diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 64849033283bb..32e97bc510a0a 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -149,6 +149,8 @@ If you are also looking for suggestions then mark it with [CR] — "comments req
 
 This can help speed up our review process by allowing us to only review the things that are ready for it, and will prevent anything that isn't completely ready from being merged in.
 
+It is not required to solve or reference an open issue to file a PR, however, if you do so, you need to explain the problem your PR is solving in full detail.
+
 ### All PRs should have a "Summary" line
 Summary is a one-line description of your change that will be extracted and added to the project changelog at https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e9ea11a839860..9a279c11e8fac 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -94,7 +94,7 @@ unzipDeps.dependsOn makeLocalization
 preBuild.dependsOn unzipDeps
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 26
 
     if (override_version.isEmpty()) {
         println("Generating version number to $version_header_path")
@@ -127,8 +127,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion 14
+        targetSdkVersion 26
         versionCode Integer.valueOf(System.env.UPSTREAM_BUILD_NUMBER ?: 1)
         versionName new File("$version_header_path").text.split('\"')[1]
         if (buildAsApplication) {
diff --git a/android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java b/android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java
index 063ec5d4ed130..c56dd148b4c2c 100755
--- a/android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java
+++ b/android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java
@@ -28,8 +28,8 @@ public class SplashScreen extends Activity {
     private static final int INSTALL_DIALOG_ID = 0;
     private ProgressDialog installDialog;
 
-    public CharSequence[] mSettingsNames = { "Software rendering" };
-    public boolean[] mSettingsValues = { true };
+    public CharSequence[] mSettingsNames = { "Software rendering", "Force fullscreen" };
+    public boolean[] mSettingsValues = { false, false};
 
     private String getVersionName() {
         try {
diff --git a/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
index 57ddc8a8c58cb..94dfb3250a67c 100644
--- a/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -21,6 +21,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.os.*;
+import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.SparseArray;
@@ -631,9 +632,11 @@ public void handleMessage(Message msg) {
                         } else {
                             int flags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_VISIBLE;
                             window.getDecorView().setSystemUiVisibility(flags);
-                            window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-                            window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
-                            SDLActivity.mFullscreenModeActive = true;
+                            Context appContext = context.getApplicationContext();
+                            boolean forceFullScreen = PreferenceManager.getDefaultSharedPreferences(appContext).getBoolean("Force fullscreen", false);
+                            window.addFlags(forceFullScreen ? WindowManager.LayoutParams.FLAG_FULLSCREEN : WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                            window.clearFlags(forceFullScreen ? WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN : WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                            SDLActivity.mFullscreenModeActive = forceFullScreen;
                         }
                     }
                 } else {
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 924a499fe248c..f8249440c0092 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -2,13 +2,14 @@
 
 # Build script intended for use in Travis CI
 
-set -ex
+set -ex pipefail
 
 num_jobs=3
 
 function run_tests
 {
-    $WINE "$@" -d yes --rng-seed time $EXTRA_TEST_OPTS
+    # The grep supresses lines that begin with "0.0## s:", which are timing lines for tests with a very short duration.
+    $WINE "$@" -d yes --use-colour yes --rng-seed time $EXTRA_TEST_OPTS | grep -Ev "^0\.0[0-9]{2} s:"
 }
 
 date +%s > build-start-time
diff --git a/data/core/tips.json b/data/core/tips.json
index 984817effb543..c75ea2b1e45b9 100644
--- a/data/core/tips.json
+++ b/data/core/tips.json
@@ -122,7 +122,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Rotten food typically attracts bugs, and bugs got a lot bigger recently..." ]
+    "text": [ "Rotten food typically attracts bugs, and bugs got a lot bigger recently…" ]
   },
   {
     "type": "snippet",
@@ -222,7 +222,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Routine kills.  Stay alert! Don't let your guard down." ]
+    "text": [ "Routine kills.  Stay alert!  Don't let your guard down." ]
   },
   {
     "type": "snippet",
@@ -312,7 +312,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "A survivor saved is a friend earned.  Most of the time..." ]
+    "text": [ "A survivor saved is a friend earned.  Most of the time…" ]
   },
   {
     "type": "snippet",
diff --git a/data/json/bionics.json b/data/json/bionics.json
index d3232380abeaf..f6f103d67083e 100644
--- a/data/json/bionics.json
+++ b/data/json/bionics.json
@@ -59,7 +59,7 @@
     "type": "bionic",
     "name": "Alloy Plating - Head",
     "description": "The flesh on your head has been surgically replaced by alloy plating, protecting both your head and jaw regions.",
-    "occupied_bodyparts": [ [ "HEAD", 5 ] ],
+    "occupied_bodyparts": [ [ "HEAD", 5 ], [ "MOUTH", 1 ] ],
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
   },
   {
@@ -325,9 +325,14 @@
     "id": "bio_ethanol",
     "type": "bionic",
     "name": "Ethanol Burner",
-    "description": "You burn alcohol as fuel in an extremely efficient reaction.  However, you will still suffer the inebriating effects of the substance.",
+    "description": "You burn alcohol as fuel in an extremely efficient reaction.",
     "occupied_bodyparts": [ [ "TORSO", 26 ] ],
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
+    "fuel_options": [ "chem_ethanol", "chem_methanol", "denat_alcohol" ],
+    "fuel_capacity": 500,
+    "fuel_efficiency": 0.5,
+    "exothermic_power_gen": true,
+    "time": 1,
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ]
   },
   {
     "id": "bio_evap",
@@ -878,15 +883,6 @@
     "occupied_bodyparts": [ [ "HEAD", 2 ] ],
     "flags": [ "BIONIC_FAULTY" ]
   },
-  {
-    "id": "bio_solar",
-    "type": "bionic",
-    "name": "Solar Panels",
-    "description": "You have a few solar panels surgically installed.  While in direct sunlight, your power level will slowly recharge.",
-    "occupied_bodyparts": [ [ "TORSO", 20 ] ],
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ],
-    "//": "Should be removed after 0.D."
-  },
   {
     "id": "bio_spasm",
     "type": "bionic",
diff --git a/data/json/body_parts.json b/data/json/body_parts.json
index c973a2db3f448..e1c442afe2631 100644
--- a/data/json/body_parts.json
+++ b/data/json/body_parts.json
@@ -13,7 +13,8 @@
     "hit_size_relative": [ 20, 33.33, 36.57 ],
     "hit_difficulty": 1,
     "side": "both",
-    "legacy_id": "TORSO"
+    "legacy_id": "TORSO",
+    "bionic_slots": 80
   },
   {
     "id": "head",
@@ -29,7 +30,8 @@
     "hit_size_relative": [ 0, 2.33, 5.71 ],
     "hit_difficulty": 1.35,
     "side": "both",
-    "legacy_id": "HEAD"
+    "legacy_id": "HEAD",
+    "bionic_slots": 18
   },
   {
     "id": "eyes",
@@ -44,7 +46,8 @@
     "hit_size_relative": [ 0, 0.33, 0.57 ],
     "hit_difficulty": 1.15,
     "side": "both",
-    "legacy_id": "EYES"
+    "legacy_id": "EYES",
+    "bionic_slots": 4
   },
   {
     "id": "mouth",
@@ -59,7 +62,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 1.15,
     "side": "both",
-    "legacy_id": "MOUTH"
+    "legacy_id": "MOUTH",
+    "bionic_slots": 4
   },
   {
     "id": "arm_l",
@@ -76,7 +80,8 @@
     "hit_size_relative": [ 15, 20, 22.86 ],
     "hit_difficulty": 0.95,
     "side": "left",
-    "legacy_id": "ARM_L"
+    "legacy_id": "ARM_L",
+    "bionic_slots": 20
   },
   {
     "id": "arm_r",
@@ -93,7 +98,8 @@
     "hit_size_relative": [ 15, 20, 22.86 ],
     "hit_difficulty": 0.95,
     "side": "right",
-    "legacy_id": "ARM_R"
+    "legacy_id": "ARM_R",
+    "bionic_slots": 20
   },
   {
     "id": "hand_l",
@@ -109,7 +115,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 1.1,
     "side": "left",
-    "legacy_id": "HAND_L"
+    "legacy_id": "HAND_L",
+    "bionic_slots": 5
   },
   {
     "id": "hand_r",
@@ -125,7 +132,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 1.1,
     "side": "right",
-    "legacy_id": "HAND_R"
+    "legacy_id": "HAND_R",
+    "bionic_slots": 5
   },
   {
     "id": "leg_l",
@@ -142,7 +150,8 @@
     "hit_size_relative": [ 25, 12, 5.71 ],
     "hit_difficulty": 0.975,
     "side": "left",
-    "legacy_id": "LEG_L"
+    "legacy_id": "LEG_L",
+    "bionic_slots": 30
   },
   {
     "id": "leg_r",
@@ -159,7 +168,8 @@
     "hit_size_relative": [ 25, 12, 5.71 ],
     "hit_difficulty": 0.975,
     "side": "right",
-    "legacy_id": "LEG_R"
+    "legacy_id": "LEG_R",
+    "bionic_slots": 30
   },
   {
     "id": "foot_l",
@@ -175,7 +185,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 0.8,
     "side": "left",
-    "legacy_id": "FOOT_L"
+    "legacy_id": "FOOT_L",
+    "bionic_slots": 7
   },
   {
     "id": "foot_r",
@@ -191,7 +202,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 0.8,
     "side": "right",
-    "legacy_id": "FOOT_R"
+    "legacy_id": "FOOT_R",
+    "bionic_slots": 7
   },
   {
     "id": "num_bp",
diff --git a/data/json/clothing_mods.json b/data/json/clothing_mods.json
index fac3dd256e1fe..804e158988c71 100644
--- a/data/json/clothing_mods.json
+++ b/data/json/clothing_mods.json
@@ -12,6 +12,20 @@
       { "type": "encumbrance", "value": 2, "round_up": true, "proportion": [ "thickness", "coverage" ] }
     ]
   },
+  {
+    "type": "clothing_mod",
+    "id": "steel_padded",
+    "flag": "steel_padded",
+    "item": "steel_armor",
+    "implement_prompt": "Pad with steel",
+    "destroy_prompt": "Destroy steel padding",
+    "restricted": true,
+    "mod_value": [
+      { "type": "bash", "value": 1, "proportion": [ "thickness", "coverage" ] },
+      { "type": "cut", "value": 1, "proportion": [ "thickness", "coverage" ] },
+      { "type": "encumbrance", "value": 2, "round_up": true, "proportion": [ "thickness", "coverage" ] }
+    ]
+  },
   {
     "type": "clothing_mod",
     "id": "kevlar_padded",
diff --git a/data/json/construction.json b/data/json/construction.json
index 195a28c965ad8..4b3349750762d 100644
--- a/data/json/construction.json
+++ b/data/json/construction.json
@@ -2235,7 +2235,7 @@
       [ { "id": "HAMMER", "level": 2 } ],
       [ { "id": "DIG", "level": 2 } ]
     ],
-    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ] ],
+    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 140 ], [ "elec_jackhammer", 7000 ] ] ],
     "components": [ [ [ "2x4", 8 ], [ "log", 8 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ],
     "pre_flags": "DIGGABLE",
     "post_special": "done_dig_stair"
@@ -2251,7 +2251,7 @@
       [ { "id": "HAMMER", "level": 2 } ],
       [ { "id": "DIG", "level": 2 } ]
     ],
-    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ] ],
+    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 8000 ] ] ],
     "components": [ [ [ "2x4", 12 ], [ "log", 12 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ],
     "pre_special": "check_down_OK",
     "pre_terrain": "t_rock_floor",
@@ -2307,7 +2307,7 @@
       [ { "id": "DIG", "level": 2 } ]
     ],
     "tools": [
-      [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ],
+      [ [ "pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 8000 ] ],
       [
         "miner_hat",
         "hat_hard",
@@ -3190,7 +3190,7 @@
     "components": [
       [ [ "processor", 2 ] ],
       [ [ "RAM", 2 ] ],
-      [ [ "small_lcd_screen", 1 ] ],
+      [ [ "large_lcd_screen", 1 ] ],
       [ [ "e_scrap", 8 ] ],
       [ [ "frame", 1 ] ],
       [ [ "circuit", 4 ] ],
diff --git a/data/json/effects.json b/data/json/effects.json
index 10264381caef5..e8cc21f70ec52 100644
--- a/data/json/effects.json
+++ b/data/json/effects.json
@@ -734,15 +734,15 @@
       "str_mod": [ -1 ],
       "dex_mod": [ -1 ],
       "vomit_chance": [ 1000, 1200 ],
-      "sleep_min": [ 60, 30 ],
-      "sleep_chance": [ -102 ]
+      "fatigue_min": [ 360, 180 ],
+      "fatigue_chance": [ -102 ]
     },
     "scaling_mods": {
       "pain_max_val": [ 30, 20 ],
       "str_mod": [ -1, -0.5 ],
       "dex_mod": [ -1, -0.5 ],
       "vomit_chance": [ -400 ],
-      "sleep_chance": [ 101 ]
+      "fatigue_chance": [ 101 ]
     }
   },
   {
@@ -760,10 +760,10 @@
       "str_mod": [ -1 ],
       "dex_mod": [ -1 ],
       "vomit_chance": [ 1000 ],
-      "sleep_min": [ 60 ],
-      "sleep_chance": [ -102 ]
+      "fatigue_min": [ 360 ],
+      "fatigue_chance": [ -102 ]
     },
-    "scaling_mods": { "pain_max_val": [ 30 ], "str_mod": [ -1 ], "dex_mod": [ -1 ], "vomit_chance": [ -400 ], "sleep_chance": [ 101 ] }
+    "scaling_mods": { "pain_max_val": [ 30 ], "str_mod": [ -1 ], "dex_mod": [ -1 ], "vomit_chance": [ -400 ], "fatigue_chance": [ 101 ] }
   },
   {
     "type": "effect_type",
@@ -1271,8 +1271,8 @@
     "base_mods": {
       "vomit_chance": [ -43 ],
       "sleep_chance": [ -1003 ],
-      "sleep_min": [ 2500 ],
-      "sleep_max": [ 3500 ],
+      "sleep_min": [ 15000 ],
+      "sleep_max": [ 21000 ],
       "pkill_amount": [ 3 ],
       "pkill_max_val": [ 3 ],
       "pkill_min": [ 1 ],
diff --git a/data/json/field_type.json b/data/json/field_type.json
index fbc9aad5ed086..15d7043705254 100644
--- a/data/json/field_type.json
+++ b/data/json/field_type.json
@@ -115,9 +115,58 @@
     "type": "field_type",
     "legacy_enum_id": 8,
     "intensity_levels": [
-      { "name": "sap splatter", "sym": "5", "color": "yellow", "dangerous": true },
-      { "name": "glob of sap" },
-      { "name": "pool of sap", "color": "brown" }
+      {
+        "name": "sap splatter",
+        "sym": "5",
+        "color": "yellow",
+        "dangerous": true,
+        "effects": [
+          {
+            "effect_id": "sap",
+            "intensity": 1,
+            "min_duration": "2 seconds",
+            "max_duration": "2 seconds",
+            "immune_in_vehicle": true,
+            "is_environmental": false,
+            "message": "The sap sticks to you!",
+            "message_npc": "The sap sticks to <npcname>!",
+            "message_type": "bad"
+          }
+        ]
+      },
+      {
+        "name": "glob of sap",
+        "effects": [
+          {
+            "effect_id": "sap",
+            "intensity": 1,
+            "min_duration": "4 seconds",
+            "max_duration": "4 seconds",
+            "immune_in_vehicle": true,
+            "is_environmental": false,
+            "message": "The sap sticks to you!",
+            "message_npc": "The sap sticks to <npcname>!",
+            "message_type": "bad"
+          }
+        ]
+      },
+      {
+        "name": "pool of sap",
+        "color": "brown",
+        "effects": [
+          {
+            "effect_id": "sap",
+            "intensity": 1,
+            "min_duration": "6 seconds",
+            "max_duration": "6 seconds",
+            "immune_in_vehicle": true,
+            "is_environmental": false,
+            "message": "The sap sticks to you!",
+            "message_npc": "The sap sticks to <npcname>!",
+            "message_type": "bad"
+          }
+        ]
+      }
     ],
     "is_splattering": true,
     "priority": 2,
@@ -185,34 +234,48 @@
         "sym": "8",
         "dangerous": true,
         "translucency": 1,
-        "effect_id": "smoke",
-        "effect_body_part": "MOUTH",
-        "effect_intensity": 1,
-        "effect_min_duration": "2 seconds",
-        "effect_max_duration": "2 seconds",
-        "inside_immune": true
+        "effects": [
+          {
+            "effect_id": "smoke",
+            "body_part": "MOUTH",
+            "intensity": 1,
+            "min_duration": "2 seconds",
+            "max_duration": "2 seconds",
+            "immune_inside_vehicle": true
+          }
+        ]
       },
       {
         "name": "smoke",
         "color": "light_gray",
         "transparent": false,
         "translucency": 10,
-        "effect_id": "smoke",
-        "effect_body_part": "MOUTH",
-        "effect_intensity": 2,
-        "effect_min_duration": "7 seconds",
-        "effect_max_duration": "7 seconds",
+        "effects": [
+          {
+            "effect_id": "smoke",
+            "body_part": "MOUTH",
+            "intensity": 2,
+            "min_duration": "7 seconds",
+            "max_duration": "7 seconds",
+            "immune_inside_vehicle": true
+          }
+        ],
         "scent_neutralization": 1
       },
       {
         "name": "thick smoke",
         "color": "dark_gray",
         "translucency": 0,
-        "effect_id": "smoke",
-        "effect_body_part": "MOUTH",
-        "effect_intensity": 4,
-        "effect_min_duration": "15 seconds",
-        "effect_max_duration": "15 seconds",
+        "effects": [
+          {
+            "effect_id": "smoke",
+            "body_part": "MOUTH",
+            "intensity": 4,
+            "min_duration": "15 seconds",
+            "max_duration": "15 seconds",
+            "immune_inside_vehicle": true
+          }
+        ],
         "scent_neutralization": 5
       }
     ],
@@ -221,7 +284,7 @@
     "dirty_transparency_cache": true,
     "percent_spread": 10,
     "outdoor_age_speedup": "0 turns",
-    "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 12 ] ] },
+    "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 7 ] ] },
     "priority": 8,
     "half_life": "2 minutes",
     "phase": "gas",
@@ -234,9 +297,71 @@
     "type": "field_type",
     "legacy_enum_id": 13,
     "intensity_levels": [
-      { "name": "hazy cloud", "sym": "8", "dangerous": true, "translucency": 1 },
-      { "name": "toxic gas", "color": "light_green", "transparent": false, "translucency": 10 },
-      { "name": "thick toxic gas", "color": "green", "translucency": 0 }
+      {
+        "name": "hazy cloud",
+        "sym": "8",
+        "dangerous": true,
+        "translucency": 1,
+        "effects": [
+          {
+            "effect_id": "poison",
+            "body_part": "MOUTH",
+            "intensity": 2,
+            "min_duration": "2 minutes",
+            "max_duration": "2 minutes",
+            "immune_inside_vehicle": true,
+            "message": "You feel sick from inhaling the hazy cloud",
+            "message_type": "bad"
+          }
+        ]
+      },
+      {
+        "name": "toxic gas",
+        "color": "light_green",
+        "transparent": false,
+        "translucency": 10,
+        "effects": [
+          {
+            "effect_id": "poison",
+            "body_part": "MOUTH",
+            "intensity": 5,
+            "min_duration": "3 minutes",
+            "max_duration": "3 minutes",
+            "immune_inside_vehicle": true,
+            "message": "You feel sick from inhaling the toxic gas",
+            "message_type": "bad"
+          }
+        ]
+      },
+      {
+        "name": "thick toxic gas",
+        "color": "green",
+        "translucency": 0,
+        "effects": [
+          {
+            "effect_id": "poison",
+            "body_part": "MOUTH",
+            "intensity": 5,
+            "min_duration": "3 minutes",
+            "max_duration": "3 minutes",
+            "//": "won't be applied outside of vehicles, so it could apply harsher effect",
+            "immune_outside_vehicle": true,
+            "message": "You feel sick from inhaling the thick toxic gas",
+            "message_type": "bad"
+          },
+          {
+            "effect_id": "badpoison",
+            "body_part": "MOUTH",
+            "intensity": 5,
+            "min_duration": "3 minutes",
+            "max_duration": "3 minutes",
+            "//": "won't be applied inside of vehicles, so it could apply lesser effect",
+            "immune_inside_vehicle": true,
+            "message": "You feel sick from inhaling the thick toxic gas",
+            "message_type": "bad"
+          }
+        ]
+      }
     ],
     "decay_amount_factor": 5,
     "gas_absorption_factor": 15,
@@ -719,9 +844,51 @@
     "type": "field_type",
     "legacy_enum_id": 39,
     "intensity_levels": [
-      { "name": "hazy cloud", "sym": ".", "dangerous": true, "translucency": 5 },
-      { "name": "sedative gas", "color": "pink" },
-      { "name": "relaxation gas", "color": "cyan" }
+      {
+        "name": "hazy cloud",
+        "sym": ".",
+        "dangerous": true,
+        "translucency": 5,
+        "effects": [
+          {
+            "effect_id": "relax_gas",
+            "body_part": "MOUTH",
+            "intensity": 2,
+            "min_duration": "3 seconds",
+            "max_duration": "3 seconds",
+            "chance_outside_vehicle": 3,
+            "immune_inside_vehicle": true
+          }
+        ]
+      },
+      {
+        "name": "sedative gas",
+        "color": "pink",
+        "effects": [
+          {
+            "effect_id": "relax_gas",
+            "body_part": "MOUTH",
+            "intensity": 4,
+            "min_duration": "3 seconds",
+            "max_duration": "3 seconds",
+            "chance_inside_vehicle": 3
+          }
+        ]
+      },
+      {
+        "name": "relaxation gas",
+        "color": "cyan",
+        "effects": [
+          {
+            "effect_id": "relax_gas",
+            "body_part": "MOUTH",
+            "intensity": 6,
+            "min_duration": "3 seconds",
+            "max_duration": "3 seconds",
+            "chance_inside_vehicle": 3
+          }
+        ]
+      }
     ],
     "decay_amount_factor": 5,
     "gas_absorption_factor": 15,
diff --git a/data/json/flags.json b/data/json/flags.json
index 136f96447087e..30eba4b7b3078 100644
--- a/data/json/flags.json
+++ b/data/json/flags.json
@@ -520,6 +520,12 @@
     "context": [ "ARMOR", "TOOL_ARMOR" ],
     "info": "This gear has certain parts padded with leather to <good>increase protection</good> with moderate <bad>increase to encumbrance</bad>."
   },
+  {
+    "id": "steel_padded",
+    "type": "json_flag",
+    "context": [ "ARMOR", "TOOL_ARMOR" ],
+    "info": "This gear has certain parts padded with steel to <good>increase protection</good> with moderate <bad>increase to encumbrance</bad>."
+  },
   {
     "id": "wooled",
     "type": "json_flag",
diff --git a/data/json/furniture_and_terrain/furniture-fungal.json b/data/json/furniture_and_terrain/furniture-fungal.json
index 9230b5ee032ef..ea0529048d104 100644
--- a/data/json/furniture_and_terrain/furniture-fungal.json
+++ b/data/json/furniture_and_terrain/furniture-fungal.json
@@ -48,5 +48,18 @@
     "required_str": -1,
     "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "ALLOW_FIELD_EFFECT", "FLAMMABLE_ASH", "FUNGUS", "MOUNTABLE", "SHORT" ],
     "bash": { "str_min": 6, "str_max": 20, "sound": "poof.", "sound_fail": "poof." }
+  },
+  {
+    "type": "furniture",
+    "id": "f_fungal_tangle",
+    "name": "fungal tangle",
+    "description": "Thick, ropy tendrils of fungus have risen from the ground and gathered into an impenetrable clump.",
+    "looks_like": "mon_fungal_wall",
+    "symbol": "&",
+    "bgcolor": "light_gray",
+    "move_cost_mod": -1,
+    "required_str": -1,
+    "flags": [ "FLAMMABLE_ASH", "FUNGUS" ],
+    "bash": { "str_min": 26, "str_max": 50, "sound": "poof.", "sound_fail": "squelch." }
   }
 ]
diff --git a/data/json/furniture_and_terrain/furniture-regional-pseudo.json b/data/json/furniture_and_terrain/furniture-regional-pseudo.json
new file mode 100644
index 0000000000000..a8315106bf942
--- /dev/null
+++ b/data/json/furniture_and_terrain/furniture-regional-pseudo.json
@@ -0,0 +1,13 @@
+[
+  {
+    "type": "furniture",
+    "id": "f_region_flower",
+    "name": "this should never actually show up, it's a pseudo furniture",
+    "description": "this should never actually show up, it's a pseudo furniture",
+    "symbol": " ",
+    "color": "black",
+    "move_cost_mod": 0,
+    "required_str": 0,
+    "flags": [ "TRANSPARENT", "NOITEM" ]
+  }
+]
diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
index ad6e9dae3aa90..a325683a846cc 100644
--- a/data/json/furniture_and_terrain/furniture-terrains.json
+++ b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -670,5 +670,84 @@
         { "item": "material_zincite", "count": [ 0, 5 ], "prob": 2 }
       ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_street_light",
+    "name": "street light",
+    "looks_like": "f_utility_pole",
+    "description": "Raised source of light which used to illuminate streets and their surrounding area, but it's useless without electricity.",
+    "symbol": "Y",
+    "color": "light_gray",
+    "move_cost_mod": -1,
+    "coverage": 40,
+    "required_str": 32,
+    "flags": [ "BASHABLE" ],
+    "bash": {
+      "str_min": 30,
+      "str_max": 100,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "pipe", "count": [ 1, 7 ] },
+        { "item": "scrap", "count": [ 3, 12 ] },
+        { "item": "amplifier", "count": [ 1, 3 ] },
+        { "item": "light_bulb", "count": [ 0, 3 ] },
+        { "item": "cable", "charges": [ 1, 2 ] },
+        { "item": "plastic_chunk", "count": [ 2, 4 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_traffic_light",
+    "name": "traffic light",
+    "looks_like": "f_utility_pole",
+    "description": "Signaling device positioned at road intersections and pedestrian crossings to control flows of traffic, but it's useless without electricity.",
+    "symbol": "P",
+    "color": "white",
+    "move_cost_mod": -1,
+    "coverage": 40,
+    "required_str": 32,
+    "flags": [ "BASHABLE" ],
+    "bash": {
+      "str_min": 30,
+      "str_max": 100,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "pipe", "count": [ 1, 5 ] },
+        { "item": "amplifier", "count": [ 1, 3 ] },
+        { "item": "light_bulb", "count": [ 1, 3 ] },
+        { "item": "plastic_chunk", "count": [ 1, 3 ] },
+        { "item": "cable", "charges": [ 1, 3 ] },
+        { "item": "scrap", "count": [ 3, 12 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_utility_pole",
+    "name": "utility pole",
+    "description": "A long wooden post which used to support overhead power lines and other public utilities, but it doesn't work anymore.",
+    "symbol": "i",
+    "color": "brown",
+    "move_cost_mod": -1,
+    "coverage": 40,
+    "required_str": 26,
+    "flags": [ "BASHABLE" ],
+    "bash": {
+      "str_min": 20,
+      "str_max": 100,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "items": [
+        { "item": "stick_long", "count": [ 3, 10 ] },
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "steel_chunk", "count": [ 2, 4 ] },
+        { "item": "cable", "charges": [ 0, 1 ] },
+        { "item": "scrap", "count": [ 3, 5 ] }
+      ]
+    }
   }
 ]
diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json
index 9ca43b3d249cc..f0bd6b6afeb8d 100644
--- a/data/json/furniture_and_terrain/terrain-manufactured.json
+++ b/data/json/furniture_and_terrain/terrain-manufactured.json
@@ -294,7 +294,7 @@
         { "item": "processor", "count": [ 1, 2 ] },
         { "item": "RAM", "count": [ 4, 8 ] },
         { "item": "cable", "charges": [ 4, 6 ] },
-        { "item": "small_lcd_screen", "count": [ 1, 2 ] },
+        { "item": "large_lcd_screen", "count": 1 },
         { "item": "e_scrap", "count": [ 10, 16 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 2, 4 ] },
@@ -313,7 +313,7 @@
         { "item": "processor", "prob": 25 },
         { "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
-        { "item": "small_lcd_screen", "prob": 25 },
+        { "item": "large_lcd_screen", "prob": 25 },
         { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
         { "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
         { "item": "power_supply", "prob": 25 },
@@ -640,6 +640,7 @@
         { "item": "RAM", "count": [ 4, 8 ] },
         { "item": "cable", "charges": [ 8, 16 ] },
         { "item": "small_lcd_screen", "count": [ 2, 4 ] },
+        { "item": "large_lcd_screen", "count": 1 },
         { "item": "e_scrap", "count": [ 12, 24 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 4, 8 ] },
diff --git a/data/json/furniture_and_terrain/terrain-mechanisms.json b/data/json/furniture_and_terrain/terrain-mechanisms.json
index 5d1fbaea6348b..7c2d7515c3063 100644
--- a/data/json/furniture_and_terrain/terrain-mechanisms.json
+++ b/data/json/furniture_and_terrain/terrain-mechanisms.json
@@ -16,7 +16,7 @@
         { "item": "processor", "count": [ 1, 2 ] },
         { "item": "RAM", "count": [ 4, 8 ] },
         { "item": "cable", "charges": [ 4, 6 ] },
-        { "item": "small_lcd_screen", "count": [ 1, 2 ] },
+        { "item": "large_lcd_screen", "count": 1 },
         { "item": "e_scrap", "count": [ 10, 16 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 2, 4 ] },
@@ -35,7 +35,7 @@
         { "item": "processor", "prob": 25 },
         { "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
-        { "item": "small_lcd_screen", "prob": 25 },
+        { "item": "large_lcd_screen", "prob": 25 },
         { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
         { "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
         { "item": "power_supply", "prob": 25 },
@@ -63,7 +63,7 @@
         { "item": "processor", "count": [ 1, 2 ] },
         { "item": "RAM", "count": [ 4, 8 ] },
         { "item": "cable", "charges": [ 4, 6 ] },
-        { "item": "small_lcd_screen", "count": [ 1, 2 ] },
+        { "item": "large_lcd_screen", "count": 1 },
         { "item": "e_scrap", "count": [ 10, 16 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 2, 4 ] },
@@ -82,7 +82,7 @@
         { "item": "processor", "prob": 25 },
         { "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
-        { "item": "small_lcd_screen", "prob": 25 },
+        { "item": "large_lcd_screen", "prob": 25 },
         { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
         { "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
         { "item": "power_supply", "prob": 25 },
diff --git a/data/json/furniture_and_terrain/terrain-railroads.json b/data/json/furniture_and_terrain/terrain-railroads.json
index 0971b8946bf81..bafd65519450b 100644
--- a/data/json/furniture_and_terrain/terrain-railroads.json
+++ b/data/json/furniture_and_terrain/terrain-railroads.json
@@ -8,15 +8,15 @@
     "color": [ "brown" ],
     "move_cost": 2,
     "bash": {
-      "str_min": 4,
+      "str_min": 30,
       "str_max": 40,
-      "ter_set": "t_rock_floor",
+      "ter_set": "t_null",
       "sound": "crunch!",
       "sound_fail": "whump!",
       "items": [ { "item": "pebble", "count": [ 1, 3 ] }, { "item": "sharp_rock", "count": [ 0, 1 ] } ]
     },
     "deconstruct": {
-      "ter_set": "t_rock_floor",
+      "ter_set": "t_null",
       "items": [ { "item": "pebble", "count": [ 2, 6 ] }, { "item": "sharp_rock", "count": [ 1, 3 ] } ]
     },
     "flags": [ "BASHABLE", "TRANSPARENT" ]
diff --git a/data/json/furniture_and_terrain/terrain-regional-pseudo.json b/data/json/furniture_and_terrain/terrain-regional-pseudo.json
new file mode 100644
index 0000000000000..655e608c77641
--- /dev/null
+++ b/data/json/furniture_and_terrain/terrain-regional-pseudo.json
@@ -0,0 +1,32 @@
+[
+  {
+    "type": "terrain",
+    "id": "t_region_groundcover",
+    "name": "this should never actually show up, it's a pseudo terrain",
+    "description": "this should never actually show up, it's a pseudo terrain",
+    "symbol": " ",
+    "color": "black",
+    "move_cost": 0,
+    "flags": [ "TRANSPARENT", "NOITEM" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_region_tree",
+    "name": "this should never actually show up, it's a pseudo terrain",
+    "description": "this should never actually show up, it's a pseudo terrain",
+    "symbol": " ",
+    "color": "black",
+    "move_cost": 0,
+    "flags": [ "TRANSPARENT", "NOITEM" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_region_shrub",
+    "name": "this should never actually show up, it's a pseudo terrain",
+    "description": "this should never actually show up, it's a pseudo terrain",
+    "symbol": " ",
+    "color": "black",
+    "move_cost": 0,
+    "flags": [ "TRANSPARENT", "NOITEM" ]
+  }
+]
diff --git a/data/json/furniture_and_terrain/terrain-traps.json b/data/json/furniture_and_terrain/terrain-traps.json
index 308ed4e601079..6d6d564d03819 100644
--- a/data/json/furniture_and_terrain/terrain-traps.json
+++ b/data/json/furniture_and_terrain/terrain-traps.json
@@ -8,7 +8,7 @@
     "color": "black",
     "move_cost": 2,
     "trap": "tr_ledge",
-    "flags": [ "TRANSPARENT", "NOITEM" ]
+    "flags": [ "TRANSPARENT", "NOITEM", "NO_FLOOR" ]
   },
   {
     "type": "terrain",
diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
index 6710f0dc0850f..5a5f91f6c905b 100644
--- a/data/json/furniture_and_terrain/terrain-walls.json
+++ b/data/json/furniture_and_terrain/terrain-walls.json
@@ -6,8 +6,12 @@
     "entries": [
       { "item": "rock", "count": [ 0, 2 ] },
       { "item": "wood_panel", "count": [ 0, 1 ] },
-      { "item": "nail", "charges": [ 2, 8 ] },
-      { "item": "splinter", "count": [ 1, 5 ] }
+      { "item": "nail", "charges": [ 4, 16 ] },
+      { "item": "splinter", "count": [ 1, 5 ] },
+      { "item": "2x4", "count": [ 1, 2 ], "prob": 25 },
+      { "item": "pipe", "count": [ 0, 2 ], "prob": 10 },
+      { "item": "cu_pipe", "count": [ 0, 2 ], "prob": 10 },
+      { "item": "cable", "charges": [ 0, 200 ], "prob": 10 }
     ]
   },
   {
diff --git a/data/json/item_category.json b/data/json/item_category.json
index 4354b2c3efe9c..5ffa968ae86e2 100644
--- a/data/json/item_category.json
+++ b/data/json/item_category.json
@@ -131,6 +131,13 @@
     "zone": "LOOT_SPARE_PARTS",
     "sort_rank": 8
   },
+  {
+    "id": "container",
+    "type": "ITEM_CATEGORY",
+    "name": "CONTAINERS",
+    "zone": "LOOT_CONTAINERS",
+    "sort_rank": 9
+  },
   {
     "id": "artifacts",
     "type": "ITEM_CATEGORY",
diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json
index 8e21b464125c2..c9143181f1fb4 100644
--- a/data/json/itemgroups/clothing.json
+++ b/data/json/itemgroups/clothing.json
@@ -563,16 +563,24 @@
     "subtype": "distribution",
     "entries": [
       { "item": "jeans", "prob": 90 },
-      { "item": "pants_checkered", "prob": 5 },
+      { "item": "jeans_red", "prob": 50 },
       { "item": "shorts", "prob": 70 },
       { "item": "shorts_denim", "prob": 35 },
+      { "item": "b_shorts", "prob": 30 },
+      { "item": "shorts_cargo", "prob": 50 },
+      { "item": "postman_shorts", "prob": 12 },
+      { "item": "under_armor_shorts", "prob": 5 },
       { "item": "pants", "prob": 75 },
-      { "item": "leather_belt", "prob": 30 },
       { "item": "pants_leather", "prob": 60 },
       { "item": "pants_cargo", "prob": 70 },
-      { "item": "shorts_cargo", "prob": 50 },
-      { "item": "under_armor_shorts", "prob": 20 },
-      { "item": "postman_shorts", "prob": 5 },
+      { "item": "pants_checkered", "prob": 55 },
+      { "item": "pants_ski", "prob": 45 },
+      { "item": "pants_fur", "prob": 5 },
+      { "item": "pants_faux_fur", "prob": 15 },
+      { "item": "hot_pants", "prob": 30 },
+      { "item": "hot_pants_fur", "prob": 5 },
+      { "item": "hot_pants_leather", "prob": 25 },
+      { "item": "breeches", "prob": 25 },
       { "item": "kilt", "prob": 5 }
     ]
   },
@@ -585,10 +593,6 @@
       { "item": "skirt", "prob": 75 },
       { "item": "skirt_leather", "prob": 5 },
       { "item": "leggings", "prob": 15 },
-      { "item": "dress", "prob": 70 },
-      { "item": "sundress", "prob": 50 },
-      { "item": "dress_wedding", "prob": 1 },
-      { "item": "b_shorts", "prob": 15 },
       { "item": "nanoskirt", "prob": 10 }
     ]
   },
@@ -1000,7 +1004,16 @@
   {
     "type": "item_group",
     "id": "female_underwear_top",
-    "items": [ [ "bra", 70 ], [ "sports_bra", 50 ], [ "bikini_top", 10 ] ]
+    "items": [
+      [ "bra", 70 ],
+      [ "sports_bra", 50 ],
+      [ "camisole", 30 ],
+      [ "halter_top", 30 ],
+      [ "bikini_top", 10 ],
+      [ "bikini_top_leather", 7 ],
+      [ "bikini_top_fur", 5 ],
+      [ "corset", 5 ]
+    ]
   },
   {
     "type": "item_group",
@@ -1020,7 +1033,8 @@
       [ "briefs", 30 ],
       [ "boxer_briefs", 50 ],
       [ "long_underpants", 20 ],
-      [ "under_armor_shorts", 20 ]
+      [ "under_armor_shorts", 20 ],
+      [ "trunks", 10 ]
     ]
   },
   {
@@ -1322,8 +1336,6 @@
       [ "power_armor_frame", 4 ],
       [ "helmet_army", 40 ],
       [ "helmet_liner", 10 ],
-      [ "UPS_off", 5 ],
-      [ "adv_UPS_off", 3 ],
       [ "beret", 50 ],
       [ "beret_wool", 40 ],
       [ "elbow_pads", 50 ],
@@ -2211,72 +2223,52 @@
     "items": [
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "tricorne", "prob": 5 },
-              { "item": "10gal_hat", "prob": 30 },
-              { "item": "tophat", "prob": 10 },
-              { "item": "hat_sombrero", "prob": 10 }
-            ],
-            "prob": 5
-          }
-        ]
+          { "item": "tricorne", "prob": 5 },
+          { "item": "10gal_hat", "prob": 30 },
+          { "item": "tophat", "prob": 10 },
+          { "item": "hat_sombrero", "prob": 10 }
+        ],
+        "prob": 5
       },
       {
-        "distribution": [
-          {
-            "collection": [ { "item": "kippah", "prob": 33 }, { "item": "turban", "prob": 33 }, { "item": "kufi", "prob": 33 } ],
-            "prob": 10
-          }
-        ]
+        "distribution": [ { "item": "kippah", "prob": 33 }, { "item": "turban", "prob": 33 }, { "item": "kufi", "prob": 33 } ],
+        "prob": 10
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "helmet_motor", "prob": 20 },
-              { "item": "helmet_bike", "prob": 50 },
-              { "item": "headgear", "prob": 10 },
-              { "item": "helmet_ball", "prob": 15 },
-              { "item": "wetsuit_hood", "prob": 5 }
-            ],
-            "prob": 30
-          }
-        ]
+          { "item": "helmet_motor", "prob": 20 },
+          { "item": "helmet_bike", "prob": 50 },
+          { "item": "headgear", "prob": 10 },
+          { "item": "helmet_ball", "prob": 15 },
+          { "item": "wetsuit_hood", "prob": 5 }
+        ],
+        "prob": 30
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "hat_hunting", "prob": 20 },
-              { "item": "hat_faux_fur", "prob": 10 },
-              { "item": "hat_fur", "prob": 5 },
-              { "item": "hat_boonie", "prob": 15 },
-              { "item": "cowl_wool", "prob": 15 },
-              { "item": "hood_rain", "prob": 25 }
-            ],
-            "prob": 50
-          }
-        ]
+          { "item": "hat_hunting", "prob": 20 },
+          { "item": "hat_faux_fur", "prob": 10 },
+          { "item": "hat_fur", "prob": 5 },
+          { "item": "hat_boonie", "prob": 15 },
+          { "item": "cowl_wool", "prob": 15 },
+          { "item": "hood_rain", "prob": 25 }
+        ],
+        "prob": 50
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "bowhat", "prob": 10 },
-              { "item": "fedora", "prob": 40 },
-              { "item": "hat_newsboy", "prob": 5 },
-              { "item": "cowboy_hat", "prob": 20 },
-              { "item": "straw_fedora", "prob": 5 },
-              { "item": "hat_golf", "prob": 15 },
-              { "item": "straw_hat", "prob": 15 },
-              { "item": "beret_wool", "prob": 5 },
-              { "item": "beret", "prob": 10 },
-              { "item": "porkpie", "prob": 15 }
-            ],
-            "prob": 50
-          }
-        ]
+          { "item": "bowhat", "prob": 10 },
+          { "item": "fedora", "prob": 40 },
+          { "item": "hat_newsboy", "prob": 5 },
+          { "item": "cowboy_hat", "prob": 20 },
+          { "item": "straw_fedora", "prob": 5 },
+          { "item": "hat_golf", "prob": 15 },
+          { "item": "straw_hat", "prob": 15 },
+          { "item": "beret_wool", "prob": 5 },
+          { "item": "beret", "prob": 10 },
+          { "item": "porkpie", "prob": 15 }
+        ],
+        "prob": 50
       },
       { "item": "hat_knit", "prob": 30 },
       { "item": "hat_cotton", "prob": 40 },
@@ -2331,25 +2323,25 @@
     "//": "unisex shirts",
     "subtype": "distribution",
     "items": [
-      { "item": "longshirt", "prob": 70, "count": [ 1, 4 ] },
+      { "item": "longshirt", "prob": 70 },
       { "item": "arm_warmers", "prob": 20 },
       { "item": "armguard_soft", "prob": 10 },
-      { "item": "dress_shirt", "prob": 50, "count": [ 1, 4 ] },
+      { "item": "dress_shirt", "prob": 50 },
       { "item": "flag_shirt", "prob": 15 },
-      { "item": "jersey", "prob": 30, "count": [ 1, 4 ] },
+      { "item": "jersey", "prob": 30 },
       { "item": "linuxtshirt", "prob": 10 },
-      { "item": "polo_shirt", "prob": 30, "count": [ 1, 4 ] },
-      { "item": "thermal_shirt", "prob": 20, "count": [ 1, 2 ] },
+      { "item": "polo_shirt", "prob": 30 },
+      { "item": "thermal_shirt", "prob": 20 },
       { "item": "sleeveless_tunic", "prob": 10 },
-      { "item": "sweater", "prob": 40, "count": [ 1, 2 ] },
-      { "item": "sweatshirt", "prob": 50, "count": [ 1, 2 ] },
-      { "item": "tank_top", "prob": 30, "count": [ 1, 4 ] },
-      { "item": "tshirt", "prob": 80, "count": [ 1, 4 ] },
-      { "item": "tshirt_text", "prob": 50, "count": [ 1, 4 ] },
+      { "item": "sweater", "prob": 40 },
+      { "item": "sweatshirt", "prob": 50 },
+      { "item": "tank_top", "prob": 30 },
+      { "item": "tshirt", "prob": 80 },
+      { "item": "tshirt_text", "prob": 50 },
       { "item": "tunic", "prob": 10 },
       { "item": "waistcoat", "prob": 10 },
       { "item": "wool_hoodie", "prob": 10 },
-      { "item": "hoodie", "prob": 40, "count": [ 1, 4 ] }
+      { "item": "hoodie", "prob": 40 }
     ]
   },
   {
@@ -2367,11 +2359,11 @@
     "items": [
       { "item": "thermal_suit", "prob": 15 },
       { "item": "thermal_outfit", "prob": 5 },
-      { "item": "long_undertop", "prob": 30, "count": [ 1, 4 ] },
-      { "item": "under_armor", "prob": 10, "count": [ 1, 4 ] },
-      { "item": "undershirt", "prob": 40, "count": [ 1, 4 ] },
-      { "item": "under_armor_shorts", "prob": 10, "count": [ 1, 4 ] },
-      { "item": "long_underpants", "prob": 30, "count": [ 1, 4 ] }
+      { "item": "long_undertop", "prob": 30 },
+      { "item": "under_armor", "prob": 10 },
+      { "item": "undershirt", "prob": 40 },
+      { "item": "under_armor_shorts", "prob": 10 },
+      { "item": "long_underpants", "prob": 30 }
     ]
   },
   {
@@ -2380,18 +2372,18 @@
     "//": "womens underwear.",
     "subtype": "distribution",
     "items": [
-      { "item": "bikini_bottom", "prob": 20, "count": [ 1, 2 ] },
-      { "item": "boy_shorts", "prob": 30, "count": [ 1, 4 ] },
-      { "item": "bra", "prob": 60, "count": [ 1, 4 ] },
-      { "item": "panties", "prob": 70, "count": [ 1, 4 ] },
-      { "item": "bikini_top", "prob": 20, "count": [ 1, 4 ] },
+      { "item": "bikini_bottom", "prob": 20 },
+      { "item": "boy_shorts", "prob": 30 },
+      { "item": "bra", "prob": 60 },
+      { "item": "panties", "prob": 70 },
+      { "item": "bikini_top", "prob": 20 },
       { "item": "bikini_top_fur", "prob": 5 },
       { "item": "bikini_top_leather", "prob": 10 },
-      { "item": "camisole", "prob": 30, "count": [ 1, 4 ] },
+      { "item": "camisole", "prob": 30 },
       { "item": "corset", "prob": 10 },
-      { "item": "sports_bra", "prob": 50, "count": [ 1, 4 ] },
-      { "item": "stockings", "prob": 20, "count": [ 1, 2 ] },
-      { "item": "tights", "prob": 20, "count": [ 1, 2 ] }
+      { "item": "sports_bra", "prob": 50 },
+      { "item": "stockings", "prob": 20 },
+      { "item": "tights", "prob": 20 }
     ]
   },
   {
@@ -2400,9 +2392,9 @@
     "//": "mens underwear.",
     "subtype": "distribution",
     "items": [
-      { "item": "boxer_briefs", "prob": 30, "count": [ 1, 4 ] },
-      { "item": "boxer_shorts", "prob": 50, "count": [ 1, 4 ] },
-      { "item": "briefs", "prob": 50, "count": [ 1, 4 ] },
+      { "item": "boxer_briefs", "prob": 30 },
+      { "item": "boxer_shorts", "prob": 50 },
+      { "item": "briefs", "prob": 50 },
       { "item": "trunks", "prob": 10 }
     ]
   },
@@ -2414,44 +2406,36 @@
     "items": [
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "hot_pants", "prob": 40 },
-              { "item": "hot_pants_fur", "prob": 5 },
-              { "item": "hot_pants_leather", "prob": 35 }
-            ],
-            "prob": 10
-          }
-        ]
+          { "item": "hot_pants", "prob": 40 },
+          { "item": "hot_pants_fur", "prob": 5 },
+          { "item": "hot_pants_leather", "prob": 35 }
+        ],
+        "prob": 10
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "chaps_leather", "prob": 30 },
-              { "item": "motorbike_pants", "prob": 35 },
-              { "item": "breeches", "prob": 25 },
-              { "item": "pants_ski", "prob": 45 },
-              { "item": "pants_checkered", "prob": 55 },
-              { "item": "pants_fur", "prob": 5 },
-              { "item": "pants_faux_fur", "prob": 15 }
-            ],
-            "prob": 20
-          }
-        ]
+          { "item": "chaps_leather", "prob": 30 },
+          { "item": "motorbike_pants", "prob": 35 },
+          { "item": "breeches", "prob": 25 },
+          { "item": "pants_ski", "prob": 45 },
+          { "item": "pants_checkered", "prob": 55 },
+          { "item": "pants_fur", "prob": 5 },
+          { "item": "pants_faux_fur", "prob": 15 }
+        ],
+        "prob": 20
       },
-      { "item": "jeans", "prob": 80, "count": [ 1, 4 ] },
+      { "item": "jeans", "prob": 80 },
       { "item": "jeans_red", "prob": 20 },
-      { "item": "leg_warmers", "prob": 20, "count": [ 1, 4 ] },
+      { "item": "leg_warmers", "prob": 20 },
       { "item": "leggings", "prob": 30 },
       { "item": "legguard_hard", "prob": 3 },
-      { "item": "pants", "prob": 70, "count": [ 1, 4 ] },
-      { "item": "pants_cargo", "prob": 60, "count": [ 1, 4 ] },
-      { "item": "pants_leather", "prob": 20, "count": [ 1, 2 ] },
-      { "item": "shorts", "prob": 50, "count": [ 1, 2 ] },
-      { "item": "shorts_cargo", "prob": 60, "count": [ 1, 2 ] },
-      { "item": "shorts_denim", "prob": 40, "count": [ 1, 2 ] },
-      { "item": "b_shorts", "prob": 60, "count": [ 1, 2 ] }
+      { "item": "pants", "prob": 70 },
+      { "item": "pants_cargo", "prob": 60 },
+      { "item": "pants_leather", "prob": 20 },
+      { "item": "shorts", "prob": 50 },
+      { "item": "shorts_cargo", "prob": 60 },
+      { "item": "shorts_denim", "prob": 40 },
+      { "item": "b_shorts", "prob": 60 }
     ]
   },
   {
@@ -2459,11 +2443,7 @@
     "type": "item_group",
     "//": "womens pants and leg coverings for domestic locations.",
     "subtype": "distribution",
-    "items": [
-      { "item": "nanoskirt", "prob": 10 },
-      { "item": "skirt", "prob": 50, "count": [ 1, 3 ] },
-      { "item": "skirt_leather", "prob": 10 }
-    ]
+    "items": [ { "item": "nanoskirt", "prob": 10 }, { "item": "skirt", "prob": 50 }, { "item": "skirt_leather", "prob": 10 } ]
   },
   {
     "id": "pants_mens",
@@ -2506,73 +2486,53 @@
     "items": [
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "basket_laundry", "prob": 60 },
-              { "item": "straw_basket", "prob": 35 },
-              { "item": "suitcase_l", "prob": 15 },
-              { "item": "suitcase_m", "prob": 25 }
-            ],
-            "prob": 20
-          }
-        ]
+          { "item": "basket_laundry", "prob": 60 },
+          { "item": "straw_basket", "prob": 35 },
+          { "item": "suitcase_l", "prob": 15 },
+          { "item": "suitcase_m", "prob": 25 }
+        ],
+        "prob": 20
       },
       {
-        "distribution": [
-          {
-            "collection": [ { "item": "2lcanteen", "prob": 50 }, { "item": "camelbak", "prob": 25 }, { "item": "canteen", "prob": 70 } ],
-            "prob": 5
-          }
-        ]
+        "distribution": [ { "item": "2lcanteen", "prob": 50 }, { "item": "camelbak", "prob": 25 }, { "item": "canteen", "prob": 70 } ],
+        "prob": 5
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "fanny", "prob": 60 },
-              { "item": "mbag", "prob": 35 },
-              { "item": "runner_bag", "prob": 45 },
-              { "item": "slingpack", "prob": 65 },
-              { "item": "purse", "prob": 70 },
-              { "item": "briefcase", "prob": 40 },
-              { "item": "hk_briefcase", "prob": 1 }
-            ],
-            "prob": 60
-          }
-        ]
+          { "item": "fanny", "prob": 60 },
+          { "item": "mbag", "prob": 35 },
+          { "item": "runner_bag", "prob": 45 },
+          { "item": "slingpack", "prob": 65 },
+          { "item": "purse", "prob": 70 },
+          { "item": "briefcase", "prob": 40 },
+          { "item": "hk_briefcase", "prob": 1 }
+        ],
+        "prob": 60
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "case_violin", "prob": 5 },
-              { "item": "quiver", "prob": 20 },
-              { "item": "quiver_large", "prob": 15 },
-              { "item": "solarpack", "prob": 5 },
-              { "item": "ammo_satchel", "prob": 10 },
-              { "item": "chestrig", "prob": 20 },
-              { "item": "dive_bag", "prob": 50 },
-              { "item": "petpack", "prob": 50 }
-            ],
-            "prob": 30
-          }
-        ]
+          { "item": "case_violin", "prob": 5 },
+          { "item": "quiver", "prob": 20 },
+          { "item": "quiver_large", "prob": 15 },
+          { "item": "solarpack", "prob": 5 },
+          { "item": "ammo_satchel", "prob": 10 },
+          { "item": "chestrig", "prob": 20 },
+          { "item": "dive_bag", "prob": 50 },
+          { "item": "petpack", "prob": 50 }
+        ],
+        "prob": 30
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "daypack", "prob": 25 },
-              { "item": "backpack_leather", "prob": 40 },
-              { "item": "backpack", "prob": 85 },
-              { "item": "backpack_hiking", "prob": 25 },
-              { "item": "duffelbag", "prob": 80 },
-              { "item": "travelpack", "prob": 25 },
-              { "item": "gobag", "prob": 1 }
-            ],
-            "prob": 80
-          }
-        ]
+          { "item": "daypack", "prob": 25 },
+          { "item": "backpack_leather", "prob": 40 },
+          { "item": "backpack", "prob": 85 },
+          { "item": "backpack_hiking", "prob": 25 },
+          { "item": "duffelbag", "prob": 80 },
+          { "item": "travelpack", "prob": 25 },
+          { "item": "gobag", "prob": 1 }
+        ],
+        "prob": 80
       }
     ]
   },
@@ -2612,9 +2572,9 @@
     "subtype": "distribution",
     "items": [
       { "item": "dress_wedding", "prob": 5 },
-      { "item": "sundress", "prob": 60, "count": [ 1, 4 ] },
-      { "item": "gown", "prob": 20, "count": [ 1, 2 ] },
-      { "item": "dress", "prob": 60, "count": [ 1, 4 ] },
+      { "item": "sundress", "prob": 60 },
+      { "item": "gown", "prob": 20 },
+      { "item": "dress", "prob": 60 },
       { "item": "veil_wedding", "prob": 5 }
     ]
   },
@@ -2626,101 +2586,77 @@
     "items": [
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "cloak", "prob": 80 },
-              { "item": "cloak_wool", "prob": 40 },
-              { "item": "cloak_leather", "prob": 20 },
-              { "item": "cloak_fur", "prob": 10 },
-              { "item": "jedi_cloak", "prob": 5 }
-            ],
-            "prob": 20
-          }
-        ]
+          { "item": "cloak", "prob": 80 },
+          { "item": "cloak_wool", "prob": 40 },
+          { "item": "cloak_leather", "prob": 20 },
+          { "item": "cloak_fur", "prob": 10 },
+          { "item": "jedi_cloak", "prob": 5 }
+        ],
+        "prob": 20
       },
       {
-        "collection": [
-          {
-            "distribution": [
-              { "item": "duster", "prob": 80 },
-              { "item": "duster_leather", "prob": 60 },
-              { "item": "duster_faux_fur", "prob": 30 },
-              { "item": "duster_fur", "prob": 5 },
-              { "item": "sleeveless_duster", "prob": 70 },
-              { "item": "sleeveless_duster_leather", "prob": 50 },
-              { "item": "sleeveless_duster_fur", "prob": 20 },
-              { "item": "sleeveless_duster_faux_fur", "prob": 10 }
-            ],
-            "prob": 60
-          },
-          {
-            "distribution": [
-              { "item": "trenchcoat", "prob": 80 },
-              { "item": "trenchcoat_leather", "prob": 60 },
-              { "item": "trenchcoat_faux_fur", "prob": 30 },
-              { "item": "trenchcoat_fur", "prob": 5 },
-              { "item": "sleeveless_trenchcoat", "prob": 40 },
-              { "item": "sleeveless_trenchcoat_leather", "prob": 30 },
-              { "item": "sleeveless_trenchcoat_fur", "prob": 10 },
-              { "item": "sleeveless_trenchcoat_faux_fur", "prob": 20 }
-            ],
-            "prob": 40
-          }
-        ]
+        "distribution": [
+          { "item": "duster", "prob": 80 },
+          { "item": "duster_leather", "prob": 60 },
+          { "item": "duster_faux_fur", "prob": 30 },
+          { "item": "duster_fur", "prob": 5 },
+          { "item": "sleeveless_duster", "prob": 70 },
+          { "item": "sleeveless_duster_leather", "prob": 50 },
+          { "item": "sleeveless_duster_fur", "prob": 20 },
+          { "item": "sleeveless_duster_faux_fur", "prob": 10 }
+        ],
+        "prob": 60
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "coat_rain", "prob": 80 },
-              { "item": "coat_winter", "prob": 50 },
-              { "item": "peacoat", "prob": 50 },
-              { "item": "greatcoat", "prob": 35 },
-              { "item": "coat_faux_fur", "prob": 20 },
-              { "item": "coat_fur", "prob": 10 },
-              { "item": "coat_fur_sf", "prob": 5 }
-            ],
-            "prob": 80
-          }
-        ]
+          { "item": "trenchcoat", "prob": 80 },
+          { "item": "trenchcoat_leather", "prob": 60 },
+          { "item": "trenchcoat_faux_fur", "prob": 30 },
+          { "item": "trenchcoat_fur", "prob": 5 },
+          { "item": "sleeveless_trenchcoat", "prob": 40 },
+          { "item": "sleeveless_trenchcoat_leather", "prob": 30 },
+          { "item": "sleeveless_trenchcoat_fur", "prob": 10 },
+          { "item": "sleeveless_trenchcoat_faux_fur", "prob": 20 }
+        ],
+        "prob": 40
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "jacket_jean", "prob": 80 },
-              { "item": "jacket_flannel", "prob": 50 },
-              { "item": "jacket_leather", "prob": 50 },
-              { "item": "jacket_leather_red", "prob": 25 },
-              { "item": "jacket_light", "prob": 60 },
-              { "item": "jacket_windbreaker", "prob": 70 },
-              { "item": "poncho", "prob": 30 },
-              { "item": "ski_jacket", "prob": 25 }
-            ],
-            "prob": 60
-          }
-        ]
+          { "item": "coat_rain", "prob": 80 },
+          { "item": "coat_winter", "prob": 50 },
+          { "item": "peacoat", "prob": 50 },
+          { "item": "greatcoat", "prob": 35 },
+          { "item": "coat_faux_fur", "prob": 20 },
+          { "item": "coat_fur", "prob": 10 },
+          { "item": "coat_fur_sf", "prob": 5 }
+        ],
+        "prob": 80
       },
       {
         "distribution": [
-          {
-            "collection": [ { "item": "house_coat", "prob": 80 }, { "item": "kimono", "prob": 20 }, { "item": "robe", "prob": 10 } ],
-            "prob": 30
-          }
-        ]
+          { "item": "jacket_jean", "prob": 80 },
+          { "item": "jacket_flannel", "prob": 50 },
+          { "item": "jacket_leather", "prob": 50 },
+          { "item": "jacket_leather_red", "prob": 25 },
+          { "item": "jacket_light", "prob": 60 },
+          { "item": "jacket_windbreaker", "prob": 70 },
+          { "item": "poncho", "prob": 30 },
+          { "item": "ski_jacket", "prob": 25 }
+        ],
+        "prob": 60
+      },
+      {
+        "distribution": [ { "item": "house_coat", "prob": 80 }, { "item": "kimono", "prob": 20 }, { "item": "robe", "prob": 10 } ],
+        "prob": 30
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "vest", "prob": 80 },
-              { "item": "vest_leather", "prob": 20 },
-              { "item": "army_top", "prob": 40 },
-              { "item": "blazer", "prob": 70 }
-            ],
-            "prob": 40
-          }
-        ]
+          { "item": "vest", "prob": 80 },
+          { "item": "vest_leather", "prob": 20 },
+          { "item": "army_top", "prob": 40 },
+          { "item": "blazer", "prob": 70 }
+        ],
+        "prob": 40
       }
     ]
   },
@@ -2732,76 +2668,56 @@
     "items": [
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "boots", "prob": 80 },
-              { "item": "boots_hiking", "prob": 50 },
-              { "item": "boots_steel", "prob": 50 },
-              { "item": "boots_combat", "prob": 45 },
-              { "item": "boots_fur", "prob": 10 },
-              { "item": "boots_western", "prob": 40 },
-              { "item": "boots_winter", "prob": 30 },
-              { "item": "knee_high_boots", "prob": 15 },
-              { "item": "motorbike_boots", "prob": 35 },
-              { "item": "thigh_high_boots", "prob": 5 }
-            ],
-            "prob": 60
-          }
-        ]
+          { "item": "boots", "prob": 80 },
+          { "item": "boots_hiking", "prob": 50 },
+          { "item": "boots_steel", "prob": 50 },
+          { "item": "boots_combat", "prob": 45 },
+          { "item": "boots_fur", "prob": 10 },
+          { "item": "boots_western", "prob": 40 },
+          { "item": "boots_winter", "prob": 30 },
+          { "item": "knee_high_boots", "prob": 15 },
+          { "item": "motorbike_boots", "prob": 35 },
+          { "item": "thigh_high_boots", "prob": 5 }
+        ],
+        "prob": 60
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "bastsandals", "prob": 20 },
-              { "item": "straw_sandals", "prob": 20 },
-              { "item": "flip_flops", "prob": 40 },
-              { "item": "leathersandals", "prob": 35 }
-            ],
-            "prob": 60
-          }
-        ]
+          { "item": "bastsandals", "prob": 20 },
+          { "item": "straw_sandals", "prob": 20 },
+          { "item": "flip_flops", "prob": 40 },
+          { "item": "leathersandals", "prob": 35 }
+        ],
+        "prob": 60
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "cleats", "prob": 20 },
-              { "item": "golf_shoes", "prob": 20 },
-              { "item": "dance_shoes", "prob": 30 },
-              { "item": "roller_blades", "prob": 35 },
-              { "item": "rollerskates", "prob": 35 },
-              { "item": "roller_shoes_off", "prob": 45 }
-            ],
-            "prob": 20
-          }
-        ]
+          { "item": "cleats", "prob": 20 },
+          { "item": "golf_shoes", "prob": 20 },
+          { "item": "dance_shoes", "prob": 30 },
+          { "item": "roller_blades", "prob": 35 },
+          { "item": "rollerskates", "prob": 35 },
+          { "item": "roller_shoes_off", "prob": 45 }
+        ],
+        "prob": 20
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "dress_shoes", "prob": 50 },
-              { "item": "lowtops", "prob": 30 },
-              { "item": "mocassins", "prob": 10 },
-              { "item": "sneakers", "prob": 35 }
-            ],
-            "prob": 70
-          }
-        ]
+          { "item": "dress_shoes", "prob": 50 },
+          { "item": "lowtops", "prob": 30 },
+          { "item": "mocassins", "prob": 10 },
+          { "item": "sneakers", "prob": 35 }
+        ],
+        "prob": 70
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "boots_rubber", "prob": 50 },
-              { "item": "clogs", "prob": 20 },
-              { "item": "geta", "prob": 10 },
-              { "item": "slippers", "prob": 75 }
-            ],
-            "prob": 70
-          }
-        ]
+          { "item": "boots_rubber", "prob": 50 },
+          { "item": "clogs", "prob": 20 },
+          { "item": "geta", "prob": 10 },
+          { "item": "slippers", "prob": 75 }
+        ],
+        "prob": 70
       }
     ]
   },
@@ -2816,143 +2732,110 @@
     "id": "accesories_personal_unisex",
     "type": "item_group",
     "//": "unisex personal accessories",
-    "subtype": "distribution",
+    "subtype": "collection",
     "items": [
       { "group": "clothing_glasses", "prob": 10 },
       { "group": "clothing_watch", "prob": 10 },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "ring_wedding", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "copper_ring", "prob": 80, "count": [ 1, 3 ] },
-              { "item": "silver_ring", "prob": 50, "count": [ 1, 3 ] },
-              { "item": "gold_ring", "prob": 40, "count": [ 1, 3 ] },
-              { "item": "diamond_ring", "prob": 10 },
-              { "item": "platinum_ring", "prob": 10 }
-            ],
-            "prob": 60
-          }
-        ]
+          { "item": "ring_wedding", "prob": 50, "count": [ 1, 2 ] },
+          { "item": "copper_ring", "prob": 80, "count": [ 1, 3 ] },
+          { "item": "silver_ring", "prob": 50, "count": [ 1, 3 ] },
+          { "item": "gold_ring", "prob": 40, "count": [ 1, 3 ] },
+          { "item": "diamond_ring", "prob": 10 },
+          { "item": "platinum_ring", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "ear_spool", "prob": 20, "count": [ 1, 2 ] },
-              { "item": "bead_ear", "prob": 70, "count": [ 1, 2 ] },
-              { "item": "copper_ear", "prob": 60, "count": [ 1, 2 ] },
-              { "item": "silver_ear", "prob": 40, "count": [ 1, 2 ] },
-              { "item": "gold_ear", "prob": 40, "count": [ 1, 2 ] },
-              { "item": "platinum_ear", "prob": 10 },
-              { "item": "ear_plugs", "prob": 40 },
-              { "item": "attached_ear_plugs_off", "prob": 30 }
-            ],
-            "prob": 60
-          }
+          { "item": "ear_spool", "prob": 20, "count": [ 1, 2 ] },
+          { "item": "bead_ear", "prob": 70, "count": [ 1, 2 ] },
+          { "item": "copper_ear", "prob": 60, "count": [ 1, 2 ] },
+          { "item": "silver_ear", "prob": 40, "count": [ 1, 2 ] },
+          { "item": "gold_ear", "prob": 40, "count": [ 1, 2 ] },
+          { "item": "platinum_ear", "prob": 10 },
+          { "item": "ear_plugs", "prob": 40 },
+          { "item": "attached_ear_plugs_off", "prob": 30 }
         ]
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "bead_bracelet", "prob": 80, "count": [ 1, 2 ] },
-              { "item": "bracelet_friendship", "prob": 60, "count": [ 1, 2 ] },
-              { "item": "copper_bracelet", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "silver_bracelet", "prob": 40, "count": [ 1, 2 ] },
-              { "item": "gold_bracelet", "prob": 10, "count": [ 1, 2 ] },
-              { "item": "platinum_bracelet", "prob": 10 }
-            ],
-            "prob": 50
-          }
-        ]
+          { "item": "bead_bracelet", "prob": 80, "count": [ 1, 2 ] },
+          { "item": "bracelet_friendship", "prob": 60, "count": [ 1, 2 ] },
+          { "item": "copper_bracelet", "prob": 50, "count": [ 1, 2 ] },
+          { "item": "silver_bracelet", "prob": 40, "count": [ 1, 2 ] },
+          { "item": "gold_bracelet", "prob": 10, "count": [ 1, 2 ] },
+          { "item": "platinum_bracelet", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "gold_dental_grill", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "platinum_dental_grill", "prob": 30, "count": [ 1, 2 ] },
-              { "item": "diamond_dental_grill", "prob": 10 }
-            ],
-            "prob": 10
-          }
-        ]
+          { "item": "gold_dental_grill", "prob": 50, "count": [ 1, 2 ] },
+          { "item": "platinum_dental_grill", "prob": 30, "count": [ 1, 2 ] },
+          { "item": "diamond_dental_grill", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "bead_necklace", "prob": 80, "count": [ 1, 2 ] },
-              { "item": "copper_necklace", "prob": 60, "count": [ 1, 2 ] },
-              { "item": "silver_necklace", "prob": 40, "count": [ 1, 2 ] },
-              { "item": "gold_necklace", "prob": 20, "count": [ 1, 2 ] },
-              { "item": "platinum_necklace", "prob": 10, "count": [ 1, 2 ] },
-              { "item": "copper_locket", "prob": 60, "count": [ 1, 2 ] },
-              { "item": "silver_locket", "prob": 40, "count": [ 1, 2 ] },
-              { "item": "gold_locket", "prob": 20, "count": [ 1, 2 ] },
-              { "item": "platinum_locket", "prob": 10, "count": [ 1, 2 ] },
-              { "item": "collarpin", "prob": 10 },
-              { "item": "bronze_medal", "prob": 6 },
-              { "item": "silver_medal", "prob": 4 },
-              { "item": "gold_medal", "prob": 2 },
-              { "item": "small_relic", "prob": 10 },
-              { "item": "holy_symbol", "prob": 10 },
-              { "item": "holy_symbol_wood", "prob": 10 }
-            ],
-            "prob": 50
-          }
-        ]
+          { "item": "bead_necklace", "prob": 80, "count": [ 1, 2 ] },
+          { "item": "copper_necklace", "prob": 60, "count": [ 1, 2 ] },
+          { "item": "silver_necklace", "prob": 40, "count": [ 1, 2 ] },
+          { "item": "gold_necklace", "prob": 20, "count": [ 1, 2 ] },
+          { "item": "platinum_necklace", "prob": 10, "count": [ 1, 2 ] },
+          { "item": "copper_locket", "prob": 60, "count": [ 1, 2 ] },
+          { "item": "silver_locket", "prob": 40, "count": [ 1, 2 ] },
+          { "item": "gold_locket", "prob": 20, "count": [ 1, 2 ] },
+          { "item": "platinum_locket", "prob": 10, "count": [ 1, 2 ] },
+          { "item": "collarpin", "prob": 10 },
+          { "item": "bronze_medal", "prob": 6 },
+          { "item": "silver_medal", "prob": 4 },
+          { "item": "gold_medal", "prob": 2 },
+          { "item": "small_relic", "prob": 10 },
+          { "item": "holy_symbol", "prob": 10 },
+          { "item": "holy_symbol_wood", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "faux_fur_cat_ears", "prob": 80, "count": [ 1, 2 ] },
-              { "item": "leather_cat_ears", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "fur_cat_ears", "prob": 10, "count": [ 1, 2 ] },
-              { "item": "faux_fur_cat_tail", "prob": 80, "count": [ 1, 2 ] },
-              { "item": "leather_cat_tail", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "fur_cat_tail", "prob": 10, "count": [ 1, 2 ] },
-              { "item": "faux_fur_collar", "prob": 80, "count": [ 1, 2 ] },
-              { "item": "leather_collar", "prob": 50, "count": [ 1, 2 ] },
-              { "item": "fur_collar", "prob": 10, "count": [ 1, 2 ] }
-            ],
-            "prob": 10
-          }
-        ]
+          { "item": "faux_fur_cat_ears", "prob": 80 },
+          { "item": "leather_cat_ears", "prob": 50 },
+          { "item": "fur_cat_ears", "prob": 10 },
+          { "item": "faux_fur_cat_tail", "prob": 80 },
+          { "item": "leather_cat_tail", "prob": 50 },
+          { "item": "fur_cat_tail", "prob": 10 },
+          { "item": "faux_fur_collar", "prob": 80 },
+          { "item": "leather_collar", "prob": 50 },
+          { "item": "fur_collar", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "bootstrap", "prob": 20 },
-              { "item": "bootsheath", "prob": 50 },
-              { "item": "sheath", "prob": 80 },
-              { "item": "back_holster", "prob": 10 },
-              { "item": "holster", "prob": 30 },
-              { "item": "sholster", "prob": 10 },
-              { "item": "bholster", "prob": 10 }
-            ],
-            "prob": 10
-          }
-        ]
+          { "item": "bootstrap", "prob": 20 },
+          { "item": "bootsheath", "prob": 50 },
+          { "item": "sheath", "prob": 80 },
+          { "item": "back_holster", "prob": 10 },
+          { "item": "holster", "prob": 30 },
+          { "item": "sholster", "prob": 10 },
+          { "item": "bholster", "prob": 10 }
+        ],
+        "prob": 15
       },
       {
         "distribution": [
-          {
-            "collection": [
-              { "item": "elbow_pads", "prob": 50 },
-              { "item": "knee_pads", "prob": 50 },
-              { "item": "iggaak", "prob": 5 },
-              { "item": "goggles_swim", "prob": 10 },
-              { "item": "glasses_bal", "prob": 10 },
-              { "item": "eclipse_glasses", "prob": 5 },
-              { "item": "goggles_ski", "prob": 10 }
-            ],
-            "prob": 10
-          }
-        ]
+          { "item": "elbow_pads", "prob": 50 },
+          { "item": "knee_pads", "prob": 50 },
+          { "item": "iggaak", "prob": 5 },
+          { "item": "goggles_swim", "prob": 10 },
+          { "item": "glasses_bal", "prob": 10 },
+          { "item": "eclipse_glasses", "prob": 5 },
+          { "item": "goggles_ski", "prob": 10 }
+        ],
+        "prob": 15
       },
       { "item": "folding_poncho", "prob": 10 },
       { "item": "american_flag", "prob": 2 },
diff --git a/data/json/itemgroups/food.json b/data/json/itemgroups/food.json
index 263b970e5b2a4..ccdc7338bf93c 100644
--- a/data/json/itemgroups/food.json
+++ b/data/json/itemgroups/food.json
@@ -53,7 +53,7 @@
     "type": "item_group",
     "items": [
       [ "birdfood", 10 ],
-      { "item": "dogfood", "prob": 45, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 45, "container-item": "can_medium" },
       { "item": "catfood", "prob": 45, "container-item": "can_food" }
     ]
   },
@@ -145,8 +145,88 @@
       [ "strawberries", 2 ],
       [ "raspberries", 7 ],
       [ "blackberries", 7 ],
+      [ "cholla_bud", 3 ],
       [ "garlic", 3 ],
       [ "pine_nuts", 2 ]
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "softdrinks_canned",
+    "items": [
+      [ "cola", 60 ],
+      [ "colamdew", 55 ],
+      [ "creamsoda", 50 ],
+      [ "lemonlime", 50 ],
+      [ "orangesoda", 45 ],
+      [ "rootbeer", 40 ],
+      [ "crispycran", 35 ],
+      [ "purple_drink", 35 ],
+      [ "choc_drink", 25 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "candy_chocolate",
+    "items": [
+      [ "chocolate", 70 ],
+      [ "candy", 70 ],
+      [ "candy2", 70 ],
+      [ "candy3", 70 ],
+      [ "maltballs", 60 ],
+      [ "mintpatties", 60 ],
+      [ "neccowafers", 55 ],
+      [ "powder_candy", 50 ],
+      [ "candycigarette", 15 ],
+      [ "maple_candy", 10 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "salty_snacks",
+    "items": [
+      [ "chips", 65 ],
+      [ "chips2", 65 ],
+      [ "chips3", 65 ],
+      [ "pretzels", 55 ],
+      [ "jerky", 55 ],
+      [ "porkstick", 55 ],
+      [ "nachos", 50 ],
+      [ "chocpretzels", 40 ],
+      [ "popcorn", 25 ],
+      [ "popcorn2", 35 ],
+      [ "popcorn3", 35 ],
+      [ "cracklins", 25 ],
+      [ "fried_seeds", 25 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "MRE",
+    "items": [
+      [ "mre_chilibeans_box", 45 ],
+      [ "mre_bbqbeef_box", 45 ],
+      [ "mre_chickennoodle_box", 45 ],
+      [ "mre_spaghetti_box", 45 ],
+      [ "mre_chicken_box", 45 ],
+      [ "mre_beeftaco_box", 45 ],
+      [ "mre_beef_box", 45 ],
+      [ "mre_meatball_box", 45 ],
+      [ "mre_beefstew_box", 45 ],
+      [ "mre_chilimac_box", 45 ],
+      [ "mre_veggy_box", 45 ],
+      [ "mre_macaronimarinara_box", 45 ],
+      [ "mre_cheesetort_box", 45 ],
+      [ "mre_mushroomfettuccine_box", 45 ],
+      [ "mre_mexicanchickenstew_box", 45 ],
+      [ "mre_maplesausage_box", 45 ],
+      [ "mre_ravioli_box", 45 ],
+      [ "mre_hashbrownbacon_box", 45 ],
+      [ "mre_lemontuna_box", 45 ],
+      [ "mre_asianbeef_box", 45 ],
+      [ "mre_chickenpesto_box", 45 ],
+      [ "mre_southwestbeef_box", 45 ],
+      [ "mre_hotdog_box", 45 ]
+    ]
   }
 ]
diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
index c4d363d7b0f28..63f2bcc83720c 100644
--- a/data/json/itemgroups/food_service.json
+++ b/data/json/itemgroups/food_service.json
@@ -130,8 +130,7 @@
       [ "oj", 40 ],
       [ "juice", 35 ],
       [ "cranberry_juice", 35 ],
-      [ "cola", 50 ],
-      [ "lemonlime", 45 ],
+      { "group": "softdrinks_canned", "prob": 95 },
       [ "V8", 15 ],
       [ "fries", 7 ],
       [ "cheese_fries", 5 ],
@@ -247,18 +246,7 @@
   {
     "id": "pizza_soda",
     "type": "item_group",
-    "items": [
-      [ "purple_drink", 3 ],
-      [ "crispycran", 7 ],
-      [ "rootbeer", 15 ],
-      [ "colamdew", 9 ],
-      [ "orangesoda", 10 ],
-      [ "lemonlime", 9 ],
-      [ "creamsoda", 9 ],
-      [ "cola", 9 ],
-      [ "energy_drink", 5 ],
-      [ "lemonade", 8 ]
-    ]
+    "items": [ { "group": "softdrinks_canned", "prob": 70 }, [ "energy_drink", 5 ], [ "lemonade", 8 ] ]
   },
   {
     "id": "pizza_table",
@@ -460,13 +448,7 @@
       [ "cheeseburger", 15 ],
       [ "hamburger", 15 ],
       [ "fish_sandwich", 10 ],
-      [ "cola", 15 ],
-      [ "lemonlime", 10 ],
-      [ "orangesoda", 10 ],
-      [ "crispycran", 10 ],
-      [ "rootbeer", 13 ],
-      [ "colamdew", 10 ],
-      [ "lemonade", 7 ]
+      { "group": "softdrinks_canned", "prob": 75 }
     ]
   },
   {
@@ -621,15 +603,8 @@
       [ "sports_drink", 40 ],
       [ "energy_drink", 40 ],
       [ "energy_drink_atomic", 5 ],
-      [ "cola", 35 ],
-      [ "creamsoda", 30 ],
-      [ "lemonlime", 40 ],
-      [ "orangesoda", 30 ],
-      [ "colamdew", 40 ],
-      [ "rootbeer", 30 ],
+      { "group": "softdrinks_canned", "prob": 290 },
       [ "spezi", 10 ],
-      [ "crispycran", 35 ],
-      [ "purple_drink", 50 ],
       { "item": "cola", "prob": 30, "container-item": "bottle_plastic" },
       { "item": "creamsoda", "prob": 20, "container-item": "bottle_plastic" },
       { "item": "lemonlime", "prob": 20, "container-item": "bottle_plastic" },
diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
index 2f09b9b4403b0..bdae410d28366 100644
--- a/data/json/itemgroups/item_groups.json
+++ b/data/json/itemgroups/item_groups.json
@@ -3,27 +3,14 @@
     "type": "item_group",
     "id": "child_items",
     "items": [
-      [ "chocolate", 50 ],
-      [ "candy", 60 ],
-      [ "candy2", 60 ],
-      [ "candy3", 60 ],
-      [ "maple_candy", 10 ],
+      { "group": "candy_chocolate", "prob": 360 },
       [ "toastem", 10 ],
       [ "toastem2", 10 ],
       [ "toastem3", 12 ],
-      [ "powder_candy", 40 ],
-      [ "neccowafers", 50 ],
-      [ "maltballs", 50 ],
       [ "cookies", 80 ],
       [ "crack", 8 ],
       [ "bat", 60 ],
-      [ "purple_drink", 12 ],
-      [ "cola", 6 ],
-      [ "creamsoda", 6 ],
-      [ "lemonlime", 6 ],
-      [ "orangesoda", 5 ],
-      [ "crispycran", 12 ],
-      [ "colamdew", 8 ],
+      { "group": "softdrinks_canned", "prob": 55 },
       { "item": "cola", "prob": 6, "container-item": "bottle_plastic" },
       { "item": "creamsoda", "prob": 6, "container-item": "bottle_plastic" },
       { "item": "lemonlime", "prob": 6, "container-item": "bottle_plastic" },
@@ -55,7 +42,6 @@
       [ "novel_pulp", 16 ],
       [ "fairy_tales", 20 ],
       [ "mag_comic", 20 ],
-      [ "candycigarette", 10 ],
       [ "radio_car_box", 1 ],
       [ "basketball", 8 ],
       [ "radiocontrol", 5 ],
@@ -203,20 +189,12 @@
     "ammo": 50,
     "magazine": 100,
     "items": [
-      [ "rootbeer", 65 ],
+      { "group": "softdrinks_canned", "prob": 325 },
       [ "mag_computer", 35 ],
-      [ "purple_drink", 35 ],
-      [ "creamsoda", 35 ],
       [ "basket_laundry", 20 ],
-      [ "lemonlime", 35 ],
-      [ "orangesoda", 20 ],
-      [ "crispycran", 20 ],
-      [ "colamdew", 35 ],
       [ "television", 30 ],
       [ "clock", 10 ],
       [ "fp_loyalty_card", 5 ],
-      [ "cola", 70 ],
-      [ "choc_drink", 10 ],
       { "item": "cola", "prob": 20, "container-item": "bottle_plastic" },
       { "item": "rootbeer", "prob": 20, "container-item": "bottle_plastic" },
       { "item": "lemonlime", "prob": 10, "container-item": "bottle_plastic" },
@@ -381,29 +359,12 @@
       [ "atomic_lamp", 1 ],
       [ "dog_whistle", 5 ],
       [ "pet_carrier", 2 ],
-      { "item": "dogfood", "prob": 10, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 10, "container-item": "can_medium" },
       { "item": "catfood", "prob": 10, "container-item": "can_food" },
       [ "nic_gum", 2 ],
       [ "oxygen_tank", 2 ],
       [ "smoxygen_tank", 1 ],
-      [ "holybook_bible1", 4 ],
-      [ "holybook_bible2", 3 ],
-      [ "holybook_quran", 3 ],
-      [ "holybook_hadith", 3 ],
-      [ "holybook_talmud", 2 ],
-      [ "holybook_tanakh", 2 ],
-      [ "holybook_vedas", 3 ],
-      [ "holybook_upanishads", 3 ],
-      [ "holybook_tripitaka", 3 ],
-      [ "holybook_sutras", 3 ],
-      [ "holybook_granth", 2 ],
-      [ "holybook_mormon", 1 ],
-      [ "holybook_kojiki", 1 ],
-      [ "holybook_havamal", 1 ],
-      [ "holybook_pastafarian", 1 ],
-      [ "holybook_slack", 1 ],
-      [ "holybook_kallisti", 1 ],
-      [ "holybook_scientology", 1 ],
+      { "group": "religious_books", "prob": 38 },
       [ "leathersandals", 25 ],
       [ "phonebook", 5 ],
       [ "survnote", 1 ],
@@ -426,9 +387,8 @@
     "ammo": 75,
     "magazine": 100,
     "items": [
+      { "group": "snacks", "prob": 370 },
       [ "aluminum_foil", 25 ],
-      [ "chips", 65 ],
-      [ "fried_seeds", 15 ],
       [ "rolling_pin", 25 ],
       [ "cereal", 50 ],
       [ "cereal2", 60 ],
@@ -439,7 +399,6 @@
       [ "clock", 10 ],
       [ "hat_chef", 2 ],
       [ "jacket_chef", 2 ],
-      [ "kernels", 35 ],
       [ "pot", 25 ],
       [ "sponge", 30 ],
       [ "pot_copper", 15 ],
@@ -481,9 +440,7 @@
       [ "wine_noir", 2 ],
       [ "wine_marsala", 2 ],
       [ "wine_vermouth", 9 ],
-      [ "syrup", 20 ],
       [ "sweet_sausage", 2 ],
-      [ "coffee_syrup", 10 ],
       [ "roasted_coffee_bean", 10 ],
       [ "bacon", 25 ],
       { "item": "bleach", "prob": 20, "charges-min": 1 },
@@ -494,7 +451,6 @@
       [ "milk_powder", 15 ],
       [ "cornmeal", 40 ],
       [ "powder_eggs", 20 ],
-      [ "granola", 5 ],
       {
         "item": "protein_powder",
         "prob": 12,
@@ -509,7 +465,6 @@
       [ "fchicken", 25 ],
       [ "lunchmeat", 10 ],
       [ "bologna", 10 ],
-      [ "nachos", 50 ],
       [ "nachosc", 10 ],
       [ "nachosm", 10 ],
       [ "nachosmc", 2 ],
@@ -521,14 +476,11 @@
       [ "brownie", 30 ],
       [ "cooking_oil", 20 ],
       [ "cooking_oil2", 20 ],
-      [ "fruit_leather", 15 ],
       [ "sugar", 40 ],
       [ "lemonade_powder", 15 ],
       [ "salt", 40 ],
       [ "pepper", 30 ],
       [ "cinnamon", 15 ],
-      [ "tea_raw", 10 ],
-      [ "coffee_raw", 15 ],
       [ "funnel", 50 ],
       [ "vac_sealer", 10 ],
       [ "seasoning_italian", 25 ],
@@ -536,8 +488,6 @@
       [ "cookbook_italian", 25 ],
       [ "family_cookbook", 6 ],
       [ "brewing_cookbook", 4 ],
-      [ "chips2", 65 ],
-      [ "chips3", 65 ],
       [ "pizza_veggy", 8 ],
       [ "pizza_meat", 8 ],
       [ "pizza_cheese", 8 ],
@@ -627,7 +577,7 @@
       [ "coffeemaker", 10 ],
       [ "atomic_coffeepot", 2 ],
       [ "dog_whistle", 5 ],
-      { "item": "dogfood", "prob": 20, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 20, "container-item": "can_medium" },
       { "item": "catfood", "prob": 20, "container-item": "can_food" },
       [ "salted_fish", 15 ],
       [ "charcoal", 5 ],
@@ -671,15 +621,7 @@
       [ "cranberry_juice", 50 ],
       [ "sports_drink", 30 ],
       [ "lemonade", 50 ],
-      [ "cola", 70 ],
-      [ "choc_drink", 30 ],
-      [ "rootbeer", 65 ],
-      [ "purple_drink", 35 ],
-      [ "creamsoda", 35 ],
-      [ "lemonlime", 35 ],
-      [ "orangesoda", 20 ],
-      [ "crispycran", 20 ],
-      [ "colamdew", 35 ],
+      { "group": "softdrinks_canned", "prob": 345 },
       { "item": "cola", "prob": 15, "container-item": "bottle_twoliter" },
       { "item": "creamsoda", "prob": 15, "container-item": "bottle_twoliter" },
       { "item": "lemonlime", "prob": 15, "container-item": "bottle_twoliter" },
@@ -996,13 +938,7 @@
       [ "firecracker", 5 ],
       [ "fried_seeds", 30 ],
       [ "chips", 65 ],
-      [ "cola", 70 ],
-      [ "lemonlime", 70 ],
-      [ "orangesoda", 60 ],
-      [ "crispycran", 30 ],
-      [ "creamsoda", 70 ],
-      [ "colamdew", 70 ],
-      [ "choc_drink", 10 ],
+      { "group": "softdrinks_canned", "prob": 380 },
       [ "picklocks", 10 ],
       [ "wolfsuit", 4 ],
       [ "dinosuit", 4 ],
@@ -1054,24 +990,7 @@
       [ "alarmclock", 30 ],
       [ "maid_dress", 3 ],
       [ "maid_hat", 3 ],
-      [ "holybook_bible1", 4 ],
-      [ "holybook_bible2", 3 ],
-      [ "holybook_quran", 3 ],
-      [ "holybook_hadith", 3 ],
-      [ "holybook_talmud", 2 ],
-      [ "holybook_tanakh", 2 ],
-      [ "holybook_vedas", 3 ],
-      [ "holybook_upanishads", 3 ],
-      [ "holybook_tripitaka", 3 ],
-      [ "holybook_sutras", 3 ],
-      [ "holybook_granth", 2 ],
-      [ "holybook_mormon", 1 ],
-      [ "holybook_kojiki", 1 ],
-      [ "holybook_havamal", 1 ],
-      [ "holybook_pastafarian", 1 ],
-      [ "holybook_slack", 1 ],
-      [ "holybook_kallisti", 1 ],
-      [ "holybook_scientology", 1 ],
+      { "group": "religious_books", "prob": 38 },
       [ "mouthpiece", 1 ],
       [ "leathersandals", 25 ],
       [ "survnote", 2 ],
@@ -1111,34 +1030,15 @@
     "type": "item_group",
     "id": "vending_food_items",
     "items": [
-      [ "chips", 65 ],
-      [ "fried_seeds", 25 ],
-      [ "pretzels", 55 ],
-      [ "chocpretzels", 40 ],
-      [ "chocolate", 50 ],
-      [ "jerky", 55 ],
-      [ "cracklins", 25 ],
-      [ "porkstick", 55 ],
-      [ "candy", 80 ],
-      [ "candy2", 80 ],
-      [ "candy3", 80 ],
-      [ "maple_candy", 5 ],
-      [ "powder_candy", 60 ],
-      [ "neccowafers", 80 ],
-      [ "maltballs", 80 ],
-      [ "mintpatties", 80 ],
+      { "group": "candy_chocolate", "prob": 615 },
+      { "group": "salty_snacks", "prob": 485 },
       [ "peanut_unshelled", 60 ],
       [ "almond_unshelled", 60 ],
       [ "cashews", 60 ],
       [ "pistachio_unshelled", 60 ],
       [ "cookies", 80 ],
       [ "choco_coffee_beans", 10 ],
-      [ "nachos", 50 ],
-      [ "chips3", 65 ],
-      [ "fruit_leather", 25 ],
-      [ "popcorn", 25 ],
-      [ "popcorn2", 25 ],
-      [ "candycigarette", 20 ]
+      [ "fruit_leather", 25 ]
     ]
   },
   {
@@ -1155,8 +1055,7 @@
       [ "lemonade", 50 ],
       [ "energy_drink", 55 ],
       [ "energy_drink_atomic", 4 ],
-      [ "crispycran", 40 ],
-      [ "choc_drink", 30 ],
+      { "group": "softdrinks_canned", "prob": 70 },
       { "item": "cola", "prob": 70, "container-item": "bottle_plastic" },
       { "item": "rootbeer", "prob": 20, "container-item": "bottle_plastic" },
       { "item": "creamsoda", "prob": 60, "container-item": "bottle_plastic" },
@@ -1173,42 +1072,21 @@
     "type": "item_group",
     "id": "snacks",
     "items": [
-      [ "chips", 65 ],
-      [ "fried_seeds", 25 ],
-      [ "pretzels", 55 ],
-      [ "chocpretzels", 40 ],
-      [ "chocolate", 50 ],
-      [ "jerky", 55 ],
-      [ "cracklins", 25 ],
+      { "group": "candy_chocolate", "prob": 620 },
+      { "group": "salty_snacks", "prob": 595 },
       [ "pemmican", 5 ],
       [ "granola", 10 ],
-      [ "porkstick", 55 ],
-      [ "candy", 80 ],
-      [ "candy2", 80 ],
-      [ "candy3", 80 ],
-      [ "maple_candy", 10 ],
-      [ "powder_candy", 60 ],
-      [ "neccowafers", 80 ],
-      [ "maltballs", 80 ],
-      [ "mintpatties", 80 ],
       [ "cookies", 80 ],
       [ "tea_raw", 10 ],
       [ "coffee_raw", 15 ],
       [ "choco_coffee_beans", 10 ],
-      [ "nachos", 50 ],
-      [ "chips2", 65 ],
-      [ "chips3", 65 ],
       [ "salt", 10 ],
       [ "pepper", 10 ],
       [ "syrup", 10 ],
       [ "coffee_syrup", 10 ],
-      [ "popcorn", 25 ],
-      [ "popcorn2", 35 ],
-      [ "popcorn3", 35 ],
       [ "fruit_leather", 25 ],
       [ "kernels", 25 ],
-      [ "pine_nuts", 5 ],
-      [ "candycigarette", 20 ]
+      [ "pine_nuts", 5 ]
     ]
   },
   {
@@ -1243,15 +1121,7 @@
       [ "energy_drink", 55 ],
       [ "herbal_tea", 30 ],
       [ "energy_drink_atomic", 4 ],
-      [ "cola", 70 ],
-      [ "creamsoda", 60 ],
-      [ "lemonlime", 60 ],
-      [ "orangesoda", 40 ],
-      [ "crispycran", 30 ],
-      [ "colamdew", 60 ],
-      [ "choc_drink", 30 ],
-      [ "rootbeer", 65 ],
-      [ "purple_drink", 45 ],
+      { "group": "softdrinks_canned", "prob": 460 },
       [ "milk", 50 ],
       [ "yoghurt", 40 ],
       [ "pudding", 50 ],
@@ -1309,16 +1179,9 @@
     "type": "item_group",
     "id": "fast_food",
     "items": [
+      { "group": "candy_chocolate", "prob": 480 },
+      { "group": "softdrinks_canned", "prob": 480 },
       [ "water_clean", 90 ],
-      [ "cola", 70 ],
-      [ "choc_drink", 30 ],
-      [ "rootbeer", 65 ],
-      [ "creamsoda", 60 ],
-      [ "lemonlime", 60 ],
-      [ "orangesoda", 60 ],
-      [ "crispycran", 30 ],
-      [ "colamdew", 60 ],
-      [ "purple_drink", 45 ],
       [ "sandwich_t", 30 ],
       [ "sandwich_pb", 30 ],
       [ "sandwich_pbj", 30 ],
@@ -1333,14 +1196,6 @@
       [ "pie_maple", 10 ],
       [ "chips", 65 ],
       [ "fried_seeds", 25 ],
-      [ "candy", 80 ],
-      [ "candy2", 80 ],
-      [ "candy3", 80 ],
-      [ "maple_candy", 2 ],
-      [ "powder_candy", 60 ],
-      [ "mintpatties", 60 ],
-      [ "maltballs", 60 ],
-      [ "neccowafers", 60 ],
       [ "cookies", 60 ],
       [ "mayonnaise", 60 ],
       [ "spork", 10 ],
@@ -1380,17 +1235,12 @@
     "type": "item_group",
     "id": "coffee_shop",
     "items": [
+      { "group": "candy_chocolate", "prob": 530 },
+      { "group": "softdrinks_canned", "prob": 470 },
+      { "group": "snacks", "prob": 560 },
+      [ "coffee_raw", 70 ],
       [ "water_clean", 90 ],
       [ "water_mineral", 10 ],
-      [ "cola", 70 ],
-      [ "choc_drink", 40 ],
-      [ "rootbeer", 65 ],
-      [ "creamsoda", 60 ],
-      [ "lemonlime", 60 ],
-      [ "orangesoda", 40 ],
-      [ "crispycran", 40 ],
-      [ "colamdew", 60 ],
-      [ "purple_drink", 35 ],
       [ "almond_milk", 30 ],
       [ "soy_milk", 30 ],
       [ "juice", 20 ],
@@ -1411,41 +1261,16 @@
       [ "hotdogs_cooked", 35 ],
       [ "corndogs_frozen", 30 ],
       [ "blt", 40 ],
-      [ "pretzels", 55 ],
-      [ "chocpretzels", 50 ],
-      [ "chocolate", 50 ],
-      [ "jerky", 55 ],
-      [ "cracklins", 25 ],
       [ "salted_fish", 15 ],
-      [ "porkstick", 55 ],
-      [ "candy", 80 ],
-      [ "powder_candy", 60 ],
-      [ "mintpatties", 80 ],
-      [ "maltballs", 80 ],
-      [ "tea_raw", 10 ],
       [ "pie", 20 ],
       [ "pie_meat", 20 ],
       [ "pie_veggy", 20 ],
       [ "pie_maple", 10 ],
-      [ "fried_seeds", 15 ],
-      [ "chips", 65 ],
-      [ "chips2", 50 ],
-      [ "chips3", 45 ],
-      [ "candy", 80 ],
-      [ "candy2", 80 ],
-      [ "candy3", 80 ],
-      [ "maple_candy", 20 ],
-      [ "cookies", 80 ],
-      [ "pepper", 10 ],
       [ "cinnamon", 15 ],
-      [ "coffee_raw", 85 ],
-      [ "choco_coffee_beans", 10 ],
       [ "coffee_bean", 20 ],
       [ "roasted_coffee_bean", 50 ],
       [ "restaurantmap", 5 ],
       [ "touristmap", 2 ],
-      [ "salt", 10 ],
-      [ "pine_nuts", 10 ],
       [ "brioche", 50 ]
     ]
   },
@@ -1765,7 +1590,7 @@
       [ "jar_sauerkraut_pickled", 5 ],
       [ "sports_drink", 10 ],
       [ "protein_shake", 10 ],
-      { "item": "dogfood", "prob": 5, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 5, "container-item": "can_medium" },
       { "item": "catfood", "prob": 5, "container-item": "can_food" },
       { "item": "fish_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" },
       [ "lutefisk", 1 ],
@@ -1794,7 +1619,7 @@
       { "item": "can_beans", "prob": 4, "charges": 12, "container-item": "can_food_big" },
       { "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "can_food_big" },
       { "item": "can_pineapple", "prob": 4, "charges": 12, "container-item": "can_food_big" },
-      { "item": "can_corn", "prob": 4, "charges": 4, "container-item": "can_food_big" },
+      { "item": "can_corn", "prob": 4, "charges": 6, "container-item": "can_food_big" },
       { "item": "sauce_red", "prob": 3, "charges": 96, "container-item": "can_food_big" }
     ]
   },
@@ -2985,25 +2810,7 @@
       [ "antiparasitic", 3 ],
       [ "diazepam", 3 ],
       [ "recipe_augs", 3 ],
-      [ "holybook_bible1", 4 ],
-      [ "holybook_bible2", 3 ],
-      [ "holybook_bible3", 6 ],
-      [ "holybook_quran", 3 ],
-      [ "holybook_hadith", 3 ],
-      [ "holybook_talmud", 2 ],
-      [ "holybook_tanakh", 2 ],
-      [ "holybook_vedas", 3 ],
-      [ "holybook_upanishads", 3 ],
-      [ "holybook_tripitaka", 3 ],
-      [ "holybook_sutras", 3 ],
-      [ "holybook_granth", 2 ],
-      [ "holybook_mormon", 1 ],
-      [ "holybook_kojiki", 1 ],
-      [ "holybook_havamal", 1 ],
-      [ "holybook_pastafarian", 1 ],
-      [ "holybook_slack", 1 ],
-      [ "holybook_kallisti", 1 ],
-      [ "holybook_scientology", 1 ],
+      { "group": "religious_books", "prob": 54 },
       [ "recipe_medicalmut", 1 ],
       [ "survnote", 1 ],
       [ "badge_doctor", 1 ],
@@ -3055,12 +2862,7 @@
     "ammo": 75,
     "magazine": 100,
     "items": [
-      [ "cola", 70 ],
-      [ "creamsoda", 60 ],
-      [ "lemonlime", 60 ],
-      [ "orangesoda", 60 ],
-      [ "crispycran", 40 ],
-      [ "colamdew", 60 ],
+      { "group": "softdrinks_canned", "prob": 370 },
       [ "file", 90 ],
       [ "mag_barter", 35 ],
       [ "mag_computer", 35 ],
@@ -3073,7 +2875,6 @@
       [ "mag_unarmed", 10 ],
       [ "decoy_anarch", 8 ],
       [ "recipe_augs", 8 ],
-      [ "choc_drink", 20 ],
       [ "aspirin", 85 ],
       [ "junk_burrito", 25 ],
       [ "cigar", 5 ],
@@ -3128,13 +2929,7 @@
     "type": "item_group",
     "id": "cubical_office",
     "items": [
-      [ "cola", 70 ],
-      [ "choc_drink", 30 ],
-      [ "creamsoda", 60 ],
-      [ "lemonlime", 60 ],
-      [ "orangesoda", 60 ],
-      [ "crispycran", 40 ],
-      [ "colamdew", 60 ],
+      { "group": "softdrinks_canned", "prob": 560 },
       [ "file", 90 ],
       [ "mag_barter", 15 ],
       [ "mag_computer", 35 ],
@@ -3188,8 +2983,6 @@
       [ "bubblewrap", 50 ],
       [ "coffee_raw", 15 ],
       [ "usb_drive", 5 ],
-      [ "rootbeer", 65 ],
-      [ "purple_drink", 55 ],
       [ "cig", 80 ],
       [ "tobacco", 10 ],
       [ "chaw", 20 ],
@@ -3226,26 +3019,10 @@
     "type": "item_group",
     "id": "office_breakroom",
     "items": [
-      [ "cola", 100 ],
-      [ "choc_drink", 100 ],
-      [ "creamsoda", 100 ],
-      [ "lemonlime", 100 ],
-      [ "orangesoda", 100 ],
-      [ "crispycran", 100 ],
-      [ "colamdew", 100 ],
-      [ "rootbeer", 100 ],
-      [ "purple_drink", 100 ],
-      [ "maltballs", 60 ],
-      [ "chocolate", 100 ],
+      { "group": "softdrinks_canned", "prob": 900 },
+      { "group": "candy_chocolate", "prob": 625 },
       [ "cookies", 60 ],
       [ "brownie", 60 ],
-      [ "candy", 100 ],
-      [ "candy2", 100 ],
-      [ "candy3", 100 ],
-      [ "maple_candy", 5 ],
-      [ "powder_candy", 60 ],
-      [ "neccowafers", 60 ],
-      [ "mintpatties", 60 ],
       [ "aspirin", 40 ],
       [ "ecig", 20 ],
       [ "chaw", 20 ],
@@ -3286,6 +3063,7 @@
     "id": "school",
     "type": "item_group",
     "items": [
+      { "group": "candy_chocolate", "prob": 292 },
       [ "glasses_reading", 90 ],
       [ "purse", 40 ],
       [ "mbag", 20 ],
@@ -3357,15 +3135,7 @@
       [ "novel_horror", 18 ],
       [ "novel_tragedy", 8 ],
       [ "ZSG", 2 ],
-      [ "chocolate", 50 ],
       [ "cookies", 50 ],
-      [ "candy", 60 ],
-      [ "candy2", 60 ],
-      [ "candy3", 60 ],
-      [ "maple_candy", 2 ],
-      [ "powder_candy", 40 ],
-      [ "neccowafers", 60 ],
-      [ "mintpatties", 60 ],
       [ "backpack", 38 ],
       [ "backpack_leather", 18 ],
       [ "slingpack", 18 ],
@@ -3417,24 +3187,7 @@
       [ "poetry_book", 6 ],
       [ "philosophy_book", 2 ],
       [ "survivormap", 1 ],
-      [ "holybook_bible1", 4 ],
-      [ "holybook_bible2", 3 ],
-      [ "holybook_quran", 3 ],
-      [ "holybook_hadith", 3 ],
-      [ "holybook_talmud", 2 ],
-      [ "holybook_tanakh", 2 ],
-      [ "holybook_vedas", 3 ],
-      [ "holybook_upanishads", 3 ],
-      [ "holybook_tripitaka", 3 ],
-      [ "holybook_sutras", 3 ],
-      [ "holybook_granth", 2 ],
-      [ "holybook_mormon", 1 ],
-      [ "holybook_kojiki", 1 ],
-      [ "holybook_havamal", 1 ],
-      [ "holybook_pastafarian", 1 ],
-      [ "holybook_slack", 1 ],
-      [ "holybook_kallisti", 1 ],
-      [ "holybook_scientology", 1 ],
+      { "group": "religious_books", "prob": 38 },
       [ "folding_poncho", 1 ],
       [ "pocketwatch", 10 ],
       [ "knitting_needles", 10 ],
@@ -4953,10 +4706,9 @@
       [ "firecracker", 1 ],
       [ "fried_seeds", 10 ],
       [ "chips", 65 ],
-      [ "cola", 70 ],
+      { "group": "softdrinks_canned", "prob": 90 },
       [ "choco_coffee_beans", 20 ],
       [ "caffeine", 20 ],
-      [ "choc_drink", 20 ],
       [ "cola_meth", 1 ],
       [ "picklocks", 10 ],
       [ "wolfsuit", 4 ],
@@ -4984,24 +4736,7 @@
       [ "flask_hip", 5 ],
       [ "corset", 15 ],
       [ "tieclip", 3 ],
-      [ "holybook_bible1", 1 ],
-      [ "holybook_bible2", 1 ],
-      [ "holybook_quran", 1 ],
-      [ "holybook_hadith", 1 ],
-      [ "holybook_talmud", 1 ],
-      [ "holybook_tanakh", 1 ],
-      [ "holybook_vedas", 1 ],
-      [ "holybook_upanishads", 1 ],
-      [ "holybook_tripitaka", 1 ],
-      [ "holybook_sutras", 1 ],
-      [ "holybook_granth", 1 ],
-      [ "holybook_mormon", 1 ],
-      [ "holybook_kojiki", 1 ],
-      [ "holybook_havamal", 1 ],
-      [ "holybook_pastafarian", 1 ],
-      [ "holybook_slack", 1 ],
-      [ "holybook_kallisti", 1 ],
-      [ "holybook_scientology", 1 ],
+      { "group": "religious_books", "prob": 18 },
       [ "collarpin", 3 ],
       [ "survnote", 1 ],
       [ "magnifying_glass", 2 ],
@@ -5226,41 +4961,9 @@
     "type": "item_group",
     "id": "mil_food",
     "items": [
-      [ "chocolate", 50 ],
-      [ "neccowafers", 30 ],
-      [ "can_beans", 40 ],
-      [ "pork_beans", 40 ],
-      [ "mre_chilibeans_box", 45 ],
-      [ "mre_bbqbeef_box", 45 ],
-      [ "mre_chickennoodle_box", 45 ],
-      [ "mre_spaghetti_box", 45 ],
-      [ "mre_chicken_box", 45 ],
-      [ "mre_beeftaco_box", 45 ],
-      [ "mre_beef_box", 45 ],
-      [ "mre_meatball_box", 45 ],
-      [ "mre_beefstew_box", 45 ],
-      [ "mre_chilimac_box", 45 ],
-      [ "mre_veggy_box", 45 ],
-      [ "mre_macaronimarinara_box", 45 ],
-      [ "mre_cheesetort_box", 45 ],
-      [ "mre_mushroomfettuccine_box", 45 ],
-      [ "mre_mexicanchickenstew_box", 45 ],
-      [ "mre_maplesausage_box", 45 ],
-      [ "mre_ravioli_box", 45 ],
-      [ "mre_hashbrownbacon_box", 45 ],
-      [ "mre_lemontuna_box", 45 ],
-      [ "mre_asianbeef_box", 45 ],
-      [ "mre_chickenpesto_box", 45 ],
-      [ "mre_southwestbeef_box", 45 ],
-      [ "mre_hotdog_box", 45 ],
-      [ "1st_aid", 35 ],
-      [ "saline", 15 ],
-      [ "con_milk", 5 ],
-      [ "milk_UHT", 35 ],
-      [ "cereal", 35 ],
+      { "group": "mil_food_nodrugs", "prob": 1410 },
       [ "codeine", 15 ],
       [ "antibiotics", 25 ],
-      [ "water_clean", 90 ],
       [ "purifier", 12 ],
       [ "heatpack", 60 ],
       [ "pur_tablets", 20 ],
@@ -5281,32 +4984,11 @@
     "type": "item_group",
     "id": "mil_food_nodrugs",
     "items": [
+      { "group": "MRE", "prob": 1035 },
       [ "chocolate", 50 ],
+      [ "neccowafers", 30 ],
       [ "can_beans", 40 ],
       [ "pork_beans", 40 ],
-      [ "mre_chilibeans_box", 45 ],
-      [ "mre_bbqbeef_box", 45 ],
-      [ "mre_chickennoodle_box", 45 ],
-      [ "mre_spaghetti_box", 45 ],
-      [ "mre_chicken_box", 45 ],
-      [ "mre_beeftaco_box", 45 ],
-      [ "mre_beef_box", 45 ],
-      [ "mre_meatball_box", 45 ],
-      [ "mre_beefstew_box", 45 ],
-      [ "mre_chilimac_box", 45 ],
-      [ "mre_veggy_box", 45 ],
-      [ "mre_macaronimarinara_box", 45 ],
-      [ "mre_cheesetort_box", 45 ],
-      [ "mre_mushroomfettuccine_box", 45 ],
-      [ "mre_mexicanchickenstew_box", 45 ],
-      [ "mre_maplesausage_box", 45 ],
-      [ "mre_ravioli_box", 45 ],
-      [ "mre_hashbrownbacon_box", 45 ],
-      [ "mre_lemontuna_box", 45 ],
-      [ "mre_asianbeef_box", 45 ],
-      [ "mre_chickenpesto_box", 45 ],
-      [ "mre_southwestbeef_box", 45 ],
-      [ "mre_hotdog_box", 45 ],
       [ "1st_aid", 35 ],
       [ "saline", 10 ],
       [ "con_milk", 10 ],
@@ -5625,12 +5307,7 @@
     "type": "item_group",
     "id": "radio",
     "items": [
-      [ "cola", 70 ],
-      [ "choc_drink", 20 ],
-      [ "creamsoda", 60 ],
-      [ "lemonlime", 40 ],
-      [ "orangesoda", 40 ],
-      [ "colamdew", 60 ],
+      { "group": "softdrinks_canned", "prob": 290 },
       [ "caffeine", 25 ],
       [ "maltballs", 30 ],
       [ "cig", 90 ],
@@ -6252,6 +5929,8 @@
     "type": "item_group",
     "id": "military",
     "items": [
+      { "group": "mil_food", "prob": 1251 },
+      { "group": "mil_armor", "prob": 575 },
       [ "m107a1", 1 ],
       [ "bipod", 1 ],
       [ "50bmg", 3 ],
@@ -6263,38 +5942,10 @@
       [ "water_clean", 90 ],
       [ "knuckle_brass", 15 ],
       [ "battery_ups", 10 ],
-      [ "duffelbag", 15 ],
-      [ "mre_chilibeans_box", 45 ],
-      [ "mre_bbqbeef_box", 45 ],
-      [ "mre_chickennoodle_box", 45 ],
-      [ "mre_spaghetti_box", 45 ],
-      [ "mre_chicken_box", 45 ],
-      [ "mre_beeftaco_box", 45 ],
-      [ "mre_beef_box", 45 ],
-      [ "mre_meatball_box", 45 ],
-      [ "mre_beefstew_box", 45 ],
-      [ "mre_chilimac_box", 45 ],
-      [ "mre_veggy_box", 45 ],
-      [ "mre_macaronimarinara_box", 45 ],
-      [ "mre_cheesetort_box", 45 ],
-      [ "mre_mushroomfettuccine_box", 45 ],
-      [ "mre_mexicanchickenstew_box", 45 ],
-      [ "mre_maplesausage_box", 45 ],
-      [ "mre_ravioli_box", 45 ],
-      [ "mre_hashbrownbacon_box", 45 ],
-      [ "mre_lemontuna_box", 45 ],
-      [ "mre_asianbeef_box", 45 ],
-      [ "mre_chickenpesto_box", 45 ],
-      [ "mre_southwestbeef_box", 45 ],
-      [ "mre_hotdog_box", 45 ],
       [ "bandages", 50 ],
       [ "cotton_ball", 20 ],
-      [ "1st_aid", 35 ],
-      [ "saline", 15 ],
       [ "iodine", 5 ],
       [ "prussian_blue", 5 ],
-      [ "neccowafers", 5 ],
-      [ "codeine", 15 ],
       [ "adrenaline_injector", 4 ],
       [ "cig", 90 ],
       [ "ecig", 10 ],
@@ -6305,42 +5956,9 @@
       [ "kukri", 2 ],
       [ "throwing_knife", 7 ],
       [ "boots_steel", 50 ],
-      [ "boots_combat", 50 ],
-      [ "pants_army", 30 ],
-      [ "jacket_army", 30 ],
-      [ "winter_pants_army", 10 ],
-      [ "winter_jacket_army", 10 ],
-      [ "winter_gloves_army", 10 ],
-      [ "army_top", 30 ],
-      [ "kevlar", 10 ],
-      [ "modularvest", 15 ],
-      [ "modularvestkevlar", 18 ],
-      [ "modularvestceramic", 24 ],
-      [ "modularveststeel", 18 ],
-      [ "modularvestsuper", 8 ],
-      [ "modularvesthard", 2 ],
-      [ "vest", 15 ],
       [ "gloves_fingerless", 20 ],
-      [ "gloves_tactical", 30 ],
-      [ "glasses_bal", 40 ],
-      [ "mask_gas", 10 ],
       [ "glasses_safety", 40 ],
-      [ "goggles_nv", 1 ],
-      [ "goggles_ir", 1 ],
       [ "hat_boonie", 10 ],
-      [ "armguard_hard", 20 ],
-      [ "legguard_hard", 15 ],
-      [ "helmet_army", 40 ],
-      [ "kevlar", 10 ],
-      [ "modularvest", 15 ],
-      [ "modularvestkevlar", 18 ],
-      [ "modularvestceramic", 24 ],
-      [ "modularveststeel", 18 ],
-      [ "modularvestsuper", 8 ],
-      [ "modularvesthard", 2 ],
-      [ "dump_pouch", 20 ],
-      [ "helmet_liner", 10 ],
-      [ "backpack", 38 ],
       [ "holster", 15 ],
       [ "sholster", 10 ],
       [ "bandolier_shotgun", 12 ],
@@ -6411,8 +6029,6 @@
       [ "EMPbomb", 2 ],
       [ "gasbomb", 3 ],
       [ "smokebomb", 5 ],
-      [ "UPS_off", 5 ],
-      [ "adv_UPS_off", 3 ],
       [ "tazer", 3 ],
       [ "c4", 5 ],
       [ "hk_g80", 2 ],
@@ -6423,18 +6039,11 @@
       [ "masterkey", 2 ],
       [ "rm121aux", 1 ],
       [ "shot_flechette", 5 ],
-      [ "tacvest", 10 ],
-      [ "molle_pack", 8 ],
-      [ "legrig", 10 ],
-      [ "power_armor_basic", 5 ],
-      [ "power_armor_helmet_basic", 6 ],
-      [ "power_armor_frame", 4 ],
       [ "canteen", 15 ],
       [ "2lcanteen", 10 ],
       [ "camelbak", 5 ],
       [ "jerrycan", 10 ],
       [ "rucksack", 20 ],
-      [ "heatpack", 60 ],
       [ "LAW_Packed", 30 ],
       [ "m3_carlgustav", 1 ],
       [ "84x246mm_he", 3 ],
@@ -6465,7 +6074,6 @@
       [ "nic_gum", 1 ],
       [ "improve_sights", 10 ],
       [ "waterproof_gunmod", 4 ],
-      [ "pur_tablets", 10 ],
       [ "cleansuit", 5 ],
       [ "needlegun", 4 ],
       [ "needlepistol", 6 ],
@@ -6474,19 +6082,9 @@
       [ "hazmat_suit", 5 ],
       [ "e_tool", 20 ],
       [ "knife_trench", 14 ],
-      [ "fungicide", 3 ],
-      [ "insecticide", 3 ],
       [ "flaregun", 20 ],
       [ "signal_flare", 25 ],
       [ "militarymap", 4 ],
-      [ "quikclot", 20 ],
-      [ "bfipowder", 20 ],
-      [ "rx12_injector", 5 ],
-      [ "ampoule", 10 ],
-      [ "rx11_stimpack", 5 ],
-      [ "stimpack_ammo", 10 ],
-      [ "optical_cloak", 1 ],
-      [ "holo_cloak", 1 ],
       [ "halligan", 10 ],
       [ "fire_ax", 5 ],
       [ "antiparasitic", 2 ],
@@ -6504,7 +6102,6 @@
       [ "bot_manhack", 1 ],
       [ "bot_grenade_hack", 1 ],
       [ "l-stick", 1 ],
-      [ "solarpack", 2 ],
       [ "chem_hexamine", 5 ],
       [ "esbit_stove", 8 ],
       [ "mess_tin", 4 ],
@@ -6651,22 +6248,14 @@
     "items": [
       [ "water_clean", 90 ],
       [ "water_mineral", 5 ],
-      [ "cola", 70 ],
-      [ "creamsoda", 60 ],
-      [ "lemonlime", 60 ],
-      [ "orangesoda", 60 ],
-      [ "crispycran", 40 ],
-      [ "colamdew", 60 ],
-      [ "choc_drink", 30 ],
+      { "group": "softdrinks_canned", "prob": 380 },
+      { "group": "salty_snacks", "prob": 135 },
       { "item": "cola", "prob": 25, "container-item": "bottle_glass" },
       { "item": "creamsoda", "prob": 25, "container-item": "bottle_glass" },
       { "item": "lemonlime", "prob": 25, "container-item": "bottle_glass" },
       { "item": "orangesoda", "prob": 25, "container-item": "bottle_glass" },
       { "item": "colamdew", "prob": 25, "container-item": "bottle_glass" },
-      [ "jerky", 55 ],
-      [ "cracklins", 25 ],
       [ "salted_fish", 35 ],
-      [ "porkstick", 55 ],
       [ "ravioli", 25 ],
       [ "cheese_hard", 15 ],
       [ "can_beans", 40 ],
@@ -6738,9 +6327,7 @@
       [ "whiskey", 16 ],
       [ "bum_wine", 10 ],
       [ "chem_ethanol", 12 ],
-      [ "jerky", 55 ],
-      [ "cracklins", 25 ],
-      [ "porkstick", 55 ],
+      { "group": "salty_snacks", "prob": 135 },
       [ "bandages", 50 ],
       [ "cotton_ball", 50 ],
       [ "caffeine", 25 ],
@@ -7192,6 +6779,8 @@
     "ammo": 75,
     "magazine": 100,
     "items": [
+      { "group": "candy_chocolate", "prob": 320 },
+      { "group": "softdrinks_canned", "prob": 244 },
       [ "bbgun", 30 ],
       [ "bb", 30 ],
       [ "portable_game", 60 ],
@@ -7200,26 +6789,11 @@
       [ "manual_dodge_kid", 5 ],
       [ "inflatable_boat", 10 ],
       [ "hand_pump", 15 ],
-      [ "chocolate", 30 ],
-      [ "candy", 45 ],
-      [ "candy2", 45 ],
-      [ "candy3", 45 ],
-      [ "maple_candy", 5 ],
       [ "toastem", 45 ],
       [ "toastem2", 45 ],
       [ "toastem3", 45 ],
-      [ "powder_candy", 45 ],
-      [ "neccowafers", 45 ],
-      [ "maltballs", 45 ],
       [ "cookies", 45 ],
       [ "bat", 15 ],
-      [ "purple_drink", 42 ],
-      [ "cola", 32 ],
-      [ "creamsoda", 42 ],
-      [ "lemonlime", 32 ],
-      [ "orangesoda", 32 ],
-      [ "crispycran", 32 ],
-      [ "colamdew", 32 ],
       [ "backpack", 20 ],
       [ "hairpin", 10 ],
       [ "fc_hairpin", 4 ],
@@ -7234,7 +6808,6 @@
       [ "novel_pulp", 30 ],
       [ "fairy_tales", 30 ],
       [ "mag_comic", 30 ],
-      [ "candycigarette", 45 ],
       [ "folding_bicycle", 3 ],
       [ "sunglasses", 25 ],
       [ "cowboy_hat", 25 ],
@@ -8023,8 +7596,7 @@
       [ "water_clean", 50 ],
       [ "granola", 60 ],
       [ "fruit_leather", 50 ],
-      [ "jerky", 70 ],
-      [ "porkstick", 60 ],
+      { "group": "salty_snacks", "prob": 130 },
       [ "aspirin", 80 ],
       [ "inhaler", 30 ],
       [ "vodka", 60 ],
@@ -8139,14 +7711,9 @@
     "type": "item_group",
     "id": "coffee_display",
     "items": [
+      { "group": "salty_snacks", "prob": 121 },
       [ "sandwich_t", 22 ],
-      [ "jerky", 17 ],
-      [ "porkstick", 18 ],
       [ "tea_raw", 50 ],
-      [ "fried_seeds", 5 ],
-      [ "chips", 28 ],
-      [ "chips2", 27 ],
-      [ "chips3", 26 ],
       [ "cookies", 25 ],
       [ "brownie", 25 ],
       [ "coffee_raw", 90 ],
@@ -8163,11 +7730,8 @@
     "items": [
       [ "water_clean", 30 ],
       [ "water_mineral", 15 ],
-      [ "cola", 30 ],
-      [ "choc_drink", 30 ],
+      { "group": "softdrinks_canned", "prob": 121 },
       [ "milk_UHT", 10 ],
-      [ "rootbeer", 33 ],
-      [ "creamsoda", 28 ],
       [ "juice", 31 ],
       [ "pie", 40 ],
       [ "pie_meat", 28 ],
@@ -8240,8 +7804,7 @@
       [ "textbook_chemistry", 15 ],
       [ "child_book", 15 ],
       [ "manual_dodge_kid", 5 ],
-      [ "holybook_bible1", 5 ],
-      [ "holybook_quran", 5 ],
+      { "group": "religious_books", "prob": 10 },
       [ "novel_thriller", 15 ],
       [ "novel_sports", 15 ],
       [ "novel_war", 15 ],
@@ -8284,7 +7847,8 @@
       { "item": "two_way_radio", "prob": 30, "charges-min": 0, "charges-max": 15 },
       [ "transponder", 25 ],
       [ "receiver", 25 ],
-      [ "small_lcd_screen", 20 ],
+      [ "small_lcd_screen", 10 ],
+      [ "large_lcd_screen", 10 ],
       [ "mobile_memory_card", 35 ],
       [ "mobile_memory_card_used", 35 ],
       [ "mobile_memory_card_encrypted", 35 ],
@@ -8436,6 +8000,8 @@
     "items": [
       [ "can_food", 65 ],
       [ "can_food_unsealed", 65 ],
+      [ "can_medium", 65 ],
+      [ "can_medium_unsealed", 65 ],
       { "item": "scrap", "prob": 50, "charges-min": 1, "charges-max": 3 },
       { "item": "steel_chunk", "prob": 50, "charges-min": 1, "charges-max": 2 },
       { "item": "steel_lump", "prob": 50, "charges-min": 1, "charges-max": 2 },
@@ -8584,12 +8150,10 @@
     "id": "dollar_food",
     "type": "item_group",
     "items": [
-      [ "fruit_leather", 20 ],
-      [ "chips", 30 ],
-      [ "pretzels", 30 ],
+      { "group": "candy_chocolate", "prob": 45 },
+      { "group": "salty_snacks", "prob": 80 },
       [ "peanut_unshelled", 20 ],
       [ "almond_unshelled", 20 ],
-      [ "chocolate", 20 ],
       [ "cereal", 25 ],
       [ "cereal3", 25 ],
       [ "soup_tomato", 25 ],
@@ -8604,9 +8168,8 @@
       [ "dry_rice", 20 ],
       [ "dry_beans", 20 ],
       [ "dry_lentils", 50 ],
-      [ "bread", 40 ],
       [ "cookies", 25 ],
-      [ "candy", 20 ]
+      [ "bread", 40 ]
     ]
   },
   {
@@ -8656,10 +8219,7 @@
       [ "touristmap", 3 ],
       [ "trailmap", 3 ],
       [ "phonebook", 60 ],
-      [ "holybook_bible1", 1 ],
-      [ "holybook_bible2", 1 ],
-      [ "holybook_quran", 1 ],
-      [ "holybook_scientology", 1 ]
+      { "group": "religious_books", "prob": 4 }
     ]
   },
   {
diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json
index e8c9b1d061e5e..aeb4644d8ad45 100644
--- a/data/json/itemgroups/locations.json
+++ b/data/json/itemgroups/locations.json
@@ -212,7 +212,7 @@
     "id": "petstore_misc",
     "type": "item_group",
     "items": [
-      { "item": "dogfood", "prob": 35, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 35, "container-item": "can_medium" },
       { "item": "catfood", "prob": 35, "container-item": "can_food" },
       [ "birdfood", 15 ],
       [ "dog_whistle", 15 ],
@@ -223,7 +223,7 @@
     "id": "petstore_shelves",
     "type": "item_group",
     "items": [
-      { "item": "dogfood", "prob": 30, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 30, "container-item": "can_medium" },
       { "item": "catfood", "prob": 30, "container-item": "can_food" },
       [ "birdfood", 15 ],
       [ "can_tuna", 15 ],
@@ -322,8 +322,7 @@
       [ "oj", 40 ],
       [ "juice", 35 ],
       [ "cranberry_juice", 35 ],
-      [ "cola", 50 ],
-      [ "lemonlime", 45 ],
+      { "group": "softdrinks_canned", "prob": 95 },
       [ "V8", 15 ],
       [ "gum", 15 ]
     ]
@@ -337,8 +336,7 @@
       [ "oj", 40 ],
       [ "juice", 35 ],
       [ "cranberry_juice", 35 ],
-      [ "cola", 50 ],
-      [ "lemonlime", 45 ],
+      { "group": "softdrinks_canned", "prob": 95 },
       [ "V8", 15 ],
       [ "fries", 7 ],
       [ "cheese_fries", 5 ],
@@ -685,13 +683,11 @@
     "id": "ic_merch_vending",
     "//": "for cs_internet_cafe",
     "items": [
+      { "group": "salty_snacks", "prob": 300 },
       [ "water_clean", 100 ],
       [ "water_mineral", 100 ],
       [ "coffee", 100 ],
-      [ "atomic_coffee", 100 ],
-      [ "chips", 100 ],
-      [ "chips2", 100 ],
-      [ "chips3", 100 ]
+      [ "atomic_coffee", 100 ]
     ]
   },
   {
@@ -852,7 +848,7 @@
       [ "dog_whistle", 10 ],
       [ "pet_carrier", 30 ],
       [ "petpack", 3 ],
-      { "item": "dogfood", "prob": 30, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 30, "container-item": "can_medium" },
       { "item": "catfood", "prob": 30, "container-item": "can_food" },
       [ "birdfood", 10 ],
       [ "towel", 20 ],
@@ -1072,6 +1068,8 @@
     "//": "for ws_regional_dump",
     "items": [
       { "group": "ammo_pocket_batteries", "prob": 30 },
+      { "group": "candy_chocolate", "prob": 570 },
+      { "group": "snacks", "prob": 820 },
       [ "radio", 10 ],
       [ "eyedrops", 10 ],
       [ "rag", 30 ],
@@ -1081,43 +1079,7 @@
       [ "cell_phone", 10 ],
       [ "file", 40 ],
       [ "mag_mechanics", 20 ],
-      [ "manual_mechanics", 10 ],
-      [ "chips", 65 ],
-      [ "fried_seeds", 25 ],
-      [ "pretzels", 55 ],
-      [ "chocpretzels", 40 ],
-      [ "chocolate", 50 ],
-      [ "jerky", 55 ],
-      [ "cracklins", 25 ],
-      [ "pemmican", 5 ],
-      [ "granola", 10 ],
-      [ "porkstick", 55 ],
-      [ "candy", 80 ],
-      [ "candy2", 80 ],
-      [ "candy3", 80 ],
-      [ "maple_candy", 10 ],
-      [ "powder_candy", 60 ],
-      [ "neccowafers", 80 ],
-      [ "maltballs", 80 ],
-      [ "mintpatties", 80 ],
-      [ "cookies", 80 ],
-      [ "tea_raw", 10 ],
-      [ "coffee_raw", 15 ],
-      [ "choco_coffee_beans", 10 ],
-      [ "nachos", 50 ],
-      [ "chips2", 65 ],
-      [ "chips3", 65 ],
-      [ "salt", 10 ],
-      [ "pepper", 10 ],
-      [ "syrup", 10 ],
-      [ "coffee_syrup", 10 ],
-      [ "popcorn", 25 ],
-      [ "popcorn2", 35 ],
-      [ "popcorn3", 35 ],
-      [ "fruit_leather", 25 ],
-      [ "kernels", 25 ],
-      [ "pine_nuts", 5 ],
-      [ "candycigarette", 20 ]
+      [ "manual_mechanics", 10 ]
     ]
   },
   {
@@ -1369,7 +1331,8 @@
       [ "e_scrap", 95 ],
       [ "antenna", 50 ],
       [ "circuit", 35 ],
-      [ "small_lcd_screen", 20 ],
+      [ "small_lcd_screen", 10 ],
+      [ "large_lcd_screen", 10 ],
       [ "RAM", 35 ],
       [ "processor", 10 ],
       [ "amplifier", 7 ],
@@ -1462,6 +1425,27 @@
       [ "fishing_hook_bone", 100 ]
     ]
   },
+  {
+    "id": "hotel_coffee_bar",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "coffeemaker", "prob": 60, "charges": [ 0, 200 ] },
+      { "group": "coffee_display", "prob": 60, "count": [ 1, 3 ] }
+    ]
+  },
+  {
+    "id": "hotel_luggage",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "group": "bags_trip", "prob": 25 }, { "group": "dresser", "prob": 25, "count": [ 1, 4 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "book_hotel_tower_bible",
+    "subtype": "collection",
+    "items": [ { "item": "holybook_bible3", "prob": 100 } ]
+  },
   {
     "id": "laundromat_bleach",
     "type": "item_group",
diff --git a/data/json/itemgroups/mall_item_groups.json b/data/json/itemgroups/mall_item_groups.json
index d9f14c31b8f36..934f64c980d13 100644
--- a/data/json/itemgroups/mall_item_groups.json
+++ b/data/json/itemgroups/mall_item_groups.json
@@ -29,18 +29,7 @@
   {
     "id": "candy_shop",
     "type": "item_group",
-    "items": [
-      [ "chocolate", 50 ],
-      [ "cookies", 50 ],
-      [ "candy", 60 ],
-      [ "candy2", 60 ],
-      [ "candy3", 60 ],
-      [ "maple_candy", 25 ],
-      [ "powder_candy", 40 ],
-      [ "neccowafers", 60 ],
-      [ "candycigarette", 45 ],
-      [ "mintpatties", 60 ]
-    ]
+    "items": [ { "group": "candy_chocolate", "prob": 460 }, [ "cookies", 50 ] ]
   },
   {
     "id": "tux_shop",
diff --git a/data/json/itemgroups/mansion.json b/data/json/itemgroups/mansion.json
index f77dffd401b87..353f90610d01a 100644
--- a/data/json/itemgroups/mansion.json
+++ b/data/json/itemgroups/mansion.json
@@ -57,37 +57,97 @@
     "subtype": "collection",
     "entries": [
       { "group": "everyday_gear", "prob": 40 },
-      { "group": "shoes", "prob": 30, "damage": [ 0, 4 ] },
-      { "group": "shirts", "prob": 60, "damage": [ 0, 4 ] },
-      { "group": "jackets", "prob": 20, "damage": [ 0, 4 ] },
-      { "group": "common_gloves", "prob": 20, "damage": [ 0, 4 ] },
-      { "group": "hatstore_hats", "prob": 20, "damage": [ 0, 4 ] },
-      { "group": "hatstore_accessories", "prob": 20, "damage": [ 0, 4 ] },
-      { "group": "clothing_glasses", "prob": 20, "damage": [ 0, 4 ] },
-      { "group": "jewelry_accessories", "prob": 15 },
-      {
-        "distribution": [
-          { "item": "wristwatch", "prob": 15 },
-          { "item": "pocketwatch", "prob": 5 },
-          { "item": "gold_watch", "prob": 5, "damage": [ 1, 4 ] },
-          { "item": "diving_watch", "prob": 10, "damage": [ 1, 4 ] },
-          { "item": "sf_watch", "prob": 5, "damage": [ 1, 4 ] }
-        ],
-        "prob": 20
-      },
+      { "group": "coats_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "common_gloves", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "hatstore_hats", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "scarfs_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "accesories_personal_unisex", "prob": 15 },
       {
         "distribution": [
           {
             "collection": [
-              { "group": "male_underwear", "prob": 90, "damage": [ 0, 4 ] },
-              { "group": "pants_male", "prob": 60, "damage": [ 0, 4 ] },
+              {
+                "distribution": [
+                  { "group": "male_underwear", "prob": 90, "damage": [ 1, 4 ] },
+                  { "item": "union_suit", "prob": 10, "damage": [ 1, 4 ] }
+                ]
+              },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_male", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      { "item": "leather_belt", "prob": 30, "damage": [ 1, 4 ] }
+                    ]
+                  },
+                  { "item": "suit", "prob": 5, "damage": [ 1, 4 ] },
+                  { "item": "tux", "prob": 5, "damage": [ 1, 4 ] },
+                  { "item": "thawb", "prob": 10, "damage": [ 1, 4 ] },
+                  { "item": "cassock", "prob": 10, "damage": [ 1, 4 ] },
+                  { "item": "haori", "prob": 10, "damage": [ 1, 4 ] }
+                ]
+              },
+              { "group": "neckties", "prob": 15, "damage": [ 1, 4 ] },
+              { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+              { "group": "socks_unisex", "damage": [ 1, 4 ], "prob": 50 },
+              { "group": "accesories_personal_mens", "prob": 15, "damage": [ 1, 4 ] },
               { "group": "corpse_male" }
             ]
           },
           {
             "collection": [
-              { "group": "female_underwear", "prob": 90, "damage": [ 0, 4 ] },
-              { "group": "pants_female", "prob": 60, "damage": [ 0, 4 ] },
+              { "group": "female_underwear", "prob": 90, "damage": [ 1, 4 ] },
+              { "group": "accesories_personal_womens", "prob": 15, "damage": [ 1, 4 ] },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_female", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [
+                          {
+                            "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                          },
+                          { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] }
+                        ]
+                      }
+                    ],
+                    "prob": 70
+                  },
+                  {
+                    "collection": [
+                      {
+                        "distribution": [
+                          { "item": "gown", "prob": 10, "damage": [ 1, 4 ] },
+                          { "item": "dress", "prob": 70, "damage": [ 1, 4 ] },
+                          { "item": "sundress", "prob": 50, "damage": [ 1, 4 ] }
+                        ]
+                      },
+                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                      },
+                      { "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
+                    ],
+                    "prob": 20
+                  },
+                  {
+                    "collection": [
+                      { "item": "dress_wedding", "damage": [ 1, 4 ] },
+                      { "item": "veil_wedding", "damage": [ 1, 4 ] },
+                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                      },
+                      { "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
+                    ],
+                    "prob": 10
+                  }
+                ]
+              },
               { "group": "corpse_female" }
             ]
           },
@@ -95,6 +155,9 @@
             "collection": [
               { "group": "underwear", "prob": 90, "damage": [ 0, 4 ] },
               { "group": "pants", "prob": 60, "damage": [ 0, 4 ] },
+              { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+              { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+              { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] },
               { "group": "corpse_child" }
             ]
           }
diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
index 28d5bb11df3b1..85b7836910917 100644
--- a/data/json/items/ammo.json
+++ b/data/json/items/ammo.json
@@ -258,6 +258,28 @@
     "container": "metal_tank_little",
     "count": 10
   },
+  {
+    "type": "AMMO",
+    "id": "rock",
+    "symbol": "*",
+    "color": "light_gray",
+    "name": "rock",
+    "description": "A rock the size of a baseball.  Makes a decent melee weapon, and is also good for throwing at enemies.",
+    "category": "spare_parts",
+    "material": "stone",
+    "ammo_type": "rock",
+    "flags": "TRADER_AVOID",
+    "weight": "657 g",
+    "volume": "250 ml",
+    "bashing": 7,
+    "damage": 7,
+    "range": 10,
+    "dispersion": 14,
+    "loudness": 0,
+    "to_hit": -2,
+    "effects": [ "NEVER_MISFIRES", "NON-FOULING", "RECOVER_80" ],
+    "qualities": [ [ "HAMMER", 1 ] ]
+  },
   {
     "type": "AMMO",
     "id": "pebble",
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
index ddd9cc673fb6b..5cc3e23802b12 100644
--- a/data/json/items/ammo_types.json
+++ b/data/json/items/ammo_types.json
@@ -59,6 +59,12 @@
     "name": "pebbles",
     "default": "pebble"
   },
+  {
+    "type": "ammunition_type",
+    "id": "rock",
+    "name": "rocks",
+    "default": "rock"
+  },
   {
     "type": "ammunition_type",
     "id": "shotcanister",
diff --git a/data/json/items/armor.json b/data/json/items/armor.json
index 06fdf6eb4a9cc..2890a91446e57 100644
--- a/data/json/items/armor.json
+++ b/data/json/items/armor.json
@@ -260,6 +260,7 @@
     "encumbrance": 10,
     "warmth": 25,
     "material_thickness": 4,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "STURDY", "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY" ]
   },
   {
@@ -397,6 +398,7 @@
     "storage": "1 L",
     "warmth": 20,
     "material_thickness": 5,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "STURDY" ]
   },
   {
@@ -497,6 +499,7 @@
     "storage": "2 L",
     "warmth": 25,
     "material_thickness": 4,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "STURDY" ]
   },
   {
@@ -2609,6 +2612,7 @@
     "warmth": 30,
     "material_thickness": 3,
     "environmental_protection": 1,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "OUTER", "WATERPROOF", "RAINPROOF" ]
   },
   {
@@ -3221,6 +3225,7 @@
     "warmth": 15,
     "material_thickness": 3,
     "environmental_protection": 1,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS" ]
   },
   {
@@ -3540,6 +3545,7 @@
     "encumbrance": 10,
     "warmth": 25,
     "material_thickness": 1,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "WATERPROOF" ]
   },
   {
@@ -5238,6 +5244,7 @@
     "storage": "3500 ml",
     "warmth": 20,
     "material_thickness": 2,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "OUTER" ]
   },
   {
@@ -5346,6 +5353,7 @@
     "warmth": 30,
     "material_thickness": 3,
     "environmental_protection": 1,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "OUTER" ]
   },
   {
@@ -5390,6 +5398,7 @@
     "warmth": 30,
     "material_thickness": 3,
     "environmental_protection": 1,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "OUTER", "FANCY" ]
   },
   {
@@ -6364,7 +6373,7 @@
     "material": [ "lycra" ],
     "symbol": "[",
     "color": "dark_gray",
-    "covers": [ "LEGS" ],
+    "covers": [ "TORSO" ],
     "coverage": 55,
     "warmth": 5,
     "material_thickness": 1,
@@ -6410,7 +6419,7 @@
       },
       {
         "id": "fedora",
-        "text": "A t-shirt with the Fedora logo on it, underneath it says \"Freedom. Friends. Features. First.\""
+        "text": "A t-shirt with the Fedora logo on it, underneath it says \"Freedom.  Friends.  Features.  First.\""
       },
       {
         "id": "redhat",
@@ -7205,6 +7214,7 @@
     "storage": "500 ml",
     "warmth": 25,
     "material_thickness": 2,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE" ]
   },
   {
@@ -8046,6 +8056,7 @@
     "warmth": 30,
     "material_thickness": 3,
     "environmental_protection": 1,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "OUTER", "WATERPROOF", "RAINPROOF" ]
   },
   {
@@ -8150,6 +8161,7 @@
     "warmth": 30,
     "material_thickness": 3,
     "environmental_protection": 1,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "OUTER" ]
   },
   {
@@ -8890,9 +8902,9 @@
     "warmth": 15,
     "material_thickness": 2,
     "snippet_category": [
-      { "id": "blue", "text": "A pair of blue work pants." },
-      { "id": "gray", "text": "A pair of gray work pants." },
-      { "id": "lightblue", "text": "A pair of light-blue work pants." }
+      { "id": "technician_pants_blue", "text": "A pair of blue work pants." },
+      { "id": "technician_pants_gray", "text": "A pair of gray work pants." },
+      { "id": "technician_pants_lightblue", "text": "A pair of light-blue work pants." }
     ],
     "flags": [ "VARSIZE", "POCKETS" ]
   },
@@ -8915,9 +8927,9 @@
     "warmth": 8,
     "material_thickness": 1,
     "snippet_category": [
-      { "id": "blue", "text": "A blue work t-shirt with a small front pocket." },
-      { "id": "gray", "text": "A gray work t-shirt with a small front pocket." },
-      { "id": "lightblue", "text": "A light-blue work t-shirt with a small front pocket." }
+      { "id": "technician_shirt_blue", "text": "A blue work t-shirt with a small front pocket." },
+      { "id": "technician_shirt_gray", "text": "A gray work t-shirt with a small front pocket." },
+      { "id": "technician_shirt_lightblue", "text": "A light-blue work t-shirt with a small front pocket." }
     ],
     "flags": [ "VARSIZE" ]
   },
@@ -9167,6 +9179,7 @@
     "warmth": 30,
     "material_thickness": 3,
     "environmental_protection": 1,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "OUTER" ]
   },
   {
@@ -9557,6 +9570,7 @@
     "warmth": 20,
     "material_thickness": 3,
     "environmental_protection": 1,
+    "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "OUTER" ]
   },
   {
diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
index 21504d34db9c4..f2f81f5026b52 100644
--- a/data/json/items/armor/ammo_pouch.json
+++ b/data/json/items/armor/ammo_pouch.json
@@ -10,6 +10,7 @@
     "price_postapoc": 5000,
     "material": "cotton",
     "symbol": "[",
+    "looks_like": "pouch",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 20,
@@ -38,6 +39,7 @@
     "rigid": false,
     "material": "cotton",
     "symbol": "[",
+    "looks_like": "pouch",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 15,
@@ -65,6 +67,7 @@
     "rigid": false,
     "material": "cotton",
     "symbol": "[",
+    "looks_like": "tool_belt",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 15,
@@ -87,6 +90,7 @@
     "description": "This light vest is meant to carry your gear and ammunition comfortably distributed about your torso.  They are popular amongst law enforcement, but less so than combination tactical vests incorporating kevlar.  Lightweight and easy to don, this vest can hold four magazines close at hand in its many pouches.",
     "weight": "600 g",
     "volume": "1250 ml",
+    "looks_like": "vest",
     "price": 7400,
     "price_postapoc": 12000,
     "rigid": false,
@@ -122,6 +126,7 @@
     "price_postapoc": 4500,
     "material": "cotton",
     "symbol": "[",
+    "looks_like": "pouch",
     "color": "dark_gray",
     "covers": [ "FOOT_EITHER" ],
     "coverage": 5,
@@ -150,6 +155,7 @@
     "rigid": false,
     "material": "cotton",
     "symbol": "[",
+    "looks_like": "ammo_satchel",
     "color": "dark_gray",
     "covers": [ "LEG_EITHER" ],
     "coverage": 15,
@@ -180,6 +186,7 @@
     "bashing": 6,
     "material": [ "kevlar" ],
     "symbol": "[",
+    "looks_like": "modularvestkevlar",
     "color": "light_gray",
     "covers": [ "TORSO" ],
     "coverage": 85,
@@ -214,6 +221,7 @@
     "bashing": 6,
     "material": [ "kevlar", "ceramic" ],
     "symbol": "[",
+    "looks_like": "modularvestkevlar",
     "color": "light_gray",
     "covers": [ "TORSO" ],
     "coverage": 85,
@@ -248,6 +256,7 @@
     "bashing": 6,
     "material": [ "kevlar", "hardsteel" ],
     "symbol": "[",
+    "looks_like": "modularvestkevlar",
     "color": "light_cyan",
     "covers": [ "TORSO" ],
     "coverage": 85,
@@ -282,6 +291,7 @@
     "bashing": 6,
     "material": [ "kevlar", "kevlar_rigid" ],
     "symbol": "[",
+    "looks_like": "vest",
     "color": "light_gray",
     "covers": [ "TORSO" ],
     "coverage": 85,
@@ -316,6 +326,7 @@
     "bashing": 8,
     "material": [ "kevlar", "steel" ],
     "symbol": "[",
+    "looks_like": "modularvestkevlar",
     "color": "light_cyan",
     "covers": [ "TORSO" ],
     "coverage": 85,
@@ -350,6 +361,7 @@
     "bashing": 8,
     "material": [ "kevlar", "superalloy" ],
     "symbol": "[",
+    "looks_like": "modularvestkevlar",
     "color": "light_cyan",
     "covers": [ "TORSO" ],
     "coverage": 85,
diff --git a/data/json/items/armor/backpacks.json b/data/json/items/armor/backpacks.json
index bcddbaeb325a1..a3b12162595d9 100644
--- a/data/json/items/armor/backpacks.json
+++ b/data/json/items/armor/backpacks.json
@@ -11,6 +11,7 @@
     "rigid": false,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "pouch",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 30,
@@ -33,6 +34,7 @@
     "rigid": false,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "brown",
     "covers": [ "TORSO" ],
     "coverage": 50,
@@ -65,6 +67,7 @@
     "rigid": false,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "green",
     "covers": [ "TORSO", "LEGS" ],
     "coverage": 75,
@@ -87,6 +90,7 @@
     "rigid": false,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "brown",
     "covers": [ "TORSO" ],
     "coverage": 30,
@@ -109,6 +113,7 @@
     "rigid": false,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 50,
@@ -131,6 +136,7 @@
     "rigid": false,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "rucksack",
     "color": "black",
     "covers": [ "TORSO" ],
     "coverage": 50,
@@ -153,6 +159,7 @@
     "rigid": false,
     "material": [ "plastic" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "yellow",
     "covers": [ "TORSO" ],
     "coverage": 40,
@@ -174,6 +181,7 @@
     "rigid": false,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "rucksack",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 50,
@@ -195,6 +203,7 @@
     "price_postapoc": 7900,
     "material": [ "cotton", "plastic" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "blue",
     "covers": [ "TORSO" ],
     "coverage": 40,
@@ -218,6 +227,7 @@
     "to_hit": -1,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 40,
@@ -239,6 +249,7 @@
     "rigid": false,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "pouch",
     "color": "light_gray",
     "covers": [ "TORSO" ],
     "coverage": 30,
@@ -262,6 +273,7 @@
     "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "pouch",
     "color": "light_gray",
     "covers": [ "TORSO" ],
     "coverage": 40,
@@ -287,6 +299,7 @@
     "bashing": 1,
     "material": [ "cotton", "plastic" ],
     "symbol": "[",
+    "looks_like": "purse",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 30,
@@ -308,6 +321,7 @@
     "rigid": false,
     "material": [ "cotton", "kevlar" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 35,
@@ -332,6 +346,7 @@
     "bashing": 2,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "pouch",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 10,
@@ -353,6 +368,7 @@
     "rigid": false,
     "material": [ "cotton", "plastic" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 40,
@@ -377,6 +393,7 @@
     "bashing": 1,
     "material": [ "cotton", "plastic" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 20,
@@ -401,6 +418,7 @@
     "bashing": 1,
     "material": [ "cotton", "plastic" ],
     "symbol": "[",
+    "looks_like": "purse",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 30,
@@ -423,6 +441,7 @@
     "rigid": false,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
+    "looks_like": "rucksack",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 40,
@@ -444,6 +463,7 @@
     "rigid": false,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "brown",
     "covers": [ "TORSO" ],
     "coverage": 30,
@@ -465,6 +485,7 @@
     "rigid": false,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
+    "looks_like": "rucksack",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 40,
@@ -486,6 +507,7 @@
     "rigid": false,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "brown",
     "covers": [ "TORSO" ],
     "coverage": 30,
@@ -507,6 +529,7 @@
     "rigid": false,
     "material": [ "cotton", "plastic" ],
     "symbol": "[",
+    "looks_like": "quiver_large",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 35,
@@ -537,6 +560,7 @@
     "rigid": false,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "backpack",
     "color": "yellow",
     "covers": [ "TORSO" ],
     "coverage": 40,
diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json
index 8fa00fcedc2ae..0bce8b165f478 100644
--- a/data/json/items/armor/bandolier.json
+++ b/data/json/items/armor/bandolier.json
@@ -10,6 +10,7 @@
     "price_postapoc": 2900,
     "material": "leather",
     "symbol": "[",
+    "looks_like": "belt",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 10,
@@ -18,7 +19,27 @@
     "use_action": {
       "type": "bandolier",
       "capacity": 18,
-      "ammo": [ "32", "762x25", "38", "357mag", "38super", "40", "10mm", "44", "45", "45colt", "9x18", "9mm", "454", "500" ],
+      "ammo": [
+        "32",
+        "762x25",
+        "38",
+        "357mag",
+        "357sig",
+        "380",
+        "38super",
+        "40",
+        "10mm",
+        "44",
+        "45",
+        "45colt",
+        "46",
+        "57",
+        "9x18",
+        "9mm",
+        "454",
+        "460",
+        "500"
+      ],
       "draw_cost": 20
     },
     "flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE", "FANCY" ]
@@ -34,6 +55,7 @@
     "price_postapoc": 2900,
     "material": "leather",
     "symbol": "[",
+    "looks_like": "belt",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 10,
@@ -42,7 +64,23 @@
     "use_action": {
       "type": "bandolier",
       "capacity": 16,
-      "ammo": [ "22", "223", "5x50", "545x39", "3006", "308", "300", "762", "762R", "8x40mm" ],
+      "ammo": [
+        "22",
+        "223",
+        "270win",
+        "300blk",
+        "5x50",
+        "545x39",
+        "3006",
+        "308",
+        "300",
+        "762",
+        "762R",
+        "8x40mm",
+        "4570",
+        "50",
+        "700nx"
+      ],
       "draw_cost": 20
     },
     "flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
@@ -58,12 +96,13 @@
     "price_postapoc": 2900,
     "material": "leather",
     "symbol": "[",
+    "looks_like": "belt",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 10,
     "encumbrance": 2,
     "material_thickness": 1,
-    "use_action": { "type": "bandolier", "capacity": 25, "ammo": [ "410shot", "shot", "20x66mm", "shotcanister" ], "draw_cost": 25 },
+    "use_action": { "type": "bandolier", "capacity": 25, "ammo": [ "410shot", "shot", "20x66mm", "signal_flare" ], "draw_cost": 25 },
     "flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
   },
   {
@@ -77,12 +116,13 @@
     "price_postapoc": 6900,
     "material": "leather",
     "symbol": "[",
+    "looks_like": "belt",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 12,
     "encumbrance": 3,
     "material_thickness": 1,
-    "use_action": { "type": "bandolier", "capacity": 50, "ammo": [ "410shot", "shot", "20x66mm", "shotcanister" ], "draw_cost": 35 },
+    "use_action": { "type": "bandolier", "capacity": 50, "ammo": [ "410shot", "shot", "20x66mm", "signal_flare" ], "draw_cost": 35 },
     "flags": [ "WATER_FRIENDLY", "OVERSIZE", "BELTED" ]
   },
   {
@@ -97,12 +137,18 @@
     "price_postapoc": 8900,
     "material": "leather",
     "symbol": "[",
+    "looks_like": "ammo_pouch",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 10,
     "encumbrance": 2,
     "material_thickness": 1,
-    "use_action": { "type": "bandolier", "capacity": 14, "ammo": [ "flintlock", "36paper", "44paper", "blunderbuss" ], "draw_cost": 20 },
+    "use_action": {
+      "type": "bandolier",
+      "capacity": 14,
+      "ammo": [ "flintlock", "36paper", "44paper", "blunderbuss", "shotcanister", "shotpaper" ],
+      "draw_cost": 20
+    },
     "flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
   },
   {
@@ -116,6 +162,7 @@
     "price_postapoc": 5900,
     "material": "cotton",
     "symbol": "[",
+    "looks_like": "belt",
     "color": "dark_gray",
     "covers": [ "HAND_EITHER" ],
     "coverage": 5,
@@ -124,7 +171,23 @@
     "use_action": {
       "type": "bandolier",
       "capacity": 4,
-      "ammo": [ "22", "223", "5x50", "545x39", "3006", "308", "300", "762", "762R", "8x40mm" ],
+      "ammo": [
+        "22",
+        "223",
+        "270win",
+        "300blk",
+        "5x50",
+        "545x39",
+        "3006",
+        "308",
+        "300",
+        "762",
+        "762R",
+        "8x40mm",
+        "4570",
+        "50",
+        "700nx"
+      ],
       "draw_cost": 20
     },
     "flags": [ "WATER_FRIENDLY", "BELTED", "ALLOWS_NATURAL_ATTACKS" ]
@@ -141,6 +204,7 @@
     "price_postapoc": 9900,
     "material": [ "cotton", "plastic" ],
     "symbol": "[",
+    "looks_like": "ammo_satchel",
     "color": "dark_gray",
     "covers": [ "LEG_EITHER" ],
     "coverage": 10,
@@ -149,6 +213,28 @@
     "use_action": { "type": "bandolier", "capacity": 4, "ammo": [ "40mm" ], "draw_cost": 20 },
     "flags": [ "WATER_FRIENDLY", "BELTED", "OVERSIZE" ]
   },
+  {
+    "id": "stone_pouch",
+    "type": "ARMOR",
+    "name": "stone pouch",
+    "name_plural": "stone pouches",
+    "description": "A medium-sized pouch for storing rocks, with straps for attaching it to your belt or other webbing.",
+    "weight": "90 g",
+    "volume": "250 ml",
+    "price": 5900,
+    "price_postapoc": 9900,
+    "rigid": false,
+    "material": [ "cotton", "leather" ],
+    "symbol": "[",
+    "looks_like": "ammo_satchel",
+    "color": "dark_gray",
+    "covers": [ "LEG_EITHER" ],
+    "coverage": 10,
+    "encumbrance": 4,
+    "material_thickness": 1,
+    "use_action": { "type": "bandolier", "capacity": 10, "ammo": [ "rock" ], "draw_cost": 20 },
+    "flags": [ "WATER_FRIENDLY", "BELTED", "OVERSIZE" ]
+  },
   {
     "id": "grenadebandolier",
     "type": "ARMOR",
@@ -162,6 +248,7 @@
     "rigid": false,
     "material": "cotton",
     "symbol": "[",
+    "looks_like": "belt",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 15,
diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
index 22f2dd767b3e3..fbda446ccd05f 100644
--- a/data/json/items/armor/boots.json
+++ b/data/json/items/armor/boots.json
@@ -12,6 +12,7 @@
     "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "flip_flops",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 40,
@@ -33,6 +34,7 @@
     "bashing": 1,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "dress_shoes",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 90,
@@ -57,6 +59,7 @@
     "bashing": 4,
     "material": [ "bone", "leather" ],
     "symbol": "[",
+    "looks_like": "boots",
     "color": "white",
     "covers": [ "FEET" ],
     "coverage": 95,
@@ -80,6 +83,7 @@
     "to_hit": 2,
     "material": [ "plastic", "nomex" ],
     "symbol": "[",
+    "looks_like": "steeltoed",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -104,6 +108,7 @@
     "bashing": 4,
     "material": [ "chitin" ],
     "symbol": "[",
+    "looks_like": "boots_bone",
     "color": "green",
     "covers": [ "FEET" ],
     "coverage": 95,
@@ -139,6 +144,7 @@
     "bashing": 1,
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
+    "looks_like": "boots",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -163,6 +169,7 @@
     "bashing": 1,
     "material": [ "kevlar", "nomex" ],
     "symbol": "[",
+    "looks_like": "boots_combat",
     "color": "light_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -186,6 +193,7 @@
     "bashing": 1,
     "material": [ "leather", "fur" ],
     "symbol": "[",
+    "looks_like": "boots",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 90,
@@ -210,6 +218,7 @@
     "bashing": 1,
     "material": [ "kevlar", "plastic", "neoprene" ],
     "symbol": "[",
+    "looks_like": "boots_bunker",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -233,6 +242,7 @@
     "bashing": 1,
     "material": [ "leather", "plastic" ],
     "symbol": "[",
+    "looks_like": "boots",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 95,
@@ -257,6 +267,7 @@
     "bashing": 1,
     "material": [ "kevlar", "steel" ],
     "symbol": "[",
+    "looks_like": "boots_combat",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -281,6 +292,7 @@
     "bashing": 4,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "boots",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 95,
@@ -305,6 +317,7 @@
     "bashing": 1,
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
+    "looks_like": "boots_combat",
     "color": "green",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -329,6 +342,7 @@
     "bashing": 7,
     "material": [ "iron", "leather" ],
     "symbol": "[",
+    "looks_like": "boots_steel",
     "color": "light_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -351,6 +365,7 @@
     "to_hit": 2,
     "material": [ "plastic" ],
     "symbol": "[",
+    "looks_like": "boots",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -375,6 +390,7 @@
     "bashing": 4,
     "material": [ "steel", "iron" ],
     "symbol": "[",
+    "looks_like": "boots_steel",
     "color": "light_gray",
     "covers": [ "FEET" ],
     "coverage": 80,
@@ -398,6 +414,7 @@
     "bashing": 4,
     "material": [ "leather", "steel" ],
     "symbol": "[",
+    "looks_like": "boots_combat",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 90,
@@ -422,6 +439,7 @@
     "bashing": 1,
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
+    "looks_like": "boots_combat",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -456,6 +474,7 @@
     "to_hit": -1,
     "material": [ "wool", "plastic" ],
     "symbol": "[",
+    "looks_like": "boots_larmor",
     "color": "light_gray",
     "covers": [ "FEET" ],
     "coverage": 90,
@@ -480,6 +499,7 @@
     "bashing": 1,
     "material": [ "kevlar", "fur" ],
     "symbol": "[",
+    "looks_like": "boots_fur",
     "color": "light_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -504,6 +524,7 @@
     "bashing": 1,
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
+    "looks_like": "boots_combat",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -526,6 +547,7 @@
     "bashing": 2,
     "material": [ "cotton", "leather" ],
     "symbol": "[",
+    "looks_like": "sneakers",
     "color": "light_gray",
     "covers": [ "FEET" ],
     "coverage": 80,
@@ -547,6 +569,7 @@
     "bashing": 2,
     "material": [ "cotton", "leather" ],
     "symbol": "[",
+    "looks_like": "dress_shoes",
     "color": "light_gray",
     "covers": [ "FEET" ],
     "coverage": 70,
@@ -569,6 +592,7 @@
     "bashing": 5,
     "material": [ "wood" ],
     "symbol": "[",
+    "looks_like": "sandals",
     "color": "yellow",
     "covers": [ "FEET" ],
     "coverage": 85,
@@ -592,6 +616,7 @@
     "bashing": 14,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "sneakers",
     "color": "light_red",
     "covers": [ "FEET" ],
     "coverage": 85,
@@ -615,6 +640,7 @@
     "bashing": 1,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "dress_shoes",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 60,
@@ -637,6 +663,7 @@
     "bashing": 1,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "sneakers",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 60,
@@ -658,6 +685,7 @@
     "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "[",
+    "looks_like": "sneakers",
     "color": "blue",
     "covers": [ "FEET" ],
     "coverage": 10,
@@ -677,6 +705,7 @@
     "price_postapoc": 500,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "socks",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 65,
@@ -697,6 +726,7 @@
     "price_postapoc": 700,
     "material": [ "fur" ],
     "symbol": "[",
+    "looks_like": "socks_wool",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 65,
@@ -717,6 +747,7 @@
     "price_postapoc": 525,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "socks",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 65,
@@ -737,6 +768,7 @@
     "price_postapoc": 500,
     "material": [ "wool" ],
     "symbol": "[",
+    "looks_like": "socks_wool",
     "color": "blue",
     "covers": [ "FEET" ],
     "coverage": 65,
@@ -759,6 +791,7 @@
     "bashing": 5,
     "material": [ "wood", "cotton" ],
     "symbol": "[",
+    "looks_like": "clogs",
     "color": "yellow",
     "covers": [ "FEET" ],
     "coverage": 50,
@@ -782,6 +815,7 @@
     "bashing": 6,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "dress_shoes",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 30,
@@ -803,6 +837,7 @@
     "bashing": 1,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "boots_larmor",
     "color": "dark_gray",
     "covers": [ "FEET", "LEGS" ],
     "coverage": 65,
@@ -825,6 +860,7 @@
     "to_hit": -2,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "flip_flops",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 20,
@@ -845,6 +881,7 @@
     "to_hit": -2,
     "material": [ "cotton", "plastic" ],
     "symbol": "[",
+    "looks_like": "sneakers",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 80,
@@ -864,6 +901,7 @@
     "price_postapoc": 5000,
     "material": [ "fur", "leather" ],
     "symbol": "[",
+    "looks_like": "Sandals",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 50,
@@ -885,6 +923,7 @@
     "bashing": 5,
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
+    "looks_like": "steeltoed",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 95,
@@ -907,6 +946,7 @@
     "to_hit": -2,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
+    "looks_like": "rollerskates",
     "color": "light_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -930,6 +970,7 @@
     "bashing": 6,
     "material": [ "leather", "steel" ],
     "symbol": "[",
+    "looks_like": "rollerblades",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -951,6 +992,7 @@
     "price_postapoc": 3500,
     "material": [ "wood" ],
     "symbol": "[",
+    "looks_like": "clogs",
     "color": "light_gray",
     "covers": [ "FEET" ],
     "coverage": 50,
@@ -971,6 +1013,7 @@
     "price_postapoc": 1900,
     "material": [ "cotton", "leather" ],
     "symbol": "[",
+    "looks_like": "dress_shoes",
     "color": "light_blue",
     "covers": [ "FEET" ],
     "coverage": 80,
@@ -992,6 +1035,7 @@
     "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "socks_wool",
     "color": "brown",
     "covers": [ "FEET" ],
     "coverage": 30,
@@ -1012,6 +1056,7 @@
     "price_postapoc": 12000,
     "material": [ "cotton", "leather" ],
     "symbol": "[",
+    "looks_like": "shoes_bowling",
     "color": "light_blue",
     "covers": [ "FEET" ],
     "coverage": 80,
@@ -1033,6 +1078,7 @@
     "to_hit": -2,
     "material": [ "paper" ],
     "symbol": "[",
+    "looks_like": "sandals",
     "color": "light_gray",
     "covers": [ "FEET" ],
     "coverage": 30,
@@ -1052,6 +1098,7 @@
     "price_postapoc": 4000,
     "material": [ "plastic" ],
     "symbol": "[",
+    "looks_like": "clownshoes",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 85,
@@ -1074,6 +1121,7 @@
     "bashing": 1,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "boots_larmor",
     "color": "dark_gray",
     "covers": [ "FEET", "LEGS" ],
     "coverage": 80,
@@ -1095,6 +1143,7 @@
     "price_postapoc": 6900,
     "material": [ "neoprene", "cotton" ],
     "symbol": "[",
+    "looks_like": "boots_rubber",
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
@@ -1116,6 +1165,7 @@
     "price_postapoc": 14000,
     "material": [ "cotton", "leather" ],
     "symbol": "[",
+    "looks_like": "sneakers",
     "color": "light_blue",
     "covers": [ "FEET" ],
     "coverage": 80,
@@ -1137,6 +1187,7 @@
     "price_postapoc": 14000,
     "material": [ "cotton", "leather" ],
     "symbol": "[",
+    "looks_like": "sneakers",
     "color": "light_blue",
     "covers": [ "FEET" ],
     "coverage": 80,
diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json
index ad4dd40635b47..d9eac312df66a 100644
--- a/data/json/items/armor/holster.json
+++ b/data/json/items/armor/holster.json
@@ -10,6 +10,7 @@
     "price_postapoc": 19000,
     "material": "leather",
     "symbol": "[",
+    "looks_like": "quiver_large",
     "color": "light_gray",
     "covers": [ "TORSO" ],
     "coverage": 5,
@@ -29,6 +30,7 @@
     "price_postapoc": 12000,
     "material": "leather",
     "symbol": "[",
+    "looks_like": "holster",
     "color": "brown",
     "covers": [ "FOOT_EITHER" ],
     "coverage": 5,
@@ -56,6 +58,7 @@
     "price_postapoc": 9000,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "slingpack",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 5,
@@ -75,6 +78,7 @@
     "price_postapoc": 9000,
     "material": "leather",
     "symbol": "[",
+    "looks_like": "SHEATH_KNIFE",
     "color": "light_gray",
     "covers": [ "LEG_EITHER" ],
     "coverage": 5,
@@ -127,6 +131,7 @@
     "price_postapoc": 20000,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
+    "looks_like": "tacvest",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 20,
@@ -148,6 +153,7 @@
     "rigid": false,
     "material": "leather",
     "symbol": "[",
+    "looks_like": "quiver_large",
     "color": "light_gray",
     "covers": [ "LEG_EITHER" ],
     "coverage": 10,
diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json
index f400c3c0d39c9..1f3e4dd15d8e9 100644
--- a/data/json/items/armor/jewelry.json
+++ b/data/json/items/armor/jewelry.json
@@ -27,6 +27,7 @@
     "price_postapoc": 100,
     "material": [ "wood" ],
     "symbol": "[",
+    "looks_like": "earrings",
     "color": "brown"
   },
   {
@@ -71,6 +72,7 @@
     "price_postapoc": 1000,
     "material": [ "iron" ],
     "symbol": "[",
+    "looks_like": "copper_locket",
     "color": "brown",
     "flags": [ "FANCY" ]
   },
@@ -87,6 +89,7 @@
     "cutting": 3,
     "material": [ "gold" ],
     "symbol": "[",
+    "looks_like": "gold_dental_grill",
     "color": "yellow",
     "covers": [ "MOUTH" ],
     "encumbrance": 10,
@@ -103,6 +106,7 @@
     "price_postapoc": 1700,
     "material": [ "gold" ],
     "symbol": "[",
+    "looks_like": "ring_engagement",
     "color": "yellow",
     "flags": [ "FANCY" ]
   },
@@ -119,6 +123,7 @@
     "to_hit": -1,
     "material": [ "steel" ],
     "symbol": "[",
+    "looks_like": "gold_watch",
     "color": "light_gray",
     "covers": [ "HAND_EITHER" ],
     "coverage": 5,
@@ -136,6 +141,7 @@
     "price_postapoc": 200,
     "material": [ "silver" ],
     "symbol": "[",
+    "looks_like": "tieclip",
     "color": "light_gray",
     "flags": [ "FANCY" ]
   },
@@ -150,6 +156,7 @@
     "price_postapoc": 100,
     "material": [ "copper" ],
     "symbol": "[",
+    "looks_like": "bracelet",
     "color": "brown"
   },
   {
@@ -164,6 +171,7 @@
     "price_postapoc": 50,
     "material": [ "copper" ],
     "symbol": "[",
+    "looks_like": "earrings",
     "color": "brown"
   },
   {
@@ -177,6 +185,7 @@
     "price_postapoc": 500,
     "material": [ "copper" ],
     "symbol": "[",
+    "looks_like": "tieclip",
     "color": "brown"
   },
   {
@@ -190,6 +199,7 @@
     "price_postapoc": 1000,
     "material": [ "copper" ],
     "symbol": "[",
+    "looks_like": "necklace",
     "color": "brown"
   },
   {
@@ -203,6 +213,7 @@
     "price_postapoc": 1000,
     "material": [ "copper" ],
     "symbol": "[",
+    "looks_like": "necklace",
     "color": "brown"
   },
   {
@@ -216,6 +227,7 @@
     "price_postapoc": 500,
     "material": [ "copper" ],
     "symbol": "[",
+    "looks_like": "ring_purity",
     "color": "brown"
   },
   {
diff --git a/data/json/items/armor/pets_dog_armor.json b/data/json/items/armor/pets_dog_armor.json
index d1b113355ddc6..32b4ed40e3dce 100644
--- a/data/json/items/armor/pets_dog_armor.json
+++ b/data/json/items/armor/pets_dog_armor.json
@@ -3,6 +3,7 @@
     "type": "PET_ARMOR",
     "id": "kevlar_harness",
     "symbol": "[",
+    "looks_like": "tacvest",
     "color": "blue",
     "name": "Kevlar dog harness",
     "name_plural": "Kevlar dog harnesses",
diff --git a/data/json/items/armor/pets_horse_armor.json b/data/json/items/armor/pets_horse_armor.json
index d7017b98344ab..c4640b3106bd2 100644
--- a/data/json/items/armor/pets_horse_armor.json
+++ b/data/json/items/armor/pets_horse_armor.json
@@ -3,6 +3,7 @@
     "type": "PET_ARMOR",
     "id": "kevlar_armor_horse",
     "symbol": "[",
+    "looks_like": "hsurvivor_suit",
     "color": "yellow",
     "name": "Kevlar-lined horse peto",
     "description": "A heavy mattress-like armor of cloth, leather and thick linings of Kevlar, originally used as protection in bullfighting.  You could put this on a friendly horse.",
@@ -135,6 +136,7 @@
     "price": 15000,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "dump_pouch",
     "color": "green",
     "covers": [ "HANDS" ],
     "coverage": 50,
diff --git a/data/json/items/armor/power_armor.json b/data/json/items/armor/power_armor.json
index a91d001cb9455..6189ecb845272 100644
--- a/data/json/items/armor/power_armor.json
+++ b/data/json/items/armor/power_armor.json
@@ -14,6 +14,7 @@
     "bashing": 1,
     "material": [ "steel" ],
     "symbol": "[",
+    "looks_like": "power_armor",
     "color": "light_gray",
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 95,
@@ -38,6 +39,7 @@
     "bashing": 1,
     "material": [ "steel" ],
     "symbol": "[",
+    "looks_like": "power_armor_helmet_basic",
     "color": "light_gray",
     "covers": [ "HEAD", "EYES", "MOUTH" ],
     "coverage": 95,
@@ -62,6 +64,7 @@
     "bashing": 1,
     "material": [ "steel" ],
     "symbol": "[",
+    "looks_like": "depowered_armor",
     "color": "light_gray",
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
@@ -88,6 +91,7 @@
     "bashing": 1,
     "material": [ "steel" ],
     "symbol": "[",
+    "looks_like": "bigpack",
     "color": "light_gray",
     "coverage": 100,
     "encumbrance": 40,
@@ -110,6 +114,7 @@
     "bashing": 1,
     "material": [ "hardsteel", "steel" ],
     "symbol": "[",
+    "looks_like": "power_armor",
     "color": "dark_gray",
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
@@ -136,6 +141,7 @@
     "bashing": 1,
     "material": [ "steel" ],
     "symbol": "[",
+    "looks_like": "depowered_helmet",
     "color": "light_gray",
     "covers": [ "HEAD", "EYES", "MOUTH" ],
     "coverage": 100,
@@ -161,6 +167,7 @@
     "bashing": 1,
     "material": [ "hardsteel", "steel" ],
     "symbol": "[",
+    "looks_like": "power_armor_helmet_basic",
     "color": "dark_gray",
     "covers": [ "HEAD", "EYES", "MOUTH" ],
     "coverage": 100,
@@ -186,6 +193,7 @@
     "bashing": 1,
     "material": [ "superalloy", "plastic" ],
     "symbol": "[",
+    "looks_like": "power_armor_helmet_basic",
     "color": "dark_gray",
     "covers": [ "HEAD", "EYES", "MOUTH" ],
     "coverage": 100,
@@ -211,6 +219,7 @@
     "bashing": 1,
     "material": [ "superalloy", "plastic" ],
     "symbol": "[",
+    "looks_like": "depowered_armor",
     "color": "dark_gray",
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
diff --git a/data/json/items/armor/swimming.json b/data/json/items/armor/swimming.json
index 713ffadb18444..9b38db838f1f8 100644
--- a/data/json/items/armor/swimming.json
+++ b/data/json/items/armor/swimming.json
@@ -11,6 +11,7 @@
     "to_hit": 1,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "shorts",
     "color": "blue",
     "covers": [ "LEGS" ],
     "coverage": 35,
@@ -28,6 +29,7 @@
     "to_hit": -3,
     "material": [ "neoprene", "cotton" ],
     "symbol": "[",
+    "looks_like": "wetsuit_spring",
     "color": "dark_gray",
     "covers": [ "LEGS", "TORSO", "ARMS" ],
     "coverage": 100,
@@ -48,6 +50,7 @@
     "price": 4500,
     "material": [ "neoprene", "cotton" ],
     "symbol": "[",
+    "looks_like": "hood_rain",
     "color": "dark_gray",
     "covers": [ "HEAD" ],
     "coverage": 100,
@@ -70,6 +73,7 @@
     "bashing": 10,
     "material": [ "kevlar", "plastic", "neoprene" ],
     "symbol": "[",
+    "looks_like": "wetsuit_hood",
     "color": "dark_gray",
     "covers": [ "HEAD" ],
     "coverage": 100,
@@ -92,6 +96,7 @@
     "bashing": 6,
     "material": [ "kevlar", "plastic", "neoprene" ],
     "symbol": "[",
+    "looks_like": "wetsuit",
     "color": "dark_gray",
     "covers": [ "LEGS", "TORSO", "ARMS" ],
     "coverage": 100,
@@ -115,6 +120,7 @@
     "to_hit": 2,
     "material": [ "kevlar", "plastic", "neoprene" ],
     "symbol": "[",
+    "looks_like": "gloves_rubber",
     "color": "dark_gray",
     "covers": [ "HANDS" ],
     "coverage": 100,
@@ -135,6 +141,7 @@
     "to_hit": -3,
     "material": [ "neoprene", "cotton" ],
     "symbol": "[",
+    "looks_like": "wetsuit",
     "color": "pink",
     "covers": [ "TORSO", "ARMS" ],
     "coverage": 90,
@@ -156,6 +163,7 @@
     "to_hit": -1,
     "material": [ "steel", "plastic" ],
     "symbol": "[",
+    "looks_like": "chainmail_hauberk",
     "color": "light_red",
     "covers": [ "TORSO", "HEAD", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
@@ -175,6 +183,7 @@
     "to_hit": -1,
     "material": [ "steel", "plastic" ],
     "symbol": "[",
+    "looks_like": "chainmail_suit",
     "color": "light_red",
     "covers": [ "TORSO", "HEAD", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
@@ -195,6 +204,7 @@
     "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "[",
+    "looks_like": "goggles_welding",
     "color": "light_blue",
     "covers": [ "EYES" ],
     "coverage": 100,
@@ -216,6 +226,7 @@
     "to_hit": 1,
     "material": [ "neoprene", "cotton" ],
     "symbol": "[",
+    "looks_like": "gloves_tactical",
     "color": "dark_gray",
     "covers": [ "HANDS" ],
     "coverage": 100,
diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json
index 9eeda24ff9e0d..7e4307671b778 100644
--- a/data/json/items/bionics.json
+++ b/data/json/items/bionics.json
@@ -301,7 +301,7 @@
     "type": "BIONIC_ITEM",
     "name": "Ethanol Burner CBM",
     "looks_like": "bio_int_enhancer",
-    "description": "A reactor that burns alcohol as fuel in an extremely efficient reaction.  However, the user will still suffer the inebriating effects of the substance.",
+    "description": "A reactor that burns alcohol as fuel in an extremely efficient reaction.  It can store up to 500ml and accept ethanol, methanol and denatured aclohol as fuel.",
     "price": 120000,
     "difficulty": 4
   },
@@ -514,7 +514,7 @@
     "id": "bio_lighter",
     "copy-from": "bionic_general",
     "type": "BIONIC_ITEM",
-    "name": "Mini-Flamethrower CBM",
+    "name": "Finger Lighter CBM",
     "looks_like": "bio_int_enhancer",
     "description": "Powerful fire starters which extend from the tip of both hands' index fingers.",
     "price": 130000,
diff --git a/data/json/items/book/misc.json b/data/json/items/book/misc.json
index d32f278b09e1f..3e165ae003767 100644
--- a/data/json/items/book/misc.json
+++ b/data/json/items/book/misc.json
@@ -856,11 +856,11 @@
     "snippet_category": [
       {
         "id": "scifi1_1",
-        "text": "This is a copy of Gibson's \"Neuromancer\".  Written in the eighties, it was surprisingly accurate in predicting much of modern society...  Until recently."
+        "text": "This is a copy of Gibson's \"Neuromancer\".  Written in the eighties, it was surprisingly accurate in predicting much of modern society…  Until recently."
       },
       {
         "id": "scifi1_2",
-        "text": "This is a copy of \"The Stars My Destination\" by Alfred Bester.  \n\nTyger, Tyger, Burning bright,  \nIn the forests of the night:  \nWhat immortal hand or eye,  \nDare frame thy fearful symmetry?"
+        "text": "This is a copy of \"The Stars My Destination\" by Alfred Bester.\n\nTyger, Tyger, Burning bright,\nIn the forests of the night:\nWhat immortal hand or eye,\nDare frame thy fearful symmetry?"
       },
       {
         "id": "scifi1_3",
@@ -868,14 +868,10 @@
       },
       { "id": "scifi1_4", "text": "This is a copy of \"The Dispossessed\" by Ursula Le Guin." },
       { "id": "scifi1_5", "text": "This copy of Ray Bradbury's \"Fahrenheit 451\"." },
-      {
-        "id": "scifi1_5",
-        "text": "This is a well-worn copy of \"The Hitchhikers Guide to the Galaxy\" by Douglas Adams."
-      },
       { "id": "scifi1_6", "text": "This is a copy of \"Hyperion\" by Dan Simmons." },
       {
         "id": "scifi1_7",
-        "text": "This is a copy of \"Endymion\" by Dan Simmons.  It opens with a poem by D.H. Lawrence:\n\nGive us gods. Oh give them us! \nGive us gods. \nWe are so tired of men \nAnd motor-power."
+        "text": "This is a copy of \"Endymion\" by Dan Simmons.  It opens with a poem by D.H. Lawrence:\n\nGive us gods.  Oh give them us!\nGive us gods.\nWe are so tired of men\nAnd motor-power."
       },
       { "id": "scifi1_8", "text": "This is a copy of Philip K. Dick's \"Do Androids Dream of Electric Sheep?\"." },
       { "id": "scifi1_9", "text": "This is a dog-eared copy of \"Nova Express\" by William Burroughs." },
@@ -974,10 +970,10 @@
       { "id": "scifi1_42", "text": "This is a copy of \"Islands in the Sky\" by Arthur C. Clarke." },
       { "id": "scifi1_43", "text": "This is a copy of H. G. Wells' \"The Island of Doctor Moreau\"." },
       { "id": "scifi1_44", "text": "This is a copy of Stanislaw Lem's \"His Masters Voice\"." },
-      { "id": "scifi_45", "text": "This is a copy of Fred Hoyle's \"The Black Cloud\"." },
-      { "id": "scifi_46", "text": "This is a copy of \"Last and First Men\" by Olaf Stapeldon." },
-      { "id": "scifi_47", "text": "This is a copy of Stanislaw Lem's \"Solaris\"." },
-      { "id": "scifi_48", "text": "This is a copy of Theodore Sturgeon's \"More Than Human\"." },
+      { "id": "scifi1_45", "text": "This is a copy of Fred Hoyle's \"The Black Cloud\"." },
+      { "id": "scifi1_46", "text": "This is a copy of \"Last and First Men\" by Olaf Stapeldon." },
+      { "id": "scifi1_47", "text": "This is a copy of Stanislaw Lem's \"Solaris\"." },
+      { "id": "scifi1_48", "text": "This is a copy of Theodore Sturgeon's \"More Than Human\"." },
       { "id": "scifi1_49", "text": "This is a copy of \"Vurt\" by Jeff Noon." },
       { "id": "scifi1_50", "text": "This is a copy of \"A Canticle for Leibowitz\" by Walter M. Miller Jr." },
       { "id": "scifi1_51", "text": "This is a copy of \"The War of The Worlds\" by H.G Wells." },
@@ -995,6 +991,10 @@
       {
         "id": "scifi1_60",
         "text": "This is a copy of Larry Niven's \"Ringworld\".  There are a couple of pages missing from the end of the book.  Luckily only mail-order advertisements."
+      },
+      {
+        "id": "scifi1_61",
+        "text": "This is a well-worn copy of \"The Hitchhikers Guide to the Galaxy\" by Douglas Adams."
       }
     ]
   },
diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
index 8357ca4877217..687883c18e86a 100644
--- a/data/json/items/comestibles/carnivore.json
+++ b/data/json/items/comestibles/carnivore.json
@@ -209,15 +209,16 @@
   },
   {
     "id": "meat_cooked",
-    "copy-from": "meat",
+    "copy-from": "flesh",
+    "weight": "296 g",
+    "volume": "250 ml",
+    "spoils_in": "1 day",
     "type": "COMESTIBLE",
     "name": "cooked meat",
     "description": "This is a chunk of freshly cooked meat.  It's filling and nutritious, but unseasoned and a bit bland.",
-    "proportional": { "price": 1.5 },
+    "price": 750,
     "parasites": 0,
     "calories": 402,
-    "healthy": 0,
-    "fun": 0,
     "vitamins": [ [ "vitC", 16 ], [ "calcium", 2 ], [ "iron", 69 ], [ "vitB", 778 ] ],
     "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
   },
diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json
index 6447cac17229c..3f538f80bcce1 100644
--- a/data/json/items/comestibles/dairy.json
+++ b/data/json/items/comestibles/dairy.json
@@ -26,21 +26,22 @@
     "id": "milk_evap",
     "name": "evaporated milk",
     "name_plural": "evaporated milk",
-    "weight": "20 g",
+    "weight": "266 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 25,
     "healthy": 1,
-    "calories": 132,
+    "calories": 207,
     "description": "Milk that's had about 60% of its water removed prior to canning.",
     "price": 38,
     "material": [ "milk" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
     "flags": [ "EATEN_COLD" ],
+    "charges": 2,
     "vitamins": [ [ "vitA", 10 ], [ "vitC", 4 ], [ "calcium", 25 ] ],
     "fun": 1
   },
@@ -256,7 +257,7 @@
     "weight": "32 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 12,
@@ -265,9 +266,9 @@
     "price": 70,
     "material": [ "milk", "junk" ],
     "primary_material": "milk",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
-    "charges": 10,
+    "charges": 20,
     "vitamins": [ [ "vitA", 2 ], [ "vitC", 1 ], [ "calcium", 7 ] ],
     "fun": 3
   }
diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
index fe8c862b4509b..4fad4ac86ff87 100644
--- a/data/json/items/comestibles/drink.json
+++ b/data/json/items/comestibles/drink.json
@@ -108,7 +108,7 @@
     "weight": "238 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
@@ -116,8 +116,9 @@
     "description": "A dense, sweet creamy sauce, often used in curries.",
     "price": 350,
     "material": "fruit",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
+    "charges": 2,
     "vitamins": [ [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 43 ] ],
     "fun": 1
   },
@@ -295,29 +296,6 @@
     "flags": [ "EATEN_COLD" ],
     "fun": 5
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "con_milk",
-    "name": "condensed milk",
-    "name_plural": "condensed milk",
-    "weight": "32 g",
-    "color": "white",
-    "spoils_in": "1 day",
-    "container": "can_food",
-    "comestible_type": "DRINK",
-    "symbol": "~",
-    "quench": 12,
-    "calories": 103,
-    "description": "Cow's milk that has been partly dehydrated, and also sweetened.  A key ingredient in many sweets.",
-    "price": 70,
-    "material": [ "milk", "junk" ],
-    "primary_material": "milk",
-    "volume": "250 ml",
-    "phase": "liquid",
-    "charges": 10,
-    "vitamins": [ [ "vitA", 2 ], [ "vitC", 1 ], [ "calcium", 7 ] ],
-    "fun": 3
-  },
   {
     "type": "COMESTIBLE",
     "id": "creamsoda",
diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
index eaa708ec9cb96..3961e4f556d49 100644
--- a/data/json/items/comestibles/drink_other.json
+++ b/data/json/items/comestibles/drink_other.json
@@ -6,7 +6,7 @@
     "weight": "64 g",
     "color": "red",
     "spoils_in": "3 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": 1,
@@ -15,8 +15,8 @@
     "price": 4,
     "//": "Small cans--needs upsized after the string freeze.",
     "material": "tomato",
-    "volume": "250 ml",
-    "charges": 4,
+    "volume": "500 ml",
+    "charges": 8,
     "phase": "liquid",
     "flags": [ "EATEN_HOT" ],
     "fun": 1
diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
index 4c8c8ddc58a86..17006885feefc 100644
--- a/data/json/items/comestibles/fruit_dishes.json
+++ b/data/json/items/comestibles/fruit_dishes.json
@@ -84,17 +84,18 @@
     "weight": "268 g",
     "color": "yellow",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
     "healthy": 1,
-    "calories": 209,
+    "calories": 104,
     "description": "Canned pineapple rings in water.  Quite tasty.",
     "price": 400,
     "material": "fruit",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "fun": 7,
+    "charges": 2,
     "vitamins": [ [ "vitC", 26 ], [ "calcium", 4 ], [ "iron", 6 ] ]
   },
   {
diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
index 16d8ced2eb02c..5787c260a72a9 100644
--- a/data/json/items/comestibles/meat_dishes.json
+++ b/data/json/items/comestibles/meat_dishes.json
@@ -383,23 +383,34 @@
     "type": "COMESTIBLE",
     "id": "can_spam",
     "name": "SPAM",
-    "weight": "84 g",
+    "//": "SPAM comes in cans of six 2 oz slices.  Each charge is one slice.",
+    "weight": "56 g",
     "color": "pink",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -3,
-    "calories": 270,
+    "calories": 180,
     "description": "A canned pork product that is unnaturally pink, oddly rubbery, and not very tasty, this SPAM remains quite filling.  Completely unappetizing, but quite filling.",
     "price": 400,
     "material": "flesh",
-    "volume": "250 ml",
-    "charges": 2,
+    "volume": "500 ml",
+    "charges": 6,
     "flags": [ "EATEN_HOT" ],
     "fun": -8,
     "vitamins": [ [ "iron", 3 ] ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "debug_nutrition",
+    "copy-from": "can_spam",
+    "name": "holy SPAM of debugging",
+    "calories": 2100,
+    "description": "A mysterious lump of SPAM that contains just enough calories and vitamins to feed you for a day.  For debug use only.",
+    "//": "This is used for the all_nutrient_starve_test.",
+    "vitamins": [ [ "vitA", 96 ], [ "vitB", 96 ], [ "vitC", 96 ], [ "calcium", 96 ], [ "iron", 96 ] ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "can_sardine",
@@ -487,15 +498,16 @@
     "weight": "170 g",
     "color": "light_red",
     "spoils_in": "2 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 393,
     "description": "Meat encased in little dough satchels.  Tastes fine raw.",
     "price": 250,
     "material": [ "flesh", "wheat" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "flags": [ "EATEN_HOT" ],
+    "charges": 2,
     "vitamins": [ [ "vitA", 6 ], [ "calcium", 16 ], [ "iron", 9 ] ]
   },
   {
@@ -506,7 +518,7 @@
     "weight": "253 g",
     "color": "red",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": 1,
@@ -514,9 +526,10 @@
     "description": "A spicy stew containing chili peppers, meat, tomatoes and beans.",
     "price": 290,
     "material": [ "flesh", "veggy", "bean", "tomato" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "flags": [ "EATEN_HOT" ],
     "fun": 5,
+    "charges": 2,
     "vitamins": [ [ "vitA", 14 ], [ "vitC", 7 ], [ "calcium", 6 ], [ "iron", 27 ] ]
   },
   {
@@ -527,7 +540,7 @@
     "weight": "267 g",
     "color": "brown",
     "spoils_in": "1 day 12 hours",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -8,
@@ -535,7 +548,8 @@
     "description": "Greasy Prospector improved pork and beans with hickory smoked pig fat chunks.",
     "price": 200,
     "material": [ "flesh", "bean" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 5,
     "vitamins": [ [ "vitC", 6 ], [ "calcium", 14 ], [ "iron", 25 ] ]
@@ -581,20 +595,20 @@
     "type": "COMESTIBLE",
     "id": "can_chicken",
     "name": "canned chicken",
-    "weight": "54 g",
+    "weight": "217 g",
     "color": "pink",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "calories": 100,
+    "calories": 400,
     "description": "Bright white chicken-paste.",
     "price": 400,
     "material": "flesh",
-    "volume": "250 ml",
-    "charges": 4,
+    "volume": "500 ml",
+    "charges": 2,
     "fun": 1,
-    "vitamins": [ [ "vitA", 3 ], [ "calcium", 1 ], [ "iron", 4 ], [ "vitB", 23 ] ]
+    "vitamins": [ [ "vitA", 18 ], [ "calcium", 3 ], [ "iron", 18 ], [ "vitB", 34 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -603,16 +617,16 @@
     "weight": "232 g",
     "color": "white",
     "spoils_in": "4 days",
-    "container": "can_food",
-    "//": "Small cans--needs properly Jarred after the string freeze.",
+    "container": "jar_glass",
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 465,
     "description": "Fish fillets pickled in some sort of tangy white sauce.",
     "price": 310,
     "material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "fun": 3,
+    "charges": 2,
     "vitamins": [ [ "calcium", 34 ], [ "iron", 34 ] ]
   },
   {
@@ -642,7 +656,7 @@
     "weight": "253 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 2,
@@ -650,7 +664,8 @@
     "description": "Delicious, lumpy, white soup made of clams and potatoes.  A taste of the lost glory of New England.",
     "price": 400,
     "material": [ "flesh", "milk" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 6,
     "vitamins": [ [ "vitA", 20 ], [ "vitC", 14 ], [ "calcium", 7 ], [ "iron", 16 ], [ "vitB", 348 ] ]
@@ -806,6 +821,7 @@
     "description": "Meat slices cured in brine.  Salty but tasty in a pinch.",
     "price": 500,
     "material": "flesh",
+    "delete": { "flags": [ "NUTRIENT_OVERRIDE" ] },
     "primary_material": "cured_meat",
     "fun": 2
   },
@@ -956,6 +972,7 @@
     "healthy": 1,
     "description": "This is a serving of crisply brined and canned meat.  Tasty and nutritious.",
     "price": 250,
+    "delete": { "flags": [ "NUTRIENT_OVERRIDE" ] },
     "fun": 6
   },
   {
@@ -982,6 +999,7 @@
     "color": "light_red",
     "description": "Reconstituted meat flakes, which are much more enjoyable to eat now that they have been rehydrated.",
     "price": 900,
+    "delete": { "flags": [ "NUTRIENT_OVERRIDE" ] },
     "fun": 2
   },
   {
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index 31ab474f86f18..32cb299e5f081 100644
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -247,7 +247,7 @@
     "weight": "256 g",
     "color": "brown",
     "spoils_in": "2 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -1,
@@ -255,7 +255,8 @@
     "description": "Canned beans.  A staple among canned goods, these are reputedly good for one's coronary health.",
     "price": 150,
     "material": "bean",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "vitamins": [ [ "calcium", 9 ], [ "iron", 24 ] ]
   },
@@ -587,8 +588,8 @@
     "description": "This is food for dogs.  It smells strange, but dogs seem to love it.",
     "weight": "554 g",
     "spoils_in": "1 day",
-    "container": "can_food",
-    "volume": "250 ml",
+    "container": "can_medium",
+    "volume": "500 ml",
     "price": 300,
     "to_hit": -5,
     "material": "flesh",
diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json
index 1b6ccf39d31c5..c9efd13837d8c 100644
--- a/data/json/items/comestibles/raw_fruit.json
+++ b/data/json/items/comestibles/raw_fruit.json
@@ -620,6 +620,27 @@
     "smoking_result": "dry_fruit",
     "vitamins": [ [ "vitA", 17 ], [ "vitC", 18 ], [ "calcium", 2 ], [ "iron", 4 ] ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "cholla_bud",
+    "name": "cholla bud",
+    "weight": "92 g",
+    "color": "red",
+    "spoils_in": "6 days 16 hours",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": 6,
+    "healthy": 2,
+    "calories": 62,
+    "description": "Edible bud of a cholla cactus, with spines removed; the candy of the Mojave indigenous peoples.  Tastes similar to asparagus.",
+    "price": 900,
+    "material": "fruit",
+    "volume": "175 ml",
+    "fun": 6,
+    "flags": [ "FREEZERBURN", "SMOKABLE" ],
+    "smoking_result": "dry_fruit",
+    "vitamins": [ [ "vitA", 2 ], [ "vitC", 18 ], [ "iron", 1 ] ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "cactus_pad",
diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json
index 798618e795902..c7097a40dbf85 100644
--- a/data/json/items/comestibles/soup.json
+++ b/data/json/items/comestibles/soup.json
@@ -6,7 +6,7 @@
     "weight": "253 g",
     "color": "yellow",
     "spoils_in": "6 days 16 hours",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 30,
@@ -14,7 +14,8 @@
     "description": "Vegetable stock.  Tasty and fairly nutritious.",
     "price": 350,
     "material": "veggy",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT" ],
     "fun": 1,
@@ -27,7 +28,7 @@
     "weight": "267 g",
     "color": "yellow",
     "spoils_in": "6 days 16 hours",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 30,
@@ -36,7 +37,8 @@
     "price": 350,
     "material": "bone",
     "primary_material": "water",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "NO_SALVAGE" ],
     "fun": 10,
@@ -58,7 +60,7 @@
     "weight": "254 g",
     "color": "red",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 8,
@@ -67,7 +69,8 @@
     "description": "A nutritious and delicious hearty vegetable soup.",
     "price": 400,
     "material": "veggy",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 43 ], [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 5 ] ],
@@ -80,7 +83,7 @@
     "weight": "253 g",
     "color": "red",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 8,
@@ -89,7 +92,8 @@
     "description": "A nutritious and delicious hearty meat soup.",
     "price": 400,
     "material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 80 ], [ "vitC", 36 ], [ "calcium", 3 ], [ "iron", 13 ], [ "vitB", 20 ] ],
@@ -102,7 +106,7 @@
     "weight": "265 g",
     "color": "light_gray",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 8,
@@ -111,7 +115,8 @@
     "description": "A nutritious and delicious hearty fish soup.",
     "price": 400,
     "material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 12 ], [ "vitC", 28 ], [ "calcium", 4 ], [ "iron", 5 ], [ "vitB", 20 ] ],
@@ -125,7 +130,7 @@
     "weight": "263 g",
     "color": "red",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 13,
@@ -134,7 +139,8 @@
     "description": "Spicy, and filled with bits of peppers.  It's pretty good.",
     "price": 750,
     "material": "veggy",
-    "volume": "250 ml",
+    "charges": 2,
+    "volume": "500 ml",
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 178 ], [ "vitC", 35 ], [ "calcium", 4 ], [ "iron", 12 ] ],
@@ -148,7 +154,7 @@
     "weight": "289 g",
     "color": "red",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 13,
@@ -157,7 +163,7 @@
     "description": "Spicy, and filled with bits of peppers and meat!  It's pretty good.",
     "price": 750,
     "material": [ "flesh", "veggy" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
     "charges": 2,
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
@@ -171,7 +177,7 @@
     "weight": "250 g",
     "color": "red",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 8,
@@ -180,7 +186,8 @@
     "description": "A nutritious and delicious soup, made of gifts of nature.",
     "price": 350,
     "material": [ "flesh", "veggy" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 20 ], [ "vitC", 9 ], [ "iron", 3 ], [ "vitB", 5 ] ],
@@ -190,7 +197,6 @@
     "type": "COMESTIBLE",
     "id": "soup_human",
     "copy-from": "soup_meat",
-    "calories": 550,
     "name": "sap soup",
     "description": "A soup made from someone who is a far better meal than person.",
     "material": "hflesh"
@@ -202,7 +208,7 @@
     "weight": "261 g",
     "color": "light_gray",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 15,
@@ -212,7 +218,8 @@
     "price": 580,
     "material": [ "flesh", "wheat" ],
     "primary_material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 10 ], [ "calcium", 1 ], [ "iron", 9 ], [ "vitB", 8 ] ],
@@ -225,18 +232,18 @@
     "weight": "266 g",
     "color": "light_gray",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 15,
     "healthy": 1,
-    "calories": 211,
+    "calories": 70,
     "description": "A mushy, gray semi-liquid soup made from mushrooms.",
     "price": 450,
     "material": "mushroom",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
-    "charges": 4,
+    "charges": 2,
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "fun": 1,
     "vitamins": [ [ "calcium", 2 ], [ "iron", 2 ] ]
@@ -271,7 +278,7 @@
     "weight": "263 g",
     "color": "light_gray",
     "spoils_in": "6 days 16 hours",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 10,
@@ -281,7 +288,8 @@
     "price": 500,
     "material": [ "flesh", "wheat" ],
     "primary_material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 81 ], [ "vitC", 7 ], [ "calcium", 9 ], [ "iron", 13 ], [ "vitB", 20 ] ],
@@ -294,7 +302,7 @@
     "weight": "261 g",
     "color": "white",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 8,
@@ -303,7 +311,8 @@
     "description": "A rich and tasty fish chowder from Scotland, made with preserved fish and creamy milk.",
     "price": 500,
     "material": [ "flesh", "milk" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 15 ], [ "vitC", 8 ], [ "calcium", 7 ], [ "iron", 7 ], [ "vitB", 8 ] ],
diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json
index e744c3679d430..a215550531922 100644
--- a/data/json/items/comestibles/veggy_dishes.json
+++ b/data/json/items/comestibles/veggy_dishes.json
@@ -113,11 +113,18 @@
     "id": "can_corn",
     "name": "corn",
     "name_plural": "corn",
-    "copy-from": "corn",
+    "comestible_type": "FOOD",
+    "weight": "178 g",
+    "color": "yellow",
+    "symbol": "%",
+    "material": "veggy",
+    "vitamins": [ [ "vitA", 6 ], [ "vitC", 3 ], [ "iron", 3 ] ],
     "spoils_in": "2 days",
-    "container": "can_food",
+    "container": "can_medium",
     "quench": 5,
-    "calories": 260,
+    "calories": 152,
+    "volume": "500 ml",
+    "charges": 2,
     "description": "Canned corn in water.  Eat up!",
     "price": 200,
     "flags": [ "EATEN_HOT" ]
diff --git a/data/json/items/containers.json b/data/json/items/containers.json
index fad7f16b6354f..03575ec2c3259 100644
--- a/data/json/items/containers.json
+++ b/data/json/items/containers.json
@@ -2,7 +2,7 @@
   {
     "id": "2lcanteen",
     "type": "CONTAINER",
-    "category": "clothing",
+    "category": "container",
     "name": "2.5L canteen",
     "description": "A large plastic water canteen, with a 2.5 liter capacity and carrying strap.",
     "weight": "155 g",
@@ -22,7 +22,7 @@
   {
     "id": "30gal_barrel",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "30 gallon barrel",
     "description": "A huge plastic barrel with a resealable lid.",
     "weight": "6800 g",
@@ -41,7 +41,7 @@
   {
     "id": "30gal_drum",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "steel drum (100L)",
     "name_plural": "steel drums (100L)",
     "description": "A huge steel barrel with a resealable lid.",
@@ -61,7 +61,7 @@
   {
     "id": "55gal_drum",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "steel drum (200L)",
     "name_plural": "steel drums (200L)",
     "description": "A massive steel barrel with a resealable lid.",
@@ -81,7 +81,7 @@
   {
     "id": "bag_canvas",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "canvas sack",
     "description": "A large and sturdy canvas sack.  Smells faintly of earth and hard work.",
     "weight": "415 g",
@@ -98,7 +98,7 @@
   {
     "id": "bag_canvas_small",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "canvas bag",
     "description": "Small bag made of canvas.  Looks fine to store dried herbs in.",
     "weight": "5 g",
@@ -115,7 +115,7 @@
   {
     "id": "bag_plastic",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "plastic bag",
     "description": "A small, open plastic bag.  Essentially trash.",
     "weight": "5 g",
@@ -132,7 +132,7 @@
   {
     "id": "bag_zipper",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "zipper bag",
     "looks_like": "bag_plastic",
     "description": "An inexpensive flexible rectangular storage bag on its typical small size.  Transparent and made of plastic, it can be sealed and opened by a slider which works in a similar way to a zip fastener.",
@@ -150,7 +150,7 @@
   {
     "id": "bag_body_bag",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "body bag",
     "looks_like": "bag_canvas",
     "description": "A large, human size, rectangular bag made of strong plastic, with a zipper in the middle.  Used to hold a dead body.",
@@ -168,7 +168,7 @@
   {
     "id": "bottle_glass",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "glass bottle",
     "description": "A resealable glass bottle, holds 750 ml of liquid.",
     "weight": "200 g",
@@ -187,7 +187,7 @@
   {
     "id": "bottle_plastic",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "plastic bottle",
     "description": "A resealable plastic bottle, holds 500 ml of liquid.",
     "weight": "13 g",
@@ -204,7 +204,7 @@
   {
     "id": "bottle_plastic_small",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "small plastic bottle",
     "description": "A resealable plastic bottle, holds 250 ml of liquid.",
     "weight": "7 g",
@@ -221,7 +221,7 @@
   {
     "id": "bottle_twoliter",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "large plastic bottle",
     "description": "It's a two-liter plastic bottle that can hold a lot of soda, or, nowadays, boiled water.",
     "weight": "13 g",
@@ -238,7 +238,7 @@
   {
     "id": "bowl_clay",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "clay bowl",
     "description": "A clay bowl with a waterproofed hide lid.  Can be used as a container or as a tool.  Holds 250 ml of liquid.",
     "weight": "60 g",
@@ -256,7 +256,7 @@
   {
     "id": "box_cigarette",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "pack",
     "name_plural": "packs",
     "description": "SURGEON GENERAL'S WARNING: Smoking Causes Lung Cancer, Heart Disease, Emphysema And May Complicate Pregnancy.",
@@ -271,7 +271,7 @@
   {
     "id": "box_small",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "small cardboard box",
     "name_plural": "small cardboard boxes",
     "description": "A small cardboard box.  No bigger than a foot in dimension.",
@@ -286,7 +286,7 @@
   {
     "id": "box_medium",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "cardboard box",
     "name_plural": "cardboard boxes",
     "description": "A sturdy cardboard box, about the size of a banana box.  Great for packing.",
@@ -302,7 +302,7 @@
   {
     "id": "box_large",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "large cardboard box",
     "name_plural": "large cardboard boxes",
     "description": "A very large cardboard box, the sort children would have loved to hide in, when there were still children.",
@@ -319,7 +319,7 @@
   {
     "id": "bucket",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "bucket",
     "name_plural": "buckets",
     "description": "A galvanized bucket for peanuts, chilled wine, iced beer, lobster, crab legs, French fries, animal feed, farm use, tailgating, crafts, planting flowers, holding gift baskets, containing a fruit basket and herbs, loose item storage or as an ice bucket.",
@@ -336,7 +336,7 @@
   {
     "id": "camelbak",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "hydration pack",
     "description": "A slim and lightweight insulated plastic bladder worn on the back.  It has a large pocket and a capped mouth for filling with liquid with a hose that allows the wearer to drink hands-free.",
     "weight": "286 g",
@@ -356,7 +356,7 @@
   {
     "id": "can_drink",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "aluminum can",
     "description": "An aluminum can, like what soda comes in.",
     "weight": "13 g",
@@ -387,7 +387,7 @@
   {
     "id": "carton_sealed",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "paper carton",
     "description": "A half gallon carton constructed of a paper, aluminum and plastic laminate.  It has a threaded cap for easy resealing.",
     "weight": "28 g",
@@ -419,7 +419,7 @@
   {
     "id": "plastic_bag_vac",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "vacuum-packed bag",
     "description": "This is a bag of vacuum-packed food.",
     "weight": "2 g",
@@ -437,9 +437,10 @@
   {
     "id": "can_food",
     "type": "CONTAINER",
-    "category": "other",
-    "name": "tin can",
-    "description": "A tin can, like what beans come in.",
+    "category": "container",
+    "name": "small tin can",
+    "description": "A small tin can, like what tuna comes in.",
+    "//": "Represents a 4 cm radius x 5 cm height steel can.",
     "weight": "40 g",
     "volume": "250 ml",
     "price": 0,
@@ -455,18 +456,42 @@
     "id": "can_food_unsealed",
     "copy-from": "can_food",
     "type": "CONTAINER",
-    "name": "opened tin can",
-    "description": "A tin can, like what beans come in.  This one is opened and can't be easily sealed.",
+    "name": "small opened tin can",
+    "description": "A small tin can, like what tuna comes in.  This one is opened and can't be easily sealed.",
     "symbol": ")",
     "color": "blue",
     "preserves": false,
     "unseals_into": "null",
     "qualities": [ [ "CONTAIN", 1 ], [ "BOIL", 2 ] ]
   },
+  {
+    "id": "can_medium",
+    "copy-from": "can_food",
+    "type": "CONTAINER",
+    "name": "medium tin can",
+    "description": "A medium tin can, like what soup comes in.",
+    "//": "Represents a 4 cm radius x 10 cm height steel can.",
+    "looks_like": "can_food",
+    "weight": "70 g",
+    "volume": "500 ml",
+    "contains": "500 ml",
+    "unseals_into": "can_medium_unsealed"
+  },
+  {
+    "id": "can_medium_unsealed",
+    "copy-from": "can_medium",
+    "type": "CONTAINER",
+    "name": "medium opened tin can",
+    "description": "A medium tin can, like what soup comes in.  This one is opened and can't be easily sealed.",
+    "looks_like": "can_food_unsealed",
+    "preserves": false,
+    "unseals_into": "null",
+    "qualities": [ [ "CONTAIN", 1 ], [ "BOIL", 2 ] ]
+  },
   {
     "id": "canteen",
     "type": "CONTAINER",
-    "category": "clothing",
+    "category": "container",
     "name": "plastic canteen",
     "description": "A military-style water canteen with a 1.5 liter capacity.  Commonly worn at the hip.",
     "weight": "155 g",
@@ -485,7 +510,7 @@
   {
     "id": "thermos",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "thermos",
     "name_plural": "thermoses",
     "description": "A Thermos brand vacuum flask.  Built for temperature retention, helps keep things hot or cold.  Contains 1L of liquid.",
@@ -503,7 +528,7 @@
   {
     "id": "clay_canister",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "clay canister",
     "description": "A fragile clay vessel.  It can be used to make crude impact grenades or to store liquid.",
     "weight": "268 g",
@@ -521,7 +546,7 @@
   {
     "id": "clay_hydria",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "clay hydria",
     "description": "A 15-liter clay pot with three handles for carrying and for pouring.",
     "weight": "1955 g",
@@ -540,7 +565,7 @@
   {
     "id": "clay_watercont",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "large clay pot",
     "description": "A bulky and heavy clay pot with a waterproofed hide lid, meant to store water, but can carry other liquids in a pinch.",
     "weight": "4887 g",
@@ -558,7 +583,7 @@
   {
     "id": "cup_plastic",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "plastic cup",
     "description": "A small, vacuum formed cup.",
     "weight": "6 g",
@@ -586,7 +611,7 @@
   {
     "id": "flask_glass",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "glass flask",
     "description": "A 250 ml laboratory conical flask, with a rubber bung.",
     "weight": "48 g",
@@ -605,7 +630,7 @@
   {
     "id": "test_tube",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "test tube",
     "description": "A 10ml laboratory cylindrical test tube, with a rubber stopper.",
     "weight": "36 g",
@@ -624,7 +649,7 @@
   {
     "id": "beaker",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "beaker",
     "description": "A 250ml laboratory beaker.  Basically a cup with delusions of grandeur.",
     "weight": "150 g",
@@ -642,7 +667,7 @@
   {
     "id": "gradcylinder",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "graduated cylinder",
     "description": "A tall, narrow glass cylinder with precise markings for measuring fluid quantities.  An important science tool, it is also useful for anal retentive chefs.",
     "weight": "150 g",
@@ -660,7 +685,7 @@
   {
     "id": "test_tube_micro",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "microcentrifuge tube",
     "description": "These plastic tubes, with little built in snap-caps, are a great way to store a tiny amount of liquid.  Great for jello shooters if 1mL is enough for a shot for you.  Cool people call these \"eppies\".",
     "weight": "1 g",
@@ -678,7 +703,7 @@
   {
     "id": "flask_hip",
     "type": "CONTAINER",
-    "category": "clothing",
+    "category": "container",
     "name": "hip flask",
     "description": "A 250 ml metal flask with a hinged screw-on lid, commonly used to discreetly transport alcohol.",
     "weight": "120 g",
@@ -699,6 +724,7 @@
   {
     "id": "jar_3l_glass",
     "type": "CONTAINER",
+    "category": "container",
     "name": "3L glass jar",
     "description": "A three-liter glass jar with a metal screw top lid, used for canning.",
     "weight": "365 g",
@@ -718,7 +744,6 @@
     "id": "jar_3l_glass_sealed",
     "copy-from": "jar_3l_glass",
     "type": "CONTAINER",
-    "category": "other",
     "name": "sealed 3L glass jar",
     "description": "A three-liter glass jar with a metal screw top lid, used for canning.  Sealed tightly to preserve contents from rot.",
     "symbol": ")",
@@ -730,7 +755,7 @@
   {
     "id": "jar_glass",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "glass jar",
     "description": "A half-liter glass jar with a metal screw top lid, used for canning.",
     "weight": "150 g",
@@ -761,7 +786,7 @@
   {
     "id": "jerrycan",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "plastic jerrycan",
     "description": "A bulky plastic jerrycan, meant to carry fuel, but can carry other liquids in a pinch.",
     "weight": "1587 g",
@@ -778,7 +803,7 @@
   {
     "id": "jerrycan_big",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "steel jerrycan",
     "description": "A steel jerrycan, meant to carry fuel, but can carry other liquids in a pinch.",
     "weight": "4815 g",
@@ -797,7 +822,7 @@
   {
     "id": "jug_clay",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "clay jug",
     "description": "A clay container with a lid, used to hold and pour liquids.",
     "weight": "400 g",
@@ -815,7 +840,7 @@
   {
     "id": "jug_plastic",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "gallon jug",
     "description": "A standard plastic jug used for milk and household cleaning chemicals.",
     "weight": "190 g",
@@ -832,7 +857,7 @@
   {
     "id": "keg",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "aluminum keg",
     "description": "A reusable lightweight aluminum keg, used for shipping beer.  It has a capacity of 50 liters.",
     "weight": "5040 g",
@@ -851,7 +876,7 @@
   {
     "id": "keg_steel",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "steel keg",
     "description": "A reusable heavy steel keg, used for shipping beer.  It has a capacity of 50 liters.",
     "weight": "12600 g",
@@ -870,7 +895,7 @@
   {
     "id": "large_stomach_sealed",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "large sealed stomach",
     "description": "The stomach of a large creature, cleaned and sealed with strings.  It can hold 3 liters of water.",
     "weight": "783 g",
@@ -889,7 +914,7 @@
   {
     "id": "metal_tank",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "metal tank (60L)",
     "name_plural": "metal tanks (60L)",
     "description": "A large metal tank for holding liquids.  Useful for crafting.",
@@ -909,7 +934,7 @@
   {
     "id": "metal_tank_little",
     "type": "CONTAINER",
-    "category": "spare_parts",
+    "category": "container",
     "name": "metal tank (2L)",
     "name_plural": "metal tanks (2L)",
     "description": "A small metal tank for gas or liquids.  Useful for crafting.",
@@ -929,7 +954,7 @@
   {
     "id": "canteen_wood",
     "type": "CONTAINER",
-    "category": "clothing",
+    "category": "container",
     "name": "wooden canteen",
     "description": "A water canteen made from wood, secured by metal bands and sealed with wax or pitch.  Holds 1.5 liters and has a simple carry strap.",
     "weight": "232 g",
@@ -948,7 +973,7 @@
   {
     "id": "stomach_sealed",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "sealed stomach",
     "description": "The stomach of a creature, cleaned and sealed with a string.  It can hold 1.5 liters of water.",
     "weight": "453 g",
@@ -967,7 +992,7 @@
   {
     "id": "waterskin",
     "type": "CONTAINER",
-    "category": "clothing",
+    "category": "container",
     "name": "small waterskin",
     "description": "A small watertight leather bag with a carrying strap, can hold 1.5 liters of water.",
     "weight": "453 g",
@@ -988,7 +1013,7 @@
   {
     "id": "waterskin2",
     "type": "CONTAINER",
-    "category": "clothing",
+    "category": "container",
     "name": "waterskin",
     "description": "A watertight leather bag with a carrying strap, can hold 3 liters of water.",
     "weight": "783 g",
@@ -1009,7 +1034,7 @@
   {
     "id": "waterskin3",
     "type": "CONTAINER",
-    "category": "clothing",
+    "category": "container",
     "name": "large waterskin",
     "description": "A large watertight leather bag with a carrying strap, can hold 5 liters of water.",
     "weight": "990 g",
@@ -1030,7 +1055,7 @@
   {
     "id": "wooden_barrel",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "wooden barrel",
     "description": "Traditionally made of white oak; these vessels are known for delivering delicious whiskey to the future.  It has a capacity of 100 liters.",
     "weight": "42408 g",
@@ -1049,7 +1074,7 @@
   {
     "id": "wrapper",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "paper wrapper",
     "description": "Just a piece of butcher's paper.  Good for starting fires.",
     "weight": "3 g",
@@ -1066,7 +1091,7 @@
   {
     "id": "styrofoam_cup",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "styrofoam cup",
     "description": "A cheap, disposable cup with a plastic lid and straw.",
     "weight": "50 g",
@@ -1082,7 +1107,7 @@
   {
     "id": "plastic_bucket",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "plastic tub",
     "description": "A big, square plastic bucket usually used for carrying ice cream.",
     "weight": "1360 g",
@@ -1099,7 +1124,7 @@
   {
     "id": "condom",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "condom",
     "description": "A gentleman's balloon.  A single use life preventer.  A thumbless latex mitten.  This could be used as a makeshift water container, but otherwise it's anyone's guess what it's for.",
     "weight": "5 g",
@@ -1118,7 +1143,7 @@
   {
     "id": "can_food_big",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "large tin can",
     "description": "A large tin can, like what beans come in. Holds a substantial amount of food.",
     "weight": "350 g",
@@ -1147,7 +1172,7 @@
   {
     "id": "survival_kit_box",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "container",
     "name": "survival kit box",
     "description": "An aluminum box that used to contain a small survival kit.  Can hold 1 liter of liquid.",
     "weight": 200,
diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json
index bf6d528463e14..5c6be291af004 100644
--- a/data/json/items/corpses/inactive_bots.json
+++ b/data/json/items/corpses/inactive_bots.json
@@ -139,7 +139,7 @@
     "price": 600000,
     "to_hit": -3,
     "bashing": 8,
-    "material": [ "superalloy", "plastic" ],
+    "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "white",
     "use_action": {
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
index 8cb7c8ff25e60..b44fef2d75389 100644
--- a/data/json/items/generic.json
+++ b/data/json/items/generic.json
@@ -57,6 +57,21 @@
     "flags": [ "PSEUDO", "PERPETUAL" ],
     "fuel": { "energy": 1 }
   },
+  {
+    "type": "GENERIC",
+    "//": "pseudo item, used as fuel type for CBMs that are sun-powered",
+    "id": "sunlight",
+    "symbol": "?",
+    "color": "white",
+    "name": "sun light",
+    "name_plural": "none",
+    "description": "seeing this is a bug",
+    "stackable": true,
+    "price": 0,
+    "volume": 0,
+    "flags": [ "PSEUDO", "PERPETUAL" ],
+    "fuel": { "energy": 1 }
+  },
   {
     "type": "GENERIC",
     "//": "pseudo item, used as fuel type for CBMs that are metabolism-powered",
@@ -848,11 +863,11 @@
     "symbol": ";",
     "color": "dark_gray",
     "name": "television",
-    "description": "A large cathode ray tube television, full of delicious electronics.",
+    "description": "A large LCD television, full of delicious electronics.",
     "price": 0,
     "material": "plastic",
-    "weight": "22600 g",
-    "volume": "3 L",
+    "weight": "15000 g",
+    "volume": "20 L",
     "bashing": 5,
     "to_hit": -5
   },
@@ -1414,6 +1429,20 @@
     "volume": "250 ml",
     "to_hit": -1
   },
+  {
+    "type": "GENERIC",
+    "id": "large_lcd_screen",
+    "symbol": ",",
+    "color": "dark_gray",
+    "name": "large LCD screen",
+    "category": "spare_parts",
+    "description": "A large backlit screen, used for displaying images.  Useful in some electronics recipes.",
+    "price": 10000,
+    "material": "plastic",
+    "weight": "13000 g",
+    "volume": "15000 ml",
+    "to_hit": -4
+  },
   {
     "type": "GENERIC",
     "id": "small_lcd_screen",
@@ -2407,8 +2436,8 @@
     "color": "yellow",
     "name": "cash card",
     "description": "A yellow plastic card used to store money.  These became popular once the government officially moved to all electronic money.  It holds up to 2 million dollars.",
-    "price": 100,
-    "price_postapoc": 10,
+    "price": 1000,
+    "price_postapoc": 1,
     "material": "plastic",
     "flags": [ "NO_UNLOAD", "NO_RELOAD" ],
     "weight": "6 g",
diff --git a/data/json/items/gun/20x66mm.json b/data/json/items/gun/20x66mm.json
index 7acc32f148499..0758ca553462f 100644
--- a/data/json/items/gun/20x66mm.json
+++ b/data/json/items/gun/20x66mm.json
@@ -55,7 +55,7 @@
     "skill": "shotgun",
     "dispersion": 335,
     "durability": 9,
-    "burst": 4,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 2 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "grip", 1 ],
diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
index d5a7c35764921..dddea2ae55977 100644
--- a/data/json/items/gun/22.json
+++ b/data/json/items/gun/22.json
@@ -21,7 +21,7 @@
     "dispersion": 280,
     "durability": 6,
     "min_cycle_recoil": 39,
-    "burst": 20,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "barrel_length": 1,
     "valid_mod_locations": [
       [ "accessories", 3 ],
@@ -176,7 +176,7 @@
     "durability": 9,
     "blackpowder_tolerance": 24,
     "min_cycle_recoil": 39,
-    "burst": 20,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "reload": 500,
     "valid_mod_locations": [
       [ "accessories", 3 ],
diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 26f1819dcf47c..fa463b758e29c 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -19,7 +19,7 @@
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "burst": 11,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 1,
     "built_in_mods": [ "folding_stock" ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
@@ -66,7 +66,7 @@
     "dispersion": 180,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "burst": 14,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
@@ -88,7 +88,7 @@
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "burst": 13,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
@@ -152,7 +152,7 @@
     "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The carbine model incorporates Leadworks' proprietary gyro-stabilization technology and includes a red-dot sight and an integral laser sight.  Additionally it comes with underslung shotgun for close range encounters.  Like the rest of the family, doesn't accept third-party modifications.",
     "price": 520000,
     "durability": 9,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "relative": { "weight": 400 },
     "built_in_mods": [ "lead_red_dot_sight", "lead_barrel_small", "lead_laser_sight", "lead_u_shotgun", "lead_stabilizer" ],
     "valid_mod_locations": [
@@ -253,7 +253,7 @@
     "durability": 7,
     "min_cycle_recoil": 1350,
     "reload": 400,
-    "modes": [ [ "DEFAULT", "auto", 12 ] ],
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "built_in_mods": [ "bipod" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -277,7 +277,7 @@
     "name": "M27 IAR",
     "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.",
     "weight": "3495 g",
-    "burst": 13,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ],
     "relative": { "ranged_damage": 1, "durability": 1 }
   },
@@ -301,7 +301,7 @@
     "dispersion": 180,
     "durability": 6,
     "min_cycle_recoil": 1350,
-    "burst": 14,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
@@ -422,7 +422,7 @@
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
   {
@@ -442,7 +442,7 @@
     "dispersion": 180,
     "durability": 9,
     "min_cycle_recoil": 1350,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 12 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ],
     "built_in_mods": [ "folding_stock" ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
@@ -465,7 +465,7 @@
     "dispersion": 140,
     "durability": 8,
     "min_cycle_recoil": 1350,
-    "burst": 12,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "built_in_mods": [ "grip" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json
index 034ab5b4ccf84..993ddb3df9221 100644
--- a/data/json/items/gun/3006.json
+++ b/data/json/items/gun/3006.json
@@ -135,7 +135,7 @@
     "dispersion": 180,
     "durability": 8,
     "min_cycle_recoil": 3420,
-    "burst": 8,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "barrel_length": 4,
     "valid_mod_locations": [
       [ "accessories", 4 ],
diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json
index 9635f03f038a0..95459c058ae58 100644
--- a/data/json/items/gun/300BLK.json
+++ b/data/json/items/gun/300BLK.json
@@ -19,7 +19,7 @@
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 1700,
-    "burst": 11,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 1,
     "built_in_mods": [ "folding_stock" ],
     "magazines": [ [ "300blk", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json
index 1e2acb7406771..b302b3adf86f0 100644
--- a/data/json/items/gun/308.json
+++ b/data/json/items/gun/308.json
@@ -20,7 +20,7 @@
     "dispersion": 150,
     "durability": 8,
     "min_cycle_recoil": 2700,
-    "burst": 12,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 2,
     "magazines": [ [ "308", [ "falmag", "falbigmag" ] ] ]
   },
@@ -45,7 +45,7 @@
     "dispersion": 150,
     "min_cycle_recoil": 2700,
     "durability": 8,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ],
     "magazines": [ [ "308", [ "g3mag", "g3bigmag" ] ] ]
   },
   {
@@ -87,7 +87,7 @@
     "weight": "4820 g",
     "price": 195000,
     "material": [ "steel", "plastic" ],
-    "burst": 12,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -161,7 +161,7 @@
     "durability": 9,
     "min_cycle_recoil": 2700,
     "reload": 400,
-    "modes": [ [ "DEFAULT", "auto", 11 ] ],
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "built_in_mods": [ "bipod" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -199,7 +199,7 @@
     "durability": 7,
     "min_cycle_recoil": 2700,
     "reload": 400,
-    "modes": [ [ "DEFAULT", "auto", 11 ] ],
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "built_in_mods": [ "bipod" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -354,7 +354,7 @@
     "dispersion": 180,
     "durability": 8,
     "min_cycle_recoil": 2700,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "default_mods": [ "adjustable_stock" ],
     "magazines": [ [ "308", [ "hk417mag_20rd", "hk417mag_10rd" ] ] ]
   },
diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json
index ec4e4463113ff..1667b4d01f7c5 100644
--- a/data/json/items/gun/32.json
+++ b/data/json/items/gun/32.json
@@ -58,7 +58,7 @@
     "dispersion": 360,
     "durability": 6,
     "min_cycle_recoil": 135,
-    "burst": 14,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "built_in_mods": [ "folding_stock" ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json
index b9d788e70c41d..1650d4c0c0f2d 100644
--- a/data/json/items/gun/380.json
+++ b/data/json/items/gun/380.json
@@ -12,7 +12,7 @@
     "bashing": 5,
     "ammo": "380",
     "min_cycle_recoil": 270,
-    "burst": 23,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "magazines": [ [ "380", [ "mac11mag" ] ] ]
   },
   {
diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index 018279dc6c6e4..afd179307586a 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -137,7 +137,7 @@
     "durability": 4,
     "blackpowder_tolerance": 24,
     "min_cycle_recoil": 425,
-    "modes": [ [ "DEFAULT", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "burst", 5 ] ],
     "loudness": 25,
     "barrel_length": 1,
     "valid_mod_locations": [
diff --git a/data/json/items/gun/40mm.json b/data/json/items/gun/40mm.json
index 843b24f6484ba..8d535c4bf967d 100644
--- a/data/json/items/gun/40mm.json
+++ b/data/json/items/gun/40mm.json
@@ -106,7 +106,7 @@
       [ "rail mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ], [ "AUTO", "auto", 6, "NPC_AVOID" ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ] ],
     "magazines": [ [ "40mm", [ "belt40mm" ] ] ],
     "flags": [ "MOUNTED_GUN" ]
   },
diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json
index 37828cda8bf6d..081546905bd71 100644
--- a/data/json/items/gun/45.json
+++ b/data/json/items/gun/45.json
@@ -19,7 +19,7 @@
     "dispersion": 280,
     "durability": 7,
     "min_cycle_recoil": 540,
-    "burst": 20,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -59,7 +59,7 @@
     "dispersion": 240,
     "durability": 8,
     "min_cycle_recoil": 540,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -134,7 +134,7 @@
     "dispersion": 520,
     "durability": 7,
     "min_cycle_recoil": 540,
-    "burst": 18,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "built_in_mods": [ "wire_stock" ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
@@ -215,7 +215,7 @@
     "durability": 4,
     "blackpowder_tolerance": 24,
     "min_cycle_recoil": 456,
-    "modes": [ [ "DEFAULT", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "burst", 5 ] ],
     "loudness": 25,
     "barrel_length": 1,
     "valid_mod_locations": [
@@ -278,7 +278,7 @@
     "dispersion": 360,
     "durability": 7,
     "min_cycle_recoil": 540,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 2,
     "valid_mod_locations": [
       [ "accessories", 3 ],
diff --git a/data/json/items/gun/46.json b/data/json/items/gun/46.json
index c6ffb9a53b7e9..45dac19c34820 100644
--- a/data/json/items/gun/46.json
+++ b/data/json/items/gun/46.json
@@ -19,7 +19,7 @@
     "dispersion": 260,
     "durability": 8,
     "min_cycle_recoil": 81,
-    "burst": 16,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "built_in_mods": [ "wire_stock" ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json
index 7ac7b250b1cf5..b34f088fda80c 100644
--- a/data/json/items/gun/50.json
+++ b/data/json/items/gun/50.json
@@ -46,7 +46,7 @@
     "durability": 8,
     "reload": 400,
     "barrel_length": 5,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 8 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json
index 97512d3af50a3..8f3fac8ea789c 100644
--- a/data/json/items/gun/545x39.json
+++ b/data/json/items/gun/545x39.json
@@ -19,7 +19,7 @@
     "skill": "rifle",
     "dispersion": 150,
     "durability": 8,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 1,
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -58,7 +58,7 @@
     "dispersion": 150,
     "durability": 7,
     "barrel_length": 1,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ], [ "AUTO", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json
index 97b55f78efa00..0c2e2d8b7edd8 100644
--- a/data/json/items/gun/57.json
+++ b/data/json/items/gun/57.json
@@ -56,7 +56,7 @@
     "dispersion": 260,
     "durability": 8,
     "min_cycle_recoil": 81,
-    "burst": 15,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
diff --git a/data/json/items/gun/5x50.json b/data/json/items/gun/5x50.json
index 937892ca1e024..f26e0aaedb6cc 100644
--- a/data/json/items/gun/5x50.json
+++ b/data/json/items/gun/5x50.json
@@ -21,7 +21,7 @@
     "dispersion": 220,
     "durability": 9,
     "barrel_length": 1,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "5 rd.", 5 ], [ "AUTO", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "5 rd.", 5 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -58,7 +58,7 @@
     "skill": "pistol",
     "dispersion": 280,
     "durability": 9,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ], [ "AUTO", "auto", 5 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "brass catcher", 1 ],
diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 11da7fff34ef9..745915174ea58 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -18,7 +18,7 @@
     "skill": "rifle",
     "dispersion": 180,
     "durability": 9,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 1,
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -58,7 +58,7 @@
     "skill": "rifle",
     "dispersion": 160,
     "durability": 9,
-    "burst": 12,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 1,
     "default_mods": [ "folding_stock" ],
     "valid_mod_locations": [
diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json
index f6b3979bb6af7..7b3aad011a54b 100644
--- a/data/json/items/gun/762x25.json
+++ b/data/json/items/gun/762x25.json
@@ -22,7 +22,7 @@
     "durability": 8,
     "min_cycle_recoil": 270,
     "barrel_length": 2,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 15 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json
index fb7011a9d64e1..f169ff2fcf163 100644
--- a/data/json/items/gun/8x40mm.json
+++ b/data/json/items/gun/8x40mm.json
@@ -55,7 +55,7 @@
     "ranged_damage": 10,
     "dispersion": 10,
     "durability": 9,
-    "burst": 2,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 2 ] ],
     "barrel_length": 3,
     "built_in_mods": [ "riv_scope", "riv_suppressor" ],
     "valid_mod_locations": [
@@ -90,7 +90,7 @@
     "skill": "smg",
     "dispersion": 120,
     "durability": 9,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "grip", 1 ],
@@ -126,7 +126,7 @@
     "ranged_damage": 10,
     "dispersion": 90,
     "durability": 9,
-    "burst": 30,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "reload": 400,
     "barrel_length": 6,
     "magazine_well": 6,
@@ -153,7 +153,7 @@
     "ranged_damage": 5,
     "dispersion": 50,
     "durability": 9,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "grip", 1 ],
@@ -190,7 +190,7 @@
     "durability": 9,
     "reload": 200,
     "barrel_length": 2,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "4 rd.", 4 ], [ "AUTO", "auto", 20 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "4 rd.", 4 ], [ "AUTO", "auto", 6 ] ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -225,7 +225,7 @@
     "ranged_damage": 10,
     "dispersion": 30,
     "durability": 9,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_length": 2,
     "valid_mod_locations": [
       [ "accessories", 4 ],
diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 64b19618a6007..274a0b74924df 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -22,7 +22,7 @@
     "dispersion": 280,
     "durability": 6,
     "min_cycle_recoil": 450,
-    "burst": 13,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -128,7 +128,7 @@
     "durability": 8,
     "min_cycle_recoil": 450,
     "blackpowder_tolerance": 32,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 13 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -166,7 +166,7 @@
       [ "sling", 1 ],
       [ "stock", 1 ]
     ],
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 12 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ],
     "built_in_mods": [ "mp5sd_suppressor" ]
   },
   {
@@ -300,7 +300,7 @@
     "//": "The M93R can go through up to 110 rounds in six seconds, FWIW.",
     "description": "A selective-firing 9x19mm handgun introduced by Leadworks LLC's, L39B provides accurate single-shot placement as well as controllable short-range firepower with its three-round burst mode.  Users praised its accuracy and fearsome appearance.  Comes with built in red dot and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "price": 95000,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ],
     "relative": { "weight": 130, "durability": -1 }
   },
   {
@@ -424,7 +424,7 @@
     "durability": 4,
     "blackpowder_tolerance": 24,
     "min_cycle_recoil": 380,
-    "modes": [ [ "DEFAULT", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "burst", 5 ] ],
     "loudness": 25,
     "barrel_length": 1,
     "valid_mod_locations": [
@@ -463,7 +463,7 @@
     "durability": 5,
     "blackpowder_tolerance": 24,
     "min_cycle_recoil": 450,
-    "modes": [ [ "DEFAULT", "auto", 10 ] ],
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "muzzle", 1 ],
@@ -498,7 +498,7 @@
     "dispersion": 520,
     "durability": 6,
     "min_cycle_recoil": 450,
-    "modes": [ [ "DEFAULT", "auto", 8 ] ],
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -563,7 +563,7 @@
     "dispersion": 360,
     "durability": 7,
     "min_cycle_recoil": 450,
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "built_in_mods": [ "folding_stock" ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
@@ -613,7 +613,7 @@
     "name": "Glock 18C",
     "description": "A selective fire variation on the Glock 17, originally designed for Austria's EKO Cobra unit.  It has compensator cuts along its barrel to make recoil more manageable.",
     "price": 100000,
-    "burst": 20,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
     "built_in_mods": [ "barrel_ported" ]
   },
   {
diff --git a/data/json/items/gun/9x18.json b/data/json/items/gun/9x18.json
index e155c4b755702..6a3fd5e7c56a2 100644
--- a/data/json/items/gun/9x18.json
+++ b/data/json/items/gun/9x18.json
@@ -45,7 +45,7 @@
     "weight": "1251 g",
     "ammo": "9x18",
     "min_cycle_recoil": 270,
-    "burst": 15,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "magazines": [ [ "9x18", [ "skorpion82mag" ] ] ]
   }
 ]
diff --git a/data/json/items/gun/flammable.json b/data/json/items/gun/flammable.json
index 9f6c3fe949bd0..df307bda7cee2 100644
--- a/data/json/items/gun/flammable.json
+++ b/data/json/items/gun/flammable.json
@@ -15,7 +15,7 @@
     "range": 6,
     "dispersion": 300,
     "durability": 8,
-    "burst": 4,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 1 ],
       [ "grip", 1 ],
@@ -44,7 +44,7 @@
     "ranged_damage": 10,
     "dispersion": 240,
     "durability": 9,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [ [ "accessories", 4 ], [ "rail", 1 ], [ "grip", 1 ], [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
     "extend": { "flags": [ "FIRE_20", "MODE_BURST", "NON-FOULING" ] },
     "delete": { "flags": [ "FIRE_100" ] },
diff --git a/data/json/items/gun/nail.json b/data/json/items/gun/nail.json
index a0f4bef0763f7..a09a46bbdde22 100644
--- a/data/json/items/gun/nail.json
+++ b/data/json/items/gun/nail.json
@@ -66,7 +66,7 @@
     "to_hit": -1,
     "bashing": 12,
     "skill": "rifle",
-    "burst": 10,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 0,
     "valid_mod_locations": [
       [ "accessories", 4 ],
diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index 9a6976a52a830..5ddab3e6d5176 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -16,7 +16,7 @@
     "color": "dark_gray",
     "dispersion": 450,
     "durability": 6,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "loudness": 25,
     "reload": 400,
     "barrel_length": 3,
@@ -71,7 +71,7 @@
     "material": [ "aluminum", "steel" ],
     "dispersion": 855,
     "durability": 6,
-    "burst": 6,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 6,
     "reload": 110,
     "valid_mod_locations": [
diff --git a/data/json/items/gun/ups.json b/data/json/items/gun/ups.json
index d1e9e103af7d1..dac0f19ddc8b5 100644
--- a/data/json/items/gun/ups.json
+++ b/data/json/items/gun/ups.json
@@ -20,7 +20,7 @@
     "pierce": 20,
     "dispersion": 10,
     "durability": 10,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "loudness": 23,
     "ups_charges": 70,
     "reload": 0,
@@ -159,7 +159,7 @@
     "pierce": 15,
     "dispersion": 10,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "loudness": 12,
     "ups_charges": 40,
     "reload": 0,
diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json
index 4449567615b9a..ec40ec110a2a9 100644
--- a/data/json/items/gunmod/mechanism.json
+++ b/data/json/items/gunmod/mechanism.json
@@ -37,7 +37,7 @@
     "//install_time": "5 m",
     "dispersion_modifier": 10,
     "//durability_modifier": -1,
-    "mode_modifier": [ [ "AUTO", "auto", 13 ] ],
+    "mode_modifier": [ [ "AUTO", "auto", 4 ] ],
     "min_skills": [ [ "rifle", 2 ] ]
   },
   {
diff --git a/data/json/items/gunmod/muzzle.json b/data/json/items/gunmod/muzzle.json
index d49fc9d04f44d..1acbf9774ef76 100644
--- a/data/json/items/gunmod/muzzle.json
+++ b/data/json/items/gunmod/muzzle.json
@@ -129,9 +129,10 @@
     "id": "shot_suppressor",
     "type": "GUNMOD",
     "name": "shotgun suppressor",
-    "description": "A suppressor designed to work with shotguns.  It's a lot more complex than a suppressor for a pistol or rifle.",
-    "weight": "600 g",
-    "volume": "1 L",
+    "//": "SilencerCo Salvo 12",
+    "description": "A large suppressor designed to work with shotguns.  It's a lot more complex than a suppressor for a pistol or rifle.",
+    "weight": "968 g",
+    "volume": "1286 ml",
     "price": 140000,
     "to_hit": 1,
     "bashing": 3,
@@ -151,10 +152,10 @@
     "id": "suppressor",
     "type": "GUNMOD",
     "name": "suppressor",
-    "//": "SilencerCo Saker ASR 556K",
+    "//": "SilencerCo Hybrid 46",
     "description": "A suppressor reduces the amount of noise and muzzle flash generated by the report of a firearm.  Gunfire is extremely loud and can damage your hearing without protection; a suppressor will bring the loudness of a report down to generally safe levels.",
-    "weight": "402 g",
-    "volume": "156 ml",
+    "weight": "490 g",
+    "volume": "247 ml",
     "price": 77000,
     "to_hit": 1,
     "bashing": 3,
@@ -191,8 +192,9 @@
     "type": "GUNMOD",
     "name": "compact suppressor",
     "description": "A compact suppressor designed for pistols and best used with smaller calibers.",
-    "weight": "140 g",
-    "volume": "250 ml",
+    "weight": "303 g",
+    "//": "SilencerCo Omega 45K",
+    "volume": "179 ml",
     "price": 78000,
     "material": "steel",
     "symbol": ":",
diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
index d03a84baf6a1a..d334be791a2ea 100644
--- a/data/json/items/gunmod/underbarrel.json
+++ b/data/json/items/gunmod/underbarrel.json
@@ -15,7 +15,6 @@
     "gun_data": { "ammo": "flammable", "skill": "launcher", "dispersion": 300, "durability": 10 },
     "magazine_well": 1,
     "magazines": [ [ "flammable", [ "aux_pressurized_tank" ] ] ],
-    "dispersion_modifier": 30,
     "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
     "flags": [ "FIRE_100", "PUMP_RAIL_COMPATIBLE", "NON-FOULING" ]
   },
@@ -62,7 +61,6 @@
     "location": "underbarrel",
     "mod_targets": [ "rifle" ],
     "gun_data": { "ammo": "shot", "skill": "shotgun", "range": 2, "dispersion": 345, "durability": 10, "clip_size": 2 },
-    "dispersion_modifier": 15,
     "flags": [ "IRREMOVABLE", "RELOAD_ONE", "RELOAD_EJECT" ]
   },
   {
@@ -123,7 +121,6 @@
     "color": "light_gray",
     "location": "underbarrel",
     "mod_targets": [ "shotgun", "rifle" ],
-    "dispersion_modifier": 10,
     "mode_modifier": [ [ "REACH", "bayonet", 2, [ "MELEE", "REACH_ATTACK" ] ] ],
     "qualities": [ [ "CUT", 1 ], [ "COOK", 1 ], [ "BUTCHER", -18 ] ],
     "flags": [ "SLOW_WIELD", "IRREMOVABLE", "STAB" ]
@@ -210,7 +207,6 @@
     "location": "underbarrel",
     "mod_targets": [ "rifle", "crossbow" ],
     "gun_data": { "ammo": "40mm", "skill": "launcher", "dispersion": 300, "durability": 10, "clip_size": 1 },
-    "dispersion_modifier": 30,
     "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
     "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ]
   },
@@ -237,7 +233,6 @@
     "location": "underbarrel",
     "mod_targets": [ "rifle", "crossbow" ],
     "gun_data": { "ammo": "40mm", "skill": "launcher", "dispersion": 270, "durability": 10, "clip_size": 1 },
-    "dispersion_modifier": 60,
     "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
     "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ]
   },
@@ -258,7 +253,6 @@
     "gunmod_data": {
       "location": "underbarrel",
       "mod_targets": [ "shotgun", "rifle", "smg", "launcher", "crossbow" ],
-      "dispersion_modifier": 10,
       "mode_modifier": [ [ "REACH", "bayonet", 2, [ "MELEE", "REACH_ATTACK" ] ] ]
     },
     "min_skills": [ [ "weapon", 2 ], [ "melee", 1 ] ],
@@ -279,7 +273,6 @@
     "location": "underbarrel",
     "mod_targets": [ "rifle", "crossbow" ],
     "gun_data": { "ammo": "shot", "skill": "shotgun", "dispersion": 330, "durability": 10, "clip_size": 4 },
-    "dispersion_modifier": 15,
     "min_skills": [ [ "weapon", 2 ], [ "shotgun", 1 ] ],
     "flags": [ "RELOAD_ONE" ]
   },
@@ -305,7 +298,6 @@
     "location": "underbarrel",
     "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ],
     "gun_data": { "ammo": "40mm", "skill": "launcher", "dispersion": 450, "durability": 10, "clip_size": 1 },
-    "dispersion_modifier": 60,
     "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ]
   },
   {
@@ -323,7 +315,6 @@
     "color": "light_gray",
     "location": "underbarrel",
     "mod_targets": [ "pistol" ],
-    "dispersion_modifier": 15,
     "min_skills": [ [ "weapon", 2 ], [ "melee", 1 ] ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 15 ] ],
     "flags": [ "STAB" ]
@@ -342,7 +333,6 @@
     "location": "underbarrel",
     "mod_targets": [ "rifle", "crossbow" ],
     "gun_data": { "ammo": "20x66mm", "skill": "shotgun", "dispersion": 320, "durability": 9, "reload": 125 },
-    "dispersion_modifier": 30,
     "min_skills": [ [ "weapon", 2 ], [ "shotgun", 2 ] ],
     "magazine_well": 1,
     "magazines": [ [ "20x66mm", [ "20x66_10_mag" ] ] ],
@@ -370,7 +360,6 @@
     "location": "underbarrel",
     "mod_targets": [ "rifle", "crossbow" ],
     "gun_data": { "ammo": "shot", "skill": "shotgun", "dispersion": 375, "durability": 10, "clip_size": 2 },
-    "dispersion_modifier": 30,
     "min_skills": [ [ "weapon", 2 ], [ "shotgun", 1 ] ],
     "flags": [ "RELOAD_ONE" ]
   },
@@ -424,7 +413,6 @@
     "weight": "0 g",
     "volume": 0,
     "price": 0,
-    "dispersion_modifier": 0,
     "flags": [ "RELOAD_ONE", "IRREMOVABLE" ]
   },
   {
@@ -437,7 +425,6 @@
     "weight": "0 g",
     "volume": 0,
     "price": 0,
-    "dispersion_modifier": 0,
     "flags": [ "NEVER_JAMS", "RELOAD_EJECT", "IRREMOVABLE" ]
   }
 ]
diff --git a/data/json/items/magazine/308.json b/data/json/items/magazine/308.json
index 00f371e13def4..b7115fdcffa9e 100644
--- a/data/json/items/magazine/308.json
+++ b/data/json/items/magazine/308.json
@@ -48,7 +48,7 @@
     "id": "g3bigmag",
     "type": "MAGAZINE",
     "name": "H&K G3 drum magazine",
-    "description": "An 50-round drum magazine for the H&K G3 rifle.",
+    "description": "A 50-round drum magazine for the H&K G3 rifle.",
     "weight": "650 g",
     "volume": "1 L",
     "price": 7900,
@@ -118,7 +118,7 @@
     "id": "scarhbigmag",
     "type": "MAGAZINE",
     "name": "FN SCAR-H drum magazine",
-    "description": "An 50-round drum magazine for the FN SCAR-H rifle.",
+    "description": "A 50-round drum magazine for the FN SCAR-H rifle.",
     "weight": "400 g",
     "volume": "1 L",
     "price": 8900,
diff --git a/data/json/items/melee.json b/data/json/items/melee.json
index 053a89fae488c..67cc757dc1b6f 100644
--- a/data/json/items/melee.json
+++ b/data/json/items/melee.json
@@ -68,22 +68,6 @@
     "category": "weapons",
     "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "BUTCHER", 16 ] ]
   },
-  {
-    "type": "GENERIC",
-    "id": "rock",
-    "symbol": "*",
-    "color": "light_gray",
-    "name": "rock",
-    "description": "A rock the size of a baseball.  Makes a decent melee weapon, and is also good for throwing at enemies.",
-    "category": "spare_parts",
-    "material": "stone",
-    "flags": "TRADER_AVOID",
-    "weight": "657 g",
-    "volume": "250 ml",
-    "bashing": 7,
-    "to_hit": -2,
-    "qualities": [ [ "HAMMER", 1 ] ]
-  },
   {
     "type": "GENERIC",
     "id": "sharp_rock",
diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
index e6ee4174a0142..ea24d1bd9d857 100644
--- a/data/json/items/melee/swords_and_blades.json
+++ b/data/json/items/melee/swords_and_blades.json
@@ -100,7 +100,6 @@
     "gunmod_data": {
       "location": "underbarrel",
       "mod_targets": [ "shotgun", "rifle", "smg", "crossbow" ],
-      "dispersion_modifier": 10,
       "mode_modifier": [ [ "REACH", "bayonet", 2, [ "MELEE", "REACH_ATTACK" ] ] ]
     },
     "min_skills": [ [ "weapon", 2 ], [ "melee", 1 ] ],
@@ -119,7 +118,6 @@
     "gunmod_data": {
       "location": "underbarrel",
       "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ],
-      "dispersion_modifier": 10,
       "mode_modifier": [ [ "REACH", "bayonet", 2, [ "MELEE", "REACH_ATTACK" ] ] ]
     },
     "extend": { "flags": [ "PUMP_RAIL_COMPATIBLE" ] }
@@ -181,7 +179,6 @@
     "gunmod_data": {
       "location": "underbarrel",
       "mod_targets": [ "shotgun", "rifle" ],
-      "dispersion_modifier": 10,
       "mode_modifier": [ [ "REACH", "bayonet", 2, [ "MELEE", "REACH_ATTACK" ] ] ]
     },
     "min_skills": [ [ "weapon", 2 ], [ "melee", 1 ] ],
@@ -798,7 +795,6 @@
     "gunmod_data": {
       "location": "underbarrel",
       "mod_targets": [ "shotgun", "rifle", "crossbow", "launcher" ],
-      "dispersion_modifier": 20,
       "mode_modifier": [ [ "REACH", "bayonet", 2, [ "MELEE", "REACH_ATTACK" ] ] ]
     },
     "min_skills": [ [ "weapon", 2 ], [ "melee", 2 ] ],
diff --git a/data/json/items/migration.json b/data/json/items/migration.json
index c0a79915b0c58..00763f9506785 100644
--- a/data/json/items/migration.json
+++ b/data/json/items/migration.json
@@ -201,7 +201,7 @@
   {
     "id": "dogfood_canned",
     "type": "MIGRATION",
-    "replace": "can_food",
+    "replace": "can_medium",
     "contents": [ "dogfood" ]
   },
   {
diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
index 8aa0c3e9cd200..40b68eb843f34 100644
--- a/data/json/items/obsolete.json
+++ b/data/json/items/obsolete.json
@@ -282,15 +282,6 @@
     "min_skills": [ [ "weapon", 3 ], [ "mechanics", 2 ] ],
     "flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
   },
-  {
-    "id": "bio_solar",
-    "copy-from": "bionic_general",
-    "type": "BIONIC_ITEM",
-    "name": "Solar Panels CBM",
-    "description": "You have a few solar panels installed.  While in direct sunlight, your power level will slowly recharge.",
-    "price": 350000,
-    "difficulty": 4
-  },
   {
     "id": "beltfeed",
     "type": "GUNMOD",
diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json
index 54c7adf7995bb..70ee012afc17c 100644
--- a/data/json/items/ranged.json
+++ b/data/json/items/ranged.json
@@ -57,6 +57,40 @@
     "durability": 6,
     "clip_size": 1
   },
+  {
+    "id": "staff_sling",
+    "looks_like": "slingshot",
+    "type": "GUN",
+    "symbol": "(",
+    "color": "brown",
+    "name": "staff sling",
+    "description": "A leather sling attached to a staff, easy to use and accurate.  It uses rocks as ammunition.",
+    "price": 150,
+    "//": "The staff sling,consists of a staff with a short sling at one end. ",
+    "material": [ "wood", "leather" ],
+    "flags": [
+      "RELOAD_AND_SHOOT",
+      "NEVER_JAMS",
+      "PRIMITIVE_RANGED_WEAPON",
+      "BELTED",
+      "DURABLE_MELEE",
+      "NONCONDUCTIVE",
+      "SHEATH_SPEAR",
+      "ALWAYS_TWOHAND"
+    ],
+    "techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ],
+    "skill": "throw",
+    "ammo": "rock",
+    "weight": "2000 g",
+    "volume": "3 L",
+    "to_hit": 1,
+    "ranged_damage": 10,
+    "bashing": 18,
+    "range": 10,
+    "dispersion": 200,
+    "durability": 8,
+    "clip_size": 1
+  },
   {
     "id": "slingshot",
     "//": "Tileset whitelist for sling & slingshots.",
@@ -214,7 +248,7 @@
     "ranged_damage": 5,
     "dispersion": 60,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 25,
     "reload": 700,
     "valid_mod_locations": [
@@ -326,7 +360,7 @@
     "range": 15,
     "dispersion": 75,
     "durability": 7,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 15,
     "reload": 6000,
     "loudness": 18,
@@ -666,7 +700,7 @@
     "to_hit": -3,
     "dispersion": 300,
     "durability": 5,
-    "burst": 1,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
     "clip_size": 1,
     "reload": 800,
     "loudness": 200,
@@ -693,7 +727,7 @@
     "range": 10,
     "dispersion": 450,
     "durability": 10,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "burst", 4 ] ],
     "clip_size": 100,
     "reload": 0,
     "valid_mod_locations": [ [ "sling", 1 ] ]
diff --git a/data/json/items/resources/glass.json b/data/json/items/resources/glass.json
index 141cc6fdf9d40..a38314bc7c187 100644
--- a/data/json/items/resources/glass.json
+++ b/data/json/items/resources/glass.json
@@ -32,7 +32,7 @@
     "category": "spare_parts",
     "price": 5000,
     "material": "glass",
-    "weight": "24176 g",
+    "weight": "13608 g",
     "volume": "12500 ml",
     "bashing": 4,
     "to_hit": -5,
diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json
index 99fe1c84253b2..cfeeb9801300a 100644
--- a/data/json/items/resources/tailoring.json
+++ b/data/json/items/resources/tailoring.json
@@ -297,13 +297,13 @@
     "ammo_type": "components"
   },
   {
-    "id": "sheet_nomex_patchwork",
-    "copy-from": "sheet_nomex",
+    "id": "sheet_nylon_patchwork",
+    "copy-from": "sheet_nylon",
     "type": "AMMO",
     "name": "patchwork synthetic fabric clothing parts",
     "name_plural": "patchwork synthetic fabric clothing parts",
     "description": "A selection of various clothing parts, sewn together from synthetic fabric patches in a patchwork fashion.  Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.",
-    "weight": "100 g",
+    "weight": "60 g",
     "volume": "60 ml",
     "price": 1000,
     "count": 1
diff --git a/data/json/items/tools.json b/data/json/items/tools.json
index 2b9b3dea6dca0..bf56272983696 100644
--- a/data/json/items/tools.json
+++ b/data/json/items/tools.json
@@ -1789,7 +1789,7 @@
     "//": "Too small to be effectively used for butchering, still not bad at it due to serrated edge.",
     "description": "This is a short, sturdy knife with a serrated edge for cutting lines and straps, and a blunt tip for prying.  Used primarily by divers, it is very light and takes up virtually no space in one's pockets.",
     "weight": "226 g",
-    "volume": 0,
+    "volume": "250 ml",
     "price": 14000,
     "cutting": 12,
     "material": [ "steel", "plastic" ],
@@ -2076,9 +2076,9 @@
     "symbol": ";",
     "color": "light_gray",
     "ammo": "battery",
-    "initial_charges": 3500,
-    "max_charges": 7000,
-    "charges_per_use": 3500,
+    "initial_charges": 4000,
+    "max_charges": 8000,
+    "charges_per_use": 500,
     "use_action": "JACKHAMMER",
     "flags": [ "STAB", "DIG_TOOL", "POWERED", "USE_UPS", "NO_UNLOAD", "NO_RELOAD" ]
   },
@@ -4516,7 +4516,7 @@
     "type": "TOOL",
     "name": "glass pipe",
     "description": "This is a hand-blown glass pipe.  It's of the type most commonly used to smoke recreational substances.",
-    "weight": "442 g",
+    "weight": "163 g",
     "volume": "250 ml",
     "price": 2000,
     "to_hit": -10,
@@ -5751,7 +5751,7 @@
           "kevlar_rigid"
         ],
         "skill": "tailor",
-        "clothing_mods": [ "leather_padded", "kevlar_padded", "furred", "wooled" ]
+        "clothing_mods": [ "leather_padded", "steel_padded", "kevlar_padded", "furred", "wooled" ]
       }
     ],
     "flags": [ "ALLOWS_REMOTE_USE" ]
diff --git a/data/json/items/vehicle/boat.json b/data/json/items/vehicle/boat.json
index 5e95b547ac3b7..8951464d34fa9 100644
--- a/data/json/items/vehicle/boat.json
+++ b/data/json/items/vehicle/boat.json
@@ -71,7 +71,7 @@
     "name": "sail",
     "name_plural": "sails",
     "description": "Sails for a boat.",
-    "weight": "945 g",
+    "weight": "7904 g",
     "to_hit": -1,
     "color": "light_gray",
     "symbol": ":",
diff --git a/data/json/loot_zones.json b/data/json/loot_zones.json
new file mode 100644
index 0000000000000..fe6001d53d538
--- /dev/null
+++ b/data/json/loot_zones.json
@@ -0,0 +1,188 @@
+[
+  {
+    "id": "LOOT_UNSORTED",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Unsorted",
+    "description": "Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to sort items inside.  It can overlap with Loot zones of different types."
+  },
+  {
+    "id": "LOOT_FOOD",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Food",
+    "description": "Destination for comestibles.  If more specific food zone is not defined, all food is moved here."
+  },
+  {
+    "id": "LOOT_PFOOD",
+    "type": "LOOT_ZONE",
+    "name": "Loot: P.Food",
+    "description": "Destination for perishable comestibles.  Does include perishable drinks if such zone is not specified."
+  },
+  {
+    "id": "LOOT_DRINK",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Drink",
+    "description": "Destination for drinks.  Does include perishable drinks if such zone is not specified."
+  },
+  {
+    "id": "LOOT_PDRINK",
+    "type": "LOOT_ZONE",
+    "name": "Loot: P.Drink",
+    "description": "Destination for perishable drinks."
+  },
+  {
+    "id": "LOOT_CONTAINERS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Containers",
+    "description": "Destination for empty containers."
+  },
+  {
+    "id": "LOOT_GUNS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Guns",
+    "description": "Destination for guns, bows and similar wearpons."
+  },
+  {
+    "id": "LOOT_MAGAZINES",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Magazines",
+    "description": "Destination for gun magazines."
+  },
+  {
+    "id": "LOOT_AMMO",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Ammo",
+    "description": "Destination for ammo."
+  },
+  {
+    "id": "LOOT_WEAPONS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Weapons",
+    "description": "Destination for melee weapons."
+  },
+  {
+    "id": "LOOT_TOOLS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Tools",
+    "description": "Destination for tools."
+  },
+  {
+    "id": "LOOT_CLOTHING",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Clothing",
+    "description": "Destination for clothing.  Does include filthy clothing if such zone is not specified."
+  },
+  {
+    "id": "LOOT_FCLOTHING",
+    "type": "LOOT_ZONE",
+    "name": "Loot: F.Clothing",
+    "description": "Destination for filthy clothing."
+  },
+  {
+    "id": "LOOT_DRUGS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Drugs",
+    "description": "Destination for drugs and other medical items."
+  },
+  {
+    "id": "LOOT_BOOKS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Books",
+    "description": "Destination for books and magazines."
+  },
+  {
+    "id": "LOOT_MODS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Mods",
+    "description": "Destination for firearm modifications and similar items."
+  },
+  {
+    "id": "LOOT_MUTAGENS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Mutagens",
+    "description": "Destination for mutagens, serums, and purifiers."
+  },
+  {
+    "id": "LOOT_BIONICS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Bionics",
+    "description": "Destination for Compact Bionics Modules, a.k.a. CBMS."
+  },
+  {
+    "id": "LOOT_VEHICLE_PARTS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: V.Parts",
+    "description": "Destination for vehicle parts."
+  },
+  {
+    "id": "LOOT_OTHER",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Other",
+    "description": "Destination for other miscellaneous items."
+  },
+  {
+    "id": "LOOT_FUEL",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Fuel",
+    "description": "Destination for gasoline, diesel, lamp oil and other substances used as a fuel."
+  },
+  {
+    "id": "LOOT_SEEDS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Seeds",
+    "description": "Destination for seeds, stems and similar items."
+  },
+  {
+    "id": "LOOT_CHEMICAL",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Chemical",
+    "description": "Destination for chemicals."
+  },
+  {
+    "id": "LOOT_SPARE_PARTS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: S.Parts",
+    "description": "Destination for spare parts."
+  },
+  {
+    "id": "LOOT_ARTIFACTS",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Artifacts",
+    "description": "Destination for artifacts"
+  },
+  {
+    "id": "LOOT_CORPSE",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Corpses",
+    "description": "Destination for corpses"
+  },
+  {
+    "id": "LOOT_ARMOR",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Armor",
+    "description": "Destination for armor.  Does include filthy armor if such zone is not specified."
+  },
+  {
+    "id": "LOOT_FARMOR",
+    "type": "LOOT_ZONE",
+    "name": "Loot: F.Armor",
+    "description": "Destination for filthy armor."
+  },
+  {
+    "id": "LOOT_WOOD",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Wood",
+    "description": "Destination for firewood and items that can be used as such."
+  },
+  {
+    "id": "LOOT_CUSTOM",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Custom",
+    "description": "Destination for loot with a custom filter that you can modify"
+  },
+  {
+    "id": "LOOT_IGNORE",
+    "type": "LOOT_ZONE",
+    "name": "Loot: Ignore",
+    "description": "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+  }
+]
diff --git a/data/json/mapgen/animalshelter.json b/data/json/mapgen/animalshelter.json
index f84f3d6fb4b88..893bf99886489 100644
--- a/data/json/mapgen/animalshelter.json
+++ b/data/json/mapgen/animalshelter.json
@@ -36,7 +36,7 @@
     "items": [
       [ "dog_whistle", 10 ],
       [ "pet_carrier", 30 ],
-      { "item": "dogfood", "prob": 50, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 50, "container-item": "can_medium" },
       { "item": "catfood", "prob": 50, "container-item": "can_food" },
       [ "towel", 20 ],
       [ "soap", 10 ],
diff --git a/data/json/mapgen/basecamps/modular_shelter/modular_shelter_common.json b/data/json/mapgen/basecamps/modular_shelter/modular_shelter_common.json
index b57a89a18abc4..09cd4d6977119 100644
--- a/data/json/mapgen/basecamps/modular_shelter/modular_shelter_common.json
+++ b/data/json/mapgen/basecamps/modular_shelter/modular_shelter_common.json
@@ -70,112 +70,6 @@
     "method": "json",
     "object": { "set": [ { "point": "terrain", "id": "t_water_pump", "x": 16, "y": 9 } ] }
   },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "nested_mapgen_id": "fbmc_shelter_bedroom_SE",
-    "object": {
-      "mapgensize": [ 4, 4 ],
-      "rows": [
-        "wwww",
-        "w   ",
-        "d   ",
-        "w   "
-      ],
-      "palettes": [ "fbmc_shelter_palette" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "update_mapgen_id": "fbmc_shelter_bedroom_se",
-    "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SE" ], "x": 15, "y": 19 } ] }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "nested_mapgen_id": "fbmc_shelter_bedroom_E",
-    "object": {
-      "mapgensize": [ 4, 4 ],
-      "rows": [
-        "wwww",
-        "w   ",
-        "d   ",
-        "w   "
-      ],
-      "palettes": [ "fbmc_shelter_palette" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "update_mapgen_id": "fbmc_shelter_bedroom_e",
-    "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_E" ], "x": 15, "y": 15 } ] }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "nested_mapgen_id": "fbmc_shelter_bedroom_SW",
-    "object": {
-      "mapgensize": [ 5, 5 ],
-      "rows": [
-        " wwww",
-        "    w",
-        "    d",
-        "    w",
-        "  www"
-      ],
-      "palettes": [ "fbmc_shelter_palette" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "update_mapgen_id": "fbmc_shelter_bedroom_SW",
-    "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SW" ], "x": 4, "y": 16 } ] }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "nested_mapgen_id": "fbmc_shelter_bedroom_W",
-    "object": {
-      "mapgensize": [ 4, 4 ],
-      "rows": [
-        "wwww",
-        "   w",
-        "   d",
-        "   w"
-      ],
-      "palettes": [ "fbmc_shelter_palette" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "update_mapgen_id": "fbmc_shelter_bedroom_W",
-    "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_W" ], "x": 5, "y": 12 } ] }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "nested_mapgen_id": "fbmc_shelter_bedroom_NW",
-    "object": {
-      "mapgensize": [ 4, 4 ],
-      "rows": [
-        "    ",
-        "   w",
-        "   d",
-        "   w"
-      ],
-      "palettes": [ "fbmc_shelter_palette" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "update_mapgen_id": "fbmc_shelter_bedroom_NW",
-    "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_NW" ], "x": 5, "y": 8 } ] }
-  },
   {
     "type": "mapgen",
     "method": "json",
diff --git a/data/json/mapgen/basecamps/modular_shelter/modular_shelter_standard.json b/data/json/mapgen/basecamps/modular_shelter/modular_shelter_standard.json
index d0ea3612852bc..b9b9d6c94e010 100644
--- a/data/json/mapgen/basecamps/modular_shelter/modular_shelter_standard.json
+++ b/data/json/mapgen/basecamps/modular_shelter/modular_shelter_standard.json
@@ -1,26 +1,8 @@
 [
-  {
-    "type": "palette",
-    "id": "fbmc_shelter_palette_rock",
-    "terrain": { "w": "t_rock_wall", "d": "t_door_c" },
-    "furniture": {
-      "h": "f_chair",
-      "t": "f_table",
-      "c": "f_workbench",
-      "r": "f_rack",
-      "b": "f_bed",
-      "m": "f_straw_bed",
-      "n": "f_makeshift_bed",
-      "L": "f_locker",
-      "s": "f_sofa",
-      "C": "f_armchair",
-      "B": "f_bookcase"
-    }
-  },
   {
     "type": "mapgen",
     "method": "json",
-    "nested_mapgen_id": "fbmc_shelter_bedroom_SE_rock",
+    "nested_mapgen_id": "fbmc_shelter_bedroom_SE",
     "object": {
       "mapgensize": [ 4, 4 ],
       "rows": [
@@ -29,19 +11,19 @@
         "d   ",
         "w   "
       ],
-      "palettes": [ "fbmc_shelter_palette_rock" ]
+      "palettes": [ "fbmc_shelter_palette" ]
     }
   },
   {
     "type": "mapgen",
-    "update_mapgen_id": "fbmc_shelter_bedroom_se_rock",
+    "update_mapgen_id": "fbmc_shelter_bedroom_se",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SE_rock" ], "x": 15, "y": 19 } ] }
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SE" ], "x": 15, "y": 19 } ] }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "nested_mapgen_id": "fbmc_shelter_bedroom_E_rock",
+    "nested_mapgen_id": "fbmc_shelter_bedroom_E",
     "object": {
       "mapgensize": [ 4, 4 ],
       "rows": [
@@ -50,19 +32,19 @@
         "d   ",
         "w   "
       ],
-      "palettes": [ "fbmc_shelter_palette_rock" ]
+      "palettes": [ "fbmc_shelter_palette" ]
     }
   },
   {
     "type": "mapgen",
-    "update_mapgen_id": "fbmc_shelter_bedroom_e_rock",
+    "update_mapgen_id": "fbmc_shelter_bedroom_e",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_E_rock" ], "x": 15, "y": 15 } ] }
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_E" ], "x": 15, "y": 15 } ] }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "nested_mapgen_id": "fbmc_shelter_bedroom_SW_rock",
+    "nested_mapgen_id": "fbmc_shelter_bedroom_SW",
     "object": {
       "mapgensize": [ 5, 5 ],
       "rows": [
@@ -72,19 +54,19 @@
         "    w",
         "  www"
       ],
-      "palettes": [ "fbmc_shelter_palette_rock" ]
+      "palettes": [ "fbmc_shelter_palette" ]
     }
   },
   {
     "type": "mapgen",
-    "update_mapgen_id": "fbmc_shelter_bedroom_SW_rock",
+    "update_mapgen_id": "fbmc_shelter_bedroom_SW",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SW_rock" ], "x": 4, "y": 16 } ] }
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_SW" ], "x": 4, "y": 16 } ] }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "nested_mapgen_id": "fbmc_shelter_bedroom_W_rock",
+    "nested_mapgen_id": "fbmc_shelter_bedroom_W",
     "object": {
       "mapgensize": [ 4, 4 ],
       "rows": [
@@ -93,19 +75,19 @@
         "   d",
         "   w"
       ],
-      "palettes": [ "fbmc_shelter_palette_rock" ]
+      "palettes": [ "fbmc_shelter_palette" ]
     }
   },
   {
     "type": "mapgen",
-    "update_mapgen_id": "fbmc_shelter_bedroom_W_rock",
+    "update_mapgen_id": "fbmc_shelter_bedroom_W",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_W_rock" ], "x": 5, "y": 12 } ] }
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_W" ], "x": 5, "y": 12 } ] }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "nested_mapgen_id": "fbmc_shelter_bedroom_NW_rock",
+    "nested_mapgen_id": "fbmc_shelter_bedroom_NW",
     "object": {
       "mapgensize": [ 4, 4 ],
       "rows": [
@@ -114,13 +96,13 @@
         "   d",
         "   w"
       ],
-      "palettes": [ "fbmc_shelter_palette_rock" ]
+      "palettes": [ "fbmc_shelter_palette" ]
     }
   },
   {
     "type": "mapgen",
-    "update_mapgen_id": "fbmc_shelter_bedroom_NW_rock",
+    "update_mapgen_id": "fbmc_shelter_bedroom_NW",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_NW_rock" ], "x": 5, "y": 8 } ] }
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_bedroom_NW" ], "x": 5, "y": 8 } ] }
   }
 ]
diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_common.json b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_common.json
new file mode 100644
index 0000000000000..e0dad10157f68
--- /dev/null
+++ b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_common.json
@@ -0,0 +1,494 @@
+[
+  {
+    "type": "palette",
+    "id": "fbmc_shelter_1_palette",
+    "terrain": { "w": "t_wall_w", "d": "t_door_c" },
+    "furniture": {
+      "h": "f_chair",
+      "t": "f_table",
+      "x": "f_coffee_table",
+      "c": "f_workbench",
+      "r": "f_rack",
+      "b": "f_bed",
+      "m": "f_straw_bed",
+      "n": "f_makeshift_bed",
+      "L": "f_locker",
+      "s": "f_sofa",
+      "C": "f_armchair",
+      "B": "f_bookcase"
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_0",
+    "method": "json",
+    "object": {
+      "set": [
+        { "point": "terrain", "id": "t_floor", "x": 15, "y": 15 },
+        { "point": "furniture", "id": "f_bulletin", "x": 15, "y": 15 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_fireplace",
+    "method": "json",
+    "object": {
+      "set": [
+        { "point": "furniture", "id": "f_fireplace", "x": 18, "y": 14 },
+        { "point": "furniture", "id": "f_table", "x": 18, "y": 15 }
+      ],
+      "place_loot": [ { "item": "pot", "x": 18, "y": 15, "chance": 100 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_brazier",
+    "method": "json",
+    "object": {
+      "set": [
+        { "point": "furniture", "id": "f_brazier", "x": 18, "y": 14 },
+        { "point": "furniture", "id": "f_table", "x": 18, "y": 15 }
+      ],
+      "place_loot": [ { "item": "pot", "x": 18, "y": 15, "chance": 100 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_stove",
+    "method": "json",
+    "object": {
+      "set": [
+        { "point": "furniture", "id": "f_woodstove", "x": 18, "y": 14 },
+        { "point": "furniture", "id": "f_table", "x": 18, "y": 15 }
+      ],
+      "place_loot": [ { "item": "pot", "x": 18, "y": 15, "chance": 100 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_well",
+    "method": "json",
+    "object": { "set": [ { "point": "terrain", "id": "t_water_pump", "x": 16, "y": 18 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_straw_nw_wall",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "mL",
+        "m "
+      ], "palettes": [ "fbmc_shelter_1_palette" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_straw_NW",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_nw_wall" ], "x": 8, "y": 8 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_makeshift_nw_wall",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "nL",
+        "n "
+      ], "palettes": [ "fbmc_shelter_1_palette" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_NW",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_nw_wall" ], "x": 8, "y": 8 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_standard_bed_nw_wall",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "bL",
+        "b "
+      ], "palettes": [ "fbmc_shelter_1_palette" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_standard_NW",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_standard_bed_nw_wall" ], "x": 8, "y": 8 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_w1_wall",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "bb",
+        "L "
+      ], "palettes": [ "fbmc_shelter_1_palette" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_W1",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_w1_wall" ], "x": 5, "y": 10 } ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_W2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_w1_wall" ], "x": 5, "y": 13 } ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_W3",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_w1_wall" ], "x": 5, "y": 16 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_straw_west_wall",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "mm",
+        "L "
+      ], "palettes": [ "fbmc_shelter_1_palette" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_straw_W1",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_west_wall" ], "x": 5, "y": 10 } ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_straw_W2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_west_wall" ], "x": 5, "y": 13 } ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_straw_W3",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_west_wall" ], "x": 5, "y": 16 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_makeshift_west_wall",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "nn",
+        "L "
+      ], "palettes": [ "fbmc_shelter_1_palette" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_W1",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_west_wall" ], "x": 5, "y": 10 } ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_W2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_west_wall" ], "x": 5, "y": 13 } ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_W3",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_west_wall" ], "x": 5, "y": 16 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_standard_southwest_wall",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "L   ",
+        "    ",
+        "b   ",
+        "bt  "
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_standard_SW",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_standard_southwest_wall" ], "x": 5, "y": 19 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_standard_southwest_wall",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "L   ",
+        "    ",
+        "b   ",
+        "bt  "
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_standard_SW",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_standard_southwest_wall" ], "x": 5, "y": 19 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_straw_southwest_wall",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "L   ",
+        "    ",
+        "m   ",
+        "mt  "
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_straw_SW",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_southwest_wall" ], "x": 5, "y": 19 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_makeshift_southwest_wall",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "L   ",
+        "    ",
+        "n   ",
+        "nt  "
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_SW",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_southwest_wall" ], "x": 5, "y": 19 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_standard_south1_wall",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "L L",
+        "b b",
+        "btb"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_standard_S1",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_standard_south1_wall" ], "x": 8, "y": 20 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_straw_south1_wall",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "L L",
+        "m m",
+        "mtm"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_straw_S1",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_south1_wall" ], "x": 8, "y": 20 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_makeshift_south1_wall",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "L L",
+        "n n",
+        "ntn"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_S1",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_south1_wall" ], "x": 8, "y": 20 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_standard_south2_wall",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "   L",
+        "  bb",
+        "   L",
+        "  bb"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_standard_S2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_standard_south2_wall" ], "x": 11, "y": 19 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_straw_south2_wall",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "   L",
+        "  mm",
+        "   L",
+        "  mm"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_straw_S2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_south2_wall" ], "x": 11, "y": 19 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bed_makeshift_south2_wall",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "   L",
+        "  nn",
+        "   L",
+        "  nn"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_S2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_south2_wall" ], "x": 11, "y": 19 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_dining_room",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        " hth",
+        " hth",
+        " hth",
+        " hth"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_dining",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_dining_room" ], "x": 12, "y": 9 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_living_room",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "sss",
+        "   ",
+        "xxx"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_livingroom",
+    "method": "json",
+    "object": {
+      "place_nested": [ { "chunks": [ "fbmc_shelter_1_living_room" ], "x": 9, "y": 12 } ],
+      "set": [
+        { "point": "furniture", "id": "f_bookcase", "x": 8, "y": 16 },
+        { "point": "furniture", "id": "f_bookcase", "x": 9, "y": 16 },
+        { "point": "furniture", "id": "f_bookcase", "x": 10, "y": 16 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_pantry",
+    "method": "json",
+    "object": {
+      "set": [
+        { "point": "furniture", "id": "f_rack_wood", "x": 18, "y": 16 },
+        { "point": "furniture", "id": "f_rack_wood", "x": 18, "y": 17 },
+        { "point": "furniture", "id": "f_rack_wood", "x": 13, "y": 15 },
+        { "point": "furniture", "id": "f_rack_wood", "x": 14, "y": 15 },
+        { "point": "furniture", "id": "f_rack_wood", "x": 18, "y": 20 },
+        { "point": "furniture", "id": "f_rack_wood", "x": 18, "y": 21 },
+        { "point": "furniture", "id": "f_rack_wood", "x": 18, "y": 22 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_craftspot",
+    "method": "json",
+    "object": {
+      "set": [
+        { "point": "furniture", "id": "f_workbench", "x": 16, "y": 15 },
+        { "point": "furniture", "id": "f_workbench", "x": 16, "y": 16 },
+        { "point": "furniture", "id": "f_workbench", "x": 17, "y": 11 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_radio_console",
+    "method": "json",
+    "object": {
+      "set": [
+        { "point": "terrain", "id": "t_radio_tower", "x": 18, "y": 8 },
+        { "point": "terrain", "id": "t_radio_controls", "x": 18, "y": 9 }
+      ]
+    }
+  }
+]
diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_log.json b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_log.json
new file mode 100644
index 0000000000000..317b9c6f703a3
--- /dev/null
+++ b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_log.json
@@ -0,0 +1,157 @@
+[
+  {
+    "type": "palette",
+    "id": "fbmc_shelter_1_palette_log",
+    "terrain": { "w": "t_wall_log", "d": "t_door_c" },
+    "furniture": {
+      "h": "f_chair",
+      "t": "f_table",
+      "x": "f_coffee_table",
+      "c": "f_workbench",
+      "r": "f_rack",
+      "b": "f_bed",
+      "m": "f_straw_bed",
+      "n": "f_makeshift_bed",
+      "L": "f_locker",
+      "s": "f_sofa",
+      "C": "f_armchair",
+      "B": "f_bookcase"
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW_log",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  w",
+        "wdw"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_log" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_NW_log",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW_log" ], "x": 8, "y": 8 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1_log",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  d",
+        "www"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_log" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_W1_log",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1_log" ], "x": 5, "y": 10 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2_log",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  d",
+        "www"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_log" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_W2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2_log" ], "x": 5, "y": 13 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3_log",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        " X ",
+        "  d"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_log" ],
+      "terrain": { "X": "t_floor" }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW_log",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "  ww",
+        "  w ",
+        "  w ",
+        "  w "
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_log" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_SW_log",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_shelter_1_bedroom_SW_log" ], "x": 5, "y": 19 },
+        { "chunks": [ "fbmc_shelter_1_bedroom_W3_log" ], "x": 5, "y": 16 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1_log",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        " dww",
+        "   w",
+        "   w",
+        "   w"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_log" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2_log",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "dw",
+        "  "
+      ], "palettes": [ "fbmc_shelter_1_palette_log" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_S_log",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_shelter_1_bedroom_S1_log" ], "x": 8, "y": 19 },
+        { "chunks": [ "fbmc_shelter_1_bedroom_S2_log" ], "x": 12, "y": 19 }
+      ]
+    }
+  }
+]
diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_rock.json b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_rock.json
new file mode 100644
index 0000000000000..513841147063c
--- /dev/null
+++ b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_rock.json
@@ -0,0 +1,157 @@
+[
+  {
+    "type": "palette",
+    "id": "fbmc_shelter_1_palette_rock",
+    "terrain": { "w": "t_rock_wall", "d": "t_door_c" },
+    "furniture": {
+      "h": "f_chair",
+      "t": "f_table",
+      "x": "f_coffee_table",
+      "c": "f_workbench",
+      "r": "f_rack",
+      "b": "f_bed",
+      "m": "f_straw_bed",
+      "n": "f_makeshift_bed",
+      "L": "f_locker",
+      "s": "f_sofa",
+      "C": "f_armchair",
+      "B": "f_bookcase"
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW_rock",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  w",
+        "wdw"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_rock" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_NW_rock",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW_rock" ], "x": 8, "y": 8 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1_rock",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  d",
+        "www"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_rock" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_W1_rock",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1_rock" ], "x": 5, "y": 10 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2_rock",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  d",
+        "www"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_rock" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_W2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2_rock" ], "x": 5, "y": 13 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3_rock",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        " X ",
+        "  d"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_rock" ],
+      "terrain": { "X": "t_floor" }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW_rock",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "  ww",
+        "  w ",
+        "  w ",
+        "  w "
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_rock" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_SW_rock",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_shelter_1_bedroom_SW_rock" ], "x": 5, "y": 19 },
+        { "chunks": [ "fbmc_shelter_1_bedroom_W3_rock" ], "x": 5, "y": 16 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1_rock",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        " dww",
+        "   w",
+        "   w",
+        "   w"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_rock" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2_rock",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "dw",
+        "  "
+      ], "palettes": [ "fbmc_shelter_1_palette_rock" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_S_rock",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_shelter_1_bedroom_S1_rock" ], "x": 8, "y": 19 },
+        { "chunks": [ "fbmc_shelter_1_bedroom_S2_rock" ], "x": 12, "y": 19 }
+      ]
+    }
+  }
+]
diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_standard.json b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_standard.json
new file mode 100644
index 0000000000000..270ab9e69df87
--- /dev/null
+++ b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_standard.json
@@ -0,0 +1,138 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  w",
+        "wdw"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_NW",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW" ], "x": 8, "y": 8 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  d",
+        "www"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_W1",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1" ], "x": 5, "y": 10 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  d",
+        "www"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_W2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2" ], "x": 5, "y": 13 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        " X ",
+        "  d"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ],
+      "terrain": { "X": "t_floor" }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "  ww",
+        "  w ",
+        "  w ",
+        "  w "
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_standard_bedroom_SW",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_shelter_1_bedroom_SW" ], "x": 5, "y": 19 },
+        { "chunks": [ "fbmc_shelter_1_bedroom_W3" ], "x": 5, "y": 16 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        " dww",
+        "   w",
+        "   w",
+        "   w"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "dw",
+        "  "
+      ], "palettes": [ "fbmc_shelter_1_palette" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_S",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_shelter_1_bedroom_S1" ], "x": 8, "y": 19 },
+        { "chunks": [ "fbmc_shelter_1_bedroom_S2" ], "x": 12, "y": 19 }
+      ]
+    }
+  }
+]
diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wad.json b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wad.json
new file mode 100644
index 0000000000000..007ad5abd03eb
--- /dev/null
+++ b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wad.json
@@ -0,0 +1,157 @@
+[
+  {
+    "type": "palette",
+    "id": "fbmc_shelter_1_palette_wad",
+    "terrain": { "w": "t_wall_wattle", "d": "t_door_makeshift_c" },
+    "furniture": {
+      "h": "f_chair",
+      "t": "f_table",
+      "x": "f_coffee_table",
+      "c": "f_workbench",
+      "r": "f_rack",
+      "b": "f_bed",
+      "m": "f_straw_bed",
+      "n": "f_makeshift_bed",
+      "L": "f_locker",
+      "s": "f_sofa",
+      "C": "f_armchair",
+      "B": "f_bookcase"
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW_wad",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  w",
+        "wdw"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wad" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_NW_wad",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW_wad" ], "x": 8, "y": 8 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1_wad",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  d",
+        "www"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wad" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_W1_wad",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1_wad" ], "x": 5, "y": 10 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2_wad",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  d",
+        "www"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wad" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_W2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2_wad" ], "x": 5, "y": 13 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3_wad",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        " X ",
+        "  d"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wad" ],
+      "terrain": { "X": "t_floor" }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW_wad",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "  ww",
+        "  w ",
+        "  w ",
+        "  w "
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wad" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_SW_wad",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_shelter_1_bedroom_SW_wad" ], "x": 5, "y": 19 },
+        { "chunks": [ "fbmc_shelter_1_bedroom_W3_wad" ], "x": 5, "y": 16 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1_wad",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        " dww",
+        "   w",
+        "   w",
+        "   w"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wad" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2_wad",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "dw",
+        "  "
+      ], "palettes": [ "fbmc_shelter_1_palette_wad" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_S_wad",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_shelter_1_bedroom_S1_wad" ], "x": 8, "y": 19 },
+        { "chunks": [ "fbmc_shelter_1_bedroom_S2_wad" ], "x": 12, "y": 19 }
+      ]
+    }
+  }
+]
diff --git a/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wood.json b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wood.json
new file mode 100644
index 0000000000000..5baa147d8b3ac
--- /dev/null
+++ b/data/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wood.json
@@ -0,0 +1,157 @@
+[
+  {
+    "type": "palette",
+    "id": "fbmc_shelter_1_palette_wood",
+    "terrain": { "w": "t_wall_wood", "d": "t_door_c" },
+    "furniture": {
+      "h": "f_chair",
+      "t": "f_table",
+      "x": "f_coffee_table",
+      "c": "f_workbench",
+      "r": "f_rack",
+      "b": "f_bed",
+      "m": "f_straw_bed",
+      "n": "f_makeshift_bed",
+      "L": "f_locker",
+      "s": "f_sofa",
+      "C": "f_armchair",
+      "B": "f_bookcase"
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW_wood",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  w",
+        "wdw"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wood" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_NW_wood",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW_wood" ], "x": 8, "y": 8 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1_wood",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  d",
+        "www"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wood" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_W1_wood",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1_wood" ], "x": 5, "y": 10 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2_wood",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        "  d",
+        "www"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wood" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_W2",
+    "method": "json",
+    "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2_wood" ], "x": 5, "y": 13 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3_wood",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "  w",
+        " X ",
+        "  d"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wood" ],
+      "terrain": { "X": "t_floor" }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW_wood",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "  ww",
+        "  w ",
+        "  w ",
+        "  w "
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wood" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_SW_wood",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_shelter_1_bedroom_SW_wood" ], "x": 5, "y": 19 },
+        { "chunks": [ "fbmc_shelter_1_bedroom_W3_wood" ], "x": 5, "y": 16 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1_wood",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        " dww",
+        "   w",
+        "   w",
+        "   w"
+      ],
+      "palettes": [ "fbmc_shelter_1_palette_wood" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2_wood",
+    "object": { "mapgensize": [ 2, 2 ], "rows": [
+        "dw",
+        "  "
+      ], "palettes": [ "fbmc_shelter_1_palette_wood" ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "fbmc_shelter_1_bedroom_S_wood",
+    "method": "json",
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmc_shelter_1_bedroom_S1_wood" ], "x": 8, "y": 19 },
+        { "chunks": [ "fbmc_shelter_1_bedroom_S2_wood" ], "x": 12, "y": 19 }
+      ]
+    }
+  }
+]
diff --git a/data/json/mapgen/bus_station.json b/data/json/mapgen/bus_station.json
index 165ac1e057d89..9a50e1cff6dd2 100644
--- a/data/json/mapgen/bus_station.json
+++ b/data/json/mapgen/bus_station.json
@@ -7,7 +7,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "...........ss________ssssssssssssssssyyyyy___sss",
+        "...........ss________sssssssssssssssPyyyyy___sss",
         "....,,,....ss________s,;,,,;,,;,,,;,syyyyy___s,s",
         "||||www||||ss________ssssssssssssssss________s;s",
         "|p       p|ss________________________________s,s",
@@ -18,7 +18,7 @@
         "| BBB BBB |ss______________________yy________s,s",
         "|         |Gs______________________yy________s;s",
         "| BBB BBB |Gs______________________yy________s,s",
-        "|         +ss________''''''''''''''''________s,s",
+        "|         +ss________'''''''''''''''P________s,s",
         "|8        +ss________'I''bbb''bbb''I'________s;s",
         "|9  r    Y|ss________________________________s,s",
         "||+|||ddd||ss________________________________s,s",
@@ -28,7 +28,7 @@
         "|:|:|FF| cwss______________________yy________s,s",
         "|T|T|l:|  |ss______________________yy________s;s",
         "|||||i:+  +ss______________________yy________s,s",
-        "...4|||||||ssssssssss''''''''''''''''sssssssssss",
+        "...4|||||||ssssssssss'''''''''''''''Psssssssssss",
         "..........fssssssssss'I''bbb''bbb''I'sssssssssss",
         "..........ffffffffffffffffffffffffffffffffffffff"
       ],
@@ -81,6 +81,7 @@
         "h": "f_chair",
         "Y": "f_rack_coat",
         "F": "f_filing_cabinet",
+        "P": "f_traffic_light",
         "G": "f_bulletin"
       },
       "items": {
diff --git a/data/json/mapgen/faction_buildings.json b/data/json/mapgen/faction_buildings.json
index 86ec86ddec864..051b7c25c071e 100644
--- a/data/json/mapgen/faction_buildings.json
+++ b/data/json/mapgen/faction_buildings.json
@@ -1,7 +1,7 @@
 [
   {
     "type": "mapgen",
-    "om_terrain": [ "faction_base_camp_0" ],
+    "om_terrain": [ "faction_base_camp_0", "faction_base_camp_new_0" ],
     "method": "json",
     "weight": 250,
     "object": {
diff --git a/data/json/mapgen/farm_2side.json b/data/json/mapgen/farm_2side.json
index 36845d5e79bf5..3a11dcaea843d 100644
--- a/data/json/mapgen/farm_2side.json
+++ b/data/json/mapgen/farm_2side.json
@@ -10,9 +10,8 @@
     ],
     "weight": 250,
     "object": {
-      "fill_ter": "t_dirt",
+      "fill_ter": "t_floor",
       "rows": [
-        "                                                                                                ",
         " FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF       FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ",
         " F ,,,,,,,,,,       ,       ,    ,    $$$F  t  $ F        ,             ,     ,     ,        ,F ",
         " F,,~~~~~~,,,,  ,       ,          ,     F       F DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD F ",
@@ -39,7 +38,7 @@
         " #####   ,             ,F  #++###MMMMMMMM###        IIII     F, ,     ,,,,,    ,        ,    ,F ",
         " F,,,,      ,  ,        F   ,,,,,,,,,,,,,O        IIIiiIII   F DDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
         " F                 ,    F        ,,,,,,,,        IIiiiiiiII  F      , ,,,,,      ,        ,   F ",
-        " F $  t   ,  ,        , F     t  ,,,,,,,,  t     IiiiiiiiiI  F DDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
+        " F $  t   ,  ,        , F     t  ,,,,,,,,  t     KiiiiiiiiI  F DDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
         " F     $         ,  ,   F     $  ,,,,,,,,  $     IIiiiiiiII  F    ,   ,,,,,    ,        ,     F ",
         " F  ,   t    ,         ,F     $  ,,,,,,,,  $      IIIiiIII   F DDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
         " Ft            ,        F     $  ,,,,,,,,  $        IIII     F,  ,    ,,,,,    ,     Q       ,F ",
@@ -55,7 +54,7 @@
         " F   ,     ,            F     $  ,,,,,,,,  $        IIII     F    ,        ,      ,        ,  F ",
         " F             ,   ,    F     $  ,,,,,,,,  $      IIIiiIII   F,DDDDDDDDDDDDDDDDDDDDDDDDDDDDDD F ",
         " F     ,                F     $  ,,,,,,,,  $     IIiiiiiiII  F       ,   ,    Q      ,        F ",
-        " F          ,    ,   , ,F     t  ,,,,,,,,  t     IiiiiiiiiI  F DDDDDDDDDDDDDDDDDDDDDDDDDDDDDD F ",
+        " F          ,    ,   , ,F     t  ,,,,,,,,  t     KiiiiiiiiI  F DDDDDDDDDDDDDDDDDDDDDDDDDDDDDD F ",
         " F   ,        ,    ,    F     $  ,,,,,,,,  $     IIiiiiiiII  F,   ,      ,         ,       , ,F ",
         " F ,     ,              F     $  ,,,,,,,,  $      IIIiiIII   F DDDDDDDDDDDDDDDDDDDDDDDDDDDDDD F ",
         " F               ,   ,  F     $  ,,,,,,,,  $        IIII     F,       ,          ,       ,    F ",
@@ -72,26 +71,26 @@
         " F        ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,            ,      F ",
         " F DDDDDDD,,,,,DDDDDDDD F   ,,,,,,,,,,,,,,,,,,   F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
         " F  ,     ,,,,,         F    ,,,,,,,,,,,,,,,,    F,                ,  ,,,,,     ,             F ",
-        " F DDDDDDD,,,,,DDDDDDDD F    $$$$   ,,   $$$$    F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD,F ",
-        " F        ,,,,,         F  |--ww----++----ww--|  F     ,              ,,,,,            ,      F ",
-        " F DDDDDDD,,,,,DDDDDDDD F  |u.u....Y..|..H...d|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
-        " F    Q   ,,,,,         F -|u.uh......|.....BB|  F             ,      ,,,,,  ,           Q  , F ",
-        " F DDDDDDD,,,,,DDDDDDDD F wo.....hnnh.|.....BB|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
-        " F        ,,,,,         F we..u..hnnh.|...|---|  F         ,          ,,,,,        ,          F ",
-        " F DDDDDDD,,,,,DDDDDDDD F -|----+---|.+...+'ST|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
-        " F,       ,,,,,    ,    F  |d..|ST|.|.|---|'''|  F,                   ,,,,,  ,               ,F ",
-        " F DDDDDDD,,,,,DDDDDDDD F  wBB.|--|.+.+...+'bb|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
-        " F        ,,,,,        ,F  wBB......|.|...|---|  F     Q           ,, ,,,,,       ,           F ",
-        " F DDDDDDD,,,,,DDDDDDDD F  |d...H...|+|.....BB|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
-        " F ,      ,,,,,         F  |---ww---|s|d.....d|  F            ,       ,,,,,          ,       ,F ",
-        " F DDDDDDD,,,,,DDDDDDDD Fsssssssssssss|dh...BB|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
+        " F DDDDDDD,,,,,DDDDDDDD F    8888   ,,  88888    F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD,F ",
+        " F        ,,,,,         F  |--ww----++---www--|  F     ,              ,,,,,            ,      F ",
+        " F DDDDDDD,,,,,DDDDDDDD F  |uuuue.....Y.2222.6|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
+        " F    Q   ,,,,,         F -|u.....hhh...2.77.6|  F             ,      ,,,,,  ,           Q  , F ",
+        " F DDDDDDD,,,,,DDDDDDDD F wo......nnn........6|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
+        " F        ,,,,,         F wS......hhh....3|---|  F         ,          ,,,,,        ,          F ",
+        " F DDDDDDD,,,,,DDDDDDDD F -|-----........H|S'T|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
+        " F,       ,,,,,    ,    F 4|d..3|AAA|H....+'''w  F,                   ,,,,,  ,               ,F ",
+        " F DDDDDDD,,,,,DDDDDDDD F  wBB..|---|....H|'bb|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
+        " F        ,,,,,        ,F  wBB...99.+.|-+-|---|  F     Q           ,, ,,,,,       ,           F ",
+        " F DDDDDDD,,,,,DDDDDDDD F  |d.......|+|.....BB|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
+        " F ,      ,,,,,         F  |---ww---|s|d..h..d|  F            ,       ,,,,,          ,       ,F ",
+        " F DDDDDDD,,,,,DDDDDDDD Fsssssssssssss|d.kk.BB|  F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
         " F        ,,,,,         Fsssssssssssss|--www--|  F     ,              ,,,,,     ,             F ",
-        " F DDDDDDD,,,,,DDDDDDDD Fss~~~~~~~ss&  t    $    F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
-        " F     ,  ,,,,,   ,     Fss~~~~~~~ss  $      t$  F             ,      ,,,,,                ,  F ",
-        " F DDDDDDD,,,,,DDDDDDDD Fss~~~~~~~ss      $      F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
-        " F,       ,,,,,         Fss~~~~~~~ss    t  ##### F    ,          ,    ,,,,,                   F ",
-        " F DDDDDDD,,,,,DDDDDDDD Fss~~~~~~~ss ,    ,#lll# F,DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD,F ",
-        " F       ,,,,,,    Q   ,Fsssssssssss,  , ,,+...# F      ,             ,,,,,         ,         F ",
+        " F DDDDDDD,,,,,DDDDDDDD Fss*******ss&  t    $    F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
+        " F     ,  ,,,,,   ,     Fss*******ss  $      t$  F             ,      ,,,,,                ,  F ",
+        " F DDDDDDD,,,,,DDDDDDDD Fss*******ss      $      F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
+        " F,       ,,,,,         Fss*******ss    t  ##### F    ,          ,    ,,,,,                   F ",
+        " F DDDDDDD,,,,,DDDDDDDD Fss*******ss ,    ,#lll# F,DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD,F ",
+        " F       ,,,,,,    Q   ,Fsssssssssss,  , ,,+___# F      ,             ,,,,,         ,         F ",
         " F DDDDDDD,,,,,DDDDDDDD Fsssssssssss      $##### F DDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
         " F    ,   ,,,,,   ,     FFFFFFFFFFFFFFFFFFFFFFFFFF       ,      ,     ,,,,,     ,    Q  ,     F ",
         " F DDDDDDD,,,,,DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,,,,DDDDDDDDDDDDDDDDDD F ",
@@ -107,6 +106,7 @@
         " F DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD F ",
         " F       ,         ,           ,               ,               ,       ,              ,       F ",
         " FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ",
+        "                                                                                                ",
         "                                                                                                "
       ],
       "terrain": {
@@ -117,46 +117,49 @@
         "i": [ "t_metal_floor" ],
         "$": [ "t_shrub" ],
         "~": [ "t_water_sh" ],
+        "*": "t_water_pool_outdoors",
         "t": [ "t_tree" ],
         "&": [ "t_water_pump" ],
         "s": [ "t_sidewalk" ],
         "+": [ "t_door_c" ],
         ",": [ "t_dirt" ],
-        "-": [ "t_wall" ],
+        "-": [ "t_wall_w" ],
         ".": [ "t_floor" ],
         "'": [ "t_linoleum_white" ],
         "1": [ "t_column" ],
+        "4": "t_gutter_downspout",
         "5": [ "t_palisade_pulley" ],
-        "B": [ "t_floor" ],
+        "8": [ "t_shrub_lilac", "t_shrub_hydrangea", "t_shrub_rose" ],
         "D": [ "t_dirtmound" ],
         "E": [ "t_dirtmoundfloor" ],
-        "F": [ "t_fence_v" ],
-        "H": [ "t_floor" ],
+        "F": [ "t_splitrail_fence" ],
         "M": [ "t_door_metal_locked" ],
         "O": [ "t_barndoor" ],
         "P": [ "t_grass" ],
+        "K": "t_door_metal_pickable",
         "S": [ "t_linoleum_white" ],
         "T": [ "t_linoleum_white" ],
         "W": [ "t_window_boarded" ],
-        "Y": [ "t_floor" ],
         "_": [ "t_dirtfloor" ],
+        "l": [ "t_dirtfloor" ],
         "b": [ "t_linoleum_white" ],
-        "d": [ "t_floor" ],
         "e": [ "t_linoleum_white" ],
-        "g": [ "t_fencegate_c" ],
-        "h": [ "t_floor" ],
-        "n": [ "t_floor" ],
-        "k": [ "t_floor" ],
-        "l": [ "t_floor" ],
+        "g": [ "t_splitrail_fencegate_c" ],
         "o": [ "t_linoleum_white" ],
         "u": [ "t_floor" ],
         "w": [ "t_window_domestic" ],
         "y": [ "t_dirtfloor" ],
-        "|": [ "t_wall" ]
+        "|": [ "t_wall_w" ]
       },
       "furniture": {
+        "2": "f_sofa",
+        "3": "f_armchair",
+        "6": "f_entertainment_center",
+        "7": "f_coffee_table",
+        "9": "f_bookcase",
         "B": [ "f_bed" ],
-        "H": [ "f_armchair" ],
+        "A": "f_rack_wood",
+        "H": [ "f_indoor_plant_y", "f_indoor_plant" ],
         "P": [ "f_mailbox" ],
         "S": [ "f_sink" ],
         "T": [ "f_toilet" ],
@@ -176,14 +179,28 @@
       "items": {
         "B": { "item": "bed", "chance": 60 },
         "D": { "item": "hydro", "chance": 5 },
-        "H": { "item": "livingroom", "chance": 65 },
+        "o": { "item": "oven", "chance": 40, "repeat": [ 2, 3 ] },
+        "7": { "item": "livingroom", "chance": 65 },
+        "9": { "item": "homebooks", "chance": 65 },
+        "H": { "item": "trash", "chance": 65 },
         "b": { "item": "softdrugs", "chance": 70 },
-        "d": [ { "item": "dresser", "chance": 80 }, { "item": "homeguns", "chance": 20 } ],
+        "d": [
+          { "item": "dresser_mens", "chance": 50 },
+          { "item": "homeguns", "chance": 20 },
+          { "item": "dresser_womens", "chance": 50, "repeat": [ 1, 2 ] }
+        ],
         "e": { "item": "fridge", "chance": 65, "repeat": [ 1, 8 ] },
-        "h": { "item": "bedroom", "chance": 65 },
+        "n": { "item": "bedroom", "chance": 65 },
         "k": { "item": "bedroom", "chance": 65 },
         "Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] },
         "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] },
+        "A": [
+          { "item": "preserved_food", "chance": 20, "repeat": [ 1, 2 ] },
+          { "item": "dry_goods", "chance": 30, "repeat": [ 1, 2 ] },
+          { "item": "pet_food", "chance": 30, "repeat": [ 1, 2 ] },
+          { "item": "condiments", "chance": 30, "repeat": [ 1, 2 ] },
+          { "item": "pantry_liquids", "chance": 10 }
+        ],
         "l": [
           { "item": "tools_earthworking", "chance": 65 },
           { "item": "mechanics", "chance": 40 },
@@ -193,7 +210,12 @@
         "u": [
           { "item": "kitchen", "chance": 70, "repeat": [ 1, 2 ] },
           { "item": "cannedfood", "chance": 65, "repeat": [ 1, 3 ] },
-          { "item": "moonshine_brew", "chance": 65 }
+          { "item": "moonshine_brew", "chance": 65 },
+          { "item": "dishes_utility", "chance": 30 },
+          { "item": "condiments", "chance": 40, "repeat": [ 1, 2 ] },
+          { "item": "SUS_knife_drawer", "chance": 20, "repeat": [ 1, 2 ] },
+          { "item": "SUS_junk_drawer", "chance": 10, "repeat": [ 1, 2 ] },
+          { "item": "SUS_cookware", "chance": 20 }
         ],
         "Q": { "item": "farming_tools", "chance": 15 }
       },
@@ -201,6 +223,7 @@
         "_": [ { "item": "straw_pile", "chance": 3 }, { "item": "cattlefodder", "chance": 2 } ],
         "i": { "item": "wheat", "chance": 40, "repeat": 10 }
       },
+      "place_loot": [ { "item": "television", "x": 45, "y": 62, "chance": 100 }, { "item": "stereo", "x": 45, "y": 61, "chance": 50 } ],
       "place_items": [  ],
       "place_item": [  ],
       "place_monsters": [
@@ -209,5 +232,103 @@
       ],
       "place_vehicles": [ { "vehicle": "farm_vehicles", "x": 36, "y": 18, "chance": 100, "rotation": 270 } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ [ "2farm_roof_4", "2farm_roof_3" ] ],
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                                                ",
+        "                                                ",
+        "                                                ",
+        "                             .............      ",
+        "                             .............      ",
+        "                             .............      ",
+        "                           .................    ",
+        "                           .................    ",
+        "                        ....................    ",
+        "                        ....................    ",
+        "                        ....................    ",
+        "                        ....................    ",
+        "                        ....................    ",
+        "                        ....................    ",
+        " .....                  ....................    ",
+        " .....                  ....................    ",
+        " .....                  ....................    ",
+        " .....                  ....................    ",
+        " .....                  ....................    ",
+        " .....                  ....................    ",
+        " .....                  ....................    ",
+        " .....                     .................    ",
+        " .....                     .................    ",
+        " .....                     .................    "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ [ "2farm_roof_11" ], [ "2farm_roof_15" ] ],
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "   |2222222222222222223 ",
+        "   |..................3 ",
+        "  ||...............X..3 ",
+        "  |....&..............3 ",
+        "  |...................3 ",
+        "  |5..................3 ",
+        "   |................=.3 ",
+        "   |..................3 ",
+        "   |..................3 ",
+        "   |........3-|.......3 ",
+        "   |--------3 |.......3 ",
+        "              |.......3 ",
+        "              |-------3 ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                   .....",
+        "                   .....",
+        "                   .....",
+        "                   .....",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
   }
 ]
diff --git a/data/json/mapgen/fungal/fungal_bloom.json b/data/json/mapgen/fungal/fungal_bloom.json
new file mode 100644
index 0000000000000..0d2d775f95df6
--- /dev/null
+++ b/data/json/mapgen/fungal/fungal_bloom.json
@@ -0,0 +1,64 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "fungal_bloom" ],
+    "weight": 100,
+    "object": {
+      "rows": [
+        "     ..............     ",
+        "  ....................  ",
+        " ......,,,,,,,,,,...... ",
+        " ....,,,,,,,,,,,,,,.... ",
+        " ...,,,,,_____,,,,,,... ",
+        "...,,,,__________,,,,...",
+        "...,,,____________,,,...",
+        "..,,,,_____________,,,..",
+        "..,,,______________,,,..",
+        "..,,,______________,,,..",
+        "..,,________________,,..",
+        "..,,________Y_______,,..",
+        "..,,_______X________,,..",
+        "..,,________________,,..",
+        "..,,,______________,,,..",
+        "..,,,______________,,,..",
+        "..,,,,_____________,,,..",
+        "...,,,____________,,,...",
+        "...,,,,__________,,,,...",
+        " ...,,,,,_____,,,,,,... ",
+        " ....,,,,,,,,,,,,,,.... ",
+        " ......,,,,,,,,,,...... ",
+        "  ....................  ",
+        "     ..............     "
+      ],
+      "terrain": {
+        " ": [ [ "t_grass_dead", 4 ], "t_dirtmound", [ "t_grass", 2 ], "t_fungus" ],
+        ".": [ [ "t_grass_dead", 2 ], "t_fungus" ],
+        ",": [ [ "t_grass_dead", 3 ], [ "t_fungus", 7 ], "t_fungus_mound", "t_shrub_fungal" ],
+        "_": [
+          [ "t_fungus", 25 ],
+          [ "t_fungus_mound", 3 ],
+          [ "t_tree_fungal", 4 ],
+          [ "t_tree_fungal_young", 3 ],
+          [ "t_shrub_fungal", 5 ]
+        ],
+        "X": "t_marloss",
+        "Y": "t_fungus_mound"
+      },
+      "furniture": {
+        " ": [
+          [ "f_null", 18 ],
+          [ "f_boulder_small", 3 ],
+          [ "f_boulder_medium", 2 ],
+          "f_boulder_large",
+          [ "f_flower_fungal", 2 ],
+          "f_fungal_mass"
+        ],
+        ".": [ [ "f_null", 36 ], [ "f_flower_fungal", 8 ], [ "f_fungal_mass", 3 ], "f_fungal_clump" ],
+        ",": [ [ "f_null", 24 ], [ "f_fungal_mass", 2 ], [ "f_flower_fungal", 5 ], "f_fungal_clump" ],
+        "_": [ [ "f_null", 20 ], [ "f_flower_fungal", 4 ], [ "f_fungal_mass", 2 ], "f_fungal_clump" ]
+      },
+      "monster": { "Y": { "monster": "mon_fungaloid_queen" } }
+    }
+  }
+]
diff --git a/data/json/mapgen/fungal/fungal_flowers.json b/data/json/mapgen/fungal/fungal_flowers.json
new file mode 100644
index 0000000000000..1337b5c5dd41c
--- /dev/null
+++ b/data/json/mapgen/fungal/fungal_flowers.json
@@ -0,0 +1,58 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "fungal_flowers" ],
+    "weight": 100,
+    "object": {
+      "rows": [
+        "     ..............     ",
+        "  ....................  ",
+        " ......,,,,,,,,,,...... ",
+        " ....,,,,,,,,,,,,,,.... ",
+        " ...,,,,,_____,,,,,,... ",
+        "...,,,,__________,,,,...",
+        "...,,,____________,,,...",
+        "..,,,,_____________,,,..",
+        "..,,,______________,,,..",
+        "..,,,______________,,,..",
+        "..,,________________,,..",
+        "..,,________Y_______,,..",
+        "..,,_______X________,,..",
+        "..,,________________,,..",
+        "..,,,______________,,,..",
+        "..,,,______________,,,..",
+        "..,,,,_____________,,,..",
+        "...,,,____________,,,...",
+        "...,,,,__________,,,,...",
+        " ...,,,,,_____,,,,,,... ",
+        " ....,,,,,,,,,,,,,,.... ",
+        " ......,,,,,,,,,,...... ",
+        "  ....................  ",
+        "     ..............     "
+      ],
+      "terrain": {
+        " ": [ [ "t_grass_dead", 2 ], [ "t_grass", 3 ], "t_fungus" ],
+        ".": [ "t_grass_dead", "t_grass", "t_fungus" ],
+        ",": [ [ "t_grass_dead", 3 ], [ "t_fungus", 7 ], "t_fungus_mound", "t_shrub_fungal" ],
+        "_": [
+          [ "t_fungus", 25 ],
+          [ "t_fungus_mound", 3 ],
+          [ "t_tree_fungal", 2 ],
+          [ "t_tree_fungal_young", 2 ],
+          [ "t_shrub_fungal", 3 ]
+        ],
+        "X": "t_marloss",
+        "Y": "t_fungus_mound"
+      },
+      "furniture": {
+        " ": [ [ "f_null", 20 ], [ "f_boulder_small", 3 ], [ "f_flower_fungal", 3 ], "f_fungal_mass" ],
+        ".": [ [ "f_null", 36 ], [ "f_flower_fungal", 8 ], [ "f_fungal_mass", 3 ], "f_fungal_clump" ],
+        ",": [ [ "f_null", 24 ], [ "f_fungal_mass", 2 ], [ "f_flower_fungal", 5 ], "f_fungal_clump" ],
+        "_": [ [ "f_null", 20 ], [ "f_flower_fungal", 8 ], [ "f_fungal_mass", 2 ], "f_fungal_clump" ],
+        "X": "f_flower_marloss"
+      },
+      "monster": { "Y": { "monster": "mon_fungaloid_seeder" } }
+    }
+  }
+]
diff --git a/data/json/mapgen/fungal/fungal_tower.json b/data/json/mapgen/fungal/fungal_tower.json
new file mode 100644
index 0000000000000..b272281f09a3d
--- /dev/null
+++ b/data/json/mapgen/fungal/fungal_tower.json
@@ -0,0 +1,60 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "fungal_tower" ],
+    "weight": 100,
+    "object": {
+      "rows": [
+        "     ..............     ",
+        "  .........&&.........  ",
+        " ......,,,&,,,,,,...... ",
+        " ....,,,,,&,&,,,,,,.... ",
+        " ...,,,,,&&__&,,,,,,... ",
+        "...,,,,&&&___&___,,,,...",
+        "...,,,&&____&_____,,&...",
+        "..,,,,_&&&&&___&__&&,,..",
+        "..&&,_&__&__&&&_&&_,,,..",
+        "..,,&_&_&_______&__,,,..",
+        "..,,_&_&&_X_____&__&&,..",
+        "..,&&&_&______&&&&&&,,..",
+        ".&&,&__&Y__X__&_&___,,..",
+        "..&,&__&&_____&_&_&_,,..",
+        "..&&&&__&&&&&&___&&,,,..",
+        "..,&,&&_______&____,,,..",
+        "..,&,,&____&&&___&&&,,..",
+        "...&,,&&__&____&&_,,,...",
+        "..&,,,,&&&_&&&&__,,,,...",
+        " ...,,,,,&__&_,,,,,,... ",
+        " ....,,,&&,,,&,,,,,.... ",
+        " ......&,,,,,,&&,...... ",
+        "  ..............&&....  ",
+        "     ..............     "
+      ],
+      "terrain": {
+        " ": [ [ "t_grass_dead", 4 ], "t_dirtmound", "t_grass", "t_fungus" ],
+        ".": [ [ "t_grass_dead", 2 ], "t_fungus" ],
+        ",": [ [ "t_grass_dead", 3 ], [ "t_fungus", 7 ], "t_fungus_mound" ],
+        "_": [ [ "t_fungus", 25 ], "t_fungus_mound", [ "t_tree_fungal", 3 ], [ "t_tree_fungal_young", 2 ] ],
+        "&": "t_fungus_mound",
+        "X": "t_fungus_mound",
+        "Y": "t_fungus_mound"
+      },
+      "furniture": {
+        " ": [
+          [ "f_null", 18 ],
+          [ "f_boulder_small", 3 ],
+          [ "f_boulder_medium", 2 ],
+          "f_boulder_large",
+          [ "f_flower_fungal", 2 ],
+          "f_fungal_mass"
+        ],
+        ".": [ [ "f_null", 18 ], [ "f_flower_fungal", 4 ], [ "f_fungal_mass", 3 ], "f_fungal_clump" ],
+        ",": [ [ "f_null", 12 ], [ "f_fungal_mass", 2 ], "f_flower_fungal", "f_fungal_clump" ],
+        "_": [ [ "f_null", 10 ], [ "f_fungal_mass", 2 ], "f_fungal_clump" ],
+        "&": [ [ "f_fungal_tangle", 8 ], "f_fungal_clump", "f_fungal_mass" ]
+      },
+      "monster": { "X": { "monster": "mon_fungaloid_tower" }, "Y": { "monster": "mon_fungaloid_queen" } }
+    }
+  }
+]
diff --git a/data/json/mapgen/gambling_hall.json b/data/json/mapgen/gambling_hall.json
index bae727001e2c7..ab901fddbb157 100644
--- a/data/json/mapgen/gambling_hall.json
+++ b/data/json/mapgen/gambling_hall.json
@@ -199,7 +199,7 @@
       "rows": [
         "_____sss_____d__________",
         "_d__|+-+|______________d",
-        "____-...-__dSdSdSdSdSd__",
+        "____-...-__d9d9d9d9d9d__",
         "__|||...|||||||||||||||_",
         "__|a....{{.#t#....#.&^|_",
         "__|^..................|_",
@@ -229,7 +229,7 @@
         "6": "t_slot_machine",
         "D": "t_pavement",
         "P": "t_pavement",
-        "S": "t_shrub",
+        "9": "t_shrub",
         "_": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ],
         "a": "t_atm",
         "b": "t_door_metal_c",
diff --git a/data/json/mapgen/hotel_tower.json b/data/json/mapgen/hotel_tower.json
index e3d3f5b8185bb..19fdc6abcb07a 100644
--- a/data/json/mapgen/hotel_tower.json
+++ b/data/json/mapgen/hotel_tower.json
@@ -1,205 +1,137 @@
 [
   {
-    "id": "hotel_coffee_bar",
-    "type": "item_group",
-    "subtype": "collection",
-    "entries": [
-      { "item": "coffeemaker", "prob": 60, "charges": [ 0, 200 ] },
-      { "group": "coffee_display", "prob": 60, "count": [ 1, 3 ] }
-    ]
-  },
-  {
-    "id": "hotel_luggage",
-    "type": "item_group",
-    "subtype": "collection",
-    "entries": [ { "group": "bags_trip", "prob": 25 }, { "group": "dresser", "prob": 25, "count": [ 1, 4 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "book_hotel_tower_bible",
-    "subtype": "collection",
-    "items": [ { "item": "holybook_bible3", "prob": 100 } ]
-  },
-  {
-    "name": "GROUP_HOTEL_POOL",
-    "type": "monstergroup",
-    "default": "mon_zombie_swimmer",
-    "monsters": [
-      { "monster": "mon_zombie_swimmer", "freq": 100, "cost_multiplier": 2 },
-      { "monster": "mon_zombie_swimmer", "freq": 50, "cost_multiplier": 10, "pack_size": [ 3, 8 ] },
-      { "monster": "mon_zombie_child", "freq": 35, "cost_multiplier": 1 }
-    ]
-  },
-  {
-    "name": "GROUP_HOTEL_GYM",
-    "type": "monstergroup",
-    "default": "mon_zombie_fat",
-    "monsters": [
-      { "monster": "mon_zombie_fat", "freq": 30, "cost_multiplier": 2 },
-      { "monster": "mon_zombie_fat", "freq": 15, "cost_multiplier": 8, "pack_size": [ 2, 6 ] },
-      { "monster": "mon_zombie_tough", "freq": 8, "cost_multiplier": 3 }
-    ]
-  },
-  {
-    "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_1_1" ],
-    "weight": 250,
-    "object": {
-      "rows": [
-        "ssssssssssssssssssssssss",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s",
-        "_____,_____,_V___,_____s",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s",
-        "_______________________s",
-        "_______________________s",
-        "_______________________s",
-        "_______________________s",
-        "_______________________s",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s",
-        "_____,_V___,_V___,_____s",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s",
-        "ssssssssssssssssssssssss",
-        "ssssssssssssssssssssssss",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s"
-      ],
-      "terrain": { ",": "t_pavement_y", "V": "t_pavement", "_": "t_pavement", "s": "t_sidewalk" },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 2 } ],
-      "vehicles": { "V": { "vehicle": "suburban_home", "chance": 50, "rotation": 270 } }
-    }
-  },
-  {
+    "om_terrain": [ [ "hotel_tower_1_3", "hotel_tower_1_2", "hotel_tower_1_1" ] ],
     "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "hotel_tower_1_2" ],
     "weight": 250,
     "object": {
+      "fill_ter": "t_pavement",
       "rows": [
-        "ss________sssss________s",
-        "_,________s'''s________,",
-        "_,________s'''s________,",
-        "_,________s'''s________,",
-        "_,________s'''s________,",
-        "_,________sssss________,",
-        "_,_____________________,",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "_,_____________________,",
-        "_,________sssss________,",
-        "_,________s'''s________,",
-        "_,________s'''s________,",
-        "_,________s'''s________,",
-        "_,________s'''s________,",
-        "ss________s'''s________s",
-        "ss________s'''s________s",
-        "_,________s'''s________,",
-        "_,________s'''s________,",
-        "_,________sssss________,",
-        "_,_____________________,"
+        " sssssssssssssssssssssssss________sssss________sssssssssssssssssssssssss",
+        " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s",
+        " s_____,_V___,_____,_V___,________s'''s________,_V___,_____,_V___,_____s",
+        " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,________sssss________,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,_____________________,_____,_____,_____,_____s",
+        " s_____________________________________________________________________s",
+        " s_____________________________________________________________________s",
+        " s_____________________________________________________________________s",
+        " s_____________________________________________________________________s",
+        " s_____________________________________________________________________s",
+        " s_____,_____,_____,_____,_____________________,_____,_____,_____,_____s",
+        " s___V_,_____,___V_,_____,________sssss________,_____,_V___,_____,_V___s",
+        " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s",
+        " sssssssssssssssssssssssss________s'''s________sssssssssssssssssssssssss",
+        " sssssssssssssssssssssssss________s'''s________sssssssssssssssssssssssss",
+        " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,________sssss________,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,_____________________,_____,_____,_____,_____s"
       ],
-      "terrain": { "'": "t_grass", ",": "t_pavement_y", "_": "t_pavement", "s": "t_sidewalk" },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 2 } ]
+      "palettes": [ "hotel_tower_palette.json" ],
+      "vehicles": { "V": { "vehicle": "suburban_home", "chance": 50, "rotation": 270 } },
+      "terrain": { "V": "t_pavement" },
+      "place_monsters": [
+        { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 0, 23 ], "chance": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 48, 71 ], "y": [ 0, 23 ], "chance": 2 }
+      ]
     }
   },
   {
-    "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_1_3" ],
+    "om_terrain": [ [ "hotel_tower_1_6", "hotel_tower_1_5", "hotel_tower_1_4" ] ],
+    "type": "mapgen",
     "weight": 250,
     "object": {
-      "fill_ter": "t_pavement",
+      "fill_ter": "t_floor",
       "rows": [
-        " sssssssssssssssssssssss",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,_V___,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s______________________",
-        " s______________________",
-        " s______________________",
-        " s______________________",
-        " s______________________",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,_____,___v_,____",
-        " s_____,_____,_____,____",
-        " sssssssssssssssssssssss",
-        " sssssssssssssssssssssss",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____"
+        " s_____,_____,_____,_____,_____________________,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,_____________________,_____,_____,_____,_____s",
+        " s_____________________________________________________________________s",
+        " s_____________________________________________________________________s",
+        " s_____________________________________________________________________s",
+        " s_____________________________________________________________________s",
+        " s_____________________________________________________________________s",
+        " s___________________________sssssssssssssss___________________________s",
+        " s_____,_____,_____,_____,_sssssssssssssssssss_,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,sssssssssssssssssssss,_____,_V___,_____,_____s",
+        " s_____,_____,_____,_____,ssssss%HHGGGHH%ssssss,_____,_____,_____,_____s",
+        " s_____,___v_,_____,_____,sssss%%^.....^%%sssss,_____,_____,_____,___v_s",
+        " s_____,_____,_____,_____,ssss%%^......Yc%%ssss,_____,_____,_____,_____s",
+        " s_____,_____,_____,_____,sss%%^.......YcD%%sss,_____,_____,_____,_____s",
+        " ssssssssssssssssssssssssssssH^........YcxDHssssssssssssssssssssssssssss",
+        " ssssssssssssssssssssssssssssH..........ch.Hssssssssssssssssssssssssssss",
+        " s'''''''''''''''''''''''''''H.j.t......c..H'''''''''''''''''''''''''''s",
+        " s'''''''''''''''''''''''''''H.j.t......ch.H'''''''''''''''''''''''''''s",
+        " s''''''''''T'''''T'''''''T''H.j........c..H''T'''''''T'''''T''''''''''s",
+        " s'''''''''''''''''''''''''''%.jjj......c.L%'''''''''''''''''''''''''''s",
+        " s''''%%www%%%www%%%www%%%www%%.........%+%%www%%%www%%%www%%%www%%''''s",
+        " s''''%...Ld|....d|....d|....d|...........|d..ht|d....|d..L.|d....%''''s",
+        " s''''%c..BB|o..BB|c.LBB|c..BB|h.........h|BB..h|BB..o|BB..c|BB..c%''''s",
+        " s''''%c..BB|c..BB|o..BB|c.LBB|t.........t|BB..c|BB..c|BB..o|BB..o%''''s"
       ],
-      "terrain": { " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], ",": "t_pavement_y", "_": "t_pavement", "s": "t_sidewalk" },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 2 } ],
+      "palettes": [ "hotel_tower_palette.json" ],
+      "terrain": { "V": "t_pavement", "w": "t_window_domestic", "x": "t_console_broken" },
+      "furniture": { "D": "f_desk" },
+      "items": {
+        "B": { "item": "bed", "chance": 50 },
+        "L": { "item": "hotel_luggage", "chance": 100 },
+        "c": { "item": "magazines", "chance": 15 },
+        "d": { "item": "book_hotel_tower_bible", "chance": 2 },
+        "o": { "item": "hotel_coffee_bar", "chance": 100 }
+      },
       "vehicles": {
-        "V": { "vehicle": "suburban_home", "chance": 50, "rotation": 270 },
-        "v": { "vehicle": "suburban_home", "chance": 50, "rotation": 90 }
-      }
+        "V": { "vehicle": "suburban_home", "chance": 60, "rotation": 270 },
+        "v": { "vehicle": "suburban_home", "chance": 60, "rotation": 90 }
+      },
+      "place_monsters": [
+        { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 23 ] },
+        { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 7, 23 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 23 ] }
+      ]
     }
   },
   {
-    "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_1_4" ],
+    "om_terrain": [ [ "hotel_tower_flr2_1_6", "hotel_tower_flr2_1_5", "hotel_tower_flr2_1_4" ] ],
+    "type": "mapgen",
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s",
-        "_______________________s",
-        "_______________________s",
-        "_______________________s",
-        "_______________________s",
-        "_______________________s",
-        "_______________________s",
-        "_____,_____,_____,_____s",
-        "_____,_V___,_____,_____s",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,_____s",
-        "_____,_____,_____,___v_s",
-        "_____,_____,_____,_____s",
-        "ssssssssssssssssssssssss",
-        "ssssssssssssssssssssssss",
-        "'''''''''''''''''''''''s",
-        "'''''''''''''''''''''''s",
-        "''''''T'''''T''''''''''s",
-        "'''''''''''''''''''''''s",
-        "|-www-|-www-|-www-|''''s",
-        "|d....|d..L.|d....|''''s",
-        "|BB..o|BB..c|BB..c|''''s",
-        "|BB..c|BB..o|BB..o|''''s"
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "********************************111111111*******************************",
+        "*******************************11111011111******************************",
+        "******************************1111100011111*****************************",
+        "*****************************111110000011111****************************",
+        "*****************************111100000001111****************************",
+        "*****************************111000000000111****************************",
+        "*****************************111000000000111****************************",
+        "*****************************111000000000111****************************",
+        "*****************************111000000000111****************************",
+        "*****************************111111111111111****************************",
+        "******%%www%%%www%%%www%%%www%%H%%HHHHH%%H%%www%%%www%%%www%%%www%%*****",
+        "******%...Ld|....d|....d|....d|^...^^....^|d..ht|d....|d..L.|d....%*****",
+        "******%c..BB|o..BB|c.LBB|c..BB|h.........h|BB..h|BB..o|BB..c|BB..c%*****",
+        "******%c..BB|c..BB|o..BBXc.LBB|t.........t|BB..cXBB..c|BB..o|BB..o%*****"
       ],
-      "terrain": {
-        "'": "t_grass",
-        ",": "t_pavement_y",
-        "-": "t_wall",
-        "T": "t_tree_young",
-        "V": "t_pavement",
-        "_": "t_pavement",
-        "s": "t_sidewalk",
-        "v": "t_pavement",
-        "w": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": { "B": "f_bed", "c": "f_counter", "d": "f_dresser", "o": "f_counter" },
+      "palettes": [ "hotel_tower_palette.json" ],
+      "terrain": { "w": "t_window_domestic", "x": "t_console_broken" },
+      "furniture": { "D": "f_desk" },
       "items": {
         "B": { "item": "bed", "chance": 50 },
         "L": { "item": "hotel_luggage", "chance": 100 },
@@ -207,271 +139,236 @@
         "d": { "item": "book_hotel_tower_bible", "chance": 2 },
         "o": { "item": "hotel_coffee_bar", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 1, 17 ], "y": [ 0, 23 ] } ],
-      "vehicles": {
-        "V": { "vehicle": "suburban_home", "chance": 60, "rotation": 270 },
-        "v": { "vehicle": "suburban_home", "chance": 60, "rotation": 90 }
-      }
+      "place_monsters": [
+        { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 21, 23 ] },
+        { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 21, 23 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 21, 23 ] }
+      ]
     }
   },
   {
-    "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_1_5" ],
+    "om_terrain": [ [ "hotel_tower_flr3_1_6", "hotel_tower_flr3_1_5", "hotel_tower_flr3_1_4" ] ],
+    "type": "mapgen",
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "_,_____________________,",
-        "_,_____________________,",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "__sssssssssssssssssssss_",
-        "_,sssssCsssssssssCsssss,",
-        "_,sssssssssssssssssssss,",
-        "_,sss|HHHGGHHHGGHHH|sss,",
-        "_,sssV............^|sss,",
-        "_,sssV^............Vsss,",
-        "_,sss|cccc.........Vsss,",
-        "sssss|LL.c.........Vssss",
-        "sssss|...x......hh.|ssss",
-        "'''''|h..c......tt.V''''",
-        "'''''|D.r|......tt.V''''",
-        "''T''|-+-|......hh.V''T'",
-        "'''''|^............|''''",
-        "|-www||...........||www-",
-        "|....d|...........|d..ht",
-        "|c..BB|h.........h|BB..h",
-        "|c.LBB|t.........t|BB..c"
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "******%%www%%%www%%%www%%%www%%%H%%HHH%%H%%%www%%%www%%%www%%%www%%*****",
+        "******%...Ld|....d|....d|....d|^.........^|d..ht|d....|d..L.|d....%*****",
+        "******%c..BB|o..BB|c.LBB|c..BB|h.........h|BB..h|BB..o|BB..c|BB..c%*****",
+        "******%c..BB|c..BB|o..BB|c.LBB|t.........t|BB..c|BB..c|BB..o|BB..o%*****"
       ],
-      "terrain": {
-        "'": "t_grass",
-        "+": [ "t_door_c", "t_door_c", "t_door_o" ],
-        ",": "t_pavement_y",
-        "-": "t_wall",
-        "C": "t_column",
-        "G": "t_door_glass_c",
-        "H": "t_wall_glass",
-        "T": "t_tree_young",
-        "V": "t_wall_glass",
-        "_": "t_pavement",
-        "s": "t_sidewalk",
-        "w": "t_window_domestic",
-        "x": "t_console_broken",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "B": "f_bed",
-        "D": "f_desk",
-        "^": "f_indoor_plant",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "h": "f_chair",
-        "o": "f_counter",
-        "r": "f_rack",
-        "t": "f_table"
-      },
+      "palettes": [ "hotel_tower_palette.json" ],
+      "terrain": { "w": "t_window_domestic", "x": "t_console_broken" },
+      "furniture": { "D": "f_desk" },
       "items": {
         "B": { "item": "bed", "chance": 50 },
         "L": { "item": "hotel_luggage", "chance": 100 },
         "c": { "item": "magazines", "chance": 15 },
-        "d": { "item": "book_hotel_tower_bible", "chance": 2 }
+        "d": { "item": "book_hotel_tower_bible", "chance": 2 },
+        "o": { "item": "hotel_coffee_bar", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 7, 23 ], "repeat": 2 } ],
-      "place_vehicles": [ { "vehicle": "luggage_cart", "x": [ 10, 15 ], "y": [ 11, 19 ], "chance": 100, "repeat": [ 1, 3 ] } ]
+      "place_monsters": [
+        { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 21, 23 ] },
+        { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 21, 23 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 21, 23 ] }
+      ]
     }
   },
   {
-    "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_1_5" ],
+    "om_terrain": [ [ "hotel_tower_flr4_1_6", "hotel_tower_flr4_1_5", "hotel_tower_flr4_1_4" ] ],
+    "type": "mapgen",
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "__,,,,,,,,,,,,,,,,,,,,,_",
-        "___C_____C_____C_____C__",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "__'''''''''''''''''''''_",
-        "ssssssssssssssssssssssss",
-        "sssss|---HGGHGGH---|ssss",
-        "'''''|.............|''''",
-        "'''''V.............V''''",
-        "''T''V....ccccc....V''T'",
-        "'''''|^...cDxDc...^|''''",
-        "|-www||......hc...||www-",
-        "|....d|...ccccc...|d..ht",
-        "|c..BB|...........|BB..h",
-        "|c.LBB|h.........h|BB..c"
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "************************************************************************",
+        "******%%www%%%www%%%www%%%www%%%H%%HHH%%H%%%www%%%www%%%www%%%www%%*****",
+        "******%...Ld|....d|....d|....d|^.........^|d..ht|d....|d..L.|d....%*****",
+        "******%c..BB|o..BB|c.LBB|c..BB|h.........h|BB..h|BB..o|BB..c|BB..c%*****",
+        "******%c..BB|c..BB|o..BB|c.LBB|t.........t|BB..c|BB..c|BB..o|BB..o%*****"
       ],
-      "terrain": {
-        "'": "t_grass",
-        "+": [ "t_door_c", "t_door_c", "t_door_o" ],
-        ",": "t_pavement_y",
-        "-": "t_wall",
-        "C": "t_column",
-        "G": "t_door_glass_c",
-        "H": "t_wall_glass",
-        "T": "t_tree_young",
-        "V": "t_wall_glass",
-        "_": "t_pavement",
-        "s": "t_sidewalk",
-        "w": "t_window_domestic",
-        "x": "t_console_broken",
-        "|": "t_wall",
-        "~": "t_thconc_floor"
-      },
-      "furniture": {
-        "B": "f_bed",
-        "D": "f_desk",
-        "^": "f_indoor_plant",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "h": "f_chair",
-        "o": "f_counter",
-        "r": "f_rack",
-        "t": "f_table"
-      },
+      "palettes": [ "hotel_tower_palette.json" ],
+      "terrain": { "w": "t_window_domestic", "x": "t_console_broken" },
+      "furniture": { "D": "f_desk" },
       "items": {
         "B": { "item": "bed", "chance": 50 },
         "L": { "item": "hotel_luggage", "chance": 100 },
         "c": { "item": "magazines", "chance": 15 },
-        "d": { "item": "book_hotel_tower_bible", "chance": 2 }
+        "d": { "item": "book_hotel_tower_bible", "chance": 2 },
+        "o": { "item": "hotel_coffee_bar", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 7, 23 ], "repeat": 2 } ],
-      "place_vehicles": [ { "vehicle": "luggage_cart", "x": [ 3, 21 ], "y": [ 11, 17 ], "chance": 100, "repeat": [ 1, 3 ] } ]
+      "place_monsters": [
+        { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 21, 23 ] },
+        { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 21, 23 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 21, 23 ] }
+      ]
     }
   },
   {
+    "method": "json",
+    "om_terrain": [ [ "hotel_tower_roof_1_6", "hotel_tower_roof_1_5", "hotel_tower_roof_1_4" ] ],
     "type": "mapgen",
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_flat_roof",
+      "rows": [
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "      |222222222222222222222222222222222222222222222222222222222223     ",
+        "      |...........................................................3     ",
+        "      |...........................................................3     ",
+        "      |...........................................................3     "
+      ],
+      "palettes": [ "roof_palette" ]
+    }
+  },
+  {
     "method": "json",
-    "om_terrain": [ "hotel_tower_1_5" ],
+    "om_terrain": [ [ "hotel_tower_1_9", "hotel_tower_1_8", "hotel_tower_1_7" ] ],
+    "type": "mapgen",
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "_,_____________________,",
-        "_,_____________________,",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "_____sssssssssssssss____",
-        "_,_sssssssssssssssssss_,",
-        "_,sssssssssssssssssssss,",
-        "_,ssssss-HHGGGHH-ssssss,",
-        "_,sssss||^.....^||sssss,",
-        "_,ssss||^......Yc||ssss,",
-        "_,sss||^.......YcD||sss,",
-        "sssssV^........YcxDVssss",
-        "sssssV..........ch.Vssss",
-        "'''''V.j.t......c..V''''",
-        "'''''V.j.t......ch.V''''",
-        "''T''V.j........c..V''T'",
-        "'''''|.jjj......c.L|''''",
-        "|-www||.........-+||www-",
-        "|....d|...........|d..ht",
-        "|c..BB|h.........h|BB..h",
-        "|c.LBB|t.........t|BB..c"
+        " s''''%o....|c....|c....|c....|t.........t|d...c|....c|....c|....c%''''s",
+        " s''''%....h|...Lh|....h|....h|h.........h|BB..c|h...L|h....|h....%''''s",
+        " s''''%...ht|...ht|...ht|...ht|^.........^|BB...|th...|th...|th...%''''s",
+        " s''''%..|--|..|--|..|--|..|--|---|...|---|--|..|--|..|--|..|--|..%''''s",
+        " s''''%..+.S|..+.S|..+.S|..+.S|888G...|x88|S.+..|S.+..|S.+..|S.+..%''''s",
+        " s'''4%..|.&|..|.&|..|.&|..|.&|888G...G888|&.|..|&.|..|&.|..|&.|..%4'''s",
+        " s'%%%%..|bb|..|bb|..|bb|..|bb|88x|...G888|bb|..|bb|..|bb|..|bb|..%%%%'s",
+        " s'%<>%-7|--|-7|--|-7|--|-7|--|---|...|---|--|7-|--|7-|--|7-|--|7-%><%'s",
+        " ss%..%...........................................................%..%ss",
+        " ss=..+...........................................................+..=ss",
+        " ss%..%^..........................................................%..%ss",
+        "   %UF%-7|--|-7|--|-7|--|-7|--|-7|--|--|7-|--|7-|--|7-|--|7-|--|7-%UF%  ",
+        "   %%%%..|bb|..|bb|..|bb|..|bb|..|bb|bb|..|bb|..|bb|..|bb|..|bb|..%%%%  ",
+        "      %..|.&|..|.&|..|.&|..|.&|..|.&|&.|..|&.|..|&.|..|&.|..|&.|..%     ",
+        "      %..+.S|..+.S|..+.S|..+.S|..+.S|S.+..|S.+..|S.+..|S.+..|S.+..%     ",
+        "      %..|--|..|--|..|--|..|--|..|--|--|..|--|..|--|..|--|..|--|..%     ",
+        "      %..Lht|..LBB|...ht|...ht|...ht|BB..L|th...|th...|BB...|th...%     ",
+        "      %....h|o..BB|....h|....h|....h|BB..c|h....|h....|BB..c|h....%     ",
+        "      %c....|c...d|c....|c...L|o....|d...c|....c|....o|dL..c|....o%     ",
+        "      %o..BB|c..BB|c..BB|c..BB|c..BB|BB..o|BB..o|BB..c|BB..o|BB..c%     ",
+        "      %c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c%     ",
+        "      %....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....%     ",
+        "      %%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%     ",
+        "                                                                        "
       ],
-      "terrain": {
-        "'": "t_grass",
-        "+": [ "t_door_c", "t_door_c", "t_door_o" ],
-        ",": "t_pavement_y",
-        "-": "t_wall",
-        "C": "t_column",
-        "G": "t_door_glass_c",
-        "H": "t_wall_glass",
-        "T": "t_tree_young",
-        "V": "t_wall_glass",
-        "_": "t_pavement",
-        "s": "t_sidewalk",
-        "w": "t_window_domestic",
-        "x": "t_console_broken",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "B": "f_bed",
-        "D": "f_desk",
-        "^": "f_indoor_plant",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "h": "f_chair",
-        "j": "f_sofa",
-        "o": "f_counter",
-        "r": "f_rack",
-        "t": "f_table"
-      },
+      "palettes": [ "hotel_tower_palette.json" ],
+      "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic" },
+      "toilets": { "&": {  } },
       "items": {
         "B": { "item": "bed", "chance": 50 },
         "L": { "item": "hotel_luggage", "chance": 100 },
+        "c": { "item": "magazines", "chance": 15 },
         "d": { "item": "book_hotel_tower_bible", "chance": 2 },
-        "t": { "item": "magazines", "chance": 25 }
+        "o": { "item": "hotel_coffee_bar", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 7, 23 ], "repeat": 2 } ],
-      "vehicles": { "Y": { "vehicle": "luggage_cart", "chance": 85 } }
+      "item": { "S": { "item": "towel", "chance": 3, "amount": [ 1, 2 ] } },
+      "place_monsters": [
+        { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 23, 3 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 22 ], "repeat": 2 }
+      ]
     }
   },
   {
-    "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_1_6" ],
+    "om_terrain": [ [ "hotel_tower_flr2_1_9", "hotel_tower_flr2_1_8", "hotel_tower_flr2_1_7" ] ],
+    "type": "mapgen",
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s______________________",
-        " s______________________",
-        " s______________________",
-        " s______________________",
-        " s______________________",
-        " s______________________",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,_____,_____,____",
-        " s_____,___v_,_____,____",
-        " s_____,_____,_____,____",
-        " sssssssssssssssssssssss",
-        " sssssssssssssssssssssss",
-        " s''''''''''''''''''''''",
-        " s''''''''''''''''''''''",
-        " s''''''''''T'''''T'''''",
-        " s''''''''''''''''''''''",
-        " s''''|-www-|-www-|-www-",
-        " s''''|...Ld|....d|....d",
-        " s''''|c..BB|o..BB|c.LBB",
-        " s''''|c..BB|c..BB|o..BB"
+        "******%o....|c....|c....|c....|t.........t|d...c|....c|....c|....c%*****",
+        "******%....h|...Lh|....h|....h|h.........h|BB..c|h...L|h....|h....%*****",
+        "******%...ht|...ht|...ht|...ht|^.........^|BB...|th...|th...|th...%*****",
+        "******%..|--|..|--|..|--|..|--|---|...|---|--|..|--|..|--|..|--|..%*****",
+        "******%..+.S|..+.S|..+.S|..+.S|888G...|x88|S.+..|S.+..|S.+..|S.+..%*****",
+        "****4*%..|.&|..|.&|..|.&|..|.&|888G...G888|&.|..|&.|..|&.|..|&.|..%*4***",
+        "***%%%%..|bb|..|bb|..|bb|..|bb|88x|...G888|bb|..|bb|..|bb|..|bb|..%%%%**",
+        "***%><%-7|--|-7|--|-7|--|-7|--|---|...|---|--|7-|--|7-|--|7-|--|7-%<>%**",
+        "***H..%...........................................................%..H**",
+        "***H..+...........................................................+..H**",
+        "***H..%^..........................................................%..H**",
+        "***%UF%-7|--|-7|--|-7|--|-7|--|-7|--|--|7-|--|7-|--|7-|--|7-|--|7-%UF%**",
+        "***%%%%..|bb|..|bb|..|bb|..|bb|..|bb|bb|..|bb|..|bb|..|bb|..|bb|..%%%%**",
+        "******%..|.&|..|.&|..|.&|..|.&|..|.&|&.|..|&.|..|&.|..|&.|..|&.|..%*****",
+        "******%..+.S|..+.S|..+.S|..+.S|..+.S|S.+..|S.+..|S.+..|S.+..|S.+..%*****",
+        "******%..|--|..|--|..|--|..|--|..|--|--|..|--|..|--|..|--|..|--|..%*****",
+        "******%..Lht|..LBB|...ht|...ht|...ht|BB..L|th...|th...|BB...|th...%*****",
+        "******%....h|o..BB|....h|....h|....h|BB..c|h....|h....|BB..c|h....%*****",
+        "******%c....|c...d|c....|c...L|o....|d...c|....c|....o|dL..c|....o%*****",
+        "******%o..BB|c..BB|c..BB|c..BB|c..BB|BB..o|BB..o|BB..c|BB..o|BB..c%*****",
+        "******%c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c%*****",
+        "******%....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....%*****",
+        "******%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%*****",
+        "*************************************************************************"
       ],
-      "terrain": {
-        " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "'": "t_grass",
-        ",": "t_pavement_y",
-        "-": "t_wall",
-        "T": "t_tree_young",
-        "_": "t_pavement",
-        "s": "t_sidewalk",
-        "v": "t_pavement",
-        "w": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": { "B": "f_bed", "c": "f_counter", "d": "f_dresser", "o": "f_counter" },
+      "palettes": [ "hotel_tower_palette.json" ],
+      "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic" },
+      "toilets": { "&": {  } },
       "items": {
         "B": { "item": "bed", "chance": 50 },
         "L": { "item": "hotel_luggage", "chance": 100 },
@@ -479,67 +376,50 @@
         "d": { "item": "book_hotel_tower_bible", "chance": 2 },
         "o": { "item": "hotel_coffee_bar", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 23 ] } ],
-      "vehicles": { "v": { "vehicle": "suburban_home", "chance": 60, "rotation": 90 } }
+      "item": { "S": { "item": "towel", "chance": 3, "amount": [ 1, 2 ] } },
+      "place_monsters": [
+        { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 23, 3 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 22 ], "repeat": 2 }
+      ]
     }
   },
   {
-    "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_1_7" ],
+    "om_terrain": [ [ "hotel_tower_flr3_1_9", "hotel_tower_flr3_1_8", "hotel_tower_flr3_1_7" ] ],
+    "type": "mapgen",
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "|....c|....c|....c|''''s",
-        "|h...L|h....|h....|''''s",
-        "|th...|th...|th...|''''s",
-        "|--|..|--|..|--|..|''''s",
-        "|S.+..|S.+..|S.+..|''''s",
-        "|T.|..|T.|..|T.|..|''''s",
-        "|bb|..|bb|..|bb|..|--|'s",
-        "|--|D-|--|D-|--|D-|<.|'s",
-        "..................|..|ss",
-        "..................+..=ss",
-        "..................|..|ss",
-        "|--|D-|--|D-|--|D-|..|  ",
-        "|bb|..|bb|..|bb|..|--|  ",
-        "|T.|..|T.|..|T.|..|     ",
-        "|S.+..|S.+..|S.+..|     ",
-        "|--|..|--|..|--|..|     ",
-        "|th...|BB...|th...|     ",
-        "|h....|BB..c|h....|     ",
-        "|....o|dL..c|....o|     ",
-        "|BB..c|BB..o|BB..c|     ",
-        "|BB..c|BB..h|BB..c|     ",
-        "|dL...|d..ht|d....|     ",
-        "|-www-|-www-|-www-|     ",
-        "                        "
+        "******%o....|c....|c....|c....|t.........t|d...c|....c|....c|....c%*****",
+        "******%....h|...Lh|....h|....h|h.........h|BB..c|h...L|h....|h....%*****",
+        "******%...ht|...ht|...ht|...ht|^.........^|BB...|th...|th...|th...%*****",
+        "******%..|--|..|--|..|--|..|--|---|...|---|--|..|--|..|--|..|--|..%*****",
+        "******%..+.S|..+.S|..+.S|..+.S|888G...|x88|S.+..|S.+..|S.+..|S.+..%*****",
+        "*****4%..|.&|..|.&|..|.&|..|.&|888G...G888|&.|..|&.|..|&.|..|&.|..%4****",
+        "***%%%%..|bb|..|bb|..|bb|..|bb|88x|...G888|bb|..|bb|..|bb|..|bb|..%%%%**",
+        "***%<>%-7|--|-7|--|-7|--|-7|--|---|...|---|--|7-|--|7-|--|7-|--|7-%><%**",
+        "***H..%...........................................................%..H**",
+        "***H..+...........................................................+..H**",
+        "***H..%^..........................................................%..H**",
+        "***%UF%-7|--|-7|--|-7|--|-7|--|-7|--|--|7-|--|7-|--|7-|--|7-|--|7-%UF%**",
+        "***%%%%..|bb|..|bb|..|bb|..|bb|..|bb|bb|..|bb|..|bb|..|bb|..|bb|..%%%%**",
+        "******%..|.&|..|.&|..|.&|..|.&|..|.&|&.|..|&.|..|&.|..|&.|..|&.|..%*****",
+        "******%..+.S|..+.S|..+.S|..+.S|..+.S|S.+..|S.+..|S.+..|S.+..|S.+..%*****",
+        "******%..|--|..|--|..|--|..|--|..|--|--|..|--|..|--|..|--|..|--|..%*****",
+        "******%..Lht|..LBB|...ht|...ht|...ht|BB..L|th...|th...|BB...|th...%*****",
+        "******%....h|o..BB|....h|....h|....h|BB..c|h....|h....|BB..c|h....%*****",
+        "******%c....|c...d|c....|c...L|o....|d...c|....c|....o|dL..c|....o%*****",
+        "******%o..BB|c..BB|c..BB|c..BB|c..BB|BB..o|BB..o|BB..c|BB..o|BB..c%*****",
+        "******%c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c%*****",
+        "******%....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....%*****",
+        "******%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%*****",
+        "*************************************************************************"
       ],
-      "terrain": {
-        " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "'": "t_grass",
-        "+": [ "t_door_c", "t_door_c", "t_door_o" ],
-        "-": "t_wall",
-        "<": "t_stairs_down",
-        "=": "t_door_locked",
-        "D": "t_door_locked_interior",
-        "s": "t_sidewalk",
-        "w": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "B": "f_bed",
-        "S": "f_sink",
-        "T": "f_toilet",
-        "b": "f_bathtub",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "h": "f_chair",
-        "o": "f_counter",
-        "t": "f_table"
-      },
-      "toilets": { "T": {  } },
+      "palettes": [ "hotel_tower_palette.json" ],
+      "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic" },
+      "toilets": { "&": {  } },
       "items": {
         "B": { "item": "bed", "chance": 50 },
         "L": { "item": "hotel_luggage", "chance": 100 },
@@ -548,65 +428,49 @@
         "o": { "item": "hotel_coffee_bar", "chance": 100 }
       },
       "item": { "S": { "item": "towel", "chance": 3, "amount": [ 1, 2 ] } },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 1, 17 ], "y": [ 0, 22 ], "repeat": 2 } ]
+      "place_monsters": [
+        { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 23, 3 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 22 ], "repeat": 2 }
+      ]
     }
   },
   {
-    "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_1_8" ],
+    "om_terrain": [ [ "hotel_tower_flr4_1_9", "hotel_tower_flr4_1_8", "hotel_tower_flr4_1_7" ] ],
+    "type": "mapgen",
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "|c....|t.........t|d...c",
-        "|....h|h.........h|BB..c",
-        "|...ht|^.........^|BB...",
-        "|..|--|---|...|---|--|..",
-        "|..+.S|EEE=...|xEE|S.+..",
-        "|..|.T|EEE=...=EEE|T.|..",
-        "|..|bb|EEx|...=EEE|bb|..",
-        "|-D|--|---|...|---|--|D-",
-        "........................",
-        "........................",
-        "........................",
-        "|-D|--|-D|--|--|D-|--|D-",
-        "|..|bb|..|bb|bb|..|bb|..",
-        "|..|.T|..|.T|T.|..|T.|..",
-        "|..+.S|..+.S|S.+..|S.+..",
-        "|..|--|..|--|--|..|--|..",
-        "|...ht|...ht|BB..L|th...",
-        "|....h|....h|BB..c|h....",
-        "|c...L|o....|d...c|....c",
-        "|c..BB|c..BB|BB..o|BB..o",
-        "|o..BB|c..BB|BB..h|BB..c",
-        "|....d|....d|d..ht|d....",
-        "|-www-|-www-|-www-|-www-",
-        "                        "
+        "******%o....|c....|c....|c....|t.........t|d...c|....c|....c|....c%*****",
+        "******%....h|...Lh|....h|....h|h.........h|BB..c|h...L|h....|h....%*****",
+        "******%...ht|...ht|...ht|...ht|^.........^|BB...|th...|th...|th...%*****",
+        "******%..|--|..|--|..|--|..|--|---|...|---|--|..|--|..|--|..|--|..%*****",
+        "******%..+.S|..+.S|..+.S|..+.S|888G...|x88|S.+..|S.+..|S.+..|S.+..%*****",
+        "****4*%..|.&|..|.&|..|.&|..|.&|888G...G888|&.|..|&.|..|&.|..|&.|..%*4***",
+        "***%%%%..|bb|..|bb|..|bb|..|bb|88x|...G888|bb|..|bb|..|bb|..|bb|..%%%%**",
+        "***%>F%-7|--|-7|--|-7|--|-7|--|---|...|---|--|7-|--|7-|--|7-|--|7-%F>%**",
+        "***H.U%...........................................................%U.H**",
+        "***H..+...........................................................+..H**",
+        "***%7%%^..........................................................%%7%**",
+        "***%.<%-7|--|-7|--|-7|--|-7|--|-7|--|--|7-|--|7-|--|7-|--|7-|--|7-%<.%**",
+        "***%%%%..|bb|..|bb|..|bb|..|bb|..|bb|bb|..|bb|..|bb|..|bb|..|bb|..%%%%**",
+        "******%..|.&|..|.&|..|.&|..|.&|..|.&|&.|..|&.|..|&.|..|&.|..|&.|..%*****",
+        "******%..+.S|..+.S|..+.S|..+.S|..+.S|S.+..|S.+..|S.+..|S.+..|S.+..%*****",
+        "******%..|--|..|--|..|--|..|--|..|--|--|..|--|..|--|..|--|..|--|..%*****",
+        "******%..Lht|..LBB|...ht|...ht|...ht|BB..L|th...|th...|BB...|th...%*****",
+        "******%....h|o..BB|....h|....h|....h|BB..c|h....|h....|BB..c|h....%*****",
+        "******%c....|c...d|c....|c...L|o....|d...c|....c|....o|dL..c|....o%*****",
+        "******%o..BB|c..BB|c..BB|c..BB|c..BB|BB..o|BB..o|BB..c|BB..o|BB..c%*****",
+        "******%c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c%*****",
+        "******%....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....%*****",
+        "******%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%*****",
+        "*************************************************************************"
       ],
-      "terrain": {
-        "+": [ "t_door_c", "t_door_c", "t_door_o" ],
-        "-": "t_wall",
-        "=": "t_door_metal_c",
-        "D": "t_door_locked_interior",
-        "E": "t_elevator",
-        "w": "t_window_domestic",
-        "x": "t_elevator_control_off",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "B": "f_bed",
-        "S": "f_sink",
-        "T": "f_toilet",
-        "^": "f_indoor_plant",
-        "b": "f_bathtub",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "h": "f_chair",
-        "o": "f_counter",
-        "t": "f_table"
-      },
-      "toilets": { "T": {  } },
+      "palettes": [ "hotel_tower_palette.json" ],
+      "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic" },
+      "toilets": { "&": {  } },
       "items": {
         "B": { "item": "bed", "chance": 50 },
         "L": { "item": "hotel_luggage", "chance": 100 },
@@ -615,246 +479,308 @@
         "o": { "item": "hotel_coffee_bar", "chance": 100 }
       },
       "item": { "S": { "item": "towel", "chance": 3, "amount": [ 1, 2 ] } },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 23, 3 ], "repeat": 2 } ]
+      "place_monsters": [
+        { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 23, 3 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 22 ], "repeat": 2 }
+      ]
     }
   },
   {
-    "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_1_9" ],
+    "om_terrain": [ [ "hotel_tower_roof_1_9", "hotel_tower_roof_1_8", "hotel_tower_roof_1_7" ] ],
+    "type": "mapgen",
     "weight": 250,
     "object": {
-      "fill_ter": "t_floor",
+      "fill_ter": "t_flat_roof",
       "rows": [
-        " s''''|o....|c....|c....",
-        " s''''|....h|...Lh|....h",
-        " s''''|...ht|...ht|...ht",
-        " s''''|..|--|..|--|..|--",
-        " s''''|..+.S|..+.S|..+.S",
-        " s''''|..|.T|..|.T|..|.T",
-        " s'|--|..|bb|..|bb|..|bb",
-        " s'|.<|-D|--|-D|--|-D|--",
-        " ss|..|.................",
-        " ss=..+.................",
-        " ss|..|^................",
-        "   |..|-D|--|-D|--|-D|--",
-        "   |--|..|bb|..|bb|..|bb",
-        "      |..|.T|..|.T|..|.T",
-        "      |..+.S|..+.S|..+.S",
-        "      |..|--|..|--|..|--",
-        "      |..Lht|..LBB|...ht",
-        "      |....h|o..BB|....h",
-        "      |c....|c...d|c....",
-        "      |o..BB|c..BB|c..BB",
-        "      |c..BB|h..BB|o..BB",
-        "      |....d|th..d|....d",
-        "      |-www-|-www-|-www-",
-        "                        "
+        "      |...........................................................3     ",
+        "      |...........................................................3     ",
+        "      |...........................................................3     ",
+        "      |...........................................................3     ",
+        "      |...........................................................3     ",
+        "      |...........................................................3     ",
+        "   |-5|..%%%%%%%%%%%%%%%%%%%%%%%%%DD%%%%%%%%%%%%%%%%%%%%%%%%%%%%..35-3  ",
+        "   |.....%.....................................................%.....3  ",
+        "   |.....%.....YYYYY.................................YYYYY.....%.....3  ",
+        "   ########....66666.................................66666.....#######  ",
+        "   #______+.....................AAAAAA.........................+____H#  ",
+        "   #_>_HHH#.....................AAAAAA.........................#___>H#  ",
+        "   ########.....................AAAAAA.........................#######  ",
+        "      |..%.....66666.................................66666.....%..3     ",
+        "      |..%.....YYYYY.................................YYYYY.....%..3     ",
+        "      |..%.....................................................%..3     ",
+        "      |..%%%%%%%%%%%%%%%%%%%%%%%%%DD%%%%%%%%%%%%%%%%%%%%%%%%%%%%..3     ",
+        "      |...........................................................3     ",
+        "      |...........................................................3     ",
+        "      |...........................................................3     ",
+        "      |...........................................................3     ",
+        "      |...........................................................3     ",
+        "      |-----------------------------------------------------------3     ",
+        "                                                                        "
       ],
+      "palettes": [ "roof_palette" ],
       "terrain": {
-        " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "'": "t_grass",
-        "+": [ "t_door_c", "t_door_c", "t_door_o" ],
-        "-": "t_wall",
-        "<": "t_stairs_down",
-        "=": "t_door_locked",
-        "D": "t_door_locked_interior",
-        "s": "t_sidewalk",
-        "w": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "B": "f_bed",
-        "S": "f_sink",
-        "T": "f_toilet",
-        "^": "f_indoor_plant",
-        "b": "f_bathtub",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "h": "f_chair",
-        "o": "f_counter",
-        "t": "f_table"
+        ">": [ "t_stairs_down" ],
+        "#": "t_adobe_brick_wall",
+        "_": "t_thconc_floor",
+        "+": "t_door_metal_c",
+        "D": "t_chaingate_l",
+        "%": "t_chainfence",
+        "H": "t_generator_broken"
       },
-      "toilets": { "T": {  } },
+      "furniture": { "Y": "f_standing_tank", "6": "f_water_heater", "7": "f_roof_turbine_vent" },
+      "liquids": { "6": { "liquid": "water_clean", "amount": [ 0, 100 ] }, "Y": { "liquid": "water_clean", "amount": [ 100, 1000 ] } },
+      "place_monsters": [
+        { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 23, 3 ], "repeat": 2 },
+        { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 22 ], "repeat": 2 }
+      ]
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": [ [ "hotel_tower_b_3", "hotel_tower_b_2", "hotel_tower_b_1" ] ],
+    "type": "mapgen",
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_thconc_floor",
+      "rows": [
+        "########################|-----|-----------|-----|#######################",
+        "########################|&+...|.rrr...l..l|...+&|#######################",
+        "########################|-|..c|..........l|c..|-|#######################",
+        "########################|&+..S|---|-+-|---|S..+&|#######################",
+        "########################|-|..c|888+..^|x88|c..|-|#######################",
+        "########################|.+..S|888+...+888|S..+.|#######################",
+        "###|--|#################|&|..c|88x|...+888|c..|&|#################|--|##",
+        "###|UF|-----------------|---+-|---|HGH|---|-+---|-----------------|UF|##",
+        "###|..|^.............mmmm......................mmmm..............^|..|##",
+        "###|..+...........................................................+..|##",
+        "###|..|...........................................................|..|##",
+        "###|.<|-------++---|...............................|-HHHHHHHH-----|<.|##",
+        "###|--|cWWWW......r|m...sssssssssssssssssssssss....|^.............|--|##",
+        "######|c..........r|m...s999999999999999999999s....6..E..E..E..E..|#####",
+        "######|S..........r|m...s999999999999999999999s....6..............|#####",
+        "######|cDDDDrr....r|....s999999999999999999999s....G..E..E..E..E..|#####",
+        "######|--------=---|.ssss999999999999999999999s....6..............|#####",
+        "######|............|.swwwwww999999999999999999s....6...22222222...|#####",
+        "######|...$........|.swwwwww999999999999999999s....6...22222222...|#####",
+        "######|...$........|.swwwwwwsssssssssssssssssss....6...22222222...|#####",
+        "######|$$$$$PP$$$$.|.swwwwwws......................|..............|#####",
+        "######|............|^ssssssss..^rrr^..........mmmm^|...UF.mmm.mmm.|#####",
+        "######|------------|-------------------------------|--------------|#####",
+        "########################################################################"
+      ],
+      "palettes": [ "hotel_tower_palette.json" ],
+      "set": [
+        { "point": "trap", "id": "tr_rollmat", "x": [ 56, 61 ], "y": 17, "repeat": [ 2, 4 ] },
+        { "point": "trap", "id": "tr_rollmat", "x": [ 56, 61 ], "y": 18, "repeat": [ 2, 4 ] },
+        { "point": "trap", "id": "tr_rollmat", "x": [ 56, 61 ], "y": 19, "repeat": [ 2, 4 ] }
+      ],
+      "terrain": { "=": "t_door_locked_interior", ".": "t_thconc_floor", "|": "t_concrete_wall", "-": "t_concrete_wall" },
+      "vendingmachines": { "U": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "items": { "l": { "item": "cleaning", "chance": 60 } },
+      "item": { "r": { "item": "towel", "chance": 2, "amount": [ 1, 2 ] } },
+      "toilets": { "&": {  } },
+      "place_monsters": [
+        { "monster": "GROUP_HOTEL_POOL", "x": [ 24, 46 ], "y": [ 12, 19 ], "repeat": 2 },
+        { "monster": "GROUP_HOTEL_GYM", "x": [ 52, 65 ], "y": [ 12, 21 ], "repeat": 2 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "hotel_tower_1_5B" ],
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_floor",
+      "rows": [
+        "_,_____________________,",
+        "_,_____________________,",
+        "________________________",
+        "________________________",
+        "________________________",
+        "________________________",
+        "________________________",
+        "__sssssssssssssssssssss_",
+        "_,sssssssssssssssssssss,",
+        "_,sssssssssssssssssssss,",
+        "_,sss%HHHGGHHHGGHHH%sss,",
+        "_,sssH............^%sss,",
+        "_,sssH^............Hsss,",
+        "_,sss%cccc.........Hsss,",
+        "sssss%LL.c.........Hssss",
+        "sssss%...x......hh.%ssss",
+        "'''''%h..c......tt.H''''",
+        "'''''%D.r%......tt.H''''",
+        "''T''%%+%%......hh.H''T'",
+        "'''''%^............%''''",
+        "%%www%%...........%%www%",
+        "%....d|...........|d..ht",
+        "%c..BB|h.........h|BB..h",
+        "%c.LBB|t.........t|BB..c"
+      ],
+      "palettes": [ "hotel_tower_palette.json" ],
+      "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic", "x": "t_console_broken" },
+      "furniture": { "D": "f_desk" },
       "items": {
         "B": { "item": "bed", "chance": 50 },
         "L": { "item": "hotel_luggage", "chance": 100 },
         "c": { "item": "magazines", "chance": 15 },
-        "d": { "item": "book_hotel_tower_bible", "chance": 2 },
-        "o": { "item": "hotel_coffee_bar", "chance": 100 }
+        "d": { "item": "book_hotel_tower_bible", "chance": 2 }
       },
-      "item": { "S": { "item": "towel", "chance": 3, "amount": [ 1, 2 ] } },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 } ]
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 7, 23 ], "repeat": 2 } ],
+      "place_vehicles": [ { "vehicle": "luggage_cart", "x": [ 10, 15 ], "y": [ 11, 19 ], "chance": 100, "repeat": [ 1, 3 ] } ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_b_1" ],
+    "om_terrain": [ "hotel_tower_flr2_1_5B" ],
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "|#######################",
-        "|#######################",
-        "|#######################",
-        "|#######################",
-        "|#######################",
-        "|#######################",
-        "|#################|--|##",
-        "|-----------------|..|##",
-        "tth..............^|..|##",
-        "..................+..|##",
-        "..................|..|##",
-        "...|-HHHHHHHH-----|<.|##",
-        "...|^.............|--|##",
-        "...V..E..E..E..E..|#####",
-        "...V..............|#####",
-        "...G..............|#####",
-        "...V..............|#####",
-        "...V..E.........E.|#####",
-        "...V..............|#####",
-        "...V..E...........|#####",
-        "...|..............|#####",
-        "th^|...ee..E......|#####",
-        "---|--------------|#####",
-        "########################"
+        "************************",
+        "************************",
+        "************************",
+        "************************",
+        "************************",
+        "************************",
+        "************************",
+        "************************",
+        "************************",
+        "************************",
+        "*****111111111111111****",
+        "*****111111111111111****",
+        "*****111111111111111****",
+        "*****111111111111111****",
+        "*****111111111000111****",
+        "*****111111111000111****",
+        "*****111111111000111****",
+        "*****111111111111111****",
+        "*****111111111111111****",
+        "*****111111111111111****",
+        "%%www%%%%H%HHHH%H%%%www%",
+        "|....d|...^jjjj^..|d..ht",
+        "|c..BB|h.........h|BB..h",
+        "|c.LBB|t.........t|BB..c"
       ],
-      "terrain": {
-        "#": "t_rock",
-        "+": "t_door_c",
-        "-": "t_wall",
-        "<": "t_stairs_up",
-        "G": "t_door_glass_c",
-        "H": "t_wall_glass",
-        "V": "t_wall_glass",
-        "|": "t_wall"
+      "palettes": [ "hotel_tower_palette.json" ],
+      "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic", "x": "t_console_broken" },
+      "furniture": { "D": "f_desk" },
+      "items": {
+        "B": { "item": "bed", "chance": 50 },
+        "L": { "item": "hotel_luggage", "chance": 100 },
+        "c": { "item": "magazines", "chance": 15 },
+        "d": { "item": "book_hotel_tower_bible", "chance": 2 }
       },
-      "furniture": { "E": "f_exercise", "^": "f_indoor_plant", "e": "f_fridge", "h": "f_chair", "t": "f_table" },
-      "place_monsters": [ { "monster": "GROUP_HOTEL_GYM", "x": [ 4, 17 ], "y": [ 12, 21 ], "repeat": 2 } ]
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 21, 23 ] } ],
+      "place_vehicles": [ { "vehicle": "luggage_cart", "x": [ 10, 15 ], "y": [ 11, 19 ], "chance": 100, "repeat": [ 1, 3 ] } ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_b_2" ],
+    "om_terrain": [ "hotel_tower_1_5C" ],
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "|-----|-----------|-----",
-        "|T+...|.rrr...l..l|...+T",
-        "|-|..c|..........l|c..|-",
-        "|T+..S|---|-+-|---|S..+T",
-        "|-|..c|EEE+..^|xEE|c..|-",
-        "|.+..S|EEE+...+EEE|S..+.",
-        "|T|..c|EEx|...+EEE|c..|T",
-        "|---+-|---|HGH|---|-+---",
-        "h......................h",
-        "........................",
-        "........................",
-        "........................",
-        "sssssssssssssssssssssss.",
-        "swwwwwwwwwwwwWWWWWWWWWs.",
-        "swwwwwwwwwwwwWWWWWWWWWs.",
-        "swwwwwwwwwwwwWWWWWWWWWs.",
-        "swwwwwwwwwwwwWWWWWWWWWs.",
-        "swwwwwwwwwwwwWWWWWWWWWs.",
-        "swwwwwwwwwwwwWWWWWWWWWs.",
-        "sssssssssssssssssssssss.",
-        "........................",
-        ".......^rrr^..........ht",
-        "------------------------",
-        "########################"
+        "________________________",
+        "________________________",
+        "________________________",
+        "________________________",
+        "________________________",
+        "__,,,,,,,,,,,,,,,,,,,,,_",
+        "___X_____X_____X_____X__",
+        "________________________",
+        "________________________",
+        "________________________",
+        "_____________V__________",
+        "________________________",
+        "________________________",
+        "___MMMMMMsssssssMMMMMM__",
+        "sssXsssssssssssssssssXss",
+        "sssss%%%%HGGHGGH%%%%ssss",
+        "'''''%.............%''''",
+        "'''''H.............H''''",
+        "''T''H....ccccc....H''T'",
+        "'''''%^...cDxDc...^%''''",
+        "%%www%%......hc...%%www%",
+        "|....d|...ccccc...|d..ht",
+        "|c..BB|...........|BB..h",
+        "|c.LBB|h.........h|BB..c"
       ],
+      "palettes": [ "hotel_tower_palette.json" ],
       "terrain": {
-        "#": "t_rock",
-        "+": "t_door_c",
-        "-": "t_wall",
-        "E": "t_elevator",
+        "+": [ "t_door_c", "t_door_c", "t_door_o" ],
         "G": "t_door_glass_c",
-        "H": "t_wall_glass",
-        "W": "t_water_dp",
-        "s": "t_sidewalk",
-        "w": "t_water_sh",
-        "x": "t_elevator_control_off",
-        "|": "t_wall"
+        "w": "t_window_domestic",
+        "V": "t_pavement",
+        "x": "t_console_broken"
       },
-      "furniture": {
-        "S": "f_sink",
-        "T": "f_toilet",
-        "^": "f_indoor_plant",
-        "c": "f_counter",
-        "h": "f_chair",
-        "l": "f_locker",
-        "r": "f_rack",
-        "t": "f_table"
+      "furniture": { "D": "f_desk" },
+      "items": {
+        "B": { "item": "bed", "chance": 50 },
+        "L": { "item": "hotel_luggage", "chance": 100 },
+        "c": { "item": "magazines", "chance": 15 },
+        "d": { "item": "book_hotel_tower_bible", "chance": 2 }
       },
-      "toilets": { "T": {  } },
-      "items": { "l": { "item": "cleaning", "chance": 60 } },
-      "item": { "r": { "item": "towel", "chance": 2, "amount": [ 1, 2 ] } },
-      "place_monsters": [ { "monster": "GROUP_HOTEL_POOL", "x": [ 0, 22 ], "y": [ 12, 19 ], "repeat": 2 } ]
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 7, 23 ], "repeat": 2 } ],
+      "place_vehicles": [ { "vehicle": "luggage_cart", "x": [ 3, 21 ], "y": [ 16, 17 ], "chance": 100, "repeat": [ 1, 3 ] } ],
+      "vehicles": { "V": { "vehicle": "suburban_home", "chance": 100, "rotation": 180 } }
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "hotel_tower_b_3" ],
+    "om_terrain": [ "hotel_tower_flr2_1_5C" ],
     "weight": 250,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "########################",
-        "###|--|#################",
-        "###|..|-----------------",
-        "###|..|^.............htt",
-        "###|..+.................",
-        "###|..|.................",
-        "###|.<|-------++---|....",
-        "###|--|cWWWW......r|....",
-        "######|c..........r|....",
-        "######|S..........r|....",
-        "######|cDDDDrr....r|....",
-        "######|--------=---|....",
-        "######|............|....",
-        "######|...$........|....",
-        "######|...$........|....",
-        "######|$$$$$PP$$$$.|....",
-        "######|............|^...",
-        "######|------------|----",
-        "########################"
+        "************************",
+        "************************",
+        "************************",
+        "************************",
+        "************************",
+        "************************",
+        "***1111111111111111111**",
+        "***1000000000000000001**",
+        "***1000000000000000001**",
+        "***1000000000000000001**",
+        "***1000000000000000001**",
+        "***1000000000000000001**",
+        "***1000000000000000001**",
+        "***1000000000000000001**",
+        "***1111111111111111111**",
+        "*****111111111111111****",
+        "*****111111111111111****",
+        "*****111111111111111****",
+        "*****111111111111111****",
+        "*****111111111111111****",
+        "%%www%%%H%%HHHH%%H%%www%",
+        "|....d|...^jjjj^..|d..ht",
+        "|c..BB|h.........h|BB..h",
+        "|c.LBB|t.........t|BB..c"
       ],
+      "palettes": [ "hotel_tower_palette.json" ],
       "terrain": {
-        "#": "t_rock",
-        "$": "t_sewage_pipe",
-        "+": "t_door_c",
-        "-": "t_wall",
-        "<": "t_stairs_up",
-        "=": "t_door_locked_interior",
-        "P": "t_sewage_pump",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "D": "f_dryer",
-        "S": "f_sink",
-        "W": "f_washer",
-        "^": "f_indoor_plant",
-        "c": "f_counter",
-        "h": "f_chair",
-        "r": "f_rack",
-        "t": "f_table"
+        "+": [ "t_door_c", "t_door_c", "t_door_o" ],
+        "G": "t_door_glass_c",
+        "w": "t_window_domestic",
+        "x": "t_console_broken"
       },
+      "furniture": { "D": "f_desk" },
       "items": {
-        "D": { "item": "dresser", "chance": 25 },
-        "W": { "item": "dresser", "chance": 25 },
-        "r": { "item": "home_hw", "chance": 60 }
+        "B": { "item": "bed", "chance": 50 },
+        "L": { "item": "hotel_luggage", "chance": 100 },
+        "c": { "item": "magazines", "chance": 15 },
+        "d": { "item": "book_hotel_tower_bible", "chance": 2 }
       },
-      "item": { "D": { "item": "blanket", "chance": 12 }, "W": { "item": "blanket", "chance": 12 } }
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 21, 23 ] } ]
     }
   }
 ]
diff --git a/data/json/mapgen/junkyard.json b/data/json/mapgen/junkyard.json
index 9b631b4c9403f..96c198f853a93 100644
--- a/data/json/mapgen/junkyard.json
+++ b/data/json/mapgen/junkyard.json
@@ -1,382 +1,156 @@
 [
   {
     "method": "json",
+    "om_terrain": [ [ "junkyard_1a", "junkyard_1b" ] ],
+    "type": "mapgen",
+    "weight": 100,
     "object": {
-      "furniture": {
-        "#": "f_bench",
-        "$": "f_null",
-        "&": "f_trashcan",
-        "-": "f_null",
-        ".": "f_null",
-        "C": "f_counter",
-        "D": "f_null",
-        "S": "f_null",
-        "T": "f_toilet",
-        "_": "f_null",
-        "a": "f_chair",
-        "b": "f_sink",
-        "c": "f_null",
-        "d": "f_desk",
-        "f": "f_null",
-        "r": "f_null",
-        "s": "f_null",
-        "t": "f_table",
-        "{": "f_vending_c",
-        "|": "f_null"
-      },
+      "fill_ter": "t_floor",
+      "rows": [
+        "__......________________________________......__",
+        "__......e_%%%---%r%---%%%4_____________e......__",
+        "_$qqqqqq%$%ffBBBfffBBBff%%%%%%%%%%%%%%$%dddddd$_",
+        "_$......e_%ffffffffffffff%ttttttttttt%_e......$_",
+        "_$......__%KffcccccccffffDtttttttttttD__......$_",
+        "_$......__%fffccnnnccfUUf%tttttttttte%e.......$_",
+        "_$......__%fffccnnnccfxff%Cttmmmmmmmmd........$_",
+        "_$......__%FffcccccccfUaf%Cttmmmmmmmmd........$_",
+        "_$......__%fffffffffffUff%Cttmmmmmmmmd........$_",
+        "_$......__%%D%ffpppfffUff%&ttmmmmmmmmd........$_",
+        "_$......__%Rf%r---------r%Cttmmmmmmmmd........$_",
+        "_$......__%bf%fffffffffff%Cttmmmmmmmmd........$_",
+        "_$......__%ff%fIIfIIfffff%Ctttttttttt%_.......$_",
+        "_$......__%fT%ffaffafffff%ttttttttttt%__......$_",
+        "_$......__%%%%%%%%%%%%%D%%%%%%%%%%%%%%__......$_",
+        "_$......__sssss__sssss_SS_sssss__sssss__......$_",
+        "_$......__sssss__sssss_SS_sssss__sssss__......$_",
+        "_$......__sssss__sssss_SS_sssss__sssss__......$_",
+        "_$......__sssss__sssss_SS_sssss__sssss__......$_",
+        "_$......__sssss__sssss_SS_sssss__sssss__......$_",
+        "_$......__sssss__sssss_SS_sssss__sssss_.......$_",
+        "_$......._sssss__sssss_SS_sssss__sssss........$_",
+        "_$............................................$_",
+        "_$............................................$_"
+      ],
+      "palettes": [ "junkyard_palette" ],
+      "place_toilets": [ { "x": 12, "y": 13 } ],
+      "vendingmachines": { "K": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "place_loot": [ { "item": "television", "x": 17, "y": 9, "chance": 100 } ],
       "place_items": [
         { "chance": 25, "item": "cubical_office", "x": [ 18, 19 ], "y": 12 },
         { "chance": 25, "item": "cubical_office", "x": [ 15, 16 ], "y": 12 },
         { "chance": 30, "item": "trash", "x": 11, "y": 10 },
         { "chance": 75, "item": "vending_food_items", "x": 11, "y": 4 },
         { "chance": 75, "item": "vending_drink_items", "x": 11, "y": 7 },
-        { "chance": 40, "repeat": 3, "item": "magazines", "x": [ 16, 18 ], "y": [ 5, 6 ] }
+        { "chance": 40, "repeat": 3, "item": "magazines", "x": [ 16, 18 ], "y": [ 5, 6 ] },
+        { "chance": 20, "repeat": 2, "item": "tools_mechanic", "x": 26, "y": [ 10, 12 ] },
+        { "chance": 20, "repeat": 2, "item": "tools_mechanic", "x": 26, "y": [ 6, 8 ] },
+        { "chance": 25, "repeat": 2, "item": "trash", "x": 26, "y": 9 }
       ],
-      "place_toilets": [ { "x": 12, "y": 13 } ],
       "place_vehicles": [
-        { "chance": 75, "fuel": 0, "rotation": 270, "status": 1, "vehicle": "junkyard_vehicles", "x": 12, "y": 17 },
-        { "chance": 75, "fuel": 0, "rotation": 270, "status": 1, "vehicle": "junkyard_vehicles", "x": 19, "y": 17 }
-      ],
-      "rows": [
-        "__......________________",
-        "__......e_|||---|r|---||",
-        "_$qqqqqq|$|ff###fff###ff",
-        "_$......e_|fffffffffffff",
-        "_$......__|{ffcccccccfff",
-        "_$......__|fffcctttccfCC",
-        "_$......__|fffcctttccfCf",
-        "_$......__|{ffcccccccfCf",
-        "_$......__|fffffffffffCf",
-        "_$......__||D|ffffffffCf",
-        "_$......__|&f|f||||||fff",
-        "_$......__|bf|ffffffffff",
-        "_$......__|ff|fddfddffff",
-        "_$......__|fT|ffaffaffff",
-        "_$......__|||||||||||||D",
-        "_$......__sssss__sssss_S",
-        "_$......__sssss__sssss_S",
-        "_$......__sssss__sssss_S",
-        "_$......__sssss__sssss_S",
-        "_$......__sssss__sssss_S",
-        "_$......__sssss__sssss_S",
-        "_$......._sssss__sssss_S",
-        "_$......................",
-        "_$......................"
-      ],
-      "terrain": {
-        "#": "t_floor",
-        "$": "t_fence_barbed",
-        "&": "t_floor",
-        "e": "t_gates_mech_control",
-        "-": "t_wall_glass",
-        ".": [
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_dirt",
-          "t_dirt",
-          "t_grass"
-        ],
-        "C": "t_floor",
-        "D": "t_door_c",
-        "S": "t_sidewalk",
-        "T": "t_floor",
-        "_": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "a": "t_floor",
-        "b": "t_floor",
-        "q": "t_door_metal_locked",
-        "c": "t_carpet_red",
-        "d": "t_floor",
-        "f": "t_floor",
-        "r": "t_reinforced_door_glass_c",
-        "s": [ "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_grass" ],
-        "t": "t_carpet_red",
-        "{": "t_floor",
-        "|": "t_brick_wall"
-      }
-    },
-    "om_terrain": "junkyard_1a",
-    "type": "mapgen",
-    "weight": 100
+        { "chance": 75, "fuel": 0, "rotation": 270, "status": 1, "vehicle": "junkyard_vehicles", "x": 12, "y": 18 },
+        { "chance": 75, "fuel": 0, "rotation": 270, "status": 1, "vehicle": "junkyard_vehicles", "x": 19, "y": 18 },
+        { "chance": 90, "fuel": 0, "rotation": 0, "status": -1, "vehicle": "engine_crane", "x": 28, "y": 3 },
+        { "chance": 90, "fuel": 0, "rotation": 90, "status": -1, "vehicle": "handjack", "x": 31, "y": 3 },
+        { "chance": 90, "fuel": 30, "rotation": 180, "status": -1, "vehicle": "welding_cart", "x": 34, "y": 3 },
+        { "chance": 75, "fuel": 0, "rotation": 180, "status": -1, "vehicle": "junkyard_vehicles", "x": 31, "y": 9 },
+        { "chance": 75, "fuel": 0, "rotation": 270, "status": 1, "vehicle": "junkyard_vehicles", "x": 28, "y": 18 },
+        { "chance": 75, "fuel": 0, "rotation": 270, "status": 1, "vehicle": "junkyard_vehicles", "x": 35, "y": 18 }
+      ]
+    }
   },
   {
     "method": "json",
+    "om_terrain": [ [ "junkyard_roof_1a", "junkyard_roof_1b" ] ],
+    "type": "mapgen",
+    "weight": 100,
     "object": {
-      "furniture": {
-        "#": "f_counter",
-        "$": "f_null",
-        "&": "f_trashcan",
-        ".": "f_null",
-        "D": "f_null",
-        "S": "f_null",
-        "_": "f_null",
-        "d": "f_null",
-        "f": "f_null",
-        "m": "f_null",
-        "s": "f_null",
-        "t": "f_null",
-        "|": "f_null"
-      },
-      "place_items": [
-        { "chance": 20, "repeat": 2, "item": "tools_mechanic", "x": 2, "y": [ 10, 12 ] },
-        { "chance": 20, "repeat": 2, "item": "tools_mechanic", "x": 2, "y": [ 6, 8 ] },
-        { "chance": 25, "repeat": 2, "item": "trash", "x": 2, "y": 9 }
-      ],
-      "place_vehicles": [
-        { "chance": 90, "fuel": 0, "rotation": 0, "status": -1, "vehicle": "engine_crane", "x": 4, "y": 3 },
-        { "chance": 90, "fuel": 0, "rotation": 90, "status": -1, "vehicle": "handjack", "x": 7, "y": 3 },
-        { "chance": 90, "fuel": 30, "rotation": 180, "status": -1, "vehicle": "welding_cart", "x": 10, "y": 3 },
-        { "chance": 75, "fuel": 0, "rotation": 180, "status": -1, "vehicle": "junkyard_vehicles", "x": 7, "y": 9 },
-        { "chance": 75, "fuel": 0, "rotation": 270, "status": 1, "vehicle": "junkyard_vehicles", "x": 4, "y": 17 },
-        { "chance": 75, "fuel": 0, "rotation": 270, "status": 1, "vehicle": "junkyard_vehicles", "x": 11, "y": 17 }
-      ],
+      "fill_ter": "t_flat_roof",
       "rows": [
-        "________________......__",
-        "_______________e......__",
-        "||||||||||||||$|dddddd$_",
-        "f|ttttttttttt|_e......$_",
-        "fDtttttttttttD__......$_",
-        "f|tttttttttte|e.......$_",
-        "f|#ttmmmmmmmmd........$_",
-        "f|#ttmmmmmmmmd........$_",
-        "f|#ttmmmmmmmmd........$_",
-        "f|&ttmmmmmmmmd........$_",
-        "f|#ttmmmmmmmmd........$_",
-        "f|#ttmmmmmmmmd........$_",
-        "f|#tttttttttt|_.......$_",
-        "f|ttttttttttt|__......$_",
-        "||||||||||||||__......$_",
-        "S_sssss__sssss__......$_",
-        "S_sssss__sssss__......$_",
-        "S_sssss__sssss__......$_",
-        "S_sssss__sssss__......$_",
-        "S_sssss__sssss__......$_",
-        "S_sssss__sssss_.......$_",
-        "S_sssss__sssss........$_",
-        "......................$_",
-        "......................$_"
+        "                                                ",
+        "          |22222222222222                       ",
+        "          |......AA.....52222222222223          ",
+        "          |..........................3          ",
+        "          |.......................X..3          ",
+        "          |..........................3          ",
+        "          |..........................3          ",
+        "          |..........................3          ",
+        "          |..........................3          ",
+        "          |.......&...........&......3          ",
+        "          |..........................3          ",
+        "          |.=........................3          ",
+        "          |..........................3          ",
+        "          |.......................:..3          ",
+        "          |--------------------------3          ",
+        "                                                ",
+        "                                                ",
+        "                                                ",
+        "                                                ",
+        "                                                ",
+        "                                                ",
+        "                                                ",
+        "                                                ",
+        "                                                "
       ],
-      "terrain": {
-        "#": "t_thconc_floor",
-        "$": "t_fence_barbed",
-        "&": "t_thconc_floor",
-        "e": "t_gates_mech_control",
-        ".": [
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_dirt",
-          "t_dirt",
-          "t_grass"
-        ],
-        "D": "t_door_c",
-        "S": "t_sidewalk",
-        "_": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "d": "t_door_metal_locked",
-        "f": "t_floor",
-        "m": "t_metal_floor",
-        "s": [ "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_grass" ],
-        "t": "t_thconc_floor",
-        "|": "t_brick_wall"
-      }
-    },
-    "om_terrain": "junkyard_1b",
-    "type": "mapgen",
-    "weight": 100
+      "palettes": [ "roof_palette" ]
+    }
   },
   {
     "method": "json",
+    "om_terrain": [ [ "junkyard_2a", "junkyard_2b" ] ],
+    "type": "mapgen",
+    "weight": 100,
     "object": {
-      "place_item": [ { "item": "bowl_plastic", "x": 22, "y": 4 } ],
-      "furniture": { "-": "f_null", ".": "f_null", "#": "f_straw_bed", "_": "f_null", "g": "f_null", "|": "f_null" },
-      "place_monsters": [ { "chance": 65, "density": 1, "monster": "GROUP_DOGS", "x": 23, "y": [ 4, 6 ] } ],
-      "place_liquids": [ { "liquid": "water_clean", "chance": 2, "amount": [ 1, 3 ], "x": 22, "y": 4 } ],
+      "fill_ter": "t_dirt",
+      "rows": [
+        "g|............................................$g",
+        "g|............................................$g",
+        "g|............................................$g",
+        "g|......g_____gg_____gggggg_____gg_____.......$g",
+        "g|......g_____gg_____gggggg_____gg_____g......$g",
+        "g|......g_____gg_____g9##9g_____gg_____g......$g",
+        "g|......g_____gg_____g9##9g_____gg_____g......$g",
+        "g|......g_____gg_____g9999g_____gg_____g......$g",
+        "g|......g_____gg_____gggNgg_____gg_____g......$g",
+        "g|......._____gg_____gggggg_____gg_____.......$g",
+        "g|............................................$g",
+        "g|............................................$g",
+        "g|g...........................................$g",
+        "g|g..........................................g$g",
+        "g|gg........................................gg$g",
+        "g|gg_____gg_____gg_____gg_____gg_____gg_____gg$g",
+        "g|gg_____gg_____gg_____gg_____gg_____gg_____gg$g",
+        "g|gg_____gg_____gg_____gg_____gg_____gg_____gg$g",
+        "g|gg_____gg_____gg_____gg_____gg_____gg_____gg$g",
+        "g|gg_____gg_____gg_____gg_____gg_____gg_____gg$g",
+        "g|gg_____gg_____gg_____gg_____gg_____gg_____gg$g",
+        "g|gg_____gg_____gg_____gg_____gg_____gg_____gg$g",
+        "g|||||||||||||||||||||||$$$$$$$$$$$$$$$$$$$$$$$g",
+        "gggggggggggggggggggggggggggggggggggggggggggggggg"
+      ],
+      "palettes": [ "junkyard_palette" ],
+      "place_monsters": [
+        { "chance": 65, "density": 1, "monster": "GROUP_DOGS", "x": 23, "y": [ 4, 6 ] },
+        { "chance": 65, "density": 1, "monster": "GROUP_DOGS", "x": 24, "y": [ 4, 6 ] }
+      ],
       "place_vehicles": [
         { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 11, "y": 7 },
         { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 18, "y": 7 },
         { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 6, "y": 19 },
         { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 13, "y": 19 },
-        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 20, "y": 19 }
+        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 20, "y": 19 },
+        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 29, "y": 7 },
+        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 36, "y": 7 },
+        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 27, "y": 19 },
+        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 34, "y": 19 },
+        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 41, "y": 19 }
       ],
-      "rows": [
-        "g|......................",
-        "g|......................",
-        "g|......................",
-        "g|......g_____gg_____ggg",
-        "g|......g_____gg_____ggg",
-        "g|......g_____gg_____g-#",
-        "g|......g_____gg_____g-#",
-        "g|......g_____gg_____g--",
-        "g|......g_____gg_____ggg",
-        "g|......._____gg_____ggg",
-        "g|......................",
-        "g|......................",
-        "g|g.....................",
-        "g|g.....................",
-        "g|gg....................",
-        "g|gg_____gg_____gg_____g",
-        "g|gg_____gg_____gg_____g",
-        "g|gg_____gg_____gg_____g",
-        "g|gg_____gg_____gg_____g",
-        "g|gg_____gg_____gg_____g",
-        "g|gg_____gg_____gg_____g",
-        "g|gg_____gg_____gg_____g",
-        "g|||||||||||||||||||||||",
-        "gggggggggggggggggggggggg"
+      "place_item": [
+        { "item": "bowl_plastic", "x": 22, "y": 4 },
+        { "item": "meat", "repeat": [ 1, 4 ], "chance": 50, "x": 25, "y": 4 },
+        { "item": "bowl_plastic", "x": 25, "y": 4 }
       ],
-      "terrain": {
-        "-": "t_wall_wood",
-        ".": [
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_dirt",
-          "t_dirt",
-          "t_grass"
-        ],
-        "#": "t_dirt",
-        "_": [ "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_grass" ],
-        "g": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "|": "t_fence_barbed"
-      }
-    },
-    "om_terrain": "junkyard_2a",
-    "type": "mapgen",
-    "weight": 100
-  },
-  {
-    "method": "json",
-    "object": {
-      "place_item": [ { "item": "meat", "repeat": [ 1, 4 ], "chance": 50, "x": 1, "y": 4 }, { "item": "bowl_plastic", "x": 1, "y": 4 } ],
-      "furniture": { "#": "f_straw_bed", "$": "f_null", ".": "f_null", "_": "f_null", "g": "f_null", "|": "f_null" },
-      "place_monsters": [ { "chance": 65, "density": 1, "monster": "GROUP_DOGS", "x": 0, "y": [ 4, 6 ] } ],
-      "place_vehicles": [
-        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 5, "y": 7 },
-        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 12, "y": 7 },
-        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 3, "y": 19 },
-        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 10, "y": 19 },
-        { "chance": 75, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "junkyard_vehicles", "x": 17, "y": 19 }
-      ],
-      "rows": [
-        "......................$g",
-        "......................$g",
-        "......................$g",
-        "ggg_____gg_____.......$g",
-        "ggg_____gg_____g......$g",
-        "#|g_____gg_____g......$g",
-        "#|g_____gg_____g......$g",
-        "||g_____gg_____g......$g",
-        "ggg_____gg_____g......$g",
-        "ggg_____gg_____.......$g",
-        "......................$g",
-        "......................$g",
-        "......................$g",
-        ".....................g$g",
-        "....................gg$g",
-        "g_____gg_____gg_____gg$g",
-        "g_____gg_____gg_____gg$g",
-        "g_____gg_____gg_____gg$g",
-        "g_____gg_____gg_____gg$g",
-        "g_____gg_____gg_____gg$g",
-        "g_____gg_____gg_____gg$g",
-        "g_____gg_____gg_____gg$g",
-        "$$$$$$$$$$$$$$$$$$$$$$$g",
-        "gggggggggggggggggggggggg"
-      ],
-      "terrain": {
-        "|": "t_wall_wood",
-        ".": [
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_pavement",
-          "t_dirt",
-          "t_dirt",
-          "t_grass"
-        ],
-        "#": "t_dirt",
-        "_": [ "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_grass" ],
-        "g": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "$": "t_fence_barbed"
-      }
-    },
-    "om_terrain": "junkyard_2b",
-    "type": "mapgen",
-    "weight": 100
+      "place_liquids": [ { "liquid": "water_clean", "chance": 2, "amount": [ 1, 3 ], "x": 22, "y": 4 } ]
+    }
   }
 ]
diff --git a/data/json/mapgen/microlab/microlab_special_tiles.json b/data/json/mapgen/microlab/microlab_special_tiles.json
index 0c2a58fa3f6c4..f831fcbc02f42 100644
--- a/data/json/mapgen/microlab/microlab_special_tiles.json
+++ b/data/json/mapgen/microlab/microlab_special_tiles.json
@@ -90,9 +90,9 @@
         "  |------------------|6 ",
         "  |-F   cccccc -lll -|r ",
         "|||-F          2   c-||2",
-        "  |---  cc cc  -  h6-|  ",
-        "  |-F   cc cc  - h c-|c ",
-        "  |-F   cc cc  -cccc-|c ",
+        "  |---  cc pp  -  h6-|  ",
+        "  |-F   cc pt  - h c-|c ",
+        "  |-F   cc pp  -cccc-|c ",
         "  |---         -((((-|  ",
         "2|G            2   7-|||",
         "  5  T----22----  @@-|  ",
@@ -111,7 +111,9 @@
       ],
       "palettes": [ "microlab" ],
       "terrain": { "0": "t_vat", "G": "t_card_science" },
+      "furniture": { "t": "f_counter", "p": "f_counter" },
       "monster": { "T": { "monster": "mon_turret_rifle" } },
+      "item": { "0": { "item": "fetus" }, "t": { "item": "iv_mutagen_alpha" } },
       "place_monsters": [ { "monster": "GROUP_LAB", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 5 ] } ]
     }
   },
diff --git a/data/json/mapgen/miniature_railway/miniature_railway_z1.json b/data/json/mapgen/miniature_railway/miniature_railway_z1.json
new file mode 100644
index 0000000000000..022bf8da2c6e8
--- /dev/null
+++ b/data/json/mapgen/miniature_railway/miniature_railway_z1.json
@@ -0,0 +1,71 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ [ "miniaturerailway_0_0_0", "miniaturerailway_1_0_0" ], [ "miniaturerailway_0_1_0", "miniaturerailway_1_1_0" ] ],
+    "object": {
+      "fill_ter": "t_grass",
+      "rows": [
+        ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.",
+        ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.",
+        ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.",
+        ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.",
+        ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.",
+        ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.",
+        ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.",
+        ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.",
+        ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.",
+        ".@@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@pppppppp@.",
+        ".@@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@pppppppp@.",
+        ".@@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@pppppppp@.",
+        ".@@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@pppppppp@.",
+        ".@@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@pppppppp@.",
+        ".@@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@pppppppp@.",
+        ".@@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@pppppppp@.",
+        ".@@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@@@@`@pppppppp@.",
+        ".pppppppppppppppppppppppppppppppppppppppppppppp.",
+        ".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%HHHHHHHH__HHHH.",
+        ".%uuuuu.............uuuuuuuuuuu..HtHtHD||||H7|H.",
+        ".%uu....X======X....uuuuuuuuuuu..H|H|HV||||*dhH.",
+        ".%uuu..XX.uuuu.XX...uuuuuuuuuuu..H_H_H|||||H||H.",
+        ".%uuu.XX.uuuuuu.XX..uuuuuuuuuuu..H|||||||||_||H.",
+        ".%uuuXX.uuuuuuuu.=..uuuuuuuuuuu..HHHHHHHH__HHHH.",
+        ".%uuu=..uuuuuuu..=........................p.uu%.",
+        ".%uuu=..uuuuuuu..=........................p.uu%.",
+        ".%uuu=.uuuuuuuu..=...pppppppp.............p.uu%.",
+        ".%uuu=.uuuuuuuu.XX...pWWppWWp.............p.uu%.",
+        ".%uuu=.uuuuuuu.XX....pppppppp.............p.uu%.",
+        ".%uuu=.uuuuuu.XX.....pWWppWWppppppppppppppp.uu%.",
+        ".%uuu=.uuuuuu.=......pppppppp.............p.uu%.",
+        ".%uuu=.uuuuuu.=.........p.................p.uu%.",
+        ".%uuu=.uuuuuu.XX........p................=p.uu%.",
+        ".%uuu=.uuuuuu..XX..ppppppppppppppp.......=p.uu%.",
+        ".%uuu=.uuuuuuu..X==================X...5|=||5.%.",
+        ".%uuu=..uuuuuuuu...ppppppppppppppp.XX..5|=||5.%.",
+        ".%uuu=.uuuuuuuuuu.......p.uuuuuuuu..XX.5|=||5.%.",
+        ".%uuu=.uuuuuuuuuuuu.....p.uuuuuuuuu..=.5|=||5.%.",
+        ".%uuu=.uuuuuuuuuuuuu....p.uuuuuuuuu..=.5|=||5.%.",
+        ".%uuu=.......ww.........p....ww......=.5|=|l5.%.",
+        ".%uuuXX.....pppppppppppppppppppp....XX.5|=|s5.%.",
+        ".%uuu.XX.....ww..............ww....XX..5|=|s5.%.",
+        ".%uuuu.XX...uuuuuuuuuuuuuuuuuu....XX...5|=|l5.%.",
+        ".%uuuuu.XX..uuuuuuuuuuuuuuuuuu...XX....5|=||5.%.",
+        ".%uuuuu..X=======================X.....555555.%.",
+        ".%uuuuuu..............................uuuuuuu.%.",
+        ".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%.",
+        "................................................"
+      ],
+      "terrain": {  },
+      "furniture": {  },
+      "palettes": [ "miniature_railway_palette" ],
+      "place_monsters": [
+        { "monster": "GROUP_SCHOOL", "x": [ 35, 40 ], "y": [ 10, 15 ], "repeat": [ 0, 1 ], "density": 1 },
+        { "monster": "GROUP_SCHOOL", "x": [ 35, 40 ], "y": [ 35, 40 ], "repeat": [ 0, 1 ], "density": 1 }
+      ],
+      "place_vehicles": [
+        { "vehicle": "miniature_train_loco", "x": 5, "y": 31, "chance": 5, "fuel": 20, "status": 25, "rotation": 270 },
+        { "vehicle": "miniature_train_loco", "x": 41, "y": 41, "chance": 5, "fuel": 5, "status": 15, "rotation": 270 }
+      ]
+    }
+  }
+]
diff --git a/data/json/mapgen/miniature_railway/miniature_railway_z2.json b/data/json/mapgen/miniature_railway/miniature_railway_z2.json
new file mode 100644
index 0000000000000..0bef755b407b4
--- /dev/null
+++ b/data/json/mapgen/miniature_railway/miniature_railway_z2.json
@@ -0,0 +1,63 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ [ "miniaturerailway_0_0_1", "miniaturerailway_1_0_1" ], [ "miniaturerailway_0_1_1", "miniaturerailway_1_1_1" ] ],
+    "object": {
+      "fill_ter": "t_grass",
+      "rows": [
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        ":::::::::::::::::::::::::::::::::rrrrrrrrrrrrrr:",
+        ":::::::::::::::::::::::::::::::::rrrrrrrrrrrrrr:",
+        ":::::::::::::::::::::::::::::::::rrrrrrrrrrrrrr:",
+        ":::::::::::::::::::::::::::::::::rrrrrrrrrrrrrr:",
+        ":::::::::::::::::::::::::::::::::rrrrrrrrrrrrrr:",
+        ":::::::::::::::::::::::::::::::::rrrrrrrrrrrrrr:",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        ":::::::::::::::::::::::::::::::::::::::rrrrrr:::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::",
+        "::::::::::::::::::::::::::::::::::::::::::::::::"
+      ],
+      "terrain": {  },
+      "furniture": {  },
+      "palettes": [ "miniature_railway_palette" ]
+    }
+  }
+]
diff --git a/data/json/mapgen/movie_theater.json b/data/json/mapgen/movie_theater.json
index 19a1dc5c8ea3b..828860f9074b9 100644
--- a/data/json/mapgen/movie_theater.json
+++ b/data/json/mapgen/movie_theater.json
@@ -1,732 +1,264 @@
 [
   {
     "method": "json",
-    "object": {
-      "furniture": {
-        "#": "f_counter",
-        "&": "f_toilet",
-        "+": "f_null",
-        ".": "f_null",
-        "6": "f_arcade_machine",
-        "7": "f_pinball_machine",
-        "_": "f_null",
-        "c": "f_chair",
-        "s": "f_sink",
-        "t": "f_trashcan",
-        "{": "f_vending_c",
-        "|": "f_null"
-      },
-      "place_items": [
-        { "chance": 35, "item": "trash_cart", "x": 3, "y": 21 },
-        { "chance": 35, "item": "trash_cart", "x": 22, "y": 17 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 17 },
-        { "chance": 35, "item": "trash_cart", "x": 2, "y": 15 },
-        { "chance": 35, "item": "trash_cart", "x": 3, "y": 10 },
-        { "chance": 35, "item": "trash_cart", "x": 12, "y": 2 },
-        { "chance": 75, "item": "vending_food_items", "x": [ 1, 2 ], "y": 13 },
-        { "chance": 35, "item": "misc_smoking", "x": 5, "y": 7 },
-        { "chance": 75, "item": "vending_drink_items", "x": [ 3, 4 ], "y": 13 },
-        { "chance": 45, "item": "toy_store", "x": 21, "y": 22 },
-        { "chance": 45, "item": "toy_store", "x": 8, "y": 14 },
-        { "chance": 55, "item": "trash", "x": 17, "y": 11 },
-        { "chance": 55, "item": "trash", "x": 18, "y": 1 },
-        { "chance": 45, "item": "candy_shop", "x": 14, "y": 19 }
-      ],
-      "place_monsters": [ { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 12, "y": 15 } ],
-      "place_toilets": [
-        { "x": 1, "y": 5 },
-        { "x": 3, "y": 5 },
-        { "x": 5, "y": 5 },
-        { "x": 7, "y": 5 },
-        { "x": 9, "y": 5 },
-        { "x": 11, "y": 5 },
-        { "x": 13, "y": 5 },
-        { "x": 15, "y": 5 },
-        { "x": 17, "y": 5 },
-        { "x": 19, "y": 5 },
-        { "x": 1, "y": 7 },
-        { "x": 3, "y": 7 },
-        { "x": 5, "y": 7 },
-        { "x": 7, "y": 7 },
-        { "x": 9, "y": 7 },
-        { "x": 11, "y": 7 },
-        { "x": 13, "y": 7 }
-      ],
-      "rows": [
-        "||||||||||||||||||||||||",
-        "|#s#s#s#s#s#s#s#s#t....|",
-        "|......................|",
-        "|......................|",
-        "|_|+|_|_|_|+|_|+|+|_|..|",
-        "|&|&|&|&|&|&|&|&|&|&|..|",
-        "|||||||||||||||||||||...",
-        "|&|&|&|&|&|&|&|&|&|&|...",
-        "|_|_|+|_|+|_|_|.....||||",
-        "|...................||||",
-        "|.......................",
-        "|#s#s#s#s#s#s#s##t......",
-        "||||||||||||||||||||||||",
-        "|{{{{|6.6.6...7.7..66..|",
-        "|....|c.c.c............|",
-        "|.......................",
-        "|......c........c.......",
-        "|...66666....6666.......",
-        "|...66666....6666.......",
-        "|...c.c.......c........|",
-        "|....................c6|",
-        "|7...................c6|",
-        "|....................c6|",
-        "|...7.7.7.7.7.7.7.7....|"
-      ],
-      "terrain": {
-        "#": "t_floor",
-        "&": "t_floor",
-        "+": "t_door_metal_c",
-        ".": "t_floor",
-        "6": "t_floor",
-        "7": "t_floor",
-        "_": "t_door_metal_o",
-        "c": "t_floor",
-        "s": "t_floor",
-        "t": "t_floor",
-        "{": "t_floor",
-        "|": "t_wall"
-      }
-    },
-    "om_terrain": "movietheater_0_0",
     "type": "mapgen",
-    "weight": 100
-  },
-  {
-    "method": "json",
-    "object": {
-      "furniture": { "#": "f_chair", "-": "f_null", ".": "f_null", "H": "f_armchair", "|": "f_null" },
-      "place_items": [
-        { "chance": 5, "item": "alcohol", "x": 22, "y": 3 },
-        { "chance": 5, "item": "alcohol", "x": 23, "y": 1 },
-        { "chance": 25, "item": "jackets", "x": 23, "y": 16 },
-        { "chance": 25, "item": "jackets", "x": 6, "y": 11 },
-        { "chance": 25, "item": "jackets", "x": 23, "y": 2 },
-        { "chance": 15, "item": "bags", "x": 15, "y": 9 },
-        { "chance": 15, "item": "bags", "x": 4, "y": 5 },
-        { "chance": 35, "item": "trash_cart", "x": 16, "y": 22 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 20 },
-        { "chance": 35, "item": "trash_cart", "x": 20, "y": 18 },
-        { "chance": 35, "item": "trash_cart", "x": 7, "y": 17 },
-        { "chance": 35, "item": "trash_cart", "x": 17, "y": 16 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 14 },
-        { "chance": 35, "item": "trash_cart", "x": 20, "y": 13 },
-        { "chance": 35, "item": "trash_cart", "x": 4, "y": 13 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 12 },
-        { "chance": 35, "item": "trash_cart", "x": 13, "y": 11 },
-        { "chance": 35, "item": "trash_cart", "x": 21, "y": 9 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 8 },
-        { "chance": 35, "item": "trash_cart", "x": 16, "y": 7 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 7 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 5 },
-        { "chance": 35, "item": "trash_cart", "x": 19, "y": 4 },
-        { "chance": 35, "item": "trash_cart", "x": 9, "y": 4 },
-        { "chance": 35, "item": "trash_cart", "x": 17, "y": 1 }
-      ],
-      "place_monsters": [ { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 12, "y": 10 } ],
-      "rows": [
-        "||||||||||||||||||||||||",
-        "|......................#",
-        "D........#.#.#.#.#.#.#.#",
-        "|........#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|........#.#.#.#.#.#.#.#",
-        "|........#.#.#.#.#.#.#.#",
-        "|......................#",
-        "|.......----.-----||||||",
-        "|.......................",
-        "|.......................",
-        "|.......................",
-        "||||||||||||||||||||||||"
-      ],
-      "terrain": { "#": "t_floor", "D": "t_door_c", "-": "t_railing_h", ".": "t_floor", "H": "t_floor", "|": "t_wall" }
-    },
-    "om_terrain": "movietheater_0_1",
-    "type": "mapgen",
-    "weight": 100
-  },
-  {
-    "method": "json",
+    "weight": 100,
+    "om_terrain": [
+      [ "movietheater_0_0", "movietheater_1_0", "movietheater_2_0" ],
+      [ "movietheater_0_1", "movietheater_1_1", "movietheater_2_1" ],
+      [ "movietheater_0_2", "movietheater_1_2", "movietheater_2_2" ]
+    ],
     "object": {
-      "furniture": { "#": "f_chair", "-": "f_null", ".": "f_null", "H": "f_armchair", "|": "f_null" },
-      "place_items": [
-        { "chance": 5, "item": "alcohol", "x": 22, "y": 3 },
-        { "chance": 5, "item": "alcohol", "x": 23, "y": 1 },
-        { "chance": 25, "item": "jackets", "x": 23, "y": 16 },
-        { "chance": 25, "item": "jackets", "x": 6, "y": 11 },
-        { "chance": 25, "item": "jackets", "x": 23, "y": 2 },
-        { "chance": 15, "item": "bags", "x": 15, "y": 9 },
-        { "chance": 15, "item": "bags", "x": 4, "y": 5 },
-        { "chance": 35, "item": "trash_cart", "x": 16, "y": 22 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 20 },
-        { "chance": 35, "item": "trash_cart", "x": 20, "y": 18 },
-        { "chance": 35, "item": "trash_cart", "x": 7, "y": 17 },
-        { "chance": 35, "item": "trash_cart", "x": 17, "y": 16 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 14 },
-        { "chance": 35, "item": "trash_cart", "x": 20, "y": 13 },
-        { "chance": 35, "item": "trash_cart", "x": 4, "y": 13 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 12 },
-        { "chance": 35, "item": "trash_cart", "x": 13, "y": 11 },
-        { "chance": 35, "item": "trash_cart", "x": 21, "y": 9 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 8 },
-        { "chance": 35, "item": "trash_cart", "x": 16, "y": 7 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 7 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 5 },
-        { "chance": 35, "item": "trash_cart", "x": 19, "y": 4 },
-        { "chance": 35, "item": "trash_cart", "x": 9, "y": 4 },
-        { "chance": 35, "item": "trash_cart", "x": 17, "y": 1 }
-      ],
-      "place_monsters": [ { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 12, "y": 10 } ],
+      "fill_ter": "t_thconc_floor",
       "rows": [
-        "||||||||||||||||||||||||",
-        "|......................#",
-        "D........#.#.#.#.#.#.#.#",
-        "|........#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|...H.H..#.#.#.#.#.#.#.#",
-        "|........#.#.#.#.#.#.#.#",
-        "|........#.#.#.#.#.#.#.#",
-        "|......................#",
-        "|.......----.-----||||||",
-        "|.......................",
-        "|.......................",
-        "|.......................",
-        "||||||||||||||||||||||||"
+        "!!!!!!!!!!!!!!!!!!!!!!!!!!%%^^%%%%%^^%%%%%^^%%!!!!!!!!!!!!!!!!!!!!!!!!!!",
+        "!TsTsTsTsTsTsTsTsTG....|________________________|.......-....|..TT|.XXX!",
+        "!......................|________________________|.......-....+...T|...X!",
+        "!......................|||%%^^%%%%%^^%%%%%^^%%|||....!!G-.-..|...T|...X!",
+        "!+|+|+|+|+|+|+|+|+|+|..|___******************_vv|....!!G-.-..T...T|X..X!",
+        "!&|&|&|&|&|&|&|&|&|&|..|___*$$$$$$$$$$$$$$$$*___........-.-..Tc..T|X...!",
+        "!||||||||||||||||||||...___*$**************$*___@%@.....-.-..T...g|....!",
+        "!&|&|&|&|&|&|&|&|&|&|...___*$$$$********$$$$*___@%@.....-.-..T...g|...X!",
+        "!+|+|+|+|+|+|+|.....||||___****$********$****___@%@.....-.-..T...r|t..X!",
+        "!...................||||______*$*|Z%Z%|*$*______@%@.......-..T...r|t..X!",
+        "!.......................______*$*d*e*e|*$*______..........-..|...o|....!",
+        "!TsTsTsTsTsTsTsTTG......____!_*$*||||||*$*_!____........RR-..|.........!",
+        "!|||||||||||||||||||||||______*$********$*______@%@..........|.........!",
+        "!vFvF|6.6.6...7.7..66..|______*$********$*______@%@..........|gg..|....!",
+        "!....|c.c.c...........G|____!_*$********$*_!____@%@..!!G.....||||||{...!",
+        "!.......................______*$********$*______@%@..!!G.....|vFTT|{...!",
+        "!......c........c.......______*$********$*______.............|...T|{...!",
+        "!...66666....6666.......____!_*$********$*_!____.............|...T||+||!",
+        "!...66666....6666.......______*$********$*______@%@..............T|..{{!",
+        "!...c.c.......c.......G|______*$********$*______@%@..............T|....!",
+        "!....................c6|______*$********$*______@%@..!!G.........T|..ct!",
+        "!7...................c6|______*$********$*______@%@..!!G.........T|..ct!",
+        "!....................c6|______*$********$*______.............|...T||+||!",
+        "!...7.7.7.7.7.7.7.7....|______*$********$*______.............|...T|<.XX!",
+        "!|||||||||||||||||||||||||||||*$********$*|||||||||||||||||||||||||||||!",
+        "!......................#|__tt|*$********$*|tt__|#......................!",
+        "D........#.#.#.#.#.#.#.#|__tt|b$********$b|tt__|#.#.#.#.#.#.#.#........D",
+        "!........#.#.#.#.#.#.#.#|____|b$***!!***$b|____|#.#.#.#.#.#.#.#........!",
+        "!...H.H..#.#.#.#.#.#.#.#|____|b$***!!***$b|___c|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|t___|b$********$b|___t|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#wt___|b$********$b|__ctw#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#wZc__|b$********$b|___Zw#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|____|*$********$*|____|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|___G|*$********$*|G___|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|||*$********$*|||__|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|a_*$********$*_F|__|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|__*$********$*_y|__|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|__*$********$*_v|__|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|F_*$********$*_y|__|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|y_*$***Ki***$*_F|__|#.#.#.#.#.#.#.#..H.H...!",
+        "!........#.#.#.#.#.#.#.#|__|v_*$***iK***$*__|__|#.#.#.#.#.#.#.#........!",
+        "!........#.#.#.#.#.#.#.#|l_|y_*$********$*__|_l|#.#.#.#.#.#.#.#........!",
+        "!......................#|l_|F_*$********$*_a|_l|#......................!",
+        "!.......----.-----||||||||+|||*$********$*|||+||||||||||----.-----.....!",
+        "!.......................+******$********$******+.......................!",
+        "!.......................|*$$$$$$********$$$$$$*|.......................!",
+        "!.......................+******$********$******+.......................!",
+        "!|||||||||||||||||||||||||||||*$********$*|||||||||||||||||||||||||||||!",
+        "!|||||||||||||||||||||||||||||*$********$*|||||||||||||||||||||||||||||!",
+        "!......................#|__tt|*$********$*|tt__|#......................!",
+        "D........#.#.#.#.#.#.#.#|__tt|b$********$b|tt__|#.#.#.#.#.#.#.#........D",
+        "!........#.#.#.#.#.#.#.#|____|b$***!!***$b|____|#.#.#.#.#.#.#.#........!",
+        "!...H.H..#.#.#.#.#.#.#.#|____|b$***!!***$b|___c|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|t___|b$********$b|___t|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#wt___|b$********$b|__ctw#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#wZc__|b$********$b|___Zw#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|____|*$********$*|____|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|___G|*$********$*|G___|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|||*$********$*|||__|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|a_*$********$*_v|__|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|__*$********$*_y|__|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|__*$********$*_F|__|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|v_*$********$*_y|__|#.#.#.#.#.#.#.#..H.H...!",
+        "!...H.H..#.#.#.#.#.#.#.#|__|y_*$***Ki***$*_v|__|#.#.#.#.#.#.#.#..H.H...!",
+        "!........#.#.#.#.#.#.#.#|__|F_*$***iK***$*__|__|#.#.#.#.#.#.#.#........!",
+        "!........#.#.#.#.#.#.#.#|l_|y_*$********$*__|_l|#.#.#.#.#.#.#.#........!",
+        "!......................#|l_|v_*$********$*_a|_l|#......................!",
+        "!.......----.-----||||||||+|||*$********$*|||+||||||||||----.-----.....!",
+        "!.......................+******$********$******+.......................!",
+        "!.......................|*$$$$$$$$$$$$$$$$$$$$*|.......................!",
+        "!.......................+**********************+.......................!",
+        "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
       ],
-      "terrain": { "#": "t_floor", "D": "t_door_c", "-": "t_railing_h", ".": "t_floor", "H": "t_floor", "|": "t_wall" }
-    },
-    "om_terrain": "movietheater_0_2",
-    "type": "mapgen",
-    "weight": 100
-  },
-  {
-    "method": "json",
-    "object": {
-      "furniture": {
-        "#": "f_counter",
-        "&": "f_null",
-        "+": "f_null",
-        "-": "f_null",
-        ".": "f_null",
-        "_": "f_null",
-        "d": "f_null",
-        "|": "f_null"
+      "palettes": [ "movie_theater_palette.json" ],
+      "terrain": { "#": "t_thconc_floor", "H": "t_thconc_floor", "y": "t_thconc_floor" },
+      "toilets": { "&": {  } },
+      "vendingmachines": { "v": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "items": {
+        "&": { "item": "alcohol", "chance": 10 },
+        "T": { "item": "snacks", "chance": 5 },
+        "X": { "item": "snacks", "chance": 30, "repeat": [ 6, 12 ] },
+        "g": { "item": "fridgesnacks", "chance": 70, "repeat": [ 6, 12 ] },
+        "G": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] },
+        "t": [
+          { "item": "snacks", "chance": 3 },
+          { "item": "consumer_electronics", "chance": 4 },
+          { "item": "cubical_office", "chance": 10 },
+          { "item": "office_breakroom", "chance": 5 }
+        ],
+        "#": [
+          { "item": "jackets", "chance": 3 },
+          { "item": "bags", "chance": 4 },
+          { "item": "trash_cart", "chance": 8 },
+          { "item": "hatstore_accessories", "chance": 5 }
+        ],
+        "H": [
+          { "item": "jackets", "chance": 3 },
+          { "item": "bags", "chance": 4 },
+          { "item": "trash_cart", "chance": 10 },
+          { "item": "hatstore_accessories", "chance": 5 }
+        ],
+        "{": [
+          { "item": "jackets", "chance": 3 },
+          { "item": "bags", "chance": 4 },
+          { "item": "consumer_electronics", "chance": 5 },
+          { "item": "hatstore_accessories", "chance": 5 },
+          { "item": "manuals", "chance": 5 },
+          { "item": "textbooks", "chance": 5 }
+        ],
+        "l": [
+          { "item": "softdrugs", "chance": 10 },
+          { "item": "bags", "chance": 20 },
+          { "item": "consumer_electronics", "chance": 5 },
+          { "item": "alcohol", "chance": 5 },
+          { "item": "manuals", "chance": 5 },
+          { "item": "textbooks", "chance": 5 }
+        ]
       },
       "place_items": [
-        { "chance": 35, "item": "trash_cart", "x": 21, "y": 21 },
-        { "chance": 35, "item": "trash_cart", "x": 1, "y": 19 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 16 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 7 },
-        { "chance": 35, "item": "trash_cart", "x": 19, "y": 6 },
-        { "chance": 35, "item": "trash_cart", "x": 2, "y": 2 },
-        { "chance": 35, "item": "trash_cart", "x": 15, "y": 1 },
-        { "chance": 5, "item": "jackets", "x": 9, "y": 13 },
-        { "chance": 15, "item": "consumer_electronics", "x": 8, "y": 20 },
-        { "chance": 5, "item": "shoes", "x": 14, "y": 8 },
-        { "chance": 35, "item": "cubical_office", "x": [ 10, 11 ], "y": 20 }
+        { "chance": 35, "item": "misc_smoking", "x": 5, "y": 7 },
+        { "chance": 45, "item": "toy_store", "x": 21, "y": 22 },
+        { "chance": 45, "item": "toy_store", "x": 8, "y": 14 }
       ],
-      "rows": [
-        "--||++|||||++|||||++||--",
-        "________________________",
-        "________________________",
-        "--||++|||||++|||||++||--",
-        "___.................._&&",
-        "___..................___",
-        "___..................___",
-        "___..................___",
-        "___..................___",
-        "______............______",
-        "______............______",
-        "____-_............_-____",
-        "______............______",
-        "______............______",
-        "____-_............_-____",
-        "______............______",
-        "______............______",
-        "____-_............_-____",
-        "______............______",
-        "______............______",
-        "______.-####-.....______",
-        "______.d....-.....______",
-        "______.------.....______",
-        "______............______"
+      "place_monsters": [
+        { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 12, "y": 15 },
+        { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 57, "y": 15 },
+        { "chance": 15, "density": 0.0, "monster": "GROUP_ZOMBIE", "x": 69, "y": 11 },
+        { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 12, "y": 34 },
+        { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 60, "y": 34 },
+        { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 12, "y": 58 },
+        { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 60, "y": 58 }
       ],
-      "terrain": {
-        "#": "t_carpet_purple",
-        "&": "t_atm",
-        "+": "t_door_glass_c",
-        "-": "t_wall",
-        ".": "t_carpet_purple",
-        "_": "t_floor",
-        "d": "t_door_c",
-        "|": "t_wall_glass"
-      }
-    },
-    "om_terrain": "movietheater_1_0",
-    "type": "mapgen",
-    "weight": 100
+      "place_item": [
+        { "item": "ketchup", "repeat": 1, "x": 65, "y": 16 },
+        { "item": "ketchup", "repeat": 1, "x": 65, "y": 17 },
+        { "item": "ketchup", "repeat": 1, "x": 65, "y": 18 },
+        { "item": "mustard", "repeat": 1, "x": 65, "y": 20 },
+        { "item": "mustard", "repeat": 1, "x": 65, "y": 21 },
+        { "item": "mustard", "repeat": 1, "x": 65, "y": 22 },
+        { "item": "vinegar", "repeat": 1, "x": 65, "y": 22 }
+      ]
+    }
   },
   {
     "method": "json",
-    "object": {
-      "furniture": {
-        "#": "f_table",
-        "&": "f_trashcan",
-        "+": "f_null",
-        ".": "f_null",
-        "H": "f_armchair",
-        "^": "f_indoor_plant",
-        "_": "f_null",
-        "a": "f_null",
-        "b": "f_bench",
-        "c": "f_chair",
-        "d": "f_null",
-        "i": "f_indoor_plant",
-        "l": "f_locker",
-        "w": "f_null",
-        "{": "f_vending_c",
-        "|": "f_null"
-      },
-      "place_items": [
-        { "chance": 45, "item": "jackets", "x": 1, "y": 17 },
-        { "chance": 75, "item": "vending_food_items", "x": 4, "y": 18 },
-        { "chance": 75, "item": "vending_food_items", "x": 19, "y": 11 },
-        { "chance": 45, "item": "softdrugs", "x": 22, "y": 17 },
-        { "chance": 35, "item": "cubical_office", "x": 22, "y": 5 },
-        { "chance": 35, "item": "cubical_office", "x": 1, "y": 5 },
-        { "chance": 35, "item": "cubical_office", "x": 19, "y": [ 1, 2 ] },
-        { "chance": 35, "item": "cubical_office", "x": 3, "y": 1 },
-        { "chance": 55, "item": "trash", "x": 19, "y": 9 },
-        { "chance": 55, "item": "trash", "x": 4, "y": 9 },
-        { "chance": 15, "item": "bags", "x": 1, "y": 18 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 21 },
-        { "chance": 35, "item": "trash_cart", "x": 19, "y": 20 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 14 },
-        { "chance": 35, "item": "trash_cart", "x": 8, "y": 9 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 5 },
-        { "chance": 75, "item": "vending_drink_items", "x": 4, "y": 16 },
-        { "chance": 75, "item": "vending_drink_items", "x": 19, "y": 15 },
-        { "chance": 75, "item": "vending_drink_items", "x": 4, "y": 14 },
-        { "chance": 75, "item": "vending_drink_items", "x": 19, "y": 13 },
-        { "chance": 25, "item": "manuals", "x": 20, "y": 1 }
-      ],
-      "rows": [
-        "||||||............||||||",
-        "|__##|............|##__|",
-        "|__##|b..........b|##__|",
-        "|____|b....||....b|____|",
-        "|____|b....||....b|___c|",
-        "|#___|b..........b|___#|",
-        "w#___|b..........b|__c#w",
-        "wTc__|b..........b|___Tw",
-        "|____|............|____|",
-        "|___&|............|&___|",
-        "|__|||............|||__|",
-        "|__|a_............_{|__|",
-        "|__|__............_^|__|",
-        "|__|__............_{|__|",
-        "|__|{_............_^|__|",
-        "|__|^_.....Hi....._{|__|",
-        "|__|{_.....iH.....__|__|",
-        "|l_|^_............__|_l|",
-        "|l_|{_............_a|_l|",
-        "||+|||............|||+||",
-        "+......................d",
-        "|......................|",
-        "d......................+",
-        "||||||............||||||"
-      ],
-      "terrain": {
-        "#": "t_floor",
-        "&": "t_floor",
-        "+": "t_door_metal_c",
-        ".": "t_carpet_purple",
-        "H": "t_carpet_purple",
-        "^": "t_floor",
-        "_": "t_floor",
-        "a": "t_atm",
-        "b": "t_carpet_purple",
-        "c": "t_floor",
-        "d": "t_door_metal_o",
-        "i": "t_carpet_purple",
-        "l": "t_floor",
-        "w": "t_window",
-        "{": "t_floor",
-        "T": "t_console_broken",
-        "|": "t_wall"
-      }
-    },
-    "om_terrain": "movietheater_1_1",
     "type": "mapgen",
-    "weight": 100
-  },
-  {
-    "method": "json",
+    "weight": 100,
+    "om_terrain": [
+      [ "movietheater_roof_0_0", "movietheater_roof_1_0", "movietheater_roof_2_0" ],
+      [ "movietheater_roof_0_1", "movietheater_roof_1_1", "movietheater_roof_2_1" ],
+      [ "movietheater_roof_0_2", "movietheater_roof_1_2", "movietheater_roof_2_2" ]
+    ],
     "object": {
-      "furniture": {
-        "#": "f_table",
-        "&": "f_trashcan",
-        "+": "f_null",
-        ".": "f_null",
-        "H": "f_armchair",
-        "^": "f_indoor_plant",
-        "_": "f_null",
-        "a": "f_null",
-        "b": "f_bench",
-        "c": "f_chair",
-        "d": "f_null",
-        "i": "f_indoor_plant",
-        "l": "f_locker",
-        "w": "f_null",
-        "{": "f_vending_c",
-        "|": "f_null"
-      },
-      "place_items": [
-        { "chance": 45, "item": "jackets", "x": 1, "y": 17 },
-        { "chance": 75, "item": "vending_food_items", "x": 4, "y": 18 },
-        { "chance": 75, "item": "vending_food_items", "x": 19, "y": 11 },
-        { "chance": 35, "item": "cubical_office", "x": 22, "y": 5 },
-        { "chance": 35, "item": "cubical_office", "x": 1, "y": 5 },
-        { "chance": 35, "item": "cubical_office", "x": 19, "y": [ 1, 2 ] },
-        { "chance": 35, "item": "cubical_office", "x": 3, "y": 1 },
-        { "chance": 55, "item": "trash", "x": 19, "y": 9 },
-        { "chance": 55, "item": "trash", "x": 4, "y": 9 },
-        { "chance": 15, "item": "bags", "x": 1, "y": 18 },
-        { "chance": 25, "item": "hatstore_hats", "x": 22, "y": 17 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 21 },
-        { "chance": 35, "item": "trash_cart", "x": 19, "y": 20 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 14 },
-        { "chance": 35, "item": "trash_cart", "x": 8, "y": 9 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 5 },
-        { "chance": 35, "item": "textbooks", "x": 22, "y": 18 },
-        { "chance": 75, "item": "vending_drink_items", "x": 4, "y": 16 },
-        { "chance": 75, "item": "vending_drink_items", "x": 19, "y": 15 },
-        { "chance": 75, "item": "vending_drink_items", "x": 4, "y": 14 },
-        { "chance": 75, "item": "vending_drink_items", "x": 19, "y": 13 },
-        { "chance": 15, "item": "jackets", "x": 17, "y": 3 },
-        { "chance": 25, "item": "manuals", "x": 20, "y": 1 }
-      ],
+      "fill_ter": "t_thconc_floor",
       "rows": [
-        "||||||............||||||",
-        "|__##|............|##__|",
-        "|__##|b..........b|##__|",
-        "|____|b....||....b|____|",
-        "|____|b....||....b|___c|",
-        "|#___|b..........b|___#|",
-        "w#___|b..........b|__c#w",
-        "wTc__|b..........b|___Tw",
-        "|____|............|____|",
-        "|___&|............|&___|",
-        "|__|||............|||__|",
-        "|__|a_............_{|__|",
-        "|__|__............_^|__|",
-        "|__|__............_{|__|",
-        "|__|{_............_^|__|",
-        "|__|^_.....Hi....._{|__|",
-        "|__|{_.....iH.....__|__|",
-        "|l_|^_............__|_l|",
-        "|l_|{_............_a|_l|",
-        "||+|||............|||+||",
-        "+......................d",
-        "|......................|",
-        "d......................+",
-        "||||||||||||||||||||||||"
+        "222222222222222222222222222222222222222222222222222222222222222222222222",
+        "|......................................................................3",
+        "|......=............................................................:..3",
+        "|......................................................................3",
+        "|......&..&..&.............................................&...........3",
+        "|.................................................................=....3",
+        "|......................................................................3",
+        "|......&..&..&.............................................&...........3",
+        "|......................................................................3",
+        "|....=............................................................=....3",
+        "|..........................................................&...........3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|...........................................%%%D%%%%%%%%%%%%%%%%%%%%%..3",
+        "|...........................................%...........AAAAA.AAAAA.%..3",
+        "|...........................................%...YY..................%..3",
+        "|...........................................%...YY...################..3",
+        "|...........................................%........#6666______#pHH#..3",
+        "|...........................................%........+__________#_HH#..3",
+        "|...........................................%........#6666______+__p#..3",
+        "|...........................................%........#__________#####..3",
+        "|...........................................%........#__________#__>#..3",
+        "|...........................................D........#__________##+##..3",
+        "|...........................................%........#______________#..3",
+        "|...........................................%........+__________CCC_#..3",
+        "|...........................................%........#__C______CCC_p#..3",
+        "|...........................................%..X.....#_CCC______C__p#..3",
+        "|...........................................%........#___C_______CCC#..3",
+        "|...........................................%%%%%%%%%################..3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......:..................................................:............3",
+        "5......................................................................5",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|......................................................................3",
+        "|----------------------------------------------------------------------3"
       ],
+      "palettes": [ "roof_palette" ],
+      "liquids": { "6": { "liquid": "water_clean", "amount": [ 0, 100 ] }, "Y": { "liquid": "water_clean", "amount": [ 100, 1000 ] } },
       "terrain": {
-        "#": "t_floor",
-        "&": "t_floor",
+        ">": "t_ladder_down",
+        "_": "t_thconc_floor",
+        "#": "t_brick_wall",
         "+": "t_door_metal_c",
-        ".": "t_carpet_purple",
-        "H": "t_carpet_purple",
-        "^": "t_floor",
-        "_": "t_floor",
-        "a": "t_atm",
-        "b": "t_carpet_purple",
-        "c": "t_floor",
-        "d": "t_door_metal_o",
-        "i": "t_carpet_purple",
-        "l": "t_floor",
-        "w": "t_window",
-        "{": "t_floor",
-        "T": "t_console_broken",
-        "|": "t_wall"
-      }
-    },
-    "om_terrain": "movietheater_1_2",
-    "type": "mapgen",
-    "weight": 100
-  },
-  {
-    "method": "json",
-    "object": {
-      "place_item": [
-        { "item": "ketchup", "repeat": 1, "x": 17, "y": 16 },
-        { "item": "ketchup", "repeat": 1, "x": 17, "y": 17 },
-        { "item": "ketchup", "repeat": 1, "x": 17, "y": 18 },
-        { "item": "mustard", "repeat": 1, "x": 17, "y": 20 },
-        { "item": "mustard", "repeat": 1, "x": 17, "y": 21 },
-        { "item": "mustard", "repeat": 1, "x": 17, "y": 22 },
-        { "item": "vinegar", "repeat": 1, "x": 17, "y": 22 }
-      ],
-      "furniture": {
-        "#": "f_counter",
-        "+": "f_null",
-        "-": "f_null",
-        ".": "f_null",
-        "R": "f_null",
-        "X": "f_crate_c",
-        "c": "f_chair",
-        "g": "f_glass_fridge",
-        "o": "f_oven",
-        "r": "f_rack",
-        "t": "f_table",
-        "v": "f_vending_c",
-        "{": "f_locker",
-        "|": "f_null"
+        "D": "t_chaingate_l",
+        "%": "t_chainfence",
+        "H": "t_generator_broken",
+        "&": "t_flat_roof",
+        "A": "t_flat_roof",
+        ":": "t_flat_roof",
+        "Y": "t_flat_roof",
+        "X": "t_flat_roof",
+        "=": "t_flat_roof",
+        "p": "t_machinery_old"
       },
-      "place_items": [
-        { "chance": 45, "item": "jackets", "x": 22, "y": 18 },
-        { "chance": 75, "item": "vending_food_items", "x": 14, "y": 15 },
-        { "chance": 75, "item": "vending_food_items", "x": 22, "y": 8 },
-        { "chance": 75, "item": "vending_food_items", "x": 22, "y": 2 },
-        { "chance": 75, "item": "vending_food_items", "x": 21, "y": 1 },
-        { "chance": 55, "item": "office_breakroom", "x": [ 21, 22 ], "y": 21 },
-        { "chance": 35, "item": "school", "x": 21, "y": 23 },
-        { "chance": 65, "item": "snacks", "x": 22, "y": 9 },
-        { "chance": 65, "item": "snacks", "x": 17, "y": [ 8, 9 ] },
-        { "chance": 65, "item": "snacks", "x": 22, "y": 7 },
-        { "chance": 65, "item": "snacks", "x": 19, "y": 5 },
-        { "chance": 65, "item": "snacks", "x": 22, "y": [ 3, 4 ] },
-        { "chance": 65, "item": "snacks", "x": 17, "y": [ 3, 4 ] },
-        { "chance": 65, "item": "snacks", "x": 22, "y": 1 },
-        { "chance": 15, "item": "bags", "x": 21, "y": 18 },
-        { "chance": 35, "item": "trash_cart", "x": 8, "y": 20 },
-        { "chance": 35, "item": "trash_cart", "x": 1, "y": 15 },
-        { "chance": 35, "item": "trash_cart", "x": 12, "y": 1 },
-        { "chance": 75, "item": "vending_drink_items", "x": 15, "y": 15 },
-        { "chance": 75, "item": "vending_drink_items", "x": 19, "y": 4 },
-        { "chance": 75, "item": "vending_drink_items", "x": 20, "y": 1 },
-        { "chance": 55, "item": "coffee_shop", "x": 17, "y": [ 6, 7 ] },
-        { "chance": 45, "item": "dining", "x": 17, "y": 2 },
-        { "chance": 45, "item": "fridgesnacks", "x": [ 14, 15 ], "y": 13 }
-      ],
-      "place_monsters": [
-        { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 9, "y": 15 },
-        { "chance": 15, "density": 0.0, "monster": "GROUP_ZOMBIE", "x": 21, "y": 11 }
-      ],
-      "rows": [
-        "||||||||||||||||||||||||",
-        "|.......-....|..##|.XXX|",
-        "|.......-....+...#|...X|",
-        "|....||.-.-..|...#|...X|",
-        "|....||.-.-..#...#|X..X|",
-        "........-.-..#c..#|X...|",
-        "........-.-..#...g|....|",
-        "........-.-..#...g|...X|",
-        "........-.-..#...r|t..X|",
-        "..........-..#...r|t..X|",
-        "..........-..|...o|....|",
-        "........RR-..|.........|",
-        ".............|.........|",
-        ".............|gg..|....|",
-        ".....||......||||||{...|",
-        ".....||......|vv##|{...|",
-        ".............|...#|{...|",
-        ".............|...#||+|||",
-        ".................#|..{{|",
-        ".................#|....|",
-        ".....||..........#|..c.|",
-        ".....||..........#|..tt|",
-        ".............|...#|.ctt|",
-        ".............|...#|.ctt|"
-      ],
-      "terrain": {
-        "#": "t_floor",
-        "+": "t_door_c",
-        "-": "t_railing_v",
-        ".": "t_floor",
-        "R": "t_railing_h",
-        "X": "t_floor",
-        "c": "t_floor",
-        "g": "t_floor",
-        "o": "t_floor",
-        "r": "t_floor",
-        "t": "t_floor",
-        "v": "t_floor",
-        "{": "t_floor",
-        "|": "t_wall"
-      }
-    },
-    "om_terrain": "movietheater_2_0",
-    "type": "mapgen",
-    "weight": 100
-  },
-  {
-    "method": "json",
-    "object": {
-      "furniture": { "#": "f_chair", "-": "f_null", ".": "f_null", "H": "f_armchair", "|": "f_null" },
-      "place_items": [
-        { "chance": 5, "item": "alcohol", "x": 0, "y": 17 },
-        { "chance": 5, "item": "alcohol", "x": 0, "y": 1 },
-        { "chance": 25, "item": "jackets", "x": 6, "y": 11 },
-        { "chance": 25, "item": "jackets", "x": 19, "y": 7 },
-        { "chance": 25, "item": "jackets", "x": 2, "y": 7 },
-        { "chance": 15, "item": "bags", "x": 15, "y": 9 },
-        { "chance": 15, "item": "bags", "x": 4, "y": 5 },
-        { "chance": 35, "item": "trash_cart", "x": 16, "y": 22 },
-        { "chance": 35, "item": "trash_cart", "x": 8, "y": 22 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 20 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 20 },
-        { "chance": 35, "item": "trash_cart", "x": 20, "y": 18 },
-        { "chance": 35, "item": "trash_cart", "x": 7, "y": 17 },
-        { "chance": 35, "item": "trash_cart", "x": 17, "y": 16 },
-        { "chance": 35, "item": "trash_cart", "x": 1, "y": 15 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 14 },
-        { "chance": 35, "item": "trash_cart", "x": 20, "y": 13 },
-        { "chance": 35, "item": "trash_cart", "x": 4, "y": 13 },
-        { "chance": 35, "item": "trash_cart", "x": 17, "y": 12 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 12 },
-        { "chance": 35, "item": "trash_cart", "x": 13, "y": 11 },
-        { "chance": 35, "item": "trash_cart", "x": 0, "y": 11 },
-        { "chance": 35, "item": "trash_cart", "x": 19, "y": 10 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 8 },
-        { "chance": 35, "item": "trash_cart", "x": 16, "y": 7 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 7 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 5 },
-        { "chance": 35, "item": "trash_cart", "x": 19, "y": 4 },
-        { "chance": 35, "item": "trash_cart", "x": 9, "y": 4 },
-        { "chance": 35, "item": "trash_cart", "x": 1, "y": 4 },
-        { "chance": 35, "item": "trash_cart", "x": 12, "y": 3 },
-        { "chance": 35, "item": "trash_cart", "x": 17, "y": 1 }
-      ],
-      "place_monsters": [ { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 12, "y": 10 } ],
-      "rows": [
-        "||||||||||||||||||||||||",
-        "#......................|",
-        "#.#.#.#.#.#.#.#........D",
-        "#.#.#.#.#.#.#.#........|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#........|",
-        "#.#.#.#.#.#.#.#........|",
-        "#......................|",
-        "||||||||----.-----.....|",
-        ".......................|",
-        ".......................|",
-        ".......................|",
-        "||||||||||||||||||||||||"
-      ],
-      "terrain": { "#": "t_floor", "D": "t_door_c", "-": "t_railing_h", ".": "t_floor", "H": "t_floor", "|": "t_wall" }
-    },
-    "om_terrain": "movietheater_2_1",
-    "type": "mapgen",
-    "weight": 100
-  },
-  {
-    "method": "json",
-    "object": {
-      "furniture": { "#": "f_chair", "-": "f_null", ".": "f_null", "H": "f_armchair", "|": "f_null" },
-      "place_items": [
-        { "chance": 5, "item": "alcohol", "x": 0, "y": 17 },
-        { "chance": 5, "item": "alcohol", "x": 0, "y": 1 },
-        { "chance": 25, "item": "jackets", "x": 6, "y": 11 },
-        { "chance": 25, "item": "jackets", "x": 19, "y": 7 },
-        { "chance": 25, "item": "jackets", "x": 2, "y": 7 },
-        { "chance": 15, "item": "bags", "x": 15, "y": 9 },
-        { "chance": 15, "item": "bags", "x": 4, "y": 5 },
-        { "chance": 35, "item": "trash_cart", "x": 16, "y": 22 },
-        { "chance": 35, "item": "trash_cart", "x": 8, "y": 22 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 20 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 20 },
-        { "chance": 35, "item": "trash_cart", "x": 20, "y": 18 },
-        { "chance": 35, "item": "trash_cart", "x": 7, "y": 17 },
-        { "chance": 35, "item": "trash_cart", "x": 17, "y": 16 },
-        { "chance": 35, "item": "trash_cart", "x": 1, "y": 15 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 14 },
-        { "chance": 35, "item": "trash_cart", "x": 20, "y": 13 },
-        { "chance": 35, "item": "trash_cart", "x": 4, "y": 13 },
-        { "chance": 35, "item": "trash_cart", "x": 17, "y": 12 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 12 },
-        { "chance": 35, "item": "trash_cart", "x": 13, "y": 11 },
-        { "chance": 35, "item": "trash_cart", "x": 0, "y": 11 },
-        { "chance": 35, "item": "trash_cart", "x": 19, "y": 10 },
-        { "chance": 35, "item": "trash_cart", "x": 6, "y": 8 },
-        { "chance": 35, "item": "trash_cart", "x": 16, "y": 7 },
-        { "chance": 35, "item": "trash_cart", "x": 10, "y": 7 },
-        { "chance": 35, "item": "trash_cart", "x": 14, "y": 5 },
-        { "chance": 35, "item": "trash_cart", "x": 19, "y": 4 },
-        { "chance": 35, "item": "trash_cart", "x": 9, "y": 4 },
-        { "chance": 35, "item": "trash_cart", "x": 1, "y": 4 },
-        { "chance": 35, "item": "trash_cart", "x": 12, "y": 3 },
-        { "chance": 35, "item": "trash_cart", "x": 17, "y": 1 }
-      ],
-      "place_monsters": [ { "chance": 15, "density": 0.25, "monster": "GROUP_ZOMBIE", "x": 12, "y": 10 } ],
-      "rows": [
-        "||||||||||||||||||||||||",
-        "#......................|",
-        "#.#.#.#.#.#.#.#........D",
-        "#.#.#.#.#.#.#.#........|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#..H.H...|",
-        "#.#.#.#.#.#.#.#........|",
-        "#.#.#.#.#.#.#.#........|",
-        "#......................|",
-        "||||||||----.-----.....|",
-        ".......................|",
-        ".......................|",
-        ".......................|",
-        "||||||||||||||||||||||||"
-      ],
-      "terrain": { "#": "t_floor", "D": "t_door_c", "-": "t_railing_h", ".": "t_floor", "H": "t_floor", "|": "t_wall" }
-    },
-    "om_terrain": "movietheater_2_2",
-    "type": "mapgen",
-    "weight": 100
+      "furniture": { "Y": "f_standing_tank", "6": "f_water_heater", "7": "f_roof_turbine_vent" },
+      "items": { "C": { "item": "snacks", "chance": 30, "repeat": [ 6, 12 ] } }
+    }
   }
 ]
diff --git a/data/json/mapgen/outpost.json b/data/json/mapgen/outpost.json
index 8fb96a893273a..ae48f395fd14d 100644
--- a/data/json/mapgen/outpost.json
+++ b/data/json/mapgen/outpost.json
@@ -95,13 +95,13 @@
       "toilets": { "&": {  } },
       "place_monster": [
         { "monster": "mon_crows_m240", "x": 10, "y": 1 },
-        { "monster": "mon_laserturret", "x": 13, "y": 1 },
+        { "monster": "mon_turret_bmg", "x": 13, "y": 1 },
         { "monster": "mon_crows_m240", "x": 1, "y": 10 },
-        { "monster": "mon_laserturret", "x": 1, "y": 13 },
+        { "monster": "mon_turret_bmg", "x": 1, "y": 13 },
         { "monster": "mon_crows_m240", "x": 22, "y": 10 },
-        { "monster": "mon_laserturret", "x": 22, "y": 13 },
+        { "monster": "mon_turret_bmg", "x": 22, "y": 13 },
         { "monster": "mon_crows_m240", "x": 10, "y": 22 },
-        { "monster": "mon_laserturret", "x": 13, "y": 22 },
+        { "monster": "mon_turret_bmg", "x": 13, "y": 22 },
         { "monster": "mon_turret_searchlight", "x": 1, "y": 1 },
         { "monster": "mon_turret_searchlight", "x": 22, "y": 22 },
         { "monster": "mon_turret_searchlight", "x": 1, "y": 22 },
@@ -113,7 +113,7 @@
           { "monster": "mon_zombie_bio_op", "chance": 1 },
           { "monster": "mon_dispatch", "chance": 1 },
           { "monster": "mon_dispatch_military", "chance": 1 },
-          { "monster": "mon_talon_m202a1", "chance": 1 },
+          { "monster": "mon_secubot", "chance": 5 },
           { "monster": "mon_zombie_flamer", "chance": 1 }
         ]
       }
@@ -221,13 +221,13 @@
       "toilets": { "&": {  } },
       "place_monster": [
         { "monster": "mon_crows_m240", "x": 10, "y": 1 },
-        { "monster": "mon_laserturret", "x": 13, "y": 1 },
+        { "monster": "mon_turret_bmg", "x": 13, "y": 1 },
         { "monster": "mon_crows_m240", "x": 1, "y": 10 },
-        { "monster": "mon_laserturret", "x": 1, "y": 13 },
+        { "monster": "mon_turret_bmg", "x": 1, "y": 13 },
         { "monster": "mon_crows_m240", "x": 22, "y": 10 },
-        { "monster": "mon_laserturret", "x": 22, "y": 13 },
+        { "monster": "mon_turret_bmg", "x": 22, "y": 13 },
         { "monster": "mon_crows_m240", "x": 10, "y": 22 },
-        { "monster": "mon_laserturret", "x": 13, "y": 22 },
+        { "monster": "mon_turret_bmg", "x": 13, "y": 22 },
         { "monster": "mon_turret_searchlight", "x": 1, "y": 1 },
         { "monster": "mon_turret_searchlight", "x": 22, "y": 22 },
         { "monster": "mon_turret_searchlight", "x": 1, "y": 22 },
@@ -239,7 +239,7 @@
           { "monster": "mon_zombie_bio_op", "chance": 1 },
           { "monster": "mon_dispatch", "chance": 1 },
           { "monster": "mon_dispatch_military", "chance": 1 },
-          { "monster": "mon_talon_m202a1", "chance": 1 },
+          { "monster": "mon_secubot", "chance": 5 },
           { "monster": "mon_zombie_flamer", "chance": 1 }
         ]
       }
diff --git a/data/json/mapgen/parking_lot.json b/data/json/mapgen/parking_lot.json
index 1fde804f6d9e6..b09803fb7bb58 100644
--- a/data/json/mapgen/parking_lot.json
+++ b/data/json/mapgen/parking_lot.json
@@ -8,7 +8,7 @@
       "fill_ter": "t_floor",
       "rows": [
         "................................................",
-        "....____-____-____-____-____-____-____-____-....",
+        ".Y..____-____-____-____Y____-____-____-____-..Y.",
         "...-____-____-____-____-____-____-____-____-_...",
         ".._-____-____-____-____-____-____-____-____-__..",
         ".__-____-____-____-____-____-____-____-____-___.",
@@ -19,7 +19,7 @@
         ".______________________________________________.",
         ".______________________________________________.",
         ".______________________________________________.",
-        ".______________________________________________.",
+        ".Y____________________________________________Y.",
         ".______________________________________________.",
         ".______________________________________________.",
         ".______________________________________________.",
@@ -29,10 +29,11 @@
         ".__-___-____-____-____-____-___________________.",
         ".._-___-____-____-____-____-__________________..",
         "...-___-____-____-____-____-_________________...",
-        "....___-____-____-____-____-________________....",
+        ".Y..___-____-____-____Y____-________________..Y.",
         "............................_______--_______...."
       ],
-      "terrain": { ".": [ [ "t_grass", 6 ], [ "t_dirt", 5 ] ], "_": "t_pavement", "-": "t_pavement_y" }
+      "terrain": { ".": [ [ "t_grass", 6 ], [ "t_dirt", 5 ] ], "_": "t_pavement", "-": "t_pavement_y" },
+      "furniture": { "Y": "f_street_light" }
     }
   },
   {
@@ -43,10 +44,10 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "........................................................................",
+        "............Y..............Y..............Y..............Y..............",
         "....___-____-____-____-____-____-____-____-____-____-____-____-____-....",
         "...____-____-____-____-____-____-____-____-____-____-____-____-____-_...",
-        ".._____-____-____-____-____-____-____-____-____-____-____-____-____-__..",
+        ".._____-____-____-____-____-____-____-____-____-____-____-____-____-__Y.",
         ".______-____-____-____-____-____-____-____-____-____-____-____-____-___.",
         ".______-____-____-____-____-____-____-____-____-____-____-____-____-___.",
         ".______-____-____-____-____-____-____-____-____-____-____-____-____-___.",
@@ -55,7 +56,7 @@
         ".______________________________________________________________________.",
         ".______________________________________________________________________.",
         ".______________________________________________________________________.",
-        ".______________________________________________________________________.",
+        "Y______________________________________________________________________Y",
         ".______________________________________________________________________.",
         ".______________________________________________________________________.",
         ".______________________________________________________________________.",
@@ -63,12 +64,13 @@
         "._____-____-____-____-____-____-____-____-____-____-___________________.",
         "._____-____-____-____-____-____-____-____-____-____-___________________.",
         "._____-____-____-____-____-____-____-____-____-____-___________________.",
-        "..____-____-____-____-____-____-____-____-____-____-__________________..",
+        "..____-____-____-____-____-____-____-____-____-____-__________________Y.",
         "...___-____-____-____-____-____-____-____-____-____-_________________...",
         "....__-____-____-____-____-____-____-____-____-____-________________....",
-        "...................................................._______--_______...."
+        "...........Y..............Y..............Y.........._______--_______...."
       ],
-      "terrain": { ".": [ [ "t_grass", 6 ], [ "t_dirt", 5 ] ], "_": "t_pavement", "-": "t_pavement_y" }
+      "terrain": { ".": [ [ "t_grass", 6 ], [ "t_dirt", 5 ] ], "_": "t_pavement", "-": "t_pavement_y" },
+      "furniture": { "Y": "f_street_light" }
     }
   },
   {
@@ -82,7 +84,7 @@
         "................................................",
         "....__-____-____-____-____-_________________....",
         "...___-____-____-____-____-__________________...",
-        "..____-____-____-____-____-___________________..",
+        ".Y____-____-____-____-____-___________________Y.",
         "._____-____-____-____-____-____________________.",
         "._____-____-____-____-____-____________________.",
         "._____-____-____-____-____-____________________.",
@@ -90,7 +92,7 @@
         ".______________________________________________.",
         ".______________________________________________.",
         ".______________________________________________.",
-        ".______________________________________________.",
+        "Y_____________________________________________Y.",
         ".______________________________________________.",
         ".______________________________________________.",
         ".______________________________________________.",
@@ -103,7 +105,7 @@
         "._____-____-____-____-____-____________________.",
         "._____-____-____-____-____-____________________.",
         ".,,,,,,,,,,,,,,,,,,,,,,,,,,____________________.",
-        "..........................,____________________.",
+        "Y..........Y.............Y,___________________Y.",
         ".,,,,,,,,,,,,,,,,,,,,,,,,,,____________________.",
         "._____-____-____-____-____-____________________.",
         "._____-____-____-____-____-____________________.",
@@ -116,7 +118,7 @@
         ".______________________________________________.",
         ".______________________________________________.",
         ".______________________________________________.",
-        ".______________________________________________.",
+        "Y_____________________________________________Y.",
         ".______________________________________________.",
         ".______________________________________________.",
         ".______________________________________________.",
@@ -124,12 +126,13 @@
         "._____-____-____-____-____-____________________.",
         "._____-____-____-____-____-____________________.",
         "._____-____-____-____-____-____________________.",
-        "..____-____-____-____-____-___________________..",
+        ".Y____-____-____-____-____-___________________Y.",
         "...___-____-____-____-____-__________________...",
         "....__-____-____-____-____-_________________....",
         "..........................._______--_______....."
       ],
-      "terrain": { ".": [ [ "t_grass", 6 ], [ "t_dirt", 5 ] ], "_": "t_pavement", "-": "t_pavement_y", ",": "t_concrete" }
+      "terrain": { ".": [ [ "t_grass", 6 ], [ "t_dirt", 5 ] ], "_": "t_pavement", "-": "t_pavement_y", ",": "t_concrete" },
+      "furniture": { "Y": "f_street_light" }
     }
   }
 ]
diff --git a/data/json/mapgen/pizza_parlor.json b/data/json/mapgen/pizza_parlor.json
index 05209d1ee744d..f7d122911d1f1 100644
--- a/data/json/mapgen/pizza_parlor.json
+++ b/data/json/mapgen/pizza_parlor.json
@@ -9,7 +9,7 @@
       "fill_ter": "t_floor",
       "rows": [
         "-||||||||||||||-        ",
-        "-FwlwL-P#######-4       ",
+        "-FwlwL-P#######-4      Y",
         "-Flwlw#..U.U.U.g        ",
         "-#wlwl@........g        ",
         "-#lwlw#........g        ",
@@ -20,7 +20,7 @@
         "-#wlwl#........g        ",
         "-wlwlw#....BB..g        ",
         "-lwlwl#....TT..g        ",
-        "-##f###....BB..-        ",
+        "-##f###....BB..-       Y",
         "-.............P-rfrrrrrR",
         "-..............-cccccccR",
         "-C.....BB..BB..gccccBccR",
@@ -77,6 +77,7 @@
         "P": "f_indoor_plant",
         "T": "f_table",
         "U": "f_chair",
+        "Y": "f_street_light",
         "s": "f_sink",
         "{": "f_rack"
       },
@@ -190,7 +191,7 @@
         "  SbbgTH.TTTT.....R.HTB|",
         "  Sxx|TH.BBBB.........P|",
         "  Sbb|||||||||...|||||||",
-        "  S   |Fl{|$l@...QXQXQX|",
+        "  S  Y|Fl{|$l@...QXQXQX|",
         "  S   |FlO|$l#........Q|",
         "  S   |FlO|$l#........X|",
         "  S   |Fl{|ll#..CRRRRRR|",
@@ -200,7 +201,7 @@
         "|...|   |LLlL|||||||||||",
         "|...DSSSDlllL|W..<|     ",
         "|...|   |||||||D|||     ",
-        "|...|                   "
+        "|...|                  Y"
       ],
       "terrain": {
         " ": [
@@ -263,6 +264,7 @@
         "U": "f_chair",
         "s": "f_sink",
         "W": "f_water_heater",
+        "Y": "f_street_light",
         "{": "f_rack"
       },
       "items": {
diff --git a/data/json/mapgen/power_station_large.json b/data/json/mapgen/power_station_large.json
index 0f14d67365f93..fbf1f1cd412c6 100644
--- a/data/json/mapgen/power_station_large.json
+++ b/data/json/mapgen/power_station_large.json
@@ -21,14 +21,14 @@
         "  |     |              |",
         "  +     -----------+---|",
         "  |                    |",
-        "  |                    |",
+        "i |           i        |",
         "  |                    |",
         "wwwwWWWWwwww           |",
         "CCCCCccccccv           |",
         "**a********d           |",
         "*******a***v       --+-|",
         "*kkk**III**v4      |   |",
-        "wwwwWWWWwwww       |   |",
+        "wwwwWWWWwwww  i    |   |",
         "  |                |   |",
         "---------------------+--"
       ],
@@ -57,7 +57,7 @@
         "}": "t_lgtn_arrest",
         "4": "t_gutter_downspout"
       },
-      "furniture": { "c": "f_counter", "a": "f_stool", "I": "f_desk", "k": "f_filing_cabinet" },
+      "furniture": { "c": "f_counter", "a": "f_stool", "I": "f_desk", "k": "f_filing_cabinet", "i": "f_utility_pole" },
       "items": {
         "I": { "item": "office", "chance": 30 },
         "k": { "item": "office_paper", "chance": 30 },
@@ -121,12 +121,12 @@
         "|         |         888 ",
         "|         |             ",
         "|         |             ",
+        "|       i |      i      ",
         "|         |             ",
         "|         |             ",
         "|         |             ",
         "|         |             ",
-        "|         |             ",
-        "|         |             ",
+        "|         |      i      ",
         "|         |             ",
         "|         |             ",
         "|         |             ",
@@ -161,7 +161,7 @@
         "x": "t_chainfence_posts",
         "|": "t_chainfence_v"
       },
-      "furniture": { "c": "f_counter", "a": "f_stool", "$": "f_sink" },
+      "furniture": { "c": "f_counter", "a": "f_stool", "$": "f_sink", "i": "f_utility_pole" },
       "toilets": { "&": {  } },
       "place_loot": [
         { "group": "supplies_electronics", "x": [ 17, 22 ], "y": 17, "chance": 60, "repeat": [ 1, 3 ] },
diff --git a/data/json/mapgen/prison_1.json b/data/json/mapgen/prison_1.json
index 50f4595fb32a2..550cf629684d0 100644
--- a/data/json/mapgen/prison_1.json
+++ b/data/json/mapgen/prison_1.json
@@ -580,7 +580,7 @@
   {
     "id": "prison_canine_food",
     "type": "item_group",
-    "items": [ { "item": "dogfood", "prob": 100, "container-item": "can_food" } ]
+    "items": [ { "item": "dogfood", "prob": 100, "container-item": "can_medium" } ]
   },
   {
     "id": "prison_canine_bowl",
diff --git a/data/json/mapgen/robofachq_static.json b/data/json/mapgen/robofachq_static.json
index 5b7e602ba833a..055c1c9b74b10 100644
--- a/data/json/mapgen/robofachq_static.json
+++ b/data/json/mapgen/robofachq_static.json
@@ -53,20 +53,20 @@
         ",,|,____________________sssssssssssssssssssssssssssssssss___________,U,,,,,,,,,,,,,,,,,,,,,,,|,,",
         ",,|,____________________ss,,,,,,,,ss,,,,,,,,,,,,,,,,,,,,,___________,U,,,,,,,,,,,,,,,,,,,,,,,|,,",
         ",,|,____________________ss,|((((||22||||||||||||(((((||||___________|||,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,|        |d  h   |;i|    B||||___________|||,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,|?       (dh     |  | dh B||||55555555555|||,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,|? t     (dd66d  ||2|hd   |                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,__________yyyyyyyyyyss,|? t     ||((((22|  |(((([|                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,|?        2  YY           5                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,|^a a     2               5                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,|||||||||||||55GI||||55||||                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,|hhhhhhhhh|      |  |  |; |                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,__________yyyyyyyyyyss,|         2      |  |  2 i|                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,| lllllll |      ||||55||||                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,|2|||||||2|eeeeee(d      d(                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,|  2~|~2  |eeeeee(6h 66 h6(                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,____________________ss,|i ||||| i|Eeeeee(d  66  d(                |,,,,,,,,,,,,,,,,,,,,,,|,,",
-        ",,|,__________yyyyyyyyyyss,|i 2~|~2 i|eeeeee|        |                |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,|        |d  h   |;i|    B||||55555555555|||,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,|?       (dh     |  | dh B||||eeeeeeeeeee|||,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,|? t     (dd66d  ||2|hd   |   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,__________yyyyyyyyyyss,|? t     ||((((22|  |(((([|   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,|?        2  YY           5   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,|^a a     2               5   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,|||||||||||||55GI||||55||||   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,|hhhhhhhhh|      |  |  |; |   eeeeeeeeeee. |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,__________yyyyyyyyyyss,|         2      |  |  2 i|   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,| lllllll |      ||||55||||   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,|2|||||||2|Eeeeee(d      d(   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,|  2~|~2  |eeeeee(6h 66 h6(   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,____________________ss,|i ||||| i|eeeeee(d  66  d(   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
+        ",,|,__________yyyyyyyyyyss,|i 2~|~2 i|Eeeeee|        |   eeeeeeeeeee  |,,,,,,,,,,,,,,,,,,,,,,|,,",
         ",,|,__________ssssssssssss,||||||||||||||||||||||||||||||||||||||||||||,,,,,,,,,,,,,,,,,,,,,,|,,",
         ",,|,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,|,,",
         ",,|,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,|,,",
@@ -113,79 +113,98 @@
   {
     "type": "mapgen",
     "om_terrain": [
-      [ "robofachq_hab_a0", "robofachq_hab_a1", "robofachq_hab_a2", "robofachq_hab_a3" ],
-      [ "robofachq_hab_b0", "robofachq_hab_b1", "robofachq_hab_b2", "robofachq_hab_b3" ]
+      [ "robofachq_exe_a0", "robofachq_exe_a1", "robofachq_exe_a2", "robofachq_exe_a3" ],
+      [ "robofachq_exe_b0", "robofachq_exe_b1", "robofachq_exe_b2", "robofachq_exe_b3" ]
     ],
     "method": "json",
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [
-        "################################################################################################",
-        "#################################################################||||||||||||||||||||||||||||||#",
-        "#################################################################|; |  i|;Y|FFFFFF|FFFF|FFFFFF|#",
-        "########################|||||||||||##############################|  2  i|i |   Y  |  Y |   Y  |#",
-        "########################|^BB6::::B|##########################|||||||||2|||2||2|||||5||||5||||||#",
-        "########################|   YY   c|###########################|; |ii|  |rY                   Y|#",
-        "########################|r  cc   c|##|||||||||||##############|  2  2  |rY                   Y|#",
-        "########################|r  ch   c||||rrrrrrrrr||||||||||||||||||||||  |||2| i|FY ||||||||||  |#",
-        "#############||||||||||||r  YY    (Y            ???| htth  hh  htth G      |Yi|F   iKKKKooK|  |#",
-        "#############|6:::::::::|c        (    ccccc6     ^|h tth  tt  htth        cYK|FY    YY   c|  |#",
-        "#############|          |c  cc    (             ???| htth  hh              cYK|    iKKooK     |#",
-        "#############|  66::::6 |c  cc    (    ccccc6   ||||Y         YccY        YcY   Y    YY       |#",
-        "#########|||||      G   4   YY    2             ???|Y         YccY        YcY      iKKooK  FFF|#",
-        "#########|666|||||  ||||||(((((((((|G             ^| htth  hh       hh     ||||2(((||||||||||||#",
-        "#########|     5       Y        Y               ???| htth  tt       tt     W|#|  Y |############",
-        "#########|     5       Y        Y           ||22||||       hh       hh     t|#|hdh |############",
-        "########||     |||22||||(((((2(||||  |      |Y    Y||==========]]==========|||||||||############",
-        "########|6     |c    r|^      ^|  4  |Y    Y|?             .     G,,,,,,,,,|^BBB^  |#|||||######",
-        "########|||44|||c    r|  hhh   |&i|  ||||||||?                     ,,,,,,,,(YY     |||:::|######",
-        "########|6    6|c    r| ttttt  ||||55|eeeeee      d (,,,,,,t6t     ,,,,,,,,(H   dd  5T  Y|######",
-        "########|6    6|c    r|Y hhh  Y|     |eeeeee Y    d (,,,,,,Y              Y2    6h Y5   6|######",
-        "########|6 66 6|c    r|^      ^|66666|Eeeeee Y    dh(,,,,,,Yt             Y2   hd QY5   :|######",
-        "########||||||||||||||||||||||||||||||eeeeee      d (,,,,,,t6t     ,,,,,,,,(    dd  5T  Y|######",
-        "#####################################||||||||G                     ,,,,,,,,(YY     |||:::|######",
-        "#########################################|> 5                    G,,,,,,,,,|^ A   ^|#|||||######",
-        "##########|||||||||#|||||||||#|||||||||#|||||Y    Y||==========]]==========||||5||||############",
-        "##########|~ ;|~ ;|#|~ ;|~ ;|#|~ ;|~ ;|#|~ ;||22||||B                     B|    ^|##||||||######",
-        "##########|~Yi|~Yi|#|~Yi|~Yi|#|~Yi|~Yi|#|~Yi|    d |B htth t       B htth B|th  ^||||i; ~|######",
-        "#########|||2|||2|||||||||2|||||2|||2|||||2||    dh|BYhtthYt  Y Y  BYhtthYB|thY   Y 2 Y ~|######",
-        "#########|D  @|#  @|D  @|D  @|D  @|D  @|@  D|    d |B      t       B htth B|    B|2|||||||######",
-        "#########|B  @|#  @|B  @|B  @|B  @|B  @|@  B|      |B                     B|    B|  h6|#########",
-        "########||| Y|||Y ||| Y|||Y ||| Y|||Y ||| Y||G     |||BBBB^YH      YBBBBB||| h  B|   t|#########",
-        "########|^||2|^|2||^||2|^|2||^||2|^|2||^||2|         ||||||||||]]|||||||||,|ccY ||@Y B|#########",
-        "########|^    Y         Y         Y         Y     Y  ]                 ,,,,|    c|@  B|#########",
-        "########|^G                                          ]                 ,,,,|KFoKK||||||#########",
-        "########|^    Y         Y         Y         Y     Y  |h     tt YYtt    ,,,,|||||||##############",
-        "########|^||2|^|2||^||2|^|2||^||2|^|2||^||2|         |t  ?           ? ,,,,|####################",
-        "########||| Y|||Y ||| Y|||Y ||| Y|||Y ||| Y||      |||h  ????^ G ^????t,,,,|####################",
-        "#########|B  @|B  @|B  @|B  @|B  @|B  @|B  @||||||||#|||||||||||||||||||||,|####################",
-        "#########|D  @|D  @|D  @|D  @|D  @|D  @|D  @|############################|||####################",
-        "##########||2|||2|||||2|||2|||||2|||2|||||2||###################################################",
-        "##########|~Yi|~Yi|#|~Yi|~Yi|#|~Yi|~Yi|#|~Yi|###################################################",
-        "##########|~ ;|~ ;|#|~ ;|~ ;|#|~ ;|~ ;|#|~ ;|###################################################",
-        "##########|||||||||#|||||||||#|||||||||#|||||###################################################",
-        "################################################################################################",
-        "################################################################################################",
-        "################################################################################################",
+        "############################################|      |############################################",
+        "########|||||||||||||||||||||||||#|||||||||||||22|||############################################",
+        "########|k           ht|A   h  ^|#|lll|lllll|  YY  |############################################",
+        "########|i k k  htth ht| Cd6ddC |#|bYb|bYbYb|T YY T|########||||||||############################",
+        "########|k o k  htth ht| CCCCCC |#|b b|b b b|| YY ||######||=A6666A=||##########################",
+        "########|    W        ^|^    h ^|#|l l|l l l|  YY  |######|,=Y    Y=,|##########################",
+        "########|FFFF|  htth  ?||||[[||||||l l|l l l|T YY T|######|,= htth =,|##########################",
+        "########||||||  htth  ?||^^  ^^||           |||22||||||||||,= htth =,|##########################",
+        "########|ffff|         2   YY   2Y bbb  bbbb|      |L |  i|,= htth =,|##########################",
+        "########|    |^??t t??^|   ,,   |||||||||||||      |LY2 Y;|,= htth =,|##########################",
+        "###||||||hd  |||||||||||   ,,   2  r r r|  d( Y   b|||||2||,= htth =,|##########################",
+        "###|;i|T|dd  2         2        (d r r r| Gd( Y   b|AhQ  ^|,=      =,|##########################",
+        "###|@ 2Y2    |  T   T  |G  YY  G(dh    r|   2 Y   b|ddd  H|,[Y    Y[,|##########################",
+        "###|||| |||||||||||||||||||22||||||||||||||||     ^| h    |||||  |||||##########################",
+        "###|;i|  |''''''''''''''''R  R''''''''''''''(     ^|    YH|###|YY|##############################",
+        "###|@ 2Yh|''''''''''''''''R  R''''''''''''''|||22|||====[=|||||22|||||||||||####################",
+        "###|||| t|''''''''''''''''R  R''''''''''''''(<   GY         Y     =,,,,,,,,|||||||||############",
+        "###|;i| h|''''''''''''''''R  R''''''''''''''(> CC           Y    G=,,,,,,,,|^BB  ^^|#|||||######",
+        "###|@ 2Y |''''''''''''''''R  R'''''''|======|| CC ||(RRRRRRRR     =======[=(YY CCC |||:::|######",
+        "###|||||||''''''''''''''''R  R'''''''=Eeeeee2Y CC  ^('''''''([(   Y       Y(H  Cdd  5T  Y|######",
+        "#########|''''''''''''''''RYYR'''''''=eeeeee2CCCC.dG('''''''R<( CCCCCCCCCC 2   C6C Y5   6|######",
+        "#########|''''''''''''''''RYYR'''''''=eeeeee2CCCC dh('''''''R>( CCCCCCCCCC 2  hCdh Y5   :|######",
+        "#########|''''''''''''''''R  R'''''''=Eeeeee2Y CC  ^('''''''([(   Y       Y(   Cdd  5T  Y|######",
+        "#########|''''''''''''''''R  R'''''''|======|| CC ||(RRRRRRRR     =======[=(YY CCC |||:::|######",
+        "#########|''''''''''''''''R  R''''''''''''''(> CC           Y    G=,,,,,,,,|^ A   ^|#|||||######",
+        "#########|''''''''''''''''R  R''''''''''''''(<   GY         Y     =,,,,,,,,||||55||||###########",
+        "#########|''''''''''''''''R  R''''''''''''''|||22|||((2||||||||22|||||||||||^      ^|###########",
+        "#########|''''''''''''''''R  R''''''''''''''(     Y(dG L|L6dd|^YY^|::::::::|   YY   |###########",
+        "#########|====|====|=====||22||=======|||||||     Y(dh  2 Yhd|^  ^| Y    Y |  htth  |###########",
+        "#########| h ^|h  B|h   B|    |A dh  B|A dCCCCCCC |||||||||||||  ||[=======|  htth  |###########",
+        "#########|dd ^|dd B|dd  B|    |Bh6   ^| hdCCCCCCC 5Y       |Wt|  dh dh dh f| h tth  |###########",
+        "#|||||||||^h Y|h Y^|h  Y^|    |B     Y2  dCCCCCCC 5Y             d  d  d  f|  htth  |###########",
+        "#|iii    |===[|==[=|===[=||YY||||||||||       (((((  d  dh dh  Y          f|   YY   |###########",
+        "#|Y Y Y  |Y   ^    ^     ^    ^              Y(,,,(. dh d  dY  Y d  d  d Yf|^      ^|###########",
+        "#|2|2|2| |Y                              CCC Y(,,,[              dh dh dh f||||66||||###########",
+        "#|;|;|;|Y     =========================t CCC  (,,,[  dh d  dY            Yf|##||||##############",
+        "#|||||||Y     [,,,,,,,,,,,,,,,,,,,,,,,=t CCC  (,,,(  d  dh dh  Y d  d  d  f|||||||||||||########",
+        "#|;|;|;|Y     =========================t cCC  (((((            Y dh dh dh f|^^^^^^^^^^^|########",
+        "#|2|2|2| |YG                             CCC Y    5Y                               Y  ^|########",
+        "#|Y Y Y  |Y                                  Y    5Y          G                    Y  ^|########",
+        "#|iii    |====[[||=====|===[=|===[|[==||==[=||2||2|||[=======||  |||=====||||||2|||2||||########",
+        "#|||||||||      ^|  hd^|^   H|    |    |^   |f ff f|  d  dh dh|  |Y      Y^|;2Y  |  Y2;|########",
+        "#########|dd     ]   dh|h   t|h h |    | d  |f ff f|  dh d  d |  2  hhhhh ^|||  |||  |||########",
+        "#########| h     ]  hh |6dd H|ddd |6dd |hd  |f ff f| Y       Y|  2  ttttt ^|;2Y i|i Y2;|########",
+        "#########|dd   dd|Y    |h  YB|Yh  |Yhd |^  Y|f    f|  d  d  dh|  |  hhh h ^|||  i|i  |||########",
+        "#########|Yh    h|BBBB^|^^BBB|A6^^|    |BBBB|ffffff|  dh d  d |^^|Y   h  Y^|;2Y i|i Y2;|########",
+        "#########|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||########",
         "################################################################################################"
       ],
       "palettes": [ "robofachq" ],
       "terrain": {
         ",": [ "t_shrub_rose", "t_shrub", "t_grass", "t_grass", "t_grass_tall" ],
         "-": "t_wall_metal",
+        "'": "t_open_air",
         "e": "t_elevator",
+        "C": "t_carpet_red",
         "E": "t_elevator_control",
         "Y": "t_thconc_floor_olight",
         "#": "t_rock",
         "6": "t_console",
+        "R": "t_railing",
         "W": "t_water_dispenser"
       },
-      "furniture": { ":": "f_server", "K": "f_counter" },
+      "furniture": { ":": "f_server", "K": "f_counter", "H": "f_armchair", "L": "f_locker", "f": "f_filing_cabinet" },
+      "item": { "A": { "item": "american_flag" } },
       "items": {
         "F": { "item": "fridge", "chance": 80 },
+        "f": { "item": "file_room", "repeat": [ 10, 30 ] },
         "@": { "item": "bed", "chance": 80 },
+        "r": [
+          { "item": "cop_armory", "chance": 80 },
+          { "item": "energy_weapon_armory", "chance": 33 },
+          { "item": "ammo_milspec", "chance": 40 },
+          { "item": "mags_milspec", "chance": 40 },
+          { "item": "guns_milspec", "chance": 40 }
+        ],
+        "L": [
+          { "item": "energy_weapon_armory", "chance": 33 },
+          { "item": "ammo_milspec", "chance": 40 },
+          { "item": "mags_milspec", "chance": 40 },
+          { "item": "guns_milspec", "chance": 40 }
+        ],
         "K": { "item": "kitchen", "chance": 40 },
         "o": { "item": "oven", "chance": 70 },
+        "d": [ { "item": "office_supplies", "chance": 70 }, { "item": "office_mess", "chance": 70, "repeat": [ 1, 3 ] } ],
         "D": { "item": "NC_ROBOFAC_SCIENTIST_worn", "chance": 50 },
         "B": [
           { "item": "magazines", "chance": 75, "repeat": [ 1, 5 ] },
@@ -195,6 +214,218 @@
       "npcs": { "G": { "class": "hub_security" }, "Q": { "class": "hub_security_head" } }
     }
   },
+  {
+    "type": "mapgen",
+    "om_terrain": [
+      [ "robofachq_hab_a0", "robofachq_hab_a1", "robofachq_hab_a2", "robofachq_hab_a3" ],
+      [ "robofachq_hab_b0", "robofachq_hab_b1", "robofachq_hab_b2", "robofachq_hab_b3" ]
+    ],
+    "method": "json",
+    "object": {
+      "fill_ter": "t_concrete",
+      "rows": [
+        "################################################################################################",
+        "################################||||||||||######################################################",
+        "################################|FFFF|FFF|######################################################",
+        "#############||||||||||||||||||||F  F|F F||||#####||||||##||||||################################",
+        "#############|KiKKKKKiKooKKKK  K|F  F|F F|;Y|#####|~Y ~|##|~ Y~|################################",
+        "#############|K   K    YY   o  K|F  F|F f|i |#####|| |||##||| ||################################",
+        "#############|k   K  iKKoK  K  K||2||||2|||2|||||||i 2;|##|;2 i|################################",
+        "#############|              i  i| Y    Y   Y|^^^^^|i |||##||| i|################################",
+        "#############|FFFFFFFF                      2     | Y2;||||;2Y |||||############################",
+        "####|||||||||||||||||||YY||||||||||||||||||||||  ||2||||FF|||2||FFF|||||||||||||||||||||||######",
+        "####|,,,.| htth  Yffff     i|'''''''''''''''(Y   Y|Y               X X X EE|rrrrrrrrrrrrp|######",
+        "####|,,,,= htth           Mi|'''''''''''''''(G CC | TT TT b   CCC  X   X Y |            p|######",
+        "####|,,,,        ccccccff||||'''''''''''''''(  CC |       b   CCC        EE|   c  cccc  p|######",
+        "####|,,,,= htth          |WW|RRRRRRRRRRRRRRR|  CC | TT TT b   CCC  X   X Y |  h6        p|######",
+        "####|,,,,= htth   h          Y                 CC |Y         ^   ^ X X X EE|ccccYYcccc  p|######",
+        "####|,,,,= htth  hth         Y          RRRRRR CC ||=========||22||=======||||||22||||||||######",
+        "####|,,,,=                 ^|      ,,,,,R'''R>YCC           Y     =,,,,,,,,|cccAYYApppppp|######",
+        "####|,,,,= htth  htth htth ^|^bb^  ,,,,,R'''R<YCC           Y     =,,,,,,,,|   A  A p p P|######",
+        "####|,,,,= htth  htth htth ^|      ,,|======|| CC ||====[====     ==========  hA  A p p p|######",
+        "####|,,,,[Y                          =Eeeeee|  CC  ^=,,,,,,,=[(      bb   Y= ddA  A p p p|######",
+        "####|,,,,=&  ^MMM^  ^MMM^  Y         [eeeeee[CCCC.dG=,,,,,,,= (            [   %  %     r|######",
+        "####|,,,,=&  ^MMM^  ^MMM^  Y         [eeeeee[CCCC dh=,,,,,,,=<(            [   AAAA Y Y r|######",
+        "####|,,,,[Y                          =Eeeeee|  CC  ^=,,,,,,,=[(      bb   Y=   A        r|######",
+        "####|,,,,= htth htth hth h ^|G     ,,|======|| CC ||====]====     ==========AAAA 1P P P P|######",
+        "####|,,,,= htth htth     t ^|^bb^  ,,,,,R'''R<YCC           Y    G=,,,,,,,,|Y     P P P P|######",
+        "####|,,,,= htth      hth h ^|      ,,,,,R'''R>YCC           Y     =,,,,,,,,|PPPPPPP P P P|######",
+        "####|,,,,=       MM          Y          RRRRRR CC ||=========||22||========|||||||||||||||######",
+        "####|,,,,=       MM          Y                 CC |Y         BB  BB       B|####################",
+        "####|,,,,=  hth      htth|WW|RRRRRRRRRRRRRRR|  CC |htth hhh          htth B|####################",
+        "####|,,,,=  hth thht htth||||'''''''''''''''(  CC |htth ttt    ^^    htth B|####################",
+        "####|,,,,=  hth thht htth|##|'''''''''''''''(  CC |Y         B    B       B|####################",
+        "#|||||||||  hth  YY  htth|##|'''''''''''''''(Y   Y|BBBBBBBBBBBBBBBBBBBBBBBB|####################",
+        "#|iii    |  |||||||||||||||||||||||||||||||||||22|||||||||||||||||||||||||||||||||||############",
+        "#|Y Y Y  |  ^|##|~Y;|~Y;|~Y;|~Y;|~Y;|~Y;|^ t  ^        |~Y;|~Y;|~Y;|~Y;|~Y;|~Y;|~Y;|############",
+        "#|2|2|2| |  ^|##|~ i|~ i|~ i|~ i|~ i|~ i|?   H^   htth |~ i|~ i|~ i|~ i|~ i|~ i|~ i|||||||||||||",
+        "#|;|;|;|Y   ^|##||2|||2|||2|||2|||2|||2||? t  ^   htth ||2|||2|||2|||2|||2|||2|||2||~2 |@@ D @@|",
+        "#|||||||Y   ^|##|@ D|@ D|@ D|@ D|@ D|@ D|? t H^        |@ D|@ D|@ D|@ D|@ D|@ D|  D||| |D  @  D|",
+        "#|;|;|;|Y|YY^|##|@ D|@ D|@ D|@ D|@ D|@ D|         htth |@ D|@ D|@ D|@ D|@ D|@ D|  D|~2 |@@ @ @@|",
+        "#|2|2|2| |||||||||5|||5|||5|||5|||5|||2||Ht H          ||5|||5|||5|||5|||5|||5|||5||||2|D     D|",
+        "#|Y Y Y  |###|,,,=Y                   Y                                            2       S @@|",
+        "#|iii    |###|,,,=Y                   Y                                            2          D|",
+        "#|||||||||###|||||5|||5|||5|||5|||5|||2||G        ? t ?||5|||5|||5|||5|||5|||5|||5||||2|     @@|",
+        "#############|##|@ D|@ D|@ D|@ D|@ D|@ D|^  h     ? t ?|@ D|@ D|@ D|@ D|@ D|@ D|@ D|i  |D     D|",
+        "#############|##|@ D|@ D|@ D|@ D|@ D|@ D|t??t         ^|@ D|@ D|@ D|@ D|@ D|@ D|@ D|i  |@@ @ @@|",
+        "#############|##||2|||2|||2|||2|||2|||2||======[[======||2|||2|||2|||2|||2|||2|||2||   |D  @  D|",
+        "#############|##|~ i|~ i|~ i|~ i|~ i|~ i|,,,,,,,,,,,,,,|~ i|~ i|~ i|~ i|~ i|~ i|~ i|2|2|@@ D @@|",
+        "#############|##|~Y;|~Y;|~Y;|~Y;|~Y;|~Y;|,,,,,,,,,,,,,,|~Y;|~Y;|~Y;|~Y;|~Y;|~Y;|~Y;|;|;|||||||||",
+        "#############|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||########"
+      ],
+      "palettes": [ "robofachq" ],
+      "terrain": {
+        ",": [ "t_shrub_rose", "t_shrub", "t_grass_tall" ],
+        "-": "t_wall_metal",
+        "'": "t_open_air",
+        "e": "t_elevator",
+        "C": "t_carpet_red",
+        "E": "t_elevator_control",
+        "Y": "t_thconc_floor_olight",
+        "#": "t_rock",
+        "6": "t_console",
+        "R": "t_railing",
+        "W": "t_water_dispenser"
+      },
+      "furniture": {
+        "K": "f_counter",
+        "M": "f_counter",
+        "A": "f_canvas_wall",
+        "%": "f_canvas_door",
+        "E": "f_ergometer",
+        "T": "f_treadmill",
+        "X": "f_exercise"
+      },
+      "sealed_item": {
+        "P": { "item": { "item": "seed_tomato" }, "furniture": "f_planter_mature" },
+        "p": { "item": { "item": "seed_wheat" }, "furniture": "f_planter_mature" }
+      },
+      "items": {
+        "F": { "item": "fridge", "chance": 80, "repeat": [ 2, 6 ] },
+        "@": { "item": "bed", "chance": 80 },
+        "M": [
+          { "item": "SUS_dishes", "chance": 80, "repeat": [ 1, 3 ] },
+          { "item": "SUS_silverware", "chance": 33, "repeat": [ 1, 3 ] }
+        ],
+        "k": [
+          { "item": "kitchen", "chance": 33, "repeat": [ 1, 3 ] },
+          { "item": "SUS_knife_drawer", "chance": 40, "repeat": [ 1, 3 ] },
+          { "item": "SUS_cookware", "chance": 40, "repeat": [ 1, 3 ] }
+        ],
+        "K": { "item": "kitchen", "chance": 40 },
+        "o": { "item": "oven", "chance": 70 },
+        "d": [ { "item": "office_supplies", "chance": 70 }, { "item": "office_mess", "chance": 70, "repeat": [ 1, 3 ] } ],
+        "r": [ { "item": "tools_earthworking", "chance": 50 }, { "item": "supplies_farming", "chance": 70, "repeat": [ 1, 3 ] } ],
+        "D": { "item": "NC_ROBOFAC_SCIENTIST_worn", "chance": 50 },
+        "B": [
+          { "item": "magazines", "chance": 75, "repeat": [ 1, 5 ] },
+          { "item": "lab_bookshelves", "chance": 55, "repeat": [ 1, 3 ] }
+        ]
+      },
+      "npcs": { "G": { "class": "hub_security" } }
+    }
+  },
+  {
+    "type": "mapgen",
+    "om_terrain": [
+      [ "robofachq_res_a0", "robofachq_res_a1", "robofachq_res_a2", "robofachq_res_a3" ],
+      [ "robofachq_res_b0", "robofachq_res_b1", "robofachq_res_b2", "robofachq_res_b3" ]
+    ],
+    "method": "json",
+    "object": {
+      "fill_ter": "t_concrete",
+      "rows": [
+        "############################################|     |#############################################",
+        "################################||||||||||##|     |#############################################",
+        "################################|FFFF|FFF|##|     |#############################################",
+        "#############||||||||||||||||||||F  F|F F|||||222|||||||||||||||||||||||||||####################",
+        "#############|                              |^   ^|                       :|####################",
+        "#############|                              |^   ^|  === === === === ===  :|####################",
+        "#############|                              |^   ^|  =6= =6= =6= =6= =6=  :|####################",
+        "#############|                              |^   ^|  =2= =2= =2= =2= =2=  :|####################",
+        "#############|                 AAAA         |^   ^|                       :|####################",
+        "####||||||||||||||||||||||||||||YY||||||||||||222||  === === === === ===  :|||||||||||||||######",
+        "####|,,,.|SSSS6SSSS| h  B|##|,,(  (,,,,,,,,,(     |  =6= =6= =6= =6= =6=  :|:::::::::::::|######",
+        "####|,,,,|S       S|ddd B|##|,,(  (,,,,,,,,,(     |  =2= =2= =2= =2= =2=  :|            :|######",
+        "####|,,,,|SSS  SSSS|  h B||||,,(  (,,,,,,,,,(     |                       :|   66 66 6  :|######",
+        "####|,,,,|====[====|=[===|YY|(((  ((((((((((|     |         d  d  d  d     2   66 66 6  :|######",
+        "####|,,,,=             G     Y                    |         dh dh dh dh    2            :|######",
+        "####|,,,,=                   Y          RRRRR     ||====[==|||||||||||||||||2(||||||||||||######",
+        "####|,,,,=  |||||||  ((((((((      ======'''(>    2   G   Y(:::::::::::::::|   : : : : : |######",
+        "####|,,,,=  = 666 =  (''''''(^bb^  =,,,,='''(<Y  Y2       Y('''''''''''''':|   : : : : : |######",
+        "####|,,,,=  =     =  (''''''(      ==|======|||dd|| |===[==('''''''''''''':|  Y   Y Y   Y|######",
+        "####|,,,,[  = hth =  (''::''( d      =Eeeeee|   h|^ |6h    ('''''''''''''':|   : : : : : |######",
+        "####|,,,,=  [ hth [  (''::''(Gd      [eeeeee|6h  |^ |6h  h6(''''''MM''''''Y|  6: : : : : |######",
+        "####|,,,,=  [ hth [  (''::''(hd      [eeeeee|d   |^ |6h  h6(''''''MM''''''Y|  6: : : : : |######",
+        "####|,,,,[  = hth =  (''::''( d      =Eeeeee|  Gh|^ |6h    ('''''''''''''':|   : : : : : |######",
+        "####|,,,,=  = hth =  (''''''(      ==|======|||dd|| |===[==('''''''''''''':|  Y   Y Y   Y|######",
+        "####|,,,,=  =     =  (''''''(^bb^  =,,,,='''(<Y  Y2       Y('''''''''''''':|   : : : : : |######",
+        "####|,,,,=  =======  ((((((((      ======'''(>    2   G   Y(:::::::::::::::|   : : : : : |######",
+        "####|,,,,=                              RRRRRR    ||=[=====|||||||||||||||||2(||||||||||||######",
+        "####|,,,,=                                        |?            [          2  |#################",
+        "####|,,,,=   |=[===|=[===|YY|(((  ((((((((((|||||||?            [          ( Y|#################",
+        "####|,,,,=   |S   S|s   S||||,,(  (,,,,,,,,,(    ^|^   |[=======|===[|[====||||#################",
+        "####|,,,,=   |S  hS|S  hS|##|,,(  (,,,,,,,,,( hdhd|ddd |  hhhh ^|h  Y|Y  h |####################",
+        "#|||||||||  ||S6SSS|S6SSS|##|,,(  (,,,,,,,,,(  d6d| h  |  tttt 6|d6d |  dd6|####################",
+        "#|iii    |  ^||||||||||||||||((|YY|(((((((((|[[||||    |  hhhh  | h  |    h|####################",
+        "#|Y Y Y  |  ^|lllll|^Y dh      =  dh^|Y    B|     |ffff|Y      Y|BBBB|BBBBB|####################",
+        "#|2|2|2| |  ^|l    |B h6       [  d  |  hdhB|AAAAA||||||||||||||||||||||||||||||||||||||||||||||",
+        "#|;|;|;|Y    |l ll |B  d   ^||||  ||2|Y  d B|SSSSSSSS9S|SlllSSSS llSSSS  SSS=YDSS SSS SSSll  ll|",
+        "#|||||||Y   ^|||||2|BY   HtH|       G|2||||||        hy|SY G               Y=                 Y|",
+        "#|;|;|;|Y|YY^|S    ||||||||||              A          Y|S  SSSSS  hS  hS  sh=                  |",
+        "#|2|2|2| |||||Sh    SS6  SSS=             y%          Y||  SSSSS  SS  SS  SS=     SSS t  7966 6|",
+        "#|Y Y Y  |###|S       h     ]             Y%    SSS   Y2Y                G  ]Y   hSSS t  7966 6|",
+        "#|iii    |###|S             2   66         A   h6SS   Y2Y                G Y]Y    688 t       Y|",
+        "#|||||||||###|||||2|========|]=====]=======|AA%AA|AAAAA||yyyyyyyyyyyyyyyyyy =      9  t  &&66 6|",
+        "#############|l ll |Sh                 SSSS|h         d|   y6             y =      9     &&66 6|",
+        "#############|l l  |SSSSS                 6|        hhdA   y              y =t8898888         7|",
+        "#############|l   l|S                    hS|  h      hdA   y              y =Y          6     7|",
+        "#############|lllll|SSSSSYYll   6   llYYSSS|ddd  h     %Y  y              yY=t77 t7799988ttt777|",
+        "#############|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||",
+        "################################################################################################"
+      ],
+      "palettes": [ "robofachq" ],
+      "terrain": {
+        ",": [ "t_shrub_rose", "t_shrub", "t_grass_tall" ],
+        "-": "t_wall_metal",
+        "'": "t_open_air",
+        "e": "t_elevator",
+        "C": "t_carpet_red",
+        "E": "t_elevator_control",
+        "Y": "t_thconc_floor_olight",
+        "#": "t_rock",
+        "6": "t_console",
+        "R": "t_railing",
+        "9": "t_conveyor",
+        "7": "t_machinery_light",
+        "8": "t_machinery_heavy",
+        "&": "t_machinery_electronic"
+      },
+      "furniture": {
+        "K": "f_counter",
+        "S": "f_table",
+        "A": "f_canvas_wall",
+        "%": "f_canvas_door",
+        "H": "f_armchair",
+        "E": "f_ergometer",
+        "T": "f_treadmill",
+        "X": "f_exercise"
+      },
+      "items": {
+        "S": [
+          { "item": "tools_robotics", "chance": 30, "repeat": [ 1, 3 ] },
+          { "item": "robots", "chance": 50, "repeat": [ 1, 3 ] },
+          { "item": "supplies_electronics", "chance": 50, "repeat": [ 1, 3 ] }
+        ],
+        "d": [ { "item": "office_supplies", "chance": 70 }, { "item": "office_mess", "chance": 70, "repeat": [ 1, 3 ] } ],
+        "B": [
+          { "item": "magazines", "chance": 75, "repeat": [ 1, 5 ] },
+          { "item": "lab_bookshelves", "chance": 55, "repeat": [ 1, 3 ] }
+        ]
+      },
+      "npcs": { "G": { "class": "hub_security" } }
+    }
+  },
   {
     "type": "mapgen",
     "om_terrain": [ [ "robofachq_sub_a0", "robofachq_sub_a1", "robofachq_sub_a2", "robofachq_sub_a3" ] ],
@@ -202,14 +433,14 @@
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [
-        "#######################|                                         |##############################",
-        "#######################|                                         |##############################",
-        "#######################|   bb    bbb    bb                  bb   |##############################",
-        "#######################|                                         |##############################",
-        "#######################|Y                                       Y|##############################",
-        "#######################||||||||||||||||||||||||      |(((((|||||||##############################",
-        "##############################################||2222||ttttt|####################################",
-        "#####################################||||||||||^    ^| hY  |####################################",
+        "#######################|                      ||||||||||||||####################################",
+        "#######################|Y                    Y       (tt  ^|####################################",
+        "#######################|   bb    bbb    bb           (th   |####################################",
+        "#######################|                             (t    |####################################",
+        "#######################|Y ^bb^  ^bbb^  ^bb   Y       (t   ^|####################################",
+        "#######################||||||||||||||||||||||||      |||2|||####################################",
+        "##############################################||5555||tt tt|####################################",
+        "#####################################||||||||||^    ^| h  h|####################################",
         "#####################################|rrrrrrrr|^    ^|     |####################################",
         "#####################################|r      r||    ||||2|||####################################",
         "#####################################|r  YY   2      (t   G|####################################",
@@ -221,11 +452,11 @@
         "#####################################| ~|  |~ |^         Y^|####################################",
         "#####################################| i|  |i |^         Y^|####################################",
         "#####################################|||||||||||    ||||||||####################################",
-        "#####################################|eeeeee5       ^|##########################################",
-        "#####################################|eeeeee5    YY ^|##########################################",
-        "#####################################|Eeeeee5    YY ^|##########################################",
-        "#####################################|eeeeee5       ^|##########################################",
-        "#####################################|||||||||||||||||##########################################"
+        "#####################################|lll   2       ^|##########################################",
+        "#####################################|^     (    YY ^|##########################################",
+        "#####################################|  d   (    YY ^|##########################################",
+        "#####################################|^hdh  (       ^|##########################################",
+        "#####################################||||||||     ||||##########################################"
       ],
       "palettes": [ "robofachq" ],
       "terrain": { "-": "t_wall_metal", "e": "t_elevator", "E": "t_elevator_control", "Y": "t_utility_light", "I": "t_intercom" },
@@ -233,8 +464,7 @@
         "l": [ { "item": "NC_ROBOFAC_FIELD_RESEARCHER_worn", "chance": 50 }, { "item": "NC_ROBOFAC_SCIENTIST_worn", "chance": 50 } ],
         "i": { "item": "cleaning", "chance": 50 },
         "B": [ { "item": "textbooks", "chance": 50 }, { "item": "manuals", "chance": 50 } ]
-      },
-      "place_npcs": [ { "class": "robofac_intercom", "x": 46, "y": 17 } ]
+      }
     }
   },
   {
diff --git a/data/json/mapgen/shelter.json b/data/json/mapgen/shelter.json
index 2d8b771b5e9f9..6481427e2a950 100644
--- a/data/json/mapgen/shelter.json
+++ b/data/json/mapgen/shelter.json
@@ -112,8 +112,8 @@
         "    `!!!!`!!!!`!!!!`    ",
         "    `!!!!`!!!!`!!!!`    ",
         "    `!!!!`!!!!`!!!!`    ",
-        "    &&&&&&&&&&&&&&&&    ",
-        "       |---++---|       ",
+        "    &&&|---++---|&&&    ",
+        "       |........|       ",
         "    |-:|........|       ",
         "    |...........|:-|    ",
         "    |.bbbbb.....c.6|    ",
@@ -159,10 +159,10 @@
         "                        ",
         "                        ",
         "                        ",
-        "                        ",
         "       4444444444       ",
-        "    |443........|       ",
-        "    |...........|443    ",
+        "       |........3       ",
+        "    |44|........3       ",
+        "    |...........3443    ",
         "    |..............3    ",
         "    |..............3    ",
         "    |..............3    ",
diff --git a/data/json/mapgen/trailhead.json b/data/json/mapgen/trailhead.json
index 9caa266816662..b185257d29b9e 100644
--- a/data/json/mapgen/trailhead.json
+++ b/data/json/mapgen/trailhead.json
@@ -20,9 +20,20 @@
       ":": "t_window_bars",
       "c": "t_woodchips",
       "W": "t_water_pump",
-      "T": "t_floor"
+      "T": "t_floor",
+      "7": [ "t_region_tree", "t_region_shrub" ],
+      "f": "t_dirt"
+    },
+    "furniture": {
+      "b": "f_boulder_small",
+      "s": "f_sign",
+      "B": "f_bench",
+      "=": "f_bench",
+      "w": "f_woodstove",
+      ",": [ [ "f_region_flower", 1 ], [ "f_null", 100 ] ],
+      ";": [ [ "f_region_flower", 1 ], [ "f_null", 100 ] ],
+      ".": [ [ "f_region_flower", 1 ], [ "f_null", 100 ] ]
     },
-    "furniture": { "b": "f_boulder_small", "s": "f_sign", "B": "f_bench", "=": "f_bench", "w": "f_woodstove" },
     "toilets": { "T": {  } }
   },
   {
@@ -54,8 +65,8 @@
         ";;;..              ;;;;;",
         ";;;;.              ;;;;;",
         ";;;;;              ;;;;;",
-        ";;;;;tttt      tttt;;;;;",
-        ";;;;;b..b  ss  b..b;;;;;"
+        ";77;;tttt      tttt;;;;;",
+        "7777;b..b  ss  b..b;;;;;"
       ],
       "palettes": [ "trailhead" ],
       "place_vehicles": [
@@ -91,11 +102,11 @@
         ";;;...             ...;;",
         ";;...              |-|;;",
         ";;...  .     .   . +T|;;",
-        ";;;.. .            |-|;;",
-        ";;;;.   .      . . +T|;;",
+        ";;;.. .            |-|;7",
+        ";;;;.   .      . . +T|;7",
         ";;;;;             ;|-|;;",
-        ";;;;;====      sss;;;;;;",
-        ";;;;;;;;;      ;;;;;;;;;"
+        ";;;;;====      sss;;;;;7",
+        ";;;;77;77      ;;;;;;;7;"
       ],
       "palettes": [ "trailhead" ],
       "place_vehicles": [ { "chance": 100, "fuel": 0, "rotation": 0, "status": 1, "vehicle": "campground_vehicles", "x": 17, "y": 9 } ],
@@ -136,7 +147,7 @@
         ";;;;.   .      . . ;;;;;",
         ";;;;;              ;;;;;",
         ";;;;;tttt      tttt;;;;;",
-        ";;;;;b..b s  s b..b;;;;;"
+        ";;7;;b..b s  s b..b;;7;;"
       ],
       "palettes": [ "trailhead" ],
       "place_vehicles": [
@@ -175,8 +186,8 @@
         ";;;c|B###+    ..;;;;;;;b",
         ";;;c|BB#w|s   ..;;;;;;;;",
         ";;;c|--:-|     ;;;;;;;;;",
-        ";;;ccccccc     ;;;;;;b;;",
-        ";;;b;b;b;      ;;b;;;;;;"
+        ";7;ccccccc     ;;;;;;b;;",
+        ";;;b;b;b;      ;;b;;;;7;"
       ],
       "palettes": [ "trailhead" ],
       "place_items": [ { "item": "camping", "x": [ 5, 5 ], "y": [ 18, 20 ], "chance": 70 } ],
diff --git a/data/json/mapgen_palettes/hotel_tower_palette.json b/data/json/mapgen_palettes/hotel_tower_palette.json
new file mode 100644
index 0000000000000..0b1d665dc2f77
--- /dev/null
+++ b/data/json/mapgen_palettes/hotel_tower_palette.json
@@ -0,0 +1,63 @@
+[
+  {
+    "type": "palette",
+    "id": "hotel_tower_palette.json",
+    "furniture": {
+      "B": "f_bed",
+      "c": "f_counter",
+      "m": "f_bench",
+      "d": "f_dresser",
+      "o": "f_counter",
+      "D": "f_dryer",
+      "^": [ "f_indoor_plant_y", "f_indoor_plant" ],
+      "h": "f_chair",
+      "r": "f_rack",
+      "t": "f_table",
+      "j": "f_sofa",
+      "S": "f_sink",
+      "&": "f_toilet",
+      "b": "f_bathtub",
+      "E": [ "f_exercise", "f_ergometer", "f_treadmill" ],
+      "e": "f_fridge",
+      "l": "f_locker",
+      "W": "f_washer",
+      "F": "f_vending_c",
+      "U": "f_vending_c"
+    },
+    "terrain": {
+      ",": "t_pavement_y",
+      "1": "t_flat_roof",
+      "0": "t_glass_roof",
+      "*": "t_open_air",
+      "6": "t_wall_glass",
+      "_": "t_pavement",
+      "2": "t_carpet_green",
+      "s": "t_sidewalk",
+      "'": [ [ "t_grass", 5 ], "t_dirt", "t_shrub" ],
+      "M": [ "t_shrub_lilac", "t_shrub_hydrangea" ],
+      " ": [ [ "t_grass", 5 ], "t_dirt", "t_shrub" ],
+      "-": "t_wall_w",
+      "|": "t_wall_w",
+      "%": "t_adobe_brick_wall",
+      "T": "t_tree_young",
+      "v": "t_pavement",
+      "w": "t_water_pool_shallow",
+      "9": "t_water_pool",
+      "+": "t_door_c",
+      "G": "t_door_glass_c",
+      "=": "t_door_locked",
+      "7": "t_door_locked_interior",
+      "X": "t_column",
+      "H": "t_wall_glass",
+      "x": "t_elevator_control_off",
+      "8": "t_elevator",
+      "~": "t_thconc_floor",
+      "<": "t_stairs_up",
+      ">": "t_stairs_down",
+      "#": "t_rock",
+      "$": "t_sewage_pipe",
+      "4": "t_gutter_downspout",
+      "P": "t_sewage_pump"
+    }
+  }
+]
diff --git a/data/json/mapgen_palettes/junkyard_palette.json b/data/json/mapgen_palettes/junkyard_palette.json
new file mode 100644
index 0000000000000..229fb4dfbb925
--- /dev/null
+++ b/data/json/mapgen_palettes/junkyard_palette.json
@@ -0,0 +1,49 @@
+[
+  {
+    "type": "palette",
+    "id": "junkyard_palette",
+    "terrain": {
+      ".": [ [ "t_pavement", 22 ], [ "t_dirt", 2 ], "t_grass" ],
+      "g": [ [ "t_grass", 5 ], "t_dirt" ],
+      "_": [ [ "t_dirt", 5 ], "t_grass" ],
+      "|": "t_fence_barbed",
+      "$": "t_fence_barbed",
+      "-": "t_laminated_glass",
+      "s": [ [ "t_dirt", 5 ], "t_grass" ],
+      "D": "t_door_c",
+      "S": "t_sidewalk",
+      "q": "t_door_metal_locked",
+      "c": "t_carpet_red",
+      "n": "t_carpet_red",
+      "r": "t_reinforced_door_glass_c",
+      "%": "t_brick_wall",
+      "C": "t_thconc_floor",
+      "&": "t_thconc_floor",
+      "#": "t_thconc_floor",
+      "t": "t_thconc_floor",
+      "e": "t_gates_mech_control",
+      "d": "t_door_metal_locked",
+      "m": "t_metal_floor",
+      "9": "t_wall_wood",
+      "x": "t_console_broken",
+      "4": "t_gutter_downspout"
+    },
+    "furniture": {
+      "#": "f_straw_bed",
+      "N": "f_ladder",
+      "B": "f_bench",
+      "&": "f_trashcan",
+      "R": "f_trashcan",
+      "C": "f_counter",
+      "U": "f_counter",
+      "T": "f_toilet",
+      "a": "f_chair",
+      "b": "f_sink",
+      "I": "f_desk",
+      "n": "f_table",
+      "p": "f_table",
+      "F": "f_vending_c",
+      "K": "f_vending_c"
+    }
+  }
+]
diff --git a/data/json/mapgen_palettes/miniature_railway_palette.json b/data/json/mapgen_palettes/miniature_railway_palette.json
new file mode 100644
index 0000000000000..863d0d16ce1c7
--- /dev/null
+++ b/data/json/mapgen_palettes/miniature_railway_palette.json
@@ -0,0 +1,54 @@
+[
+  {
+    "type": "palette",
+    "id": "miniature_railway_palette",
+    "terrain": {
+      ".": [ "t_grass", "t_grass", "t_grass", "t_grass_long", "t_grass_dead", "t_grass_dead", "t_dirt" ],
+      "u": [ [ "t_grass", 27 ], [ "t_grass_long", 10 ], [ "t_dirt", 14 ], [ "t_underbrush", 4 ], [ "t_tree", 5 ] ],
+      "w": [ "t_grass" ],
+      "_": [ "t_door_locked" ],
+      "@": [ "t_pavement" ],
+      "X": [ "t_railroad_track_small_d" ],
+      "=": [ "t_railroad_track_small" ],
+      "H": [ "t_wall" ],
+      "*": [ "t_wall_glass" ],
+      "%": [ "t_fence" ],
+      "|": [ "t_floor" ],
+      "d": [ "t_floor" ],
+      "h": [ "t_floor" ],
+      "D": [ "t_floor" ],
+      "7": [ "t_floor" ],
+      "l": [ "t_floor" ],
+      "s": [ "t_floor" ],
+      "V": [ "t_floor" ],
+      "t": [ "t_floor" ],
+      "p": [ "t_sidewalk" ],
+      "W": [ "t_sidewalk" ],
+      "5": [ "t_wall_wood" ],
+      ":": [ "t_open_air" ],
+      "r": [ "t_flat_roof" ],
+      "`": [ "t_pavement_y" ]
+    },
+    "furniture": {
+      "h": [ "f_chair" ],
+      "d": [ "f_desk" ],
+      "s": [ "f_utility_shelf" ],
+      "l": [ "f_locker" ],
+      "W": [ "f_bench" ],
+      "w": [ "f_bench" ],
+      "D": [ "f_vending_c" ],
+      "V": [ "f_vending_c" ],
+      "7": [ "f_filing_cabinet" ]
+    },
+    "items": {
+      "d": { "item": "office", "chance": 30 },
+      "s": { "item": "metal_workshop", "chance": 10 },
+      "l": { "item": "metal_workshop", "chance": 10 },
+      "W": [ { "item": "snacks", "chance": 10 }, { "item": "novels", "chance": 10 }, { "item": "alcohol", "chance": 5 } ],
+      "w": [ { "item": "snacks", "chance": 10 }, { "item": "novels", "chance": 10 }, { "item": "alcohol", "chance": 5 } ],
+      "7": { "item": "office_paper", "chance": 30 }
+    },
+    "toilets": { "t": {  } },
+    "vendingmachines": { "D": { "item_group": "vending_drink" }, "V": { "item_group": "vending_food" } }
+  }
+]
diff --git a/data/json/mapgen_palettes/movie_theater_palette.json b/data/json/mapgen_palettes/movie_theater_palette.json
new file mode 100644
index 0000000000000..5c53aa82be8c4
--- /dev/null
+++ b/data/json/mapgen_palettes/movie_theater_palette.json
@@ -0,0 +1,58 @@
+[
+  {
+    "type": "palette",
+    "id": "movie_theater_palette.json",
+    "furniture": {
+      "T": "f_counter",
+      "f": "f_counter",
+      "&": "f_toilet",
+      "6": "f_arcade_machine",
+      "7": "f_pinball_machine",
+      "c": "f_stool",
+      "e": "f_stool",
+      "#": "f_chair",
+      "s": "f_sink",
+      "t": "f_table",
+      "{": "f_locker",
+      "H": "f_armchair",
+      "K": "f_armchair",
+      "b": "f_bench",
+      "y": [ "f_indoor_plant", "f_indoor_plant_y" ],
+      "i": [ "f_indoor_plant", "f_indoor_plant_y" ],
+      "l": "f_locker",
+      "G": "f_trashcan",
+      "X": [ [ "f_cardboard_box", 5 ], "f_crate_c" ],
+      "g": "f_glass_fridge",
+      "@": "f_sofa",
+      "o": "f_oven",
+      "r": "f_rack",
+      "F": "f_vending_c",
+      "v": "f_vending_c"
+    },
+    "terrain": {
+      "$": "t_carpet_green",
+      "#": "t_carpet_purple",
+      "K": "t_carpet_purple",
+      "b": "t_carpet_purple",
+      "i": "t_carpet_purple",
+      "*": "t_carpet_purple",
+      "f": "t_carpet_purple",
+      "e": "t_carpet_purple",
+      ".": "t_thconc_floor",
+      "!": "t_brick_wall",
+      "|": "t_wall_b",
+      "%": "t_wall_glass",
+      "+": "t_door_metal_c",
+      "^": "t_door_glass_c",
+      "&": "t_atm",
+      "D": "t_door_c",
+      "d": "t_door_c",
+      "a": "t_atm",
+      "w": "t_window",
+      "Z": "t_console_broken",
+      "-": "t_railing_h",
+      "R": "t_railing_h",
+      "<": "t_ladder_up"
+    }
+  }
+]
diff --git a/data/json/monsterdrops/monster_drops.json b/data/json/monsterdrops/monster_drops.json
index 35945faecd42f..292cf5b945653 100644
--- a/data/json/monsterdrops/monster_drops.json
+++ b/data/json/monsterdrops/monster_drops.json
@@ -5,21 +5,99 @@
     "//": "contains cloth for an average zombie",
     "id": "default_zombie_clothes",
     "entries": [
-      { "group": "pants", "damage": [ 1, 4 ] },
-      { "group": "shirts", "damage": [ 1, 4 ] },
-      { "group": "shoes", "damage": [ 1, 4 ] },
-      { "group": "underwear", "damage": [ 1, 4 ] },
-      { "group": "jackets", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "suits", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "coats_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "common_gloves", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "hatstore_hats", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "scarfs_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "accesories_personal_unisex", "damage": [ 1, 4 ], "prob": 15 },
       {
         "distribution": [
-          { "item": "wristwatch", "prob": 15 },
-          { "item": "pocketwatch", "prob": 5 },
-          { "item": "gold_watch", "prob": 5, "damage": [ 1, 4 ] },
-          { "item": "diving_watch", "prob": 10, "damage": [ 1, 4 ] },
-          { "item": "sf_watch", "prob": 5, "damage": [ 1, 4 ] }
-        ],
-        "prob": 20
+          {
+            "collection": [
+              {
+                "distribution": [
+                  { "group": "male_underwear", "prob": 90, "damage": [ 1, 4 ] },
+                  { "item": "union_suit", "prob": 10, "damage": [ 1, 4 ] }
+                ]
+              },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_male", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      { "item": "leather_belt", "prob": 30, "damage": [ 1, 4 ] }
+                    ]
+                  },
+                  { "item": "suit", "prob": 5, "damage": [ 1, 4 ] },
+                  { "item": "tux", "prob": 5, "damage": [ 1, 4 ] },
+                  { "item": "thawb", "prob": 10, "damage": [ 1, 4 ] },
+                  { "item": "cassock", "prob": 10, "damage": [ 1, 4 ] },
+                  { "item": "haori", "prob": 10, "damage": [ 1, 4 ] }
+                ]
+              },
+              { "group": "neckties", "prob": 15, "damage": [ 1, 4 ] },
+              { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+              { "group": "socks_unisex", "damage": [ 1, 4 ], "prob": 50 },
+              { "group": "accesories_personal_mens", "prob": 15, "damage": [ 1, 4 ] }
+            ]
+          },
+          {
+            "collection": [
+              { "group": "female_underwear", "prob": 90, "damage": [ 1, 4 ] },
+              { "group": "accesories_personal_womens", "prob": 15, "damage": [ 1, 4 ] },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_female", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [
+                          {
+                            "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                          },
+                          { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] }
+                        ]
+                      }
+                    ],
+                    "prob": 70
+                  },
+                  {
+                    "collection": [
+                      {
+                        "distribution": [
+                          { "item": "gown", "prob": 10, "damage": [ 1, 4 ] },
+                          { "item": "dress", "prob": 70, "damage": [ 1, 4 ] },
+                          { "item": "sundress", "prob": 50, "damage": [ 1, 4 ] }
+                        ]
+                      },
+                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                      },
+                      { "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
+                    ],
+                    "prob": 20
+                  },
+                  {
+                    "collection": [
+                      { "item": "dress_wedding", "damage": [ 1, 4 ] },
+                      { "item": "veil_wedding", "damage": [ 1, 4 ] },
+                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                      },
+                      { "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
+                    ],
+                    "prob": 10
+                  }
+                ]
+              }
+            ]
+          }
+        ]
       },
       {
         "distribution": [
@@ -27,12 +105,7 @@
           { "group": "clothing_biker", "damage": [ 1, 4 ], "prob": 50 }
         ],
         "prob": 10
-      },
-      { "group": "common_gloves", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "hatstore_hats", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "hatstore_accessories", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "clothing_glasses", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "jewelry_accessories", "prob": 15 }
+      }
     ]
   },
   {
@@ -414,5 +487,87 @@
       { "item": "cable", "charges-min": 20, "charges-max": 50 },
       { "item": "amplifier", "count": [ 0, 3 ] }
     ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "contains cloth for an average zombie child",
+    "id": "default_zombie_children_clothes",
+    "entries": [
+      { "group": "coats_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "common_gloves", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "hatstore_hats", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "scarfs_unisex", "damage": [ 1, 4 ], "prob": 20 },
+      { "group": "accesories_personal_unisex", "damage": [ 1, 4 ], "prob": 15 },
+      {
+        "distribution": [
+          {
+            "collection": [
+              {
+                "distribution": [
+                  { "group": "male_underwear", "prob": 90, "damage": [ 1, 4 ] },
+                  { "item": "union_suit", "prob": 10, "damage": [ 1, 4 ] }
+                ]
+              },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_male", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      { "item": "leather_belt", "prob": 30, "damage": [ 1, 4 ] }
+                    ]
+                  },
+                  { "item": "suit", "prob": 5, "damage": [ 1, 4 ] },
+                  { "item": "tux", "prob": 5, "damage": [ 1, 4 ] }
+                ]
+              },
+              { "group": "neckties", "prob": 15, "damage": [ 1, 4 ] },
+              { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+              { "group": "socks_unisex", "damage": [ 1, 4 ], "prob": 50 },
+              { "group": "accesories_personal_mens", "prob": 15, "damage": [ 1, 4 ] }
+            ]
+          },
+          {
+            "collection": [
+              { "group": "female_underwear", "prob": 90, "damage": [ 1, 4 ] },
+              { "group": "accesories_personal_womens", "prob": 15, "damage": [ 1, 4 ] },
+              {
+                "distribution": [
+                  {
+                    "collection": [
+                      { "group": "pants_female", "prob": 60, "damage": [ 1, 4 ] },
+                      { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
+                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [
+                          {
+                            "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                          },
+                          { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] }
+                        ]
+                      }
+                    ],
+                    "prob": 80
+                  },
+                  {
+                    "collection": [
+                      {
+                        "distribution": [ { "item": "dress", "prob": 70, "damage": [ 1, 4 ] }, { "item": "sundress", "prob": 50, "damage": [ 1, 4 ] } ]
+                      },
+                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
+                      {
+                        "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
+                      }
+                    ],
+                    "prob": 20
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    ]
   }
 ]
diff --git a/data/json/monstergroups/mi-go.json b/data/json/monstergroups/mi-go.json
index 6e100677d855d..d980fade9dd7b 100644
--- a/data/json/monstergroups/mi-go.json
+++ b/data/json/monstergroups/mi-go.json
@@ -3,7 +3,7 @@
     "type": "monstergroup",
     "name": "GROUP_MI-GO_CAMP_OM",
     "//": "Mi-go raiding parties spawning in the vicinity of a mi-go camp.  Puts slavers later on and keeps large groups from spawning until the player can deal with them.",
-    "default": "mon_mi_go_slaver",
+    "default": "mon_mi_go",
     "monsters": [
       { "monster": "mon_mi_go", "freq": 100, "cost_multiplier": 20, "pack_size": [ 2, 4 ] },
       { "monster": "mon_mi_go", "freq": 100, "cost_multiplier": 10, "pack_size": [ 4, 8 ] },
@@ -18,7 +18,7 @@
     "type": "monstergroup",
     "name": "GROUP_MI-GO_BASE_COMMON",
     "//": "Basic mi-go base defenders.",
-    "default": "mon_mi_go_slaver",
+    "default": "mon_mi_go_guard",
     "monsters": [
       { "monster": "mon_mi_go", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 4 ] },
       { "monster": "mon_mi_go", "freq": 100, "cost_multiplier": 3, "pack_size": [ 2, 4 ] },
diff --git a/data/json/monstergroups/monstergroups.json b/data/json/monstergroups/monstergroups.json
index 7cef97421a47c..43a78b86e62ba 100644
--- a/data/json/monstergroups/monstergroups.json
+++ b/data/json/monstergroups/monstergroups.json
@@ -5351,5 +5351,25 @@
       { "monster": "mon_dog_auscattle", "freq": 50, "cost_multiplier": 0 },
       { "monster": "mon_dog_auscattle_pup", "freq": 5, "cost_multiplier": 0 }
     ]
+  },
+  {
+    "name": "GROUP_HOTEL_POOL",
+    "type": "monstergroup",
+    "default": "mon_zombie_swimmer",
+    "monsters": [
+      { "monster": "mon_zombie_swimmer", "freq": 100, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_swimmer", "freq": 50, "cost_multiplier": 10, "pack_size": [ 3, 8 ] },
+      { "monster": "mon_zombie_child", "freq": 35, "cost_multiplier": 1 }
+    ]
+  },
+  {
+    "name": "GROUP_HOTEL_GYM",
+    "type": "monstergroup",
+    "default": "mon_zombie_fat",
+    "monsters": [
+      { "monster": "mon_zombie_fat", "freq": 30, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_fat", "freq": 15, "cost_multiplier": 8, "pack_size": [ 2, 6 ] },
+      { "monster": "mon_zombie_tough", "freq": 8, "cost_multiplier": 3 }
+    ]
   }
 ]
diff --git a/data/json/monsters/monsters.json b/data/json/monsters/monsters.json
index 12f1f60211a71..d1fa060df7449 100644
--- a/data/json/monsters/monsters.json
+++ b/data/json/monsters/monsters.json
@@ -1409,19 +1409,22 @@
     "id": "mon_fungal_wall",
     "type": "MONSTER",
     "name": "fungal wall",
-    "description": "A veritable wall of fungus, grown as a natural defense by the fungal spire.  New spores erupt from the surface every few seconds.",
+    "description": "A veritable wall of fungus, grown as a natural defense by the fungal spire.  New spores erupt from the surface every few seconds, and tendrils constrict around it, pulling new mass into its shape.  They move with an inexorable strength that could snap limbs.",
     "default_faction": "fungus",
     "species": [ "FUNGUS" ],
     "diff": 2,
     "volume": "875000 ml",
     "weight": 200000,
-    "hp": 10,
+    "hp": 20,
     "speed": 100,
     "material": [ "veggy" ],
     "symbol": "T",
     "color": "dark_gray",
     "aggression": 100,
     "morale": 100,
+    "melee_skill": 1,
+    "melee_dice": 2,
+    "melee_dice_sides": 10,
     "melee_cut": 0,
     "armor_bash": 10,
     "armor_cut": 10,
@@ -1564,7 +1567,7 @@
     "armor_bash": 4,
     "armor_cut": 4,
     "harvest": "fungaloid",
-    "special_attacks": [ [ "FUNGUS_GROWTH", 100 ] ],
+    "special_attacks": [ [ "FUNGUS_GROWTH", 10000 ] ],
     "death_function": [ "NORMAL" ],
     "flags": [ "HEARS", "POISON", "NO_BREATHE", "NOHEAD" ]
   },
diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json
index acf825abd1f16..a61cdfa40a73c 100644
--- a/data/json/monsters/zed_children.json
+++ b/data/json/monsters/zed_children.json
@@ -60,8 +60,8 @@
     "special_attacks": [ [ "scratch", 15 ] ],
     "death_drops": {
       "subtype": "collection",
-      "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ],
-      "//": "cloth as any other zombie (always), additional items from child_items (sometimes)"
+      "groups": [ [ "default_zombie_children_clothes", 100 ], [ "child_items", 65 ] ],
+      "//": "default zombie children clothing (always), additional items from child_items (sometimes)"
     },
     "death_function": [ "NORMAL" ],
     "burn_into": "mon_zombie_child_scorched",
diff --git a/data/json/npcs/NPC_Brigitte_LaCroix.json b/data/json/npcs/NPC_Brigitte_LaCroix.json
index 885ca662666c1..3d077909afede 100644
--- a/data/json/npcs/NPC_Brigitte_LaCroix.json
+++ b/data/json/npcs/NPC_Brigitte_LaCroix.json
@@ -91,7 +91,7 @@
     "attitude": 7,
     "mission": 3,
     "chat": "TALK_BONE_SEER",
-    "faction": "wasteland_scavengers",
+    "faction": "no_faction",
     "mission_offered": "MISSION_SEER_GATHER_BONE"
   },
   {
diff --git a/data/json/npcs/TALK_ALLY_TUTORIAL.json b/data/json/npcs/TALK_ALLY_TUTORIAL.json
index 4c3e35cc2a92d..ed77c9f53697e 100644
--- a/data/json/npcs/TALK_ALLY_TUTORIAL.json
+++ b/data/json/npcs/TALK_ALLY_TUTORIAL.json
@@ -2,10 +2,11 @@
   {
     "id": "TALK_ALLY_TUTORIAL",
     "type": "talk_topic",
-    "dynamic_line": "I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n  What do you want to know more about?",
+    "dynamic_line": "I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n  What do you want to know more about?",
     "responses": [
       { "text": "Forget I asked.", "topic": "TALK_FRIEND" },
       { "text": "Skip it, let's get going.", "topic": "TALK_DONE" },
+      { "text": "What do you mean, \"mostly\" willing to follow my lead?", "topic": "TALK_ALLY_TUTORIAL_MUTINY" },
       { "text": "What's that about giving instructions?", "topic": "TALK_ALLY_TUTORIAL_TALK" },
       { "text": "We can talk with radios?", "topic": "TALK_ALLY_TUTORIAL_RADIO" },
       { "text": "How do shouted commands work?", "topic": "TALK_ALLY_TUTORIAL_SHOUTS" },
@@ -23,10 +24,19 @@
       { "text": "What do you do as a guard?", "topic": "TALK_ALLY_TUTORIAL_GUARD" },
       { "text": "You can use bionics?  How does that work?", "topic": "TALK_ALLY_TUTORIAL_CBMS" },
       { "text": "What about chit-chatting and your background?", "topic": "TALK_ALLY_TUTORIAL_SOCIAL" },
-      { "text": "Anything else I should know?", "topic": "TALK_ALLY_TUTORIAL_MISC" },
+      {
+        "text": "Anything else I should know, like making you pulp zombies or assigning you a seat in my vehicle?",
+        "topic": "TALK_ALLY_TUTORIAL_MISC"
+      },
       { "text": "Any new abilities recently?", "topic": "TALK_ALLY_TUTORIAL_CHANGES" }
     ]
   },
+  {
+    "id": "TALK_ALLY_TUTORIAL_MUTINY",
+    "type": "talk_topic",
+    "dynamic_line": "You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that.",
+    "responses": [ { "text": "Sure.  Is there any easy way to keep you fed?", "topic": "TALK_CAMP_TUTORIAL_INTRO" } ]
+  },
   {
     "id": "TALK_ALLY_TUTORIAL_TALK",
     "type": "talk_topic",
@@ -73,7 +83,7 @@
   {
     "id": "TALK_ALLY_TUTORIAL_TRAINING",
     "type": "talk_topic",
-    "dynamic_line": "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.",
+    "dynamic_line": "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any.",
     "responses": [ { "text": "Instead of reading to you, can we just talk?", "topic": "TALK_ALLY_TUTORIAL_SOCIAL" } ]
   },
   {
@@ -100,7 +110,7 @@
   {
     "id": "TALK_ALLY_TUTORIAL_ACTIVITIES",
     "type": "talk_topic",
-    "dynamic_line": "I can help with some tasks if you show me where to work.\n  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much.",
+    "dynamic_line": "I can help with some tasks if you show me where to work.\n  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much.",
     "responses": [
       { "text": "Good to know.  Can you perform first aid?", "topic": "TALK_ALLY_TUTORIAL_MEDIC" },
       { "text": "What about carrying stuff in general?", "topic": "TALK_ALLY_TUTORIAL_MULE" },
@@ -127,8 +137,11 @@
   {
     "id": "TALK_ALLY_TUTORIAL_GUARD",
     "type": "talk_topic",
-    "dynamic_line": "You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about.",
-    "responses": [ { "text": "Just in case - how else can I tell you to stay put?", "topic": "TALK_ALLY_TUTORIAL_MISC" } ]
+    "dynamic_line": "You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about.",
+    "responses": [
+      { "text": "Just in case - how else can I tell you to stay put?", "topic": "TALK_ALLY_TUTORIAL_MISC" },
+      { "text": "Hang on, other people can steal our stuff?", "topic": "TALK_ALLY_TUTORIAL_OTHER_FACTIONS" }
+    ]
   },
   {
     "id": "TALK_ALLY_TUTORIAL_CBMS",
@@ -161,14 +174,28 @@
       }
     ]
   },
+  {
+    "id": "TALK_ALLY_TUTORIAL_OTHER_FACTIONS",
+    "type": "talk_topic",
+    "dynamic_line": "Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them.",
+    "responses": [
+      { "text": "Anything else  I can do in the faction manager?", "topic": "TALK_ALLY_TUTORIAL_RADIO" },
+      { "text": "Is there any way we can build base for our faction?", "topic": "TALK_CAMP_TUTORIAL_INTRO" }
+    ]
+  },
   {
     "id": "TALK_ALLY_TUTORIAL_CHANGES",
     "type": "talk_topic",
-    "dynamic_line": "Well, this conversation is pretty new!  But there's been some other changes.\n  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.",
+    "dynamic_line": "Well, this conversation is pretty new!  But there's been some other changes.\n  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n  I can even read books to improve my skills, so you don't have to spend time reading to me.\n  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!",
     "responses": [
       { "text": "You can use bionics?  How does that work?", "topic": "TALK_ALLY_TUTORIAL_CBMS" },
       { "text": "You can ride horses?  Can I ride horses?", "topic": "TALK_ALLY_TUTORIAL_HORSES" },
-      { "text": "Tell me more about the activities you can do now.", "topic": "TALK_ALLY_TUTORIAL_ACTIVITIES" }
+      { "text": "Tell me more about the activities you can do now.", "topic": "TALK_ALLY_TUTORIAL_ACTIVITIES" },
+      {
+        "text": "Hey, you can teach yourself from a book.  How does that work?",
+        "topic": "TALK_ALLY_TUTORIAL_TRAINING"
+      },
+      { "text": "Tell me about faction camps.", "topic": "TALK_CAMP_TUTORIAL_INTRO" }
     ]
   },
   {
@@ -183,6 +210,8 @@
       "TALK_ALLY_TUTORIAL_HORSES",
       "TALK_ALLY_TUTORIAL_MEDIC",
       "TALK_ALLY_TUTORIAL_MOVEMENT",
+      "TALK_ALLY_TUTORIAL_MUTINY",
+      "TALK_ALLY_TUTORIAL_OTHER_FACTIONS",
       "TALK_ALLY_TUTORIAL_GUARD",
       "TALK_ALLY_TUTORIAL_CBMS",
       "TALK_ALLY_TUTORIAL_SOCIAL",
diff --git a/data/json/npcs/TALK_FACTION_CAMP.json b/data/json/npcs/TALK_FACTION_CAMP.json
index 6d8171c9277e7..ca3fca864c806 100644
--- a/data/json/npcs/TALK_FACTION_CAMP.json
+++ b/data/json/npcs/TALK_FACTION_CAMP.json
@@ -34,9 +34,31 @@
   {
     "id": "TALK_CAMP_TUTORIAL_INTRO",
     "type": "talk_topic",
-    "dynamic_line": "The faction camp system is designed to give you greater control over your companions by allowing you to assign them to their own missions.  These missions can range from gathering and crafting to eventual combat patrols.",
+    "dynamic_line": "The faction camp system allows you to use friendly NPCs to take over existing buildings or construct new buildings and use them to extend the usefulness of your allies.  When you have a faction camp, you can order your companions to perform missions, such as crafting new items, building up the camp, hunting for food, or recruiting more allies.  Faction camps also simplify some aspects of managing your companions.",
     "responses": [
-      { "text": "Go on.", "topic": "TALK_CAMP_TUTORIAL_FOOD" },
+      { "text": "Give me an overview of how camps work.", "topic": "TALK_CAMP_TUTORIAL_OVERVIEW" },
+      { "text": "Tell me more about faction camps and food.", "topic": "TALK_CAMP_TUTORIAL_FOOD" },
+      { "text": "Tell me more about camp missions.", "topic": "TALK_CAMP_TUTORIAL_MISSIONS" },
+      { "text": "Tell me about building a camp.", "topic": "TALK_CAMP_TUTORIAL_BUILDING" },
+      { "text": "Give me some advice on building a camp.", "topic": "TALK_CAMP_TUTORIAL_ADVICE" },
+      { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
+      { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
+      { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
+      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
+      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "TALK_CAMP_TUTORIAL_OVERVIEW",
+    "type": "talk_topic",
+    "dynamic_line": "Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters.",
+    "responses": [
+      { "text": "Wait, we can talk with radios?", "topic": "TALK_ALLY_TUTORIAL_RADIO" },
+      { "text": "Tell me more about faction camps and food.", "topic": "TALK_CAMP_TUTORIAL_FOOD" },
+      { "text": "Tell me more about camp missions.", "topic": "TALK_CAMP_TUTORIAL_MISSIONS" },
+      { "text": "Tell me about building a camp.", "topic": "TALK_CAMP_TUTORIAL_BUILDING" },
+      { "text": "Give me some advice on building a camp.", "topic": "TALK_CAMP_TUTORIAL_ADVICE" },
+      { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
       { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
@@ -46,49 +68,91 @@
   {
     "id": "TALK_CAMP_TUTORIAL_FOOD",
     "type": "talk_topic",
-    "dynamic_line": "Food is required for or produced during every mission.  Missions that are for a fixed amount of time will require you to pay in advance while repeating missions, like gathering firewood, are paid upon completion.  Not having the food needed to pay a companion will result in a loss of reputation across the faction.  Which can lead to VERY bad things if it gets too low.",
+    "dynamic_line": "Faction camps require food, but simplify managing your companions.\n  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty.",
+    "responses": [
+      { "text": "Tell me more about camp missions.", "topic": "TALK_CAMP_TUTORIAL_MISSIONS" },
+      { "text": "Tell me about building a camp.", "topic": "TALK_CAMP_TUTORIAL_BUILDING" },
+      { "text": "Give me some advice on building a camp.", "topic": "TALK_CAMP_TUTORIAL_ADVICE" },
+      { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
+      { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
+      { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
+      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
+      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "TALK_CAMP_TUTORIAL_MISSIONS",
+    "type": "talk_topic",
+    "dynamic_line": "When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way.",
+    "responses": [
+      { "text": "What do you mean by angry?", "topic": "TALK_ALLY_TUTORIAL_MUTINY" },
+      { "text": "Tell me more about faction camps and food.", "topic": "TALK_CAMP_TUTORIAL_FOOD" },
+      { "text": "Tell me about building a camp.", "topic": "TALK_CAMP_TUTORIAL_BUILDING" },
+      { "text": "Give me some advice on building a camp.", "topic": "TALK_CAMP_TUTORIAL_ADVICE" },
+      { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
+      { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
+      { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
+      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
+      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "TALK_CAMP_TUTORIAL_BUILDING",
+    "type": "talk_topic",
+    "dynamic_line": "Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities.",
     "responses": [
-      { "text": "Go on.", "topic": "TALK_CAMP_TUTORIAL_CONTROL" },
+      { "text": "Tell me about modular field camps.", "topic": "TALK_CAMP_TUTORIAL_MFC" },
+      { "text": "Tell me about fire station camps.", "topic": "TALK_CAMP_TUTORIAL_FIRE_STATION" },
+      { "text": "Tell me about evac shelter camps.", "topic": "TALK_CAMP_TUTORIAL_EVAC_SHELTER" },
+      { "text": "Tell me about expansions.", "topic": "TALK_CAMP_TUTORIAL_EXPANSIONS" },
+      { "text": "Give me some advice on building a camp.", "topic": "TALK_CAMP_TUTORIAL_ADVICE" },
+      { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
-      { "text": "Wait, repeat what you said.", "topic": "TALK_NONE" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
       { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
       { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
     ]
   },
   {
-    "id": "TALK_CAMP_TUTORIAL_CONTROL",
+    "id": "TALK_CAMP_TUTORIAL_MFC",
     "type": "talk_topic",
-    "dynamic_line": "Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \nThe task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \nIf you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio.",
+    "dynamic_line": "Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents.",
     "responses": [
-      { "text": "Go on.", "topic": "TALK_CAMP_TUTORIAL_SETUP" },
+      { "text": "Got it.  Tell me about expansions.", "topic": "TALK_CAMP_TUTORIAL_EXPANSIONS" },
+      { "text": "Can we review how camps work?", "topic": "TALK_CAMP_TUTORIAL_OVERVIEW" },
+      { "text": "Give me some advice on building a camp.", "topic": "TALK_CAMP_TUTORIAL_ADVICE" },
+      { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
-      { "text": "Wait, repeat what you said.", "topic": "TALK_NONE" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
       { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
       { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
     ]
   },
   {
-    "id": "TALK_CAMP_TUTORIAL_SETUP",
+    "id": "TALK_CAMP_TUTORIAL_FIRE_STATION",
     "type": "talk_topic",
-    "dynamic_line": "For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \nAlthough you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building.",
+    "dynamic_line": "Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit.",
     "responses": [
-      { "text": "Go on.", "topic": "TALK_CAMP_TUTORIAL_UPGRADES" },
+      { "text": "Got it.  Tell me about expansions.", "topic": "TALK_CAMP_TUTORIAL_EXPANSIONS" },
+      { "text": "Can we review how camps work?", "topic": "TALK_CAMP_TUTORIAL_OVERVIEW" },
+      { "text": "Give me some advice on building a camp.", "topic": "TALK_CAMP_TUTORIAL_ADVICE" },
+      { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
-      { "text": "Wait, repeat what you said.", "topic": "TALK_NONE" },
+      { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
       { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
       { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
     ]
   },
   {
-    "id": "TALK_CAMP_TUTORIAL_UPGRADES",
+    "id": "TALK_CAMP_TUTORIAL_EVAC_SHELTER",
     "type": "talk_topic",
-    "dynamic_line": "After you pick a site you will need to find or make materials to upgrade the camp further to access new missions.  The first new missions are focused on gathering materials to upgrade the camp so you don't have to.  After two or three upgrades you will have access to the <color_yellow>[Menial Labor]</color> mission which will allow you to task companions with sorting all of the items around your camp into categories.  Later upgrades allow you to send companions to recruit new members, build overmap fortifications, or even conduct combat patrols",
+    "dynamic_line": "You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space.",
     "responses": [
-      { "text": "Go on.", "topic": "TALK_CAMP_TUTORIAL_EXPANSIONS" },
+      { "text": "Got it.  Tell me about expansions.", "topic": "TALK_CAMP_TUTORIAL_EXPANSIONS" },
+      { "text": "Can we review how camps work?", "topic": "TALK_CAMP_TUTORIAL_OVERVIEW" },
+      { "text": "Give me some advice on building a camp.", "topic": "TALK_CAMP_TUTORIAL_ADVICE" },
+      { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
-      { "text": "Wait, repeat what you said.", "topic": "TALK_NONE" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
       { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
       { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
@@ -97,10 +161,29 @@
   {
     "id": "TALK_CAMP_TUTORIAL_EXPANSIONS",
     "type": "talk_topic",
-    "dynamic_line": "When you upgrade your first tent all the way you will unlock the ability to construct expansions.  Expansions allow you to specialize each camp you build by focusing on the industries that you need.  A <color_light_green>[Farm]</color> is recommended for players that want to pursue a large faction while a <color_light_green>[Kitchen]</color> is better for players that just want the quality of life improvement of having an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is useful for chop shop type missions that let you trade vehicles for large amounts of parts and resources.  All those resources can be turning into valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You can build an additional expansion every other level after the first is unlocked and when one camp is full you can just as easily build another.",
+    "dynamic_line": "Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n  Saltworks Area: This is a small expansion for processing salt.\n  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n  Central Storage Building: This is a large building for storing goods.",
     "responses": [
-      { "text": "Thanks, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
-      { "text": "Wait, repeat what you said.", "topic": "TALK_NONE" },
+      { "text": "Got it.  Give me some advice on building a camp.", "topic": "TALK_CAMP_TUTORIAL_ADVICE" },
+      { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
+      { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
+      { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
+      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
+      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "TALK_CAMP_TUTORIAL_ADVICE",
+    "type": "talk_topic",
+    "dynamic_line": "Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses.",
+    "responses": [
+      { "text": "Give me an overview of how camps work.", "topic": "TALK_CAMP_TUTORIAL_OVERVIEW" },
+      { "text": "Tell me about modular field camps.", "topic": "TALK_CAMP_TUTORIAL_MFC" },
+      { "text": "Tell me about fire station camps.", "topic": "TALK_CAMP_TUTORIAL_FIRE_STATION" },
+      { "text": "Tell me about evac shelter camps.", "topic": "TALK_CAMP_TUTORIAL_EVAC_SHELTER" },
+      { "text": "Tell me about expansions.", "topic": "TALK_CAMP_TUTORIAL_EXPANSIONS" },
+      { "text": "Give me some advice on building a camp.", "topic": "TALK_CAMP_TUTORIAL_ADVICE" },
+      { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
+      { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
       { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
       { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
@@ -111,7 +194,14 @@
     "type": "talk_topic",
     "dynamic_line": "\n1.  Faction camps used to require a second NPC to act as overseer and camp manager, but that's been replaced by the bulletin board and two-way radio.\n2.  It used to be impossible to upgrade faction camps if there was a vehicle, even a cart, on the same map.  You can now upgrade camps even if there is a vehicle on the map, as long as the upgrade doesn't change the area under the vehicle.\n3.  Faction camps used to upgrade by completely redrawing the map.  Damage to the camp would be replaced when the camp was upgraded.  Now upgrades only change the actual area being upgraded, and you will have to repair damage to the camp yourself.\n4.  There used to be a single path for upgrading the main camp.  Now, after you have completed the first tent, you will have many options for your next upgrade, and you can have different companions working on different upgrades of the main camp at the same time.\n5.  Friendly NPCs who are near a camp will feed themselves from the camp's food stores, and if the camp has a well, they'll use it to quench their thirst.\n6.  You can now set up faction camps in select buildings.  The list of available buildings is constantly growing, so you'll have to experiment.",
     "responses": [
-      { "text": "Thanks, let's go back to talking about camps.", "topic": "TALK_NONE" },
+      { "text": "Wait, let's go back over from the start.", "topic": "TALK_CAMP_TUTORIAL_INTRO" },
+      { "text": "Give me an overview of how camps work.", "topic": "TALK_CAMP_TUTORIAL_OVERVIEW" },
+      { "text": "Tell me more about faction camps and food.", "topic": "TALK_CAMP_TUTORIAL_FOOD" },
+      { "text": "Tell me about modular field camps.", "topic": "TALK_CAMP_TUTORIAL_MFC" },
+      { "text": "Tell me about fire station camps.", "topic": "TALK_CAMP_TUTORIAL_FIRE_STATION" },
+      { "text": "Tell me about evac shelter camps.", "topic": "TALK_CAMP_TUTORIAL_EVAC_SHELTER" },
+      { "text": "Tell me about expansions.", "topic": "TALK_CAMP_TUTORIAL_EXPANSIONS" },
+      { "text": "Thanks, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
       { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
     ]
diff --git a/data/json/npcs/hints.json b/data/json/npcs/hints.json
index 6ea97e520122a..9960032426e53 100644
--- a/data/json/npcs/hints.json
+++ b/data/json/npcs/hints.json
@@ -11,34 +11,34 @@
     "Those acid-spitting zombies are pretty nasty, but if you're smart, you can get other zombies to wade through the acid.",
     "If there's a pool of acid blocking your way, trying tossing a junk item into it.  Eating up items will help neutralize the acid faster.",
     "Rubber boots aren't as tough as combat boots and you don't run very fast in them.  But I've seen zombies vomiting puddles of acid, and I'd hate to have my feet melt off, so I'd consider having a pair of those.",
-    "There's this type of zombie that can shoot bolts of lightning!  Stay away from walls and stuff when they do... the electricity can travel along solid surfaces.",
+    "There's this type of zombie that can shoot bolts of lightning!  Stay away from walls and stuff when they do… the electricity can travel along solid surfaces.",
     "Zombie hulks are NASTY, but they're easy to outsmart.  If there's other monsters between you and them, they'll kill the monster for you!",
     "If you run into a zombie hulk, it's probably a good idea to run.  They're fast as hell, but pretty dumb; they'll try to smash through obstacles rather than going around, and that slows them down a lot.",
     "Zombie brutes and hulks have really tough hide, but skeletal juggernauts with their bone plates are the worst.  Don't bother shooting at them with lower-caliber guns, the bullet will bounce right off!",
     "Try not to kill a boomer if it's standing right next to you.  They tend to explode when they die, and that pink goop will get all over you.",
     "Skeletons are a tough target for a gun.  They're so skinny and full of holes that it's hard to make a good hit.  And those big ones are hard as nails too.",
     "Small skeletons are too delicate to smash through doors or windows.  Big ones can walk in through a wall.  At least they can't smell you, unlike zombies, so if you turn your light off at night you can sneak right past.",
-    "Don't try to take on a skeleton with a bladed weapon... you'll just leave scratch marks.  You've got to shatter those bones with a hammer or something.",
+    "Don't try to take on a skeleton with a bladed weapon… you'll just leave scratch marks.  You've got to shatter those bones with a hammer or something.",
     "It's a good idea to butcher corpses if you have the time.  I've seen these weird zombies bring their friends back from the dead!",
-    "I have a buddy who was sleeping in this cabin way out in the woods, when he suddenly woke up to trees and vines growing right up through the floor and walls!  He said it was some kind of huge tree beast...",
-    "Oh man, have you gone down into the old subway systems?  I'd be careful... there's these things down there that are like zombies, but tougher.",
+    "I have a buddy who was sleeping in this cabin way out in the woods, when he suddenly woke up to trees and vines growing right up through the floor and walls!  He said it was some kind of huge tree beast…",
+    "Oh man, have you gone down into the old subway systems?  I'd be careful… there's these things down there that are like zombies, but tougher.",
     "There's snakes down in most of the old sewer systems.  They're slow on land, but boy, those suckers can swim fast!",
     "If you're planning on wandering around the sewers--not that you'd have a reason too--watch out for those fish.  Those suckers are fast, and vicious too!",
-    "Have you seen those eyebots flying around?  It's hard to say, but some faction's controlling them--maybe the military.  All I know is, I don't want them taking my picture...",
+    "Have you seen those eyebots flying around?  It's hard to say, but some faction's controlling them--maybe the military.  All I know is, I don't want them taking my picture…",
     "Ever go toe-to-toe with a manhack?  Tiny little helicopters covered in knives.  Best be packing a shotgun!",
-    "They're rare, but molebots are nasty things.  They bore through the ground, then pop up to stab ya.  Still, you're safe from them if you stay on pavement...",
+    "They're rare, but molebots are nasty things.  They bore through the ground, then pop up to stab ya.  Still, you're safe from them if you stay on pavement…",
     "Don't fire your gun if you can help it - the noise attracts monsters.  If you could get a silencer, or make one, it would give you some advantage.",
     "Standing behind a window is a good tactic.  It takes zombies a long time to crawl through, giving you lots of opportunities to hit them.",
-    "Zombies are pretty dumb... heck, most monsters are!  If you can get a fire going between you and them, they'll just run straight through it.",
+    "Zombies are pretty dumb… heck, most monsters are!  If you can get a fire going between you and them, they'll just run straight through it.",
     "I know it's tempting to just go full-auto and unload as many bullets as possible, but don't except as a last resort.  It's inaccurate and wastes ammo.",
     "If there's a bunch of zombies in a straight line, try unloading a burst from your gun.  Be sure to aim at the zombie furthest away; you'll hit more of them that way.",
     "If you shoot a zombie, but don't quite kill it, try to finish it off with a punch or something instead of wasting a bullet.",
     "If you're in a corridor or something, and there's a bunch of zombies chasing you down it, try to wound the guy in front badly.  He'll start moving slow and cause a serious traffic jam!",
     "Here's a trick for taking care of a huge swarm of zombies chasing you: head into a liquor store, shoot out as many bottles as you can, then light the alcohol on fire.  Then duck out the back door, and watch the zombies run into a burning building!",
     "Sledge hammers may seem like a great weapon, but swinging them is really slow, and you won't do much damage unless you're really strong.",
-    "For a good melee weapon, you can't beat a machete.  I've seen a guy take down a zombie brute with one!  Of course, if you can find a katana, that might be even better...",
-    "A knife spear makes a good weapon in a pinch, but a spike strapped to a stick isn't the sturdiest construction. At least you can strap the spike back on when it comes off.",
-    "You know, a glass bottle can make a good weapon in a pinch.  If you break it over someone's head, the shattering glass will hurt them extra.  Of course, it might hurt your hands, too...",
+    "For a good melee weapon, you can't beat a machete.  I've seen a guy take down a zombie brute with one!  Of course, if you can find a katana, that might be even better…",
+    "A knife spear makes a good weapon in a pinch, but a spike strapped to a stick isn't the sturdiest construction.  At least you can strap the spike back on when it comes off.",
+    "You know, a glass bottle can make a good weapon in a pinch.  If you break it over someone's head, the shattering glass will hurt them extra.  Of course, it might hurt your hands, too…",
     "You know what makes a nice weapon?  Take a two by four, or a baseball bat or something, and stick a bunch of nails through the end!",
     "BB guns may seem like a joke, but they've got their uses.  They're good for hunting small game, or getting to know the basics of rifles.",
     "Crossbows are a great weapon for long term use.  Most of the time, you can retrieve the bolt after shooting it, so running out of ammo is less of a concern.",
@@ -49,12 +49,12 @@
     "A good submachine gun can't be beat.  Most of them use common ammo, they're good at short and long range, and you can burst-fire if you need to!",
     "Hunting rifles are great at long range, but suck close up.  Plus, most of them don't carry many rounds.  Keep a pistol as a sidearm if you use a rifle.",
     "You know, you don't have to go full auto with an assault rifle.  Firing single shots is more accurate and efficient!",
-    "I've seen a couple guys running around with laser pistols.  They seem like the perfect weapon... quiet, accurate, and deadly.  But I've never found one, and I bet ammo is wicked scarce...",
+    "I've seen a couple guys running around with laser pistols.  They seem like the perfect weapon… quiet, accurate, and deadly.  But I've never found one, and I bet ammo is wicked scarce…",
     "When it comes to footwear, you've got two basic choices as far as I see it; sneakers, for running extra fast, or boots for durability.  Depends on your style, I guess.",
     "You don't really need to wear gloves most of the time, but once in a while they'll really come in handy.",
     "I wish I could still use those rollerblades.  I would be so fast.  But I took an arrow to the knee, and all that.",
     "It's good to keep a filter mask or gas mask handy.  You never know when you'll have to go into a smoke-filled room or something.",
-    "There's basically no reason not to wear safety glasses... nothing is worse than taking a hit to the eyes and getting blinded for a few seconds.",
+    "There's basically no reason not to wear safety glasses… nothing is worse than taking a hit to the eyes and getting blinded for a few seconds.",
     "Ski goggles are a great choice if you're worried about getting stuff in your eyes.  Perfect for dealing with boomers!",
     "If you get a pair of night vision goggles, hold on to them!  A flashlight will give you away, but with goggles you can be sneaky.  Beware that some types of zombies are camouflaged against it, and require proper light to be visible.",
     "I know they look dumb, but wearing a fanny pack gives you that extra bit of storage without encumbering you.",
@@ -92,7 +92,7 @@
     "I've found more good weapons in hardware stores than anywhere else.  Except gun stores, of course.",
     "Liquor stores are a great place to pick up non-alcoholic beverages, too.  Not that I mind alcohol!",
     "Most gun stores follow pretty similar layouts.  The restricted stuff - SMGs, assault rifles, and most importantly ammo - are always behind the counter.",
-    "I've spent many nights in the changing rooms at the back of clothing stores.  Walls on four sides, far from the store's entrance, a corridor for easy defense... it's perfect!",
+    "I've spent many nights in the changing rooms at the back of clothing stores.  Walls on four sides, far from the store's entrance, a corridor for easy defense… it's perfect!",
     "If you're getting chased by a hoard of zombies, try ducking into the subways and traveling a block or two, then coming back up.",
     "Have you seen those weird science labs out in the middle of nowhere?  I think you need some kind of special ID card to get in.",
     "I have a dream of raiding a military bunker, but I well know that good protection plus zombie soldiers are a bad mix.  The sheer thought of being sprayed with bullets by a turret is giving me the shivers.",
@@ -112,14 +112,14 @@
     "Boil first, then drink.  Ten men caravan once drank from a spring, and they are now known as a three man caravan.",
     "I've once seen a full duffel bag pass hands five times in a week.  Having a lot of stuff is a moot point if you can't run from zombies.",
     "Tim says you can drive a car through a horde of zombies.  Tim is now a zombie.  Any questions?",
-    "They said: go solar, save the environment and yourself.  Well... there is no environment to save now, but one can still save thyself I guess.",
+    "They said: go solar, save the environment and yourself.  Well… there is no environment to save now, but one can still save thyself I guess.",
     "If you can't find a knife try smashing potted plants.  It just might give you everything you need to make one.",
     "What's the difference between a good and a bad choke point?  The good one has another back door behind you.",
-    "So, methinks: if you could convince the cop-bots that you are their superior...",
+    "So, methinks: if you could convince the cop-bots that you are their superior…",
     "You'd be surprised how many items can be disassembled into their components.  A guy around here, McSomething whatever his name is, is a master at this.",
     "A soldering iron can be an aspiring mechanics' best friend.  You can also cauterize a wound with it, but as many people died as lived from that treatment, so I guess it's a last resort.",
     "I've seen some folks running with freshly installed CBMs.  That means there is a way to get them from places other than ransacked shops.  Maybe that explains those cut-up bodies I've seen around.",
-    "I'm fed up with smoked meat, but it lasts so long.  Well... if I had more heart for learning cooking I guess I'd be able to diversify my food without sacrificing its shelf life.",
+    "I'm fed up with smoked meat, but it lasts so long.  Well… if I had more heart for learning cooking I guess I'd be able to diversify my food without sacrificing its shelf life.",
     "Tricky Joe was hanged for his inventive ways of killing zombies.  Yeah, burning down a building to smoke few hordes is ok, but burning a whole town with all the loot certainly is not.",
     "Mr Tombstone always said: take nothing with you for the raids, save the space for loot.  He was known as Joe then and he rightfully earned his nickname as the first tombstone 'owner' around this place.",
     "When the whole town is one big supermarket a shopping cart becomes your best friend.",
@@ -128,13 +128,13 @@
     "Not sure if Mike is sane any more.  He was unfortunate enough to be driven in to a school one time.  This experience broke more than his ribs then.",
     "A thought about explosives.  If you can still run and it did not went boom yet, run some more.  There is no such thing as excess space between you and a stick of dynamite.",
     "Avoid using launchers in narrow hallways, you might miss.",
-    "Met a mad chemist once.  She made a battery from a potato... or was it lemon?",
+    "Met a mad chemist once.  She made a battery from a potato… or was it lemon?",
     "Police brutality lives on it seems.  It's just more mechanical now, with all the cops dead and cop robots roaming free on the loose.  If you'll get arrested who will give you justice?  A zombie judge?  Will they put you in a zombie prison?  No thanks, I'll pass.",
     "Is it dead yet?  How can you tell if it was dead before and it's dead now?  I prefer asking: are?  *smash*  you?  *smash*  dead?  *smash*  yet?  *smash smash smash*",
     "I hear there's strange big berries around, but why don't I hear first hand if they are filling for their size or not?",
-    "I've heard of a gang called The Doctors. You know, bank robbers wearing stethoscopes.  What are they trying to achieve?  I use paper money to start fires now.",
+    "I've heard of a gang called The Doctors.  You know, bank robbers wearing stethoscopes.  What are they trying to achieve?  I use paper money to start fires now.",
     "You can hole up on a roof if you need to.  Yeah, the rain will fall on your head, but it's harder for the dead to get you there.  Get a tent, a rollmat, a sleeping bag and you're set.",
-    "I thought about putting a bag on my dog to carry some of my stuff.  It didn't work, because it was a chihuahua, and it was eaten by a rottweiler.  Should have put some kevlar on it like those Z9.  Oh well...",
+    "I thought about putting a bag on my dog to carry some of my stuff.  It didn't work, because it was a chihuahua, and it was eaten by a rottweiler.  Should have put some kevlar on it like those Z9.  Oh well…",
     "Stuff from zombies is filthy but perfectly fine otherwise.  Using soap or other detergents won't hurt you.  Quick wash and you're equipped for days.",
     "Civilization has made a step back in time, so let's learn from the past.  No fridges?  Build a root cellar or keep food cool in the basement.  No guns?  Make a pointy stick or a cudgel, and work from there.  The end of the world is not the end, it seems.",
     "Hey, if you happen to find a set of two two-way radios, give one to me and we will be able to talk while being away from each other.",
@@ -154,7 +154,7 @@
     "A friend of mine was a hunter and told me, that if you field dress a corpse, it will stay fresh a bit longer.",
     "Look at the sky before you go for adventure.  You will know what weather to expect.  It's nothing compared to the old meteorology and satellite pictures, but at least you may know if you need the umbrella.",
     "Be extra careful on roads.  They are easy to travel on, but occasional minefield or a road block can make you feel sorry in an instant.  I've even seen a tank once.  I ran away like never before.",
-    "I know it's not best of times, but try to sleep well.  You're not yourself if you're sleep deprived.  Grab a pillow and a blanket. If you can't, even a teddy bear under your head and a pile of clothes to keep you warm can make a difference.  And pick a spot well, even a chair or a bench is better than a cold ground.",
+    "I know it's not best of times, but try to sleep well.  You're not yourself if you're sleep deprived.  Grab a pillow and a blanket.  If you can't, even a teddy bear under your head and a pile of clothes to keep you warm can make a difference.  And pick a spot well, even a chair or a bench is better than a cold ground.",
     "There are two ways of throwing grenades.  The smart one is throwing from behind a corner.  The less smart one involves getting shot while throwing in the open and being torn apart by the resulting explosion."
   ]
 }
diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json
index 4df523369e68c..77a499198fd45 100644
--- a/data/json/npcs/items_generic.json
+++ b/data/json/npcs/items_generic.json
@@ -497,7 +497,7 @@
       [ "diveknife", 1 ],
       [ "diving_watch", 1 ],
       [ "dog_whistle", 3 ],
-      { "item": "dogfood", "prob": 3, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 3, "container-item": "can_medium" },
       [ "doublespeargun", 1 ],
       [ "drink_boozeberry", 1 ],
       [ "drink_rumcola", 1 ],
diff --git a/data/json/npcs/npc.json b/data/json/npcs/npc.json
index 8be2d3fd8fec7..038da474ab041 100644
--- a/data/json/npcs/npc.json
+++ b/data/json/npcs/npc.json
@@ -72,7 +72,7 @@
     "//": "Foodperson mascot, except if you ask them Foodperson is a real hero and it's them!",
     "name_unique": "Foodperson",
     "class": "NC_TRUE_FOODPERSON",
-    "attitude": 7,
+    "attitude": 0,
     "mission": 7,
     "chat": "TALK_TRUE_FOODPERSON",
     "mission_offered": "MISSION_PROVE_YOUR_WORTH",
diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json b/data/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json
index 5dd39f169c446..b0371b9b63a40 100644
--- a/data/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json
+++ b/data/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json
@@ -10,7 +10,7 @@
     "attitude": 0,
     "mission": 3,
     "chat": "TALK_ARSONIST",
-    "faction": "wasteland_scavengers"
+    "faction": "no_faction"
   },
   {
     "type": "talk_topic",
diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_hunter.json b/data/json/npcs/refugee_center/surface_visitors/NPC_hunter.json
index 66ba8fe6d5661..b6738c7bd8da1 100644
--- a/data/json/npcs/refugee_center/surface_visitors/NPC_hunter.json
+++ b/data/json/npcs/refugee_center/surface_visitors/NPC_hunter.json
@@ -8,7 +8,7 @@
     "attitude": 0,
     "mission": 7,
     "chat": "TALK_EVAC_HUNTER",
-    "faction": "wasteland_scavengers"
+    "faction": "no_faction"
   },
   {
     "id": "TALK_EVAC_HUNTER",
diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json
index a854201ed0147..65418f387d086 100644
--- a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json
+++ b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json
@@ -8,7 +8,7 @@
     "attitude": 0,
     "mission": 7,
     "chat": "TALK_SCAVENGER_MERC",
-    "faction": "wasteland_scavengers"
+    "faction": "no_faction"
   },
   {
     "type": "npc_class",
diff --git a/data/json/npcs/talk_tags.json b/data/json/npcs/talk_tags.json
index 9098630d46e82..6384cc419db6d 100644
--- a/data/json/npcs/talk_tags.json
+++ b/data/json/npcs/talk_tags.json
@@ -9,8 +9,8 @@
       "Thorazine is bad for you, you know.",
       "Thorazine is poison.",
       "You don't need thorazine, it's limiting you.",
-      "Thorazine... That's what 'they' use to keep you tame.",
-      "Don't. This thorazine seriously clouds your mind. You need to stay sharp."
+      "Thorazine…  That's what 'they' use to keep you tame.",
+      "Don't.  This thorazine seriously clouds your mind.  You need to stay sharp."
     ]
   },
   {
@@ -18,13 +18,13 @@
     "category": "<yes_to_lsd>",
     "//": "Hallucinatry NPCs say these things to encourage the avatar to extend the hallucination",
     "text": [
-      "Pink tablets! I love those!",
+      "Pink tablets!  I love those!",
       "Hey there's some pink tablets, take some!",
       "Look, some LSD, let's play cataclysm: fun times ahead!",
       "Say yes to LSD, say yes to Fun!",
       "Perfect, those pink tablets will keep us going, take some!",
-      "You know what would make all this more bearable? Pink Tablets!",
-      "An odd pink tablet from the ground? I don't see why not!",
+      "You know what would make all this more bearable?  Pink Tablets!",
+      "An odd pink tablet from the ground?  I don't see why not!",
       "Finally, something to take the edge off."
     ]
   },
@@ -35,7 +35,7 @@
     "text": [
       "No thanks, I'm good.",
       "I don't want to trade with you.",
-      "I have the best stuff. And I'm keeping it!",
+      "I have the best stuff.  And I'm keeping it!",
       "No trading, that's my rule.",
       "I'm not interested.",
       "How about no?",
@@ -53,7 +53,7 @@
       "I have better things to do.",
       "I'll pass, it's too much work.",
       "Who put you in charge of what I do?",
-      "Great idea! Call me when you find SOMEONE ELSE to do it.",
+      "Great idea!  Call me when you find SOMEONE ELSE to do it.",
       "Not exactly the settlin' type."
     ]
   },
@@ -130,13 +130,13 @@
       "When we drinkin'?",
       "When was the last time I had a drink?",
       "I'm parched, I need to drink something.",
-      "I'm thirsty...",
+      "I'm thirsty…",
       "I'm <very> thirsty.",
       "I'm <swear> thirsty.",
       "Can you give me something to drink, <name_g>?",
       "I <really> need to get some water.",
       "<ill_die> if I don't drink something.",
-      "Water... Is there an oasis nearby?",
+      "Water…  Is there an oasis nearby?",
       "Did you know that lack of water kills faster than lack of rest?",
       "I'd kill for a sip of water right now."
     ]
@@ -149,8 +149,8 @@
       "Yeah sure, can't help but notice you got beer with you!  Let's crack a cold one and chat, <name_g>, how goes it?",
       "Oh definitely, how about one of those beers I see on you?  What's up anyway?",
       "Yeah you share those beers I see you hoarding and then we chat all you like!  Only joking, what's up <name_g>?",
-      "Hey <name_g>, I bet a chat would be all the sweeter with a nice, cold beer in hand. How's it going?",
-      "While we chat, what say you we open a beer and just... pretend the world isn't ending, just for a while?"
+      "Hey <name_g>, I bet a chat would be all the sweeter with a nice, cold beer in hand.  How's it going?",
+      "While we chat, what say you we open a beer and just… pretend the world isn't ending, just for a while?"
     ]
   },
   {
@@ -169,9 +169,9 @@
       "Always ready for a good chat!  But why, you OK?",
       "OK <name_g>, we should get to know each other, how are you coping?",
       "Definitely, I'm game.  How you holding up?",
-      "Good idea <name_g>. Let's forget the world for a while. How you doin'?",
-      "Ah, what the heck. How's life been treating you?",
-      "Sure. So, how about that weather ey?"
+      "Good idea <name_g>.  Let's forget the world for a while.  How you doin'?",
+      "Ah, what the heck.  How's life been treating you?",
+      "Sure.  So, how about that weather ey?"
     ]
   },
   {
@@ -210,9 +210,9 @@
       "unhappy",
       "<very> <sad>",
       "dejected",
-      "down",
+      { "text": { "ctxt": "<sad>", "str": "down" } },
       "glum",
-      "blue",
+      { "text": { "ctxt": "<sad>", "str": "blue" } },
       "dismal",
       "sorrowful",
       "despondent"
@@ -244,7 +244,7 @@
     "//": "Generally emphatic negative responses to a request or command",
     "text": [
       "never",
-      "no",
+      { "text": { "ctxt": "<no>", "str": "no" } },
       "not gonna happen",
       "not happening",
       "over my dead body",
@@ -276,7 +276,7 @@
       "Bye bye, <name_b>!",
       "See you later, alligator.",
       "Our paths must part, for now at least.",
-      "There's something I gotta do on my own. Sorry."
+      "There's something I gotta do on my own.  Sorry."
     ]
   },
   {
@@ -366,7 +366,7 @@
       "I prefer to work uninhibited by that kind of connection.",
       "I haven't found one that's good enough for me.",
       "I don't belong to a faction, <name_g>.",
-      "I'm currently not under any contract. Why, you hiring?"
+      "I'm currently not under any contract.  Why, you hiring?"
     ]
   },
   {
@@ -426,7 +426,7 @@
       "When we sleepin'?",
       "*Yawn*",
       "What time is it?",
-      "I'm tired...",
+      "I'm tired…",
       "I'm <very> tired.",
       "I'm <swear> tired.",
       "Can we rest for a while, <name_g>?",
@@ -434,9 +434,9 @@
       "<ill_die> if we don't stop for a moment.",
       "Did you know that lack of rest kills faster than lack of food?",
       "I'll just go to sleep, <okay>?",
-      "I just...gotta close my eyes for a bit, okay?",
+      "I just… gotta close my eyes for a bit, okay?",
       "Can't remember the last time I had a proper kip.",
-      "I can't keep going for long <name_g>. I need some rest, bad."
+      "I can't keep going for long <name_g>.  I need some rest, bad."
     ]
   },
   {
@@ -450,7 +450,7 @@
       "Time for bed!  See you in the morning.",
       "There's a bed calling my name, and I'm going to it.",
       "Good night!  Wake me if you need me.",
-      "Calling it a night for now. You get some rest too, okay?"
+      "Calling it a night for now.  You get some rest too, okay?"
     ]
   },
   {
@@ -488,7 +488,19 @@
     "type": "snippet",
     "category": "<okay>",
     "//": "General terms of acknowledgement for an order",
-    "text": [ "fine", "okay", "get it", "you dig", "dig", "got it", "you see", "see, <name_g>", "alright", "that clear", "capiche" ]
+    "text": [
+      { "text": { "ctxt": "<okay>", "str": "fine" } },
+      { "text": { "ctxt": "<okay>", "str": "okay" } },
+      "get it",
+      "you dig",
+      { "text": { "ctxt": "<okay>", "str": "dig" } },
+      "got it",
+      "you see",
+      "see, <name_g>",
+      "alright",
+      "that clear",
+      "capiche"
+    ]
   },
   {
     "type": "snippet",
@@ -539,12 +551,12 @@
       "See you later, <name_b>!",
       "See you in hell, <name_b>!",
       "Hasta luego, <name_g>!",
-      "I'm outta here! <done_mugging>",
+      "I'm outta here!  <done_mugging>",
       "Bye bye, <name_b>!",
       "Thanks, <name_g>!",
       "Pleasure doing business with you.",
       "Now beat it, you <name_b>.",
-      "Good haul. See you around<punc>"
+      "Good haul.  See you around<punc>"
     ]
   },
   {
@@ -552,17 +564,17 @@
     "category": "<witnessed_thievery>",
     "//": "Warning from non-hostile NPCs when the player steals something.",
     "text": [
-      "Hey! I <swear> saw you take that <name_b>! Drop it. Now.",
+      "Hey!  I <swear> saw you take that <name_b>!  Drop it.  Now.",
       "You best be dropping what you just picked up right now <name_b>.",
       "I've got eyes, you <swear> <name_b> thief!",
-      "Hey! That belongs to us! Drop it.",
+      "Hey!  That belongs to us!  Drop it.",
       "<swear>, I've seen a <swear> thief!",
-      "I saw that! Drop what you just stole!",
+      "I saw that!  Drop what you just stole!",
       "Thieves will not last long around me <name_g>, please drop that.",
       "Consider this a warning <name_b>, thieves will not be tolerated, drop it.",
-      "You think I'm <swear> blind <name_b>? Don't touch our stuff.",
+      "You think I'm <swear> blind <name_b>?  Don't touch our stuff.",
       "You have one chance to put it back.",
-      "Return the stolen goods. You have to the count of three to comply.",
+      "Return the stolen goods.  You have to the count of three to comply.",
       "You're not leaving here with stolen goods, <name_g>."
     ]
   },
@@ -601,8 +613,8 @@
       "Drop your <swear> weapon, <name_b>!",
       "Put down your <yrwp>!",
       "Alright, drop the <yrwp>!",
-      "Please put down your weapon. I'll give you to the count of three. One...",
-      "Let's take it easy now, okay? Put the weapon down."
+      "Please put down your weapon.  I'll give you to the count of three.  One…",
+      "Let's take it easy now, okay?  Put the weapon down."
     ]
   },
   {
@@ -638,7 +650,7 @@
       "Wait up, <okay>?",
       "Let's talk, <name_g>!",
       "Look, <name_g><punc> let's talk!",
-      "Hey, what's the rush? Let's chat a tad."
+      "Hey, what's the rush?  Let's chat a tad."
     ]
   },
   {
@@ -688,7 +700,7 @@
       "When we eatin'?",
       "I'd eat a burger if I had one.",
       "Perfect time for a lunch break.",
-      "I'm hungry...",
+      "I'm hungry…",
       "I'm <very> hungry.",
       "I'm <swear> hungry.",
       "So, <name_g>, when we eatin'?",
@@ -767,7 +779,7 @@
       "I <really> need to get some distance.",
       "Fire in the hole, motherfuckers!",
       "Bombs away!",
-      "Shrapnel, incoming! Watch it!",
+      "Shrapnel, incoming!  Watch it!",
       "Making some noise!",
       "Hit the deck!"
     ]
@@ -784,7 +796,7 @@
       "<swear!>, I'm doomed!  There's a <swear> <swear>",
       "<swear!>, here comes a <swear>",
       "Incoming!",
-      "Prepare yourself! We have a",
+      "Prepare yourself!  We have a",
       "<swear>"
     ]
   },
@@ -872,7 +884,7 @@
       "How do we get out of here?",
       "Is that the last of them?",
       "I'd kill for a coke.",
-      "Weapons check everyone. There may be more.",
+      "Weapons check everyone.  There may be more.",
       "That's that, then.",
       "That's the last of them for now.",
       "Clearing the world, one <name_b> at a time",
@@ -968,8 +980,8 @@
       "These bandages ain't much, but they will do for now.",
       "Hold up, gotta plug this hole in me.",
       "Watch my back while I stitch my arm back on <name_g>.",
-      "Gotta bandage this or I'll bleed out. Give me a sec.",
-      "I ain't got time to ble-wait, that's a lot of blood. Give me a second while I patch this."
+      "Gotta bandage this or I'll bleed out.  Give me a sec.",
+      "I ain't got time to ble-wait, that's a lot of blood.  Give me a second while I patch this."
     ]
   },
   {
@@ -1032,7 +1044,7 @@
     "category": "<weed_smoke>",
     "//": "Complaint when the NPC is near the avatar who is smoking marijuana.",
     "text": [
-      "Whew... smells like skunk!",
+      "Whew… smells like skunk!",
       "Man, that smells like some good shit!",
       "Hey, don't bogart the joint!",
       "C'mon, <name_g>, I can smell it, pass it over.",
@@ -1050,14 +1062,14 @@
     "category": "<meth_smoke>",
     "//": "Complaint when the NPC is near the avatar who is smoking meth.",
     "text": [
-      "I don't know... should you really be smoking that stuff?",
+      "I don't know… should you really be smoking that stuff?",
       "<name_g>, that's going to ruin your nose.",
       "Man, that stinks.  Put it out!",
       "You're going to kill yourself smoking that stuff, <name_g>.",
-      "Oh, wow, that smell... Can I have some?",
+      "Oh, wow, that smell…  Can I have some?",
       "Are you sure it's a good idea to smoke that now?",
       "I smell heresy.",
-      "Seriously? You're smoking that?",
+      "Seriously?  You're smoking that?",
       "Well that's one way to guarantee the zombies don't kill you.",
       "Come on <name_g>, you're better than this."
     ]
@@ -1076,7 +1088,7 @@
       "I need some batteries to power my CBMs.",
       "I can't recharge my CBMs without some batteries.",
       "Hey, <name_g>, can I get some batteries here?  I need to recharge.",
-      "Internal batteries running low. How many batteries can you spare right now?",
+      "Internal batteries running low.  How many batteries can you spare right now?",
       "I can do a lot more for you if you pass me a couple batteries to recharge.",
       "All these implants I got are going to turn to useless scrap real soon if I don't get some batteries to recharge."
     ]
@@ -1084,14 +1096,12 @@
   {
     "type": "snippet",
     "category": "<need_booze>",
-    "//": "NPC complaint when they are low on CBM power and have an ethanol burner system.  Additional versions should continue to specify that the NPC needs alcohol and they need them to recharge their power CBMs.",
+    "//": "NPC complaint when they are low on CBM power and have an ethanol burner system.  Additional versions should continue to specify that the NPC needs ethanol or methanol and they need them to recharge their power CBMs.",
     "text": [
-      "Pass me a beer, I need to power my ethanol burner.",
-      "Ethanol burners!  The power source that's fun to recharge.  Get me a drink, please!",
+      "Pass some ethanol, I need to power my ethanol burner.",
       "Waiter!  I need a refill, my ethanol burner is running out of charge!",
-      "I require ethanol-based drinks for my internal power supply. Anything on you?",
-      "Got any alcohol to spare? Need to recharge my drives. Mead, if you have any.",
-      "This ethanol-burning power supply is the best implant I ever got. Speaking of which, got some booze to top me off?"
+      "I require ethanol for my internal power supply.  Anything on you?",
+      "Got any alcohol to spare?  Need to recharge my drives.  Methanol, would do."
     ]
   },
   {
@@ -1150,8 +1160,8 @@
       "Let's talk about something else.",
       "Let's change the subject.",
       "I'd like to ask you about something else.",
-      "Moving on...",
-      "Anyway..."
+      "Moving on…",
+      "Anyway…"
     ]
   },
   {
@@ -1162,10 +1172,10 @@
       "We should probably get going.",
       "We'd better get moving.",
       "Let's head out.",
-      "Time's a-wasting. Let's head out.",
+      "Time's a-wasting.  Let's head out.",
       "Come on. We got stuff to do.",
       "Let's hit the road.",
-      "We'll pick this up another time. Let's go.",
+      "We'll pick this up another time.  Let's go.",
       "Let's put a pin in this chat for now.",
       "Talk to you later."
     ]
@@ -1256,7 +1266,7 @@
       "Me go, you stay.",
       "Not that way!  Go left!",
       "<move>!",
-      "Retreat! Retreat!",
+      "Retreat!  Retreat!",
       "Book it!",
       "Leg it!",
       "Thank fuck for all the cardio!"
@@ -1281,7 +1291,7 @@
       "Call the fire department!  Wait, they're dead!  Run away!",
       "This place is on fire.  I'm leaving.",
       "Put the fire out!  Put it out!",
-      "Fire bad! <move>!",
+      "Fire bad!  <move>!",
       "Fire, fire, FIRE!",
       "Get an extinguisher!",
       "Danger hot!"
diff --git a/data/json/obsolete.json b/data/json/obsolete.json
index c5e79acf48fab..6671b6357e6bb 100644
--- a/data/json/obsolete.json
+++ b/data/json/obsolete.json
@@ -43,7 +43,7 @@
     "name": "Internal Furnace",
     "description": "When this bionic is active, you can burn nearly any organic material as fuel (use 'E'), recharging your power level.  Some materials will burn better than others.",
     "occupied_bodyparts": [ [ "TORSO", 40 ] ],
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
   },
   {
     "id": "bio_storage",
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
index 586b5a93d896f..d3f3460264f36 100644
--- a/data/json/overmap/multitile_city_buildings.json
+++ b/data/json/overmap/multitile_city_buildings.json
@@ -840,7 +840,7 @@
   },
   {
     "type": "city_building",
-    "id": "hotel",
+    "id": "hotel_1",
     "locations": [ "land" ],
     "overmaps": [
       { "point": [ 1, 0, 0 ], "overmap": "road_end_north" },
@@ -848,11 +848,123 @@
       { "point": [ 1, 1, 0 ], "overmap": "hotel_tower_1_2_north" },
       { "point": [ 2, 1, 0 ], "overmap": "hotel_tower_1_1_north" },
       { "point": [ 0, 2, 0 ], "overmap": "hotel_tower_1_6_north" },
+      { "point": [ 0, 2, 1 ], "overmap": "hotel_tower_flr2_1_6_north" },
+      { "point": [ 0, 2, 2 ], "overmap": "hotel_tower_flr3_1_6_north" },
+      { "point": [ 0, 2, 3 ], "overmap": "hotel_tower_flr4_1_6_north" },
+      { "point": [ 0, 2, 4 ], "overmap": "hotel_tower_roof_1_6_north" },
       { "point": [ 1, 2, 0 ], "overmap": "hotel_tower_1_5_north" },
+      { "point": [ 1, 2, 1 ], "overmap": "hotel_tower_flr2_1_5_north" },
+      { "point": [ 1, 2, 2 ], "overmap": "hotel_tower_flr3_1_5_north" },
+      { "point": [ 1, 2, 3 ], "overmap": "hotel_tower_flr4_1_5_north" },
+      { "point": [ 1, 2, 4 ], "overmap": "hotel_tower_roof_1_5_north" },
       { "point": [ 2, 2, 0 ], "overmap": "hotel_tower_1_4_north" },
+      { "point": [ 2, 2, 1 ], "overmap": "hotel_tower_flr2_1_4_north" },
+      { "point": [ 2, 2, 2 ], "overmap": "hotel_tower_flr3_1_4_north" },
+      { "point": [ 2, 2, 3 ], "overmap": "hotel_tower_flr4_1_4_north" },
+      { "point": [ 2, 2, 4 ], "overmap": "hotel_tower_roof_1_4_north" },
       { "point": [ 0, 3, 0 ], "overmap": "hotel_tower_1_9_north" },
+      { "point": [ 0, 3, 1 ], "overmap": "hotel_tower_flr2_1_9_north" },
+      { "point": [ 0, 3, 2 ], "overmap": "hotel_tower_flr3_1_9_north" },
+      { "point": [ 0, 3, 3 ], "overmap": "hotel_tower_flr4_1_9_north" },
+      { "point": [ 0, 3, 4 ], "overmap": "hotel_tower_roof_1_9_north" },
       { "point": [ 1, 3, 0 ], "overmap": "hotel_tower_1_8_north" },
+      { "point": [ 1, 3, 1 ], "overmap": "hotel_tower_flr2_1_8_north" },
+      { "point": [ 1, 3, 2 ], "overmap": "hotel_tower_flr3_1_8_north" },
+      { "point": [ 1, 3, 3 ], "overmap": "hotel_tower_flr4_1_8_north" },
+      { "point": [ 1, 3, 4 ], "overmap": "hotel_tower_roof_1_8_north" },
       { "point": [ 2, 3, 0 ], "overmap": "hotel_tower_1_7_north" },
+      { "point": [ 2, 3, 1 ], "overmap": "hotel_tower_flr2_1_7_north" },
+      { "point": [ 2, 3, 2 ], "overmap": "hotel_tower_flr3_1_7_north" },
+      { "point": [ 2, 3, 3 ], "overmap": "hotel_tower_flr4_1_7_north" },
+      { "point": [ 2, 3, 4 ], "overmap": "hotel_tower_roof_1_7_north" },
+      { "point": [ 0, 3, -1 ], "overmap": "hotel_tower_b_3_north" },
+      { "point": [ 1, 3, -1 ], "overmap": "hotel_tower_b_2_north" },
+      { "point": [ 2, 3, -1 ], "overmap": "hotel_tower_b_1_north" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "hotel_2",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 1, 0, 0 ], "overmap": "road_end_north" },
+      { "point": [ 0, 1, 0 ], "overmap": "hotel_tower_1_3_north" },
+      { "point": [ 1, 1, 0 ], "overmap": "hotel_tower_1_2_north" },
+      { "point": [ 2, 1, 0 ], "overmap": "hotel_tower_1_1_north" },
+      { "point": [ 0, 2, 0 ], "overmap": "hotel_tower_1_6_north" },
+      { "point": [ 0, 2, 1 ], "overmap": "hotel_tower_flr2_1_6_north" },
+      { "point": [ 0, 2, 2 ], "overmap": "hotel_tower_flr3_1_6_north" },
+      { "point": [ 0, 2, 3 ], "overmap": "hotel_tower_flr4_1_6_north" },
+      { "point": [ 0, 2, 4 ], "overmap": "hotel_tower_roof_1_6_north" },
+      { "point": [ 1, 2, 0 ], "overmap": "hotel_tower_1_5B_north" },
+      { "point": [ 1, 2, 1 ], "overmap": "hotel_tower_flr2_1_5B_north" },
+      { "point": [ 1, 2, 2 ], "overmap": "hotel_tower_flr3_1_5_north" },
+      { "point": [ 1, 2, 3 ], "overmap": "hotel_tower_flr4_1_5_north" },
+      { "point": [ 1, 2, 4 ], "overmap": "hotel_tower_roof_1_5_north" },
+      { "point": [ 2, 2, 0 ], "overmap": "hotel_tower_1_4_north" },
+      { "point": [ 2, 2, 1 ], "overmap": "hotel_tower_flr2_1_4_north" },
+      { "point": [ 2, 2, 2 ], "overmap": "hotel_tower_flr3_1_4_north" },
+      { "point": [ 2, 2, 3 ], "overmap": "hotel_tower_flr4_1_4_north" },
+      { "point": [ 2, 2, 4 ], "overmap": "hotel_tower_roof_1_4_north" },
+      { "point": [ 0, 3, 0 ], "overmap": "hotel_tower_1_9_north" },
+      { "point": [ 0, 3, 1 ], "overmap": "hotel_tower_flr2_1_9_north" },
+      { "point": [ 0, 3, 2 ], "overmap": "hotel_tower_flr3_1_9_north" },
+      { "point": [ 0, 3, 3 ], "overmap": "hotel_tower_flr4_1_9_north" },
+      { "point": [ 0, 3, 4 ], "overmap": "hotel_tower_roof_1_9_north" },
+      { "point": [ 1, 3, 0 ], "overmap": "hotel_tower_1_8_north" },
+      { "point": [ 1, 3, 1 ], "overmap": "hotel_tower_flr2_1_8_north" },
+      { "point": [ 1, 3, 2 ], "overmap": "hotel_tower_flr3_1_8_north" },
+      { "point": [ 1, 3, 3 ], "overmap": "hotel_tower_flr4_1_8_north" },
+      { "point": [ 1, 3, 4 ], "overmap": "hotel_tower_roof_1_8_north" },
+      { "point": [ 2, 3, 0 ], "overmap": "hotel_tower_1_7_north" },
+      { "point": [ 2, 3, 1 ], "overmap": "hotel_tower_flr2_1_7_north" },
+      { "point": [ 2, 3, 2 ], "overmap": "hotel_tower_flr3_1_7_north" },
+      { "point": [ 2, 3, 3 ], "overmap": "hotel_tower_flr4_1_7_north" },
+      { "point": [ 2, 3, 4 ], "overmap": "hotel_tower_roof_1_7_north" },
+      { "point": [ 0, 3, -1 ], "overmap": "hotel_tower_b_3_north" },
+      { "point": [ 1, 3, -1 ], "overmap": "hotel_tower_b_2_north" },
+      { "point": [ 2, 3, -1 ], "overmap": "hotel_tower_b_1_north" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "hotel_3",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 1, 0, 0 ], "overmap": "road_end_north" },
+      { "point": [ 0, 1, 0 ], "overmap": "hotel_tower_1_3_north" },
+      { "point": [ 1, 1, 0 ], "overmap": "hotel_tower_1_2_north" },
+      { "point": [ 2, 1, 0 ], "overmap": "hotel_tower_1_1_north" },
+      { "point": [ 0, 2, 0 ], "overmap": "hotel_tower_1_6_north" },
+      { "point": [ 0, 2, 1 ], "overmap": "hotel_tower_flr2_1_6_north" },
+      { "point": [ 0, 2, 2 ], "overmap": "hotel_tower_flr3_1_6_north" },
+      { "point": [ 0, 2, 3 ], "overmap": "hotel_tower_flr4_1_6_north" },
+      { "point": [ 0, 2, 4 ], "overmap": "hotel_tower_roof_1_6_north" },
+      { "point": [ 1, 2, 0 ], "overmap": "hotel_tower_1_5C_north" },
+      { "point": [ 1, 2, 1 ], "overmap": "hotel_tower_flr2_1_5C_north" },
+      { "point": [ 1, 2, 2 ], "overmap": "hotel_tower_flr3_1_5_north" },
+      { "point": [ 1, 2, 3 ], "overmap": "hotel_tower_flr4_1_5_north" },
+      { "point": [ 1, 2, 4 ], "overmap": "hotel_tower_roof_1_5_north" },
+      { "point": [ 2, 2, 0 ], "overmap": "hotel_tower_1_4_north" },
+      { "point": [ 2, 2, 1 ], "overmap": "hotel_tower_flr2_1_4_north" },
+      { "point": [ 2, 2, 2 ], "overmap": "hotel_tower_flr3_1_4_north" },
+      { "point": [ 2, 2, 3 ], "overmap": "hotel_tower_flr4_1_4_north" },
+      { "point": [ 2, 2, 4 ], "overmap": "hotel_tower_roof_1_4_north" },
+      { "point": [ 0, 3, 0 ], "overmap": "hotel_tower_1_9_north" },
+      { "point": [ 0, 3, 1 ], "overmap": "hotel_tower_flr2_1_9_north" },
+      { "point": [ 0, 3, 2 ], "overmap": "hotel_tower_flr3_1_9_north" },
+      { "point": [ 0, 3, 3 ], "overmap": "hotel_tower_flr4_1_9_north" },
+      { "point": [ 0, 3, 4 ], "overmap": "hotel_tower_roof_1_9_north" },
+      { "point": [ 1, 3, 0 ], "overmap": "hotel_tower_1_8_north" },
+      { "point": [ 1, 3, 1 ], "overmap": "hotel_tower_flr2_1_8_north" },
+      { "point": [ 1, 3, 2 ], "overmap": "hotel_tower_flr3_1_8_north" },
+      { "point": [ 1, 3, 3 ], "overmap": "hotel_tower_flr4_1_8_north" },
+      { "point": [ 1, 3, 4 ], "overmap": "hotel_tower_roof_1_8_north" },
+      { "point": [ 2, 3, 0 ], "overmap": "hotel_tower_1_7_north" },
+      { "point": [ 2, 3, 1 ], "overmap": "hotel_tower_flr2_1_7_north" },
+      { "point": [ 2, 3, 2 ], "overmap": "hotel_tower_flr3_1_7_north" },
+      { "point": [ 2, 3, 3 ], "overmap": "hotel_tower_flr4_1_7_north" },
+      { "point": [ 2, 3, 4 ], "overmap": "hotel_tower_roof_1_7_north" },
       { "point": [ 0, 3, -1 ], "overmap": "hotel_tower_b_3_north" },
       { "point": [ 1, 3, -1 ], "overmap": "hotel_tower_b_2_north" },
       { "point": [ 2, 3, -1 ], "overmap": "hotel_tower_b_1_north" }
@@ -1567,14 +1679,23 @@
     "locations": [ "land" ],
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "movietheater_0_0_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "movietheater_roof_0_0_north" },
       { "point": [ 1, 0, 0 ], "overmap": "movietheater_1_0_north" },
+      { "point": [ 1, 0, 1 ], "overmap": "movietheater_roof_1_0_north" },
       { "point": [ 2, 0, 0 ], "overmap": "movietheater_2_0_north" },
+      { "point": [ 2, 0, 1 ], "overmap": "movietheater_roof_2_0_north" },
       { "point": [ 0, 1, 0 ], "overmap": "movietheater_0_1_north" },
+      { "point": [ 0, 1, 1 ], "overmap": "movietheater_roof_0_1_north" },
       { "point": [ 1, 1, 0 ], "overmap": "movietheater_1_1_north" },
+      { "point": [ 1, 1, 1 ], "overmap": "movietheater_roof_1_1_north" },
       { "point": [ 2, 1, 0 ], "overmap": "movietheater_2_1_north" },
+      { "point": [ 2, 1, 1 ], "overmap": "movietheater_roof_2_1_north" },
       { "point": [ 0, 2, 0 ], "overmap": "movietheater_0_2_north" },
+      { "point": [ 0, 2, 1 ], "overmap": "movietheater_roof_0_2_north" },
       { "point": [ 1, 2, 0 ], "overmap": "movietheater_1_2_north" },
-      { "point": [ 2, 2, 0 ], "overmap": "movietheater_2_2_north" }
+      { "point": [ 1, 2, 1 ], "overmap": "movietheater_roof_1_2_north" },
+      { "point": [ 2, 2, 0 ], "overmap": "movietheater_2_2_north" },
+      { "point": [ 2, 2, 1 ], "overmap": "movietheater_roof_2_2_north" }
     ]
   },
   {
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
index a360c4d0d1d16..5114a8e66ba5a 100644
--- a/data/json/overmap/overmap_special/specials.json
+++ b/data/json/overmap/overmap_special/specials.json
@@ -276,7 +276,9 @@
     "id": "Farm_2side",
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "2farm_4_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "2farm_roof_4_north" },
       { "point": [ 1, 0, 0 ], "overmap": "2farm_3_north" },
+      { "point": [ 1, 0, 1 ], "overmap": "2farm_roof_3_north" },
       { "point": [ 2, 0, 0 ], "overmap": "2farm_2_north" },
       { "point": [ 3, 0, 0 ], "overmap": "2farm_1_north" },
       { "point": [ 0, 1, 0 ], "overmap": "2farm_8_north" },
@@ -285,10 +287,12 @@
       { "point": [ 3, 1, 0 ], "overmap": "2farm_5_north" },
       { "point": [ 0, 3, 0 ], "overmap": "2farm_12_north" },
       { "point": [ 1, 3, 0 ], "overmap": "2farm_11_north" },
+      { "point": [ 1, 3, 1 ], "overmap": "2farm_roof_11_north" },
       { "point": [ 2, 3, 0 ], "overmap": "2farm_10_north" },
       { "point": [ 3, 3, 0 ], "overmap": "2farm_9_north" },
       { "point": [ 0, 4, 0 ], "overmap": "2farm_16_north" },
       { "point": [ 1, 4, 0 ], "overmap": "2farm_15_north" },
+      { "point": [ 1, 4, 1 ], "overmap": "2farm_roof_15_north" },
       { "point": [ 2, 4, 0 ], "overmap": "2farm_14_north" },
       { "point": [ 3, 4, 0 ], "overmap": "2farm_13_north" }
     ],
@@ -3595,7 +3599,9 @@
     "id": "junkyard",
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "junkyard_1a_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "junkyard_roof_1a_north" },
       { "point": [ 1, 0, 0 ], "overmap": "junkyard_1b_north" },
+      { "point": [ 1, 0, 1 ], "overmap": "junkyard_roof_1b_north" },
       { "point": [ 0, 1, 0 ], "overmap": "junkyard_2a_north" },
       { "point": [ 1, 1, 0 ], "overmap": "junkyard_2b_north" }
     ],
@@ -3773,14 +3779,23 @@
     "id": "Movie Theater",
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "movietheater_0_0_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "movietheater_roof_0_0_north" },
       { "point": [ 1, 0, 0 ], "overmap": "movietheater_1_0_north" },
+      { "point": [ 1, 0, 1 ], "overmap": "movietheater_roof_1_0_north" },
       { "point": [ 2, 0, 0 ], "overmap": "movietheater_2_0_north" },
+      { "point": [ 2, 0, 1 ], "overmap": "movietheater_roof_2_0_north" },
       { "point": [ 0, 1, 0 ], "overmap": "movietheater_0_1_north" },
+      { "point": [ 0, 1, 1 ], "overmap": "movietheater_roof_0_1_north" },
       { "point": [ 1, 1, 0 ], "overmap": "movietheater_1_1_north" },
+      { "point": [ 1, 1, 1 ], "overmap": "movietheater_roof_1_1_north" },
       { "point": [ 2, 1, 0 ], "overmap": "movietheater_2_1_north" },
+      { "point": [ 2, 1, 1 ], "overmap": "movietheater_roof_2_1_north" },
       { "point": [ 0, 2, 0 ], "overmap": "movietheater_0_2_north" },
+      { "point": [ 0, 2, 1 ], "overmap": "movietheater_roof_0_2_north" },
       { "point": [ 1, 2, 0 ], "overmap": "movietheater_1_2_north" },
-      { "point": [ 2, 2, 0 ], "overmap": "movietheater_2_2_north" }
+      { "point": [ 1, 2, 1 ], "overmap": "movietheater_roof_1_2_north" },
+      { "point": [ 2, 2, 0 ], "overmap": "movietheater_2_2_north" },
+      { "point": [ 2, 2, 1 ], "overmap": "movietheater_roof_2_2_north" }
     ],
     "connections": [ { "point": [ 1, -1, 0 ], "terrain": "road" } ],
     "locations": [ "land" ],
@@ -3984,18 +3999,40 @@
       { "point": [ 1, 1, 0 ], "overmap": "robofachq_surface_b1_north" },
       { "point": [ 2, 1, 0 ], "overmap": "robofachq_surface_b2_north" },
       { "point": [ 3, 1, 0 ], "overmap": "robofachq_surface_b3_north" },
-      { "point": [ 0, 0, -2 ], "overmap": "robofachq_hab_a0_north" },
-      { "point": [ 1, 0, -2 ], "overmap": "robofachq_hab_a1_north" },
-      { "point": [ 2, 0, -2 ], "overmap": "robofachq_hab_a2_north" },
-      { "point": [ 3, 0, -2 ], "overmap": "robofachq_hab_a3_north" },
-      { "point": [ 0, 1, -2 ], "overmap": "robofachq_hab_b0_north" },
-      { "point": [ 1, 1, -2 ], "overmap": "robofachq_hab_b1_north" },
-      { "point": [ 2, 1, -2 ], "overmap": "robofachq_hab_b2_north" },
-      { "point": [ 3, 1, -2 ], "overmap": "robofachq_hab_b3_north" },
-      { "point": [ 0, 0, -4 ], "overmap": "robofachq_sub_a0_north" },
-      { "point": [ 1, 0, -4 ], "overmap": "robofachq_sub_a1_north" },
-      { "point": [ 2, 0, -4 ], "overmap": "robofachq_sub_a2_north" },
-      { "point": [ 3, 0, -4 ], "overmap": "robofachq_sub_a3_north" },
+      { "point": [ 1, -2, -2 ], "overmap": "microlab_sub_connector_north" },
+      { "point": [ 0, -1, -2 ], "overmap": "robofachq_sub_a0_north" },
+      { "point": [ 1, -1, -2 ], "overmap": "robofachq_sub_a1_north" },
+      { "point": [ 2, -1, -2 ], "overmap": "robofachq_sub_a2_north" },
+      { "point": [ 3, -1, -2 ], "overmap": "robofachq_sub_a3_north" },
+      { "point": [ 0, 0, -2 ], "overmap": "robofachq_exe_a0_north" },
+      { "point": [ 1, 0, -2 ], "overmap": "robofachq_exe_a1_north" },
+      { "point": [ 2, 0, -2 ], "overmap": "robofachq_exe_a2_north" },
+      { "point": [ 3, 0, -2 ], "overmap": "robofachq_exe_a3_north" },
+      { "point": [ 0, 1, -2 ], "overmap": "robofachq_exe_b0_north" },
+      { "point": [ 1, 1, -2 ], "overmap": "robofachq_exe_b1_north" },
+      { "point": [ 2, 1, -2 ], "overmap": "robofachq_exe_b2_north" },
+      { "point": [ 3, 1, -2 ], "overmap": "robofachq_exe_b3_north" },
+      { "point": [ 0, 0, -3 ], "overmap": "robofachq_hab_a0_north" },
+      { "point": [ 1, 0, -3 ], "overmap": "robofachq_hab_a1_north" },
+      { "point": [ 2, 0, -3 ], "overmap": "robofachq_hab_a2_north" },
+      { "point": [ 3, 0, -3 ], "overmap": "robofachq_hab_a3_north" },
+      { "point": [ 0, 1, -3 ], "overmap": "robofachq_hab_b0_north" },
+      { "point": [ 1, 1, -3 ], "overmap": "robofachq_hab_b1_north" },
+      { "point": [ 2, 1, -3 ], "overmap": "robofachq_hab_b2_north" },
+      { "point": [ 3, 1, -3 ], "overmap": "robofachq_hab_b3_north" },
+      { "point": [ 1, -2, -4 ], "overmap": "microlab_sub_connector_north" },
+      { "point": [ 0, -1, -4 ], "overmap": "robofachq_sub_a0_north" },
+      { "point": [ 1, -1, -4 ], "overmap": "robofachq_sub_a1_north" },
+      { "point": [ 2, -1, -4 ], "overmap": "robofachq_sub_a2_north" },
+      { "point": [ 3, -1, -4 ], "overmap": "robofachq_sub_a3_north" },
+      { "point": [ 0, 0, -4 ], "overmap": "robofachq_res_a0_north" },
+      { "point": [ 1, 0, -4 ], "overmap": "robofachq_res_a1_north" },
+      { "point": [ 2, 0, -4 ], "overmap": "robofachq_res_a2_north" },
+      { "point": [ 3, 0, -4 ], "overmap": "robofachq_res_a3_north" },
+      { "point": [ 0, 1, -4 ], "overmap": "robofachq_res_b0_north" },
+      { "point": [ 1, 1, -4 ], "overmap": "robofachq_res_b1_north" },
+      { "point": [ 2, 1, -4 ], "overmap": "robofachq_res_b2_north" },
+      { "point": [ 3, 1, -4 ], "overmap": "robofachq_res_b3_north" },
       { "point": [ 0, 0, -6 ], "overmap": "robofachq_ai_a0_north" },
       { "point": [ 1, 0, -6 ], "overmap": "robofachq_ai_a1_north" },
       { "point": [ 2, 0, -6 ], "overmap": "robofachq_ai_a2_north" },
@@ -4021,6 +4058,7 @@
     "city_distance": [ 3, -1 ],
     "city_sizes": [ 1, 16 ],
     "occurrences": [ 1, 1 ],
+    "rotate": false,
     "flags": [ "UNIQUE" ]
   },
   {
@@ -6252,5 +6290,25 @@
     "city_sizes": [ 3, 12 ],
     "occurrences": [ 0, 1 ],
     "flags": [ "CLASSIC" ]
+  },
+  {
+    "type": "overmap_special",
+    "id": "miniature railway",
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "miniaturerailway_0_0_0_north" },
+      { "point": [ 0, 1, 0 ], "overmap": "miniaturerailway_0_1_0_north" },
+      { "point": [ 1, 0, 0 ], "overmap": "miniaturerailway_1_0_0_north" },
+      { "point": [ 1, 1, 0 ], "overmap": "miniaturerailway_1_1_0_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "miniaturerailway_0_0_1_north" },
+      { "point": [ 0, 1, 1 ], "overmap": "miniaturerailway_0_1_1_north" },
+      { "point": [ 1, 0, 1 ], "overmap": "miniaturerailway_1_0_1_north" },
+      { "point": [ 1, 1, 1 ], "overmap": "miniaturerailway_1_1_1_north" }
+    ],
+    "locations": [ "wilderness", "land" ],
+    "connections": [ { "point": [ 1, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 1, 1, 0 ] } ],
+    "city_distance": [ 10, 100 ],
+    "city_sizes": [ 3, 12 ],
+    "occurrences": [ 0, 1 ],
+    "flags": [ "CLASSIC" ]
   }
 ]
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json
index 095597733e130..fa61b0a75aeb9 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json
@@ -237,6 +237,16 @@
     "extras": "field",
     "mondensity": 2
   },
+  {
+    "type": "overmap_terrain",
+    "id": "2farm_roof_3",
+    "name": "farm",
+    "sym": "#",
+    "color": "i_brown",
+    "see_cost": 5,
+    "extras": "field",
+    "mondensity": 2
+  },
   {
     "type": "overmap_terrain",
     "id": "2farm_4",
@@ -247,6 +257,16 @@
     "extras": "field",
     "mondensity": 2
   },
+  {
+    "type": "overmap_terrain",
+    "id": "2farm_roof_4",
+    "name": "farm",
+    "sym": "#",
+    "color": "i_brown",
+    "see_cost": 5,
+    "extras": "field",
+    "mondensity": 2
+  },
   {
     "type": "overmap_terrain",
     "id": "2farm_5",
@@ -318,6 +338,16 @@
     "mondensity": 2,
     "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
   },
+  {
+    "type": "overmap_terrain",
+    "id": "2farm_roof_11",
+    "name": "farm house",
+    "sym": "^",
+    "color": "i_brown",
+    "see_cost": 5,
+    "extras": "field",
+    "mondensity": 2
+  },
   {
     "type": "overmap_terrain",
     "id": "2farm_12",
@@ -358,6 +388,16 @@
     "extras": "field",
     "mondensity": 2
   },
+  {
+    "type": "overmap_terrain",
+    "id": "2farm_roof_15",
+    "name": "farm field",
+    "sym": "#",
+    "color": "i_brown",
+    "see_cost": 5,
+    "extras": "field",
+    "mondensity": 2
+  },
   {
     "type": "overmap_terrain",
     "id": "2farm_16",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json
index f0cde32e72b62..bc95887c2e749 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json
@@ -1507,6 +1507,38 @@
     "sym": "h",
     "color": "light_blue"
   },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr2_1_4",
+    "copy-from": "generic_city_building",
+    "name": "hotel parking",
+    "sym": "h",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr3_1_4",
+    "copy-from": "generic_city_building",
+    "name": "hotel parking",
+    "sym": "h",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr4_1_4",
+    "copy-from": "generic_city_building",
+    "name": "hotel parking",
+    "sym": "h",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_roof_1_4",
+    "copy-from": "generic_city_building",
+    "name": "hotel",
+    "sym": "h",
+    "color": "light_blue"
+  },
   {
     "type": "overmap_terrain",
     "id": "hotel_tower_1_5",
@@ -1515,14 +1547,110 @@
     "sym": "H",
     "color": "light_blue"
   },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr2_1_5",
+    "copy-from": "generic_city_building",
+    "name": "hotel",
+    "sym": "h",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr3_1_5",
+    "copy-from": "generic_city_building",
+    "name": "hotel",
+    "sym": "h",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr4_1_5",
+    "copy-from": "generic_city_building",
+    "name": "hotel",
+    "sym": "h",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_roof_1_5",
+    "copy-from": "generic_city_building",
+    "name": "hotel entrance",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_1_5B",
+    "copy-from": "generic_city_building",
+    "name": "hotel entrance",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr2_1_5B",
+    "copy-from": "generic_city_building",
+    "name": "hotel",
+    "sym": "h",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_1_5C",
+    "copy-from": "generic_city_building",
+    "name": "hotel entrance",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr2_1_5C",
+    "copy-from": "generic_city_building",
+    "name": "hotel",
+    "sym": "h",
+    "color": "light_blue"
+  },
   {
     "type": "overmap_terrain",
     "id": "hotel_tower_1_6",
     "copy-from": "generic_city_building",
+    "name": "hotel",
+    "sym": "h",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr2_1_6",
+    "copy-from": "generic_city_building",
+    "name": "hotel parking",
+    "sym": "h",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr3_1_6",
+    "copy-from": "generic_city_building",
+    "name": "hotel parking",
+    "sym": "h",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr4_1_6",
+    "copy-from": "generic_city_building",
     "name": "hotel parking",
     "sym": "h",
     "color": "light_blue"
   },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_roof_1_6",
+    "copy-from": "generic_city_building",
+    "name": "hotel",
+    "sym": "h",
+    "color": "light_blue"
+  },
   {
     "type": "overmap_terrain",
     "id": "hotel_tower_1_7",
@@ -1531,6 +1659,38 @@
     "sym": "H",
     "color": "light_blue"
   },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr2_1_7",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr3_1_7",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr4_1_7",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_roof_1_7",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
   {
     "type": "overmap_terrain",
     "id": "hotel_tower_1_8",
@@ -1539,6 +1699,38 @@
     "sym": "H",
     "color": "light_blue"
   },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr2_1_8",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr3_1_8",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr4_1_8",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_roof_1_8",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
   {
     "type": "overmap_terrain",
     "id": "hotel_tower_1_9",
@@ -1547,6 +1739,38 @@
     "sym": "H",
     "color": "light_blue"
   },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr2_1_9",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr3_1_9",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_flr4_1_9",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "hotel_tower_roof_1_9",
+    "copy-from": "generic_city_building",
+    "name": "hotel tower",
+    "sym": "H",
+    "color": "light_blue"
+  },
   {
     "type": "overmap_terrain",
     "id": "hotel_tower_b_1",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json b/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json
index 201438af15f60..58f367dbc327a 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json
@@ -8,6 +8,15 @@
     "see_cost": 5,
     "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
   },
+  {
+    "type": "overmap_terrain",
+    "id": "faction_base_camp_new_0",
+    "name": "survivor camp",
+    "sym": "+",
+    "color": "white",
+    "see_cost": 5,
+    "flags": [ "SOURCE_PEOPLE" ]
+  },
   {
     "type": "overmap_terrain",
     "id": "faction_base_camp_1",
@@ -461,7 +470,7 @@
   {
     "type": "overmap_terrain",
     "id": "faction_base_workshop_0",
-    "name": "store survey",
+    "name": "fabrication workshop survey",
     "sym": "+",
     "color": "cyan",
     "see_cost": 5,
@@ -596,7 +605,7 @@
   {
     "type": "overmap_terrain",
     "id": "faction_base_storehouse_0",
-    "name": "store survey",
+    "name": "store house survey",
     "sym": "+",
     "color": "cyan",
     "see_cost": 5,
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_fungal.json b/data/json/overmap/overmap_terrain/overmap_terrain_fungal.json
new file mode 100644
index 0000000000000..4198541232351
--- /dev/null
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_fungal.json
@@ -0,0 +1,32 @@
+[
+  {
+    "type": "overmap_terrain",
+    "id": "fungal_tower",
+    "name": "fungal tower",
+    "sym": "T",
+    "color": "yellow",
+    "see_cost": 3,
+    "extras": "marloss",
+    "flags": [ "NO_ROTATE", "RISK_HIGH" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "fungal_bloom",
+    "name": "fungal bloom",
+    "sym": "T",
+    "color": "light_gray",
+    "see_cost": 2,
+    "extras": "marloss",
+    "flags": [ "NO_ROTATE", "RISK_HIGH" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "fungal_flowers",
+    "name": "fungal flowers",
+    "sym": "T",
+    "color": "cyan",
+    "see_cost": 5,
+    "extras": "marloss",
+    "flags": [ "NO_ROTATE", "RISK_HIGH" ]
+  }
+]
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json b/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json
index fd3d2d7512586..cedd5730f7584 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json
@@ -209,36 +209,6 @@
     "extras": "field",
     "flags": [ "NO_ROTATE", "RISK_HIGH" ]
   },
-  {
-    "type": "overmap_terrain",
-    "id": "fungal_bloom",
-    "name": "fungal bloom",
-    "sym": "T",
-    "color": "light_gray",
-    "see_cost": 2,
-    "extras": "marloss",
-    "flags": [ "NO_ROTATE", "RISK_HIGH" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "fungal_tower",
-    "name": "fungal tower",
-    "sym": "T",
-    "color": "yellow",
-    "see_cost": 3,
-    "extras": "marloss",
-    "flags": [ "NO_ROTATE", "RISK_HIGH" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "fungal_flowers",
-    "name": "fungal flowers",
-    "sym": "T",
-    "color": "cyan",
-    "see_cost": 5,
-    "extras": "marloss",
-    "flags": [ "NO_ROTATE", "RISK_HIGH" ]
-  },
   {
     "type": "overmap_terrain",
     "id": "spider_pit",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json
index bacdccdda0fe0..84f2bc3848232 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json
@@ -514,6 +514,70 @@
     "mondensity": 2,
     "flags": [ "SOURCE_GUN", "SOURCE_AMMO" ]
   },
+  {
+    "type": "overmap_terrain",
+    "id": "miniaturerailway_0_0_0",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "miniature railway",
+    "sym": "R",
+    "color": "green"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "miniaturerailway_0_1_0",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "miniature railway",
+    "sym": "R",
+    "color": "green"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "miniaturerailway_1_0_0",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "miniature railway",
+    "sym": "R",
+    "color": "green"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "miniaturerailway_1_1_0",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "miniature railway",
+    "sym": "R",
+    "color": "green"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "miniaturerailway_0_0_1",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "miniature railway",
+    "sym": "R",
+    "color": "green"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "miniaturerailway_0_1_1",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "miniature railway",
+    "sym": "R",
+    "color": "green"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "miniaturerailway_1_0_1",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "miniature railway",
+    "sym": "R",
+    "color": "green"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "miniaturerailway_1_1_1",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "miniature railway",
+    "sym": "R",
+    "color": "green"
+  },
   {
     "type": "overmap_terrain",
     "id": "golfcourse_00",
@@ -1018,6 +1082,78 @@
     "sym": "M",
     "color": "i_yellow"
   },
+  {
+    "type": "overmap_terrain",
+    "id": "movietheater_roof_0_0",
+    "copy-from": "generic_city_building",
+    "name": "movie theater",
+    "sym": "M",
+    "color": "i_yellow"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "movietheater_roof_1_0",
+    "copy-from": "generic_city_building",
+    "name": "movie theater entrance",
+    "sym": "M",
+    "color": "i_yellow"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "movietheater_roof_2_0",
+    "copy-from": "generic_city_building",
+    "name": "movie theater",
+    "sym": "M",
+    "color": "i_yellow"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "movietheater_roof_0_1",
+    "copy-from": "generic_city_building",
+    "name": "movie theater",
+    "sym": "M",
+    "color": "i_yellow"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "movietheater_roof_1_1",
+    "name": "movie theater",
+    "copy-from": "generic_city_building",
+    "sym": "M",
+    "color": "i_yellow"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "movietheater_roof_2_1",
+    "copy-from": "generic_city_building",
+    "name": "movie theater",
+    "sym": "M",
+    "color": "i_yellow"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "movietheater_roof_0_2",
+    "copy-from": "generic_city_building",
+    "name": "movie theater",
+    "sym": "M",
+    "color": "i_yellow"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "movietheater_roof_1_2",
+    "copy-from": "generic_city_building",
+    "name": "movie theater",
+    "sym": "M",
+    "color": "i_yellow"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "movietheater_roof_2_2",
+    "copy-from": "generic_city_building",
+    "name": "movie theater",
+    "sym": "M",
+    "color": "i_yellow"
+  },
   {
     "type": "overmap_terrain",
     "id": "paintball_field",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_robofachq.json b/data/json/overmap/overmap_terrain/overmap_terrain_robofachq.json
index 1b2421f404ae8..1f1457c87cd2b 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_robofachq.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_robofachq.json
@@ -93,6 +93,70 @@
     "color": "light_blue",
     "see_cost": 5
   },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_exe_a0",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_exe_a1",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_exe_a2",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_exe_a3",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_exe_b0",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_exe_b1",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_exe_b2",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_exe_b3",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
   {
     "type": "overmap_terrain",
     "id": "robofachq_hab_a0",
@@ -189,6 +253,70 @@
     "color": "light_blue",
     "see_cost": 5
   },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_res_a0",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_res_a1",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_res_a2",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_res_a3",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_res_b0",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_res_b1",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_res_b2",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "robofachq_res_b3",
+    "name": "hub 01",
+    "sym": "0",
+    "color": "light_blue",
+    "see_cost": 5
+  },
   {
     "type": "overmap_terrain",
     "id": "robofachq_ai_a0",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json b/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json
index c89e3dd8bd0dd..425a35682b766 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json
@@ -290,6 +290,15 @@
     "color": "i_brown",
     "flags": [ "SOURCE_FABRICATION", "SOURCE_CONSTRUCTION", "SOURCE_VEHICLES" ]
   },
+  {
+    "type": "overmap_terrain",
+    "id": "junkyard_roof_1a",
+    "copy-from": "generic_city_building",
+    "name": "junkyard",
+    "sym": "J",
+    "color": "i_brown",
+    "flags": [ "SOURCE_FABRICATION", "SOURCE_CONSTRUCTION", "SOURCE_VEHICLES" ]
+  },
   {
     "type": "overmap_terrain",
     "id": "junkyard_1b",
@@ -299,6 +308,15 @@
     "color": "i_brown",
     "flags": [ "SOURCE_FABRICATION", "SOURCE_CONSTRUCTION", "SOURCE_VEHICLES" ]
   },
+  {
+    "type": "overmap_terrain",
+    "id": "junkyard_roof_1b",
+    "copy-from": "generic_city_building",
+    "name": "junkyard",
+    "sym": "J",
+    "color": "i_brown",
+    "flags": [ "SOURCE_FABRICATION", "SOURCE_CONSTRUCTION", "SOURCE_VEHICLES" ]
+  },
   {
     "type": "overmap_terrain",
     "id": "junkyard_2a",
diff --git a/data/json/player_activities.json b/data/json/player_activities.json
index e6d69084b00f0..edcf74fee6472 100644
--- a/data/json/player_activities.json
+++ b/data/json/player_activities.json
@@ -368,15 +368,6 @@
     "verb": "sorting out the loot",
     "based_on": "neither"
   },
-  {
-    "id": "ACT_TILL_PLOT",
-    "type": "activity_type",
-    "activity_level": "ACTIVE_EXERCISE",
-    "verb": "tilling the farm plot",
-    "suspendable": false,
-    "based_on": "neither",
-    "no_resume": true
-  },
   {
     "id": "ACT_FETCH_REQUIRED",
     "type": "activity_type",
@@ -396,24 +387,6 @@
     "no_resume": true,
     "multi_activity": true
   },
-  {
-    "id": "ACT_PLANT_PLOT",
-    "type": "activity_type",
-    "activity_level": "MODERATE_EXERCISE",
-    "verb": "planting seeds",
-    "suspendable": false,
-    "based_on": "neither",
-    "no_resume": true
-  },
-  {
-    "id": "ACT_HARVEST_PLOT",
-    "type": "activity_type",
-    "activity_level": "ACTIVE_EXERCISE",
-    "verb": "harvesting plots",
-    "suspendable": false,
-    "based_on": "neither",
-    "no_resume": true
-  },
   {
     "id": "ACT_FERTILIZE_PLOT",
     "type": "activity_type",
diff --git a/data/json/professions.json b/data/json/professions.json
index 704f5f4d09503..c0f3b41ec4644 100644
--- a/data/json/professions.json
+++ b/data/json/professions.json
@@ -94,6 +94,84 @@
     "id": "shotgun_d_roadwarrior",
     "entries": [ { "item": "shotgun_d", "ammo-item": "reloaded_shot_00", "contents-item": [ "barrel_small" ] } ]
   },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "quiver_bow_hunter",
+    "entries": [ { "item": "arrow_cf", "charges": 8 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "quiver_crossbow_hunter",
+    "entries": [ { "item": "bolt_metal", "charges": 9 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "bandolier_shotgun_hunter",
+    "entries": [ { "item": "shot_00", "charges": 18 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "bandolier_rifle_hunter",
+    "entries": [ { "item": "270win_jsp", "charges": 16 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "bandolier_swat_cqc1",
+    "entries": [ { "item": "shot_00", "charges": 12 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "bandolier_swat_cqc2",
+    "entries": [ { "item": "shot_slug", "charges": 12 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "quiver_bionic_prepper",
+    "entries": [ { "item": "bolt_steel", "charges": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "quiver_naturalist",
+    "entries": [ { "item": "arrow_wood", "charges": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "bandolier_ww_gunslinger",
+    "entries": [ { "item": "45colt_jhp", "charges": 18 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "quiver_winter_surivor",
+    "entries": [ { "item": "bolt_wood", "charges": 29 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "bandolier_roadwarrior",
+    "entries": [ { "item": "reloaded_shot_00", "charges": 18 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "bandolier_waste_ranger",
+    "entries": [ { "item": "reloaded_shot_00", "charges": 19 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "quiver_waste_ranger",
+    "entries": [ { "item": "bolt_steel", "charges": 12 } ]
+  },
   {
     "type": "profession_item_substitutions",
     "substitutions": [
@@ -270,7 +348,7 @@
         ],
         "entries": [
           { "item": "crossbow", "ammo-item": "bolt_steel", "charges": 1, "contents-item": "shoulder_strap" },
-          { "item": "bolt_steel", "charges": 20, "container-item": "quiver" },
+          { "item": "quiver", "contents-group": "quiver_bionic_prepper" },
           { "item": "machete", "container-item": "scabbard" }
         ]
       },
@@ -746,7 +824,8 @@
         "entries": [
           { "group": "charged_cell_phone" },
           { "item": "glock_19", "ammo-item": "9mm", "container-item": "sholster", "charges": 15 },
-          { "item": "9mm", "charges": 35 },
+          { "item": "glockmag", "ammo-item": "9mm", "charges": 15 },
+          { "item": "glockmag", "ammo-item": "9mm", "charges": 15 },
           { "item": "lighter", "charges": 100 }
         ]
       },
@@ -767,7 +846,8 @@
           { "group": "charged_cell_phone" },
           { "group": "charged_flashlight" },
           { "item": "m9", "ammo-item": "9mm", "charges": 15, "container-item": "holster" },
-          { "item": "9mm", "charges": 35 }
+          { "item": "m9mag", "ammo-item": "9mm", "charges": 15 },
+          { "item": "m9mag", "ammo-item": "9mm", "charges": 15 }
         ]
       },
       "male": [ "boxer_shorts" ],
@@ -1084,8 +1164,8 @@
         "entries": [
           { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "shot_00", "charges": 12, "container-item": "bandolier_shotgun" },
-          { "item": "shot_slug", "charges": 12, "container-item": "bandolier_shotgun" },
+          { "item": "bandolier_shotgun", "contents-group": "bandolier_swat_cqc1" },
+          { "item": "bandolier_shotgun", "contents-group": "bandolier_swat_cqc2" },
           { "item": "legpouch_large", "contents-group": "army_mags_usp9" },
           { "item": "usp_9mm", "ammo-item": "9mmfmj", "charges": 15, "container-item": "sholster" },
           { "item": "baton-extended", "container-item": "police_belt" },
@@ -1212,7 +1292,7 @@
         ],
         "entries": [
           { "group": "charged_cell_phone" },
-          { "item": "quiver", "charges": 8, "contents-item": "arrow_cf" },
+          { "item": "quiver", "contents-group": "quiver_bow_hunter" },
           { "item": "sheath", "contents-item": "knife_hunting" }
         ]
       },
@@ -1233,7 +1313,7 @@
         "entries": [
           { "group": "charged_cell_phone" },
           { "item": "crossbow", "ammo-item": "bolt_metal", "charges": 1, "contents-item": "shoulder_strap" },
-          { "item": "bolt_metal", "charges": 9, "container-item": "quiver" },
+          { "item": "quiver", "contents-group": "quiver_crossbow_hunter" },
           { "item": "sheath", "contents-item": "knife_hunting" }
         ]
       },
@@ -1255,7 +1335,7 @@
           { "group": "charged_cell_phone" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "shotgun_d", "ammo-item": "shot_00", "charges": 2, "contents-item": "shoulder_strap" },
-          { "item": "shot_00", "charges": 18, "container-item": "bandolier_shotgun" },
+          { "item": "bandolier_shotgun", "contents-group": "bandolier_shotgun_hunter" },
           { "item": "sheath", "contents-item": "knife_hunting" }
         ]
       },
@@ -1277,7 +1357,7 @@
           { "group": "charged_cell_phone" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "remington700_270", "ammo-item": "270win_jsp", "charges": 4, "contents-item": "shoulder_strap" },
-          { "item": "270win_jsp", "charges": 16, "container-item": "bandolier_rifle" },
+          { "item": "bandolier_rifle", "contents-group": "bandolier_rifle_hunter" },
           { "item": "sheath", "contents-item": "knife_hunting" }
         ]
       },
@@ -1414,7 +1494,7 @@
     "name": "Shower Victim",
     "description": "You were in the middle of a nice, hot shower when the cataclysm struck!  You barely managed to escape with some soap and the most massively useful thing ever...  a towel.",
     "points": -1,
-    "items": { "both": [ "soap", "towel_wet" ] }
+    "items": { "both": { "items": [ "towel_wet" ], "entries": [ { "item": "soap", "custom-flags": [ "auto_wield" ] } ] } }
   },
   {
     "type": "profession",
@@ -1760,7 +1840,12 @@
           { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "sheath", "contents-item": "knife_combat" },
-          { "item": "h&k416a5", "ammo-item": "556", "contents-item": [ "shoulder_strap", "acog_scope" ] },
+          {
+            "item": "h&k416a5",
+            "ammo-item": "556",
+            "charges": 30,
+            "contents-item": [ "shoulder_strap", "acog_scope" ]
+          },
           { "item": "modularvestceramic", "contents-group": "army_mags_m4" }
         ]
       },
@@ -1820,6 +1905,7 @@
           {
             "item": "m2010",
             "ammo-item": "300_winmag",
+            "charges": 5,
             "contents-item": [ "shoulder_strap", "rifle_scope", "bipod" ]
           },
           { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
@@ -2618,18 +2704,20 @@
     "traits": [ "PROF_BOXER" ],
     "skills": [ { "level": 2, "name": "melee" }, { "level": 2, "name": "unarmed" }, { "level": 2, "name": "dodge" } ],
     "items": {
-      "both": [
-        "under_armor_shorts",
-        "under_armor",
-        "shorts",
-        "gloves_wraps",
-        "boxing_gloves",
-        "headgear",
-        "mouthpiece",
-        "socks",
-        "boots",
-        "towel"
-      ],
+      "both": {
+        "items": [
+          "under_armor_shorts",
+          "under_armor",
+          "shorts",
+          "gloves_wraps",
+          "boxing_gloves",
+          "headgear",
+          "mouthpiece",
+          "socks",
+          "boots"
+        ],
+        "entries": [ { "item": "towel", "custom-flags": [ "no_auto_equip" ] } ]
+      },
       "female": [ "sports_bra" ]
     }
   },
@@ -2823,8 +2911,8 @@
         "entries": [
           { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" },
           { "item": "kukri", "container-item": "sheath" },
-          { "item": "crossbow", "ammo-item": "bolt_wood", "contents-item": "shoulder_strap" },
-          { "item": "bolt_wood", "charges": 29, "container-item": "quiver_large" }
+          { "item": "crossbow", "ammo-item": "bolt_wood", "charges": 1, "contents-item": "shoulder_strap" },
+          { "item": "quiver_large", "contents-group": "quiver_winter_surivor" }
         ]
       },
       "male": [ "boxer_shorts" ],
@@ -2956,7 +3044,7 @@
           { "item": "knife_combat", "container-item": "sheath" },
           { "item": "gasoline_cooker", "ammo-item": "gasoline", "charges": 500 },
           { "item": "XL_holster", "contents-group": "shotgun_d_roadwarrior" },
-          { "item": "reloaded_shot_00", "charges": 18, "container-item": "bandolier_shotgun" },
+          { "item": "bandolier_shotgun", "contents-group": "bandolier_roadwarrior" },
           { "item": "light_battery_cell", "charges": 100, "container-item": "wearable_light" }
         ]
       },
@@ -2998,9 +3086,9 @@
         "entries": [
           { "item": "knife_trench", "container-item": "sheath" },
           { "item": "ashot", "ammo-item": "reloaded_shot_00", "container-item": "holster" },
-          { "item": "reloaded_shot_00", "charges": 19, "container-item": "bandolier_shotgun" },
+          { "item": "bandolier_shotgun", "contents-group": "bandolier_waste_ranger" },
           { "item": "helsing", "ammo-item": "bolt_steel", "contents-item": "shoulder_strap" },
-          { "item": "bolt_steel", "charges": 12, "container-item": "quiver" },
+          { "item": "quiver", "contents-group": "quiver_waste_ranger" },
           { "item": "survivor_mess_kit", "charges": [ 20, 30 ] }
         ]
       },
@@ -3040,8 +3128,7 @@
           "heavy_flashlight",
           "knuckle_steel",
           "ref_lighter",
-          "wristwatch",
-          "mess_kit"
+          "wristwatch"
         ],
         "entries": [
           {
@@ -3050,6 +3137,7 @@
             "charges": 50,
             "contents-item": [ "shoulder_strap", "folding_stock" ]
           },
+          { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" },
           { "item": "makeshift_machete", "container-item": "scabbard" },
           { "item": "nailmag", "ammo-item": "combatnail", "charges": 50, "container-item": "chestpouch" }
         ]
@@ -3112,7 +3200,7 @@
         ],
         "entries": [
           { "item": "primitive_knife", "container-item": "sheath" },
-          { "item": "arrow_wood", "charges": 20, "container-item": "quiver" }
+          { "item": "quiver", "contents-group": "quiver_naturalist" }
         ]
       },
       "male": [ "chestwrap_fur", "loincloth_fur" ],
@@ -3229,7 +3317,6 @@
         "hat_fur",
         "purse",
         "oil_lamp",
-        "needle_wood",
         "pot",
         "cornmeal",
         "salt"
@@ -3249,6 +3336,7 @@
         "entries": [
           { "item": "rifle_flintlock", "ammo-item": "flintlock_ammo", "charges": 1, "contents-item": "shoulder_strap" },
           { "item": "flintlock_ammo", "charges": 14, "container-item": "flintlock_pouch" },
+          { "item": "needle_wood", "charges": 50 },
           { "item": "flintlock_ammo", "charges": 15 }
         ]
       }
@@ -3533,7 +3621,6 @@
           "rollmat",
           "sleeping_bag_roll",
           "knife_swissarmy",
-          "mess_kit",
           "gasoline_lantern",
           "canteen",
           "granola",
@@ -3541,7 +3628,10 @@
           "wristwatch",
           "1st_aid"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ]
+        "entries": [
+          { "group": "charged_cell_phone" },
+          { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" }
+        ]
       },
       "male": [ "briefs" ],
       "female": [ "sports_bra", "boy_shorts" ]
@@ -3562,7 +3652,6 @@
           "knee_pads",
           "jumpsuit",
           "mask_gas",
-          "jackhammer",
           "canteen",
           "e_tool",
           "tool_belt",
@@ -3572,6 +3661,7 @@
         ],
         "entries": [
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
+          { "item": "jackhammer", "charges": 400 },
           { "item": "light_minus_disposable_cell", "charges": 100 },
           { "item": "light_minus_disposable_cell", "charges": 100, "container-item": "miner_hat" }
         ]
@@ -3767,23 +3857,25 @@
     "skills": [ { "level": 8, "name": "firstaid" } ],
     "traits": [ "PROF_MED" ],
     "items": {
-      "both": [
-        "gloves_medical",
-        "socks",
-        "mask_dust",
-        "dress_shirt",
-        "pants",
-        "dress_shoes",
-        "coat_lab",
-        "stethoscope",
-        "bfipowder",
-        "antibiotics",
-        "oxycodone",
-        "1st_aid",
-        "smart_phone",
-        "wristwatch",
-        "medium_battery_cell"
-      ],
+      "both": {
+        "items": [
+          "gloves_medical",
+          "socks",
+          "mask_dust",
+          "dress_shirt",
+          "pants",
+          "dress_shoes",
+          "coat_lab",
+          "stethoscope",
+          "bfipowder",
+          "antibiotics",
+          "oxycodone",
+          "1st_aid",
+          "smart_phone",
+          "wristwatch"
+        ],
+        "entries": [ { "item": "medium_battery_cell", "charges": 500 } ]
+      },
       "male": [ "boxer_shorts" ],
       "female": [ "bra", "panties" ]
     }
@@ -3963,7 +4055,7 @@
         ],
         "entries": [
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "45colt_jhp", "charges": 18, "container-item": "bandolier_pistol" },
+          { "item": "bandolier_pistol", "contents-group": "bandolier_ww_gunslinger" },
           { "item": "whiskey", "container-item": "bottle_glass" },
           { "item": "colt_saa", "ammo-item": "45colt_jhp", "charges": 6, "container-item": "sholster" }
         ]
diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json
index 83ad1d8e79244..2ba0bc4b57a17 100644
--- a/data/json/recipes/armor/arms.json
+++ b/data/json/recipes/armor/arms.json
@@ -34,7 +34,7 @@
     "difficulty": 5,
     "time": "30 m",
     "autolearn": true,
-    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 4 ] ] ]
+    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 12 ] ] ]
   },
   {
     "result": "armguard_acidchitin",
@@ -47,7 +47,7 @@
     "time": "60 m",
     "autolearn": true,
     "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 6 ] ] ]
+    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 12 ] ] ]
   },
   {
     "result": "armguard_hard",
diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index aa8680c4f64ad..eafe9d04be58c 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -33,7 +33,7 @@
     "time": "40 m",
     "autolearn": true,
     "using": [ [ "cordage", 1 ] ],
-    "components": [ [ [ "chitin_piece", 8 ] ], [ [ "leather", 4 ], [ "fur", 4 ], [ "rag", 4 ] ] ]
+    "components": [ [ [ "chitin_piece", 20 ] ], [ [ "leather", 4 ], [ "fur", 4 ], [ "rag", 4 ] ] ]
   },
   {
     "result": "boots_acidchitin",
@@ -47,7 +47,7 @@
     "autolearn": true,
     "using": [ [ "cordage", 1 ] ],
     "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "acidchitin_piece", 12 ] ], [ [ "leather", 4 ], [ "fur", 4 ], [ "rag", 4 ] ] ]
+    "components": [ [ [ "acidchitin_piece", 20 ] ], [ [ "leather", 4 ], [ "fur", 4 ], [ "rag", 4 ] ] ]
   },
   {
     "result": "boots_fsurvivor",
diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
index 1b053107d2cf9..649b6e51b8c26 100644
--- a/data/json/recipes/armor/hands.json
+++ b/data/json/recipes/armor/hands.json
@@ -8,7 +8,7 @@
     "difficulty": 4,
     "time": "30 m",
     "autolearn": true,
-    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 4 ] ] ]
+    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 10 ] ] ]
   },
   {
     "result": "gauntlets_acidchitin",
@@ -21,7 +21,7 @@
     "time": "1 h",
     "autolearn": true,
     "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 6 ] ] ]
+    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 10 ] ] ]
   },
   {
     "result": "gauntlets_larmor",
diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json
index 333c1339cbed9..462dfb0a859dd 100644
--- a/data/json/recipes/armor/head.json
+++ b/data/json/recipes/armor/head.json
@@ -363,7 +363,7 @@
     "difficulty": 6,
     "time": "1 h",
     "autolearn": true,
-    "components": [ [ [ "string_36", 1 ], [ "string_6", 5 ] ], [ [ "chitin_piece", 5 ] ] ]
+    "components": [ [ [ "string_36", 1 ], [ "string_6", 5 ] ], [ [ "chitin_piece", 12 ] ] ]
   },
   {
     "result": "helmet_conical",
@@ -390,7 +390,7 @@
     "time": "2 h",
     "autolearn": true,
     "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "string_36", 1 ], [ "string_6", 5 ] ], [ [ "acidchitin_piece", 8 ] ] ]
+    "components": [ [ [ "string_36", 1 ], [ "string_6", 5 ] ], [ [ "acidchitin_piece", 12 ] ] ]
   },
   {
     "result": "helmet_galea",
diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json
index d2ef4e593780d..c32d9a29d516f 100644
--- a/data/json/recipes/armor/storage.json
+++ b/data/json/recipes/armor/storage.json
@@ -29,6 +29,19 @@
     "qualities": [ { "id": "SEW", "level": 1 } ],
     "components": [ [ [ "leather", 8 ], [ "rag", 8 ] ], [ [ "filament", 300, "LIST" ], [ "cordage", 1, "LIST" ] ] ]
   },
+  {
+    "result": "stone_pouch",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_STORAGE",
+    "skill_used": "tailor",
+    "difficulty": 3,
+    "skills_required": [ [ "throw", 1 ] ],
+    "time": "1 h 20 m",
+    "autolearn": true,
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "rag", 8 ] ], [ [ "leather", 4 ] ], [ [ "filament", 600, "LIST" ], [ "cordage", 2, "LIST" ] ] ]
+  },
   {
     "result": "chestrig",
     "type": "recipe",
diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json
index d7d802327d958..e77d77be39ef4 100644
--- a/data/json/recipes/armor/suit.json
+++ b/data/json/recipes/armor/suit.json
@@ -75,7 +75,7 @@
     "autolearn": true,
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
     "using": [ [ "cordage", 2 ] ],
-    "components": [ [ [ "chitin_piece", 15 ] ] ]
+    "components": [ [ [ "chitin_piece", 72 ] ] ]
   },
   {
     "result": "armor_acidchitin",
@@ -89,7 +89,7 @@
     "autolearn": true,
     "using": [ [ "cordage", 2 ] ],
     "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "acidchitin_piece", 15 ] ] ]
+    "components": [ [ [ "acidchitin_piece", 72 ] ] ]
   },
   {
     "result": "armor_farmor",
diff --git a/data/json/recipes/basecamps/recipe_groups.json b/data/json/recipes/basecamps/recipe_groups.json
index 9614d17c0ec6d..af498215d77cc 100644
--- a/data/json/recipes/basecamps/recipe_groups.json
+++ b/data/json/recipes/basecamps/recipe_groups.json
@@ -6,7 +6,8 @@
     "recipes": [
       { "id": "faction_base_modular_hub_field_0", "description": "Field Camp", "om_terrains": [ "field" ] },
       { "id": "faction_base_firestation_0", "description": "Firestation Base", "om_terrains": [ "fire_station" ] },
-      { "id": "faction_base_shelter_0", "description": "Evac Shelter Base", "om_terrains": [ "shelter" ] }
+      { "id": "faction_base_shelter_0", "description": "Evac Shelter Base", "om_terrains": [ "shelter" ] },
+      { "id": "faction_base_shelter_1_0", "description": "Evac Shelter Base", "om_terrains": [ "shelter_1" ] }
     ]
   },
   {
diff --git a/data/json/recipes/basecamps/recipe_modular_field_common.json b/data/json/recipes/basecamps/recipe_modular_field_common.json
index d352d4bf85962..e0387d8a12eb1 100644
--- a/data/json/recipes/basecamps/recipe_modular_field_common.json
+++ b/data/json/recipes/basecamps/recipe_modular_field_common.json
@@ -594,7 +594,7 @@
     "components": [
       [ [ "processor", 2 ] ],
       [ [ "RAM", 2 ] ],
-      [ [ "small_lcd_screen", 1 ] ],
+      [ [ "large_lcd_screen", 1 ] ],
       [ [ "e_scrap", 8 ] ],
       [ [ "frame", 1 ] ],
       [ [ "circuit", 4 ] ],
diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json
new file mode 100644
index 0000000000000..39ae0c9ca41df
--- /dev/null
+++ b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json
@@ -0,0 +1,502 @@
+[
+  {
+    "type": "recipe",
+    "result": "faction_base_shelter_1_0",
+    "description": "We should survey the base site and set up a bulletin board.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "skill_used": "fabrication",
+    "autolearn": false,
+    "never_learn": true,
+    "time": "1 h",
+    "construction_blueprint": "fbmc_shelter_1_0",
+    "blueprint_provides": [
+      { "id": "gathering" },
+      { "id": "primitive_camp_recipes_1" },
+      { "id": "fbmc_shelter_1_0" },
+      { "id": "firewood" },
+      { "id": "foraging" },
+      { "id": "sorting" },
+      { "id": "logging" }
+    ],
+    "blueprint_requires": [ { "id": "not_an_upgrade" } ],
+    "blueprint_name": "basic survey"
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_fireplace",
+    "description": "We should build a fireplace for cooking and grab a pot.  Let's set up near the working terminal.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_fireplace",
+    "blueprint_name": "build a fireplace",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_0" } ],
+    "blueprint_provides": [
+      { "id": "fbmc_shelter_1_fire" },
+      { "id": "trapping" },
+      { "id": "hunting" },
+      { "id": "kitchen" },
+      { "id": "kitchen_recipes_1" }
+    ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_resources": [ "fake_fireplace", "pot" ],
+    "blueprint_autocalc": true,
+    "components": [ [ [ "pot", 1 ], [ "rock_pot", 1 ], [ "pot_copper", 1 ], [ "clay_pot", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_brazier",
+    "description": "We should build a brazier for cooking and grab a pot.  Let's set up near the working terminal.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "skill_used": "fabrication",
+    "autolearn": false,
+    "never_learn": true,
+    "time": "5 m",
+    "construction_blueprint": "fbmc_shelter_1_brazier",
+    "blueprint_name": "build a brazier",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_0" } ],
+    "blueprint_provides": [
+      { "id": "fbmc_shelter_1_fire" },
+      { "id": "trapping" },
+      { "id": "hunting" },
+      { "id": "kitchen" },
+      { "id": "kitchen_recipes_1" }
+    ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_resources": [ "fake_fireplace", "pot" ],
+    "blueprint_autocalc": true,
+    "components": [ [ [ "brazier", 1 ] ], [ [ "pot", 1 ], [ "rock_pot", 1 ], [ "pot_copper", 1 ], [ "clay_pot", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_stove",
+    "description": "We should build a wood stove for cooking and grab a pot.  Let's set up near the working terminal.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "skill_used": "fabrication",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_stove",
+    "blueprint_name": "build a wood stove",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_0" } ],
+    "blueprint_provides": [
+      { "id": "fbmc_shelter_1_fire" },
+      { "id": "trapping" },
+      { "id": "hunting" },
+      { "id": "kitchen" },
+      { "id": "kitchen_recipes_1" }
+    ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_resources": [ "fake_fireplace", "pot" ],
+    "blueprint_autocalc": true,
+    "components": [ [ [ "pot", 1 ], [ "rock_pot", 1 ], [ "pot_copper", 1 ], [ "clay_pot", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_well",
+    "description": "We should build a well, put it near the terminal.  This will make our future here more secure.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_well",
+    "blueprint_name": "build a well",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_well" }, { "id": "relaying" }, { "id": "scouting" }, { "id": "patrolling" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_well" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bed_standard_NW",
+    "description": "Let's furnish the southeast bedroom with a regular bed.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_standard_NW",
+    "blueprint_name": "furnish the NW bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_nw" }, { "id": "bed", "amount": 1 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_nw" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_standard_W1",
+    "description": "Let's furnish the west bedroom with regular beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_W1",
+    "blueprint_name": "furnish the W bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" }, { "id": "fbmc_shelter_1_bed_nw" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom_w1" }, { "id": "bed", "amount": 2 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom_w1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_standard_W2",
+    "description": "Let's furnish the west bedroom with regular beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_W2",
+    "blueprint_name": "furnish the W bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" }, { "id": "fbmc_shelter_1_bedroom_w1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom_w2" }, { "id": "bed", "amount": 3 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom_w2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_standard_W3",
+    "description": "Let's furnish the west bedroom with regular beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_W3",
+    "blueprint_name": "furnish the W bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" }, { "id": "fbmc_shelter_1_bedroom_w2" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom_w3" }, { "id": "bed", "amount": 4 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom_w3" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bed_straw_NW",
+    "description": "Let's furnish the southeast bedroom with a straw bed.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_straw_NW",
+    "blueprint_name": "furnish the NW bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_nw" }, { "id": "bed", "amount": 1 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_nw" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_straw_W1",
+    "description": "Let's furnish the west bedroom with a straw bed.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_straw_W1",
+    "blueprint_name": "furnish the W bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" }, { "id": "fbmc_shelter_1_bed_nw" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom_w1" }, { "id": "bed", "amount": 2 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom_w1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_straw_W2",
+    "description": "Let's furnish the west bedroom with a straw bed.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_straw_W2",
+    "blueprint_name": "furnish the W bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" }, { "id": "fbmc_shelter_1_bedroom_w1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom_w2" }, { "id": "bed", "amount": 3 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom_w2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_straw_W3",
+    "description": "Let's furnish the west bedroom with straw beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_straw_W3",
+    "blueprint_name": "furnish the W bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" }, { "id": "fbmc_shelter_1_bedroom_w2" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom_w3" }, { "id": "bed", "amount": 4 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom_w3" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bed_makeshift_NW",
+    "description": "Let's furnish the southeast bedroom with a makeshift bed.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_makeshift_NW",
+    "blueprint_name": "furnish the NW bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_nw" }, { "id": "bed", "amount": 1 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_nw" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_makeshift_W1",
+    "description": "Let's furnish the west bedroom with a makeshift bed.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_makeshift_W1",
+    "blueprint_name": "furnish the W bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" }, { "id": "fbmc_shelter_1_bed_nw" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom_w1" }, { "id": "bed", "amount": 2 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom_w1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_makeshift_W2",
+    "description": "Let's furnish the west bedroom with a makeshift bed.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_makeshift_W2",
+    "blueprint_name": "furnish the W bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" }, { "id": "fbmc_shelter_1_bedroom_w1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom_w2" }, { "id": "bed", "amount": 3 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom_w2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_makeshift_W3",
+    "description": "Let's furnish the west bedroom with makeshift beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_makeshift_W3",
+    "blueprint_name": "furnish the W bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" }, { "id": "fbmc_shelter_1_bedroom_w2" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom_w3" }, { "id": "bed", "amount": 4 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom_w3" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bed_standard_SW",
+    "description": "Let's furnish the southwest bedroom with a regular bed.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_standard_SW",
+    "blueprint_name": "furnish the SW bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom_w3" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_sw" }, { "id": "bed", "amount": 5 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_sw" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bed_straw_SW",
+    "description": "Let's furnish the southwest bedroom with a straw bed.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_straw_SW",
+    "blueprint_name": "furnish the SW bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom_w3" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_sw" }, { "id": "bed", "amount": 5 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_sw" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bed_makeshift_SW",
+    "description": "Let's furnish the southwest bedroom with a makeshift bed.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_makeshift_SW",
+    "blueprint_name": "furnish the SW bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom_w3" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_sw" }, { "id": "bed", "amount": 5 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_sw" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_standard_S1",
+    "description": "Let's furnish the southern bedroom with a regular beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_standard_S1",
+    "blueprint_name": "furnish the S bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_sw" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s1" }, { "id": "bed", "amount": 7 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_straw_S1",
+    "description": "Let's furnish the southern bedroom with a straw beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_straw_S1",
+    "blueprint_name": "furnish the S bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_sw" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s1" }, { "id": "bed", "amount": 7 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_makeshift_S1",
+    "description": "Let's furnish the southern bedroom with a makeshift beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_makeshift_S1",
+    "blueprint_name": "furnish the S bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_sw" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s1" }, { "id": "bed", "amount": 7 } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_standard_S2",
+    "description": "Let's furnish the southern bedroom with regular beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_standard_S2",
+    "blueprint_name": "furnish the S bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_s1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s2" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_straw_S2",
+    "description": "Let's furnish the southern bedroom with straw beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_straw_S2",
+    "blueprint_name": "furnish the S bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_s1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s2" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_beds_makeshift_S2",
+    "description": "Let's furnish the southern bedroom with makeshift beds.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bed_makeshift_S2",
+    "blueprint_name": "furnish the S bedroom",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_s1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s2" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_diningroom",
+    "description": "Let's make a dining area.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_dining",
+    "blueprint_name": "furnish the dining room",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_dining" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_dining" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_livingroom",
+    "description": "Let's make a living room area.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_livingroom",
+    "blueprint_name": "furnish the living room",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_livingroom" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_livingroom" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_pantry",
+    "description": "Let's build some pantry storage.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_pantry",
+    "blueprint_name": "build some wooden racks",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_pantry" }, { "id": "pantry" }, { "id": "sorting" }, { "id": "tool_storage" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_pantry" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_craftspot",
+    "description": "Let's build a work bench.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_craftspot",
+    "blueprint_name": "build a work bench",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_craftspot" }, { "id": "tool_storage" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_craftspot" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_radio",
+    "description": "Let's set up a radio tower to improve our recruitment efforts.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_radio_console",
+    "blueprint_name": "build a radio tower and console",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_well" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_radio" }, { "id": "recruiting" }, { "id": "radio" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_radio" } ],
+    "blueprint_autocalc": true
+  }
+]
diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json
new file mode 100644
index 0000000000000..b8aebc819a077
--- /dev/null
+++ b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json
@@ -0,0 +1,77 @@
+[
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom1_log",
+    "description": "Let's build some living quarters so we can expand.  We will start in the northwest corner.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_NW_log",
+    "blueprint_name": "build NW log bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom2_log",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the west wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_W1_log",
+    "blueprint_name": "build W log bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom3_log",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the same wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_W2",
+    "blueprint_name": "build W log bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom5_log",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the southwest corner.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_SW_log",
+    "blueprint_name": "build SW log bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom6_log",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the south wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_S_log",
+    "blueprint_name": "build S log bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom6" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom6" } ],
+    "blueprint_autocalc": true
+  }
+]
diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json
new file mode 100644
index 0000000000000..20eda8b11f65c
--- /dev/null
+++ b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json
@@ -0,0 +1,77 @@
+[
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom1_rock",
+    "description": "Let's build some living quarters so we can expand.  We will start in the northwest corner.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_NW_rock",
+    "blueprint_name": "build NW rock bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom2_rock",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the west wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_W1_rock",
+    "blueprint_name": "build W rock bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom3_rock",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the same wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_W2",
+    "blueprint_name": "build W rock bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom5_rock",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the southwest corner.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_SW_rock",
+    "blueprint_name": "build SW rock bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom6_rock",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the south wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_S_rock",
+    "blueprint_name": "build S rock bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom6" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom6" } ],
+    "blueprint_autocalc": true
+  }
+]
diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json
new file mode 100644
index 0000000000000..7a0d65e97a033
--- /dev/null
+++ b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json
@@ -0,0 +1,77 @@
+[
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom1",
+    "description": "Let's build some living quarters so we can expand.  We will start in the northwest corner.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_NW",
+    "blueprint_name": "build NW standard bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom2",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the west wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_W1",
+    "blueprint_name": "build W standard bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom3",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the same wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_W2",
+    "blueprint_name": "build W standard bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom5",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the southwest corner.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_standard_bedroom_SW",
+    "blueprint_name": "build SW standard bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom6",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the south wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_S",
+    "blueprint_name": "build S standard bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom6" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom6" } ],
+    "blueprint_autocalc": true
+  }
+]
diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json
new file mode 100644
index 0000000000000..dd60644cede08
--- /dev/null
+++ b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json
@@ -0,0 +1,77 @@
+[
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom1_wad",
+    "description": "Let's build some living quarters so we can expand.  We will start in the northwest corner.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_NW_wad",
+    "blueprint_name": "build NW wattle and daub bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom2_wad",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the west wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_W1_wad",
+    "blueprint_name": "build W wattle and daub bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom3_wad",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the same wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_W2",
+    "blueprint_name": "build W wattle and daub bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom5_wad",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the southwest corner.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_SW_wad",
+    "blueprint_name": "build SW wattle and daub bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom6_wad",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the south wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_S_wad",
+    "blueprint_name": "build S wattle and daub bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom6" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom6" } ],
+    "blueprint_autocalc": true
+  }
+]
diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json
new file mode 100644
index 0000000000000..a84d7bc2a2bca
--- /dev/null
+++ b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json
@@ -0,0 +1,77 @@
+[
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom1_wood",
+    "description": "Let's build some living quarters so we can expand.  We will start in the northwest corner.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_NW_wood",
+    "blueprint_name": "build NW wood bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom2_wood",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the west wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_W1_wood",
+    "blueprint_name": "build W wood bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom3_wood",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the same wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_W2",
+    "blueprint_name": "build W wood bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom5_wood",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the southwest corner.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_SW_wood",
+    "blueprint_name": "build SW wood bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_autocalc": true
+  },
+  {
+    "type": "recipe",
+    "result": "faction_base_modular_shelter_1_bedroom6_wood",
+    "description": "Let's build some living quarters so we can expand.  We will continue along the south wall.",
+    "category": "CC_BUILDING",
+    "subcategory": "CSC_BUILDING_BASES",
+    "autolearn": false,
+    "never_learn": true,
+    "construction_blueprint": "fbmc_shelter_1_bedroom_S_wood",
+    "blueprint_name": "build S wood bedroom walls",
+    "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" } ],
+    "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom6" } ],
+    "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom6" } ],
+    "blueprint_autocalc": true
+  }
+]
diff --git a/data/json/recipes/basecamps/recipe_primitive_field.json b/data/json/recipes/basecamps/recipe_primitive_field.json
index a0d667d9bd1da..98f016cf25bc0 100644
--- a/data/json/recipes/basecamps/recipe_primitive_field.json
+++ b/data/json/recipes/basecamps/recipe_primitive_field.json
@@ -442,7 +442,7 @@
     "components": [
       [ [ "processor", 2 ] ],
       [ [ "RAM", 2 ] ],
-      [ [ "small_lcd_screen", 1 ] ],
+      [ [ "large_lcd_screen", 1 ] ],
       [ [ "e_scrap", 8 ] ],
       [ [ "frame", 1 ] ],
       [ [ "circuit", 4 ] ],
diff --git a/data/json/recipes/food/pasta.json b/data/json/recipes/food/pasta.json
index 4599663dbffb9..a7f125f832ccf 100644
--- a/data/json/recipes/food/pasta.json
+++ b/data/json/recipes/food/pasta.json
@@ -54,7 +54,7 @@
         [ "can_tomato", 1 ],
         [ "wild_herbs", 10 ]
       ],
-      [ [ "meat_red", 1, "LIST" ], [ "can_chicken", 2 ], [ "dry_meat", 1 ] ]
+      [ [ "meat_red", 1, "LIST" ], [ "can_chicken", 1 ], [ "dry_meat", 1 ] ]
     ]
   },
   {
@@ -81,7 +81,7 @@
         [ "wild_herbs", 10 ]
       ],
       [ [ "cheese", 1 ], [ "cheese_hard", 1 ], [ "can_cheese", 1 ] ],
-      [ [ "meat_red", 1, "LIST" ], [ "can_chicken", 2 ], [ "dry_meat", 1 ] ]
+      [ [ "meat_red", 1, "LIST" ], [ "can_chicken", 1 ], [ "dry_meat", 1 ] ]
     ]
   },
   {
@@ -238,7 +238,7 @@
         [ "can_salmon", 1 ],
         [ "can_tuna", 1 ],
         [ "bacon", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "sausage", 1 ],
         [ "bratwurst_sausage", 1 ]
       ],
diff --git a/data/json/recipes/food/seed.json b/data/json/recipes/food/seed.json
index 9adc21a453611..a0adc992e9195 100644
--- a/data/json/recipes/food/seed.json
+++ b/data/json/recipes/food/seed.json
@@ -501,5 +501,18 @@
     "autolearn": true,
     "components": [ [ [ "chamomile", 1 ] ] ],
     "flags": [ "ALLOW_ROTTEN" ]
+  },
+  {
+    "result": "seed_sugar_beet",
+    "type": "recipe",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_SEEDS",
+    "skill_used": "survival",
+    "difficulty": 2,
+    "time": "5 m",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sugar_beet", 1 ] ] ],
+    "flags": [ "ALLOW_ROTTEN" ]
   }
 ]
diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json
index 841a1ea833a09..3d92677546f09 100644
--- a/data/json/recipes/other/parts.json
+++ b/data/json/recipes/other/parts.json
@@ -1,4 +1,30 @@
 [
+  {
+    "result": "circsaw_blade",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_PARTS",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "time": "10 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
+  },
+  {
+    "result": "blade_scythe",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_PARTS",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "time": "5 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 6 ], [ "steel_standard", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
+  },
   {
     "result": "hinge",
     "type": "recipe",
diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json
index 58d56db1c29ef..bfef49b9cbea2 100644
--- a/data/json/recipes/other/tool.json
+++ b/data/json/recipes/other/tool.json
@@ -1,4 +1,138 @@
 [
+  {
+    "result": "g_shovel",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ] ]
+  },
+  {
+    "result": "sickle",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 6 ], [ "steel_standard", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ] ]
+  },
+  {
+    "result": "knife_paring",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "scrap", 2 ] ] ]
+  },
+  {
+    "result": "knife_chef",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
+  },
+  {
+    "result": "knife_carving",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
+  },
+  {
+    "result": "knife_bread",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
+  },
+  {
+    "result": "knife_vegetable_cleaver",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
+  },
+  {
+    "result": "knife_meat_cleaver",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
+  },
+  {
+    "result": "knife_folding",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 7,
+    "time": "5 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "scrap", 4 ] ], [ [ "plastic_chunk", 1 ] ] ]
+  },
+  {
+    "result": "steel_pan",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": "1 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 3 ], [ "steel_tiny", 3 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
+  },
   {
     "result": "awl_bone",
     "type": "recipe",
@@ -39,20 +173,6 @@
     "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "mold_plastic", -1 ] ] ],
     "components": [ [ [ "plastic_chunk", 1 ] ], [ [ "scrap", 2 ] ] ]
   },
-  {
-    "type": "recipe",
-    "result": "xacto",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_TOOLS",
-    "skill_used": "fabrication",
-    "difficulty": 7,
-    "time": "5 h",
-    "autolearn": true,
-    "using": [ [ "forging_standard", 5 ] ],
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ],
-    "components": [ [ [ "plastic_chunk", 1 ] ], [ [ "scrap", 1 ] ] ]
-  },
   {
     "result": "fishing_rod_professional",
     "type": "recipe",
diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
index 1e49c2cc49b36..01e83e463285c 100644
--- a/data/json/recipes/recipe_deconstruction.json
+++ b/data/json/recipes/recipe_deconstruction.json
@@ -1762,6 +1762,22 @@
       [ [ "small_storage_battery", 2 ] ]
     ]
   },
+  {
+    "result": "large_lcd_screen",
+    "type": "uncraft",
+    "skill_used": "electronics",
+    "time": "30 m",
+    "using": [ [ "soldering_standard", 15 ] ],
+    "components": [ [ [ "e_scrap", 3 ] ], [ [ "plastic_chunk", 5 ] ] ]
+  },
+  {
+    "result": "small_lcd_screen",
+    "type": "uncraft",
+    "skill_used": "electronics",
+    "time": "10 m",
+    "using": [ [ "soldering_standard", 5 ] ],
+    "components": [ [ [ "e_scrap", 1 ] ], [ [ "plastic_chunk", 2 ] ] ]
+  },
   {
     "result": "basket_laundry",
     "type": "uncraft",
@@ -2338,6 +2354,7 @@
     "time": "1 h",
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
+      [ [ "large_lcd_screen", 1 ] ],
       [ [ "processor", 1 ] ],
       [ [ "RAM", 2 ] ],
       [ [ "cable", 8 ] ],
diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json
index 45d11d575030d..da8906f65b656 100644
--- a/data/json/recipes/recipe_electronics.json
+++ b/data/json/recipes/recipe_electronics.json
@@ -2162,7 +2162,7 @@
       [ [ "antenna", 1 ] ],
       [ [ "processor", 1 ] ],
       [ [ "RAM", 1 ] ],
-      [ [ "small_lcd_screen", 1 ] ]
+      [ [ "large_lcd_screen", 1 ] ]
     ]
   },
   {
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index 8fd1e41c8cc3a..dda3602131a13 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -1052,14 +1052,13 @@
     "time": "30 m",
     "autolearn": true,
     "batch_time_factors": [ 83, 5 ],
-    "result_mult": 2,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
     "components": [
       [ [ "water", 11 ], [ "water_clean", 11 ] ],
       [ [ "jar_glass", 1 ] ],
-      [ [ "meat", 2 ], [ "fish", 2 ] ],
-      [ [ "veggy", 2 ], [ "veggy_wild", 2 ] ]
+      [ [ "meat", 1 ], [ "fish", 1 ] ],
+      [ [ "veggy", 1 ], [ "veggy_wild", 1 ] ]
     ]
   },
   {
@@ -1082,7 +1081,7 @@
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "can_medium_unsealed", 1 ] ],
       [ [ "scrap", 1 ] ],
       [ [ "water", 1 ], [ "water_clean", 1 ] ],
       [ [ "meat", 1 ], [ "fish", 1 ] ],
@@ -1100,7 +1099,7 @@
     "skill_used": "cooking",
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "result_mult": 6,
     "autolearn": true,
     "batch_time_factors": [ 83, 5 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -1108,8 +1107,8 @@
     "components": [
       [ [ "water", 16 ], [ "water_clean", 16 ] ],
       [ [ "jar_3l_glass", 1 ] ],
-      [ [ "meat", 12 ], [ "fish", 12 ] ],
-      [ [ "veggy", 12 ], [ "veggy_wild", 12 ] ]
+      [ [ "meat", 6 ], [ "fish", 6 ] ],
+      [ [ "veggy", 6 ], [ "veggy_wild", 6 ] ]
     ]
   },
   {
@@ -1444,7 +1443,7 @@
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ],
-    "components": [ [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 2 ] ], [ [ "nachos", 3 ] ] ]
+    "components": [ [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ], [ [ "nachos", 3 ] ] ]
   },
   {
     "type": "recipe",
@@ -1458,7 +1457,7 @@
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ],
     "components": [
-      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 2 ] ],
+      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ],
       [ [ "cheese", 1 ], [ "cheese_hard", 1 ], [ "can_cheese", 1 ] ],
       [ [ "nachos", 3 ] ]
     ]
@@ -1841,6 +1840,7 @@
   {
     "type": "recipe",
     "result": "can_coconut",
+    "charges": 1,
     "byproducts": [ [ "juice_pulp", 2 ] ],
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_DRINKS",
@@ -2325,37 +2325,18 @@
     "skill_used": "cooking",
     "difficulty": 2,
     "time": "20 m",
+    "charges": 1,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "water", 1 ], [ "water_clean", 1 ] ],
-      [
-        [ "veggy_any", 1, "LIST" ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ]
-      ],
-      [
-        [ "seasoning_italian", 4 ],
-        [ "wild_herbs", 4 ],
-        [ "seasoning_salt", 1 ],
-        [ "soysauce", 2 ],
-        [ "pepper", 4 ],
-        [ "garlic_clove", 2 ],
-        [ "salt_water", 1 ],
-        [ "salt", 1 ]
-      ]
-    ]
+    "using": [ [ "broth_ingredients", 1 ] ],
+    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
   {
     "type": "recipe",
     "result": "broth_bone",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
@@ -2370,6 +2351,7 @@
   {
     "type": "recipe",
     "result": "broth_human",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
@@ -2381,6 +2363,76 @@
     "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ],
     "components": [ [ [ "bone_human", 10 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "broth",
+    "id_suffix": "canned",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "24 m",
+    "autolearn": true,
+    "contained": true,
+    "batch_time_factors": [ 83, 5 ],
+    "qualities": [
+      { "id": "SAW_M", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 3 }
+    ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
+    "using": [ [ "broth_ingredients", 2 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "broth_bone",
+    "id_suffix": "canned",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "24 m",
+    "autolearn": true,
+    "contained": true,
+    "batch_time_factors": [ 83, 5 ],
+    "qualities": [
+      { "id": "SAW_M", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 3 }
+    ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "bone", 20 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "broth_human",
+    "id_suffix": "canned",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "24 m",
+    "autolearn": true,
+    "contained": true,
+    "batch_time_factors": [ 83, 5 ],
+    "book_learn": [ [ "cookbook_human", 4 ] ],
+    "qualities": [
+      { "id": "SAW_M", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 3 }
+    ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
+    "components": [
+      [ [ "can_medium_unsealed", 1 ] ],
+      [ [ "scrap", 1 ] ],
+      [ [ "bone_human", 20 ] ],
+      [ [ "water", 2 ], [ "water_clean", 2 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "result": "soup_mushroom",
@@ -2389,16 +2441,12 @@
     "skill_used": "cooking",
     "difficulty": 2,
     "time": "20 m",
-    "charges": 2,
+    "charges": 1,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 1 ] ],
-      [ [ "mushroom", 6 ], [ "mushroom_cooked", 6 ], [ "dry_mushroom", 6 ], [ "morel_cooked", 6 ] ],
-      [ [ "flour", 5 ] ]
-    ]
+    "using": [ [ "mushroom_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
@@ -2412,18 +2460,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ] ],
-      [ [ "flour", 20 ], [ "starch", 2 ] ],
-      [ [ "mushroom", 12 ], [ "mushroom_cooked", 12 ], [ "dry_mushroom", 12 ], [ "morel_cooked", 12 ] ]
-    ]
+    "using": [ [ "mushroom_soup_ingredients", 2 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -2444,17 +2487,33 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ] ],
-      [ [ "flour", 10 ], [ "starch", 1 ] ],
-      [ [ "mushroom", 6 ], [ "mushroom_cooked", 6 ], [ "dry_mushroom", 6 ], [ "morel_cooked", 6 ] ]
-    ]
+    "using": [ [ "mushroom_soup_ingredients", 2 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "soup_mushroom",
+    "id_suffix": "jarred_3l",
+    "byproducts": [ [ "water", 10 ] ],
+    "container": "jar_3l_glass_sealed",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "skills_required": [ "mechanics", 1 ],
+    "difficulty": 4,
+    "time": "40 m",
+    "charges": 12,
+    "autolearn": true,
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
+    "using": [ [ "mushroom_soup_ingredients", 12 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
     "result": "soup_veggy",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
     "skill_used": "cooking",
@@ -2464,36 +2523,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 1 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "veggy_green", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "tofu", 1 ],
-        [ "dry_tofu", 1 ],
-        [ "raw_edamame", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "veggy_any", 1, "LIST" ] ]
-    ]
+    "using": [ [ "veggy_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
@@ -2508,34 +2538,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "cabbage", 1 ],
-        [ "irradiated_cabbage", 1 ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 2 ] ]
-    ]
+    "using": [ [ "meat_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
@@ -2550,61 +2553,12 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "veggy_any", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "can_corn", 1 ],
-        [ "dry_veggy", 1 ],
-        [ "con_milk", 1 ],
-        [ "flatbread", 1 ],
-        [ "tortilla_corn", 1 ],
-        [ "bread", 1 ],
-        [ "cornbread", 1 ],
-        [ "biscuit", 1 ],
-        [ "hardtack", 1 ],
-        [ "wastebread", 1 ],
-        [ "sourdough_bread", 1 ],
-        [ "flour", 2 ],
-        [ "cornmeal", 2 ],
-        [ "milk_powder", 1 ],
-        [ "crackers", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [
-        [ "fish", 2 ],
-        [ "dry_fish", 2 ],
-        [ "fish_smoked", 2 ],
-        [ "fish_pickled", 2 ],
-        [ "salted_fish", 2 ],
-        [ "fish_canned", 2 ],
-        [ "can_salmon", 2 ],
-        [ "can_tuna", 2 ]
-      ]
-    ]
+    "using": [ [ "fish_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
     "result": "soup_woods",
+    "charges": 2,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
@@ -2614,44 +2568,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 1 ], [ "broth_bone", 1 ], [ "pine_tea", 1 ] ],
-      [
-        [ "meat_nofish", 1, "LIST" ],
-        [ "fish", 1 ],
-        [ "fish_smoked", 1 ],
-        [ "dry_fish", 1 ],
-        [ "rehydrated_fish", 1 ],
-        [ "fish_canned", 1 ],
-        [ "can_salmon", 1 ],
-        [ "can_tuna", 1 ],
-        [ "sausage", 1 ],
-        [ "sausage_cooked", 1 ],
-        [ "bratwurst_sausage", 1 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ]
-      ],
-      [
-        [ "veggy_wild", 1 ],
-        [ "veggy", 1 ],
-        [ "rehydrated_veggy", 1 ],
-        [ "dry_veggy", 1 ],
-        [ "dry_beans", 1 ],
-        [ "can_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ]
-    ]
+    "using": [ [ "woods_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
@@ -2661,38 +2578,12 @@
     "skill_used": "cooking",
     "difficulty": 2,
     "time": "20 m",
-    "charges": 1,
+    "charges": 2,
     "batch_time_factors": [ 80, 4 ],
     "book_learn": [ [ "cookbook_human", 2 ] ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "broth_human", 2 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "cabbage", 1 ],
-        [ "irradiated_cabbage", 1 ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "dry_hflesh", 1 ], [ "rehydrated_hflesh", 1 ], [ "human_meat", 1, "LIST" ] ]
-    ]
+    "using": [ [ "human_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
@@ -2890,7 +2781,7 @@
     "tools": [ [ [ "char_smoker", 10 ] ] ],
     "components": [
       [ [ "syrup", 1 ] ],
-      [ [ "meat_red", 3, "LIST" ], [ "can_chicken", 6 ] ],
+      [ [ "meat_red", 3, "LIST" ], [ "can_chicken", 3 ] ],
       [ [ "edible_fat", 1, "LIST" ], [ "edible_tallow_lard", 2, "LIST" ] ],
       [
         [ "salt", 10 ],
@@ -3049,7 +2940,7 @@
         [ "meat_smoked", 1 ],
         [ "dry_meat", 1 ],
         [ "can_chicken", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "fish", 1 ],
         [ "fish_smoked", 1 ],
         [ "dry_fish", 1 ],
@@ -3132,7 +3023,7 @@
         [ "meat_smoked", 1 ],
         [ "dry_meat", 1 ],
         [ "can_chicken", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "fish", 1 ],
         [ "fish_smoked", 1 ],
         [ "dry_fish", 1 ],
@@ -3214,7 +3105,7 @@
         [ "meat_smoked", 1 ],
         [ "dry_meat", 1 ],
         [ "can_chicken", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "fish", 1 ],
         [ "fish_smoked", 1 ],
         [ "dry_fish", 1 ],
@@ -3650,7 +3541,7 @@
         [ "meat_salted", 1 ],
         [ "meat_canned", 1 ],
         [ "can_chicken", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "fish_pickled", 1 ],
         [ "salted_fish", 1 ],
         [ "fish_canned", 1 ],
@@ -3692,7 +3583,7 @@
         [ "meat_salted", 1 ],
         [ "meat_canned", 1 ],
         [ "can_chicken", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "fish_pickled", 1 ],
         [ "salted_fish", 1 ],
         [ "fish_canned", 1 ],
@@ -4092,6 +3983,7 @@
   {
     "type": "recipe",
     "result": "curry_meat",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
@@ -4126,6 +4018,7 @@
   {
     "type": "recipe",
     "result": "curry_veggy",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
     "skill_used": "cooking",
@@ -4575,49 +4468,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "pine_tea", 2 ] ],
-      [
-        [ "meat_nofish", 2, "LIST" ],
-        [ "fish", 2 ],
-        [ "fish_smoked", 2 ],
-        [ "dry_fish", 2 ],
-        [ "rehydrated_fish", 2 ],
-        [ "fish_canned", 2 ],
-        [ "can_salmon", 2 ],
-        [ "can_tuna", 2 ],
-        [ "sausage", 4 ],
-        [ "sausage_cooked", 4 ],
-        [ "bratwurst_sausage", 4 ],
-        [ "powder_eggs", 4 ],
-        [ "eggs_bird", 4, "LIST" ],
-        [ "egg_reptile", 4 ]
-      ],
-      [
-        [ "veggy_wild", 2 ],
-        [ "veggy", 2 ],
-        [ "rehydrated_veggy", 2 ],
-        [ "dry_veggy", 2 ],
-        [ "dry_beans", 2 ],
-        [ "can_beans", 2 ],
-        [ "raw_beans", 2 ],
-        [ "beans_cooked", 2 ],
-        [ "dry_rice", 2 ],
-        [ "dandelion_cooked", 2 ],
-        [ "mushroom", 2 ],
-        [ "dry_mushroom", 2 ],
-        [ "mushroom_cooked", 2 ],
-        [ "morel_cooked", 2 ],
-        [ "acorns_cooked", 2 ]
-      ]
-    ]
+    "using": [ [ "woods_soup_ingredients", 1 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -4631,38 +4488,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
-      [
-        [ "irradiated_potato", 2 ],
-        [ "potato", 2 ],
-        [ "celery", 2 ],
-        [ "irradiated_celery", 2 ],
-        [ "veggy_green", 2, "LIST" ],
-        [ "sauerkraut", 2 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ],
-        [ "can_beans", 2 ],
-        [ "beans_cooked", 2 ],
-        [ "spaghetti_raw", 2 ],
-        [ "macaroni_raw", 2 ],
-        [ "noodles_fast", 2 ],
-        [ "dry_beans", 2 ],
-        [ "raw_beans", 2 ],
-        [ "dry_rice", 2 ],
-        [ "dandelion_cooked", 2 ],
-        [ "acorns_cooked", 2 ]
-      ],
-      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 2 ] ]
-    ]
+    "using": [ [ "meat_soup_ingredients", 1 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -4676,41 +4508,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ] ],
-      [
-        [ "irradiated_potato", 2 ],
-        [ "potato", 2 ],
-        [ "celery", 2 ],
-        [ "irradiated_celery", 2 ],
-        [ "veggy_green", 2, "LIST" ],
-        [ "sauerkraut", 2 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ],
-        [ "can_beans", 2 ],
-        [ "beans_cooked", 2 ],
-        [ "spaghetti_raw", 2 ],
-        [ "macaroni_raw", 2 ],
-        [ "noodles_fast", 2 ],
-        [ "dry_beans", 2 ],
-        [ "raw_beans", 2 ],
-        [ "tofu", 2 ],
-        [ "dry_tofu", 2 ],
-        [ "raw_edamame", 2 ],
-        [ "dry_rice", 2 ],
-        [ "dandelion_cooked", 2 ],
-        [ "acorns_cooked", 2 ]
-      ],
-      [ [ "veggy_any", 2, "LIST" ] ]
-    ]
+    "using": [ [ "veggy_soup_ingredients", 2 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -4724,64 +4528,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "veggy_any", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "can_corn", 1 ],
-        [ "dry_veggy", 1 ],
-        [ "con_milk", 1 ],
-        [ "flatbread", 1 ],
-        [ "tortilla_corn", 1 ],
-        [ "bread", 1 ],
-        [ "cornbread", 1 ],
-        [ "biscuit", 1 ],
-        [ "hardtack", 1 ],
-        [ "wastebread", 1 ],
-        [ "sourdough_bread", 1 ],
-        [ "flour", 2 ],
-        [ "cornmeal", 2 ],
-        [ "milk_powder", 1 ],
-        [ "crackers", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [
-        [ "fish", 2 ],
-        [ "dry_fish", 2 ],
-        [ "fish_smoked", 2 ],
-        [ "fish_pickled", 2 ],
-        [ "salted_fish", 2 ],
-        [ "fish_canned", 2 ],
-        [ "can_salmon", 2 ],
-        [ "can_tuna", 2 ]
-      ]
-    ]
+    "using": [ [ "fish_soup_ingredients", 1 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -4794,39 +4547,14 @@
     "skill_used": "cooking",
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
-    "time": "30 m",
-    "result_mult": 2,
-    "book_learn": [ [ "cookbook_human", 4 ] ],
-    "batch_time_factors": [ 80, 4 ],
-    "qualities": [ { "id": "COOK", "level": 3 } ],
-    "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ], [ "broth_human", 2 ], [ "broth_bone", 1 ] ],
-      [
-        [ "irradiated_potato", 2 ],
-        [ "potato", 2 ],
-        [ "celery", 2 ],
-        [ "irradiated_celery", 2 ],
-        [ "cabbage", 2 ],
-        [ "irradiated_cabbage", 2 ],
-        [ "sauerkraut", 2 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ],
-        [ "can_beans", 2 ],
-        [ "spaghetti_raw", 2 ],
-        [ "macaroni_raw", 2 ],
-        [ "noodles_fast", 2 ],
-        [ "dry_beans", 2 ],
-        [ "raw_beans", 2 ],
-        [ "dry_rice", 2 ],
-        [ "beans_cooked", 2 ],
-        [ "acorns_cooked", 2 ]
-      ],
-      [ [ "dry_hflesh", 2 ], [ "rehydrated_hflesh", 2 ], [ "human_meat", 2, "LIST" ] ]
-    ]
+    "time": "30 m",
+    "charges": 2,
+    "book_learn": [ [ "cookbook_human", 4 ] ],
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
+    "using": [ [ "human_soup_ingredients", 1 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -4840,35 +4568,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 12 ], [ "water_clean", 12 ] ],
-      [
-        [ "veggy_any", 2, "LIST" ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ],
-        [ "mushroom_cooked", 2 ],
-        [ "morel_cooked", 2 ],
-        [ "mushroom", 2 ],
-        [ "dry_mushroom", 2 ]
-      ],
-      [
-        [ "seasoning_italian", 6 ],
-        [ "wild_herbs", 6 ],
-        [ "seasoning_salt", 2 ],
-        [ "soysauce", 2 ],
-        [ "pepper", 2 ],
-        [ "garlic_clove", 1 ],
-        [ "salt_water", 1 ],
-        [ "salt", 2 ]
-      ]
-    ]
+    "using": [ [ "broth_ingredients", 2 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 12 ], [ "water_clean", 12 ] ] ]
   },
   {
     "type": "recipe",
@@ -4882,7 +4588,7 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "1 h",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
@@ -4901,7 +4607,7 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "1 h",
-    "result_mult": 2,
+    "charges": 2,
     "book_learn": [ [ "cookbook_human", 4 ] ],
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
@@ -5046,6 +4752,7 @@
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "2 m 45 s",
+    "batch_time_factors": [ 80, 2 ],
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
@@ -5832,6 +5539,7 @@
   {
     "type": "recipe",
     "result": "sloppyjoe",
+    "charges": 2,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
@@ -6426,7 +6134,7 @@
     "skill_used": "cooking",
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 83, 5 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -6608,10 +6316,10 @@
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "can_medium_unsealed", 1 ] ],
       [ [ "scrap", 1 ] ],
       [ [ "water", 1 ], [ "water_clean", 1 ] ],
-      [ [ "beans_cooked", 1 ], [ "dry_beans", 1 ], [ "raw_beans", 1 ] ]
+      [ [ "beans_cooked", 2 ], [ "dry_beans", 2 ], [ "raw_beans", 2 ] ]
     ]
   },
   {
@@ -6633,48 +6341,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ], [ "broth_bone", 1 ], [ "pine_tea", 1 ] ],
-      [
-        [ "meat_nofish", 1, "LIST" ],
-        [ "rehydrated_meat", 1 ],
-        [ "meat_canned", 1 ],
-        [ "can_chicken", 1 ],
-        [ "fish", 1 ],
-        [ "fish_smoked", 1 ],
-        [ "dry_fish", 1 ],
-        [ "rehydrated_fish", 1 ],
-        [ "fish_canned", 1 ],
-        [ "can_salmon", 1 ],
-        [ "can_tuna", 1 ],
-        [ "sausage", 2 ],
-        [ "sausage_cooked", 2 ],
-        [ "bratwurst_sausage", 2 ],
-        [ "bacon", 2 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ]
-      ],
-      [
-        [ "veggy_wild", 1 ],
-        [ "veggy", 1 ],
-        [ "rehydrated_veggy", 1 ],
-        [ "dry_veggy", 1 ],
-        [ "dry_beans", 1 ],
-        [ "can_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dry_rice", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ]
-    ]
+    "using": [ [ "woods_soup_ingredients", 1 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -6695,33 +6363,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "veggy_green", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "veggy_any", 1, "LIST" ] ]
-    ]
+    "using": [ [ "veggy_soup_ingredients", 2 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -6742,33 +6385,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ], [ "broth_bone", 1 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "veggy_green", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ]
-    ]
+    "using": [ [ "meat_soup_ingredients", 1 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -6789,34 +6407,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "//": "This recipe currently has issues with not being able to give it a result_mult or charges. As such, limited ingredients will make it function with the values for meat.",
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ], [ "broth_bone", 1 ], [ "broth_human", 1 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "cabbage", 1 ],
-        [ "irradiated_cabbage", 1 ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "can_beans", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_rice", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "dry_hflesh", 1 ], [ "rehydrated_hflesh", 1 ], [ "human_meat", 1, "LIST" ] ]
-    ]
+    "using": [ [ "human_soup_ingredients", 1 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -6837,59 +6429,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ], [ "broth_bone", 1 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "veggy_any", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "can_corn", 1 ],
-        [ "dry_veggy", 1 ],
-        [ "con_milk", 1 ],
-        [ "flatbread", 1 ],
-        [ "tortilla_corn", 1 ],
-        [ "bread", 1 ],
-        [ "cornbread", 1 ],
-        [ "biscuit", 1 ],
-        [ "hardtack", 1 ],
-        [ "wastebread", 1 ],
-        [ "sourdough_bread", 1 ],
-        [ "flour", 1 ],
-        [ "cornmeal", 1 ],
-        [ "milk_powder", 1 ],
-        [ "crackers", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [
-        [ "fish", 1 ],
-        [ "dry_fish", 1 ],
-        [ "fish_smoked", 1 ],
-        [ "fish_pickled", 1 ],
-        [ "salted_fish", 1 ],
-        [ "fish_canned", 1 ],
-        [ "can_salmon", 1 ],
-        [ "can_tuna", 1 ]
-      ]
-    ]
+    "using": [ [ "fish_soup_ingredients", 1 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -7348,6 +6889,7 @@
   {
     "type": "recipe",
     "result": "soup_cullenskink",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
@@ -8072,7 +7614,7 @@
     "time": "40 m",
     "autolearn": true,
     "batch_time_factors": [ 83, 5 ],
-    "result_mult": 12,
+    "charges": 12,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
     "components": [
@@ -8094,7 +7636,7 @@
     "time": "40 m",
     "autolearn": true,
     "batch_time_factors": [ 83, 5 ],
-    "result_mult": 12,
+    "charges": 12,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
     "components": [
@@ -8226,52 +7768,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 12 ], [ "broth_bone", 12 ], [ "pine_tea", 12 ] ],
-      [
-        [ "meat_nofish", 12, "LIST" ],
-        [ "rehydrated_meat", 12 ],
-        [ "meat_canned", 12 ],
-        [ "fish", 12 ],
-        [ "fish_smoked", 12 ],
-        [ "dry_fish", 12 ],
-        [ "rehydrated_fish", 12 ],
-        [ "fish_canned", 12 ],
-        [ "can_salmon", 12 ],
-        [ "can_tuna", 12 ],
-        [ "sausage", 24 ],
-        [ "sausage_cooked", 24 ],
-        [ "bratwurst_sausage", 24 ],
-        [ "bacon", 24 ],
-        [ "powder_eggs", 24 ],
-        [ "eggs_bird", 24, "LIST" ],
-        [ "egg_reptile", 24 ]
-      ],
-      [
-        [ "veggy_wild", 12 ],
-        [ "veggy", 12 ],
-        [ "rehydrated_veggy", 12 ],
-        [ "dry_veggy", 12 ],
-        [ "dry_beans", 12 ],
-        [ "can_beans", 12 ],
-        [ "raw_beans", 12 ],
-        [ "beans_cooked", 12 ],
-        [ "dry_rice", 12 ],
-        [ "dandelion_cooked", 12 ],
-        [ "mushroom", 12 ],
-        [ "dry_mushroom", 12 ],
-        [ "mushroom_cooked", 12 ],
-        [ "morel_cooked", 12 ],
-        [ "acorns_cooked", 12 ]
-      ]
-    ]
+    "using": [ [ "woods_soup_ingredients", 6 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -8285,38 +7788,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 12 ], [ "broth_bone", 12 ] ],
-      [
-        [ "irradiated_potato", 6 ],
-        [ "potato", 6 ],
-        [ "celery", 6 ],
-        [ "irradiated_celery", 6 ],
-        [ "veggy_green", 6, "LIST" ],
-        [ "sauerkraut", 6 ],
-        [ "powder_eggs", 6 ],
-        [ "eggs_bird", 6, "LIST" ],
-        [ "egg_reptile", 6 ],
-        [ "can_beans", 6 ],
-        [ "beans_cooked", 6 ],
-        [ "spaghetti_raw", 6 ],
-        [ "macaroni_raw", 6 ],
-        [ "noodles_fast", 6 ],
-        [ "dry_beans", 6 ],
-        [ "raw_beans", 6 ],
-        [ "dry_rice", 6 ],
-        [ "dandelion_cooked", 6 ],
-        [ "acorns_cooked", 6 ]
-      ],
-      [ [ "meat_red", 6, "LIST" ], [ "dry_meat", 6 ], [ "can_chicken", 12 ] ]
-    ]
+    "using": [ [ "meat_soup_ingredients", 6 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -8330,38 +7808,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 12 ] ],
-      [
-        [ "irradiated_potato", 12 ],
-        [ "potato", 12 ],
-        [ "celery", 12 ],
-        [ "irradiated_celery", 12 ],
-        [ "veggy_green", 12, "LIST" ],
-        [ "sauerkraut", 12 ],
-        [ "powder_eggs", 12 ],
-        [ "eggs_bird", 12, "LIST" ],
-        [ "egg_reptile", 12 ],
-        [ "can_beans", 12 ],
-        [ "beans_cooked", 12 ],
-        [ "spaghetti_raw", 12 ],
-        [ "macaroni_raw", 12 ],
-        [ "noodles_fast", 12 ],
-        [ "dry_beans", 12 ],
-        [ "raw_beans", 12 ],
-        [ "dry_rice", 12 ],
-        [ "dandelion_cooked", 12 ],
-        [ "acorns_cooked", 12 ]
-      ],
-      [ [ "veggy_any", 12, "LIST" ] ]
-    ]
+    "using": [ [ "veggy_soup_ingredients", 12 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -8375,64 +7828,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 12 ], [ "broth_bone", 12 ] ],
-      [
-        [ "spaghetti_raw", 6 ],
-        [ "macaroni_raw", 6 ],
-        [ "noodles_fast", 6 ],
-        [ "veggy_any", 6, "LIST" ],
-        [ "sauerkraut", 6 ],
-        [ "can_corn", 6 ],
-        [ "dry_veggy", 6 ],
-        [ "con_milk", 6 ],
-        [ "flatbread", 6 ],
-        [ "tortilla_corn", 6 ],
-        [ "bread", 6 ],
-        [ "cornbread", 6 ],
-        [ "biscuit", 6 ],
-        [ "hardtack", 6 ],
-        [ "wastebread", 6 ],
-        [ "sourdough_bread", 6 ],
-        [ "flour", 12 ],
-        [ "cornmeal", 12 ],
-        [ "milk_powder", 6 ],
-        [ "crackers", 6 ],
-        [ "powder_eggs", 6 ],
-        [ "eggs_bird", 6, "LIST" ],
-        [ "egg_reptile", 6 ],
-        [ "dry_beans", 6 ],
-        [ "raw_beans", 6 ],
-        [ "dry_lentils", 6 ],
-        [ "raw_lentils", 6 ],
-        [ "dry_rice", 6 ],
-        [ "can_beans", 6 ],
-        [ "beans_cooked", 6 ],
-        [ "dandelion_cooked", 6 ],
-        [ "mushroom", 6 ],
-        [ "dry_mushroom", 6 ],
-        [ "mushroom_cooked", 6 ],
-        [ "morel_cooked", 6 ],
-        [ "acorns_cooked", 6 ]
-      ],
-      [
-        [ "fish", 12 ],
-        [ "dry_fish", 12 ],
-        [ "fish_smoked", 12 ],
-        [ "fish_pickled", 12 ],
-        [ "salted_fish", 12 ],
-        [ "fish_canned", 12 ],
-        [ "can_salmon", 12 ],
-        [ "can_tuna", 12 ]
-      ]
-    ]
+    "using": [ [ "fish_soup_ingredients", 6 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -8446,38 +7848,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "book_learn": [ [ "cookbook_human", 4 ] ],
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 12 ], [ "broth_human", 12 ], [ "broth_bone", 6 ] ],
-      [
-        [ "irradiated_potato", 12 ],
-        [ "potato", 12 ],
-        [ "celery", 12 ],
-        [ "irradiated_celery", 12 ],
-        [ "cabbage", 12 ],
-        [ "irradiated_cabbage", 12 ],
-        [ "sauerkraut", 12 ],
-        [ "powder_eggs", 12 ],
-        [ "eggs_bird", 12, "LIST" ],
-        [ "egg_reptile", 12 ],
-        [ "can_beans", 12 ],
-        [ "spaghetti_raw", 12 ],
-        [ "macaroni_raw", 12 ],
-        [ "noodles_fast", 12 ],
-        [ "dry_beans", 12 ],
-        [ "raw_beans", 12 ],
-        [ "dry_rice", 12 ],
-        [ "beans_cooked", 12 ],
-        [ "acorns_cooked", 12 ]
-      ],
-      [ [ "dry_hflesh", 12 ], [ "rehydrated_hflesh", 12 ], [ "human_meat", 12, "LIST" ] ]
-    ]
+    "using": [ [ "human_soup_ingredients", 6 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -8491,35 +7868,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 22 ], [ "water_clean", 22 ] ],
-      [
-        [ "veggy_any", 12, "LIST" ],
-        [ "powder_eggs", 12 ],
-        [ "eggs_bird", 12, "LIST" ],
-        [ "egg_reptile", 12 ],
-        [ "mushroom_cooked", 12 ],
-        [ "morel_cooked", 12 ],
-        [ "mushroom", 12 ],
-        [ "dry_mushroom", 12 ]
-      ],
-      [
-        [ "seasoning_italian", 60 ],
-        [ "wild_herbs", 60 ],
-        [ "seasoning_salt", 60 ],
-        [ "soysauce", 8 ],
-        [ "pepper", 80 ],
-        [ "garlic_clove", 24 ],
-        [ "salt_water", 4 ],
-        [ "salt", 60 ]
-      ]
-    ]
+    "using": [ [ "broth_ingredients", 12 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 22 ], [ "water_clean", 22 ] ] ]
   },
   {
     "type": "recipe",
@@ -8533,12 +7888,12 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "1 h 10 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 24 ], [ "water_clean", 24 ] ], [ [ "bone", 120 ] ] ]
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 22 ], [ "water_clean", 22 ] ], [ [ "bone", 120 ] ] ]
   },
   {
     "type": "recipe",
@@ -8552,12 +7907,12 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "1 h 10 m",
-    "result_mult": 12,
+    "charges": 12,
     "book_learn": [ [ "cookbook_human", 4 ] ],
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 24 ], [ "water_clean", 24 ] ], [ [ "bone_human", 120 ] ] ]
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 22 ], [ "water_clean", 22 ] ], [ [ "bone_human", 120 ] ] ]
   },
   {
     "type": "recipe",
@@ -8584,7 +7939,7 @@
     "skill_used": "cooking",
     "difficulty": 4,
     "time": "2 h",
-    "result_mult": 12,
+    "charges": 48,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -8606,7 +7961,7 @@
     "skill_used": "cooking",
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 2,
+    "charges": 8,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -8637,10 +7992,10 @@
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "can_medium_unsealed", 1 ] ],
       [ [ "scrap", 1 ] ],
-      [ [ "can_tomato", 2 ], [ "tomato", 2 ], [ "irradiated_tomato", 2 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ] ]
+      [ [ "can_tomato", 4 ], [ "tomato", 4 ], [ "irradiated_tomato", 4 ] ],
+      [ [ "water", 2 ], [ "water_clean", 2 ] ]
     ]
   },
   {
@@ -8669,6 +8024,7 @@
   {
     "type": "recipe",
     "result": "con_milk",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
@@ -8704,7 +8060,7 @@
     "difficulty": 3,
     "autolearn": true,
     "time": "2 h",
-    "result_mult": 12,
+    "charges": 12,
     "book_learn": [ [ "cookbook_italian", 2 ], [ "family_cookbook", 2 ], [ "mag_cooking", 2 ] ],
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -8736,7 +8092,7 @@
     "difficulty": 3,
     "autolearn": true,
     "time": "45 m",
-    "result_mult": 2,
+    "charges": 2,
     "book_learn": [ [ "cookbook_italian", 2 ], [ "family_cookbook", 2 ], [ "mag_cooking", 2 ] ],
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -8776,16 +8132,16 @@
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "can_medium_unsealed", 1 ] ],
       [ [ "scrap", 1 ] ],
-      [ [ "milk_standard_raw", 2, "LIST" ] ],
+      [ [ "milk_standard_raw", 4, "LIST" ] ],
       [
-        [ "sugar", 100 ],
-        [ "syrup", 1 ],
-        [ "beet_syrup", 1 ],
-        [ "molasses", 1 ],
-        [ "honey_bottled", 1 ],
-        [ "honey_glassed", 1 ]
+        [ "sugar", 200 ],
+        [ "syrup", 2 ],
+        [ "beet_syrup", 2 ],
+        [ "molasses", 2 ],
+        [ "honey_bottled", 2 ],
+        [ "honey_glassed", 2 ]
       ]
     ]
   },
diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json
index 28c90003ec98d..a2bc417af32fc 100644
--- a/data/json/recipes/recipe_obsolete.json
+++ b/data/json/recipes/recipe_obsolete.json
@@ -421,11 +421,6 @@
     "result": "bio_recycleruncraft",
     "obsolete": true
   },
-  {
-    "type": "recipe",
-    "result": "bio_solar",
-    "obsolete": true
-  },
   {
     "type": "recipe",
     "result": "bio_water_extractor",
@@ -1920,5 +1915,10 @@
     "type": "recipe",
     "result": "pressure_cooker",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "xacto",
+    "obsolete": true
   }
 ]
diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
index d1201087cc961..b4fd73e8129bb 100644
--- a/data/json/recipes/recipe_others.json
+++ b/data/json/recipes/recipe_others.json
@@ -24,7 +24,7 @@
     "time": "25 m",
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
-    "components": [ [ [ "glass_shard", 322 ], [ "glass_sheet", 1 ] ], [ [ "superglue", 1 ], [ "bone_glue", 1 ] ] ]
+    "components": [ [ [ "glass_shard", 17 ] ], [ [ "superglue", 1 ], [ "bone_glue", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -2502,6 +2502,19 @@
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "can_medium_unsealed",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_CONTAINERS",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "time": "30 m",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
+  },
   {
     "type": "recipe",
     "result": "jackhammer",
@@ -2935,7 +2948,7 @@
     "book_learn": [ [ "glassblowing_book", 5 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 150 ] ] ],
-    "components": [ [ [ "glass_shard", 5 ], [ "flask_glass", 6 ], [ "jar_glass", 4 ] ] ]
+    "components": [ [ [ "glass_shard", 27 ], [ "flask_glass", 6 ], [ "jar_glass", 4 ] ] ]
   },
   {
     "type": "recipe",
@@ -2948,7 +2961,7 @@
     "book_learn": [ [ "glassblowing_book", 5 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 75 ] ] ],
-    "components": [ [ [ "glass_shard", 3 ], [ "flask_glass", 3 ], [ "jar_glass", 2 ] ] ]
+    "components": [ [ [ "glass_shard", 15 ], [ "flask_glass", 3 ], [ "jar_glass", 2 ] ] ]
   },
   {
     "type": "recipe",
@@ -2961,7 +2974,7 @@
     "book_learn": [ [ "glassblowing_book", 4 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 50 ] ] ],
-    "components": [ [ [ "glass_shard", 8 ], [ "flask_glass", 2 ] ] ]
+    "components": [ [ [ "glass_shard", 11 ], [ "flask_glass", 2 ] ] ]
   },
   {
     "type": "recipe",
@@ -3026,7 +3039,7 @@
     "book_learn": [ [ "glassblowing_book", 6 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 25 ] ] ],
-    "components": [ [ [ "glass_shard", 2 ] ] ]
+    "components": [ [ [ "glass_shard", 4 ] ] ]
   },
   {
     "type": "recipe",
@@ -3038,7 +3051,7 @@
     "time": "1 h",
     "autolearn": true,
     "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "sheet_metal", -1 ] ], [ [ "forge", 75 ] ] ],
-    "components": [ [ [ "glass_shard", 322 ], [ "flask_glass", 80 ], [ "jar_glass", 40 ] ] ]
+    "components": [ [ [ "glass_shard", 250 ], [ "flask_glass", 63 ], [ "jar_glass", 21 ] ] ]
   },
   {
     "type": "recipe",
@@ -3455,6 +3468,7 @@
     "difficulty": 4,
     "time": "20 m",
     "autolearn": true,
+    "reversible": true,
     "using": [ [ "soldering_standard", 25 ] ],
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "cable", 100 ] ], [ [ "scrap", 4 ] ], [ [ "duct_tape", 50 ] ] ]
@@ -3469,6 +3483,7 @@
     "difficulty": 5,
     "time": "2 h",
     "autolearn": true,
+    "reversible": true,
     "using": [ [ "soldering_standard", 60 ] ],
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "cable", 650 ] ], [ [ "scrap", 10 ] ], [ [ "duct_tape", 30 ] ], [ [ "hose", 2 ] ] ]
diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json
index 2efcdc1cf7c52..20fc4b379813f 100644
--- a/data/json/recipes/recipe_vehicle.json
+++ b/data/json/recipes/recipe_vehicle.json
@@ -377,11 +377,10 @@
     "skill_used": "fabrication",
     "difficulty": 2,
     "time": 30000,
-    "reversible": true,
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
     "using": [ [ "sewing_standard", 100 ] ],
-    "components": [ [ [ "rag", 40 ], [ "sheet", 2 ] ], [ [ "2x4", 10 ], [ "stick", 8 ], [ "stick_long", 4 ] ], [ [ "nail", 30 ] ] ]
+    "components": [ [ [ "sheet", 2 ] ], [ [ "2x4", 4 ], [ "stick", 4 ] ], [ [ "nail", 20 ] ] ]
   },
   {
     "type": "recipe",
diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json
index b5bc52949b34f..171b9bc73a87b 100644
--- a/data/json/recipes/weapon/bashing.json
+++ b/data/json/recipes/weapon/bashing.json
@@ -1,4 +1,17 @@
 [
+  {
+    "result": "hollow_cane",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_BASHING",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "40 m",
+    "autolearn": true,
+    "using": [ [ "adhesive", 1 ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "2x4", 1 ] ], [ [ "nail", 5 ] ] ]
+  },
   {
     "result": "battletorch",
     "type": "recipe",
diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json
index abf165f1b68f0..c95f8c38673fd 100644
--- a/data/json/recipes/weapon/piercing.json
+++ b/data/json/recipes/weapon/piercing.json
@@ -1,4 +1,104 @@
 [
+  {
+    "result": "fencing_epee_sharpened",
+    "id_suffix": "from_scratch",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 7,
+    "time": "6 h",
+    "book_learn": [ [ "textbook_weapwest", 6 ] ],
+    "using": [ [ "blacksmithing_standard", 3 ], [ "steel_tiny", 3 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ] ]
+  },
+  {
+    "result": "fencing_foil_sharpened",
+    "id_suffix": "from_scratch",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 7,
+    "time": "6 h",
+    "book_learn": [ [ "textbook_weapwest", 6 ] ],
+    "using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ] ]
+  },
+  {
+    "result": "fencing_sabre_sharpened",
+    "id_suffix": "from_scratch",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 7,
+    "time": "6 h",
+    "book_learn": [ [ "textbook_weapwest", 6 ] ],
+    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "sheet_metal_small", 1 ] ] ]
+  },
+  {
+    "result": "kirpan",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "time": "3 h",
+    "book_learn": [ [ "textbook_weapeast", 5 ] ],
+    "using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
+  },
+  {
+    "result": "kris",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 9,
+    "time": "10 h",
+    "book_learn": [ [ "textbook_weapeast", 9 ] ],
+    "using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ] ]
+  },
+  {
+    "result": "pitchfork",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "stick_long", 1 ] ] ]
+  },
+  {
+    "result": "sword_cane",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "time": "8 h",
+    "book_learn": [ [ "textbook_weapwest", 8 ] ],
+    "using": [ [ "blacksmithing_standard", 3 ], [ "steel_tiny", 3 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ] ]
+  },
   {
     "result": "spear_steel",
     "type": "recipe",
diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json
index 48157a1d643e3..882e878e47d3d 100644
--- a/data/json/recipes/weapon/ranged.json
+++ b/data/json/recipes/weapon/ranged.json
@@ -14,6 +14,19 @@
     "using": [ [ "welding_standard", 40 ] ],
     "components": [ [ [ "pipe", 2 ] ], [ [ "hose", 2 ] ], [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "staff_sling",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_RANGED",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "throw", 1 ],
+    "time": "1 h",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_W", "level": 1 } ],
+    "components": [ [ [ "stick_long", 1 ] ], [ [ "sling", 1 ] ], [ [ "nail", 1 ] ] ]
+  },
   {
     "result": "nailrifle",
     "type": "recipe",
diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
index 46c22b86ad736..a473f0c119d0f 100644
--- a/data/json/regional_map_settings.json
+++ b/data/json/regional_map_settings.json
@@ -3,7 +3,67 @@
     "type": "region_settings",
     "id": "default",
     "default_oter": "field",
-    "default_groundcover": [ [ "t_grass", 4 ], [ "t_grass_long", 2 ], [ "t_dirt", 1 ] ],
+    "default_groundcover": [ [ "t_region_groundcover", 1 ] ],
+    "region_terrain_and_furniture": {
+      "terrain": {
+        "t_region_groundcover": { "t_grass": 4, "t_grass_long": 2, "t_dirt": 1 },
+        "t_region_shrub": {
+          "t_underbrush": 30,
+          "t_shrub": 5,
+          "t_shrub_blueberry": 1,
+          "t_shrub_strawberry": 1,
+          "t_shrub_blackberry": 1,
+          "t_shrub_raspberry": 1,
+          "t_shrub_huckleberry": 1,
+          "t_shrub_grape": 1,
+          "t_shrub_rose": 1,
+          "t_shrub_hydrangea": 1,
+          "t_shrub_lilac": 1
+        },
+        "t_region_tree": {
+          "t_tree": 128,
+          "t_tree_young": 128,
+          "t_tree_birch": 16,
+          "t_tree_elm": 16,
+          "t_tree_cottonwood": 16,
+          "t_tree_pine": 32,
+          "t_tree_maple": 32,
+          "t_tree_willow": 32,
+          "t_tree_hickory": 16,
+          "t_tree_walnut": 8,
+          "t_tree_chestnut": 8,
+          "t_tree_hazelnut": 2,
+          "t_tree_beech": 2,
+          "t_tree_blackjack": 8,
+          "t_tree_coffee": 2,
+          "t_tree_apple": 2,
+          "t_tree_apricot": 2,
+          "t_tree_cherry": 2,
+          "t_tree_juniper": 2,
+          "t_tree_peach": 2,
+          "t_tree_pear": 2,
+          "t_tree_plum": 2,
+          "t_tree_elderberry": 2,
+          "t_tree_mulberry": 2,
+          "t_tree_deadpine": 16,
+          "t_tree_hickory_dead": 16,
+          "t_tree_dead": 16
+        }
+      },
+      "furniture": {
+        "f_region_flower": {
+          "f_black_eyed_susan": 1,
+          "f_lily": 1,
+          "f_flower_tulip": 1,
+          "f_flower_spurge": 1,
+          "f_chamomile": 1,
+          "f_dandelion": 1,
+          "f_datura": 1,
+          "f_dahlia": 1,
+          "f_bluebell": 1
+        }
+      }
+    },
     "river_scale": 1.0,
     "field_coverage": {
       "percent_coverage": 0.9333,
@@ -797,7 +857,9 @@
         "s_petstore_1": 100,
         "s_petstore_2": 100,
         "megastore": 150,
-        "hotel": 75,
+        "hotel_1": 75,
+        "hotel_2": 75,
+        "hotel_3": 75,
         "hospital": 175,
         "public_works": 200,
         "office_tower_2": 150,
diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
index c3e241c96bd9f..2ac0f06d28fcd 100644
--- a/data/json/requirements/cooking_components.json
+++ b/data/json/requirements/cooking_components.json
@@ -133,7 +133,7 @@
         [ "bacon", 4 ],
         [ "lunchmeat", 5 ],
         [ "bologna", 5 ],
-        [ "can_spam", 4 ],
+        [ "can_spam", 2 ],
         [ "can_chicken", 1 ],
         [ "meat_pickled", 1 ],
         [ "dry_meat", 1 ],
@@ -160,8 +160,8 @@
         [ "bacon", 1 ],
         [ "lunchmeat", 2 ],
         [ "bologna", 5 ],
-        [ "can_spam", 4 ],
-        [ "fried_spam", 4 ],
+        [ "can_spam", 2 ],
+        [ "fried_spam", 2 ],
         [ "can_chicken", 1 ],
         [ "fish_cooked", 1 ],
         [ "fish_smoked", 1 ],
@@ -191,6 +191,167 @@
     "//": "Cooked meat that non-cannibals would be unhappy eating.",
     "components": [ [ [ "human_cooked", 1 ], [ "mutant_human_cooked", 1 ] ] ]
   },
+  {
+    "id": "meat_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
+      [
+        [ "irradiated_potato", 1 ],
+        [ "potato", 1 ],
+        [ "celery", 1 ],
+        [ "irradiated_celery", 1 ],
+        [ "cabbage", 1 ],
+        [ "irradiated_cabbage", 1 ],
+        [ "sauerkraut", 1 ],
+        [ "powder_eggs", 1 ],
+        [ "eggs_bird", 1, "LIST" ],
+        [ "egg_reptile", 1 ],
+        [ "can_beans", 1 ],
+        [ "beans_cooked", 1 ],
+        [ "spaghetti_raw", 1 ],
+        [ "macaroni_raw", 1 ],
+        [ "noodles_fast", 1 ],
+        [ "dry_beans", 1 ],
+        [ "raw_beans", 1 ],
+        [ "dry_rice", 1 ],
+        [ "dandelion_cooked", 1 ],
+        [ "acorns_cooked", 1 ],
+        [ "dry_lentils", 1 ],
+        [ "raw_lentils", 1 ]
+      ],
+      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ]
+    ]
+  },
+  {
+    "id": "human_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "broth_human", 2 ] ],
+      [
+        [ "irradiated_potato", 1 ],
+        [ "potato", 1 ],
+        [ "celery", 1 ],
+        [ "irradiated_celery", 1 ],
+        [ "cabbage", 1 ],
+        [ "irradiated_cabbage", 1 ],
+        [ "sauerkraut", 1 ],
+        [ "powder_eggs", 1 ],
+        [ "eggs_bird", 1, "LIST" ],
+        [ "egg_reptile", 1 ],
+        [ "can_beans", 1 ],
+        [ "beans_cooked", 1 ],
+        [ "spaghetti_raw", 1 ],
+        [ "macaroni_raw", 1 ],
+        [ "noodles_fast", 1 ],
+        [ "dry_beans", 1 ],
+        [ "raw_beans", 1 ],
+        [ "dry_rice", 1 ],
+        [ "dandelion_cooked", 1 ],
+        [ "acorns_cooked", 1 ],
+        [ "dry_lentils", 1 ],
+        [ "raw_lentils", 1 ]
+      ],
+      [ [ "dry_hflesh", 1 ], [ "rehydrated_hflesh", 1 ], [ "human_meat", 1, "LIST" ] ]
+    ]
+  },
+  {
+    "id": "fish_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
+      [
+        [ "spaghetti_raw", 1 ],
+        [ "macaroni_raw", 1 ],
+        [ "noodles_fast", 1 ],
+        [ "veggy_any", 1, "LIST" ],
+        [ "sauerkraut", 1 ],
+        [ "can_corn", 1 ],
+        [ "dry_veggy", 1 ],
+        [ "con_milk", 1 ],
+        [ "flatbread", 1 ],
+        [ "tortilla_corn", 1 ],
+        [ "bread", 1 ],
+        [ "cornbread", 1 ],
+        [ "biscuit", 1 ],
+        [ "hardtack", 1 ],
+        [ "wastebread", 1 ],
+        [ "sourdough_bread", 1 ],
+        [ "flour", 2 ],
+        [ "cornmeal", 2 ],
+        [ "milk_powder", 1 ],
+        [ "crackers", 1 ],
+        [ "powder_eggs", 1 ],
+        [ "eggs_bird", 1, "LIST" ],
+        [ "egg_reptile", 1 ],
+        [ "dry_beans", 1 ],
+        [ "raw_beans", 1 ],
+        [ "dry_lentils", 1 ],
+        [ "raw_lentils", 1 ],
+        [ "dry_rice", 1 ],
+        [ "can_beans", 1 ],
+        [ "beans_cooked", 1 ],
+        [ "dandelion_cooked", 1 ],
+        [ "mushroom", 1 ],
+        [ "dry_mushroom", 1 ],
+        [ "mushroom_cooked", 1 ],
+        [ "morel_cooked", 1 ],
+        [ "acorns_cooked", 1 ]
+      ],
+      [
+        [ "fish", 2 ],
+        [ "dry_fish", 2 ],
+        [ "fish_smoked", 2 ],
+        [ "fish_pickled", 2 ],
+        [ "salted_fish", 2 ],
+        [ "fish_canned", 2 ],
+        [ "can_salmon", 2 ],
+        [ "can_tuna", 2 ]
+      ]
+    ]
+  },
+  {
+    "id": "woods_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "pine_tea", 2 ] ],
+      [
+        [ "meat_nofish", 1, "LIST" ],
+        [ "fish", 1 ],
+        [ "fish_smoked", 1 ],
+        [ "dry_fish", 1 ],
+        [ "rehydrated_fish", 1 ],
+        [ "fish_canned", 1 ],
+        [ "can_salmon", 1 ],
+        [ "can_tuna", 1 ],
+        [ "sausage", 1 ],
+        [ "sausage_cooked", 1 ],
+        [ "bratwurst_sausage", 1 ],
+        [ "powder_eggs", 2 ],
+        [ "eggs_bird", 2, "LIST" ],
+        [ "egg_reptile", 2 ]
+      ],
+      [
+        [ "veggy_wild", 2 ],
+        [ "veggy", 2 ],
+        [ "rehydrated_veggy", 2 ],
+        [ "dry_veggy", 2 ],
+        [ "dry_beans", 2 ],
+        [ "can_beans", 2 ],
+        [ "raw_beans", 2 ],
+        [ "beans_cooked", 2 ],
+        [ "dry_lentils", 2 ],
+        [ "raw_lentils", 2 ],
+        [ "dry_rice", 2 ],
+        [ "dandelion_cooked", 2 ],
+        [ "mushroom", 2 ],
+        [ "dry_mushroom", 2 ],
+        [ "mushroom_cooked", 2 ],
+        [ "morel_cooked", 2 ],
+        [ "acorns_cooked", 2 ]
+      ]
+    ]
+  },
   {
     "id": "any_fat",
     "type": "requirement",
@@ -393,6 +554,75 @@
     "type": "requirement",
     "components": [ [ [ "dandelion_cooked", 1 ], [ "veggy_any_uncooked", 1, "LIST" ], [ "veggy_canned", 1 ], [ "veggy_salted", 1 ] ] ]
   },
+  {
+    "id": "mushroom_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 1 ] ],
+      [ [ "mushroom", 1 ], [ "mushroom_cooked", 1 ], [ "dry_mushroom", 1 ], [ "morel_cooked", 1 ] ],
+      [ [ "flour", 1 ] ]
+    ]
+  },
+  {
+    "id": "broth_ingredients",
+    "type": "requirement",
+    "components": [
+      [
+        [ "veggy_any", 1, "LIST" ],
+        [ "powder_eggs", 1 ],
+        [ "eggs_bird", 1, "LIST" ],
+        [ "egg_reptile", 1 ],
+        [ "mushroom_cooked", 1 ],
+        [ "morel_cooked", 1 ],
+        [ "mushroom", 1 ],
+        [ "dry_mushroom", 1 ]
+      ],
+      [
+        [ "seasoning_italian", 4 ],
+        [ "wild_herbs", 4 ],
+        [ "seasoning_salt", 4 ],
+        [ "soysauce", 2 ],
+        [ "pepper", 4 ],
+        [ "garlic_clove", 2 ],
+        [ "salt_water", 1 ],
+        [ "salt", 4 ]
+      ]
+    ]
+  },
+  {
+    "id": "veggy_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 1 ] ],
+      [
+        [ "spaghetti_raw", 1 ],
+        [ "macaroni_raw", 1 ],
+        [ "noodles_fast", 1 ],
+        [ "irradiated_potato", 1 ],
+        [ "potato", 1 ],
+        [ "celery", 1 ],
+        [ "irradiated_celery", 1 ],
+        [ "veggy_green", 1, "LIST" ],
+        [ "sauerkraut", 1 ],
+        [ "powder_eggs", 1 ],
+        [ "eggs_bird", 1, "LIST" ],
+        [ "egg_reptile", 1 ],
+        [ "dry_beans", 1 ],
+        [ "raw_beans", 1 ],
+        [ "dry_rice", 1 ],
+        [ "can_beans", 1 ],
+        [ "beans_cooked", 1 ],
+        [ "dandelion_cooked", 1 ],
+        [ "acorns_cooked", 1 ],
+        [ "tofu", 1 ],
+        [ "dry_tofu", 1 ],
+        [ "raw_edamame", 1 ],
+        [ "dry_lentils", 1 ],
+        [ "raw_lentils", 1 ]
+      ],
+      [ [ "veggy_any", 1, "LIST" ] ]
+    ]
+  },
   {
     "id": "wash_liquor",
     "type": "requirement",
diff --git a/data/json/requirements/tailoring.json b/data/json/requirements/tailoring.json
new file mode 100644
index 0000000000000..7cc231bf73d71
--- /dev/null
+++ b/data/json/requirements/tailoring.json
@@ -0,0 +1,330 @@
+[
+  {
+    "id": "armor_acidchitin",
+    "type": "requirement",
+    "//": "Shaping and attaching a biosillicified chitin plate to something, per 112 g of biosillicified chitin.  Time needed is 10 minutes per unit.",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "acidchitin_piece", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "armor_chainmail_assembling",
+    "type": "requirement",
+    "//": "Assembling chainmail rings into finished products, and riveting rings closed, per 1025 g of steel.  It is assumed that each ring used comes with a prepared rivet.  Time needed is 1 hour per unit (most of the time goes into making rings and then chainmail sheets first)",
+    "tools": [ [ [ "pliers", -1 ], [ "multitool", -1 ], [ "toolset", -1 ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ],
+    "components": [ [ [ "link_sheet", 1 ] ], [ [ "chain_link", 25 ] ] ]
+  },
+  {
+    "id": "armor_chitin",
+    "type": "requirement",
+    "//": "Shaping and attaching a chitin plate to something, per 90 g of chitin.  Time needed is 10 minutes per unit.",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "chitin_piece", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "armor_kevlar_plate",
+    "type": "requirement",
+    "//": "Shaping and attaching a rigid Kevlar plate to something, per 300 g of rigid Kevlar.  Time needed is 10 minutes per unit.",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "kevlar_plate", 1 ] ], [ [ "superglue", 1 ] ] ]
+  },
+  {
+    "id": "armor_steel_plate",
+    "type": "requirement",
+    "//": "Attaching a steel plate to some flexible material like cloth or leather, as well as working it into shape needed, per 251 g of steel.  Time needed is 20 minutes per unit.",
+    "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 } ],
+    "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "armor_paper",
+    "type": "requirement",
+    "//": "Joining multiple sheets of paper together using duct tape, per 19 g of paper.  Time needed is 2 minutes per unit.",
+    "components": [ [ [ "paper", 5 ] ], [ [ "duct_tape", 1 ] ] ]
+  },
+  {
+    "id": "armor_paper_lamellar",
+    "type": "requirement",
+    "//": "Layering paper sheets, cutting holes in them, laminating them with glue, and connecting multiple of resulting plates with cordage, per 162 g of paper.  Time needed is 50 minutes per unit.",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "paper", 50 ] ], [ [ "superglue", 1 ], [ "bone_glue", 1 ] ], [ [ "cordage_short", 2, "LIST" ] ] ]
+  },
+  {
+    "id": "armor_wood",
+    "type": "requirement",
+    "//": "Shaping and tying together multiple wood pieces of same size with lots of cordage, per 1463 g of wood.  Time needed is 30 minutes per unit.  Works for lamellar wooden armor as well as for planks tied to limbs.",
+    "qualities": [ { "id": "SAW_W", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "2x4", 1 ] ], [ [ "cordage", 2, "LIST" ] ] ]
+  },
+  {
+    "id": "button",
+    "type": "requirement",
+    "//": "All kinds of clothing buttons.",
+    "components": [ [ [ "button_plastic", 1 ], [ "button_wood", 1 ], [ "button_steel", 1 ] ] ]
+  },
+  {
+    "id": "dye_cloth",
+    "type": "requirement",
+    "//": "Dyeing cloth items, per 500 ml of dyed cloth.  Use only for fancy clothing, otherwise it's unnecessary.  Takes 720 minutes, this doesn't depend on amount.",
+    "qualities": [ { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
+    "components": [
+      [
+        [ "dye_powder", 5 ],
+        [ "tanbark", 1 ],
+        [ "coffee_raw", 1 ],
+        [ "coffee_raw_kentucky", 1 ],
+        [ "tea_raw", 1 ],
+        [ "mustard", 48 ],
+        [ "acorns", 1 ],
+        [ "wild_herbs", 100 ],
+        [ "raw_dandelion", 4 ],
+        [ "sugar_beet", 1 ],
+        [ "carrot", 12 ],
+        [ "irradiated_carrot", 12 ],
+        [ "carrot_wild", 6 ],
+        [ "onion", 1 ],
+        [ "irradiated_onion", 1 ],
+        [ "blueberries", 1 ],
+        [ "irradiated_blueberries", 1 ],
+        [ "strawberries", 1 ],
+        [ "irradiated_strawberries", 1 ],
+        [ "cranberries", 3 ],
+        [ "irradiated_cranberries", 3 ],
+        [ "raspberries", 1 ],
+        [ "irradiated_raspberries", 1 ],
+        [ "huckleberries", 1 ],
+        [ "irradiated_huckleberries", 1 ],
+        [ "mulberries", 1 ],
+        [ "irradiated_mulberries", 1 ],
+        [ "elderberries", 1 ],
+        [ "irradiated_elderberries", 1 ],
+        [ "blackberries", 1 ],
+        [ "irradiated_blackberries", 1 ],
+        [ "cherries", 1 ],
+        [ "irradiated_cherries", 1 ],
+        [ "grapes", 1 ],
+        [ "irradiated_grapes", 1 ],
+        [ "pomegranate", 1 ],
+        [ "irradiated_pomegranate", 1 ],
+        [ "rose_hips", 1 ],
+        [ "irradiated_rose_hips", 1 ],
+        [ "cabbage", 1 ],
+        [ "irradiated_cabbage", 1 ],
+        [ "celery", 1 ],
+        [ "irradiated_celery", 1 ],
+        [ "mushroom", 1 ]
+      ],
+      [
+        [ "ammonia", 2 ],
+        [ "vinegar", 16 ],
+        [ "ash", 100 ],
+        [ "tanbark", 1 ],
+        [ "salt", 100 ],
+        [ "chem_potassium_alum", 100 ]
+      ],
+      [ [ "water", 3 ], [ "water_clean", 3 ] ]
+    ]
+  },
+  {
+    "id": "fastener_large",
+    "type": "requirement",
+    "//": "All kinds of fasteners for jacket-sized soft objects.",
+    "components": [
+      [
+        [ "button", 9, "LIST" ],
+        [ "snapfastener_steel", 9 ],
+        [ "zipper_long_plastic", 1 ],
+        [ "touch_fastener", 6 ],
+        [ "string_6", 6 ]
+      ]
+    ]
+  },
+  {
+    "id": "fastener_small",
+    "type": "requirement",
+    "//": "All kinds of fasteners for footwear-sized soft objects, including pockets.",
+    "components": [
+      [
+        [ "button", 3, "LIST" ],
+        [ "snapfastener_steel", 3 ],
+        [ "zipper_short_plastic", 1 ],
+        [ "touch_fastener", 2 ],
+        [ "string_6", 2 ]
+      ]
+    ]
+  },
+  {
+    "id": "plastic_molding",
+    "type": "requirement",
+    "//": "Melting and reshaping plastic items, per 70 g of plastic. Usually takes 30 minutes per unit.",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ],
+    "components": [ [ [ "plastic_chunk", 1 ] ] ]
+  },
+  {
+    "id": "tailoring_cotton",
+    "type": "requirement",
+    "//": "Crafting cotton items, per 101 g of cotton; 10 g + excessive weight of material is wasted, producing rags and cotton scraps as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_cotton", 22 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_cotton_knitting",
+    "type": "requirement",
+    "//": "Crafting cotton items via knitting, per 1 g of cotton; no material wasted.  Time needed is usually 2 minutes per unit if doing it by hand.",
+    "qualities": [ { "id": "KNIT", "level": 1 } ],
+    "components": [ [ [ "thread", 1 ] ] ]
+  },
+  {
+    "id": "tailoring_cotton_patchwork",
+    "type": "requirement",
+    "//": "Crafting possibly-patchwork cotton items, per 101 g of cotton; 10 g + excessive weight of material is wasted, producing rags and cotton scraps as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet)",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_cotton", 22 ], [ "sheet_cotton_patchwork", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_faux_fur",
+    "type": "requirement",
+    "//": "Crafting faux fur items, per 201 g of faux fur; 20 g + excessive weight of material is wasted, producing faux fur patches and scraps.  Time needed is usually 90 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_faux_fur", 22 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_faux_fur_patchwork",
+    "type": "requirement",
+    "//": "Crafting possibly-patchwork faux fur items, per 201 g of faux fur; 20 g + excessive weight of material is wasted, producing faux fur patches and scraps.  Time needed is usually 90 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_faux_fur", 22 ], [ "sheet_faux_fur_patchwork", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_felt",
+    "type": "requirement",
+    "//": "Crafting felt items (not via knitting), per 161 g of wool; 16 g + excessive weight of material is wasted, producing felt patches as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_felt", 22 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_felt_patchwork",
+    "type": "requirement",
+    "//": "Crafting possibly-patchwork felt items (not via knitting), per 161 g of wool; 16 g + excessive weight of material is wasted, producing felt patches as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching. (most of the time actually needed goes into making a patchwork sheet)",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_felt", 22 ], [ "sheet_felt_patchwork", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_fur",
+    "type": "requirement",
+    "//": "Crafting fur items, per 415 g of fur; 273 g + excessive weight of material is wasted, producing fur patches as byproducts.  Time needed is usually 360 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
+    "components": [ [ [ "tanned_pelt", 1 ] ], [ [ "filament", 4, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_fur_small",
+    "type": "requirement",
+    "//": "Crafting either small or patchwork fur items, per 92 g of fur; 23 g + excessive weight of material is wasted, producing fur patches as byproducts.  Time needed is usually 180 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
+    "components": [ [ [ "fur", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_kevlar",
+    "type": "requirement",
+    "//": "Crafting Kevlar items, per 101 g of Kevlar; 10 g + excessive weight of material is wasted, producing Kevlar scraps as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_kevlar", 22 ] ], [ [ "thread_kevlar", 1 ] ] ]
+  },
+  {
+    "id": "tailoring_leather",
+    "type": "requirement",
+    "//": "Crafting leather items, per 364 g of leather; 240 g + excessive weight of material is wasted, producing leather patches as byproducts.  Time needed is usually 360 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
+    "components": [ [ [ "tanned_hide", 1 ] ], [ [ "filament", 4, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_leather_small",
+    "type": "requirement",
+    "//": "Crafting either small or patchwork leather items, per 81 g of leather; 20 g + excessive weight of material is wasted, producing leather patches as byproducts.  Time needed is usually 180 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
+    "components": [ [ [ "leather", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_lycra",
+    "type": "requirement",
+    "//": "Crafting lycra items, per 55 g of lycra; 6 g + excessive weight of material is wasted, producing lycra scraps as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_lycra", 22 ] ], [ [ "thread_nomex", 1 ] ] ]
+  },
+  {
+    "id": "tailoring_lycra_patchwork",
+    "type": "requirement",
+    "//": "Crafting possibly-patchwork lycra items, per 55 g of lycra; 6 g + excessive weight of material is wasted, producing lycra scraps as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_lycra", 22 ], [ "sheet_lycra_patchwork", 1 ] ], [ [ "thread_nomex", 1 ] ] ]
+  },
+  {
+    "id": "tailoring_neoprene",
+    "type": "requirement",
+    "//": "Crafting neoprene items, per 121 g of neoprene; 12 g + excessive weight of material is wasted, producing neoprene scraps as byproducts.  Superglue and duct tape will usually be needed for extra waterproofing.  Time needed is usually 100 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_neoprene", 22 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_neoprene_patchwork",
+    "type": "requirement",
+    "//": "Crafting possibly-patchwork neoprene items, per 121 g of neoprene; 12 g + excessive weight of material is wasted, producing neoprene scraps as byproducts.  Superglue and duct tape will usually be needed for extra waterproofing.  Time needed is usually 100 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).",
+    "qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_neoprene", 22 ], [ "sheet_neoprene_patchwork", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_nomex",
+    "type": "requirement",
+    "//": "Crafting Nomex items, per 101 g of Nomex; 10 g + excessive weight of material is wasted, producing Nomex scraps as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_nomex", 22 ] ], [ [ "thread_nomex", 1 ] ] ]
+  },
+  {
+    "id": "tailoring_nomex_patchwork",
+    "type": "requirement",
+    "//": "Crafting possibly-patchwork Nomex items, per 101 g of Nomex; 10 g + excessive weight of material is wasted, producing Nomex scraps as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_nomex", 22 ], [ "sheet_nomex_patchwork", 1 ] ], [ [ "thread_nomex", 1 ] ] ]
+  },
+  {
+    "id": "tailoring_nylon",
+    "type": "requirement",
+    "//": "Crafting synthetic fabric items, per 55 g of neoprene; 6 g + excessive weight of material is wasted, producing synthetic fabric scraps as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_nylon", 22 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_nylon_patchwork",
+    "type": "requirement",
+    "//": "Crafting possibly-patchwork synthetic fabric items, per 55 g of neoprene; 6 g + excessive weight of material is wasted, producing synthetic fabric scraps as byproducts.  Time needed is usually 90 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_nylon", 22 ] ], [ [ "sheet_nylon_patchwork", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_wool_knitting",
+    "type": "requirement",
+    "//": "Crafting wool items via knitting, per 1 g of wool; no material wasted.  Time needed is usually 2 minutes per unit if doing it by hand.",
+    "qualities": [ { "id": "KNIT", "level": 1 } ],
+    "components": [ [ [ "yarn", 1 ] ] ]
+  },
+  {
+    "id": "waterproofing_cloth",
+    "type": "requirement",
+    "//": "Waterproofing cloth items, per 500 ml of waterproofed cloth.  Takes 360 minutes, doesn't depend on amount.  Duct tape is needed to waterproof seams.",
+    "qualities": [ { "id": "COOK", "level": 3 }, { "id": "CUT", "level": 1 } ],
+    "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ],
+    "components": [
+      [ [ "chem_potassium_alum", 50 ] ],
+      [ [ "detergent", 10 ] ],
+      [ [ "water", 3 ], [ "water_clean", 3 ] ],
+      [ [ "duct_tape", 5 ] ]
+    ]
+  },
+  {
+    "id": "waterproofing_plastic_bags",
+    "type": "requirement",
+    "//": "Making a waterproof layer from plastic bags duct taped together, per 25 g of such waterproofing.  Takes 15 minutes per unit.",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "bag_plastic", 1 ] ], [ [ "duct_tape", 5 ] ] ]
+  }
+]
diff --git a/data/json/snippets/dimensional_exploration.json b/data/json/snippets/dimensional_exploration.json
index b1f228cf55e2d..9a7cbfa61ae2c 100644
--- a/data/json/snippets/dimensional_exploration.json
+++ b/data/json/snippets/dimensional_exploration.json
@@ -3,21 +3,30 @@
     "type": "snippet",
     "category": "log_immersion27",
     "text": [
-      "\nIMMERSION LOG: 27A\n\nINCIDENT REPORT:\n\nSUMMARY:\nUnforeseen EM interference source forced the team to remain in-phase between prime and sub-scape 27.  Expedition members reported observing a spheroid-entity ('PE-01') moving beneath the typically opaque t-substrate.  Interference readings and expedition testimony implies the PE-01 was a potent EM radiation source, and the origin of the interference.  After 30 min, PE-01 receded and the expedition was aborted in accordance of procedure EMER-12.  The expedition team suffered no injuries, physical or mental, during the incident. \n\nIt's become clear we have greatly underestimated the risk posed by phase immersions.  Engineering has been tasked with designing a new, improved protection suite, and has shown promising advances.  Updated emergency procedures are in-progress.\n\nRefer to file EXO-I-271 for full report."
+      {
+        "id": "log_immersion27_1",
+        "text": "\nIMMERSION LOG: 27A\n\nINCIDENT REPORT:\n\nSUMMARY:\nUnforeseen EM interference source forced the team to remain in-phase between prime and sub-scape 27.  Expedition members reported observing a spheroid-entity ('PE-01') moving beneath the typically opaque t-substrate.  Interference readings and expedition testimony implies the PE-01 was a potent EM radiation source, and the origin of the interference.  After 30 min, PE-01 receded and the expedition was aborted in accordance of procedure EMER-12.  The expedition team suffered no injuries, physical or mental, during the incident.\n\nIt's become clear we have greatly underestimated the risk posed by phase immersions.  Engineering has been tasked with designing a new, improved protection suite, and has shown promising advances.  Updated emergency procedures are in-progress.\n\nRefer to file EXO-I-271 for full report."
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "t-substrate",
     "text": [
-      "\nANALYSIS OF TRANSPLANAR MATERIALS\n\nT-SUBSTRATE\n\nSUMMARY:\nThe material henceforth named t-substrate is the naturally occurring 'floor' material of phase-space.  Samples of t-substrate were first recovered during IMMERSION-25A, when upon return to prime the samples violently [////////], exhibiting what are now known as 'plane-uneven' physical properties.  The following report will examine such variances to the best extent of our knowledge.\n\nRefer to file EXO-M-312 for full report."
+      {
+        "id": "t-substrate_1",
+        "text": "\nANALYSIS OF TRANSPLANAR MATERIALS\n\nT-SUBSTRATE\n\nSUMMARY:\nThe material henceforth named t-substrate is the naturally occurring 'floor' material of phase-space.  Samples of t-substrate were first recovered during IMMERSION-25A, when upon return to prime the samples violently [////////], exhibiting what are now known as 'plane-uneven' physical properties.  The following report will examine such variances to the best extent of our knowledge.\n\nRefer to file EXO-M-312 for full report."
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "HAADF_t-substrate",
     "text": [
-      "\nANALISIS OF TRANSPLANAR MATERIALS \n\nT-SUBSTRATE\n\nHAADF MICROGRAPH:\nAn atomic-scale photograph shows only a completely smooth red surface.  In the lower left corner the phrase 'Not made of atoms?!' is scrawled with a blue pen.\n\nRefer to file EXO-M-312 for full report."
+      {
+        "id": "HAADF_t-substrate_1",
+        "text": "\nANALISIS OF TRANSPLANAR MATERIALS\n\nT-SUBSTRATE\n\nHAADF MICROGRAPH:\nAn atomic-scale photograph shows only a completely smooth red surface.  In the lower left corner the phrase 'Not made of atoms?!' is scrawled with a blue pen.\n\nRefer to file EXO-M-312 for full report."
+      }
     ]
   }
 ]
diff --git a/data/json/snippets/health_msgs.json b/data/json/snippets/health_msgs.json
index 48ae87518a32c..9ade8a81653f6 100644
--- a/data/json/snippets/health_msgs.json
+++ b/data/json/snippets/health_msgs.json
@@ -147,6 +147,6 @@
   {
     "type": "snippet",
     "category": "health_horrible",
-    "text": "Awareness seems to only come with a battle... and your body seem to be on its side."
+    "text": "Awareness seems to only come with a battle… and your body seem to be on its side."
   }
 ]
diff --git a/data/json/snippets/music.json b/data/json/snippets/music.json
index 5337c428d9b74..8b761cbb94318 100644
--- a/data/json/snippets/music.json
+++ b/data/json/snippets/music.json
@@ -1,7 +1,7 @@
 [
   {
     "type": "snippet",
-    "category": "music_description",
+    "category": "<music_description>",
     "text": [ "some <musicgenre>.", "some <musicgenre>. The <musicdesc_part> is <musicdesc_evaluation>." ]
   },
   {
@@ -21,7 +21,7 @@
     "text": [
       "amazing",
       "funky",
-      "okay",
+      { "text": { "ctxt": "<musicdesc_evaluation>", "str": "okay" } },
       "pretty good",
       "sweet",
       "sick",
diff --git a/data/json/snippets/schizophrenia.json b/data/json/snippets/schizophrenia.json
index d9ff590f66b17..6d169c6560b83 100644
--- a/data/json/snippets/schizophrenia.json
+++ b/data/json/snippets/schizophrenia.json
@@ -8,7 +8,7 @@
       "What's your name?",
       "I thought you were my friend.",
       "How are you today?",
-      "Shut up! Don't lie to me.",
+      "Shut up!  Don't lie to me.",
       "Why would you do that?",
       "Please, don't go.",
       "Don't leave me alone!",
@@ -49,7 +49,7 @@
       "Hey, you're bleeding.",
       "Your wound looks pretty bad.",
       "Shouldn't you put a bandage on that?",
-      "Please don't die! No one else lets me kill things!",
+      "Please don't die!  No one else lets me kill things!",
       "You look hurt, did I do that?",
       "Are you supposed to be bleeding?",
       "You're not going to die, are you?",
@@ -62,13 +62,13 @@
     "text": [
       "Hey fix me up.",
       "I need healing!",
-      "I hurt all over...",
+      "I hurt all over…",
       "You can put me back together, right?",
-      "I... I can't move my legs!",
+      "I… I can't move my legs!",
       "Medic!",
       "I can still fight, don't replace me!",
       "They got me!",
-      "*cough cough* Go on without me...",
+      "*cough cough* Go on without me…",
       "Am I gonna die?"
     ]
   },
@@ -96,7 +96,7 @@
       "You gain the sudden realization that you must have been responsible for the cataclysm.",
       "You get the odd feeling that your thoughts are not your own.",
       "You feel as if everyone in the world must be playing a sick prank on you.",
-      "You are being watched... by THEM."
+      "You are being watched… by THEM."
     ]
   },
   {
@@ -125,7 +125,7 @@
       "\"Stop laughing at me!\"",
       "\"Don't point that thing at me!\"",
       "\"Stay away from me!\"",
-      "\"No! Stop!\"",
+      "\"No!  Stop!\"",
       "\"Get the fuck away from me!\"",
       "\"That's not true!\"",
       "\"What do you want from me?\"",
@@ -145,7 +145,7 @@
       "%1$s feels freezing cold!",
       "An electric shock shoots into your hand from %1$s!",
       "%1$s lied to you.",
-      "%1$s was working for... THEM",
+      "%1$s was working for… THEM",
       "%1$s said something stupid.",
       "%1$s is running away!"
     ]
diff --git a/data/json/snippets/snippets.json b/data/json/snippets/snippets.json
index 8b2837c768d86..a2e358e6dc732 100644
--- a/data/json/snippets/snippets.json
+++ b/data/json/snippets/snippets.json
@@ -3,430 +3,1201 @@
     "type": "snippet",
     "category": "flier",
     "text": [
-      "This is an advertisement for the Diet Devil brand Metabolic Exchange CBM.  It shows a picture of a tiny obese devil sitting on a woman's shoulder.  The woman stares intently at a gigantic wedding cake covered with bacon and candy bars.  The caption reads: \"Burn calories!  Burn!\"",
-      "This is an advertisement for the Diet Devil brand Ethanol Burner CBM.  It shows a picture of a teenage boy driving a car while chugging a bottle of whiskey.  A tiny obese devil sits on his shoulder and drinks a martini.  The caption reads: \"Drink like there's no tomorrow!\"",
-      "This is an advertisement for the Twenty8 brand Diamond Cornea CBM.  It shows a picture of the cyber-module being clutched by an eagle in flight.  The captions read: \"Get the new Model 28.bx Eagle-Eye!\" and \"Twenty8.  See what you've been missing.\"",
-      "This is an advertisement for the Twenty8 brand Night Vision CBM.  It shows a picture of an owl swooping down on a the cyber-module.  The captions read: \"Get the new Model 28.hx Night-Owl!\" and \"Twenty8.  See what you've been missing.\"",
-      "This is an advertisement for the Twenty8 brand Diamond Cornea CBM.  It shows a picture of a flying hawk carrying the cyber-module in its beak.  The captions read: \"Get the new Model 28.xx Hawk-Eye!\" and \"Twenty8.  See what you've been missing.\"",
-      "This is an advertisement for the Twenty8 brand Scent Vision CBM.  It shows a picture of a vulture perched on a pile of skulls and cyber-modules.  The captions read: \"Get the new Model 28.vx Vulture today!\" and \"Twenty8.  See what you've been missing.\"",
-      "This is an ad for a Twenty8 brand Infrared Vision CBM.  It shows a picture of a robotic phoenix covered in flames.  The captions read: \"Get the new Model 28.tx Phoenix today!\" and \"Twenty8.  See what you've been missing.\"",
-      "This is an advertisement for DoubleTech brand law enforcement robots.  It shows a picture of copbot and an eyebot boldly emerging from a cloud of teargas and flame.  The caption reads: \"DoubleTech Industries.  Built to Protect.  Programmed to Serve.\"",
-      "This is an advertisement for DoubleTech brand law enforcement robots.  It shows a picture of an eyebot flying alongside a bald eagle and a Stealth bomber painted as an American flag.  The caption reads: \"Built to Protect.  Programmed to Serve.\"",
-      "This is an advertisement for DoubleTech brand law enforcement robots.  It shows a picture of a dozen eyebots floating over a woman as she jogs through a park.  The captions read: \"Built to Protect.  Programmed to Serve.\"",
-      "This is an advertisement for DoubleTech brand law enforcement robots.  It shows a picture of copbot pepper-spraying a handcuffed rioter.  In the background a troop of boy scouts salutes the robot.  The caption reads: \"Built to Protect.  Programmed to Serve.\"",
-      "This is an advertisement for Robert's Universal Robotics brand law enforcement robots.  It shows a picture of a tribot incinerating a mob of looters and stepping over charred and smoking corpses.  The caption reads: \"R.U.R.  Technology you can Trust.\"",
-      "This is an advertisement for Robert's Universal Robots brand labor-bots.  It shows a picture of a robot carrying a heavy pallet of bricks.  In the background a human foreman is sleeping on the job, with his hardhat pulled down over his eyes.  The captions read: \"It's a tough job, so why should you have to do it?\" and \"R.U.R.  Technology you can Trust.\"",
-      "This is an advertisement for Robert's Universal Robots brand labor-bots.  It shows a picture of a factory floor run entirely by robots.  In the background a man in a suit reads a newspaper that shows soaring stock prices.  The caption reads: \"R.U.R.  Technology you can Trust.\"",
-      "This is an advertisement for Sybil's Cyber Boutique.  It shows a picture of several bikini-clad female doctors removing the skin from man's face.  The patient is strapped to a chair but cheerfully gives two thumbs up.  The caption reads: \"Free Plastic Surgery While You Wait!\"",
-      "This is an advertisement for Sybil's Cyber Boutique.  It shows a picture of a nerdy looking man surrounded by a group of admiring women.  In the foreground a blood-drenched doctor gives an exaggerated wink and two thumbs up.  The caption reads: \"Holiday sales!  Get the package deals!\"",
-      "This is an advertisement for Sybil's Cyber Boutique.  It shows a picture of a man carrying a somewhat confused horse on his shoulders.  He is flanked by two scantily clad nurses who hold bloody chainsaws and give approving thumbs up.  His bulging knees and elbows are stitched and seem to be the source of his ability.  The caption reads:  \"Brand new!  Horse power at hand!\"",
-      "This is an advertisement for Sybil's Cyber Boutique.  It shows a picture of a man smiling while being relentlessly punched by a boxer.  He doesn't even sweat as punches have no effect on him.  Two scantily clad nurses give approving thumbs up from the background.  The caption reads:  \"Bouncy as never before!  Absorb those shocks!\"",
-      "This is an advertisement for Rivtech brand handguns.  It shows a picture of a well armed couple in business suits with matching handguns facing down a legion of villainous looking characters.  The caption reads:  \"Protect yourself with the Rivtech caseless automagnum!\"",
-      "This is an advertisement for Rivtech brand rifles.  It shows a picture of a smiling soldier with a futuristic looking rifle on her shoulder saluting the viewer.  The caption reads:  \"Rivtech caseless firearms proudly supports our Military.\"",
-      "This is an advertisement for Rivtech brand firearms.  It shows a picture of a trio of well armed hunters.  The three are each armed with different futuristic looking weapons and are shooting at a hostile crowd of approaching wildlife.  The caption reads:  \"Rivtech caseless firearms.  Superior stopping power.\"",
-      "This is an advertisement for the Rivtech brand Muscle Augmentation CBM.  It shows a picture of a stylized, howling wolf against a red background.  The caption reads:  \"Rivtech neuroreactive myomer bionics.  The most efficient synthetic adenosine triphosphate recovery system on the market.\" and \"Rivtech Bionics, guaranteed for life.\"",
-      "This is an advertisement for the Rivtech brand Wired Reflexes CBM.  It shows a picture of a stylized, snarling black cat against a red background.  The caption reads:  \"Rivtech neuroelectric stimulation bionics.  The next level in quantum inductive piezochemical nerve stimulation technology.\" and \"Rivtech Bionics, guaranteed for life.\"",
-      "This is an advertisement for the Rivtech brand Monomolecular Blade CBM.  It shows a picture of a woman with a bionic blade extending from her arm steadfastly defending her children from an angry bear.  The caption reads:  \"Rivtech retractable monomolecular blade system.  Failure is never an option.\" and \"Rivtech Bionics, guaranteed for life.\"",
-      "This is an advertisement for the Rivtech brand Synaptic Accelerator CBM.  It shows a picture of a stylized, soaring raven against a red background.  The caption reads:  \"Introducing the Rivtech Model Six myelination retrovirus system.  The latest in synthetic high-performance glycoprotein deposition technology.\" and \"Rivtech Bionics, guaranteed for life.\"",
-      "This is an advertisement for Rivtech brand ammunition.  It shows a picture of an armored steel plate with a gaping hole blasted through the middle.  Sitting beside the plate is a block of brightly colored caseless ammunition.  The caption reads:  \"Rivtech 8x40mm caseless.  Nothing else comes close.\"",
-      "This is an advertisement for Leadworks LLC's Home Frontier Starter Pack.  It shows a picture of a young suburban parent, equipped with rifle and revolver, keeping a steely eye on the neighborhood from the front porch.  Similarly-armed parents are visible in front of every house on the street.  Young children are at play and older ones tend a large vegetable garden.  The caption reads: \"A well-armed community is a SAFE community.  Leadworks, LLC.\"",
-      "This is a propaganda poster showing the Northrop Dispatch's military variant.  It depicts the iconic dark green, arachnoid dispatch, standing before a fence and facing away from the camera as blurring machines rush forward from its back towards black silhouettes menacing on the horizon.  It reads: \"WE ARE HERE TO PROTECT YOU.\"",
-      "This is an advertisement for Leadworks LLC handguns.  It shows a picture of a bionic police officer assisting a young couple, who were being attacked by a gang of ruffians.  The caption reads: \"You don't have to void your warranty or wear out your thumb to achieve felon-stopping firepower.  The L39B, tried and true by our fine cyborgs in blue, is available in .45 ACP for that extra punch, and we offer semiautomatic (but equally robust!) versions for the civilian market.  Leadworks, LLC.\"",
-      "This is an advertisement for Leadworks LLC modular weapons.  It shows a picture of an overworked-yet-grateful police sergeant assembling a sleek rifle, with similar-looking weapons racked neatly behind her.  The caption reads: \"Leadworks is proud to offer the L523 modular weapon system.  No more must armorers stock and maintain stacks and stacks of rifles, carbines, and squad support weapons, juggling multiple incompatible ammunition types!  Just procure a base unit for every trooper, and use our lightweight and portable conversion kits to swap from house-to-house CQB carbine to rooftop-patrol DSR, safely and cleanly!\"",
-      "This is a public notice from the Centers for Disease Control.  Its message, repeated in several languages, reads: Due to the recent outbreak of the A H3N2 flu strain, the CDC would like to remind the public to cover your nose and mouth with a tissue when you cough or sneeze and wash your hands frequently with soap and water. The CDC also recommends an annual flu vaccine for everyone 6 months of age and older, which can be found at your local doctor's office or pharmacy.",
-      "This is a public alert from the Centers for Disease Control. Its message, repeated in several languages, reads: PUBLIC HEALTH ALERT: Due to recent events, the CDC is issuing a warning to avoid public areas and spaces. An unknown biological contaminant is suspected to be affecting citizens, possibly an unexpected mutation in the A H3N2 flu strain. The CDC would like to remind the public to cover your nose and mouth when sneezing, wash your hands frequently, and recieve an up-to-date flu shot if possible. Boiling water is recommended until further notice.",
-      "This is a public alert from the Federal Emergency Management Agency.  Its message, repeated in several languages, reads: STAY IN YOUR HOMES!  All residents of the New England Disaster Area are advised to shelter in place wherever possible. The United States Armed Forces are working to contain the area. If there is a nearby evacuation shelter you can get to safely, you are recommended to do so. Otherwise, stay in your homes until authorized personnel evacuate you to a secured facility. Thank you for your compliance.",
-      "This is a public alert from the Federal Emergency Management Agency.  Its message, repeated in several languages, consists of a list of towns serving as major evacuation points from the New England Disaster Area. Someone has scribbled off most of the town names, and scrawled \"OVERRUN\" next to each one, with the exception of the Tacoma evacuation point.",
-      "This is a public warning from an unnamed source.  Its rambling message, poorly-photocopied onto both sides of the page, reads: Don't believe the lies!  The Army is rounding up people in death camps and executing them at mass graves. They cannot stop this.  Do not believe what the mainstream news-media is reporting.  All official evacuation points are death-traps.  Secure supplies and escape the cities while there is still time.",
-      "This is a public message from an unnamed source.  Its message, photocopied from a scrawled handwritten copy, reads: REPENT YOUR SINS O BABYLON FOR THE TIME OF HIS JUDGEMENT IS NIGH!  LOOK UPON YOUR DESTRUCTION AND KNOW THAT IT IS JUST!  YOU WILL BE DIVIDED FATHER AGAINST SON AND MOTHER AGAINST CHILD UNTO THE VERY LAST SINNER!",
-      "This is a public warning from the Federal Government.  Its brief message, repeated in several languages, reads:  The President of the United States has declared unilateral martial law to be in effect for the 48 contiguous states in response to the ongoing national crisis.  Continue to shelter in place until evacuated to an appropriate emergency management camp by authorized military personnel. A 24-hour curfew has been established. This curfew will remain in effect until further notice.  Stay indoors.  Violators will be shot on sight.",
-      "This is an advertisement for Rivtech's 'ATOMIC POWER THIRST' energy drink.  While intended to advertise a new flavor called Isotope RU-238 'FRUIT', most of the text is dedicated to a long list of possible side effects: anxiety, insomnia, severe insomnia, dizziness, tremors, nausea, headache, vomiting, delusions, hallucinations, rhabdomyolysis, internal burns, thyroid cancer, extensive internal bleeding, upper gastrointestinal bleeding, diarrhea, cardiac dysrhythmia, cardiovascular collapse, suicidal ideation, seizures, ataxia, amnesia, mania, stroke, neurodegeneration, malignalitaloptereosis, necrotizing fasciitis, recurrent flu, and pinkeye.",
-      "This is a soda advertisement.  On the front is a picture of a happy couple on a beach watching the sun set.  Between them are bottles of soda.  The poster reads, \"Cascade Cola, for those special moments\" in bold white letters.",
-      "This is a flier for a fast food chain.  In it, a man is placing an order with an attractive woman wearing a bright green shirt in the window with two happy children sitting in the back seat.  The flier reads \"Burgers, fries, and a Smile.\" Down in one corner is a company logo.",
-      "This is an advertisement for soda.  It shows a dark brown can of soda on a black background.  The label reads \"Spin\".",
-      "This is a flyer for a local pizza chain.  On it is a picture of a cartoon Italian holding a pizza, with the words \"It's a goooood pizza\" written above his head.",
-      "This is a poster advertising contact lenses.  On it is a picture of a blood shot eye with a rather long block of information beneath it making some fairly exaggerated claims about the product.",
-      "This is a flyer advertising a local radio station.  It has a lot of bright colors and patterns, but no definite message other than \"104.4 all the best, all the time!\" in big yellow letters.",
-      "This is a large movie poster for \"Action Packstone 6, Revenge of the Dog Men\".  It shows a fit man in a leather jacket with a revolver and a claymore walking towards the viewer.  At his side is his trusty cyberdog companion and in the background is an explosion.",
-      "This is an illustrated poster for a brand of solar car.  The vehicle is driving through a lush country side as small animals look on.  The slogan \"Improving the world, one tank at a time.\" is written across the top in small letters.",
-      "This is a soda advertisement.  On the front is a picture of a happy couple on a beach watching the sun set.  Between them are bottles of soda.  The poster reads, \"Cascade Cola, for those special moments\" in bold white letters.  Someone has colored in the sun with a black marker.  The words \"oh Discordia\" are scrawled across the top.",
-      "This is a flier for a fast food chain.  In it, a man is placing an order with an attractive woman wearing a bright green shirt in the window with two happy children in the back seat.  The flier reads \"Burgers, fries, and a Smile.\" down in one corner is a company logo.  Someone has gone to town on this one with a permanent marker.  It is now covered in rude images and racial epithets.",
-      "This is a flier for a local pizza chain.  On it is a picture of a cartoon Italian holding a pizza, with the words \"It's a goooood pizza\" written above his head.  Someone has drawn an exaggerated mustache on the cartoon Italian, along with a pair of crude, oversized breasts.",
-      "This is a poster advertising contact lenses.  On it is a picture of a blood shot eye.  Someone has defaced this one.  The informative part has been torn off, and written in jagged letters across the top in red crayon are the words \"ALL HAIL THE CRIMSON KING!\".",
-      "This is an illustrated poster for a brand of solar car.  The vehicle is driving through a lush country side as small animals look on.  The slogan \"Improving the world, one tank at a time.\" is written across the top.  Someone used a blue pen to write \"who gives a shit\" across the slogan and put X's over the eyes of all the animals.",
-      "This is a poster advertising a underground bunker.  The poster shows a nuclear bomb wiping out a city while a family huddles safely underground.  There a slogan \"Concerned about enemy attack?  Want to protect your family?  Join the VAULT program today.\" which is written in the middle.  However, there seems to be no information about *how* one might do so.",
-      "This is a flier for Red Ryder BBGuns.  On it a child is pulling a shining red wagon with a cooked pheasant on it and a wooden rifle over one shoulder.  The child has a dog trailing beside him and a satisfied look on his face.  The caption reads \"When you chose Red Ryder, you invested in the American Dream.  You invested in our Independence.\"",
-      "This is an old flier for a movie from the 30s.  A tan man with slick black hair and muscles bulging through his offwhite suit is clasping a woman to his hip with one hand, and the woman is wearing a black leather dress.  With her hips splayed, she is holding a pistol in one hand and starring directly out of the advert.  The caption reads \"Witness the rebirth of New Noir with 'Jersey Shore Blues'.  Starring Jenifer Languiz as 'Snookie'!\"",
-      "\"Joe's Diner; 1/2 pound of meat, 3 toppings, 'your choice', all with a side of freedom fries and a BIG Gulp size pop.\"",
-      "This is an advertisement for the Wink & Nod brand Soporific Induction CBM.  It shows a picture of a woman sleeping on a bed of nails with a satisfied smile on her face.  The caption reads: \"Catch Zs with ease, wherever you please!\"",
-      "This is a leaflet about autoclaving procedure.  One sentence catches your attention \"/!\\Always place your tools into an autoclave pouch before autoclaving./!\\\"",
-      "This is an advertisement for a local hospital.  You see a clean hospital room with a smiling man lying on the bed.  The bed is connected to some medical apparatus with a \"Autodoc Mk. X\" printed on it.  A doctor is seen working with its console, while his assistant is unpacking some high-tech hardware.  The caption reads: \"Autodoc - augmentation has never been so easy, reliable, and safe.\""
+      {
+        "id": "flier_1",
+        "text": "This is an advertisement for the Diet Devil brand Metabolic Exchange CBM.  It shows a picture of a tiny obese devil sitting on a woman's shoulder.  The woman stares intently at a gigantic wedding cake covered with bacon and candy bars.  The caption reads: \"Burn calories!  Burn!\""
+      },
+      {
+        "id": "flier_2",
+        "text": "This is an advertisement for the Diet Devil brand Ethanol Burner CBM.  It shows a picture of a teenage boy driving a car while chugging a bottle of whiskey.  A tiny obese devil sits on his shoulder and drinks a martini.  The caption reads: \"Drink like there's no tomorrow!\""
+      },
+      {
+        "id": "flier_3",
+        "text": "This is an advertisement for the Twenty8 brand Diamond Cornea CBM.  It shows a picture of the cyber-module being clutched by an eagle in flight.  The captions read: \"Get the new Model 28.bx Eagle-Eye!\" and \"Twenty8.  See what you've been missing.\""
+      },
+      {
+        "id": "flier_4",
+        "text": "This is an advertisement for the Twenty8 brand Night Vision CBM.  It shows a picture of an owl swooping down on a the cyber-module.  The captions read: \"Get the new Model 28.hx Night-Owl!\" and \"Twenty8.  See what you've been missing.\""
+      },
+      {
+        "id": "flier_5",
+        "text": "This is an advertisement for the Twenty8 brand Diamond Cornea CBM.  It shows a picture of a flying hawk carrying the cyber-module in its beak.  The captions read: \"Get the new Model 28.xx Hawk-Eye!\" and \"Twenty8.  See what you've been missing.\""
+      },
+      {
+        "id": "flier_6",
+        "text": "This is an advertisement for the Twenty8 brand Scent Vision CBM.  It shows a picture of a vulture perched on a pile of skulls and cyber-modules.  The captions read: \"Get the new Model 28.vx Vulture today!\" and \"Twenty8.  See what you've been missing.\""
+      },
+      {
+        "id": "flier_7",
+        "text": "This is an ad for a Twenty8 brand Infrared Vision CBM.  It shows a picture of a robotic phoenix covered in flames.  The captions read: \"Get the new Model 28.tx Phoenix today!\" and \"Twenty8.  See what you've been missing.\""
+      },
+      {
+        "id": "flier_8",
+        "text": "This is an advertisement for DoubleTech brand law enforcement robots.  It shows a picture of copbot and an eyebot boldly emerging from a cloud of teargas and flame.  The caption reads: \"DoubleTech Industries.  Built to Protect.  Programmed to Serve.\""
+      },
+      {
+        "id": "flier_9",
+        "text": "This is an advertisement for DoubleTech brand law enforcement robots.  It shows a picture of an eyebot flying alongside a bald eagle and a Stealth bomber painted as an American flag.  The caption reads: \"Built to Protect.  Programmed to Serve.\""
+      },
+      {
+        "id": "flier_10",
+        "text": "This is an advertisement for DoubleTech brand law enforcement robots.  It shows a picture of a dozen eyebots floating over a woman as she jogs through a park.  The captions read: \"Built to Protect.  Programmed to Serve.\""
+      },
+      {
+        "id": "flier_11",
+        "text": "This is an advertisement for DoubleTech brand law enforcement robots.  It shows a picture of copbot pepper-spraying a handcuffed rioter.  In the background a troop of boy scouts salutes the robot.  The caption reads: \"Built to Protect.  Programmed to Serve.\""
+      },
+      {
+        "id": "flier_12",
+        "text": "This is an advertisement for Robert's Universal Robotics brand law enforcement robots.  It shows a picture of a tribot incinerating a mob of looters and stepping over charred and smoking corpses.  The caption reads: \"R.U.R.  Technology you can Trust.\""
+      },
+      {
+        "id": "flier_13",
+        "text": "This is an advertisement for Robert's Universal Robots brand labor-bots.  It shows a picture of a robot carrying a heavy pallet of bricks.  In the background a human foreman is sleeping on the job, with his hardhat pulled down over his eyes.  The captions read: \"It's a tough job, so why should you have to do it?\" and \"R.U.R.  Technology you can Trust.\""
+      },
+      {
+        "id": "flier_14",
+        "text": "This is an advertisement for Robert's Universal Robots brand labor-bots.  It shows a picture of a factory floor run entirely by robots.  In the background a man in a suit reads a newspaper that shows soaring stock prices.  The caption reads: \"R.U.R.  Technology you can Trust.\""
+      },
+      {
+        "id": "flier_15",
+        "text": "This is an advertisement for Sybil's Cyber Boutique.  It shows a picture of several bikini-clad female doctors removing the skin from man's face.  The patient is strapped to a chair but cheerfully gives two thumbs up.  The caption reads: \"Free Plastic Surgery While You Wait!\""
+      },
+      {
+        "id": "flier_16",
+        "text": "This is an advertisement for Sybil's Cyber Boutique.  It shows a picture of a nerdy looking man surrounded by a group of admiring women.  In the foreground a blood-drenched doctor gives an exaggerated wink and two thumbs up.  The caption reads: \"Holiday sales!  Get the package deals!\""
+      },
+      {
+        "id": "flier_17",
+        "text": "This is an advertisement for Sybil's Cyber Boutique.  It shows a picture of a man carrying a somewhat confused horse on his shoulders.  He is flanked by two scantily clad nurses who hold bloody chainsaws and give approving thumbs up.  His bulging knees and elbows are stitched and seem to be the source of his ability.  The caption reads:  \"Brand new!  Horse power at hand!\""
+      },
+      {
+        "id": "flier_18",
+        "text": "This is an advertisement for Sybil's Cyber Boutique.  It shows a picture of a man smiling while being relentlessly punched by a boxer.  He doesn't even sweat as punches have no effect on him.  Two scantily clad nurses give approving thumbs up from the background.  The caption reads:  \"Bouncy as never before!  Absorb those shocks!\""
+      },
+      {
+        "id": "flier_19",
+        "text": "This is an advertisement for Rivtech brand handguns.  It shows a picture of a well armed couple in business suits with matching handguns facing down a legion of villainous looking characters.  The caption reads:  \"Protect yourself with the Rivtech caseless automagnum!\""
+      },
+      {
+        "id": "flier_20",
+        "text": "This is an advertisement for Rivtech brand rifles.  It shows a picture of a smiling soldier with a futuristic looking rifle on her shoulder saluting the viewer.  The caption reads:  \"Rivtech caseless firearms proudly supports our Military.\""
+      },
+      {
+        "id": "flier_21",
+        "text": "This is an advertisement for Rivtech brand firearms.  It shows a picture of a trio of well armed hunters.  The three are each armed with different futuristic looking weapons and are shooting at a hostile crowd of approaching wildlife.  The caption reads:  \"Rivtech caseless firearms.  Superior stopping power.\""
+      },
+      {
+        "id": "flier_22",
+        "text": "This is an advertisement for the Rivtech brand Muscle Augmentation CBM.  It shows a picture of a stylized, howling wolf against a red background.  The caption reads:  \"Rivtech neuroreactive myomer bionics.  The most efficient synthetic adenosine triphosphate recovery system on the market.\" and \"Rivtech Bionics, guaranteed for life.\""
+      },
+      {
+        "id": "flier_23",
+        "text": "This is an advertisement for the Rivtech brand Wired Reflexes CBM.  It shows a picture of a stylized, snarling black cat against a red background.  The caption reads:  \"Rivtech neuroelectric stimulation bionics.  The next level in quantum inductive piezochemical nerve stimulation technology.\" and \"Rivtech Bionics, guaranteed for life.\""
+      },
+      {
+        "id": "flier_24",
+        "text": "This is an advertisement for the Rivtech brand Monomolecular Blade CBM.  It shows a picture of a woman with a bionic blade extending from her arm steadfastly defending her children from an angry bear.  The caption reads:  \"Rivtech retractable monomolecular blade system.  Failure is never an option.\" and \"Rivtech Bionics, guaranteed for life.\""
+      },
+      {
+        "id": "flier_25",
+        "text": "This is an advertisement for the Rivtech brand Synaptic Accelerator CBM.  It shows a picture of a stylized, soaring raven against a red background.  The caption reads:  \"Introducing the Rivtech Model Six myelination retrovirus system.  The latest in synthetic high-performance glycoprotein deposition technology.\" and \"Rivtech Bionics, guaranteed for life.\""
+      },
+      {
+        "id": "flier_26",
+        "text": "This is an advertisement for Rivtech brand ammunition.  It shows a picture of an armored steel plate with a gaping hole blasted through the middle.  Sitting beside the plate is a block of brightly colored caseless ammunition.  The caption reads:  \"Rivtech 8x40mm caseless.  Nothing else comes close.\""
+      },
+      {
+        "id": "flier_27",
+        "text": "This is an advertisement for Leadworks LLC's Home Frontier Starter Pack.  It shows a picture of a young suburban parent, equipped with rifle and revolver, keeping a steely eye on the neighborhood from the front porch.  Similarly-armed parents are visible in front of every house on the street.  Young children are at play and older ones tend a large vegetable garden.  The caption reads: \"A well-armed community is a SAFE community.  Leadworks, LLC.\""
+      },
+      {
+        "id": "flier_28",
+        "text": "This is a propaganda poster showing the Northrop Dispatch's military variant.  It depicts the iconic dark green, arachnoid dispatch, standing before a fence and facing away from the camera as blurring machines rush forward from its back towards black silhouettes menacing on the horizon.  It reads: \"WE ARE HERE TO PROTECT YOU.\""
+      },
+      {
+        "id": "flier_29",
+        "text": "This is an advertisement for Leadworks LLC handguns.  It shows a picture of a bionic police officer assisting a young couple, who were being attacked by a gang of ruffians.  The caption reads: \"You don't have to void your warranty or wear out your thumb to achieve felon-stopping firepower.  The L39B, tried and true by our fine cyborgs in blue, is available in .45 ACP for that extra punch, and we offer semiautomatic (but equally robust!) versions for the civilian market.  Leadworks, LLC.\""
+      },
+      {
+        "id": "flier_30",
+        "text": "This is an advertisement for Leadworks LLC modular weapons.  It shows a picture of an overworked-yet-grateful police sergeant assembling a sleek rifle, with similar-looking weapons racked neatly behind her.  The caption reads: \"Leadworks is proud to offer the L523 modular weapon system.  No more must armorers stock and maintain stacks and stacks of rifles, carbines, and squad support weapons, juggling multiple incompatible ammunition types!  Just procure a base unit for every trooper, and use our lightweight and portable conversion kits to swap from house-to-house CQB carbine to rooftop-patrol DSR, safely and cleanly!\""
+      },
+      {
+        "id": "flier_31",
+        "text": "This is a public notice from the Centers for Disease Control.  Its message, repeated in several languages, reads: Due to the recent outbreak of the A H3N2 flu strain, the CDC would like to remind the public to cover your nose and mouth with a tissue when you cough or sneeze and wash your hands frequently with soap and water.  The CDC also recommends an annual flu vaccine for everyone 6 months of age and older, which can be found at your local doctor's office or pharmacy."
+      },
+      {
+        "id": "flier_32",
+        "text": "This is a public alert from the Centers for Disease Control.  Its message, repeated in several languages, reads: PUBLIC HEALTH ALERT: Due to recent events, the CDC is issuing a warning to avoid public areas and spaces.  An unknown biological contaminant is suspected to be affecting citizens, possibly an unexpected mutation in the A H3N2 flu strain.  The CDC would like to remind the public to cover your nose and mouth when sneezing, wash your hands frequently, and recieve an up-to-date flu shot if possible.  Boiling water is recommended until further notice."
+      },
+      {
+        "id": "flier_33",
+        "text": "This is a public alert from the Federal Emergency Management Agency.  Its message, repeated in several languages, reads: STAY IN YOUR HOMES!  All residents of the New England Disaster Area are advised to shelter in place wherever possible.  The United States Armed Forces are working to contain the area.  If there is a nearby evacuation shelter you can get to safely, you are recommended to do so.  Otherwise, stay in your homes until authorized personnel evacuate you to a secured facility.  Thank you for your compliance."
+      },
+      {
+        "id": "flier_34",
+        "text": "This is a public alert from the Federal Emergency Management Agency.  Its message, repeated in several languages, consists of a list of towns serving as major evacuation points from the New England Disaster Area.  Someone has scribbled off most of the town names, and scrawled \"OVERRUN\" next to each one, with the exception of the Tacoma evacuation point."
+      },
+      {
+        "id": "flier_35",
+        "text": "This is a public warning from an unnamed source.  Its rambling message, poorly-photocopied onto both sides of the page, reads: Don't believe the lies!  The Army is rounding up people in death camps and executing them at mass graves.  They cannot stop this.  Do not believe what the mainstream news-media is reporting.  All official evacuation points are death-traps.  Secure supplies and escape the cities while there is still time."
+      },
+      {
+        "id": "flier_36",
+        "text": "This is a public message from an unnamed source.  Its message, photocopied from a scrawled handwritten copy, reads: REPENT YOUR SINS O BABYLON FOR THE TIME OF HIS JUDGEMENT IS NIGH!  LOOK UPON YOUR DESTRUCTION AND KNOW THAT IT IS JUST!  YOU WILL BE DIVIDED FATHER AGAINST SON AND MOTHER AGAINST CHILD UNTO THE VERY LAST SINNER!"
+      },
+      {
+        "id": "flier_37",
+        "text": "This is a public warning from the Federal Government.  Its brief message, repeated in several languages, reads:  The President of the United States has declared unilateral martial law to be in effect for the 48 contiguous states in response to the ongoing national crisis.  Continue to shelter in place until evacuated to an appropriate emergency management camp by authorized military personnel.  A 24-hour curfew has been established.  This curfew will remain in effect until further notice.  Stay indoors.  Violators will be shot on sight."
+      },
+      {
+        "id": "flier_38",
+        "text": "This is an advertisement for Rivtech's 'ATOMIC POWER THIRST' energy drink.  While intended to advertise a new flavor called Isotope RU-238 'FRUIT', most of the text is dedicated to a long list of possible side effects: anxiety, insomnia, severe insomnia, dizziness, tremors, nausea, headache, vomiting, delusions, hallucinations, rhabdomyolysis, internal burns, thyroid cancer, extensive internal bleeding, upper gastrointestinal bleeding, diarrhea, cardiac dysrhythmia, cardiovascular collapse, suicidal ideation, seizures, ataxia, amnesia, mania, stroke, neurodegeneration, malignalitaloptereosis, necrotizing fasciitis, recurrent flu, and pinkeye."
+      },
+      {
+        "id": "flier_39",
+        "text": "This is a soda advertisement.  On the front is a picture of a happy couple on a beach watching the sun set.  Between them are bottles of soda.  The poster reads, \"Cascade Cola, for those special moments\" in bold white letters."
+      },
+      {
+        "id": "flier_40",
+        "text": "This is a flier for a fast food chain.  In it, a man is placing an order with an attractive woman wearing a bright green shirt in the window with two happy children sitting in the back seat.  The flier reads \"Burgers, fries, and a Smile.\" Down in one corner is a company logo."
+      },
+      {
+        "id": "flier_41",
+        "text": "This is an advertisement for soda.  It shows a dark brown can of soda on a black background.  The label reads \"Spin\"."
+      },
+      {
+        "id": "flier_42",
+        "text": "This is a flyer for a local pizza chain.  On it is a picture of a cartoon Italian holding a pizza, with the words \"It's a goooood pizza\" written above his head."
+      },
+      {
+        "id": "flier_43",
+        "text": "This is a poster advertising contact lenses.  On it is a picture of a blood shot eye with a rather long block of information beneath it making some fairly exaggerated claims about the product."
+      },
+      {
+        "id": "flier_44",
+        "text": "This is a flyer advertising a local radio station.  It has a lot of bright colors and patterns, but no definite message other than \"104.4 all the best, all the time!\" in big yellow letters."
+      },
+      {
+        "id": "flier_45",
+        "text": "This is a large movie poster for \"Action Packstone 6, Revenge of the Dog Men\".  It shows a fit man in a leather jacket with a revolver and a claymore walking towards the viewer.  At his side is his trusty cyberdog companion and in the background is an explosion."
+      },
+      {
+        "id": "flier_46",
+        "text": "This is an illustrated poster for a brand of solar car.  The vehicle is driving through a lush country side as small animals look on.  The slogan \"Improving the world, one tank at a time.\" is written across the top in small letters."
+      },
+      {
+        "id": "flier_47",
+        "text": "This is a soda advertisement.  On the front is a picture of a happy couple on a beach watching the sun set.  Between them are bottles of soda.  The poster reads, \"Cascade Cola, for those special moments\" in bold white letters.  Someone has colored in the sun with a black marker.  The words \"oh Discordia\" are scrawled across the top."
+      },
+      {
+        "id": "flier_48",
+        "text": "This is a flier for a fast food chain.  In it, a man is placing an order with an attractive woman wearing a bright green shirt in the window with two happy children in the back seat.  The flier reads \"Burgers, fries, and a Smile.\" down in one corner is a company logo.  Someone has gone to town on this one with a permanent marker.  It is now covered in rude images and racial epithets."
+      },
+      {
+        "id": "flier_49",
+        "text": "This is a flier for a local pizza chain.  On it is a picture of a cartoon Italian holding a pizza, with the words \"It's a goooood pizza\" written above his head.  Someone has drawn an exaggerated mustache on the cartoon Italian, along with a pair of crude, oversized breasts."
+      },
+      {
+        "id": "flier_50",
+        "text": "This is a poster advertising contact lenses.  On it is a picture of a blood shot eye.  Someone has defaced this one.  The informative part has been torn off, and written in jagged letters across the top in red crayon are the words \"ALL HAIL THE CRIMSON KING!\"."
+      },
+      {
+        "id": "flier_51",
+        "text": "This is an illustrated poster for a brand of solar car.  The vehicle is driving through a lush country side as small animals look on.  The slogan \"Improving the world, one tank at a time.\" is written across the top.  Someone used a blue pen to write \"who gives a shit\" across the slogan and put X's over the eyes of all the animals."
+      },
+      {
+        "id": "flier_52",
+        "text": "This is a poster advertising a underground bunker.  The poster shows a nuclear bomb wiping out a city while a family huddles safely underground.  There a slogan \"Concerned about enemy attack?  Want to protect your family?  Join the VAULT program today.\" which is written in the middle.  However, there seems to be no information about *how* one might do so."
+      },
+      {
+        "id": "flier_53",
+        "text": "This is a flier for Red Ryder BBGuns.  On it a child is pulling a shining red wagon with a cooked pheasant on it and a wooden rifle over one shoulder.  The child has a dog trailing beside him and a satisfied look on his face.  The caption reads \"When you chose Red Ryder, you invested in the American Dream.  You invested in our Independence.\""
+      },
+      {
+        "id": "flier_54",
+        "text": "This is an old flier for a movie from the 30s.  A tan man with slick black hair and muscles bulging through his offwhite suit is clasping a woman to his hip with one hand, and the woman is wearing a black leather dress.  With her hips splayed, she is holding a pistol in one hand and starring directly out of the advert.  The caption reads \"Witness the rebirth of New Noir with 'Jersey Shore Blues'.  Starring Jenifer Languiz as 'Snookie'!\""
+      },
+      {
+        "id": "flier_55",
+        "text": "\"Joe's Diner; 1/2 pound of meat, 3 toppings, 'your choice', all with a side of freedom fries and a BIG Gulp size pop.\""
+      },
+      {
+        "id": "flier_56",
+        "text": "This is an advertisement for the Wink & Nod brand Soporific Induction CBM.  It shows a picture of a woman sleeping on a bed of nails with a satisfied smile on her face.  The caption reads: \"Catch Zs with ease, wherever you please!\""
+      },
+      {
+        "id": "flier_57",
+        "text": "This is a leaflet about autoclaving procedure.  One sentence catches your attention \"/!\\Always place your tools into an autoclave pouch before autoclaving./!\\\""
+      },
+      {
+        "id": "flier_58",
+        "text": "This is an advertisement for a local hospital.  You see a clean hospital room with a smiling man lying on the bed.  The bed is connected to some medical apparatus with a \"Autodoc Mk. X\" printed on it.  A doctor is seen working with its console, while his assistant is unpacking some high-tech hardware.  The caption reads: \"Autodoc - augmentation has never been so easy, reliable, and safe.\""
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "note",
     "text": [
-      "\"WE WERE RIGHT THE GOVERNMENT DID IT\"",
-      "\"Have seen a zombie making its kin raise even despite damage that normally would take them down, the air around it shimmered like around that hole in the air we've seen creatures coming through back home\"",
-      "\"I shot the sheriff; but I couldn't find the deputy\"",
-      "\"Some plant vines started chasin after me, so I took a gas mask and some teargas and I ran through them.\"",
-      "\"Slingshot right through the windshield k?\"",
-      "\"When I was a kid I used to slingshot at bugs and birds.  Its really playing off nowadays, Ill tell you what\"",
-      "\"ALL YOU STONERS WITH YOUR VIDEYA GAMES - I BET YOU WISH YOU TOOK THE TIME TO LEARN A SKILL NOW DONTYA\"",
-      "\"I tried to be a bard, but the rats didn't like my piping.\"",
-      "\"I found a chocolate bar on my pillow when I got home last night.  I left and don't wanna go back.\"",
-      "\"this demon thing came after me  it got me good  i shot it but i dont know if ill make it\"",
-      "\"DANNY IF YOU READ THIS THIS IS CLARA WE'RE ALL OKAY AND WE'RE HEADING TO THE RIVER.  A BOAT SAID THEY WERE DOCKED NEARBY.\"",
-      "\"When I think of all the dead people I get mad, because I was supposed to be the next big leader.  WHERES MY CHANCE!??\"",
-      "\"A man in a black robe came up to me, said he wanted to make a deal...\"",
-      "\"Cha-cha-cha-chia!  Saw a woman today, with fungus coming out her head like hair tendrils.\"",
-      "\"If only I had had more time with that Autodoc I could have saved them!  But with that damn chip in their brain those poor cyborg wil never be human again...\"",
-      "\"Save the cyborgs!  Please, whoever reads this, you must help them!  Knock them out or deactivate them, I don't care how you do it.  But put their unconscious body on that Autodoc and remove the chip that is messing up their brain!\"",
-      "\"Gotta slow down, man.  I don't think we spend more than 20% of our time fightin',  Put some Marley on and take off that racketus tripcore nonsense, man.\"",
-      "\"I kept shooting with my handgun, but I never got any better!\"",
-      "\"ITS OKEY GUYS!  I BARRYED A TIME CAPSUL IN MY BACKYARD!  I PUT IN SOME HOEHOES.\"",
-      "\"I got my tinfoil hat on.  Good thing too, cause this monster was starrin at me kinda funny, trying to freeze my mind in place.\"",
-      "\"You want my advice?  Smoke crack, it gets shit done.\"",
-      "\"ALWAYS WITH THE EFFICIENCY GUYS; YOURE ALWAYS WORKING TO GO HOME TO PAY RENT TO SLEEP TO WAKE UP TO WORK AGAIN.  STOP\"",
-      "\"IM OFF TO THUNDERDOME, BYE SUCKERS.\"",
-      "\"If you get a parasite, take some sand and some vodka.  Rub the sand into the afflicted area, real good too; like you're washing your hair.  Then rinse with vodka.\"",
-      "\"I put my toilet water into a gastank.  Then I poured it into a glass cup.  Then I drank it without vomiting my insides back into the toilet.\"",
-      "\"This isn't real this is a test to turn you into a Manchurian Candidate!\"",
-      "\"They're all hiding on an oil rig, I heard it myself over the AM airwaves.  They think they're the nobles of the 21st century, the prigs.\"",
-      "\"Some of 'em are big.  Real big.  Don't stick around, I saw my mate get fucking torn in half!\"",
-      "\"po p y fl ow er s don t ea at them\"",
-      "\"Some guy is walking through the horde without a scratch.  Please tell me they're docile now.  Please fucking tell me.\"",
-      "\"Why are all the lawnmowers broken?!\"",
-      "\"Some of the bridges, they're right next to each other, right?  If you see something up ahead one of those, just careen through to the other side.  My van was long enough to bridge right across!\"",
-      "\"BURN BURN BURN BURN BURN ALL BURN ALL BURN ALL BURN\"",
-      "\"I took all the supplies.  Don't follow me.  I'm sorry, man.  I have to look out for myself now.\"",
-      "\"My next-door neighbor had a katana in his basement!\"",
-      "\"Am I the last one alive?\"",
-      "\"Boyfriend stole my pistol while I was asleep.  I locked him in the bathroom and set the house on fire.  At least he attracted their attention.\"",
-      "\"I get air conditioners, but... this whole laboratory is frozen to ice!\"",
-      "\"A wood ax works pretty well against them.  So does a machete, but you can't cut down a tree.\"",
-      "\"Why would you hide in a farm?  Sure, it's isolated, but if they know where you are, you don't exactly have cover on all sides.\"",
-      "\"Imagine if this spread to, like, Australia.  Zombie kangaroos.  Haha...\"",
-      "\"how DO I use THESE bionic THINGS?  I just STUCK the wires IN my WRIST and now I CAN'T STOP twitching.  AND now my LEG hurts!  Is THAT acid?!\"",
-      "\"I tried playing memorial music for my dead brother, on a radio.  They must have been attracted to it.  I can't see his grave through the crowd anymore.\"",
-      "\"Took a picture of a dead dog leaping right onto a soldier.  Sweet fucking shot!\"",
-      "\"Gas mask is nice and all, but I can hardly run with it on.\"",
-      "\"One of those robot tanks was blocking the way out.  Got some sort of sweetspot, though, where it can't decide what to shoot with, maybe 30 yards or so?  Made it to the truck and just drove.\"",
-      "\"Those evac shelters have basements.  Remember when they were full of food?  Every single one is fucking empty now...\"",
-      "\"I made mushroom babies.  My arms hurt.  I hurt.  I had mushroom babies.  They are growing now.\"",
-      "\"It doesn't matter how you die.  You're gonna turn into one of them.\"",
-      "\"WHY DO ALL THE DEAD CHILDREN GO TO SCHOOL\"",
-      "\"Don't keep your goddamn casings!  They'll just weigh you down.\"",
-      "\"Local auto shop is full of the things.  And to think I worked with them on repairing cars... now they're just... fucking corpses.\"",
-      "\"DON'T EAT THE SLIME DON'T EAT THE SLIME DON'T EAT THE SLIME\"",
-      "\"I used to be human.  But... my arms... they are like tentacles.  I slither along akin to a snail and I shed my feathers every day.\"",
-      "\"Killed a giant worm thing, but now I'm only three feet tall. Should've just left the damn worm alone, now none of my clothes fit!\"",
-      "\"I don't have enough time to double tap.  You don't either.\"",
-      "\"PINK TALL ONES RUN RUN RUN RUN RUN\"",
-      "\"Are they still human inside?\"",
-      "\"the eye it watches me it follows me everywhere help\"",
-      "\"tHE Portal it's so COld\"",
-      "\"They build modern bullets fuckin crazy.  Set some on fire and they all goes like a lil grenade.  Need kindling first.\"",
-      "\"GOD CAN'T SAVE US\"",
-      "\"SHOOT YOURSELF, LET IT END QUICKLY\"",
-      "\"There are five basic rules to survival.  One, stay prepared and watchful.  Two, keep your iron sights lined up or succumb.  Three, stay FAR WAY from all\"",
-      "\"The bricks of this bathroom look like a face.  Haha... it's all I can focus on.  At least let me shit before you break down the door.  Please...\"",
-      "\"What the hell are they mining for in these shafts?\"",
-      "\"I am one with the plants.\"",
-      "\"Broadsword!  Yeah!\"",
-      "\"If you see a trail of dirt getting displaced in your direction... run.  Run for your life.\"",
-      "\"DINT ATE THE MUSHROM\"",
-      "\"Libraries are useless after the apocalypse.\"",
-      "\"I swear to God I've seen these plant things before!  In a book, or something!  I swear...\"",
-      "\"Is robbing a bank easier or harder now that all the guards are undead?\"",
-      "\"Make sure your car is REALLY stopped before you get out.\"",
-      "\"I found some kind of stone pyramid with spikes.  I feel... I feel like I'm being watched.\"",
-      "\"Why would you ever hide in a damn gun store?  The owner... he was a moron alright.\"",
-      "\"THEY DON'T feel ANYTHING\"",
-      "\"What was XEDRA doing, anyway?\"",
-      "\"Is that one pharmaceutical company gonna come out with a, like, cure for this anytime soon?\"",
-      "\"THE MARLEY WAS RIGHT\"",
-      "\"Squeeze some ammonia into zombie flesh and hold it tight.  You smell like one of them!  I think.\"",
-      "\"I thought my damn terminal cancer was bad enough... now the dead are rising?!\"",
-      "\"THE GOO IS IN THE WATER DON'T DRINK WATER\"",
-      "\"Don't let the ember go out please don't go out I need you precious fire.\"",
-      "\"Everyone used their gas to get to another town... but it's the same story everywhere.\"",
-      "\"There's still an evacuation point at Concord, spread the word.\"",
-      "\"STAY AWAY FROM CONCORD\"",
-      "\"Most things can be taken out with a shotgun.  More things can be taken out with a grenade.  Imagine what a mini-nuke does.\"",
-      "\"Come to the bar if you see this, let's re-enact a zombie movie, friends.\"",
-      "\"They are NOT slow!  They are NEVER slow!\"",
-      "\"I had a phobia of bees BEFORE they grew to enormous sizes.\"",
-      "\"Your backpack's gonna weigh you down in the water.  Hell, feel free to get naked.  Nobody's going to judge your modesty.\"",
-      "\"Guns too loud.  Crossbow too long.  Running is best.\"",
-      "\"99% dead?  I'd like to see a million zombies on Wall Street.\"",
-      "\"Crawled in through the vents.  Whole office building is infested.\"",
-      "\"Don't shoot the people who get bit!  It's OK!  Death is the only thing that makes you turn!\"",
-      "\"Zombies, walkers, dead ones, undead, reanimated, zed, animata, biters.  Did I miss any?\"",
-      "\"All I've got is this keg of beer and an appetite.  Come at me, apocalypse!\"",
-      "\"My cousin says that murder nowadays is just a war crime.  War for what, I don't know, since the undead seem to be rebels without a cause.\"",
-      "\"SWAMPS RUN SWAMPS NO SWAMPS RUN\"",
-      "\"They said a walking cane was a useless weapon... but then I hit one of them with it.\"",
-      "\"River water around these parts is extremely safe.  Probably more safe than the damn tap water at this point.\"",
-      "\"DON't bomB THe PORtals it MAKES iT WORSE\"",
-      "\"No wonder all the camps got overrun, they kept a goddamn zombie test subject!  Each and every one of 'em!\"",
-      "\"I just realized how damn demented those fliers are.\"",
-      "\"I propose a new currency: 9mm.\"",
-      "\"My skin is crawling and I teleport every few minutes... what is going o\"",
-      "\"You can't see them through the smoke but they can't either.\"",
-      "\"There's gotta be a better use of all this rebar...\"",
-      "\"met schoolhouse of people, all crazy and mad they were, ate killed all of them, yum\"",
-      "\"STAY AWAY FROM THE BIG ONES IN THE FOREST\"",
-      "\"got into a prison with a halligan bar.  makes me wonder how they kept prisoners inside\"",
-      "\"This thing isn't a car any more.  It's just a fucking mountain of metal on wheels, which I live in.\"",
-      "\"Anyone else seen those really... SQUARE-looking towns?  I don't think they're normal.\"",
-      "\"big z threw me on top of the building, legs broken but at least im safe for a few more minutes\"",
-      "\"I'm starting to feel bad about disabling all these turrets and stealing their ammunition.\"",
-      "\"Make sure you strip the house for all available resources-- tubes, pipes, ceramics, sheets, strings, and more\"",
-      "\"FUCK FAUX-MUTANTS, BEING 'EXTREMELY THIRSTY' DOES NOT COUNT\"",
-      "\"There's nothing wrong with eating people if you HAVE to.  I mean, I only did it because I didn't want to waste my potato chips!\"",
-      "\"all these robotic police really take the piss out of kops\"",
-      "\"CHINA DID THIS\"",
-      "\"RUSSIA DID THIS\"",
-      "\"Thank You RivTech.  Thank You For Good Coffee.  Will Always Stay Awake For You Rivtech.\"",
-      "\"See, now I'm just not sure where I'm putting all these storage batteries in my body!\"",
-      "\"dont try to leave they will shoot you\"",
-      "\"I'd like to thank my high-school culinary arts class for teaching me how to make RDX and mutagenic serum.\"",
-      "\"Makayla Sanchez burned down my fucking house\"",
-      "\"he calls himself the 'man with the hands', don't approach\"",
-      "\"So... what happens if the military rescues us?  We're all freaks by now, right?  How the fuck are we gonna go back to real life?\"",
-      "\"Not sure if my companion WANTED to turn into a bird, but I was the one giving her the serum, and I saved her life!  That's fair, right?\"",
-      "\"I've never been very confident, is that why my shots keep missing?\"",
-      "\"FIRE BAD.  NOW NAKED.  PLEASE HELP.\"",
-      "\"Heard of a place up in Maine where people have their shit together.  Hundreds of people, defense, food and shelter... let's go raid it, guys!\"",
-      "\"KASHWAK: NO-FO\"",
-      "\"The whispering fog is taking me in like a blanket.  I'm warm now.  I'm finally\"",
-      "\"got a video recording of hour one when the portals were still up.  pretty cool\"",
-      "\"Stuck here.  Zombies outside.  Friends were outside too, now they're part of zombies.  Need to be quiet\"",
-      "\"if anyones reading this, please tell my mom i was right about insects being superior\"",
-      "\"Diamond coated sword!  Diamond coated hammer!  Diamond coated clothes!  Diamond coated hands help\"",
-      "\"waded through 14 miles of sewage for playboy magazine, wasnt worth it\"",
-      "\"I'm coming back for this note in twelve hours.  If I don't, take all my shit!\"",
-      "\"all my friends died when they came near me.  there's nothing funny about that\"",
-      "\"DOG NOT REAL DOG\"",
-      "\"This is all just a dream, right??! I'M GOING TO WAKE UP, SHE'S GOING TO BE OK\"",
-      "\"wek ik spak\"",
-      "\"IT'S BURIED!  THE TEMPLE IS BURIED!\"",
-      "\"If I had a dollar for every cash card I've found, I'd have more money than is on these stupid things!\"",
-      "\"can never have enough kevlar.  basically just live in a kevlar turtle shell.\"",
-      "\"MY GLITTERING SNAKE COMPELS YOU!  OBEY!\"",
-      "\"can sunstasin self frorever off fof my funggnaloid babiues oout fo yme arms eat themm up eatbtb my chidlldren\"",
-      "\"Gonna settle down one day.  Nice big orchard, couple of friends/future family to spend time with, and my army of zlaves to guard the place.\"",
-      "\"a ctulaly don t mi nd  t he cold it   s  f i ne in h ere  nn    o problem\"",
-      "\"tried to shoot myself but the nanobots fixed it, fucked up the controls, now i can't turn them off i just want it to be over\"",
-      "\"Tried wearing dead zombie clothes, but they still knew I was alive!  It's like they're a hivemind, man!\"",
-      "\"riddle.  what's 1/4 feathers, 1/4 scales, 1/4 metal, and 1/4 flesh?  answer: sorry, but you should know this one.\"",
-      "\"For anyone that's reading this, I just want to confirm (FROM AN UNBIASED SOURCE) that it was NOT the scientists' fault.\"",
-      "\"We're the eagle-eyes in the sky!  Just two mutant avians in our helicopter!  Filming the Cataclysm!  Check us out on any working electronics!\"",
-      "\"WE'RE GOING TO SAIL TO CANADA, BITCHES!\"",
-      "\"Anyone hear about that guy who tried to sail his family to Canada?  What a moron, right?\"",
-      "\"recently canadian border has gotten more dangerous don't go there\"",
-      "\"Hey, what happened to my dad's airboat?!\"",
-      "\"Reading is good!  Never stop reading.  Read EVERYTHING.\"",
-      "\"I'm gonna be honest here, I'm really gonna die soon so I dont want to gt forgnottedn ples dont forntget me y nrmmy name is h@@hbhbh\"",
-      "\"all it takes to seal a wound is a sawblade and a match!  trust me\"",
-      "\"I wonder what's in this sarcophagus?  Maybe it's a real sarcophagus.  Maybe there's a big guy named God under here.\"",
-      "\"these hulks aint so incredible when ya got .50\"",
-      "\"WBLF 970 went off-air three days ago. There's nobody left on the radio. Might as well throw this thing away...\"",
-      "\"I've heard it's safer across the Mississippi. Going to start driving today. If you're reading this, pray for me\"",
-      "\"Mi-go is friend!  Go with Mi-go to friend dimension!  On the Friend Team!!\"",
-      "\"We have Landed our Comet.  The Sky is Ablaze.\"",
-      "\"Last one standing.  It's good feeling.  I win.  I win I win I win I win I win\"",
-      "\"Adderall cures weakness, tramadol cures death\"",
-      "\"These turrets keep dodging my FUCKING BULLETS!\"",
-      "\"Best way to train is by throwing pebbles at birds.  You'll be a legend.\"",
-      "\"new bedford is overrun.  i'm sorry.  we tried.\"",
-      "\"Check out my cooking show on The Television!  Making Mannwurst sausages out of some of those assholes who tried to raid my kitchen earlier...\"",
-      "\"Renting out my rat tunnels for 50 9mm rounds a night.  I dug them with my own claws, so you know they're the best.\"",
-      "\"Anyone wanna listen to some music at full volume and shoot the Zs that approach?  You pick the tunes if I get some ammo.\"",
-      "\"Lots of new easy ways to burn calories now.  Fighting aminata, managing the fields, running with my wings buzzing, and more.\"",
-      "\"FLAMING SWORD HUMANE.  CAUTERIZES WOUNDS.  SURGICAL.\"",
-      "\"knife screams it screams i cant breathe so scared help me please help\"",
-      "\"when it started, we could still hope The Man was gonna save us...\"",
-      "\"Hey, Ted.  Alexander and Cass and I are heading to Z-Mobile for the last of the meth.  Keep the lizard fetus fed for us, OK?\"",
-      "\"i say we call the material from melting down cars and dead robots 'massachusetite' or 'vermontsteel' or 'connecticut composite'\"",
-      "\"Sometimes what you need when you're infected, bleeding, sick and hungover is a J and some chips.\"",
-      "\"This has to be China's fault. Seriously, why is nobody suspecting the people we're having a cold war with! This is an invasion! These aren't zombies, it's just camoflauge! WAKE UP, SHEEPLE!\"",
-      "\"Hahahahaa stupid fuck in his mansion, with his plate armor and big axe.  Guy never swung the thing in his life.  Can't block bullets, dipshit\"",
-      "\"I woke up with a dozen bears in a tribe outside the vault.  One was covered in red markings, glowing-- speaking.\"",
-      "\"poor guy.  watched him from afar with my binocs for months and months.  today he died fighting.  feels like i knew him even though i never approached.\"",
-      "\"ENGLAND DID THIS\"",
-      "\"That little fakkin rat din say anythin till we whacked him with a steel chain!  Then 'e just wanted to know if he could buy the chain!\"",
-      "\"tom, adorned with fluid sacs three layers deep, crawls to safety like a slug\"",
-      "\"my friend turned fuckin insane and ate his arms and then his sister's arms!  he looked rather cross\"",
-      "\"Starting today, the hallucinations are my only friends.\"",
-      "\"For sale: zombaby shoes, very filthy\"",
-      "\"Started my own brewery recently.  I just need some glass bottles, now!  Several thousand!  I'm planning way ahead.\"",
-      "\"Heard recently of some radio op who lives in a skyscraper, announcing where those hordes are going.  Couldn't find the frequency, though.\"",
-      "\"Woah, bud!  Not all cannibals eat meat!\"",
-      "\"ay why aint my bullets fuckin explodin\"",
-      "\"Those Fiktok clan people picked this place clean... no food...\"",
-      "\"The fewer people in New England, the stronger we'll become.\"",
-      "\"It all boils down to the Apex Predator.\"",
-      "\"King Jameson ik goner!  Thee cyber limbs isk falleng off me body!  Stak pyroteknik I heear!\"",
-      "\"Got my mortar and pestle.  Now if I could just find some avocados...\"",
-      "\"saw a girl standing with the mushrooms.  spores coming out of slits in her neck.  she looked happy.\"",
-      "\"Found some pink berries.  Eating them makes bushes into more pink berries.  Infinite berry.\"",
-      "\"m ust grow                 unity\"",
-      "\"AMY IS FUNGUS.  DO NOT LISTEN IF SHE ASKS YOU TO TAKE OFF MASK\"",
-      "\"my rabbi follows a new god now.  asks us to call him a local guide.  i dont mind, he keeps us fed\"",
-      "\"Fungus are helping us.  Help them and they will unite us\"",
-      "\"Saw a boy couldnt be older than 16.  Walked straight through the mushroom tower.  THROUGH IT\"",
-      "\"Found some food in a box outside my house.  We ate it and now the fungaloids aren't harming us.  I think we are a mushroom now\"",
-      "\"saw the girl again.  she looked dead exhausted and walked right into the fungus.  30 mins later and she walked out good as new\"",
-      "\"HADENSBROOK REBUILT AROUND FUNGUS.  THEY EAT GRAY APPLES AND SPREAD IT\"",
-      "\"mycus must grow\"",
-      "\"School bus with solar panels = TRUST.  Gave us berries and seeds, we were out of food\"",
-      "\"d o nThelp scho Ol buss makE seeeedS ARe FUNGUS!! !\"",
-      "\"Go to every fungus patch you find but WEAR A SUIT.  Food there is very very filling.  Look for pink berries, blue flowers\"",
-      "\"red blue yellow berry seed sap bloom flowers tower mycus mycus mycus.\"",
-      "\"Husband 30 yrs died in bombs.  Mushrooms brought him back.  GIVE YOURSELF TO THEm AND THEY WILL HELP YOU\"",
-      "\"Lisa always was a fan of sports.  Thank God these Global Athletics Games in Harran started some time before the outbreak, so she was able to leave New England before it was quarantined.  I can only hope there are no zombies, as we do have here, in the city she flew to.\"",
-      "\"Don't mix powders, them books said.  Do Not Mix powders.  Didn't listen did I.  Blew my goddamn pinky off, near lost my right eye.\"",
-      "\"followed what toby wrote down. shells looked like theyd hold more, I put in some more.  traded most to h raiders for crank.  shot my 38 today and it fuckn exploded.  low on crank, good as dead, no gun, no toby.  headed to montreal real sorry bout the bullets\""
+      { "id": "note_1", "text": "\"WE WERE RIGHT THE GOVERNMENT DID IT\"" },
+      {
+        "id": "note_2",
+        "text": "\"Have seen a zombie making its kin raise even despite damage that normally would take them down, the air around it shimmered like around that hole in the air we've seen creatures coming through back home\""
+      },
+      { "id": "note_3", "text": "\"I shot the sheriff; but I couldn't find the deputy\"" },
+      {
+        "id": "note_4",
+        "text": "\"Some plant vines started chasin after me, so I took a gas mask and some teargas and I ran through them.\""
+      },
+      { "id": "note_5", "text": "\"Slingshot right through the windshield k?\"" },
+      {
+        "id": "note_6",
+        "text": "\"When I was a kid I used to slingshot at bugs and birds.  Its really playing off nowadays, Ill tell you what\""
+      },
+      {
+        "id": "note_7",
+        "text": "\"ALL YOU STONERS WITH YOUR VIDEYA GAMES - I BET YOU WISH YOU TOOK THE TIME TO LEARN A SKILL NOW DONTYA\""
+      },
+      { "id": "note_8", "text": "\"I tried to be a bard, but the rats didn't like my piping.\"" },
+      {
+        "id": "note_9",
+        "text": "\"I found a chocolate bar on my pillow when I got home last night.  I left and don't wanna go back.\""
+      },
+      {
+        "id": "note_10",
+        "text": "\"this demon thing came after me  it got me good  i shot it but i dont know if ill make it\""
+      },
+      {
+        "id": "note_11",
+        "text": "\"DANNY IF YOU READ THIS THIS IS CLARA WE'RE ALL OKAY AND WE'RE HEADING TO THE RIVER.  A BOAT SAID THEY WERE DOCKED NEARBY.\""
+      },
+      {
+        "id": "note_12",
+        "text": "\"When I think of all the dead people I get mad, because I was supposed to be the next big leader.  WHERES MY CHANCE!??\""
+      },
+      { "id": "note_13", "text": "\"A man in a black robe came up to me, said he wanted to make a deal…\"" },
+      {
+        "id": "note_14",
+        "text": "\"Cha-cha-cha-chia!  Saw a woman today, with fungus coming out her head like hair tendrils.\""
+      },
+      {
+        "id": "note_15",
+        "text": "\"If only I had had more time with that Autodoc I could have saved them!  But with that damn chip in their brain those poor cyborg wil never be human again…\""
+      },
+      {
+        "id": "note_16",
+        "text": "\"Save the cyborgs!  Please, whoever reads this, you must help them!  Knock them out or deactivate them, I don't care how you do it.  But put their unconscious body on that Autodoc and remove the chip that is messing up their brain!\""
+      },
+      {
+        "id": "note_17",
+        "text": "\"Gotta slow down, man.  I don't think we spend more than 20% of our time fightin',  Put some Marley on and take off that racketus tripcore nonsense, man.\""
+      },
+      { "id": "note_18", "text": "\"I kept shooting with my handgun, but I never got any better!\"" },
+      {
+        "id": "note_19",
+        "text": "\"ITS OKEY GUYS!  I BARRYED A TIME CAPSUL IN MY BACKYARD!  I PUT IN SOME HOEHOES.\""
+      },
+      {
+        "id": "note_20",
+        "text": "\"I got my tinfoil hat on.  Good thing too, cause this monster was starrin at me kinda funny, trying to freeze my mind in place.\""
+      },
+      { "id": "note_21", "text": "\"You want my advice?  Smoke crack, it gets shit done.\"" },
+      {
+        "id": "note_22",
+        "text": "\"ALWAYS WITH THE EFFICIENCY GUYS; YOURE ALWAYS WORKING TO GO HOME TO PAY RENT TO SLEEP TO WAKE UP TO WORK AGAIN.  STOP\""
+      },
+      { "id": "note_23", "text": "\"IM OFF TO THUNDERDOME, BYE SUCKERS.\"" },
+      {
+        "id": "note_24",
+        "text": "\"If you get a parasite, take some sand and some vodka.  Rub the sand into the afflicted area, real good too; like you're washing your hair.  Then rinse with vodka.\""
+      },
+      {
+        "id": "note_25",
+        "text": "\"I put my toilet water into a gastank.  Then I poured it into a glass cup.  Then I drank it without vomiting my insides back into the toilet.\""
+      },
+      { "id": "note_26", "text": "\"This isn't real this is a test to turn you into a Manchurian Candidate!\"" },
+      {
+        "id": "note_27",
+        "text": "\"They're all hiding on an oil rig, I heard it myself over the AM airwaves.  They think they're the nobles of the 21st century, the prigs.\""
+      },
+      {
+        "id": "note_28",
+        "text": "\"Some of 'em are big.  Real big.  Don't stick around, I saw my mate get fucking torn in half!\""
+      },
+      { "id": "note_29", "text": "\"po p y fl ow er s don t ea at them\"" },
+      {
+        "id": "note_30",
+        "text": "\"Some guy is walking through the horde without a scratch.  Please tell me they're docile now.  Please fucking tell me.\""
+      },
+      { "id": "note_31", "text": "\"Why are all the lawnmowers broken?!\"" },
+      {
+        "id": "note_32",
+        "text": "\"Some of the bridges, they're right next to each other, right?  If you see something up ahead one of those, just careen through to the other side.  My van was long enough to bridge right across!\""
+      },
+      { "id": "note_33", "text": "\"BURN BURN BURN BURN BURN ALL BURN ALL BURN ALL BURN\"" },
+      {
+        "id": "note_34",
+        "text": "\"I took all the supplies.  Don't follow me.  I'm sorry, man.  I have to look out for myself now.\""
+      },
+      { "id": "note_35", "text": "\"My next-door neighbor had a katana in his basement!\"" },
+      { "id": "note_36", "text": "\"Am I the last one alive?\"" },
+      {
+        "id": "note_37",
+        "text": "\"Boyfriend stole my pistol while I was asleep.  I locked him in the bathroom and set the house on fire.  At least he attracted their attention.\""
+      },
+      { "id": "note_38", "text": "\"I get air conditioners, but… this whole laboratory is frozen to ice!\"" },
+      {
+        "id": "note_39",
+        "text": "\"A wood ax works pretty well against them.  So does a machete, but you can't cut down a tree.\""
+      },
+      {
+        "id": "note_40",
+        "text": "\"Why would you hide in a farm?  Sure, it's isolated, but if they know where you are, you don't exactly have cover on all sides.\""
+      },
+      { "id": "note_41", "text": "\"Imagine if this spread to, like, Australia.  Zombie kangaroos.  Haha…\"" },
+      {
+        "id": "note_42",
+        "text": "\"how DO I use THESE bionic THINGS?  I just STUCK the wires IN my WRIST and now I CAN'T STOP twitching.  AND now my LEG hurts!  Is THAT acid?!\""
+      },
+      {
+        "id": "note_43",
+        "text": "\"I tried playing memorial music for my dead brother, on a radio.  They must have been attracted to it.  I can't see his grave through the crowd anymore.\""
+      },
+      {
+        "id": "note_44",
+        "text": "\"Took a picture of a dead dog leaping right onto a soldier.  Sweet fucking shot!\""
+      },
+      { "id": "note_45", "text": "\"Gas mask is nice and all, but I can hardly run with it on.\"" },
+      {
+        "id": "note_46",
+        "text": "\"One of those robot tanks was blocking the way out.  Got some sort of sweetspot, though, where it can't decide what to shoot with, maybe 30 yards or so?  Made it to the truck and just drove.\""
+      },
+      {
+        "id": "note_47",
+        "text": "\"Those evac shelters have basements.  Remember when they were full of food?  Every single one is fucking empty now…\""
+      },
+      {
+        "id": "note_48",
+        "text": "\"I made mushroom babies.  My arms hurt.  I hurt.  I had mushroom babies.  They are growing now.\""
+      },
+      { "id": "note_49", "text": "\"It doesn't matter how you die.  You're gonna turn into one of them.\"" },
+      { "id": "note_50", "text": "\"WHY DO ALL THE DEAD CHILDREN GO TO SCHOOL\"" },
+      { "id": "note_51", "text": "\"Don't keep your goddamn casings!  They'll just weigh you down.\"" },
+      {
+        "id": "note_52",
+        "text": "\"Local auto shop is full of the things.  And to think I worked with them on repairing cars… now they're just… fucking corpses.\""
+      },
+      { "id": "note_53", "text": "\"DON'T EAT THE SLIME DON'T EAT THE SLIME DON'T EAT THE SLIME\"" },
+      {
+        "id": "note_54",
+        "text": "\"I used to be human.  But… my arms… they are like tentacles.  I slither along akin to a snail and I shed my feathers every day.\""
+      },
+      {
+        "id": "note_55",
+        "text": "\"Killed a giant worm thing, but now I'm only three feet tall.  Should've just left the damn worm alone, now none of my clothes fit!\""
+      },
+      { "id": "note_56", "text": "\"I don't have enough time to double tap.  You don't either.\"" },
+      { "id": "note_57", "text": "\"PINK TALL ONES RUN RUN RUN RUN RUN\"" },
+      { "id": "note_58", "text": "\"Are they still human inside?\"" },
+      { "id": "note_59", "text": "\"the eye it watches me it follows me everywhere help\"" },
+      { "id": "note_60", "text": "\"tHE Portal it's so COld\"" },
+      {
+        "id": "note_61",
+        "text": "\"They build modern bullets fuckin crazy.  Set some on fire and they all goes like a lil grenade.  Need kindling first.\""
+      },
+      { "id": "note_62", "text": "\"GOD CAN'T SAVE US\"" },
+      { "id": "note_63", "text": "\"SHOOT YOURSELF, LET IT END QUICKLY\"" },
+      {
+        "id": "note_64",
+        "text": "\"There are five basic rules to survival.  One, stay prepared and watchful.  Two, keep your iron sights lined up or succumb.  Three, stay FAR WAY from all\""
+      },
+      {
+        "id": "note_65",
+        "text": "\"The bricks of this bathroom look like a face.  Haha… it's all I can focus on.  At least let me shit before you break down the door.  Please…\""
+      },
+      { "id": "note_66", "text": "\"What the hell are they mining for in these shafts?\"" },
+      { "id": "note_67", "text": "\"I am one with the plants.\"" },
+      { "id": "note_68", "text": "\"Broadsword!  Yeah!\"" },
+      {
+        "id": "note_69",
+        "text": "\"If you see a trail of dirt getting displaced in your direction… run.  Run for your life.\""
+      },
+      { "id": "note_70", "text": "\"DINT ATE THE MUSHROM\"" },
+      { "id": "note_71", "text": "\"Libraries are useless after the apocalypse.\"" },
+      {
+        "id": "note_72",
+        "text": "\"I swear to God I've seen these plant things before!  In a book, or something!  I swear…\""
+      },
+      { "id": "note_73", "text": "\"Is robbing a bank easier or harder now that all the guards are undead?\"" },
+      { "id": "note_74", "text": "\"Make sure your car is REALLY stopped before you get out.\"" },
+      {
+        "id": "note_75",
+        "text": "\"I found some kind of stone pyramid with spikes.  I feel…  I feel like I'm being watched.\""
+      },
+      {
+        "id": "note_76",
+        "text": "\"Why would you ever hide in a damn gun store?  The owner… he was a moron alright.\""
+      },
+      { "id": "note_77", "text": "\"THEY DON'T feel ANYTHING\"" },
+      { "id": "note_78", "text": "\"What was XEDRA doing, anyway?\"" },
+      {
+        "id": "note_79",
+        "text": "\"Is that one pharmaceutical company gonna come out with a, like, cure for this anytime soon?\""
+      },
+      { "id": "note_80", "text": "\"THE MARLEY WAS RIGHT\"" },
+      {
+        "id": "note_81",
+        "text": "\"Squeeze some ammonia into zombie flesh and hold it tight.  You smell like one of them!  I think.\""
+      },
+      { "id": "note_82", "text": "\"I thought my damn terminal cancer was bad enough… now the dead are rising?!\"" },
+      { "id": "note_83", "text": "\"THE GOO IS IN THE WATER DON'T DRINK WATER\"" },
+      { "id": "note_84", "text": "\"Don't let the ember go out please don't go out I need you precious fire.\"" },
+      {
+        "id": "note_85",
+        "text": "\"Everyone used their gas to get to another town… but it's the same story everywhere.\""
+      },
+      { "id": "note_86", "text": "\"There's still an evacuation point at Concord, spread the word.\"" },
+      { "id": "note_87", "text": "\"STAY AWAY FROM CONCORD\"" },
+      {
+        "id": "note_88",
+        "text": "\"Most things can be taken out with a shotgun.  More things can be taken out with a grenade.  Imagine what a mini-nuke does.\""
+      },
+      { "id": "note_89", "text": "\"Come to the bar if you see this, let's re-enact a zombie movie, friends.\"" },
+      { "id": "note_90", "text": "\"They are NOT slow!  They are NEVER slow!\"" },
+      { "id": "note_91", "text": "\"I had a phobia of bees BEFORE they grew to enormous sizes.\"" },
+      {
+        "id": "note_92",
+        "text": "\"Your backpack's gonna weigh you down in the water.  Hell, feel free to get naked.  Nobody's going to judge your modesty.\""
+      },
+      { "id": "note_93", "text": "\"Guns too loud.  Crossbow too long.  Running is best.\"" },
+      { "id": "note_94", "text": "\"99% dead?  I'd like to see a million zombies on Wall Street.\"" },
+      { "id": "note_95", "text": "\"Crawled in through the vents.  Whole office building is infested.\"" },
+      {
+        "id": "note_96",
+        "text": "\"Don't shoot the people who get bit!  It's OK!  Death is the only thing that makes you turn!\""
+      },
+      {
+        "id": "note_97",
+        "text": "\"Zombies, walkers, dead ones, undead, reanimated, zed, animata, biters.  Did I miss any?\""
+      },
+      { "id": "note_98", "text": "\"All I've got is this keg of beer and an appetite.  Come at me, apocalypse!\"" },
+      {
+        "id": "note_99",
+        "text": "\"My cousin says that murder nowadays is just a war crime.  War for what, I don't know, since the undead seem to be rebels without a cause.\""
+      },
+      { "id": "note_100", "text": "\"SWAMPS RUN SWAMPS NO SWAMPS RUN\"" },
+      {
+        "id": "note_101",
+        "text": "\"They said a walking cane was a useless weapon… but then I hit one of them with it.\""
+      },
+      {
+        "id": "note_102",
+        "text": "\"River water around these parts is extremely safe.  Probably more safe than the damn tap water at this point.\""
+      },
+      { "id": "note_103", "text": "\"DON't bomB THe PORtals it MAKES iT WORSE\"" },
+      {
+        "id": "note_104",
+        "text": "\"No wonder all the camps got overrun, they kept a goddamn zombie test subject!  Each and every one of 'em!\""
+      },
+      { "id": "note_105", "text": "\"I just realized how damn demented those fliers are.\"" },
+      { "id": "note_106", "text": "\"I propose a new currency: 9mm.\"" },
+      { "id": "note_107", "text": "\"My skin is crawling and I teleport every few minutes… what is going o\"" },
+      { "id": "note_108", "text": "\"You can't see them through the smoke but they can't either.\"" },
+      { "id": "note_109", "text": "\"There's gotta be a better use of all this rebar…\"" },
+      {
+        "id": "note_110",
+        "text": "\"met schoolhouse of people, all crazy and mad they were, ate killed all of them, yum\""
+      },
+      { "id": "note_111", "text": "\"STAY AWAY FROM THE BIG ONES IN THE FOREST\"" },
+      {
+        "id": "note_112",
+        "text": "\"got into a prison with a halligan bar.  makes me wonder how they kept prisoners inside\""
+      },
+      {
+        "id": "note_113",
+        "text": "\"This thing isn't a car any more.  It's just a fucking mountain of metal on wheels, which I live in.\""
+      },
+      {
+        "id": "note_114",
+        "text": "\"Anyone else seen those really… SQUARE-looking towns?  I don't think they're normal.\""
+      },
+      {
+        "id": "note_115",
+        "text": "\"big z threw me on top of the building, legs broken but at least im safe for a few more minutes\""
+      },
+      {
+        "id": "note_116",
+        "text": "\"I'm starting to feel bad about disabling all these turrets and stealing their ammunition.\""
+      },
+      {
+        "id": "note_117",
+        "text": "\"Make sure you strip the house for all available resources-- tubes, pipes, ceramics, sheets, strings, and more\""
+      },
+      { "id": "note_118", "text": "\"FUCK FAUX-MUTANTS, BEING 'EXTREMELY THIRSTY' DOES NOT COUNT\"" },
+      {
+        "id": "note_119",
+        "text": "\"There's nothing wrong with eating people if you HAVE to.  I mean, I only did it because I didn't want to waste my potato chips!\""
+      },
+      { "id": "note_120", "text": "\"all these robotic police really take the piss out of kops\"" },
+      { "id": "note_121", "text": "\"CHINA DID THIS\"" },
+      { "id": "note_122", "text": "\"RUSSIA DID THIS\"" },
+      {
+        "id": "note_123",
+        "text": "\"Thank You RivTech.  Thank You For Good Coffee.  Will Always Stay Awake For You Rivtech.\""
+      },
+      {
+        "id": "note_124",
+        "text": "\"See, now I'm just not sure where I'm putting all these storage batteries in my body!\""
+      },
+      { "id": "note_125", "text": "\"dont try to leave they will shoot you\"" },
+      {
+        "id": "note_126",
+        "text": "\"I'd like to thank my high-school culinary arts class for teaching me how to make RDX and mutagenic serum.\""
+      },
+      { "id": "note_127", "text": "\"Makayla Sanchez burned down my fucking house\"" },
+      { "id": "note_128", "text": "\"he calls himself the 'man with the hands', don't approach\"" },
+      {
+        "id": "note_129",
+        "text": "\"So… what happens if the military rescues us?  We're all freaks by now, right?  How the fuck are we gonna go back to real life?\""
+      },
+      {
+        "id": "note_130",
+        "text": "\"Not sure if my companion WANTED to turn into a bird, but I was the one giving her the serum, and I saved her life!  That's fair, right?\""
+      },
+      { "id": "note_131", "text": "\"I've never been very confident, is that why my shots keep missing?\"" },
+      { "id": "note_132", "text": "\"FIRE BAD.  NOW NAKED.  PLEASE HELP.\"" },
+      {
+        "id": "note_133",
+        "text": "\"Heard of a place up in Maine where people have their shit together.  Hundreds of people, defense, food and shelter… let's go raid it, guys!\""
+      },
+      { "id": "note_134", "text": "\"KASHWAK: NO-FO\"" },
+      {
+        "id": "note_135",
+        "text": "\"The whispering fog is taking me in like a blanket.  I'm warm now.  I'm finally\""
+      },
+      {
+        "id": "note_136",
+        "text": "\"got a video recording of hour one when the portals were still up.  pretty cool\""
+      },
+      {
+        "id": "note_137",
+        "text": "\"Stuck here.  Zombies outside.  Friends were outside too, now they're part of zombies.  Need to be quiet\""
+      },
+      {
+        "id": "note_138",
+        "text": "\"if anyones reading this, please tell my mom i was right about insects being superior\""
+      },
+      {
+        "id": "note_139",
+        "text": "\"Diamond coated sword!  Diamond coated hammer!  Diamond coated clothes!  Diamond coated hands help\""
+      },
+      { "id": "note_140", "text": "\"waded through 14 miles of sewage for playboy magazine, wasnt worth it\"" },
+      {
+        "id": "note_141",
+        "text": "\"I'm coming back for this note in twelve hours.  If I don't, take all my shit!\""
+      },
+      {
+        "id": "note_142",
+        "text": "\"all my friends died when they came near me.  there's nothing funny about that\""
+      },
+      { "id": "note_143", "text": "\"DOG NOT REAL DOG\"" },
+      {
+        "id": "note_144",
+        "text": "\"This is all just a dream, right??!  I'M GOING TO WAKE UP, SHE'S GOING TO BE OK\""
+      },
+      { "id": "note_145", "text": "\"wek ik spak\"" },
+      { "id": "note_146", "text": "\"IT'S BURIED!  THE TEMPLE IS BURIED!\"" },
+      {
+        "id": "note_147",
+        "text": "\"If I had a dollar for every cash card I've found, I'd have more money than is on these stupid things!\""
+      },
+      { "id": "note_148", "text": "\"can never have enough kevlar.  basically just live in a kevlar turtle shell.\"" },
+      { "id": "note_149", "text": "\"MY GLITTERING SNAKE COMPELS YOU!  OBEY!\"" },
+      {
+        "id": "note_150",
+        "text": "\"can sunstasin self frorever off fof my funggnaloid babiues oout fo yme arms eat themm up eatbtb my chidlldren\""
+      },
+      {
+        "id": "note_151",
+        "text": "\"Gonna settle down one day.  Nice big orchard, couple of friends/future family to spend time with, and my army of zlaves to guard the place.\""
+      },
+      { "id": "note_152", "text": "\"a ctulaly don t mi nd  t he cold it   s  f i ne in h ere  nn    o problem\"" },
+      {
+        "id": "note_153",
+        "text": "\"tried to shoot myself but the nanobots fixed it, fucked up the controls, now i can't turn them off i just want it to be over\""
+      },
+      {
+        "id": "note_154",
+        "text": "\"Tried wearing dead zombie clothes, but they still knew I was alive!  It's like they're a hivemind, man!\""
+      },
+      {
+        "id": "note_155",
+        "text": "\"riddle.  what's 1/4 feathers, 1/4 scales, 1/4 metal, and 1/4 flesh?  answer: sorry, but you should know this one.\""
+      },
+      {
+        "id": "note_156",
+        "text": "\"For anyone that's reading this, I just want to confirm (FROM AN UNBIASED SOURCE) that it was NOT the scientists' fault.\""
+      },
+      {
+        "id": "note_157",
+        "text": "\"We're the eagle-eyes in the sky!  Just two mutant avians in our helicopter!  Filming the Cataclysm!  Check us out on any working electronics!\""
+      },
+      { "id": "note_158", "text": "\"WE'RE GOING TO SAIL TO CANADA, BITCHES!\"" },
+      {
+        "id": "note_159",
+        "text": "\"Anyone hear about that guy who tried to sail his family to Canada?  What a moron, right?\""
+      },
+      { "id": "note_160", "text": "\"recently canadian border has gotten more dangerous don't go there\"" },
+      { "id": "note_161", "text": "\"Hey, what happened to my dad's airboat?!\"" },
+      { "id": "note_162", "text": "\"Reading is good!  Never stop reading.  Read EVERYTHING.\"" },
+      {
+        "id": "note_163",
+        "text": "\"I'm gonna be honest here, I'm really gonna die soon so I dont want to gt forgnottedn ples dont forntget me y nrmmy name is h@@hbhbh\""
+      },
+      { "id": "note_164", "text": "\"all it takes to seal a wound is a sawblade and a match!  trust me\"" },
+      {
+        "id": "note_165",
+        "text": "\"I wonder what's in this sarcophagus?  Maybe it's a real sarcophagus.  Maybe there's a big guy named God under here.\""
+      },
+      { "id": "note_166", "text": "\"these hulks aint so incredible when ya got .50\"" },
+      {
+        "id": "note_167",
+        "text": "\"WBLF 970 went off-air three days ago.  There's nobody left on the radio.  Might as well throw this thing away…\""
+      },
+      {
+        "id": "note_168",
+        "text": "\"I've heard it's safer across the Mississippi.  Going to start driving today.  If you're reading this, pray for me\""
+      },
+      { "id": "note_169", "text": "\"Mi-go is friend!  Go with Mi-go to friend dimension!  On the Friend Team!!\"" },
+      { "id": "note_170", "text": "\"We have Landed our Comet.  The Sky is Ablaze.\"" },
+      {
+        "id": "note_171",
+        "text": "\"Last one standing.  It's good feeling.  I win.  I win I win I win I win I win\""
+      },
+      { "id": "note_172", "text": "\"Adderall cures weakness, tramadol cures death\"" },
+      { "id": "note_173", "text": "\"These turrets keep dodging my FUCKING BULLETS!\"" },
+      { "id": "note_174", "text": "\"Best way to train is by throwing pebbles at birds.  You'll be a legend.\"" },
+      { "id": "note_175", "text": "\"new bedford is overrun.  i'm sorry.  we tried.\"" },
+      {
+        "id": "note_176",
+        "text": "\"Check out my cooking show on The Television!  Making Mannwurst sausages out of some of those assholes who tried to raid my kitchen earlier…\""
+      },
+      {
+        "id": "note_177",
+        "text": "\"Renting out my rat tunnels for 50 9mm rounds a night.  I dug them with my own claws, so you know they're the best.\""
+      },
+      {
+        "id": "note_178",
+        "text": "\"Anyone wanna listen to some music at full volume and shoot the Zs that approach?  You pick the tunes if I get some ammo.\""
+      },
+      {
+        "id": "note_179",
+        "text": "\"Lots of new easy ways to burn calories now.  Fighting aminata, managing the fields, running with my wings buzzing, and more.\""
+      },
+      { "id": "note_180", "text": "\"FLAMING SWORD HUMANE.  CAUTERIZES WOUNDS.  SURGICAL.\"" },
+      { "id": "note_181", "text": "\"knife screams it screams i cant breathe so scared help me please help\"" },
+      { "id": "note_182", "text": "\"when it started, we could still hope The Man was gonna save us…\"" },
+      {
+        "id": "note_183",
+        "text": "\"Hey, Ted.  Alexander and Cass and I are heading to Z-Mobile for the last of the meth.  Keep the lizard fetus fed for us, OK?\""
+      },
+      {
+        "id": "note_184",
+        "text": "\"i say we call the material from melting down cars and dead robots 'massachusetite' or 'vermontsteel' or 'connecticut composite'\""
+      },
+      {
+        "id": "note_185",
+        "text": "\"Sometimes what you need when you're infected, bleeding, sick and hungover is a J and some chips.\""
+      },
+      {
+        "id": "note_186",
+        "text": "\"This has to be China's fault.  Seriously, why is nobody suspecting the people we're having a cold war with!  This is an invasion!  These aren't zombies, it's just camoflauge!  WAKE UP, SHEEPLE!\""
+      },
+      {
+        "id": "note_187",
+        "text": "\"Hahahahaa stupid fuck in his mansion, with his plate armor and big axe.  Guy never swung the thing in his life.  Can't block bullets, dipshit\""
+      },
+      {
+        "id": "note_188",
+        "text": "\"I woke up with a dozen bears in a tribe outside the vault.  One was covered in red markings, glowing-- speaking.\""
+      },
+      {
+        "id": "note_189",
+        "text": "\"poor guy.  watched him from afar with my binocs for months and months.  today he died fighting.  feels like i knew him even though i never approached.\""
+      },
+      { "id": "note_190", "text": "\"ENGLAND DID THIS\"" },
+      {
+        "id": "note_191",
+        "text": "\"That little fakkin rat din say anythin till we whacked him with a steel chain!  Then 'e just wanted to know if he could buy the chain!\""
+      },
+      { "id": "note_192", "text": "\"tom, adorned with fluid sacs three layers deep, crawls to safety like a slug\"" },
+      {
+        "id": "note_193",
+        "text": "\"my friend turned fuckin insane and ate his arms and then his sister's arms!  he looked rather cross\""
+      },
+      { "id": "note_194", "text": "\"Starting today, the hallucinations are my only friends.\"" },
+      { "id": "note_195", "text": "\"For sale: zombaby shoes, very filthy\"" },
+      {
+        "id": "note_196",
+        "text": "\"Started my own brewery recently.  I just need some glass bottles, now!  Several thousand!  I'm planning way ahead.\""
+      },
+      {
+        "id": "note_197",
+        "text": "\"Heard recently of some radio op who lives in a skyscraper, announcing where those hordes are going.  Couldn't find the frequency, though.\""
+      },
+      { "id": "note_198", "text": "\"Woah, bud!  Not all cannibals eat meat!\"" },
+      { "id": "note_199", "text": "\"ay why aint my bullets fuckin explodin\"" },
+      { "id": "note_200", "text": "\"Those Fiktok clan people picked this place clean… no food…\"" },
+      { "id": "note_201", "text": "\"The fewer people in New England, the stronger we'll become.\"" },
+      { "id": "note_202", "text": "\"It all boils down to the Apex Predator.\"" },
+      {
+        "id": "note_203",
+        "text": "\"King Jameson ik goner!  Thee cyber limbs isk falleng off me body!  Stak pyroteknik I heear!\""
+      },
+      { "id": "note_204", "text": "\"Got my mortar and pestle.  Now if I could just find some avocados…\"" },
+      {
+        "id": "note_205",
+        "text": "\"saw a girl standing with the mushrooms.  spores coming out of slits in her neck.  she looked happy.\""
+      },
+      {
+        "id": "note_206",
+        "text": "\"Found some pink berries.  Eating them makes bushes into more pink berries.  Infinite berry.\""
+      },
+      { "id": "note_207", "text": "\"m ust grow                 unity\"" },
+      { "id": "note_208", "text": "\"AMY IS FUNGUS.  DO NOT LISTEN IF SHE ASKS YOU TO TAKE OFF MASK\"" },
+      {
+        "id": "note_209",
+        "text": "\"my rabbi follows a new god now.  asks us to call him a local guide.  i dont mind, he keeps us fed\""
+      },
+      { "id": "note_210", "text": "\"Fungus are helping us.  Help them and they will unite us\"" },
+      {
+        "id": "note_211",
+        "text": "\"Saw a boy couldnt be older than 16.  Walked straight through the mushroom tower.  THROUGH IT\""
+      },
+      {
+        "id": "note_212",
+        "text": "\"Found some food in a box outside my house.  We ate it and now the fungaloids aren't harming us.  I think we are a mushroom now\""
+      },
+      {
+        "id": "note_213",
+        "text": "\"saw the girl again.  she looked dead exhausted and walked right into the fungus.  30 mins later and she walked out good as new\""
+      },
+      { "id": "note_214", "text": "\"HADENSBROOK REBUILT AROUND FUNGUS.  THEY EAT GRAY APPLES AND SPREAD IT\"" },
+      { "id": "note_215", "text": "\"mycus must grow\"" },
+      {
+        "id": "note_216",
+        "text": "\"School bus with solar panels = TRUST.  Gave us berries and seeds, we were out of food\""
+      },
+      {
+        "id": "note_217",
+        "text": { "str": "\"d o nThelp scho Ol buss makE seeeedS ARe FUNGUS!! !\"", "//NOLINT(cata-text-style)": "intentional format" }
+      },
+      {
+        "id": "note_218",
+        "text": "\"Go to every fungus patch you find but WEAR A SUIT.  Food there is very very filling.  Look for pink berries, blue flowers\""
+      },
+      { "id": "note_219", "text": "\"red blue yellow berry seed sap bloom flowers tower mycus mycus mycus.\"" },
+      {
+        "id": "note_220",
+        "text": "\"Husband 30 yrs died in bombs.  Mushrooms brought him back.  GIVE YOURSELF TO THEm AND THEY WILL HELP YOU\""
+      },
+      {
+        "id": "note_221",
+        "text": "\"Lisa always was a fan of sports.  Thank God these Global Athletics Games in Harran started some time before the outbreak, so she was able to leave New England before it was quarantined.  I can only hope there are no zombies, as we do have here, in the city she flew to.\""
+      },
+      {
+        "id": "note_222",
+        "text": "\"Don't mix powders, them books said.  Do Not Mix powders.  Didn't listen did I.  Blew my goddamn pinky off, near lost my right eye.\""
+      },
+      {
+        "id": "note_223",
+        "text": "\"followed what toby wrote down.  shells looked like theyd hold more, I put in some more.  traded most to h raiders for crank.  shot my 38 today and it fuckn exploded.  low on crank, good as dead, no gun, no toby.  headed to montreal real sorry bout the bullets\""
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "newest_news",
     "text": [
-      "LABS BOMBED: In an apparent foreign attack (contradicting earlier Department of Defense denials of the disaster being caused by Chinese aggression) most of New England's scientific labs were bombed simultaneously yesterday.  A statement from the Pentagon has been issued, stating the strikes were the result of Chinese opportunism during the national crisis, and assured that action would be taken in kind against the aggressors.",
-      "RIOTS GROWING?: Communications were muddled by a large influx of aggressive armed individuals.  \"We have this under control,\" says a local police chief.  \"We are authorizing our robotic security drones to use lethal force on combative humans.\"",
-      "RIOTERS NOT HUMAN?: An earlier command by regional police has backfired.  \"The hooligans don't register as human.\" says a local police chief. \"The securibots turned on us when we tried to fight them.  We don't have enough people left to reprogram them.\"",
-      "GENETIC MODIFICATIONS?: Eyewitnesses from the New England Disaster Area have claimed that the infected are displaying inhuman qualities. \"I swear to God, one of them was the size of a tree!\", said one panicked survivor. There are also reports of infected with acidic and/or electric properties.",
-      "SUPER-SOLDIERS DEPLOYED: General Westinghouse released a statement today that elite troops equipped with top-of-the-line experimental combat bionics have been deployed via helicopter into the New England Disaster Area. \"Through the strength of American technology and American soldiers, we will fix this disaster!\"",
-      "PUBLIC SERVICE ANNOUNCEMENT: \"Aid Delayed\".  Fighting by the military at the edge of the New England Disaster Area is expected to delay civilian extraction.  Civilians will be forced to supply themselves over the next weeks.",
-      "PUBLIC SERVICE ANNOUNCEMENT: \"New England Cut Off\".  New England has been quarantined for the safety of the rest of the USA.  No rescue attempts will be funded; it is assumed there are no survivors in the area.",
-      "LEAVE TO THE EXPERTS -- GENERAL: \"Do not attempt to deal with infected yourself, our troops have the technology and the training for military action.  Loud gunfire may attract more hostile attention than you have ammo!\"",
-      "TOWNS OCCUPIED TERRITORY: FEMA officials said today \"Do not try to defend your property in towns: hostiles use advanced tracking, perhaps scent.  Please retreat to your nearest evacuation center outside town and await extraction.\"",
-      "EDITOR SAYS \"DESTROY THE DEAD\".  Recognizable dead left lying in the street may be dangerous!  If you kill a hostile, smash or butcher with a knife until unrecognizable!  The Geneva Conventions don't apply to civilians!",
-      "THEY'RE NOT RIOTS!: According to head officials at the Centers for Disease Control, autopsies of rioters in New England have shown massive pathological infection, possibly causing hyper-aggression, disregard for personal harm, and a severely-impaired ability for higher reasoning.",
-      "SOLDIERS SEEN HEADED UNDERGROUND.  Rumors abound as eyewitness see troops headed underground near a local salon.  Expert sources suggest that the soldiers may be headed to a possible underground bunker.",
-      "A BRIDGE TOO FAR: In a Monday statement, the Department of Defense detailed its plans to deploy strategic minefields on key bridge crossings, in order to quarantine infected regions.  \"Military personnel will be on-site to assist any refugees fleeing the infected zones.  We urge citizens to comply with all military directives and avoid quarantined areas whenever possible until order can be restored.\""
+      {
+        "id": "newest_news_1",
+        "text": "LABS BOMBED: In an apparent foreign attack (contradicting earlier Department of Defense denials of the disaster being caused by Chinese aggression) most of New England's scientific labs were bombed simultaneously yesterday.  A statement from the Pentagon has been issued, stating the strikes were the result of Chinese opportunism during the national crisis, and assured that action would be taken in kind against the aggressors."
+      },
+      {
+        "id": "newest_news_2",
+        "text": "RIOTS GROWING?: Communications were muddled by a large influx of aggressive armed individuals.  \"We have this under control,\" says a local police chief.  \"We are authorizing our robotic security drones to use lethal force on combative humans.\""
+      },
+      {
+        "id": "newest_news_3",
+        "text": "RIOTERS NOT HUMAN?: An earlier command by regional police has backfired.  \"The hooligans don't register as human.\" says a local police chief.  \"The securibots turned on us when we tried to fight them.  We don't have enough people left to reprogram them.\""
+      },
+      {
+        "id": "newest_news_4",
+        "text": "GENETIC MODIFICATIONS?: Eyewitnesses from the New England Disaster Area have claimed that the infected are displaying inhuman qualities.  \"I swear to God, one of them was the size of a tree!\", said one panicked survivor.  There are also reports of infected with acidic and/or electric properties."
+      },
+      {
+        "id": "newest_news_5",
+        "text": "SUPER-SOLDIERS DEPLOYED: General Westinghouse released a statement today that elite troops equipped with top-of-the-line experimental combat bionics have been deployed via helicopter into the New England Disaster Area.  \"Through the strength of American technology and American soldiers, we will fix this disaster!\""
+      },
+      {
+        "id": "newest_news_6",
+        "text": "PUBLIC SERVICE ANNOUNCEMENT: \"Aid Delayed\".  Fighting by the military at the edge of the New England Disaster Area is expected to delay civilian extraction.  Civilians will be forced to supply themselves over the next weeks."
+      },
+      {
+        "id": "newest_news_7",
+        "text": "PUBLIC SERVICE ANNOUNCEMENT: \"New England Cut Off\".  New England has been quarantined for the safety of the rest of the USA.  No rescue attempts will be funded; it is assumed there are no survivors in the area."
+      },
+      {
+        "id": "newest_news_8",
+        "text": "LEAVE TO THE EXPERTS -- GENERAL: \"Do not attempt to deal with infected yourself, our troops have the technology and the training for military action.  Loud gunfire may attract more hostile attention than you have ammo!\""
+      },
+      {
+        "id": "newest_news_9",
+        "text": "TOWNS OCCUPIED TERRITORY: FEMA officials said today \"Do not try to defend your property in towns: hostiles use advanced tracking, perhaps scent.  Please retreat to your nearest evacuation center outside town and await extraction.\""
+      },
+      {
+        "id": "newest_news_10",
+        "text": "EDITOR SAYS \"DESTROY THE DEAD\".  Recognizable dead left lying in the street may be dangerous!  If you kill a hostile, smash or butcher with a knife until unrecognizable!  The Geneva Conventions don't apply to civilians!"
+      },
+      {
+        "id": "newest_news_11",
+        "text": "THEY'RE NOT RIOTS!: According to head officials at the Centers for Disease Control, autopsies of rioters in New England have shown massive pathological infection, possibly causing hyper-aggression, disregard for personal harm, and a severely-impaired ability for higher reasoning."
+      },
+      {
+        "id": "newest_news_12",
+        "text": "SOLDIERS SEEN HEADED UNDERGROUND.  Rumors abound as eyewitness see troops headed underground near a local salon.  Expert sources suggest that the soldiers may be headed to a possible underground bunker."
+      },
+      {
+        "id": "newest_news_13",
+        "text": "A BRIDGE TOO FAR: In a Monday statement, the Department of Defense detailed its plans to deploy strategic minefields on key bridge crossings, in order to quarantine infected regions.  \"Military personnel will be on-site to assist any refugees fleeing the infected zones.  We urge citizens to comply with all military directives and avoid quarantined areas whenever possible until order can be restored.\""
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "many_years_old_news",
     "text": [
-      "QUANTUM LEAP: An undisclosed DARPA project has yielded results in the form of theoretical teleportation.  \"This is just the tip of the iceberg,\" said an anonymous source.  \"I can't disclose, but this development is the LEAST in this exciting vein!\"",
-      "SECURIBOTS: Keeping your home safe, ready the second the alarm goes off...  Who needs people?",
-      "ROBOCOP BEATS CRIME: Due to the common usage of Securibots and their ability to respond more rapidly than people, crime is down 54% and dropping.  Police chief says \"Don't trip an alarm and you have nothing to worry about\"",
-      "ROBOT RAMPAGE: Three Protesters injured when surrounding a Military base, protesting automated turrets which put guards out of jobs.  \"We warned them, turrets will open fire on anyone without a military ID,\" a general said.",
-      "US IGNORES UN DEMANDS: The US ambassador to the UN today turned down UN requests to begin mutual nuclear disarmament of China, the US and North Korea.  \"We have a right to defend ourselves,\" insisted the ambassador.  \"We'll back down when they do\".",
-      "A WHOLE NEW YOU!  Augment your world with CBMs!  This ad features a man covered in glowing tattoos with a miniature flashlight in the middle of his head. He's waving at the reader; all of his fingertips are Allen wrenches.",
-      "The Future...  powered by COFFEE!  Rivtech brings you the greatest revolution since espresso.  Why wait for milk to boil?  Have your coffee ready instantly with \"THE POWER OF THE ATOM\"!",
-      "GLAMOPOLITAN!  We've got ALL the latest tips!  Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine!  So pick up a copy today and \"Sizzle Like A Star\"!",
-      "POPULAR MECHANICS: People say mechanics is boring.  We say, prove them wrong!  We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!",
-      "CRAFTY CRAFTERS QUARTERLY: Macaroni isn't just for eating anymore!  Learn how to make jewelery and art from it as well!  We also discuss the correct way to use superglue without gluing your hands together!",
-      "UNDERGROUND BUNKER?  Sources in the government suggest that underground bunkers are being built in a secret location in case of enemy attack.  We were unable to get the exact location as our sources mysteriously disappeared shortly after revealing this information.",
-      "STUDENT MISSING: A high school student vanished yesterday evening in the forest near Wayland.  The 17-year-old international student from China (who adopted the anglicized nickname \"Brett\" due to his classmates' difficulty pronouncing his given name) was last seen with his friends in the camp.  \"Brett said that he was gonna get some firewood but he never came back,\" said his classmate, Jianxiang Wang.  The search is underway.",
-      "STILL SEARCHING: The search for Brett, the high school student who went missing three days ago, is still ongoing.  \"He could have played in the soccer game against Weston High School yesterday,\" Brett's sorrowful teammate said, \"[..] we've never stopped praying.\"  Despite the best efforts of the County Search & Rescue, Brett had still not been located at the time of this report.",
-      "RUMORS DENIED: Allegations that DARPA had been conducting teleportation experiments in secret just outside Wayland were put to rest during a press conference earlier today.  \"I have to clarify that not only have we never done such research,\" said the officer on the press conference, \"teleportation only exists in sci-fi films.\""
+      {
+        "id": "many_years_old_news_1",
+        "text": "QUANTUM LEAP: An undisclosed DARPA project has yielded results in the form of theoretical teleportation.  \"This is just the tip of the iceberg,\" said an anonymous source.  \"I can't disclose, but this development is the LEAST in this exciting vein!\""
+      },
+      {
+        "id": "many_years_old_news_2",
+        "text": "SECURIBOTS: Keeping your home safe, ready the second the alarm goes off…  Who needs people?"
+      },
+      {
+        "id": "many_years_old_news_3",
+        "text": "ROBOCOP BEATS CRIME: Due to the common usage of Securibots and their ability to respond more rapidly than people, crime is down 54% and dropping.  Police chief says \"Don't trip an alarm and you have nothing to worry about\""
+      },
+      {
+        "id": "many_years_old_news_4",
+        "text": "ROBOT RAMPAGE: Three Protesters injured when surrounding a Military base, protesting automated turrets which put guards out of jobs.  \"We warned them, turrets will open fire on anyone without a military ID,\" a general said."
+      },
+      {
+        "id": "many_years_old_news_5",
+        "text": "US IGNORES UN DEMANDS: The US ambassador to the UN today turned down UN requests to begin mutual nuclear disarmament of China, the US and North Korea.  \"We have a right to defend ourselves,\" insisted the ambassador.  \"We'll back down when they do\"."
+      },
+      {
+        "id": "many_years_old_news_6",
+        "text": "A WHOLE NEW YOU!  Augment your world with CBMs!  This ad features a man covered in glowing tattoos with a miniature flashlight in the middle of his head.  He's waving at the reader; all of his fingertips are Allen wrenches."
+      },
+      {
+        "id": "many_years_old_news_7",
+        "text": "The Future… powered by COFFEE!  Rivtech brings you the greatest revolution since espresso.  Why wait for milk to boil?  Have your coffee ready instantly with \"THE POWER OF THE ATOM\"!"
+      },
+      {
+        "id": "many_years_old_news_8",
+        "text": "GLAMOPOLITAN!  We've got ALL the latest tips!  Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine!  So pick up a copy today and \"Sizzle Like A Star\"!"
+      },
+      {
+        "id": "many_years_old_news_9",
+        "text": "POPULAR MECHANICS: People say mechanics is boring.  We say, prove them wrong!  We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!"
+      },
+      {
+        "id": "many_years_old_news_10",
+        "text": "CRAFTY CRAFTERS QUARTERLY: Macaroni isn't just for eating anymore!  Learn how to make jewelery and art from it as well!  We also discuss the correct way to use superglue without gluing your hands together!"
+      },
+      {
+        "id": "many_years_old_news_11",
+        "text": "UNDERGROUND BUNKER?  Sources in the government suggest that underground bunkers are being built in a secret location in case of enemy attack.  We were unable to get the exact location as our sources mysteriously disappeared shortly after revealing this information."
+      },
+      {
+        "id": "many_years_old_news_12",
+        "text": "STUDENT MISSING: A high school student vanished yesterday evening in the forest near Wayland.  The 17-year-old international student from China (who adopted the anglicized nickname \"Brett\" due to his classmates' difficulty pronouncing his given name) was last seen with his friends in the camp.  \"Brett said that he was gonna get some firewood but he never came back,\" said his classmate, Jianxiang Wang.  The search is underway."
+      },
+      {
+        "id": "many_years_old_news_13",
+        "text": "STILL SEARCHING: The search for Brett, the high school student who went missing three days ago, is still ongoing.  \"He could have played in the soccer game against Weston High School yesterday,\" Brett's sorrowful teammate said, \"[..] we've never stopped praying.\"  Despite the best efforts of the County Search & Rescue, Brett had still not been located at the time of this report."
+      },
+      {
+        "id": "many_years_old_news_14",
+        "text": "RUMORS DENIED: Allegations that DARPA had been conducting teleportation experiments in secret just outside Wayland were put to rest during a press conference earlier today.  \"I have to clarify that not only have we never done such research,\" said the officer on the press conference, \"teleportation only exists in sci-fi films.\""
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "years_old_news",
     "text": [
-      "GOVERNMENT SCIENCE BOOST: The government has drastically increased defense R&D after UN disarmament demands.  \"This not only keeps money in our country, but maintains our lead on China and keeps us defended\", the President said.",
-      "HOME GROWN SCIENCE: Several governors & legislators from the New England region discussed a new regional initiative today, which relaxed laws that limit the distance a hazardous-material laboratory or factory can be from a city.  \"This should keep our economy going strong for years to come, with all the military R&D facilities being established,\", one mayor remarked.",
-      "DRIVING ON A WING AND A PRAYER: A New England man has proven it is possible to create a new car from scrap parts using almost nothing but duct tape.  When asked why he had done it, his answer was \"Well, I didn't have a welder.\"",
-      "NEVER BE LEFT IN THE DARK!  Rivtech Atomic-nightlight uses \"inexhaustible\" plutonium fuel cell, provides light, feeds power back into your grid!",
-      "Sick of FUEL PRICES?  Bus stop too far?  Get your driving fix from THE SUN!  Solar powered electric cars: Silent, Cheap, Powerful.",
-      "Coffee of The Future...  RIGHT NOW!  No one has really has the time to make great coffee, but now you don't have to!  Rivtech gives you inexhaustible ATOMIC power!  To make boiling hot coffee the MINUTE you want it!  Atomic Coffeemaker.",
-      "GLAMOPOLITAN!  We've got ALL the latest tips!  Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine!  So pick up a copy today and \"Sizzle Like A Star\"!",
-      "POPULAR MECHANICS: People say mechanics is boring?  We say, Prove them Wrong!  We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!",
-      "BIRDHOUSE MONTHLY...  This month we look at some Dutch innovations in birdhouse design, and compare with the often confused Scandinavian Birdhouse design.  Our article on sheet metal birdhouses will have you riveted!",
-      "TECHWORLD NEWS: Toy company at the origin of the successful talking doll rebrands and becomes Uncanny.  Uncanny plans to bring their expertise to the field of androids.  Unconfirmed rumors suggest that Uncanny has already recieved large orders from the government."
+      {
+        "id": "years_old_news_1",
+        "text": "GOVERNMENT SCIENCE BOOST: The government has drastically increased defense R&D after UN disarmament demands.  \"This not only keeps money in our country, but maintains our lead on China and keeps us defended\", the President said."
+      },
+      {
+        "id": "years_old_news_2",
+        "text": "HOME GROWN SCIENCE: Several governors & legislators from the New England region discussed a new regional initiative today, which relaxed laws that limit the distance a hazardous-material laboratory or factory can be from a city.  \"This should keep our economy going strong for years to come, with all the military R&D facilities being established,\", one mayor remarked."
+      },
+      {
+        "id": "years_old_news_3",
+        "text": "DRIVING ON A WING AND A PRAYER: A New England man has proven it is possible to create a new car from scrap parts using almost nothing but duct tape.  When asked why he had done it, his answer was \"Well, I didn't have a welder.\""
+      },
+      {
+        "id": "years_old_news_4",
+        "text": "NEVER BE LEFT IN THE DARK!  Rivtech Atomic-nightlight uses \"inexhaustible\" plutonium fuel cell, provides light, feeds power back into your grid!"
+      },
+      {
+        "id": "years_old_news_5",
+        "text": "Sick of FUEL PRICES?  Bus stop too far?  Get your driving fix from THE SUN!  Solar powered electric cars: Silent, Cheap, Powerful."
+      },
+      {
+        "id": "years_old_news_6",
+        "text": "Coffee of The Future… RIGHT NOW!  No one has really has the time to make great coffee, but now you don't have to!  Rivtech gives you inexhaustible ATOMIC power!  To make boiling hot coffee the MINUTE you want it!  Atomic Coffeemaker."
+      },
+      {
+        "id": "years_old_news_7",
+        "text": "GLAMOPOLITAN!  We've got ALL the latest tips!  Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine!  So pick up a copy today and \"Sizzle Like A Star\"!"
+      },
+      {
+        "id": "years_old_news_8",
+        "text": "POPULAR MECHANICS: People say mechanics is boring?  We say, Prove them Wrong!  We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!"
+      },
+      {
+        "id": "years_old_news_9",
+        "text": "BIRDHOUSE MONTHLY…  This month we look at some Dutch innovations in birdhouse design, and compare with the often confused Scandinavian Birdhouse design.  Our article on sheet metal birdhouses will have you riveted!"
+      },
+      {
+        "id": "years_old_news_10",
+        "text": "TECHWORLD NEWS: Toy company at the origin of the successful talking doll rebrands and becomes Uncanny.  Uncanny plans to bring their expertise to the field of androids.  Unconfirmed rumors suggest that Uncanny has already recieved large orders from the government."
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "one_year_old_news",
     "text": [
-      "READY FOR THE WORST: The government has proven it is ready to deal with China's threats.  In the event of an actual attack, we have established evacuation centers, within a short distance of most towns.",
-      "MUTANT COLD: A new cold virus has emerged in the New England area.  \"There don't appear to be complications, but many sufferers are dealing with sudden muscle weakness and a greater-than-normal amount of lethargy from this virus,\" said a doctor. \"In addition, it's been documented to last up to ten days.\"",
-      "GRAVE BUSINESS: Recent reports show a large spike in thefts from and assaults on funeral homes in the last few weeks.  Described as highly strange but not especially dangerous, Homeland Security is \"looking at the connections now.\"",
-      "SPACE TELEPORTATION - TRUTH OR FICTION?  Scientists addressed a growing conspiracy theory today \"The plutonium consumed is massive.  We could never use teleportation to reach aliens, unless they live on some kind of parallel world.\"",
-      "LASERS - NEXT BIG THING?: Top defense researchers remarked during demonstration of a prototype today: \"We are still working on it, the laser weapon lacks power, but has a technically almost unlimited range,\" one said",
-      "DRUG USE ON THE RISE: Recent statistic suggest drug use in New England has climbed more than 20% in the last two years.  \"People are scared for their jobs, their country, even their life...  of course some will turn to drugs,\" said an expert.",
-      "FEELING BLUE?  Try \"Greens\" for Magazines!  Your local Supermarket!  Nothing cheers you up like a good magazine...  Unless it's JUNK FOOD!  Or why not buy an MP3 PLAYER or a GAME CONSOLE?  Chase those blues away at GREENS Supermarket",
-      "GLAMOPOLITAN!  We've got ALL the latest tips!  Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine!  So pick up a copy today and \"Sizzle Like A Star\"!",
-      "POPULAR MECHANICS: People say mechanics is boring?  We say, Prove them Wrong!  We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!",
-      "BIRDHOUSE MONTHLY...  Which wood would a woodpecker prefer?  This month we discuss hardwood versus soft woods, whether to lacquer, oil or paint, and which type of nails you should use!",
-      "TECHWORLD NEWS: Uncanny unveils its new product - the Grocery Bot!  Thousands of else-if statements, pre-recorded voice from professional actors, what more does this adorable android hides under its smiling face?  Our expert got the answer for you!",
-      " ...What do you know about surviving in the Wilderness?  If you can't make a snare you don't know TRAP!  Hunt down a copy of TRAPPERS' LIFE and learn about wildlife!...  And how to kill it.  This week, a CROSSBOW TRAP!",
-      "NEW LAB OPENS: The H.R. Bennett Research Facility has been officially opened by the Department of Energy. According to Deputy Secretary of Energy Randall Balakrishnan , \"This facility is one of the most state-of-the-art in the world. With the opening of the H.R. Bennett research complex, New England's future is looking brighter than ever.\""
+      {
+        "id": "one_year_old_news_1",
+        "text": "READY FOR THE WORST: The government has proven it is ready to deal with China's threats.  In the event of an actual attack, we have established evacuation centers, within a short distance of most towns."
+      },
+      {
+        "id": "one_year_old_news_2",
+        "text": "MUTANT COLD: A new cold virus has emerged in the New England area.  \"There don't appear to be complications, but many sufferers are dealing with sudden muscle weakness and a greater-than-normal amount of lethargy from this virus,\" said a doctor.  \"In addition, it's been documented to last up to ten days.\""
+      },
+      {
+        "id": "one_year_old_news_3",
+        "text": "GRAVE BUSINESS: Recent reports show a large spike in thefts from and assaults on funeral homes in the last few weeks.  Described as highly strange but not especially dangerous, Homeland Security is \"looking at the connections now.\""
+      },
+      {
+        "id": "one_year_old_news_4",
+        "text": "SPACE TELEPORTATION - TRUTH OR FICTION?  Scientists addressed a growing conspiracy theory today \"The plutonium consumed is massive.  We could never use teleportation to reach aliens, unless they live on some kind of parallel world.\""
+      },
+      {
+        "id": "one_year_old_news_5",
+        "text": "LASERS - NEXT BIG THING?: Top defense researchers remarked during demonstration of a prototype today: \"We are still working on it, the laser weapon lacks power, but has a technically almost unlimited range,\" one said"
+      },
+      {
+        "id": "one_year_old_news_6",
+        "text": "DRUG USE ON THE RISE: Recent statistic suggest drug use in New England has climbed more than 20% in the last two years.  \"People are scared for their jobs, their country, even their life… of course some will turn to drugs,\" said an expert."
+      },
+      {
+        "id": "one_year_old_news_7",
+        "text": "FEELING BLUE?  Try \"Greens\" for Magazines!  Your local Supermarket!  Nothing cheers you up like a good magazine…  Unless it's JUNK FOOD!  Or why not buy an MP3 PLAYER or a GAME CONSOLE?  Chase those blues away at GREENS Supermarket"
+      },
+      {
+        "id": "one_year_old_news_8",
+        "text": "GLAMOPOLITAN!  We've got ALL the latest tips!  Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine!  So pick up a copy today and \"Sizzle Like A Star\"!"
+      },
+      {
+        "id": "one_year_old_news_9",
+        "text": "POPULAR MECHANICS: People say mechanics is boring?  We say, Prove them Wrong!  We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!"
+      },
+      {
+        "id": "one_year_old_news_10",
+        "text": "BIRDHOUSE MONTHLY…  Which wood would a woodpecker prefer?  This month we discuss hardwood versus soft woods, whether to lacquer, oil or paint, and which type of nails you should use!"
+      },
+      {
+        "id": "one_year_old_news_11",
+        "text": "TECHWORLD NEWS: Uncanny unveils its new product - the Grocery Bot!  Thousands of else-if statements, pre-recorded voice from professional actors, what more does this adorable android hides under its smiling face?  Our expert got the answer for you!"
+      },
+      {
+        "id": "one_year_old_news_12",
+        "text": "…What do you know about surviving in the Wilderness?  If you can't make a snare you don't know TRAP!  Hunt down a copy of TRAPPERS' LIFE and learn about wildlife!…  And how to kill it.  This week, a CROSSBOW TRAP!"
+      },
+      {
+        "id": "one_year_old_news_13",
+        "text": "NEW LAB OPENS: The H.R. Bennett Research Facility has been officially opened by the Department of Energy.  According to Deputy Secretary of Energy Randall Balakrishnan, \"This facility is one of the most state-of-the-art in the world.  With the opening of the H.R. Bennett research complex, New England's future is looking brighter than ever.\""
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "months_old_news",
     "text": [
-      "SUPPORT THE COUNTRIES THAT SUPPORT YOURS - PRESIDENT: Unexpectedly and unpopularly, the president today suggested the possible institution of a peacetime draft in response to increasing Chinese aggression towards Taiwan and the Philippines.  \"We must pray for the best while preparing for the worst. We cannot abandon key allies in the face of Chinese bullying.\"",
-      "EVACS UNSTOCKED: TRUTH OR FICTION?  An unidentified government source has suggested that the evacuation centers are unstocked, having \"already accomplished the goal of calming the people\".  He later retracted the comment and is unable to be contacted.",
-      "NEW WEAPON UNVEILED: Defense today lifted the lid on a long held secret project.  \"We can't discuss the specifics, but it generates a burst of plasma which accurately follows a path of laser-heated air,\" according to a Pentagon official.",
-      "UFO CRASH: TRUTH OR FICTION?  One civilian account claims a shining disk appeared in his field.  \"It kind of glowed, and I could see a strange gray world through it.  Then a shambling hazy purple mushroom came through, man.\"",
-      "TIME TRAVEL: TRUTH OR FICTION?  Leaked federal documents describe the formation of a new federal agency called XEDRA, to oversee \"4th Axis technology\" already in use.  Our expert's opinion suggests time-travel or parallel worlds. The meaning of the acronym is currently unknown.",
-      " ...What do you know about surviving in the Wilderness?  If you can't make a snare you don't know TRAP!  Hunt down a copy of TRAPPERS' LIFE and learn about wildlife!...  And how to kill it.  Classic BEAR TRAP returns in this issue!",
-      "HUNTING GOODS!  Food prices getting you down?  Why not get a crossbow or compound bow and Hunt Your Own!?  Our arrows and bolts are completely reusable, so why not hunt animals like Mother Nature intended?"
+      {
+        "id": "months_old_news_1",
+        "text": "SUPPORT THE COUNTRIES THAT SUPPORT YOURS - PRESIDENT: Unexpectedly and unpopularly, the president today suggested the possible institution of a peacetime draft in response to increasing Chinese aggression towards Taiwan and the Philippines.  \"We must pray for the best while preparing for the worst.  We cannot abandon key allies in the face of Chinese bullying.\""
+      },
+      {
+        "id": "months_old_news_2",
+        "text": "EVACS UNSTOCKED: TRUTH OR FICTION?  An unidentified government source has suggested that the evacuation centers are unstocked, having \"already accomplished the goal of calming the people\".  He later retracted the comment and is unable to be contacted."
+      },
+      {
+        "id": "months_old_news_3",
+        "text": "NEW WEAPON UNVEILED: Defense today lifted the lid on a long held secret project.  \"We can't discuss the specifics, but it generates a burst of plasma which accurately follows a path of laser-heated air,\" according to a Pentagon official."
+      },
+      {
+        "id": "months_old_news_4",
+        "text": "UFO CRASH: TRUTH OR FICTION?  One civilian account claims a shining disk appeared in his field.  \"It kind of glowed, and I could see a strange gray world through it.  Then a shambling hazy purple mushroom came through, man.\""
+      },
+      {
+        "id": "months_old_news_5",
+        "text": "TIME TRAVEL: TRUTH OR FICTION?  Leaked federal documents describe the formation of a new federal agency called XEDRA, to oversee \"4th Axis technology\" already in use.  Our expert's opinion suggests time-travel or parallel worlds.  The meaning of the acronym is currently unknown."
+      },
+      {
+        "id": "months_old_news_6",
+        "text": "…What do you know about surviving in the Wilderness?  If you can't make a snare you don't know TRAP!  Hunt down a copy of TRAPPERS' LIFE and learn about wildlife!…  And how to kill it.  Classic BEAR TRAP returns in this issue!"
+      },
+      {
+        "id": "months_old_news_7",
+        "text": "HUNTING GOODS!  Food prices getting you down?  Why not get a crossbow or compound bow and Hunt Your Own!?  Our arrows and bolts are completely reusable, so why not hunt animals like Mother Nature intended?"
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "weeks_old_news",
     "text": [
-      "MYTH DEBUNKED: DEAD ARE STAYING DEAD: Stories about the dead rising \"are completely unfounded.\", a general said today.  \"It's an obvious hoax by people just looking for five minutes of fame, or to scare people in these uncertain times. After all, remember the clown thing a few years ago?\"",
-      "GENERAL SAYS AVOID BUNKERS: Do not attempt to flee to your nearest military bunker!  Understaffed bunkers are defended by turrets, which will shoot those without proper registration.  Please seek military personnel if you need access.",
-      "VIOLENCE OUTBREAKS CAUSED BY \"NEW DRUG\": Rumors of riots were quelled today.  \"These are isolated incidents\" said a local police chief.  \"The violence is random and senseless, our current theory is contamination in a new street drug.\"",
-      "ZOMBIE DRUG?  A controversial blogger suggested the recent riots are a chemical attack by China in her latest podcast.  \"They're jealous of our cybernetic superiority, so they teamed up with Haiti to put hoodoo drugs in the water making people zombies!\"",
-      "PICKLED MEAT IN A JAR!  Just like your grandma used to make!  It will last for months or longer, and when you've eaten it, you can refill and seal the jar!  Stock your emergency supply TODAY!",
-      "BAGS, BAGS, BAGS!  They're very useful things!  If we didn't have BAGS, what-would-we-use...  to PUT a lot of things in!?  (Ad by the \"Play SchoolClothing Co.\")",
-      "GLAMOPOLITAN!  We've got ALL the latest tips!  Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine!  So pick up a copy today and \"Sizzle Like A Star\"!",
-      "POPULAR MECHANICS: People say mechanics is boring?  We say, Prove them Wrong!  We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!",
-      "BIRDHOUSE MONTHLY...  Which wood would a woodpecker prefer?  This month we discuss hardwood versus soft woods, whether to lacquer, oil or paint, and which type of nails you should use!",
-      "FEELING BLUE?  Try \"Greens\" for Magazines!  Your local Supermarket!  Nothing cheers you up like a good magazine...  Unless it's JUNK FOOD!  Or why not buy an MP3 PLAYER or a GAME CONSOLE?  Chase those Blues away at GREENS Supermarket"
+      {
+        "id": "weeks_old_news_1",
+        "text": "MYTH DEBUNKED: DEAD ARE STAYING DEAD: Stories about the dead rising \"are completely unfounded.\", a general said today.  \"It's an obvious hoax by people just looking for five minutes of fame, or to scare people in these uncertain times.  After all, remember the clown thing a few years ago?\""
+      },
+      {
+        "id": "weeks_old_news_2",
+        "text": "GENERAL SAYS AVOID BUNKERS: Do not attempt to flee to your nearest military bunker!  Understaffed bunkers are defended by turrets, which will shoot those without proper registration.  Please seek military personnel if you need access."
+      },
+      {
+        "id": "weeks_old_news_3",
+        "text": "VIOLENCE OUTBREAKS CAUSED BY \"NEW DRUG\": Rumors of riots were quelled today.  \"These are isolated incidents\" said a local police chief.  \"The violence is random and senseless, our current theory is contamination in a new street drug.\""
+      },
+      {
+        "id": "weeks_old_news_4",
+        "text": "ZOMBIE DRUG?  A controversial blogger suggested the recent riots are a chemical attack by China in her latest podcast.  \"They're jealous of our cybernetic superiority, so they teamed up with Haiti to put hoodoo drugs in the water making people zombies!\""
+      },
+      {
+        "id": "weeks_old_news_5",
+        "text": "PICKLED MEAT IN A JAR!  Just like your grandma used to make!  It will last for months or longer, and when you've eaten it, you can refill and seal the jar!  Stock your emergency supply TODAY!"
+      },
+      {
+        "id": "weeks_old_news_6",
+        "text": "BAGS, BAGS, BAGS!  They're very useful things!  If we didn't have BAGS, what-would-we-use… to PUT a lot of things in!?  (Ad by the \"Play SchoolClothing Co.\")"
+      },
+      {
+        "id": "weeks_old_news_7",
+        "text": "GLAMOPOLITAN!  We've got ALL the latest tips!  Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine!  So pick up a copy today and \"Sizzle Like A Star\"!"
+      },
+      {
+        "id": "weeks_old_news_8",
+        "text": "POPULAR MECHANICS: People say mechanics is boring?  We say, Prove them Wrong!  We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!"
+      },
+      {
+        "id": "weeks_old_news_9",
+        "text": "BIRDHOUSE MONTHLY…  Which wood would a woodpecker prefer?  This month we discuss hardwood versus soft woods, whether to lacquer, oil or paint, and which type of nails you should use!"
+      },
+      {
+        "id": "weeks_old_news_10",
+        "text": "FEELING BLUE?  Try \"Greens\" for Magazines!  Your local Supermarket!  Nothing cheers you up like a good magazine…  Unless it's JUNK FOOD!  Or why not buy an MP3 PLAYER or a GAME CONSOLE?  Chase those Blues away at GREENS Supermarket"
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "necropolis_intro",
     "text": [
-      "WELCOME HOME!  Your decision to join our family will lead you to become part of the next generation of job creators.  With us you will already have a foot in the door when it is time to rebuild the nation!",
-      "NEED A NEW JOB?  Now that you have secured a comfortable home, try looking into one of the many promising career opportunities that have positions open.  Openings such as GEOLOGICAL ENGINEERING ASSISTANT or FACILITY TECHNICIAN offer limitless growth potential!  Please contact your employment adviser if you have any questions.",
-      "GOOD WITH YOUR HANDS?  Engineering always needs another hand keeping our home in good working order!  As an incentive, everyone working on level 3 will receive additional hazardous pay and time off.  Please go to the engineering office on level 3 if you are interested.",
-      "WANT TO CONTINUE YOUR EDUCATION?  Our educational facilities are top notch and offer courses for individuals at all age groups.  Many new careers are opening up to those who are willing to learn a new craft.  Our library and research labs will keep even the hungriest minds fed!"
+      {
+        "id": "necropolis_intro_1",
+        "text": "WELCOME HOME!  Your decision to join our family will lead you to become part of the next generation of job creators.  With us you will already have a foot in the door when it is time to rebuild the nation!"
+      },
+      {
+        "id": "necropolis_intro_2",
+        "text": "NEED A NEW JOB?  Now that you have secured a comfortable home, try looking into one of the many promising career opportunities that have positions open.  Openings such as GEOLOGICAL ENGINEERING ASSISTANT or FACILITY TECHNICIAN offer limitless growth potential!  Please contact your employment adviser if you have any questions."
+      },
+      {
+        "id": "necropolis_intro_3",
+        "text": "GOOD WITH YOUR HANDS?  Engineering always needs another hand keeping our home in good working order!  As an incentive, everyone working on level 3 will receive additional hazardous pay and time off.  Please go to the engineering office on level 3 if you are interested."
+      },
+      {
+        "id": "necropolis_intro_4",
+        "text": "WANT TO CONTINUE YOUR EDUCATION?  Our educational facilities are top notch and offer courses for individuals at all age groups.  Many new careers are opening up to those who are willing to learn a new craft.  Our library and research labs will keep even the hungriest minds fed!"
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "scores",
     "text": [
-      "The card is printed with 2 boxes.  In the first box you see a tally of 5 tick marks.  The second box has a total of 9.",
-      "The card is printed with 2 boxes.  In the first box you see a tally of 3 tick marks.  The second box has line trailing off to the edge and a bloody fingerprint.",
-      "The card is printed for a game of golf. Someone has filled out their score for the first 9 holes."
+      {
+        "id": "scores_1",
+        "text": "The card is printed with 2 boxes.  In the first box you see a tally of 5 tick marks.  The second box has a total of 9."
+      },
+      {
+        "id": "scores_2",
+        "text": "The card is printed with 2 boxes.  In the first box you see a tally of 3 tick marks.  The second box has line trailing off to the edge and a bloody fingerprint."
+      },
+      {
+        "id": "scores_3",
+        "text": "The card is printed for a game of golf.  Someone has filled out their score for the first 9 holes."
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "charsheet",
     "text": [
-      "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a fighter.",
-      "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a bard.",
-      "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a cleric.",
-      "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a wizard.",
-      "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a rogue.",
-      "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a barbarian.",
-      "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a warlock.",
-      "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a paladin.",
-      "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a sorcerer."
+      { "id": "charsheet_1", "text": "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a fighter." },
+      {
+        "id": "charsheet_2",
+        "text": "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a bard."
+      },
+      {
+        "id": "charsheet_3",
+        "text": "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a cleric."
+      },
+      {
+        "id": "charsheet_4",
+        "text": "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a wizard."
+      },
+      {
+        "id": "charsheet_5",
+        "text": "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a rogue."
+      },
+      {
+        "id": "charsheet_6",
+        "text": "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a barbarian."
+      },
+      {
+        "id": "charsheet_7",
+        "text": "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a warlock."
+      },
+      {
+        "id": "charsheet_8",
+        "text": "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a paladin."
+      },
+      {
+        "id": "charsheet_9",
+        "text": "It's a Dungeons & Dragons 6th Edition character sheet.  This one is for a sorcerer."
+      }
     ]
   },
   {
@@ -436,7 +1207,7 @@
       "You feel cold.  You need the warmth of a fire.",
       "Maybe a fire could calm your nerves?",
       "You need to ignite something.",
-      "You daydream of crackling fire...",
+      "You daydream of crackling fire…",
       "You shiver.  A fire would be great right now.",
       "You think of randomly lighting a fire, but decide against it."
     ]
@@ -584,31 +1355,31 @@
       "kssht.  Dark Horse, this is Blue Jay, what's your status, over.  kssht.  Blue Jay, this is Black Horse, still holding, but not for long.  kssht.  Dark Horse, you've got to hold position for 3 hours.  We're almost black on ammo, but resupply is on the way, over.  kssht.  Not possible Blue Jay, too many dead.  30 minutes max, and if you don't order us to retreat we're gone, over.  kssht.",
       "kssht.  Blue Jay, this is Black Rose, got your resupply, going in on vector 36, what's the status of the LZ?  kssht.  Black Rose, this is Blue Jay, what took you so long?  LZ hot and unsecured, ammo black, bayonets in action, land on your own discretion, over.  kssht.  Roger that, hold on, Black Rose out.  kssht.",
       "To whomever is listening, this may be our last broadcast.  Wish you luck.  Can't stay in the studio any longer, station is being rewired to military frequencies for automatic broadcast.  Stay safe, and bless you, people.",
-      "You're listening to KDDA from Boston, I'm Jenny Sanders with a special emergency news update.  Road closures by military and police forces have been reported on interstates 90, 91, 93, and 95. Alternative routes have not been suggested. Due to dangers on non-interstate roads, it is strongly recommended that you avoid major thoroughfares and population centers when travelling by car.",
+      "You're listening to KDDA from Boston, I'm Jenny Sanders with a special emergency news update.  Road closures by military and police forces have been reported on interstates 90, 91, 93, and 95.  Alternative routes have not been suggested.  Due to dangers on non-interstate roads, it is strongly recommended that you avoid major thoroughfares and population centers when travelling by car.",
       "Those evacuating cities are advised to head to the nearest designated evacuation shelter and await pickup by a FEMA transport.  Do not engage with rioters.  Due to the danger of being mistaken for a rioter, do not approach military or police blockades, even for assistance.  I repeat, do not approach military or police blockades, even for assistance.",
       "If you are not in an evacuation zone, officials highly recommend you pack gear for evacuation.  Make sure to include clean clothes, a blanket, and enough food and water to last a few days.",
       "In other news, the federal government has confirmed that Rhode Island's declaration of secession is official, although the US government does not acknowledge its validity.  Our sources haven't been able to determine the extent of hostilities in the area, but there are rumors of border violence initiated by the Rhode Island militia.",
       "Hey ladies and gentlemen of the apocalypse, you're listening to Dark Days Radio, the last radio station on the Eastern Seaboard, I'm DJ Dustbowl here with our mascot Sam.",
-      "DJ Dustbowl back, you're listening to Dark Days Radio.  Quick survivor tip: remember, killing a zombie isn't enough. You've gotta smash that thing to a pulp or chop it into pieces if you don't want it getting back up.  Good news though, you don't need to worry about headshots!  Any major damage will lay a shambler out.",
-      "You're listening to Dark Days Radio, I'm DJ Dustbowl!  In with a quick tip for any survivors listening: one zombie is bad news, two are worse.  Don't go Rambo on me.  Tackle threats in small numbers or through bottlenecks.  You aren't tougher than a zombie but you are smarter, use that to your advantage... or just run away.",
+      "DJ Dustbowl back, you're listening to Dark Days Radio.  Quick survivor tip: remember, killing a zombie isn't enough.  You've gotta smash that thing to a pulp or chop it into pieces if you don't want it getting back up.  Good news though, you don't need to worry about headshots!  Any major damage will lay a shambler out.",
+      "You're listening to Dark Days Radio, I'm DJ Dustbowl!  In with a quick tip for any survivors listening: one zombie is bad news, two are worse.  Don't go Rambo on me.  Tackle threats in small numbers or through bottlenecks.  You aren't tougher than a zombie but you are smarter, use that to your advantage… or just run away.",
       "…black goo in the water!  Drugs and who knows what else, the government wants you dumb and docile!  Wake up people.  They are the spawn of Satan!  This is Alan Jewels with the AJ show, we’ll be back after the break.",
-      "This is Escort, frequency one-fifty-five, nineteen-thousand, here's your report.  Can you gimme an 'amen', it's ...kshhhsk.... days after Armageddon and I'm still kicking.  The 49ers are headed southwards towards Neufolk, so if you're there and listening, barricade or lay low until they go by.  There's another horde forming out of Metro Bay.",
-      "I'll be calling them the Pigskins, and they're circling the city right now, but trickles tell me they're going to converge on Neufolk in the next few days, so once the 49ers pass, Neufolkians, get all the supplies you can, cause this is gonna be a big one...",
-      "This is an emergency broadcast from the National Emergency Alert System.  This is not a test.  There has been several hundred confirmed cases of an unknown pathogen in the metropolitan area of ...kshhssk... in the last 24 hours.  The contagion is believed to be highly transmittable.  Residents are advised to remain in their homes at this time.  More information will be released as it becomes available.",
+      "This is Escort, frequency one-fifty-five, nineteen-thousand, here's your report.  Can you gimme an 'amen', it's …kshhhsk… days after Armageddon and I'm still kicking.  The 49ers are headed southwards towards Neufolk, so if you're there and listening, barricade or lay low until they go by.  There's another horde forming out of Metro Bay.",
+      "I'll be calling them the Pigskins, and they're circling the city right now, but trickles tell me they're going to converge on Neufolk in the next few days, so once the 49ers pass, Neufolkians, get all the supplies you can, cause this is gonna be a big one…",
+      "This is an emergency broadcast from the National Emergency Alert System.  This is not a test.  There has been several hundred confirmed cases of an unknown pathogen in the metropolitan area of …kshhssk… in the last 24 hours.  The contagion is believed to be highly transmittable.  Residents are advised to remain in their homes at this time.  More information will be released as it becomes available.",
       "This is an emergency broadcast from the National Emergency Alert System.  This is not a test.  The new pathogen has now been confirmed in several cities across the US.  Victims of this disease are known to display highly aggressive, rabies-like behavior, and may be violent to people around them.  Avoid contact with infected persons at all costs.  If you suspect that you or someone else has contracted the pathogen, contact emergency services immediately.",
-      "This is not a test.  Seek immediate shelter.  Multiple missile launches have been confirmed to be targeting the ..ksshhsk... Seek immediate shelter.  If a community shelter is not available, alternative shelter locations are basements, beneath stairwells, or central rooms with no windows.  Ensure that you have sufficient protection from falling debris.  Ensure that you have food and water for at least one week.  Repeat.  Seek immediate shelter.",
+      "This is not a test.  Seek immediate shelter.  Multiple missile launches have been confirmed to be targeting the …ksshhsk… Seek immediate shelter.  If a community shelter is not available, alternative shelter locations are basements, beneath stairwells, or central rooms with no windows.  Ensure that you have sufficient protection from falling debris.  Ensure that you have food and water for at least one week.  Repeat.  Seek immediate shelter.",
       "zzzzchzzzzchurzzz Are you tired of always losing your dumpy old sunglasses?  Tired of having to pay for over price shades just to have them fall to pieces?  Well no longer now introducing zchzzzzch- brand Anti-glare compensators for the shade you need in you.  Order now for 12 easy payments of $1200.99 and we'll throw in a free order of zpzzzzpzz eye bot.",
       "This is WSSA-233, broadcasting from <city>.  We've barricaded all the doors and windows.  There's a ton of them right outside, we're trying to stay quiet.  Do not, I repeat, do not approach.",
-      "First Fleet, this is Mount Wheater, we've send a helicopter with a squad to the location of the Guard Outpost. If any survivors of the crash are to reach the outpost, contact the base, we are short on men and one of the big ones has just breached the perimeter.  Over.",
+      "First Fleet, this is Mount Wheater, we've send a helicopter with a squad to the location of the Guard Outpost.  If any survivors of the crash are to reach the outpost, contact the base, we are short on men and one of the big ones has just breached the perimeter.  Over.",
       "USS Eagle of Freedom to all callsigns.  Operation Ocean 11 is in effect.  Repeat.  Operation Ocean 11 is in effect.  Sir, this should effectively reach about 150 units, but there is no response from literally anyone in hours.  Their coms winked out like candles in the wind.  And how do we even secure the port to load anyone in?",
-      "Seagull 54 to USS Eagle of Freedom.  It's as we predicted.  Going down on last reserves of fuel, with dropping evacuated unit out of question at that point.  This is our last call.  Will try emergency landing at ...kshssssssk... Don't send us a rescue team, we know the odds.  Will be moving east towards the shore, and if we're not there in T minus 3 days, count us dead.  Proud to serve the country.  Over and out."
+      "Seagull 54 to USS Eagle of Freedom.  It's as we predicted.  Going down on last reserves of fuel, with dropping evacuated unit out of question at that point.  This is our last call.  Will try emergency landing at …kshssssssk… Don't send us a rescue team, we know the odds.  Will be moving east towards the shore, and if we're not there in T minus 3 days, count us dead.  Proud to serve the country.  Over and out."
     ]
   },
   {
     "type": "snippet",
     "category": "amigara1",
     "text": [
-      "ENTRY 47:\nOur normal mining routine has unearthed a hollow chamber.  This would not be out of the ordinary, save for the odd, perfectly vertical faultline found. This faultline has several odd concavities in it which have the more superstitious crew members alarmed; they seem to be of human origin.\nENTRY 48:\nThe concavities are between 10 and 20 feet tall, and run the length of the faultline.  Each one is vaguely human in shape, but with the proportions of the limbs, neck and head greatly distended, all twisted and curled in on themselves."
+      "ENTRY 47:\nOur normal mining routine has unearthed a hollow chamber.  This would not be out of the ordinary, save for the odd, perfectly vertical faultline found.  This faultline has several odd concavities in it which have the more superstitious crew members alarmed; they seem to be of human origin.\nENTRY 48:\nThe concavities are between 10 and 20 feet tall, and run the length of the faultline.  Each one is vaguely human in shape, but with the proportions of the limbs, neck and head greatly distended, all twisted and curled in on themselves."
     ]
   },
   {
@@ -629,7 +1400,7 @@
     "type": "snippet",
     "category": "amigara4",
     "text": [
-      "MINE OPERATIONS SUSPENDED; CONTROL TRANSFERRED TO AMIGARA PROJECT UNDER IMPERATIVE 2:07B.\nFAULTLINE SOUNDING HAS PLACED DEPTH AT 30.09 KM.\nDAMAGE TO FAULTLINE DISCOVERED; NEPOWER MINE CREW PLACED UNDER ARREST FOR VIOLATION OF REGULATION 87.08 AND TRANSFERRED TO LAB 89-C FOR USE AS SUBJECTS.\nQUALITY OF FAULTLINE NOT COMPROMISED.\nINITIATING STANDARD TREMOR TEST..."
+      "MINE OPERATIONS SUSPENDED; CONTROL TRANSFERRED TO AMIGARA PROJECT UNDER IMPERATIVE 2:07B.\nFAULTLINE SOUNDING HAS PLACED DEPTH AT 30.09 KM.\nDAMAGE TO FAULTLINE DISCOVERED; NEPOWER MINE CREW PLACED UNDER ARREST FOR VIOLATION OF REGULATION 87.08 AND TRANSFERRED TO LAB 89-C FOR USE AS SUBJECTS.\nQUALITY OF FAULTLINE NOT COMPROMISED.\nINITIATING STANDARD TREMOR TEST…"
     ]
   },
   {
@@ -641,7 +1412,10 @@
     "type": "snippet",
     "category": "death_note",
     "text": [
-      "This is General Baker.  Today I received a top-secret letter with new orders from high command.  These orders described a new set of coordinates for our ICBM.  My men deciphered it, and it became crystal-clear that coordinates are pointing to a certain place inside our country.  I requested re-confirmation, and after a short while I received it with the same coordinates, so it wasn't an weird error as I originally thought.  I don't know what's on the minds of these guys in the government, but I'm not gonna bomb innocent people of my country.  We're just one step away from starting a war, so failure to comply with an order will obviously result in a execution.  And it's just a matter of time when they come for me.  So actually I'm already a dead man.  Whomever may find this.  Please tell my wife Jane I love her and Michael Jr.  And tell her I'm sorry.  General Michael Baker"
+      {
+        "id": "death_note_1",
+        "text": "This is General Baker.  Today I received a top-secret letter with new orders from high command.  These orders described a new set of coordinates for our ICBM.  My men deciphered it, and it became crystal-clear that coordinates are pointing to a certain place inside our country.  I requested re-confirmation, and after a short while I received it with the same coordinates, so it wasn't an weird error as I originally thought.  I don't know what's on the minds of these guys in the government, but I'm not gonna bomb innocent people of my country.  We're just one step away from starting a war, so failure to comply with an order will obviously result in a execution.  And it's just a matter of time when they come for me.  So actually I'm already a dead man.  Whomever may find this.  Please tell my wife Jane I love her and Michael Jr.  And tell her I'm sorry.  General Michael Baker"
+      }
     ]
   }
 ]
diff --git a/data/json/test_regions.json b/data/json/test_regions.json
index a714d3edc2f6e..806e5676544e0 100644
--- a/data/json/test_regions.json
+++ b/data/json/test_regions.json
@@ -3,7 +3,15 @@
     "type": "region_settings",
     "id": "desert_test",
     "default_oter": "field",
-    "default_groundcover": [ [ "t_searth_test", 3 ], [ "t_sand", 1 ] ],
+    "default_groundcover": [ [ "t_region_groundcover", 1 ] ],
+    "region_terrain_and_furniture": {
+      "terrain": {
+        "t_region_groundcover": { "t_searth_test": 3, "t_sand": 1 },
+        "t_region_shrub": { "t_shrub": 1 },
+        "t_region_tree": { "t_tree_willow": 1, "t_tree_dead": 1 }
+      },
+      "furniture": { "f_region_flower": { "f_mutcactus_test": 1 } }
+    },
     "field_coverage": {
       "percent_coverage": 1.9333,
       "default_ter": "t_sand",
diff --git a/data/json/uncraft/cbm/cbm.json b/data/json/uncraft/cbm/cbm.json
index a3afdf0fbcf28..68c3338c6f0c1 100644
--- a/data/json/uncraft/cbm/cbm.json
+++ b/data/json/uncraft/cbm/cbm.json
@@ -25,16 +25,6 @@
       [ [ "burnt_out_bionic", 1 ] ]
     ]
   },
-  {
-    "type": "uncraft",
-    "result": "bio_solar",
-    "skill_used": "electronics",
-    "difficulty": 7,
-    "time": "500 s",
-    "using": [ [ "soldering_standard", 20 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [ [ [ "power_supply", 4 ] ], [ [ "amplifier", 2 ] ], [ [ "solar_cell", 4 ] ], [ [ "burnt_out_bionic", 1 ] ] ]
-  },
   {
     "type": "uncraft",
     "result": "bio_batteries",
diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json
index 7c2a1889a3de9..77c43718e7f76 100644
--- a/data/json/vehicleparts/vehicle_parts.json
+++ b/data/json/vehicleparts/vehicle_parts.json
@@ -1439,7 +1439,7 @@
       "STABLE",
       "UNMOUNT_ON_DAMAGE"
     ],
-    "breaks_into": [ { "item": "splinter", "count": [ 10, 20 ] }, { "item": "rag", "count": [ 5, 10 ] } ]
+    "breaks_into": [ { "item": "splinter", "count": [ 2, 4 ] }, { "item": "rag", "count": [ 5, 10 ] } ]
   },
   {
     "type": "vehicle_part",
diff --git a/data/json/vehicles/trains.json b/data/json/vehicles/trains.json
index 532fd293e2279..21dcea76870b3 100644
--- a/data/json/vehicles/trains.json
+++ b/data/json/vehicles/trains.json
@@ -238,5 +238,16 @@
       { "x": 1, "y": 0, "parts": [ "headlight", "battery_motorbike" ] },
       { "x": -1, "y": 0, "parts": [ "muffler", "box" ] }
     ]
+  },
+  {
+    "id": "miniature_train_loco",
+    "type": "vehicle",
+    "name": "Miniature Train Locomotive",
+    "blueprint": [ "oo" ],
+    "parts": [
+      { "x": 1, "y": 0, "parts": [ "frame_vertical_2", "engine_steam_small", "rail_wheel_small_pair" ] },
+      { "x": 0, "y": 0, "parts": [ "frame_vertical_2", "seat", "rail_wheel_small_pair", "controls" ] },
+      { "x": 0, "y": 0, "parts": [ { "part": "fuel_bunker", "fuel": "coal_lump" } ] }
+    ]
   }
 ]
diff --git a/data/json/vehicles/trucks.json b/data/json/vehicles/trucks.json
index 14ead2c9e8105..cb0d0e76d604f 100644
--- a/data/json/vehicles/trucks.json
+++ b/data/json/vehicles/trucks.json
@@ -891,8 +891,8 @@
       { "x": -2, "y": 1, "chance": 20, "items": [ "blanket" ] },
       { "x": -3, "y": 0, "chance": 20, "items": [ "blanket" ] },
       { "x": -3, "y": 1, "chance": 20, "items": [ "blanket" ] },
-      { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_food" } },
-      { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_food" } },
+      { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_medium" } },
+      { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_medium" } },
       { "x": -4, "y": 1, "chance": 10, "items": { "item": "cat_food", "container-item": "can_food" } },
       { "x": -4, "y": 1, "chance": 10, "items": { "item": "cat_food", "container-item": "can_food" } },
       { "x": -4, "y": 0, "chance": 3, "items": [ "beartrap" ] }
diff --git a/data/mods/Aftershock/README.md b/data/mods/Aftershock/README.md
index ec41f827313dc..ed7e59248a216 100644
--- a/data/mods/Aftershock/README.md
+++ b/data/mods/Aftershock/README.md
@@ -24,4 +24,8 @@ Contains json data for all recipes, sorted by category or niche.
 
 ### vehicles
 
-Contains json data for vehicles, vehicle parts, and vehicle spawn groups.
\ No newline at end of file
+Contains json data for vehicles, vehicle parts, and vehicle spawn groups.
+
+### npcs
+
+Contains json data for npcs, factions, and design document for any new factions, specific new faction PrepPhyle.  Bionic Preppers living simple farming life with bionic upgrades, prefer to upgrade animals instead of relying on robots.
diff --git a/data/mods/Aftershock/items/afs__items.json b/data/mods/Aftershock/items/afs__items.json
index aa09250e326d5..b5e8714e8d481 100644
--- a/data/mods/Aftershock/items/afs__items.json
+++ b/data/mods/Aftershock/items/afs__items.json
@@ -7,6 +7,20 @@
     "flags": "TRADER_AVOID",
     "qualities": [ [ "SAW_M_FINE", 1 ], [ "SCREW_FINE", 1 ], [ "CUT_FINE", 2 ] ]
   },
+  {
+    "type": "GENERIC",
+    "id": "crypto_coin",
+    "name": "Crypto coins",
+    "description": "PrepNet had been heavily involved in avoiding taxes by using untraceable internet currencies.  If this movement had grown it could have crippled the US tax base but the cataclysm happened first. These are physical coins with random numbers sequences embossed on them.",
+    "price": 12000,
+    "price_postapoc": 15000,
+    "//": "The coins would be worthless but the PrepNet Phyle still retains some manufacturing capacity",
+    "weight": "1 g",
+    "to_hit": -3,
+    "color": "cyan",
+    "symbol": "$",
+    "material": [ "plastic" ]
+  },
   {
     "id": "afs_basin",
     "type": "CONTAINER",
@@ -141,5 +155,26 @@
     "material": [ "steel", "lead" ],
     "symbol": "0",
     "color": "yellow"
+  },
+  {
+    "id": "atomic_butterchurn",
+    "type": "GENERIC",
+    "category": "tools",
+    "name": "folded atomic butter churn",
+    "description": "The Rivtech Churninator 4000, the only churn to be banned by 13 religious sects. The legs are currently folded up for travel. Unlike a standard churn that requires cream separated from raw milk this churn requires only raw milk, salt and a healthy respect for glowing objects.",
+    "weight": "6464 g",
+    "volume": "11356 ml",
+    "price": 5000,
+    "price_postapoc": 45000,
+    "looks_like": [ "still" ],
+    "symbol": "u",
+    "color": "light_green",
+    "use_action": { "type": "deploy_furn", "furn_type": "f_atomic_butter_churn" },
+    "qualities": [ [ "CONTAIN", 1 ], [ "CHURN", 2 ] ],
+    "to_hit": -2,
+    "bashing": 5,
+    "material": [ "plastic", "steel" ],
+    "//": "I figured bionic preppers would have a sci-fi solution to some low tech problems.",
+    "flags": [ "LEAK_DAM", "RADIOACTIVE", "DURABLE_MELEE" ]
   }
 ]
diff --git a/data/mods/Aftershock/items/afs_cbms.json b/data/mods/Aftershock/items/afs_cbms.json
index c88da7db978d1..e15ab4e50818a 100644
--- a/data/mods/Aftershock/items/afs_cbms.json
+++ b/data/mods/Aftershock/items/afs_cbms.json
@@ -8,6 +8,15 @@
     "price": 350000,
     "difficulty": 4
   },
+  {
+    "id": "afs_bio_wind_turbine",
+    "copy-from": "bionic_general",
+    "type": "BIONIC_ITEM",
+    "name": "Wind Turbine CBM",
+    "description": "Installed on your body is a set of small retractable wind turbines.  When activated, they will deploy and slowly harvest wind power to recharge your power level.",
+    "price": 350000,
+    "difficulty": 4
+  },
   {
     "id": "afs_bio_precision_solderers",
     "copy-from": "bionic_general",
diff --git a/data/mods/Aftershock/items/afs_furniture.json b/data/mods/Aftershock/items/afs_furniture.json
new file mode 100644
index 0000000000000..e1703c870e73b
--- /dev/null
+++ b/data/mods/Aftershock/items/afs_furniture.json
@@ -0,0 +1,37 @@
+[
+  {
+    "type": "furniture",
+    "id": "f_atomic_butter_churn",
+    "name": "atomic butter churn on a stand",
+    "description": "The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready to add raw milk and salt. It will churn turn the earth is a cinder.",
+    "symbol": "H",
+    "color": "light_green",
+    "crafting_pseudo_item": "atomic_butter_churn",
+    "move_cost_mod": -1,
+    "coverage": 70,
+    "required_str": -1,
+    "flags": [ "NOITEM", "SEALED", "ALLOW_FIELD_EFFECT", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "LIQUIDCONT" ],
+    "examine_action": "keg",
+    "keg_capacity": 45,
+    "deconstruct": {
+      "items": [
+        { "item": "plastic_chunk", "count": 10 },
+        { "item": "water_faucet", "count": 1 },
+        { "item": "sheet_metal_small", "count": [ 12, 20 ] },
+        { "item": "scrap", "count": [ 5, 10 ] }
+      ]
+    },
+    "bash": {
+      "str_min": 12,
+      "str_max": 50,
+      "sound": "smash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "plastic_chunk", "count": [ 6, 8 ] },
+        { "item": "water_faucet", "prob": 50 },
+        { "item": "sheet_metal_small", "count": [ 6, 12 ] },
+        { "item": "scrap", "count": [ 10, 20 ] }
+      ]
+    }
+  }
+]
diff --git a/data/mods/Aftershock/items/afs_item_groups.json b/data/mods/Aftershock/items/afs_item_groups.json
new file mode 100644
index 0000000000000..88212c58a12bb
--- /dev/null
+++ b/data/mods/Aftershock/items/afs_item_groups.json
@@ -0,0 +1,57 @@
+[
+  {
+    "type": "item_group",
+    "id": "afs_gardener_worn",
+    "subtype": "collection",
+    "entries": [
+      { "item": "boots_combat" },
+      { "item": "briefs" },
+      { "item": "socks" },
+      { "item": "polo_shirt" },
+      { "item": "pants_cargo" },
+      { "item": "kevlar" },
+      { "item": "leather_pouch" },
+      { "item": "balclava", "chance": 75 },
+      { "item": "bootsheath" }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "afs_gardener_carried",
+    "subtype": "collection",
+    "entries": [ { "group": "hardware", "count": [ 1, 2 ] }, { "group": "snacks", "repeat": [ 1, 3 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "afs_gardener_wield",
+    "subtype": "collection",
+    "entries": [ { "item": "machete" } ]
+  },
+  {
+    "type": "item_group",
+    "id": "afs_gardener_misc",
+    "subtype": "collection",
+    "items": [
+      { "item": "RobofacCoin", "count-min": 5, "count-max": 30, "prob": 30 },
+      { "group": "forage_spring", "count-min": 10, "count-max": 30, "prob": 30 },
+      { "group": "fresh_produce", "prob": 80, "count": [ 4, 8 ] },
+      { "group": "tools_home", "prob": 80, "count": [ 1, 3 ] },
+      { "group": "tools_construction", "prob": 30, "count": [ 1, 3 ] },
+      { "group": "tools_carpentry", "prob": 30, "count": [ 1, 3 ] },
+      { "group": "tools_earthworking", "prob": 30, "count": [ 1, 3 ] },
+      { "group": "supplies_hardware", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "forage_summer", "prob": 20, "count": [ 1, 3 ] },
+      [ "tool_belt", 15 ],
+      [ "dump_pouch", 5 ],
+      [ "ragpouch", 15 ],
+      [ "leather_pouch", 15 ],
+      [ "quiver", 15 ],
+      [ "quiver_large", 5 ],
+      [ "crowbar", 25 ],
+      [ "machete", 25 ],
+      [ "ax", 25 ],
+      [ "arrow_metal", 25 ],
+      [ "bolt_steel", 10 ]
+    ]
+  }
+]
diff --git a/data/mods/Aftershock/items/afs_tool_quality.json b/data/mods/Aftershock/items/afs_tool_quality.json
new file mode 100644
index 0000000000000..646e2f5df34d6
--- /dev/null
+++ b/data/mods/Aftershock/items/afs_tool_quality.json
@@ -0,0 +1,8 @@
+[
+  {
+    "type": "tool_quality",
+    "id": "CHURN",
+    "name": "churn",
+    "//": "Delete this when you mainline Dairy products existing PR"
+  }
+]
diff --git a/data/mods/Aftershock/items/afs_tools.json b/data/mods/Aftershock/items/afs_tools.json
index d2fa5ca505824..eb71696c73a95 100644
--- a/data/mods/Aftershock/items/afs_tools.json
+++ b/data/mods/Aftershock/items/afs_tools.json
@@ -176,7 +176,7 @@
     "coverage": 5,
     "encumbrance": 2,
     "covers": [ "LEG_EITHER" ],
-    "flags": [ "NO_UNLOAD", "RECHARGE", "WAIST", "FRAGILE", "OVERSIZE", "WATERPROOF" ]
+    "flags": [ "RECHARGE", "WAIST", "FRAGILE", "OVERSIZE", "WATERPROOF", "IS_UPS" ]
   },
   {
     "id": "adv_UPS_off",
@@ -188,7 +188,7 @@
     "coverage": 5,
     "encumbrance": 1,
     "covers": [ "LEG_EITHER" ],
-    "flags": [ "WAIST", "FRAGILE", "OVERSIZE" ]
+    "flags": [ "WAIST", "FRAGILE", "OVERSIZE", "IS_UPS" ]
   },
   {
     "id": "afs_bionic_power_mod",
diff --git a/data/mods/Aftershock/maps/afs_item_groups.json b/data/mods/Aftershock/maps/afs_item_groups.json
index 72ecabacffbc9..3caff3d06f308 100644
--- a/data/mods/Aftershock/maps/afs_item_groups.json
+++ b/data/mods/Aftershock/maps/afs_item_groups.json
@@ -29,6 +29,7 @@
     "items": [
       [ "bio_furnace", 10 ],
       [ "bn_bio_solar", 10 ],
+      [ "afs_bio_wind_turbine", 5 ],
       [ "afs_bio_precision_solderers", 10 ],
       [ "afs_bio_missiles", 10 ],
       [ "afs_bio_linguistic_coprocessor", 10 ],
@@ -42,6 +43,7 @@
     "items": [
       [ "bio_furnace", 10 ],
       [ "bn_bio_solar", 10 ],
+      [ "afs_bio_wind_turbine", 5 ],
       [ "afs_bio_precision_solderers", 5 ],
       [ "afs_bio_linguistic_coprocessor", 8 ]
     ]
@@ -57,6 +59,7 @@
     "items": [
       [ "bio_furnace", 5 ],
       [ "bn_bio_solar", 5 ],
+      [ "afs_bio_wind_turbine", 2 ],
       [ "afs_bio_precision_solderers", 7 ],
       [ "afs_bio_linguistic_coprocessor", 5 ]
     ]
@@ -64,7 +67,13 @@
   {
     "id": "bionics_op",
     "type": "item_group",
-    "items": [ [ "bio_furnace", 15 ], [ "bn_bio_solar", 15 ], [ "afs_bio_missiles", 10 ], [ "afs_bio_dopamine_stimulators", 10 ] ]
+    "items": [
+      [ "bio_furnace", 15 ],
+      [ "bn_bio_solar", 15 ],
+      [ "afs_bio_wind_turbine", 10 ],
+      [ "afs_bio_missiles", 10 ],
+      [ "afs_bio_dopamine_stimulators", 10 ]
+    ]
   },
   {
     "id": "bionics_subs",
diff --git a/data/mods/Aftershock/maps/afs_overmap_terrain.json b/data/mods/Aftershock/maps/afs_overmap_terrain.json
index 2c30daecb3e5f..a9daeebb99966 100644
--- a/data/mods/Aftershock/maps/afs_overmap_terrain.json
+++ b/data/mods/Aftershock/maps/afs_overmap_terrain.json
@@ -9,6 +9,15 @@
     "mondensity": 2,
     "flags": [ "SIDEWALK" ]
   },
+  {
+    "id": "prepnet_orchard",
+    "type": "overmap_terrain",
+    "copy-from": "generic_city_building",
+    "name": "PrepNet orchard",
+    "sym": "#",
+    "color": "i_green",
+    "flags": [ "SOURCE_FOOD" ]
+  },
   {
     "id": "municipal_reactor_ware",
     "type": "overmap_terrain",
diff --git a/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json b/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json
new file mode 100644
index 0000000000000..f5d8745818874
--- /dev/null
+++ b/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json
@@ -0,0 +1,146 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "prepnet_orchard" ],
+    "weight": 100,
+    "object": {
+      "faction_owner": [ { "id": "Prepnet_Phyle", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
+      "rows": [
+        "________________________",
+        "________________________",
+        "----__------------------",
+        "....__................u-",
+        "....__.................-",
+        "....__ddd....t.T.7d7....",
+        "FFwww+wwFFFFFFFFFFFFFFFF",
+        "FpwCcccwudd...d........F",
+        "F.wCcccWdbd..t.T.7.7...F",
+        "F.WcccHwdbdd...........F",
+        "F.wCccHW.dd.....d......F",
+        "FpwDccHwu#...t.T.7.7...F",
+        "F.www+ww...............F",
+        "F..##..p..u............F",
+        "F.......a....t.Td7.7...F",
+        "F..#.d.....#.....d.....F",
+        "F.a..u4d.d.............F",
+        "Fud...d......t.T.7.7...F",
+        "F..#4.au4.#...dd.......F",
+        "F.4..dd.p.d............F",
+        "F....#4.d....7.7.7.7...F",
+        "F.4u.u.d4d..#...d......F",
+        "F#..4...d..............F",
+        "FFFFFFFFFFFFFFFFFFFFFFFF"
+      ],
+      "terrain": {
+        "#": "t_underbrush_harvested_spring",
+        "+": "t_door_c",
+        "-": "t_fence_h",
+        ".": "t_grass",
+        "4": "t_tree_pine",
+        "7": "t_tree_apple",
+        "C": "t_thconc_floor",
+        "D": "t_thconc_floor",
+        "H": "t_thconc_floor",
+        "T": "t_tree_cherry",
+        "W": "t_window_domestic",
+        "_": "t_sidewalk",
+        "a": "t_tree_birch",
+        "b": "t_grass",
+        "c": "t_thconc_floor",
+        "d": "t_dirt",
+        "p": "t_grass",
+        "t": "t_tree_plum",
+        "u": "t_underbrush",
+        "w": "t_wall_log",
+        "F": "t_fence_barbed"
+      },
+      "furniture": { "C": "f_chair", "D": "f_desk", "H": "f_sofa", "b": "f_bench" },
+      "place_items": [
+        { "item": "supplies_farming", "x": 6, "y": 13, "chance": 50 },
+        { "item": "supplies_farming", "x": 4, "y": 11, "chance": 15 },
+        { "item": "supplies_farming", "x": 6, "y": 7, "chance": 15 },
+        { "item": "supplies_farming", "x": 3, "y": 9, "chance": 99 }
+      ],
+      "sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } },
+      "place_monsters": [
+        { "monster": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 },
+        { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 4, "friendly": true }
+      ],
+      "place_npcs": [ { "class": "prepnet_gardener", "x": 10, "y": 9 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "prepnet_orchard" ],
+    "weight": 100,
+    "object": {
+      "faction_owner": [ { "id": "Prepnet_Phyle", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
+      "rows": [
+        "________________________",
+        "________________________",
+        "----__------------------",
+        "...&__................U-",
+        "....__.................-",
+        "....__ddd........7dt....",
+        "FFwww+wwFFFFFFFFFFFFFFFF",
+        "FpwCcccwUdd..#.s.......F",
+        "F.wCcccWdbd..#.s.7.t...F",
+        "F.WcccHwdbdd...........F",
+        "F.wCccHW.ad............F",
+        "FpwDccHwUu...#.s.7.t...F",
+        "F.www+ww#....#.s.......F",
+        "F..uu..p..U..#.s.......F",
+        "F.......T....#.s.7.t...F",
+        "F..u.d.....u...........F",
+        "F.T..U4d.d.............F",
+        "FUd...d......#.s.7.t...F",
+        "F..u4.TU4.u..#.s.......F",
+        "F.4..dd.p.d..#.s.......F",
+        "F....u4.d....#.s.7.t...F",
+        "F.4U.U.d4d..u...d......F",
+        "Fu..4...d..............F",
+        "FFFFFFFFFFFFFFFFFFFFFFFF"
+      ],
+      "terrain": {
+        "#": "t_shrub_strawberry",
+        "&": "t_grass",
+        "+": "t_door_c",
+        "-": "t_fence_h",
+        ".": "t_grass",
+        "4": "t_tree_pine",
+        "7": "t_tree_cherry",
+        "C": "t_thconc_floor",
+        "D": "t_thconc_floor",
+        "H": "t_thconc_floor",
+        "T": "t_tree_birch",
+        "U": "t_underbrush",
+        "W": "t_window_domestic",
+        "_": "t_sidewalk",
+        "a": "t_dirt",
+        "b": "t_grass",
+        "c": "t_thconc_floor",
+        "d": "t_dirt",
+        "p": "t_grass",
+        "s": "t_shrub_blueberry",
+        "t": "t_tree_apricot",
+        "u": "t_underbrush_harvested_spring",
+        "w": "t_wall_log",
+        "F": "t_fence_barbed"
+      },
+      "furniture": { "&": "f_trashcan", "C": "f_chair", "D": "f_desk", "H": "f_sofa", "a": "f_trashcan", "b": "f_bench" },
+      "place_items": [
+        { "item": "supplies_farming", "x": 6, "y": 13, "chance": 50 },
+        { "item": "supplies_farming", "x": 4, "y": 11, "chance": 15 },
+        { "item": "supplies_farming", "x": 6, "y": 7, "chance": 15 }
+      ],
+      "sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } },
+      "place_monsters": [
+        { "monster": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 },
+        { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 3, "friendly": true }
+      ],
+      "place_npcs": [ { "class": "prepnet_gardener", "x": 10, "y": 9 } ]
+    }
+  }
+]
diff --git a/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json b/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json
new file mode 100644
index 0000000000000..c794b03830404
--- /dev/null
+++ b/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json
@@ -0,0 +1,65 @@
+[
+  {
+    "id": "afs_mon_cyber_mastiff",
+    "copy-from": "mon_dog",
+    "default_faction": "PrepNet",
+    "type": "MONSTER",
+    "name": { "str": "Cyber Mastiff", "str_pl": "Cyber Mastifs" },
+    "//": "Rare, location specific only",
+    "description": "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic enhancements. These hounds defend Prep Phyle lands from all comers undead and otherwise.",
+    "volume": "57500 ml",
+    "weight": 57500,
+    "hp": 86,
+    "speed": 100,
+    "aggression": 3,
+    "morale": 10,
+    "melee_dice": 1,
+    "melee_dice_sides": 2,
+    "melee_cut": 7,
+    "dodge": 3,
+    "armor_bash": 8,
+    "armor_cut": 14,
+    "looks_like": "mon_dog_gpyrenees",
+    "vision_day": 30,
+    "vision_night": 8,
+    "harvest": "CBM_DOG",
+    "reproduction": { "baby_monster": "afs_mon_cyber_mastiff_pup", "baby_count": 7, "baby_timer": 320 },
+    "//": "1-7 puppies & 300-320 days per-litter for size medium canines",
+    "flags": [ "ANIMAL", "PET_MOUNTABLE", "HEARS", "HIT_AND_RUN", "KEENNOSE", "PATH_AVOID_DANGER_1", "SEES", "SMELLS", "WARM" ],
+    "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ]
+  },
+  {
+    "id": "afs_mon_cyber_mastiff_pup",
+    "type": "MONSTER",
+    "name": { "str": "Cyber Mastiff puppy", "str_pl": "Cyber Mastiff puppies" },
+    "description": "An adorable, defenseless Cyber Mastiff puppy.  Much safer to tame than an adult dog. CBMs are implanted but immature in growth with the puppy.",
+    "default_faction": "PrepNet",
+    "bodytype": "dog",
+    "looks_like": "mon_dog_gpyrenees_pup",
+    "categories": [ "WILDLIFE" ],
+    "species": [ "MAMMAL" ],
+    "volume": "750 ml",
+    "weight": 1000,
+    "hp": 15,
+    "speed": 65,
+    "material": [ "flesh" ],
+    "symbol": "d",
+    "color": "light_gray",
+    "aggression": -12,
+    "morale": 5,
+    "melee_skill": 2,
+    "melee_dice": 1,
+    "melee_dice_sides": 1,
+    "melee_cut": 3,
+    "dodge": 1,
+    "vision_night": 5,
+    "harvest": "mammal_tiny",
+    "path_settings": { "max_dist": 10 },
+    "upgrades": { "age_grow": 42, "into": "afs_mon_cyber_mastiff" },
+    "biosignature": { "biosig_item": "feces_dog", "biosig_timer": 6 },
+    "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ],
+    "death_function": [ "NORMAL" ],
+    "special_attacks": [ [ "EAT_FOOD", 100 ] ],
+    "flags": [ "ANIMAL", "DOGFOOD", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SEES", "SMELLS", "WARM" ]
+  }
+]
diff --git a/data/mods/Aftershock/mobs/afs_harvest.json b/data/mods/Aftershock/mobs/afs_harvest.json
new file mode 100644
index 0000000000000..dcabcfbc04478
--- /dev/null
+++ b/data/mods/Aftershock/mobs/afs_harvest.json
@@ -0,0 +1,32 @@
+[
+  {
+    "id": "CBM_DOG",
+    "type": "harvest",
+    "entries": [
+      {
+        "drop": "bio_power_storage_mkII",
+        "type": "bionic",
+        "flags": [ "FILTHY", "NO_STERILE", "NO_PACKED" ],
+        "faults": [ "fault_bionic_salvaged" ]
+      },
+      {
+        "drop": "bionics_op",
+        "type": "bionic_group",
+        "flags": [ "FILTHY", "NO_STERILE", "NO_PACKED" ],
+        "faults": [ "fault_bionic_salvaged" ]
+      },
+      { "drop": "meat", "type": "flesh", "mass_ratio": 0.3 },
+      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.03 },
+      { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
+      { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 },
+      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
+      { "drop": "stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
+      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 }
+    ]
+  }
+]
diff --git a/data/mods/Aftershock/mobs/afs_monster_faction.json b/data/mods/Aftershock/mobs/afs_monster_faction.json
new file mode 100644
index 0000000000000..1c23ef23ed06d
--- /dev/null
+++ b/data/mods/Aftershock/mobs/afs_monster_faction.json
@@ -0,0 +1,9 @@
+[
+  {
+    "type": "MONSTER_FACTION",
+    "name": "PrepNet",
+    "friendly": [ "Prepnet_Phyle", "human", "PrepNet", "player" ],
+    "neutral": "herbivore",
+    "by_mood": [ "insect", "small_animal" ]
+  }
+]
diff --git a/data/mods/Aftershock/mobs/afs_monster_groups.json b/data/mods/Aftershock/mobs/afs_monster_groups.json
index 33fc04f1bee46..a6334e828390f 100644
--- a/data/mods/Aftershock/mobs/afs_monster_groups.json
+++ b/data/mods/Aftershock/mobs/afs_monster_groups.json
@@ -8,5 +8,21 @@
     "type": "monstergroup",
     "name": "GROUP_ZOMBIE_MID",
     "monsters": [ { "monster": "mon_afs_headless_horror", "freq": 10, "cost_multiplier": 20 } ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_PrepNet",
+    "default": "afs_mon_cyber_mastiff",
+    "is_animal": true,
+    "monsters": [
+      { "monster": "mon_cat", "freq": 100, "cost_multiplier": 0 },
+      { "monster": "mon_cat", "freq": 20, "cost_multiplier": 10, "pack_size": [ 2, 8 ] },
+      { "monster": "afs_mon_cyber_mastiff", "freq": 15, "cost_multiplier": 25, "pack_size": [ 1, 6 ] },
+      { "monster": "afs_mon_cyber_mastiff_pup", "freq": 1, "cost_multiplier": 25, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_chicken", "freq": 50, "cost_multiplier": 10, "pack_size": [ 1, 16 ] },
+      { "monster": "mon_cow", "freq": 50, "cost_multiplier": 25, "pack_size": [ 1, 8 ] },
+      { "monster": "mon_horse", "freq": 50, "cost_multiplier": 25, "pack_size": [ 1, 4 ] },
+      { "monster": "mon_sheep", "freq": 50, "cost_multiplier": 25, "pack_size": [ 1, 12 ] }
+    ]
   }
 ]
diff --git a/data/mods/Aftershock/modinfo.json b/data/mods/Aftershock/modinfo.json
index e2ffc58084d9b..33bb0f15a29cd 100644
--- a/data/mods/Aftershock/modinfo.json
+++ b/data/mods/Aftershock/modinfo.json
@@ -4,7 +4,7 @@
     "ident": "aftershock",
     "name": "Aftershock",
     "authors": [ "Esther", "Coolthulu" ],
-    "maintainers": [ "Esther" ],
+    "maintainers": [ "Maleclypse" ],
     "description": "Drifts the game away from realism and more towards sci-fi.",
     "category": "content",
     "dependencies": [ "dda" ]
diff --git a/data/mods/Aftershock/mutations/afs_mutations.json b/data/mods/Aftershock/mutations/afs_mutations.json
new file mode 100644
index 0000000000000..f20602050727b
--- /dev/null
+++ b/data/mods/Aftershock/mutations/afs_mutations.json
@@ -0,0 +1,12 @@
+[
+  {
+    "type": "mutation",
+    "id": "PrepNet",
+    "name": "PrepNet Tag",
+    "points": 0,
+    "valid": false,
+    "description": "NPC trait that makes monsters see it as a Prepnet.  It is a bug if you have it.",
+    "player_display": false,
+    "threshold": true
+  }
+]
diff --git a/data/mods/Aftershock/npcs/afs_classes.json b/data/mods/Aftershock/npcs/afs_classes.json
new file mode 100644
index 0000000000000..1caf26f2ea86f
--- /dev/null
+++ b/data/mods/Aftershock/npcs/afs_classes.json
@@ -0,0 +1,45 @@
+[
+  {
+    "type": "npc",
+    "id": "prepnet_gardener",
+    "name_suffix": "Gardener",
+    "class": "afs_prepnet_gardener",
+    "attitude": 0,
+    "mission": 7,
+    "chat": "TALK_PrepNet_gardener_1",
+    "mission_offered": "MISSION_PrepNet_gardener_FUR_1",
+    "faction": "Prepnet_Phyle"
+  },
+  {
+    "type": "npc_class",
+    "id": "afs_prepnet_gardener",
+    "name": "Gardener",
+    "job_description": "When the end came, we were ready. Now I grow food for my phyle.",
+    "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
+    "skills": [
+      { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 4, 2 ] }, { "rng": [ -4, -1 ] } ] } ] } },
+      { "skill": "survival", "bonus": { "rng": [ 2, 4 ] } },
+      { "skill": "fabrication", "bonus": { "rng": [ 1, 3 ] } },
+      { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
+      { "skill": "gun", "bonus": { "rng": [ 3, 6 ] } }
+    ],
+    "common": false,
+    "worn_override": "afs_gardener_worn",
+    "carry_override": "afs_gardener_carried",
+    "weapon_override": "afs_gardener_wield",
+    "shopkeeper_item_group": "afs_gardener_misc",
+    "bionics": [
+      { "id": "bio_carbon", "chance": 100 },
+      { "id": "bio_claws", "chance": 100 },
+      { "id": "bio_dex_enhancer", "chance": 100 },
+      { "id": "bio_laser", "chance": 100 },
+      { "id": "bio_membrane", "chance": 100 },
+      { "id": "bio_power_storage_mkII", "chance": 100 },
+      { "id": "bio_purifier", "chance": 100 },
+      { "id": "bio_radscrubber", "chance": 100 },
+      { "id": "bio_sunglasses", "chance": 100 },
+      { "id": "bio_tools", "chance": 100 },
+      { "id": "bio_torsionratchet", "chance": 100 }
+    ]
+  }
+]
diff --git a/data/mods/Aftershock/npcs/afs_factions.json b/data/mods/Aftershock/npcs/afs_factions.json
new file mode 100644
index 0000000000000..4df287e763e82
--- /dev/null
+++ b/data/mods/Aftershock/npcs/afs_factions.json
@@ -0,0 +1,73 @@
+[
+  {
+    "type": "faction",
+    "id": "Prepnet_Phyle",
+    "name": "PrepNet Phyle",
+    "mon_faction": "PrepNet",
+    "likes_u": 0,
+    "respects_u": 0,
+    "known_by_u": false,
+    "size": 15,
+    "power": 20,
+    "currency": "crypto_coin",
+    "food_supply": 115200,
+    "wealth": 75000,
+    "relations": {
+      "free_merchants": {
+        "kill on sight": false,
+        "watch your back": false,
+        "share my stuff": false,
+        "guard your stuff": false,
+        "lets you in": true,
+        "defends your space": false,
+        "knows your voice": true
+      },
+      "old_guard": {
+        "kill on sight": false,
+        "watch your back": false,
+        "share my stuff": false,
+        "guard your stuff": false,
+        "lets you in": false,
+        "defends your space": false,
+        "knows your voice": false
+      },
+      "tacoma_commune": {
+        "kill on sight": false,
+        "watch your back": false,
+        "share my stuff": false,
+        "guard your stuff": false,
+        "lets you in": true,
+        "defends your space": false
+      },
+      "lobby_beggars": {
+        "kill on sight": false,
+        "watch your back": false,
+        "share my stuff": false,
+        "guard your stuff": true,
+        "lets you in": false,
+        "defends your space": false
+      },
+      "no_faction": {
+        "kill on sight": false,
+        "watch your back": false,
+        "share my stuff": false,
+        "guard your stuff": false,
+        "lets you in": false,
+        "defends your space": false,
+        "knows your voice": true
+      },
+      "wasteland_scavengers": {
+        "kill on sight": false,
+        "watch your back": true,
+        "share my stuff": false,
+        "guard your stuff": true,
+        "lets you in": false,
+        "defends your space": false,
+        "knows your voice": true
+      },
+      "hells_raiders": { "kill on sight": true },
+      "marloss": { "kill on sight": true }
+    },
+    "description": "A group of bionic preppers who had expected the collapse of the economy and global chaos, instead they were slightly more ready than others for the Cataclysm."
+  }
+]
diff --git a/data/mods/Aftershock/npcs/afs_npc.json b/data/mods/Aftershock/npcs/afs_npc.json
new file mode 100644
index 0000000000000..8b5617036d7ee
--- /dev/null
+++ b/data/mods/Aftershock/npcs/afs_npc.json
@@ -0,0 +1,14 @@
+[
+  {
+    "type": "npc",
+    "id": "afs_gardener_cyborg",
+    "//": "PrepNet Phyle Gardener.",
+    "name_suffix": "Gardener",
+    "class": "afs_prepnet_gardener",
+    "attitude": 1,
+    "mission": 0,
+    "chat": "TALK_PrepNet_gardener_1",
+    "faction": "Prepnet_Phyle",
+    "mon_faction": "PrepNet"
+  }
+]
diff --git a/data/mods/Aftershock/npcs/afs_prepnet_dialogue.json b/data/mods/Aftershock/npcs/afs_prepnet_dialogue.json
new file mode 100644
index 0000000000000..30d7c882e5e81
--- /dev/null
+++ b/data/mods/Aftershock/npcs/afs_prepnet_dialogue.json
@@ -0,0 +1,224 @@
+[
+  {
+    "type": "effect_type",
+    "id": "u_met_prepnet_gardener"
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_PrepNet_gardener_1",
+    "dynamic_line": {
+      "u_has_var": "u_met_prepnet_gardener",
+      "type": "general",
+      "context": "meeting",
+      "value": "yes",
+      "yes": [ "Hey there.", "Hello.", "How are you?", "Welcome!", "How's the weather?" ],
+      "no": "Howdy!  You seem new, what brings you here?"
+    },
+    "responses": [
+      {
+        "text": "Who are you?",
+        "effect": { "u_add_var": "u_met_prepnet_gardener", "type": "general", "context": "meeting", "value": "yes" },
+        "condition": { "not": { "u_has_var": "u_met_prepnet_gardener", "type": "general", "context": "meeting", "value": "yes" } },
+        "topic": "TALK_PrepNet_gardener_firstmeet"
+      },
+      {
+        "text": "What is this place?",
+        "condition": { "u_has_var": "u_met_prepnet_gardener", "type": "general", "context": "meeting", "value": "yes" },
+        "topic": "TALK_PrepNet_gardener_place"
+      },
+      {
+        "text": "What's your story?",
+        "condition": { "u_has_var": "u_met_prepnet_gardener", "type": "general", "context": "meeting", "value": "yes" },
+        "topic": "TALK_PrepNet_gardener_ask_past"
+      },
+      {
+        "text": "How are things here?",
+        "condition": { "u_has_var": "u_met_prepnet_gardener", "type": "general", "context": "meeting", "value": "yes" },
+        "topic": "TALK_PrepNet_gardener_ask_mood"
+      },
+      {
+        "text": "Can I do anything for you?",
+        "condition": { "u_has_var": "u_met_prepnet_gardener", "type": "general", "context": "meeting", "value": "yes" },
+        "topic": "TALK_MISSION_LIST"
+      },
+      { "text": "How do I join the phyle?", "topic": "TALK_PrepNet_gardener_ask_membership" },
+      { "text": "I'm going on my way now.", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_PrepNet_gardener_firstmeet",
+    "dynamic_line": "I'm a gardener for PrepNet Phyle.  Who are you?",
+    "responses": [
+      { "text": "I am a beggar who really needs something to eat.", "topic": "TALK_PrepNet_gardener_food" },
+      { "text": "I am just a fellow survivor.", "topic": "TALK_PrepNet_gardener_1" },
+      { "text": "I'm bringing order back to the land.", "topic": "TALK_PrepNet_gardener_1" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_PrepNet_gardener_place",
+    "dynamic_line": "This is a PrepNet Phyle orchard. We were a community of survivalists gathering resources to prepare for climate change, but it left us better prepared for what actually happened than most.",
+    "responses": [
+      { "text": "Can you give me something to eat then?", "topic": "TALK_PrepNet_gardener_food" },
+      { "text": "What can I buy here?", "topic": "TALK_PrepNet_gardener_ask_goods" },
+      { "text": "Oh, okay.", "topic": "TALK_PrepNet_gardener_1" },
+      { "text": "Only the insane will prosper, I guess.", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_PrepNet_gardener_food",
+    "dynamic_line": "This food has to go back to our core communities. But maybe we can trade some food for services",
+    "responses": [
+      { "text": "I can pay.", "topic": "TALK_PrepNet_gardener_ask_food_bribe" },
+      { "text": "What do you need done?", "topic": "TALK_MISSION_LIST" },
+      { "text": "Well I'm heading out then", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_PrepNet_gardener_ask_food_bribe",
+    "dynamic_line": "You have to earn the right to trade with us. Plus we created our own currency before the cataclysm",
+    "responses": [
+      { "text": "It was worth a try.", "topic": "TALK_PrepNet_gardener_1" },
+      { "text": "What kind of currency?", "topic": "TALK_PrepNet_gardener_currency" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_PrepNet_gardener_ask_membership",
+    "dynamic_line": "This is just an outpost, you'd have to find our main camp and currently we don't want you to.",
+    "responses": [ { "text": "I didn't want to join your club anyway.", "topic": "TALK_PrepNet_gardener_1" } ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_PrepNet_gardener_ask_goods",
+    "dynamic_line": "Here? Fruits and berries. Maybe the occasional piece of farm equipment, but you need crypto coins",
+    "responses": [
+      { "text": "Ok.", "topic": "TALK_PrepNet_gardener_1" },
+      { "text": "What are crypto coins?", "topic": "TALK_PrepNet_gardener_currency" },
+      { "text": "What can I buy here?", "effect": "start_trade", "topic": "TALK_PrepNet_gardener_1" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_PrepNet_gardener_ask_past",
+    "dynamic_line": "I got introduced to the movement through Mutual Aid Society. From there it became an all consuming part of my life to prepare for a post consumption world. It seems to have worked better for us than for many others.",
+    "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_PrepNet_gardener_1" } ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_PrepNet_gardener_ask_mood",
+    "dynamic_line": "It can get lonely out here between caravans.  But there's plenty of work and my Cyber Mastiffs.  If a horde comes through we hunker down in a nearby shelter if it's too large for us.",
+    "responses": [ { "text": "I'm glad you stay busy.", "topic": "TALK_PrepNet_gardener_1" } ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_PrepNet_gardener_currency",
+    "dynamic_line": "We use crypto coins for money here. They were a pre cataclysm attempt to abstract money even further and create electronic cash. We figured we'd keep it up. Barter only gets you so far.",
+    "responses": [
+      { "text": "Oh, okay.", "topic": "TALK_PrepNet_gardener_1" },
+      { "text": "What can I buy here?", "effect": "start_trade", "topic": "TALK_PrepNet_gardener_1" }
+    ]
+  },
+  {
+    "id": "MISSION_PrepNet_gardener_FUR_1",
+    "type": "mission_definition",
+    "name": "Big Game Hunting",
+    "description": "Find 50 fur pelts.",
+    "goal": "MGOAL_FIND_ITEM",
+    "difficulty": 1,
+    "value": 0,
+    "item": "fur",
+    "count": 50,
+    "origins": [ "ORIGIN_SECONDARY" ],
+    "followup": "MISSION_PrepNet_gardener_FOOD_2",
+    "dialogue": {
+      "describe": "I need 50 fur pelts.",
+      "offer": "I've got to maintain the orchard but at nights I work on prepping winter clothes.  Could you find about... 50 fur pelts for me?",
+      "accepted": "Don't forget to tell me when you have them.",
+      "rejected": "It's okay, I can do without them.  Just let me know if you reconsider.",
+      "advice": "There's a lot of places to look.  The entire outdoors is full of wild animals.",
+      "inquire": "How is the search going?  Have you found'em?",
+      "success": "I really apreciate your help.  Don't worry, you won't leave empty-handed.",
+      "success_lie": "Thanks for trying...  I guess.",
+      "failure": "Don't worry about it, it's not that important."
+    },
+    "end": { "effect": [ { "u_buy_item": "crypto_coin", "count": 6 } ] }
+  },
+  {
+    "id": "MISSION_PrepNet_gardener_FOOD_2",
+    "type": "mission_definition",
+    "name": "Bread",
+    "description": "Find 50 flour.",
+    "goal": "MGOAL_FIND_ITEM",
+    "difficulty": 2,
+    "value": 0,
+    "item": "flour",
+    "count": 50,
+    "origins": [ "ORIGIN_SECONDARY" ],
+    "followup": "MISSION_PrepNet_gardener_FOOD_3",
+    "dialogue": {
+      "describe": "I need 50 flour.",
+      "offer": "Flour would let me break the monotony of fruit and meats.",
+      "accepted": "Thanks for accepting this task.  Otherwise I might kill a stranger for a sandwich. Just kidding.",
+      "rejected": "Just let me know if you change your mind.",
+      "advice": "Flour is not that hard to find.  I'd look for them in residental areas and professional kitchens or bakeries.",
+      "inquire": "Have you found the flour?",
+      "success": "Thank you for your help.  Here's your reward.",
+      "success_lie": "Thanks for trying...  I guess.",
+      "failure": "It's not a big deal, it isn't that urgent."
+    },
+    "end": { "effect": [ { "u_buy_item": "crypto_coin", "count": 5 } ] }
+  },
+  {
+    "id": "MISSION_PrepNet_gardener_FOOD_3",
+    "type": "mission_definition",
+    "name": "Gallon Jugs",
+    "description": "Find 5 gallon jugs.",
+    "goal": "MGOAL_FIND_ITEM",
+    "difficulty": 1,
+    "value": 0,
+    "item": "jug_plastic",
+    "count": 5,
+    "origins": [ "ORIGIN_SECONDARY" ],
+    "followup": "MISSION_PrepNet_gardener_QUEST_4",
+    "dialogue": {
+      "describe": "I need storage for various liquid products when the fruits come in.",
+      "offer": "Every season we produce so much fruit. Some of it will be turned into juice and some into alcohol. I need easy containers to load it on the caravan.",
+      "accepted": "Thank you for accepting.  I'm almost out after the last caravan.",
+      "rejected": "I guess I'll have to make stomach waterskins.",
+      "advice": "Gallon jugs are not that rare to find.  They are commonly found in kitchens.",
+      "inquire": "Do you have those jugs now?",
+      "success": "I am grateful for the help you've done. I have one more task to do.",
+      "success_lie": "Thanks for trying...  I guess.",
+      "failure": "Don't worry about it, it's not that important."
+    },
+    "end": { "effect": [ { "u_buy_item": "crypto_coin", "count": 3 } ] }
+  },
+  {
+    "id": "MISSION_PrepNet_gardener_QUEST_4",
+    "type": "mission_definition",
+    "name": "Faulty CBMs",
+    "description": "Find 5 faulty CBMs.",
+    "goal": "MGOAL_FIND_ITEM",
+    "difficulty": 3,
+    "value": 0,
+    "item": "burnt_out_bionic",
+    "count": 5,
+    "origins": [ "ORIGIN_SECONDARY" ],
+    "dialogue": {
+      "describe": "We have the ability to manufacture CBMs but lack resources.",
+      "offer": "If you can bring me faulty CBMs we can recycle them into new ones.",
+      "accepted": "Thank you for accepting.  You're really making yourself useful to the phyle.",
+      "rejected": "These materials are often in dangerous areas. I understand your decision.",
+      "advice": "Zombie scientists, technicians, shocker zombies.  These are not undertaken lightly.",
+      "inquire": "Do you have those CBMs now?",
+      "success": "I am grateful for the help you've done. I think we might be able to introduce you to others soon.",
+      "success_lie": "Thanks for trying...  I guess.",
+      "failure": "Don't worry about it, it's not that important."
+    },
+    "end": { "effect": [ { "u_buy_item": "crypto_coin", "count": 12 } ] }
+  }
+]
diff --git a/data/mods/Aftershock/player/afs_bionics.json b/data/mods/Aftershock/player/afs_bionics.json
index 1d9e4eb1b0882..17e0bc54e1fc7 100644
--- a/data/mods/Aftershock/player/afs_bionics.json
+++ b/data/mods/Aftershock/player/afs_bionics.json
@@ -1,12 +1,25 @@
 [
   {
     "id": "bn_bio_solar",
-    "//": "That's right, it's taken from Bright Nights. Sue me!",
     "type": "bionic",
     "name": "Solar Panels",
     "description": "Installed on your back is a set of retractable, reinforced solar panels resembling angular butterfly wings.  When in direct sunlight, they will automatically deploy and slowly recharge your power level.",
     "occupied_bodyparts": [ [ "TORSO", 10 ] ],
-    "flags": [ "BIONIC_POWER_SOURCE" ]
+    "fuel_options": [ "sunlight" ],
+    "fuel_efficiency": 1.0,
+    "time": 1,
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ]
+  },
+  {
+    "id": "afs_bio_wind_turbine",
+    "type": "bionic",
+    "name": "Wind Turbines",
+    "description": "Installed on your body is a set of small retractable wind turbines.  When activated, they will deploy and slowly harvest wind power to recharge your power level.",
+    "occupied_bodyparts": [ [ "TORSO", 10 ] ],
+    "fuel_options": [ "wind" ],
+    "fuel_efficiency": 0.25,
+    "time": 1,
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ]
   },
   {
     "id": "afs_bio_precision_solderers",
diff --git a/data/mods/Aftershock/recipes/afs_comestible_recipes.json b/data/mods/Aftershock/recipes/afs_comestible_recipes.json
index abeeab4538f01..2b7d86c21c838 100644
--- a/data/mods/Aftershock/recipes/afs_comestible_recipes.json
+++ b/data/mods/Aftershock/recipes/afs_comestible_recipes.json
@@ -13,6 +13,19 @@
     "tools": [ [ "rolling_pin" ] ],
     "components": [ [ [ "flour", 2 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "butter",
+    "result_mult": 1,
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_DAIRY",
+    "skill_used": "cooking",
+    "difficulty": 3,
+    "time": "15 m",
+    "qualities": [ { "id": "CHURN", "level": 2 } ],
+    "autolearn": true,
+    "components": [ [ [ "milk_raw", 45 ] ], [ [ "salt", 15 ] ] ]
+  },
   {
     "type": "recipe",
     "result": "flatbread",
diff --git a/data/mods/Animatronics/snippets.json b/data/mods/Animatronics/snippets.json
index e5a18c8933ea1..3a350f2c0a818 100644
--- a/data/mods/Animatronics/snippets.json
+++ b/data/mods/Animatronics/snippets.json
@@ -3,40 +3,26 @@
     "type": "snippet",
     "category": "flier",
     "text": [
-      "This is a crumpled old advertisement for a local pizzaria.  It depicts smiling kids and some sort of animal mascot.  The flier reads \"Eat, rock, party, play.\""
+      {
+        "id": "flier_animatronics_1",
+        "text": "This is a crumpled old advertisement for a local pizzaria.  It depicts smiling kids and some sort of animal mascot.  The flier reads \"Eat, rock, party, play.\""
+      },
+      {
+        "id": "flier_animatronics_2",
+        "//": "Reference to 11 Drunk Guys Play FNAF.",
+        "text": "This is a crumpled old advertisement for a local pizzaria.  It depicts smiling kids and some sort of animal mascot.  The flier reads \"Eat, rock, party, play!\"  Someone has crudely scrawled underneath it \"Smoke weed every day!\""
+      }
     ]
   },
   {
     "type": "snippet",
-    "category": "flier",
-    "//": "Reference to 11 Drunk Guys Play FNAF.",
+    "category": "note",
     "text": [
-      "This is a crumpled old advertisement for a local pizzaria.  It depicts smiling kids and some sort of animal mascot.  The flier reads \"Eat, rock, party, play!\"  Someone has crudely scrawled underneath it \"Smoke weed every day!\""
+      { "id": "note_animatronics_1", "text": "\"This is a kids place, why is their mascot so stacked!?\"" },
+      { "id": "note_animatronics_2", "text": "\"NO BAD ROBOT I DON'T WANT PIZZA.\"" },
+      { "id": "note_animatronics_3", "text": "\"Fuckin haunted pizza joint, just burn it down\"" },
+      { "id": "note_animatronics_4", "text": "\"Pizza, arcade tokens, horrible death, got my bases covered.\"" },
+      { "id": "note_animatronics_5", "text": "\"leg eaten by zombie robot furry help\"" }
     ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"This is a kids place, why is their mascot so stacked!?\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"NO BAD ROBOT I DON'T WANT PIZZA.\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Fuckin haunted pizza joint, just burn it down\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Pizza, arcade tokens, horrible death, got my bases covered.\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"leg eaten by zombie robot furry help\"" ]
   }
 ]
diff --git a/data/mods/DinoMod/snippets.json b/data/mods/DinoMod/snippets.json
index 05b94cbe66f53..fa57f769cb1e2 100644
--- a/data/mods/DinoMod/snippets.json
+++ b/data/mods/DinoMod/snippets.json
@@ -3,32 +3,24 @@
     "type": "snippet",
     "category": "flier",
     "text": [
-      "This is an advertisement for a local wildlife exhibit, claiming to have new and exciting animals on display.  Strangely, the only imagery on it is a stylized silhouette of a T. Rex.  The flier reads \"Witness the rebirth of the extinct, grand opening this week!\""
+      {
+        "id": "flier_dinomod_1",
+        "text": "This is an advertisement for a local wildlife exhibit, claiming to have new and exciting animals on display.  Strangely, the only imagery on it is a stylized silhouette of a T. Rex.  The flier reads \"Witness the rebirth of the extinct, grand opening this week!\""
+      }
     ]
   },
   {
     "type": "snippet",
     "category": "note",
-    "text": [ "\"SWAMPS BAD TEETH HUGE OHGOD\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Why is that place just fucking crawling with lizards?\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Fellow scaly bretheren!  Tonight we feast on the hairless apes.\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"where's some .700 t-rex medicine when you need it?\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"So is this what happens when you stray off the path and step on a butterfly?\"" ]
+    "text": [
+      { "id": "note_dinomod_1", "text": "\"SWAMPS BAD TEETH HUGE OHGOD\"" },
+      { "id": "note_dinomod_2", "text": "\"Why is that place just fucking crawling with lizards?\"" },
+      { "id": "note_dinomod_3", "text": "\"Fellow scaly bretheren!  Tonight we feast on the hairless apes.\"" },
+      { "id": "note_dinomod_4", "text": "\"where's some .700 t-rex medicine when you need it?\"" },
+      {
+        "id": "note_dinomod_5",
+        "text": "\"So is this what happens when you stray off the path and step on a butterfly?\""
+      }
+    ]
   }
 ]
diff --git a/data/mods/EW_Pack/ew_weapons.json b/data/mods/EW_Pack/ew_weapons.json
index 0138feee38c46..67069b1431814 100644
--- a/data/mods/EW_Pack/ew_weapons.json
+++ b/data/mods/EW_Pack/ew_weapons.json
@@ -18,7 +18,7 @@
     "to_hit": -1,
     "dispersion": 75,
     "durability": 9,
-    "burst": 12,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 12 ] ],
     "default_mods": [ "red_dot_sight" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -145,7 +145,7 @@
     "price": 420000,
     "dispersion": 120,
     "durability": 6,
-    "burst": 8
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 8 ] ]
   },
   {
     "id": "cw-24m_hack",
@@ -157,7 +157,7 @@
     "price": 420000,
     "dispersion": 120,
     "durability": 6,
-    "burst": 8
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 8 ] ]
   },
   {
     "id": "cwd-63",
@@ -213,7 +213,7 @@
     "dispersion": 150,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 30,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 30 ] ],
     "clip_size": 90,
     "reload": 300,
     "valid_mod_locations": [ [ "accessories", 2 ], [ "magazine", 2 ], [ "sling", 1 ], [ "underbarrel", 1 ] ],
diff --git a/data/mods/FictonalWeapons/snippets.json b/data/mods/FictonalWeapons/snippets.json
index 7cb94898e5d62..8fceccef41cb8 100644
--- a/data/mods/FictonalWeapons/snippets.json
+++ b/data/mods/FictonalWeapons/snippets.json
@@ -2,26 +2,18 @@
   {
     "type": "snippet",
     "category": "note",
-    "text": [ "\"Gun.  Sword.  Gunsword.  Screw bayonets, this is way more awesome.\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Not sure if wielding this thing makes me feel like a bodybuilder or a theoretical physicist.  Both?\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"This ain't your grandaddy's .50 cal hand cannon!\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Nice pistol!  Which trigger fires the flamer?\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Why in the name of fuck did I slap a crossbow on this handgun.\"" ]
+    "text": [
+      { "id": "note_fictional_weapons_1", "text": "\"Gun.  Sword.  Gunsword.  Screw bayonets, this is way more awesome.\"" },
+      {
+        "id": "note_fictional_weapons_2",
+        "text": "\"Not sure if wielding this thing makes me feel like a bodybuilder or a theoretical physicist.  Both?\""
+      },
+      { "id": "note_fictional_weapons_3", "text": "\"This ain't your grandaddy's .50 cal hand cannon!\"" },
+      { "id": "note_fictional_weapons_4", "text": "\"Nice pistol!  Which trigger fires the flamer?\"" },
+      {
+        "id": "note_fictional_weapons_5",
+        "text": "\"Why in the name of fuck did I slap a crossbow on this handgun.\""
+      }
+    ]
   }
 ]
diff --git a/data/mods/Magiclysm/Spells/classless.json b/data/mods/Magiclysm/Spells/classless.json
index 92415661fa25f..237e84768340a 100644
--- a/data/mods/Magiclysm/Spells/classless.json
+++ b/data/mods/Magiclysm/Spells/classless.json
@@ -156,5 +156,50 @@
     "base_energy_cost": 675,
     "energy_source": "MANA",
     "spell_class": "NONE"
+  },
+  {
+    "id": "acid_resistance",
+    "type": "SPELL",
+    "name": "Acid Resistance",
+    "description": "Protects the user from acid.",
+    "valid_targets": [ "none" ],
+    "min_range": 0,
+    "max_range": 0,
+    "min_damage": 1,
+    "max_damage": 1,
+    "effect": "spawn_item",
+    "effect_str": "acid_res_aura",
+    "energy_source": "MANA",
+    "spell_class": "NONE",
+    "flags": [ "CONCENTRATE", "NO_LEGS" ],
+    "difficulty": 4,
+    "max_level": 15,
+    "base_casting_time": 200,
+    "base_energy_cost": 150,
+    "min_duration": 84000,
+    "max_duration": 360000,
+    "duration_increment": 18000,
+    "learn_spells": { "acid_resistance_greater": 15 }
+  },
+  {
+    "id": "acid_resistance_greater",
+    "type": "SPELL",
+    "name": "Greater Acid Resistance",
+    "description": "Protects the user from acid.",
+    "valid_targets": [ "none" ],
+    "min_range": 0,
+    "max_range": 0,
+    "min_damage": 1,
+    "max_damage": 1,
+    "effect": "spawn_item",
+    "effect_str": "acid_res_aura_greater",
+    "energy_source": "MANA",
+    "spell_class": "NONE",
+    "flags": [ "CONCENTRATE", "NO_LEGS" ],
+    "difficulty": 7,
+    "max_level": 1,
+    "base_casting_time": 200,
+    "base_energy_cost": 250,
+    "min_duration": 180000
   }
 ]
diff --git a/data/mods/Magiclysm/items/alchemy_items.json b/data/mods/Magiclysm/items/alchemy_items.json
index f25a2672b98a6..6aade7e4de53f 100644
--- a/data/mods/Magiclysm/items/alchemy_items.json
+++ b/data/mods/Magiclysm/items/alchemy_items.json
@@ -41,6 +41,15 @@
     "name_plural": "copper infusion bracelets",
     "description": "This bracelet has runes engraved on it. You sense a faint air of mysticism when you look at it. It would be useful for imbuing mana into material."
   },
+  {
+    "id": "silver_infuser",
+    "copy-from": "silver_bracelet",
+    "type": "ARMOR",
+    "qualities": [ [ "MANA_INFUSE", 2 ] ],
+    "name": "silver infusion bracelet",
+    "name_plural": "silver infusion bracelets",
+    "description": "This bracelet has runes engraved on it.  You sense a faint air of mysticism when you look at it.  It would be useful for imbuing mana into material."
+  },
   {
     "id": "copper_circlet",
     "type": "ARMOR",
diff --git a/data/mods/Magiclysm/items/black_dragon_items.json b/data/mods/Magiclysm/items/black_dragon_items.json
index e2dd300488527..6d8646130231a 100644
--- a/data/mods/Magiclysm/items/black_dragon_items.json
+++ b/data/mods/Magiclysm/items/black_dragon_items.json
@@ -249,5 +249,182 @@
     "material_thickness": 2,
     "environmental_protection": 1,
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "boots_xlblack_dragon_scale",
+    "copy-from": "boots_black_dragon_scale",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL black dragonscale boots", "str_pl": "pairs of XL black dragonscale boots" },
+    "description": "Massive boots made of black dragonscale, modified to fit even the strangest of bodies.  Very protective, and surprisingly light.",
+    "weight": "1545 g",
+    "volume": "6250 ml",
+    "encumbrance": 40,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "boots_xlblack_dragon_hide",
+    "copy-from": "boots_black_dragon_hide",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL black dragonhide boots", "str_pl": "pairs of XL black dragonhide boots" },
+    "description": "Massive boots made of black dragonhide, modified to fit even the strangest of bodies.  Very protective, and surprisingly light.",
+    "weight": "955 g",
+    "volume": "6250 ml",
+    "encumbrance": 28,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "helmet_xlblack_dragon_scale",
+    "copy-from": "helmet_black_dragon_scale",
+    "type": "ARMOR",
+    "name": "XL black dragonscale helmet",
+    "description": "A massive helmet made from black dragonscale, held together with black dragonhide.  It comes equipped with a full face visor and is large enough to fit even the strangest of heads.",
+    "weight": "1256 g",
+    "volume": "4500 ml",
+    "encumbrance": 42,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "helmet_xlblack_dragon_hide",
+    "copy-from": "helmet_black_dragon_hide",
+    "type": "ARMOR",
+    "name": "XL black dragonhide helmet",
+    "description": "A massive helmet made from black dragonhide.  It protects your head well, and doesn't cover your face, but is large enough to fit even the strangest of heads.",
+    "weight": "815 g",
+    "volume": "4500 ml",
+    "encumbrance": 42,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "suit_xlblack_dragon_scale",
+    "copy-from": "suit_black_dragon_scale",
+    "type": "ARMOR",
+    "name": "XL black dragonscale armor",
+    "description": "A massive full suit of black dragon scale mail.  It comes with all the accoutrements that cover your torso, legs, and arms; sized to fit even the strangest of bodies.",
+    "weight": "6250 g",
+    "volume": "18 L",
+    "encumbrance": 35,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY" ]
+  },
+  {
+    "id": "suit_xlblack_dragon_hide",
+    "copy-from": "suit_black_dragon_hide",
+    "type": "ARMOR",
+    "name": "XL black dragonhide armor",
+    "description": "A massive full suit of black dragonhide armor.  It comes with all the accoutrements that cover your torso, legs, and arms; sized to fit even the strangest of bodies.",
+    "weight": "5500 g",
+    "volume": "18 L",
+    "encumbrance": 28,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY" ]
+  },
+  {
+    "id": "gauntlets_xlblack_dragon_scale",
+    "copy-from": "gauntlets_black_dragon_scale",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL black dragonscale gauntlets", "str_pl": "pairs of XL black dragonscale gauntlets" },
+    "description": "A pair of heavy-duty gauntlets made of black dragonscale that covers your hands, or whatever you use as hands.",
+    "weight": "680 g",
+    "volume": "2 L",
+    "encumbrance": 30,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "gloves_xlblack_dragon_hide",
+    "copy-from": "gloves_black_dragon_hide",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL black dragonhide gloves", "str_pl": "pairs of XL black dragonhide gloves" },
+    "description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.  Sized to fit even the strangest of anatomy.",
+    "weight": "430 g",
+    "volume": "1500 ml",
+    "encumbrance": 18,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "boots_xlblack_dragon_scale",
+    "copy-from": "boots_black_dragon_scale",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL black dragonscale boots", "str_pl": "pairs of XL black dragonscale boots" },
+    "description": "Massive boots made of black dragonscale, modified to fit even the strangest of bodies.  Very protective, and surprisingly light.",
+    "weight": "1545 g",
+    "volume": "6250 ml",
+    "encumbrance": 40,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "boots_xlblack_dragon_hide",
+    "copy-from": "boots_black_dragon_hide",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL black dragonhide boots", "str_pl": "pairs of XL black dragonhide boots" },
+    "description": "Massive boots made of black dragonhide, modified to fit even the strangest of bodies.  Very protective, and surprisingly light.",
+    "weight": "955 g",
+    "volume": "6250 ml",
+    "encumbrance": 28,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "helmet_xlblack_dragon_scale",
+    "copy-from": "helmet_black_dragon_scale",
+    "type": "ARMOR",
+    "name": "XL black dragonscale helmet",
+    "description": "A massive helmet made from black dragonscale, held together with black dragonhide.  It comes equipped with a full face visor and is large enough to fit even the strangest of heads.",
+    "weight": "1256 g",
+    "volume": "4500 ml",
+    "encumbrance": 42,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "helmet_xlblack_dragon_hide",
+    "copy-from": "helmet_black_dragon_hide",
+    "type": "ARMOR",
+    "name": "XL black dragonhide helmet",
+    "description": "A massive helmet made from black dragonhide.  It protects your head well, and doesn't cover your face, but is large enough to fit even the strangest of heads.",
+    "weight": "815 g",
+    "volume": "4500 ml",
+    "encumbrance": 42,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "suit_xlblack_dragon_scale",
+    "copy-from": "suit_black_dragon_scale",
+    "type": "ARMOR",
+    "name": "XL black dragonscale armor",
+    "description": "A massive full suit of black dragon scale mail.  It comes with all the accoutrements that cover your torso, legs, and arms; sized to fit even the strangest of bodies.",
+    "weight": "6250 g",
+    "volume": "18 L",
+    "encumbrance": 35,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY" ]
+  },
+  {
+    "id": "suit_xlblack_dragon_hide",
+    "copy-from": "suit_black_dragon_hide",
+    "type": "ARMOR",
+    "name": "XL black dragonhide armor",
+    "description": "A massive full suit of black dragonhide armor.  It comes with all the accoutrements that cover your torso, legs, and arms; sized to fit even the strangest of bodies.",
+    "weight": "5500 g",
+    "volume": "18 L",
+    "encumbrance": 28,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY" ]
+  },
+  {
+    "id": "gauntlets_xlblack_dragon_scale",
+    "copy-from": "gauntlets_black_dragon_scale",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL black dragonscale gauntlets", "str_pl": "pairs of XL black dragonscale gauntlets" },
+    "description": "A pair of heavy-duty gauntlets made of black dragonscale that covers your hands, or whatever you use as hands.",
+    "weight": "680 g",
+    "volume": "2 L",
+    "encumbrance": 30,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "gloves_xlblack_dragon_hide",
+    "copy-from": "gloves_black_dragon_hide",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL black dragonhide gloves", "str_pl": "pairs of XL black dragonhide gloves" },
+    "description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.  Sized to fit even the strangest of anatomy.",
+    "weight": "430 g",
+    "volume": "1500 ml",
+    "price": 180000,
+    "encumbrance": 18,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
   }
 ]
diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json
index b377d5218a4fa..c31f505814bdf 100644
--- a/data/mods/Magiclysm/items/ethereal_items.json
+++ b/data/mods/Magiclysm/items/ethereal_items.json
@@ -343,5 +343,37 @@
     "initial_charges": 15,
     "max_charges": 15,
     "use_action": "WATER_PURIFIER"
+  },
+  {
+    "id": "acid_res_aura",
+    "type": "ARMOR",
+    "name": "acid resistance aura",
+    "description": "An all-encompassing, invisible layer of protection against acid.",
+    "weight": "1g",
+    "volume": "1ml",
+    "price": 3646,
+    "symbol": "o",
+    "color": "green",
+    "covers": [ "LEGS", "TORSO", "ARMS", "HANDS", "HEAD", "FEET", "MOUTH", "EYES" ],
+    "flags": [ "AURA", "SEMITANGIBLE", "OVERSIZE", "ONLY_ONE", "TRADER_AVOID", "NO_TAKEOFF", "NONCONDUCTIVE" ],
+    "relic_data": {
+      "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "ARMOR_ACID", "multiply": -0.25 } ] } ]
+    }
+  },
+  {
+    "id": "acid_res_aura_greater",
+    "type": "ARMOR",
+    "name": "greater acid resistance aura",
+    "description": "An all-encompassing, invisible layer of protection against acid.",
+    "weight": "1g",
+    "volume": "1ml",
+    "price": 3646,
+    "symbol": "o",
+    "color": "green",
+    "covers": [ "LEGS", "TORSO", "ARMS", "HANDS", "HEAD", "FEET", "MOUTH", "EYES" ],
+    "flags": [ "AURA", "SEMITANGIBLE", "OVERSIZE", "ONLY_ONE", "TRADER_AVOID", "NO_TAKEOFF", "NONCONDUCTIVE" ],
+    "relic_data": {
+      "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "ARMOR_ACID", "multiply": -0.6 } ] } ]
+    }
   }
 ]
diff --git a/data/mods/Magiclysm/items/spell_scrolls.json b/data/mods/Magiclysm/items/spell_scrolls.json
index 60f149842224f..9056ceab8cbfe 100644
--- a/data/mods/Magiclysm/items/spell_scrolls.json
+++ b/data/mods/Magiclysm/items/spell_scrolls.json
@@ -640,6 +640,14 @@
     "id": "spell_scroll_lava_bomb",
     "name": "Scroll of Lava Bomb",
     "description": "You tear up the ground beneath you to fire a lava bomb: a globe of lava surrounded by hot, solid rock.  It shatters upon impact, spraying shards of rock and lava everywhere.",
-    "use_action": { "type": "learn_spell", "spells": [ "lava_bomb" ] }
+    "use_action": { "type": "learn_spell", "spells": [ "lava_bomb_main" ] }
+  },
+  {
+    "type": "GENERIC",
+    "copy-from": "spell_scroll",
+    "id": "spell_scroll_acid_resistance",
+    "name": "Scroll of Acid Resistance",
+    "description": "This spell creates an invisible aura to protect you from acid.",
+    "use_action": { "type": "learn_spell", "spells": [ "acid_resistance" ] }
   }
 ]
diff --git a/data/mods/Magiclysm/recipes/alchemy.json b/data/mods/Magiclysm/recipes/alchemy.json
index 9ea8bf71ed497..a3341267fb08f 100644
--- a/data/mods/Magiclysm/recipes/alchemy.json
+++ b/data/mods/Magiclysm/recipes/alchemy.json
@@ -17,5 +17,22 @@
     "skills_required": [ "spellcraft", 2 ],
     "book_learn": [ [ "black_dragons", 2 ] ],
     "category": "CSC_ENCHANTED_OTHER"
+  },
+  {
+    "type": "recipe",
+    "result": "spell_scroll_acid_resistance",
+    "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
+    "tools": [ [ [ "paint_brush", -1 ] ] ],
+    "components": [
+      [ [ "tainted_blood", 2000 ], [ "blood", 8 ], [ "dragon_blood", 2000 ] ],
+      [ [ "acid", 4 ] ],
+      [ [ "water", 2 ], [ "water_clean", 2 ] ]
+    ],
+    "time": "2 h",
+    "skill_used": "spellcraft",
+    "difficulty": 2,
+    "book_learn": [ [ "black_dragons", 2 ] ],
+    "category": "CSC_ENCHANTED_OTHER",
+    "flags": [ "SECRET" ]
   }
 ]
diff --git a/data/mods/Magiclysm/recipes/dragon_black.json b/data/mods/Magiclysm/recipes/dragon_black.json
index 9398f46214966..1284607fa18fb 100644
--- a/data/mods/Magiclysm/recipes/dragon_black.json
+++ b/data/mods/Magiclysm/recipes/dragon_black.json
@@ -140,5 +140,125 @@
     "tools": [ [ [ "chisel", -1 ] ] ],
     "using": [ [ "sewing_standard", 100 ], [ "welding_standard", 10 ] ],
     "components": [ [ [ "black_dragon_tanned_hide", 4 ] ], [ [ "dragon_black_scale", 50 ] ], [ [ "dragon_essence", 5 ] ] ]
+  },
+  {
+    "result": "suit_xlblack_dragon_hide",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "tailor",
+    "difficulty": 6,
+    "skills_required": [ "spellcraft", 4 ],
+    "time": "70 h",
+    "book_learn": [ [ "black_dragons", 5 ] ],
+    "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ],
+    "tools": [ [ [ "chisel", -1 ] ] ],
+    "using": [ [ "sewing_standard", 350 ] ],
+    "components": [ [ [ "black_dragon_tanned_hide", 60 ] ], [ [ "dragon_black_scale", 250 ] ], [ [ "dragon_essence", 20 ] ] ]
+  },
+  {
+    "result": "suit_xlblack_dragon_scale",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "spellcraft", 6 ],
+    "time": "340 h",
+    "book_learn": [ [ "black_dragons", 6 ] ],
+    "qualities": [ { "id": "MANA_INFUSE", "level": 2 } ],
+    "tools": [ [ [ "chisel", -1 ] ] ],
+    "using": [ [ "sewing_standard", 350 ], [ "welding_standard", 100 ] ],
+    "components": [ [ [ "black_dragon_tanned_hide", 60 ] ], [ [ "dragon_black_scale", 2250 ] ], [ [ "dragon_essence", 25 ] ] ]
+  },
+  {
+    "result": "boots_xlblack_dragon_hide",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "tailor",
+    "difficulty": 6,
+    "skills_required": [ "spellcraft", 4 ],
+    "time": "30 h",
+    "book_learn": [ [ "black_dragons", 5 ] ],
+    "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ],
+    "tools": [ [ [ "chisel", -1 ] ] ],
+    "using": [ [ "sewing_standard", 150 ] ],
+    "components": [ [ [ "black_dragon_tanned_hide", 6 ] ], [ [ "dragon_black_scale", 20 ] ], [ [ "dragon_essence", 3 ] ] ]
+  },
+  {
+    "result": "boots_xlblack_dragon_scale",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "spellcraft", 6 ],
+    "time": "30 h",
+    "book_learn": [ [ "black_dragons", 6 ] ],
+    "qualities": [ { "id": "MANA_INFUSE", "level": 2 } ],
+    "tools": [ [ [ "chisel", -1 ] ] ],
+    "using": [ [ "sewing_standard", 150 ], [ "welding_standard", 20 ] ],
+    "components": [ [ [ "black_dragon_tanned_hide", 8 ] ], [ [ "dragon_black_scale", 125 ] ], [ [ "dragon_essence", 6 ] ] ]
+  },
+  {
+    "result": "helmet_xlblack_dragon_hide",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "tailor",
+    "difficulty": 6,
+    "skills_required": [ "spellcraft", 4 ],
+    "time": "30 h",
+    "book_learn": [ [ "black_dragons", 5 ] ],
+    "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ],
+    "tools": [ [ [ "chisel", -1 ] ] ],
+    "using": [ [ "sewing_standard", 150 ] ],
+    "components": [ [ [ "black_dragon_tanned_hide", 4 ] ], [ [ "dragon_black_scale", 12 ] ], [ [ "dragon_essence", 3 ] ] ]
+  },
+  {
+    "result": "helmet_xlblack_dragon_scale",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "spellcraft", 6 ],
+    "time": "30 h",
+    "book_learn": [ [ "black_dragons", 6 ] ],
+    "qualities": [ { "id": "MANA_INFUSE", "level": 2 } ],
+    "tools": [ [ [ "chisel", -1 ] ] ],
+    "using": [ [ "sewing_standard", 150 ], [ "welding_standard", 20 ] ],
+    "components": [ [ [ "black_dragon_tanned_hide", 2 ] ], [ [ "dragon_black_scale", 140 ] ], [ [ "dragon_essence", 6 ] ] ]
+  },
+  {
+    "result": "gloves_xlblack_dragon_hide",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "tailor",
+    "difficulty": 6,
+    "skills_required": [ "spellcraft", 4 ],
+    "time": "30 h",
+    "book_learn": [ [ "black_dragons", 5 ] ],
+    "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ],
+    "tools": [ [ [ "chisel", -1 ] ] ],
+    "using": [ [ "sewing_standard", 150 ] ],
+    "components": [ [ [ "black_dragon_tanned_hide", 4 ] ], [ [ "dragon_black_scale", 15 ] ], [ [ "dragon_essence", 4 ] ] ]
+  },
+  {
+    "result": "gauntlets_xlblack_dragon_scale",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "spellcraft", 6 ],
+    "time": "30 h",
+    "book_learn": [ [ "black_dragons", 6 ] ],
+    "qualities": [ { "id": "MANA_INFUSE", "level": 2 } ],
+    "tools": [ [ [ "chisel", -1 ] ] ],
+    "using": [ [ "sewing_standard", 150 ], [ "welding_standard", 20 ] ],
+    "components": [ [ [ "black_dragon_tanned_hide", 6 ] ], [ [ "dragon_black_scale", 75 ] ], [ [ "dragon_essence", 7 ] ] ]
   }
 ]
diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json
index d5ae781213a6d..922a9cfffdca6 100644
--- a/data/mods/Magiclysm/recipes/magic_tools.json
+++ b/data/mods/Magiclysm/recipes/magic_tools.json
@@ -39,6 +39,19 @@
     "qualities": [ { "id": "CHISEL", "level": 1 } ],
     "components": [ [ [ "copper_bracelet", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "silver_infuser",
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_TOOLS",
+    "skill_used": "fabrication",
+    "skills_required": [ "spellcraft", 3 ],
+    "difficulty": 4,
+    "time": "20 m",
+    "book_learn": [ [ "alchemy_basic", 3 ], [ "necro_basic", 4 ], [ "techno_basic", 4 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 1 } ],
+    "components": [ [ [ "silver_bracelet", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "result": "rune_alchemist",
diff --git a/data/mods/Magiclysm/worldgen/overmap_terrain.json b/data/mods/Magiclysm/worldgen/overmap_terrain.json
index 93b8ce6c50139..00f559ab37660 100644
--- a/data/mods/Magiclysm/worldgen/overmap_terrain.json
+++ b/data/mods/Magiclysm/worldgen/overmap_terrain.json
@@ -18,8 +18,7 @@
     "color": "red",
     "see_cost": 5,
     "extras": "build",
-    "mondensity": 2,
-    "flags": [ "SIDEWALK" ]
+    "mondensity": 2
   },
   {
     "type": "overmap_terrain",
@@ -29,8 +28,7 @@
     "color": "red",
     "see_cost": 5,
     "extras": "build",
-    "mondensity": 2,
-    "flags": [ "SIDEWALK" ]
+    "mondensity": 2
   },
   {
     "type": "overmap_terrain",
@@ -40,8 +38,7 @@
     "color": "green",
     "see_cost": 5,
     "extras": "build",
-    "mondensity": 2,
-    "flags": [ "SIDEWALK" ]
+    "mondensity": 2
   },
   {
     "type": "overmap_terrain",
@@ -51,8 +48,7 @@
     "color": "green",
     "see_cost": 5,
     "extras": "build",
-    "mondensity": 2,
-    "flags": [ "SIDEWALK" ]
+    "mondensity": 2
   },
   {
     "type": "overmap_terrain",
@@ -81,8 +77,7 @@
     "color": "white",
     "see_cost": 5,
     "extras": "build",
-    "mondensity": 1,
-    "flags": [ "SIDEWALK" ]
+    "mondensity": 1
   },
   {
     "type": "overmap_terrain",
diff --git a/data/mods/More_Survival_Tools/snippets.json b/data/mods/More_Survival_Tools/snippets.json
index db4f6c94662cb..149b5ee8ffd8c 100644
--- a/data/mods/More_Survival_Tools/snippets.json
+++ b/data/mods/More_Survival_Tools/snippets.json
@@ -2,7 +2,12 @@
   {
     "type": "snippet",
     "category": "note",
-    "text": [ "\"Shoot elfy mutants.  Carve more bolts outta their bones.  Rinse and repeat.\"" ],
-    "//": "Dwarf Fortress reference."
+    "text": [
+      {
+        "id": "note_more_survival_tools_1",
+        "text": "\"Shoot elfy mutants.  Carve more bolts outta their bones.  Rinse and repeat.\"",
+        "//": "Dwarf Fortress reference."
+      }
+    ]
   }
 ]
diff --git a/data/mods/My_Sweet_Cataclysm/sweet_snippets.json b/data/mods/My_Sweet_Cataclysm/sweet_snippets.json
index 975d38ea35052..4a0690dd0d4f3 100644
--- a/data/mods/My_Sweet_Cataclysm/sweet_snippets.json
+++ b/data/mods/My_Sweet_Cataclysm/sweet_snippets.json
@@ -2,6 +2,9 @@
   "type": "snippet",
   "category": "flier",
   "text": [
-    "A flyer for some kind of candy.  It shows a picture of a gleaming human made of smooth candy looking at you in terror.  \"SugarKin the first life-size human candy!  Are you a real monster?  Will you be able to devour it all?\""
+    {
+      "id": "flier_my_sweet_cataclysm_1",
+      "text": "A flyer for some kind of candy.  It shows a picture of a gleaming human made of smooth candy looking at you in terror.  \"SugarKin the first life-size human candy!  Are you a real monster?  Will you be able to devour it all?\""
+    }
   ]
 }
diff --git a/data/mods/No_Old_guns/modinfo.json b/data/mods/No_Old_guns/modinfo.json
index 01dee47e29971..de2b11b5721fb 100644
--- a/data/mods/No_Old_guns/modinfo.json
+++ b/data/mods/No_Old_guns/modinfo.json
@@ -4,7 +4,7 @@
     "ident": "no_olg_guns",
     "name": "No Antique Firearms",
     "authors": [ "Rivet-the-Zombie" ],
-    "maintainers": [ "Rivet-the-Zombie" ],
+    "maintainers": [ "Rivet-the-Zombie", "Cyrano7" ],
     "description": "Removes all black powder and pre-Cold War firearms.",
     "category": "item_exclude",
     "dependencies": [ "dda" ]
@@ -12,6 +12,8 @@
   {
     "type": "ITEM_BLACKLIST",
     "items": [
+      "sharps",
+      "colt_saa",
       "lemat_revolver",
       "garand",
       "garandclip",
@@ -60,7 +62,10 @@
       "762_25hot",
       "762_25typeP",
       "reloaded_762_25",
-      "762_25_casing"
+      "762_25_casing",
+      "45colt_jhp",
+      "reloaded_45colt_jhp",
+      "45colt_casing"
     ]
   }
 ]
diff --git a/data/mods/Tanks/items.json b/data/mods/Tanks/items.json
index 7475d6b7f1a9b..d683a37cb5729 100644
--- a/data/mods/Tanks/items.json
+++ b/data/mods/Tanks/items.json
@@ -368,7 +368,7 @@
     "dispersion": 0,
     "sight_dispersion": 10,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "reload": 700,
     "loudness": 175,
     "magazines": [ [ "30mm", [ "belt30mm" ] ] ]
diff --git a/data/mods/Tanks/snippets.json b/data/mods/Tanks/snippets.json
index d02f47d7adffc..d1b732283e280 100644
--- a/data/mods/Tanks/snippets.json
+++ b/data/mods/Tanks/snippets.json
@@ -1,29 +1,22 @@
 [
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Tank drone, meet the real deal.  See how you handle 120 millimeters of HELL YEAH!\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"big fucking gun, earplugs are good for your brain\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"I have a bicyle-mounted tank cannon.  Your argument is invalid.\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Next person to call this infantry fighting vehicle a 'tank' is walking home.\"" ]
-  },
   {
     "type": "snippet",
     "category": "note",
     "text": [
-      "\"Found what used to be an armored platoon.  Most tanks have hatches up top, not in the back like the new ones they're using.\""
+      {
+        "id": "note_tanks_1",
+        "text": "\"Tank drone, meet the real deal.  See how you handle 120 millimeters of HELL YEAH!\""
+      },
+      { "id": "note_tanks_2", "text": "\"big fucking gun, earplugs are good for your brain\"" },
+      { "id": "note_tanks_3", "text": "\"I have a bicyle-mounted tank cannon.  Your argument is invalid.\"" },
+      {
+        "id": "note_tanks_4",
+        "text": "\"Next person to call this infantry fighting vehicle a 'tank' is walking home.\""
+      },
+      {
+        "id": "note_tanks_5",
+        "text": "\"Found what used to be an armored platoon.  Most tanks have hatches up top, not in the back like the new ones they're using.\""
+      }
     ]
   }
 ]
diff --git a/data/mods/blazemod/blaze_blob.json b/data/mods/blazemod/blaze_blob.json
index b44eeceb9e533..bc7591332281f 100644
--- a/data/mods/blazemod/blaze_blob.json
+++ b/data/mods/blazemod/blaze_blob.json
@@ -138,7 +138,7 @@
     "pierce": 15,
     "sight_dispersion": 150,
     "durability": 10,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "clip_size": 50,
     "ammo_effects": [ "WIDE" ],
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_BOOM" ]
@@ -343,7 +343,7 @@
     "pierce": 20,
     "sight_dispersion": 150,
     "durability": 10,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "clip_size": 50,
     "ammo_effects": [ "WIDE" ],
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
@@ -690,7 +690,7 @@
     "pierce": 15,
     "sight_dispersion": 150,
     "durability": 10,
-    "burst": 20,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 20 ] ],
     "clip_size": 240,
     "ammo_effects": [ "WIDE" ],
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
@@ -1053,7 +1053,7 @@
     "pierce": 5,
     "sight_dispersion": 150,
     "durability": 10,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 36,
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
@@ -1232,7 +1232,7 @@
     "dispersion": 450,
     "sight_dispersion": 150,
     "durability": 10,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 180,
     "ammo_effects": [ "INCENDIARY", "FLARE", "WIDE", "NO_BOOM", "STREAM" ],
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_BOOM", "FIRE_20" ]
diff --git a/data/mods/blazemod/blaze_override.json b/data/mods/blazemod/blaze_override.json
index 53e144c201054..0508c3460d789 100644
--- a/data/mods/blazemod/blaze_override.json
+++ b/data/mods/blazemod/blaze_override.json
@@ -5,7 +5,6 @@
     "type": "AMMO",
     "name": "rock",
     "count": 1,
-    "ammo_type": "h_projectile",
     "damage": 15,
     "dispersion": 45,
     "effects": [ "RECOVER_10", "BEANBAG" ]
diff --git a/data/mods/blazemod/blaze_test.json b/data/mods/blazemod/blaze_test.json
index 54264e03b47c7..3aedc2654d13f 100644
--- a/data/mods/blazemod/blaze_test.json
+++ b/data/mods/blazemod/blaze_test.json
@@ -859,7 +859,7 @@
     "dispersion": 300,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 30,
     "reload": 40,
     "valid_mod_locations": [  ],
@@ -964,7 +964,7 @@
     "dispersion": 300,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 250,
     "reload": 10,
     "valid_mod_locations": [  ],
diff --git a/data/mods/blazemod/blaze_weapons.json b/data/mods/blazemod/blaze_weapons.json
index bfc2e8a314511..4d342188fb39c 100644
--- a/data/mods/blazemod/blaze_weapons.json
+++ b/data/mods/blazemod/blaze_weapons.json
@@ -20,7 +20,7 @@
     "pierce": 20,
     "sight_dispersion": 150,
     "durability": 9,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "reload": 150,
     "magazine_well": 1,
     "magazines": [ [ "bolt", [ "bolt_hopper" ] ] ],
@@ -98,7 +98,7 @@
     "ranged_damage": 60,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 12,
     "reload": 750,
     "valid_mod_locations": [  ],
@@ -149,7 +149,7 @@
     "pierce": 20,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "ups_charges": 29,
     "valid_mod_locations": [  ],
     "ammo_effects": [ "LASER", "WIDE" ],
@@ -229,7 +229,7 @@
     "pierce": 15,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "reload": 150,
     "valid_mod_locations": [  ],
     "magazine_well": 1,
@@ -284,7 +284,7 @@
     "pierce": 5,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "clip_size": 15,
     "reload": 750,
     "valid_mod_locations": [  ],
@@ -311,7 +311,7 @@
     "ranged_damage": 40,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 12,
     "reload": 2500,
     "valid_mod_locations": [  ],
@@ -365,7 +365,7 @@
     "dispersion": 1300,
     "sight_dispersion": 150,
     "durability": 5,
-    "burst": 25,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 25 ] ],
     "ups_charges": 1,
     "reload": 150,
     "valid_mod_locations": [  ],
@@ -394,7 +394,7 @@
     "pierce": 15,
     "sight_dispersion": 150,
     "durability": 8,
-    "burst": 3,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 12,
     "reload": 750,
     "valid_mod_locations": [  ],
@@ -445,7 +445,7 @@
     "ranged_damage": 25,
     "sight_dispersion": 150,
     "durability": 9,
-    "burst": 5,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "magazine_well": 1,
     "magazines": [ [ "pebble", [ "pebble_hopper" ] ] ],
     "reload": 150,
diff --git a/data/mods/blazemod/snippets.json b/data/mods/blazemod/snippets.json
index 5f11e87bedf84..9a8466ff8ee85 100644
--- a/data/mods/blazemod/snippets.json
+++ b/data/mods/blazemod/snippets.json
@@ -3,56 +3,31 @@
     "type": "snippet",
     "category": "note",
     "text": [
-      "\"Agh, to See the Spiral in such a Distorted Shape!  Manipulated for its Vortex motion!  Its Perpetual Grace!  Its beauty Tarnished...\""
+      {
+        "id": "note_blazemod_1",
+        "text": "\"Agh, to See the Spiral in such a Distorted Shape!  Manipulated for its Vortex motion!  Its Perpetual Grace!  Its beauty Tarnished...\""
+      },
+      { "id": "note_blazemod_2", "text": "\"My friend died, but at least I made her into a blob turret.\"" },
+      {
+        "id": "note_blazemod_3",
+        "text": "\"I have this laser cannon turret on my shopping cart.  I push it around and everything dies.  I think I'm gonna toss it in the lake-- this just isn't fair anymore.\""
+      },
+      {
+        "id": "note_blazemod_4",
+        "text": "\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably forward.  Giant rollers on front demolish forest.  Maine, here I come.\""
+      },
+      { "id": "note_blazemod_5", "text": "\"my car is a diamond in the rough... literally\"" },
+      { "id": "note_blazemod_6", "text": "\"M249 TURRET NODDED.  IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" },
+      { "id": "note_blazemod_7", "text": "\"Added so many things to my taxi that it went a-blaze.  Whoops.\"" },
+      {
+        "id": "note_blazemod_8",
+        "text": "\"If I put one cargo dimension into another cargo dimension, does the universe end?\""
+      },
+      { "id": "note_blazemod_9", "text": "\"one day, i will be part of car, too\"" },
+      {
+        "id": "note_blazemod_10",
+        "text": "\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!  You goin' somewhere.\""
+      }
     ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"My friend died, but at least I made her into a blob turret.\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [
-      "\"I have this laser cannon turret on my shopping cart.  I push it around and everything dies.  I think I'm gonna toss it in the lake-- this just isn't fair anymore.\""
-    ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [
-      "\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably forward.  Giant rollers on front demolish forest.  Maine, here I come.\""
-    ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"my car is a diamond in the rough... literally\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"M249 TURRET NODDED.  IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Added so many things to my taxi that it went a-blaze.  Whoops.\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"If I put one cargo dimension into another cargo dimension, does the universe end?\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"one day, i will be part of car, too\"" ]
-  },
-  {
-    "type": "snippet",
-    "category": "note",
-    "text": [ "\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!  You goin' somewhere.\"" ]
   }
 ]
diff --git a/data/mods/desert_region/desert_items.json b/data/mods/desert_region/desert_items.json
deleted file mode 100644
index a327a00352b7b..0000000000000
--- a/data/mods/desert_region/desert_items.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-  {
-    "type": "COMESTIBLE",
-    "id": "cholla_bud",
-    "name": "cholla bud",
-    "weight": 92,
-    "color": "red",
-    "spoils_in": "6 days 16 hours",
-    "comestible_type": "FOOD",
-    "symbol": "%",
-    "quench": 6,
-    "healthy": 2,
-    "calories": 62,
-    "description": "The candy of the Mojave Indigenous peoples.",
-    "price": 900,
-    "material": "fruit",
-    "volume": "175 ml",
-    "fun": 6,
-    "flags": [ "FREEZERBURN", "SMOKABLE" ],
-    "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitA", 2 ], [ "vitC", 18 ], [ "iron", 1 ] ]
-  }
-]
diff --git a/data/mods/desert_region/desert_regional_map_settings.json b/data/mods/desert_region/desert_regional_map_settings.json
index 4e9d72e617aaf..9d1c6cc964bc3 100644
--- a/data/mods/desert_region/desert_regional_map_settings.json
+++ b/data/mods/desert_region/desert_regional_map_settings.json
@@ -3,7 +3,15 @@
     "type": "region_settings",
     "id": "default",
     "default_oter": "desert",
-    "default_groundcover": [ [ "t_searth_test", 4 ], [ "t_sand", 1 ] ],
+    "default_groundcover": [ [ "t_region_groundcover", 1 ] ],
+    "region_terrain_and_furniture": {
+      "terrain": {
+        "t_region_groundcover": { "t_searth_test": 4, "t_sand": 1 },
+        "t_region_shrub": { "t_shrub": 1 },
+        "t_region_tree": { "t_tree_willow": 1, "t_tree_dead": 1 }
+      },
+      "furniture": { "f_region_flower": { "f_mutcactus_test": 1 } }
+    },
     "river_scale": 0.0,
     "field_coverage": {
       "percent_coverage": 0.1333,
diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json
index ae5082e0a6984..566cb21f94429 100644
--- a/data/raw/keybindings.json
+++ b/data/raw/keybindings.json
@@ -1410,6 +1410,20 @@
     "name": "Toggle activate/examine",
     "bindings": [ { "input_method": "keyboard", "key": "!" } ]
   },
+  {
+    "type": "keybinding",
+    "id": "TOGGLE_SAFE_FUEL",
+    "category": "BIONICS",
+    "name": "Toggle safe fuel mod",
+    "bindings": [ { "input_method": "keyboard", "key": "s" } ]
+  },
+  {
+    "type": "keybinding",
+    "id": "TOGGLE_AUTO_START",
+    "category": "BIONICS",
+    "name": "Toggle auto start mod",
+    "bindings": [ { "input_method": "keyboard", "key": "A" } ]
+  },
   {
     "type": "keybinding",
     "id": "TOGGLE_EXAMINE",
diff --git a/doc/CHANGELOG_GUIDELINES.md b/doc/CHANGELOG_GUIDELINES.md
index 99ff5a4410487..77258eb0692d4 100644
--- a/doc/CHANGELOG_GUIDELINES.md
+++ b/doc/CHANGELOG_GUIDELINES.md
@@ -1,6 +1,9 @@
 These are the categories used by Pull Request Summary lines as outlined in the [PR Template](../.github/pull_request_template.md).
 In the end, it's up to the author to decide where *they* want their change to be listed, these are only guidelines, not rules.
 
+
+#### None
+Please consider a summary of "SUMMARY: None" for minor additions and fixes. There are far too many changes made to the game to feature anything approaching all of them in the changelog.
 #### Features
 If it adds something new that the player can do, or that can happen to the player, it's a feature.
 These will generally be edits to the C++ code in the game, though new json entities may be involved as well.
diff --git a/doc/COMPILING/COMPILING.md b/doc/COMPILING/COMPILING.md
index bc08be44edafb..f2e846e60823b 100644
--- a/doc/COMPILING/COMPILING.md
+++ b/doc/COMPILING/COMPILING.md
@@ -10,11 +10,11 @@
   * [Cross-compile to Windows from Linux](#cross-compile-to-windows-from-linux)
   * [Cross-compile to Mac OS X from Linux](#cross-compile-to-mac-os-x-from-linux)
   * [Cross-compile to Android from Linux](#cross-compile-to-android-from-linux)
-  * [Troubleshooting](#debian-troubleshooting)
+  * [Troubleshooting](#linux-troubleshooting)
 * [Mac OS X](#mac-os-x)
   * [Simple build using Homebrew](#simple-build-using-homebrew)
   * [Advanced info for Developers](#advanced-info-for-developers)
-  * [Troubleshooting](#mac-troubleshooting)
+  * [Troubleshooting](#mac-os-x-troubleshooting)
 * [Windows](#windows)
   * [Building with Visual Studio](#building-with-visual-studio)
   * [Building with MSYS2](#building-with-msys2)
@@ -548,7 +548,7 @@ Once `dmgbuild` is installed, you will be able to use the `dmgdist` target like
 
 You should see a `Cataclysm.dmg` file.
 
-## Troubleshooting
+## Mac OS X Troubleshooting
 
 ### ISSUE: Game runs very slowly when built for Mac OS X 10.11 or earlier
 
diff --git a/doc/EFFECTS_JSON.md b/doc/EFFECTS_JSON.md
index 85f3dd37b32f9..5f637266e3e5b 100644
--- a/doc/EFFECTS_JSON.md
+++ b/doc/EFFECTS_JSON.md
@@ -299,138 +299,139 @@ This is where the real meat of the effect JSON definition lies. Each one can tak
 Decimals are valid but must be formatted as "0.X" or "-0.X". The game will round towards zero at the end
 when calculating actually applied values
 
+Basic definitions:
+```C++
+"X_amount"      - Amount applied of X when effect is placed. Like apply messages it will only trigger on new effects
+"X_min"         - Minimum amount of X applied when roll triggers
+"X_max"         - Maximum amount of X applied when roll triggers (no entry means it will give exactly X_min each time instead of rng(min, max)
+"X_min_val"     - Minimum value the effect will push you to, 0 means uncapped! Doesn't exist for some X's!
+"X_max_val"     - Maximum value the effect will push you to, 0 means uncapped! Doesn't exist for some X's!
+"X_chance"      - Basic chance of X triggering each time, depends on "X_chance_bot" for exact formula
+"X_chance_bot"  - If this doesn't exist then the trigger chance is (1 in "X_chance"). If this does exist then the chance is ("X_chance" in "X_chance_bot")
+"X_tick"        - Effect rolls for X triggering every Y ticks
+```
+
 Valid arguments:
 ```C++
-"str_mod"
-"dex_mod"
-"per_mod"
-"int_mod"
-"speed_mod"
+"str_mod"           - Positive values raises stat, negative values lowers stat
+"dex_mod"           - Positive values raises stat, negative values lowers stat
+"per_mod"           - Positive values raises stat, negative values lowers stat
+"int_mod"           - Positive values raises stat, negative values lowers stat
+"speed_mod"         - Positive values raises stat, negative values lowers stat
 
-"pain_amount"
-"pain_min"
+"pain_amount"       - Positives raise pain, negatives don't make anything. Don't make it too high.
+"pain_min"          - Minimal amount of pain, certain effect will give/take
 "pain_max"          - if 0 or missing value will be exactly "pain_min"
 "pain_max_val"      - Defaults to 0, which means uncapped
-"pain_chance"
+"pain_chance"       - Chance to get more pain
 "pain_chance_bot"
-"pain_tick"         - Defaults to every tick
+"pain_tick"         - Defaults to every tick.
 
-"hurt_amount"
-"hurt_min"
+"hurt_amount"       - Positives will give damage, negatives will heal instead. Don't make it too high.
+"hurt_min"          - Minimal amount of damage, certain effect will give/take
 "hurt_max"          - if 0 or missing value will be exactly "hurt_min"
-"hurt_chance"
+"hurt_chance"       - Chance to cause damage
 "hurt_chance_bot"
 "hurt_tick"         - Defaults to every tick
 
-"sleep_amount"
-"sleep_min"
+"sleep_amount"      - Amount of turns spent sleeping.
+"sleep_min"         - Minimal amount of sleep in turns, certain effect can give
 "sleep_max"         - if 0 or missing value will be exactly "sleep_min"
-"sleep_chance"
+"sleep_chance"      - Chance to fall asleep
 "sleep_chance_bot"
 "sleep_tick"        - Defaults to every tick
 
-"pkill_amount"
-"pkill_min"
+"pkill_amount"      - Amount of painkiller effect. Don't go too high with it.
+"pkill_min"         - Minimal amount of painkiller, certain effect will give
 "pkill_max"         - if 0 or missing value will be exactly "pkill_min"
 "pkill_max_val"     - Defaults to 0, which means uncapped
-"pkill_chance"
+"pkill_chance"      - Chance to cause painkiller effect(lowers pain)
 "pkill_chance_bot"
 "pkill_tick"        - Defaults to every tick
 
-"stim_amount"
-"stim_min"
+"stim_amount"       - Negatives cause depressants effect and positives cause stimulants effect.
+"stim_min"          - Minimal amount of stimulant, certain effect will give. 
 "stim_max"          - if 0 or missing value will be exactly "stim_min"
 "stim_min_val"      - Defaults to 0, which means uncapped
 "stim_max_val"      - Defaults to 0, which means uncapped
-"stim_chance"
+"stim_chance"       - Chance to cause one of two stimulant effects
 "stim_chance_bot"
 "stim_tick"         - Defaults to every tick
 
-"health_amount"
-"health_min"
+"health_amount"     - Negatives decrease health and positives increase it. It's semi-hidden stat, which affects healing.
+"health_min"        - Minimal amount of health, certain effect will give/take. 
 "health_max"        - if 0 or missing value will be exactly "health_min"
 "health_min_val"    - Defaults to 0, which means uncapped
 "health_max_val"    - Defaults to 0, which means uncapped
-"health_chance"
+"health_chance"     - Chance to change health
 "health_chance_bot"
 "health_tick"       - Defaults to every tick
 
-"h_mod_amount"
-"h_mod_min"
+"h_mod_amount"      - Affects health stat growth, positives increase it and negatives decrease it
+"h_mod_min"         - Minimal amount of health_modifier, certain effect will give/take
 "h_mod_max"         - if 0 or missing value will be exactly "h_mod_min"
 "h_mod_min_val"     - Defaults to 0, which means uncapped
 "h_mod_max_val"     - Defaults to 0, which means uncapped
-"h_mod_chance"
+"h_mod_chance"      - Chance to change health_modifier
 "h_mod_chance_bot"
 "h_mod_tick"        - Defaults to every tick
 
-"rad_amount"
-"rad_min"
+"rad_amount"        - Amount of radiation it can give/take. Just be aware that anything above [50] is fatal.
+"rad_min"           - Minimal amount of radiation, certain effect will give/take
 "rad_max"           - if 0 or missing value will be exactly "rad_min"
 "rad_max_val"       - Defaults to 0, which means uncapped
-"rad_chance"
+"rad_chance"        - Chance to get more radiation
 "rad_chance_bot"
 "rad_tick"          - Defaults to every tick
 
-"hunger_amount"
-"hunger_min"
+"hunger_amount"     - Amount of hunger it can give/take.
+"hunger_min"        - Minimal amount of hunger, certain effect will give/take
 "hunger_max"        - if 0 or missing value will be exactly "hunger_min"
 "hunger_min_val"    - Defaults to 0, which means uncapped
 "hunger_max_val"    - Defaults to 0, which means uncapped
-"hunger_chance"
+"hunger_chance"     - Chance to become more hungry
 "hunger_chance_bot"
 "hunger_tick"       - Defaults to every tick
 
-"thirst_amount"
-"thirst_min"
+"thirst_amount"     - Amount of thirst it can give/take.
+"thirst_min"        - Minimal amount of thirst, certain effect will give/take
 "thirst_max"        - if 0 or missing value will be exactly "thirst_min"
 "thirst_min_val"    - Defaults to 0, which means uncapped
 "thirst_max_val"    - Defaults to 0, which means uncapped
-"thirst_chance"
+"thirst_chance"     - Chance to become more thirsty
 "thirst_chance_bot"
 "thirst_tick"       - Defaults to every tick
 
-"fatigue_amount"
-"fatigue_min"
+"fatigue_amount"    - Amount of fatigue it can give/take. After certain amount character will need to sleep.
+"fatigue_min"       - Minimal amount of fatigue, certain effect will give/take
 "fatigue_max"       - if 0 or missing value will be exactly "fatigue_min"
 "fatigue_min_val"   - Defaults to 0, which means uncapped
 "fatigue_max_val"   - Defaults to 0, which means uncapped
-"fatigue_chance"
+"fatigue_chance"    - Chance to get more tired
 "fatigue_chance_bot"
 "fatigue_tick"      - Defaults to every tick
 
-"stamina_amount"
-"stamina_min"
+"stamina_amount"    - Amount of stamina it can give/take.
+"stamina_min"       - Minimal amount of stamina, certain effect will give/take
 "stamina_max"       - if 0 or missing value will be exactly "stamina_min"
 "stamina_min_val"   - Defaults to 0, which means uncapped
 "stamina_max_val"   - Defaults to 0, which means uncapped
-"stamina_chance"
+"stamina_chance"    - Chance to get stamina changes
 "stamina_chance_bot"
 "stamina_tick"      - Defaults to every tick
 
-"cough_chance"
+"cough_chance"      - Chance to cause cough
 "cough_chance_bot"
-"cough_tick"
+"cough_tick"        - Defaults to every tick
 
-"vomit_chance"
+"vomit_chance"      - Chance to cause vomiting
 "vomit_chance_bot"
-"vomit_tick"
+"vomit_tick"        - Defaults to every tick
 
 "healing_rate"      - Healed rate per day
 "healing_head"      - Percentage of healing value for head
 "healing_torso"     - Percentage of healing value for torso
 
-```
-Basic definitions:
-```C++
-"X_amount"      - Amount applied of X when effect is placed. Like apply messages it will only trigger on new effects
-"X_min"         - Minimum amount of X applied when roll triggers
-"X_max"         - Maximum amount of X applied when roll triggers (no entry means it will give exactly X_min each time instead of rng(min, max)
-"X_min_val"     - Minimum value the effect will push you to, 0 means uncapped! Doesn't exist for some X's!
-"X_max_val"     - Maximum value the effect will push you to, 0 means uncapped! Doesn't exist for some X's!
-"X_chance"      - Basic chance of X triggering each time, depends on "X_chance_bot" for exact formula
-"X_chance_bot"  - If this doesn't exist then the trigger chance is (1 in "X_chance"). If this does exist then the chance is ("X_chance" in "X_chance_bot")
-"X_tick"        - Effect rolls for X triggering every Y ticks
 ```
 Each argument can also take either one or two values.
 ```C++
diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md
index 6a0115d3504b8..5f8dc9b13df7a 100644
--- a/doc/JSON_INFO.md
+++ b/doc/JSON_INFO.md
@@ -353,34 +353,35 @@ This section describes each json file and their contents. Each json has their ow
 
 ### Bionics
 
-| Identifier               | Description
-|---                       |---
-| id                       | Unique ID. Must be one continuous word, use underscores if necessary.
-| name                     | In-game name displayed.
-| active                   | Whether the bionic is active or passive. (default: `passive`)
-| power_source             | Whether the bionic provides power. (default: `false`)
-| faulty                   | Whether it is a faulty type. (default: `false`)
-| act_cost                 | How many kJ it costs to activate the bionic.  Strings can be used "1 kJ"/"1000 J"/"1000000 mJ" (default: `0`)
-| deact_cost               | How many kJ it costs to deactivate the bionic.  Strings can be used "1 kJ"/"1000 J"/"1000000 mJ" (default: `0`)
-| react_cost               | How many kJ it costs over time to keep this bionic active, does nothing without a non-zero "time".  Strings can be used "1 kJ"/"1000 J"/"1000000 mJ" (default: `0`)
-| time                     | How long, when activated, between drawing cost. If 0, it draws power once. (default: `0`)
-| description              | In-game description.
-| encumbrance              | (_optional_) A list of body parts and how much this bionic encumber them.
-| weight_capacity_bonus    | (_optional_) Bonus to weight carrying capacity in grams, can be negative.  Strings can be used - "5000 g" or "5 kg" (default: `0`)
-| weight_capacity_modifier | (_optional_) Factor modifying base weight carrying capacity. (default: `1`)
-| canceled_mutations       | (_optional_) A list of mutations/traits that are removed when this bionic is installed (e.g. because it replaces the fault biological part).
-| included_bionics         | (_optional_) Additional bionics that are installed automatically when this bionic is installed. This can be used to install several bionics from one CBM item, which is useful as each of those can be activated independently.
-| included                 | (_optional_) Whether this bionic is included with another. If true this bionic does not require a CBM item to be defined. (default: `false`)
-| env_protec               | (_optional_) How much environmental protection does this bionic provide on the specified body parts.
-| occupied_bodyparts       | (_optional_) A list of body parts occupied by this bionic, and the number of bionic slots it take on those parts.
-| capacity                 | (_optional_) Amount of power storage added by this bionic.  Strings can be used "1 kJ"/"1000 J"/"1000000 mJ" (default: `0`)
-| fuel_options             | (_optional_) A list of fuel that this bionic can use to produce bionic power.
-| fuel_capacity            | (_optional_) Volume of fuel this bionic can store.
-| fuel_efficiency          | (_optional_) Fraction of fuel energy converted into power. (default: `0`)
-| passive_fuel_efficiency  | (_optional_) Fraction of fuel energy passively converted into power. Only useful for muscle powered CBM (default: `0`)
-| exothermic_power_gen     | (_optional_) If true this bionic emits heat when producing power. (default: `false`)
-| power_gen_emission       | (_optional_) `emit_id` of the field emitted by this bionic when it produces energy. Emit_ids are defined in `emit.json`.
-| stat_bonus               | (_optional_) List of passive stat bonus. Stat are designated as follow: "DEX", "INT", "STR", "PER".
+| Identifier                  | Description
+|---                          |---
+| id                          | Unique ID. Must be one continuous word, use underscores if necessary.
+| name                        | In-game name displayed.
+| active                      | Whether the bionic is active or passive. (default: `passive`)
+| power_source                | Whether the bionic provides power. (default: `false`)
+| faulty                      | Whether it is a faulty type. (default: `false`)
+| act_cost                    | How many kJ it costs to activate the bionic.  Strings can be used "1 kJ"/"1000 J"/"1000000 mJ" (default: `0`)
+| deact_cost                  | How many kJ it costs to deactivate the bionic.  Strings can be used "1 kJ"/"1000 J"/"1000000 mJ" (default: `0`)
+| react_cost                  | How many kJ it costs over time to keep this bionic active, does nothing without a non-zero "time".  Strings can be used "1 kJ"/"1000 J"/"1000000 mJ" (default: `0`)
+| time                        | How long, when activated, between drawing cost. If 0, it draws power once. (default: `0`)
+| description                 | In-game description.
+| encumbrance                 | (_optional_) A list of body parts and how much this bionic encumber them.
+| weight_capacity_bonus       | (_optional_) Bonus to weight carrying capacity in grams, can be negative.  Strings can be used - "5000 g" or "5 kg" (default: `0`)
+| weight_capacity_modifier    | (_optional_) Factor modifying base weight carrying capacity. (default: `1`)
+| canceled_mutations          | (_optional_) A list of mutations/traits that are removed when this bionic is installed (e.g. because it replaces the fault biological part).
+| included_bionics            | (_optional_) Additional bionics that are installed automatically when this bionic is installed. This can be used to install several bionics from one CBM item, which is useful as each of those can be activated independently.
+| included                    | (_optional_) Whether this bionic is included with another. If true this bionic does not require a CBM item to be defined. (default: `false`)
+| env_protec                  | (_optional_) How much environmental protection does this bionic provide on the specified body parts.
+| occupied_bodyparts          | (_optional_) A list of body parts occupied by this bionic, and the number of bionic slots it take on those parts.
+| capacity                    | (_optional_) Amount of power storage added by this bionic.  Strings can be used "1 kJ"/"1000 J"/"1000000 mJ" (default: `0`)
+| fuel_options                | (_optional_) A list of fuel that this bionic can use to produce bionic power.
+| fuel_capacity               | (_optional_) Volume of fuel this bionic can store.
+| fuel_efficiency             | (_optional_) Fraction of fuel energy converted into power. (default: `0`)
+| passive_fuel_efficiency     | (_optional_) Fraction of fuel energy passively converted into power. Useful for CBM using PERPETUAL fuel like `muscle`, `wind` or `sun_light`. (default: `0`)
+| exothermic_power_gen        | (_optional_) If true this bionic emits heat when producing power. (default: `false`)
+| coverage_power_gen_penalty  | (_optional_) Fraction of coverage diminishing fuel_efficiency. Float between 0.0 and 1.0. (default: `nullopt`)
+| power_gen_emission          | (_optional_) `emit_id` of the field emitted by this bionic when it produces energy. Emit_ids are defined in `emit.json`.
+| stat_bonus                  | (_optional_) List of passive stat bonus. Stat are designated as follow: "DEX", "INT", "STR", "PER".
 
 ```C++
 {
diff --git a/doc/REGION_SETTINGS.md b/doc/REGION_SETTINGS.md
index 4861dc1d8a31f..29f6805f71330 100644
--- a/doc/REGION_SETTINGS.md
+++ b/doc/REGION_SETTINGS.md
@@ -4,17 +4,18 @@ The **region_settings** define the attributes for map generation that apply to a
 The general settings define the default overmap terrain and ground cover. Additional sections are
 as follows:
 
-|             Section             |                             Description                             |
-| ------------------------------- | ------------------------------------------------------------------- |
-| `field_coverage`                | Defines the flora that cover the `field` overmap terrain.           |
-| `overmap_lake_settings`         | Defines parameters for generating lakes in the region.              |
-| `overmap_forest_settings`       | Defines parameters for generating forests and swamps in the region. |
-| `forest_mapgen_settings`        | Defines flora (and "stuff") that cover the `forest` terrain types.  |
-| `forest_trail_settings`         | Defines the overmap and local structure of forest trails.           |
-| `city`                          | Defines the structural compositions of cities.                      |
-| `map_extras`                    | Defines the map extra groups referenced by overmap terrains.        |
-| `weather`                       | Defines the base weather attributes for the region.                 |
-| `overmap_feature_flag_settings` | Defines operations on overmap features based on their flags.        |
+|             Section             |                              Description                              |
+| ------------------------------- | --------------------------------------------------------------------- |
+| `region_terrain_and_furniture`  | Defines the resolution of regional terrain/furniture to actual types. |
+| `field_coverage`                | Defines the flora that cover the `field` overmap terrain.             |
+| `overmap_lake_settings`         | Defines parameters for generating lakes in the region.                |
+| `overmap_forest_settings`       | Defines parameters for generating forests and swamps in the region.   |
+| `forest_mapgen_settings`        | Defines flora (and "stuff") that cover the `forest` terrain types.    |
+| `forest_trail_settings`         | Defines the overmap and local structure of forest trails.             |
+| `city`                          | Defines the structural compositions of cities.                        |
+| `map_extras`                    | Defines the map extra groups referenced by overmap terrains.          |
+| `weather`                       | Defines the base weather attributes for the region.                   |
+| `overmap_feature_flag_settings` | Defines operations on overmap features based on their flags.          |
 
 Note that for the default region, all attributes and sections are required.
 
@@ -41,6 +42,49 @@ Note that for the default region, all attributes and sections are required.
 }
 ```
 
+## Region Terrain / Furniture
+
+The **region_terrain_and_furniture** section defines the resolution of regional terrain/furniture
+to their actual terrain and furniture types for the region, with a weighted list for
+terrain/furniture entry that defines the relative weight of a given entry when mapgen resolves the
+regional entry to an actual entry.
+
+### Fields
+
+| Identifier  |                            Description                             |
+| ----------- | ------------------------------------------------------------------ |
+| `terrain`   | List of regional terrain and their corresponding weighted lists.   |
+| `furniture` | List of regional furniture and their corresponding weighted lists. |
+
+### Example
+```json
+{
+	"region_terrain_and_furniture": {
+		"terrain": {
+			"t_region_groundcover": {
+				"t_grass": 4,
+				"t_grass_long": 2,
+				"t_dirt": 1
+			}
+		},
+		"furniture": {
+			"f_region_flower": {
+				"f_black_eyed_susan": 1,
+				"f_lily": 1,
+				"f_flower_tulip": 1,
+				"f_flower_spurge": 1,
+				"f_chamomile": 1,
+				"f_dandelion": 1,
+				"f_datura": 1,
+				"f_dahlia": 1,
+				"f_bluebell": 1
+			}
+		}
+	}
+}
+```
+
+
 ## Field Coverage
 
 The **field_coverage** section defines the furniture and terrain that make up the flora that
diff --git a/doc/TRANSLATING.md b/doc/TRANSLATING.md
index f15b0db65ff33..153a1ea1832b0 100644
--- a/doc/TRANSLATING.md
+++ b/doc/TRANSLATING.md
@@ -313,6 +313,7 @@ issues reported by the `translation` class.
 | Recipe descriptions
 | Inscribe use action verbs/gerunds
 | Monster names (plural supported) and descriptions
+| Snippets
 
 ### Recommendations
 
diff --git a/lang/extract_json_strings.py b/lang/extract_json_strings.py
index 152a4c2897a2a..3050dad1d8301 100755
--- a/lang/extract_json_strings.py
+++ b/lang/extract_json_strings.py
@@ -131,6 +131,7 @@ def warning_supressed(filename):
     "ITEM_CATEGORY",
     "json_flag",
     "keybinding",
+    "LOOT_ZONE",
     "MAGAZINE",
     "map_extra",
     "MOD_INFO",
@@ -143,7 +144,6 @@ def warning_supressed(filename):
     "PET_ARMOR",
     "score",
     "skill",
-    "snippet",
     "speech",
     "SPELL",
     "start_location",
@@ -759,6 +759,17 @@ def extract_fault(item):
         if "success_msg" in method:
             writestr(outfile, method["success_msg"], format_strings=True, comment="success message for mending method '{}' of fault '{}'".format(method["name"], item["name"]))
 
+def extract_snippets(item):
+    outfile = get_outfile("snippet")
+    text = item["text"];
+    if type(text) is not list:
+        text = [text];
+    for snip in text:
+        if type(snip) is str:
+            writestr(outfile, snip)
+        else:
+            writestr(outfile, snip["text"])
+
 # these objects need to have their strings specially extracted
 extract_specials = {
     "harvest" : extract_harvest,
@@ -781,6 +792,7 @@ def extract_fault(item):
     "recipe": extract_recipes,
     "recipe_group": extract_recipe_group,
     "scenario": extract_scenarios,
+    "snippet": extract_snippets,
     "talk_topic": extract_talk_topic,
     "trap": extract_trap,
     "gate": extract_gate,
diff --git a/lang/po/cataclysm-dda.pot b/lang/po/cataclysm-dda.pot
index c25b92c625aae..8416e42a3529f 100644
--- a/lang/po/cataclysm-dda.pot
+++ b/lang/po/cataclysm-dda.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-01 10:05+0800\n"
+"POT-Creation-Date: 2019-11-23 00:14+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -173,6 +173,18 @@ msgstr ""
 msgid "watery plutonium slurry"
 msgstr ""
 
+#: lang/json/AMMO_from_json.py
+#: lang/json/snippet_from_json.py
+msgid "rock"
+msgstr ""
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr ""
@@ -5372,6 +5384,18 @@ msgid ""
 "burn hotly upon impact, piercing armor and igniting flammable substances."
 msgstr ""
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr ""
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only "
+"be fired from Ichaival."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -5423,6 +5447,27 @@ msgid ""
 "crystals, but can never be unloaded."
 msgstr ""
 
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr ""
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr ""
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "fire lance charge"
 msgstr ""
@@ -5908,13 +5953,6 @@ msgid ""
 "blob needs to be healthy.  You think..."
 msgstr ""
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -7072,6 +7110,46 @@ msgid ""
 "small straps designed to better distribute the weight."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -7499,6 +7577,22 @@ msgstr[1] ""
 msgid "A white button-down shirt with long sleeves.  Looks professional!"
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free "
+"drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -8181,6 +8275,20 @@ msgid ""
 "wear while providing maximum protection under extreme conditions."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -9896,8 +10004,8 @@ msgstr ""
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A t-shirt with the Fedora logo on it, underneath it says \"Freedom. Friends. "
-"Features. First.\""
+"A t-shirt with the Fedora logo on it, underneath it says \"Freedom.  "
+"Friends.  Features.  First.\""
 msgstr ""
 
 #: lang/json/ARMOR_from_json.py
@@ -13060,6 +13168,19 @@ msgid ""
 "your belt or other webbing."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "stone pouch"
+msgid_plural "stone pouches"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stone pouch
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A medium-sized pouch for storing rocks, with straps for attaching it to your "
+"belt or other webbing."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "large grenade pouch"
 msgid_plural "large grenade pouches"
@@ -15735,6 +15856,19 @@ msgid ""
 "when you look at it. It would be useful for imbuing mana into material."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "silver infusion bracelet"
+msgid_plural "silver infusion bracelets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for silver infusion bracelet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This bracelet has runes engraved on it.  You sense a faint air of mysticism "
+"when you look at it.  It would be useful for imbuing mana into material."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper circlet"
 msgid_plural "copper circlets"
@@ -15845,6 +15979,115 @@ msgid_plural "pairs of black dragonhide gloves"
 msgstr[0] ""
 msgstr[1] ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of XL black dragonscale boots"
+msgid_plural "pairs of XL black dragonscale boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'pair of XL black dragonscale boots', 'str_pl': 'pairs of XL black dragonscale boots'}
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Massive boots made of black dragonscale, modified to fit even the strangest "
+"of bodies.  Very protective, and surprisingly light."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of XL black dragonhide boots"
+msgid_plural "pairs of XL black dragonhide boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'pair of XL black dragonhide boots', 'str_pl': 'pairs of XL black dragonhide boots'}
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Massive boots made of black dragonhide, modified to fit even the strangest "
+"of bodies.  Very protective, and surprisingly light."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "XL black dragonscale helmet"
+msgid_plural "XL black dragonscale helmets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for XL black dragonscale helmet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A massive helmet made from black dragonscale, held together with black "
+"dragonhide.  It comes equipped with a full face visor and is large enough to "
+"fit even the strangest of heads."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "XL black dragonhide helmet"
+msgid_plural "XL black dragonhide helmets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for XL black dragonhide helmet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A massive helmet made from black dragonhide.  It protects your head well, "
+"and doesn't cover your face, but is large enough to fit even the strangest "
+"of heads."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "XL black dragonscale armor"
+msgid_plural "XL black dragonscale armors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for XL black dragonscale armor
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A massive full suit of black dragon scale mail.  It comes with all the "
+"accoutrements that cover your torso, legs, and arms; sized to fit even the "
+"strangest of bodies."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "XL black dragonhide armor"
+msgid_plural "XL black dragonhide armors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for XL black dragonhide armor
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A massive full suit of black dragonhide armor.  It comes with all the "
+"accoutrements that cover your torso, legs, and arms; sized to fit even the "
+"strangest of bodies."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of XL black dragonscale gauntlets"
+msgid_plural "pairs of XL black dragonscale gauntlets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'pair of XL black dragonscale gauntlets', 'str_pl': 'pairs of XL black dragonscale gauntlets'}
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of heavy-duty gauntlets made of black dragonscale that covers your "
+"hands, or whatever you use as hands."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of XL black dragonhide gloves"
+msgid_plural "pairs of XL black dragonhide gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'pair of XL black dragonhide gloves', 'str_pl': 'pairs of XL black dragonhide gloves'}
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored leather gloves, modified to be easy to "
+"wear while providing maximum protection under extreme conditions.  Sized to "
+"fit even the strangest of anatomy."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "belt of strength +2"
 msgid_plural "belts of strength +2"
@@ -15941,6 +16184,24 @@ msgid ""
 "minimize encumbrance."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -16469,8 +16730,9 @@ msgstr[1] ""
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the substance."
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It "
+"can store up to 500ml and accept ethanol, methanol and denatured aclohol as "
+"fuel."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -16480,8 +16742,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from "
 "a fingertip in the form of water.  It may fail in very dry environments."
@@ -16732,12 +16993,12 @@ msgid ""
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid "Mini-Flamethrower CBM"
-msgid_plural "Mini-Flamethrower CBMs"
+msgid "Finger Lighter CBM"
+msgid_plural "Finger Lighter CBMs"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for Mini-Flamethrower CBM
+#. ~ Description for Finger Lighter CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "Powerful fire starters which extend from the tip of both hands' index "
@@ -20113,17 +20374,16 @@ msgstr ""
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of Gibson's \"Neuromancer\".  Written in the eighties, it was "
-"surprisingly accurate in predicting much of modern society...  Until "
-"recently."
+"surprisingly accurate in predicting much of modern society…  Until recently."
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid ""
-"This is a copy of \"The Stars My Destination\" by Alfred Bester.  \n"
+"This is a copy of \"The Stars My Destination\" by Alfred Bester.\n"
 "\n"
-"Tyger, Tyger, Burning bright,  \n"
-"In the forests of the night:  \n"
-"What immortal hand or eye,  \n"
+"Tyger, Tyger, Burning bright,\n"
+"In the forests of the night:\n"
+"What immortal hand or eye,\n"
 "Dare frame thy fearful symmetry?"
 msgstr ""
 
@@ -20141,12 +20401,6 @@ msgstr ""
 msgid "This copy of Ray Bradbury's \"Fahrenheit 451\"."
 msgstr ""
 
-#: lang/json/BOOK_from_json.py
-msgid ""
-"This is a well-worn copy of \"The Hitchhikers Guide to the Galaxy\" by "
-"Douglas Adams."
-msgstr ""
-
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Hyperion\" by Dan Simmons."
 msgstr ""
@@ -20156,9 +20410,9 @@ msgid ""
 "This is a copy of \"Endymion\" by Dan Simmons.  It opens with a poem by D.H. "
 "Lawrence:\n"
 "\n"
-"Give us gods. Oh give them us! \n"
-"Give us gods. \n"
-"We are so tired of men \n"
+"Give us gods.  Oh give them us!\n"
+"Give us gods.\n"
+"We are so tired of men\n"
 "And motor-power."
 msgstr ""
 
@@ -20424,6 +20678,12 @@ msgid ""
 "missing from the end of the book.  Luckily only mail-order advertisements."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a well-worn copy of \"The Hitchhikers Guide to the Galaxy\" by "
+"Douglas Adams."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "sports novel"
 msgid_plural "sports novels"
@@ -22189,6 +22449,20 @@ msgid ""
 "herein`."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl': 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -23566,6 +23840,40 @@ msgstr ""
 msgid "The stomach of a large humanoid creature.  It is surprisingly durable."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr ""
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr ""
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a "
+"very long time, and can be used as an ingredient in many foods and projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -23641,6 +23949,30 @@ msgid ""
 "the worst parts."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr ""
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr ""
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -24033,6 +24365,41 @@ msgid ""
 "many foods and projects."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr ""
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr ""
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It "
+"won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
 msgid_plural "chunks of tainted meat"
@@ -24218,6 +24585,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
+#: lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] ""
@@ -26884,6 +27252,17 @@ msgid ""
 "filling."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr ""
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to "
+"feed you for a day.  For debug use only."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr ""
@@ -30562,6 +30941,17 @@ msgstr[1] ""
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr ""
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr ""
@@ -34203,15 +34593,6 @@ msgstr[1] ""
 msgid "This rice flour is useful for baking."
 msgstr ""
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr ""
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr ""
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr ""
@@ -36448,6 +36829,18 @@ msgid ""
 "constructing tougher walls and such."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -36577,7 +36970,7 @@ msgstr[1] ""
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
+msgid "A large LCD television, full of delicious electronics."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -36996,6 +37389,19 @@ msgid ""
 "communications equipment."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -37740,10 +38146,10 @@ msgstr ""
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -38363,13 +38769,6 @@ msgid ""
 "chopping things and for use as a hammer."
 msgstr ""
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr ""
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -39577,7 +39976,9 @@ msgstr[1] ""
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
+#. ~ Use action menu_text for atomic headlamp.
 #: lang/json/GENERIC_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr ""
 
@@ -39605,7 +40006,9 @@ msgstr[1] ""
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
+#. ~ Use action menu_text for atomic headlamp (covered).
 #: lang/json/GENERIC_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr ""
 
@@ -46082,6 +46485,21 @@ msgid ""
 "attached for securely fastening the edges."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Crypto coins"
+msgid_plural "Crypto coinss"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Crypto coins
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"PrepNet had been heavily involved in avoiding taxes by using untraceable "
+"internet currencies.  If this movement had grown it could have crippled the "
+"US tax base but the cataclysm happened first. These are physical coins with "
+"random numbers sequences embossed on them."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py
 msgid "vehicle refrigerator"
 msgid_plural "vehicle refrigerators"
@@ -46203,6 +46621,21 @@ msgstr[1] ""
 msgid "A small pellet of fissile material.  Handle carefully."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "folded atomic butter churn"
+msgid_plural "folded atomic butter churns"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for folded atomic butter churn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"The Rivtech Churninator 4000, the only churn to be banned by 13 religious "
+"sects. The legs are currently folded up for travel. Unlike a standard churn "
+"that requires cream separated from raw milk this churn requires only raw "
+"milk, salt and a healthy respect for glowing objects."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "hydraulic gauntlet"
 msgid_plural "hydraulic gauntlets"
@@ -48258,6 +48691,56 @@ msgstr[1] ""
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr ""
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through "
+"the hammer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill.  "
+"If feels like Odin's protecting you."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god "
+"himself."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -49286,6 +49769,32 @@ msgid ""
 "yield greater numbers of seeds."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Lava Bomb"
 msgid_plural "Scroll of Lava Bombs"
@@ -49301,6 +49810,17 @@ msgid ""
 "rock and lava everywhere."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
@@ -50182,12 +50702,6 @@ msgid ""
 "ornaments."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] ""
-msgstr[1] ""
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -51125,6 +51639,12 @@ msgstr ""
 msgid "SPARE PARTS"
 msgstr ""
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py
+#: lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr ""
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr ""
@@ -51144,6 +51664,299 @@ msgstr ""
 msgid "WEAPON HELD"
 msgstr ""
 
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr ""
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr ""
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all "
+"food is moved here."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr ""
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr ""
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr ""
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr ""
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr ""
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr ""
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr ""
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr ""
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr ""
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr ""
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr ""
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr ""
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr ""
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr ""
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr ""
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr ""
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr ""
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr ""
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr ""
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr ""
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr ""
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr ""
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr ""
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr ""
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr ""
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr ""
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr ""
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr ""
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr ""
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -51721,7 +52534,7 @@ msgstr ""
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
+msgid "A 50-round drum magazine for the H&K G3 rifle."
 msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
@@ -51762,7 +52575,7 @@ msgstr ""
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
 msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
@@ -59712,6 +60525,33 @@ msgid ""
 "appears to remember its training."
 msgstr ""
 
+#: lang/json/MONSTER_from_json.py
+msgid "Cyber Mastiff"
+msgid_plural "Cyber Mastifs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Cyber Mastiff', 'str_pl': 'Cyber Mastifs'}
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic "
+"enhancements. These hounds defend Prep Phyle lands from all comers undead "
+"and otherwise."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "Cyber Mastiff puppy"
+msgid_plural "Cyber Mastiff puppies"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Cyber Mastiff puppy', 'str_pl': 'Cyber Mastiff puppies'}
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"An adorable, defenseless Cyber Mastiff puppy.  Much safer to tame than an "
+"adult dog. CBMs are implanted but immature in growth with the puppy."
+msgstr ""
+
 #: lang/json/MONSTER_from_json.py
 msgid "headless zombie"
 msgid_plural "headless zombies"
@@ -62910,6 +63750,20 @@ msgstr ""
 msgid "Translocates the user to an attuned gate."
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr ""
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr ""
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr ""
@@ -63202,6 +64056,10 @@ msgstr ""
 msgid "Lava Bomb"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr ""
@@ -63497,6 +64355,10 @@ msgstr ""
 msgid "Mirror Image"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr ""
@@ -64009,6 +64871,46 @@ msgid ""
 "It is turned on, and continually draining batteries.  Use it to turn it off."
 msgstr ""
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -66597,10 +67499,9 @@ msgstr[1] ""
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
 #: lang/json/TOOL_from_json.py
-#: src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py src/veh_interact.cpp
 msgid "Light"
 msgstr ""
 
@@ -66771,6 +67672,27 @@ msgid ""
 "fuse stuck inside of it."
 msgstr ""
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr ""
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses "
+"simple tinder."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -71335,38 +72257,6 @@ msgid_plural "hobo stoves"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr ""
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp
-#: src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr ""
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses "
-"simple tinder."
-msgstr ""
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr ""
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -75909,12 +76799,6 @@ msgid ""
 "This is a stick that has been cut into a trigger mechanism for a snare trap."
 msgstr ""
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] ""
-msgstr[1] ""
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -77081,6 +77965,17 @@ msgid ""
 "terribly when not on a rail."
 msgstr ""
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr ""
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr ""
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr ""
@@ -77480,10 +78375,6 @@ msgstr ""
 msgid "sorting out the loot"
 msgstr ""
 
-#: lang/json/activity_type_from_json.py
-msgid "tilling the farm plot"
-msgstr ""
-
 #: lang/json/activity_type_from_json.py
 msgid "fetching components"
 msgstr ""
@@ -77492,14 +78383,6 @@ msgstr ""
 msgid "farming"
 msgstr ""
 
-#: lang/json/activity_type_from_json.py
-msgid "planting seeds"
-msgstr ""
-
-#: lang/json/activity_type_from_json.py
-msgid "harvesting plots"
-msgstr ""
-
 #: lang/json/activity_type_from_json.py
 msgid "fertilizing plots"
 msgstr ""
@@ -77727,6 +78610,10 @@ msgstr ""
 msgid "pebbles"
 msgstr ""
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr ""
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr ""
@@ -78412,15 +79299,20 @@ msgstr ""
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr ""
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr ""
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr ""
@@ -78655,10 +79547,10 @@ msgid ""
 msgstr ""
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
+msgid "Finger Lighter"
 msgstr ""
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -78685,8 +79577,8 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing "
-"you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
+"you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -78782,7 +79674,7 @@ msgstr ""
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
+"Increases mouth encumbrance by ten."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -78813,7 +79705,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
+"mild optic neuropathy.  Increases eye encumbrance by ten."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -79130,7 +80022,7 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and "
 "don't let go (even when you'd rather they did).  Increases hand encumbrance "
-"by two, while failing to improve your ability to hold objects whatsoever."
+"by ten, while failing to improve your ability to hold objects whatsoever."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -80007,6 +80899,18 @@ msgstr ""
 msgid "Make Woodchip Floor"
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr ""
@@ -80657,6 +81561,10 @@ msgstr ""
 msgid "Build a radio tower console."
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr ""
@@ -85178,6 +86086,18 @@ msgid ""
 "welcome anyone in their faction, but hate the unnatural."
 msgstr ""
 
+#: lang/json/faction_from_json.py
+msgid "PrepNet Phyle"
+msgstr ""
+
+#. ~ Description for PrepNet Phyle
+#: lang/json/faction_from_json.py
+msgid ""
+"A group of bionic preppers who had expected the collapse of the economy and "
+"global chaos, instead they were slightly more ready than others for the "
+"Cataclysm."
+msgstr ""
+
 #: lang/json/faction_from_json.py
 msgid "Captives"
 msgstr ""
@@ -85208,25 +86128,48 @@ msgstr ""
 msgid "Dusty"
 msgstr ""
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
 #: lang/json/fault_from_json.py
 msgid "It's dusty.  Has no effect - obsolete fault."
 msgstr ""
 
+#. ~ name of mending method for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "Wipe clean"
+msgstr ""
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean you %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr ""
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr ""
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr ""
+
+#. ~ success message for mending method 'Reset to factory state' of fault 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr ""
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and, "
@@ -85235,22 +86178,44 @@ msgid ""
 "on reliability at high levels, but black powder fouling accumulates quickly."
 msgstr ""
 
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr ""
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr ""
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr ""
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr ""
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr ""
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
@@ -85261,89 +86226,199 @@ msgid ""
 "thousands of rounds without cleaning your firearm."
 msgstr ""
 
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
 msgstr ""
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr ""
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr ""
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr ""
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr ""
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr ""
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr ""
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr ""
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr ""
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr ""
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr ""
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr ""
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
 msgstr ""
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired air filter' of fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr ""
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
 msgstr ""
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr ""
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr ""
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr ""
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr ""
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr ""
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr ""
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty starter motor' of fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr ""
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp
 #: src/mapdata.cpp src/skill.cpp
@@ -85831,6 +86906,10 @@ msgstr ""
 msgid "smoke vent"
 msgstr ""
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr ""
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
 msgstr ""
@@ -86019,9 +87098,10 @@ msgid "A road barricade.  For barricading roads."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py
-#: lang/json/terrain_from_json.py src/map.cpp
-#: src/mapdata.cpp src/vehicle_move.cpp
+#: src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr ""
 
@@ -86141,6 +87221,7 @@ msgid "A carved statue made of stone."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py
 msgid "thump."
 msgstr ""
@@ -86217,7 +87298,6 @@ msgid ""
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py
 msgid "crunch."
 msgstr ""
@@ -86547,10 +87627,26 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py
 #: lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "shrub with bee hive"
+msgstr ""
+
+#. ~ Description for shrub with bee hive
+#: lang/json/furniture_from_json.py
+msgid ""
+"Shrub with a bee hive hidden somewhere deep inside.  A constant buzzing is "
+"heard near it."
+msgstr ""
+
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "brush."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "marloss flower"
 msgstr ""
@@ -87272,6 +88368,11 @@ msgid ""
 "disassembled for various electronic parts."
 msgstr ""
 
+#. ~ Description for this should never actually show up, it's a pseudo furniture
+#: lang/json/furniture_from_json.py
+msgid "this should never actually show up, it's a pseudo furniture"
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "cell phone signal booster"
 msgstr ""
@@ -87407,6 +88508,17 @@ msgstr ""
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr ""
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr ""
@@ -88524,6 +89636,17 @@ msgid ""
 "you wouldn't need to pay at all!"
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "atomic butter churn on a stand"
+msgstr ""
+
+#. ~ Description for atomic butter churn on a stand
+#: lang/json/furniture_from_json.py
+msgid ""
+"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready "
+"to add raw milk and salt. It will churn turn the earth is a cinder."
+msgstr ""
+
 #. ~ Description for vehicle refrigerator
 #: lang/json/furniture_from_json.py
 msgid ""
@@ -88622,6 +89745,15 @@ msgid ""
 "blood, candles, and other small knick-knacks."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr ""
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr ""
@@ -89243,6 +90375,18 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -89322,6 +90466,11 @@ msgid ""
 "blooming.  While powerful, it suffers from short range.  Powered by UPS."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+#: lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -89516,6 +90665,10 @@ msgid ""
 "stop fires or \"protesters\"."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -89881,11 +91034,6 @@ msgid ""
 "this barren proto-weapon."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-#: src/item_factory.cpp
-msgid "semi-auto"
-msgstr ""
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -92825,10 +93973,6 @@ msgid ""
 "and destruction it can cause."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr ""
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -93689,6 +94833,18 @@ msgid ""
 "stock to absorb recoil means some strength is required to fire."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the "
+"string.  It has gold and silver ornaments on it, as well as an ornate Raven."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -93803,12 +94959,6 @@ msgid ""
 "this weapon have a good chance of remaining intact for re-use."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -95394,8 +96544,8 @@ msgstr[1] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A suppressor designed to work with shotguns.  It's a lot more complex than a "
-"suppressor for a pistol or rifle."
+"A large suppressor designed to work with shotguns.  It's a lot more complex "
+"than a suppressor for a pistol or rifle."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -99930,6 +101080,14 @@ msgstr ""
 msgid "Toggle activate/examine"
 msgstr ""
 
+#: lang/json/keybinding_from_json.py
+msgid "Toggle safe fuel mod"
+msgstr ""
+
+#: lang/json/keybinding_from_json.py
+msgid "Toggle auto start mod"
+msgstr ""
+
 #: lang/json/keybinding_from_json.py src/martialarts.cpp
 msgid "Pause"
 msgstr ""
@@ -104193,6 +105351,10 @@ msgstr ""
 msgid "Arcane Skin"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr ""
@@ -108491,6 +109653,180 @@ msgstr ""
 msgid "Do you have the Molotov cocktails?"
 msgstr ""
 
+#: lang/json/mission_def_from_json.py
+msgid "Big Game Hunting"
+msgstr ""
+
+#. ~ Description for mission 'Big Game Hunting'
+#: lang/json/mission_def_from_json.py
+msgid "Find 50 fur pelts."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "I need 50 fur pelts."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"I've got to maintain the orchard but at nights I work on prepping winter "
+"clothes.  Could you find about... 50 fur pelts for me?"
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Don't forget to tell me when you have them."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "It's okay, I can do without them.  Just let me know if you reconsider."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"There's a lot of places to look.  The entire outdoors is full of wild "
+"animals."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "How is the search going?  Have you found'em?"
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"I really apreciate your help.  Don't worry, you won't leave empty-handed."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Don't worry about it, it's not that important."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Bread"
+msgstr ""
+
+#. ~ Description for mission 'Bread'
+#: lang/json/mission_def_from_json.py
+msgid "Find 50 flour."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "I need 50 flour."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Flour would let me break the monotony of fruit and meats."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"Thanks for accepting this task.  Otherwise I might kill a stranger for a "
+"sandwich. Just kidding."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Just let me know if you change your mind."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"Flour is not that hard to find.  I'd look for them in residental areas and "
+"professional kitchens or bakeries."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Have you found the flour?"
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Thank you for your help.  Here's your reward."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "It's not a big deal, it isn't that urgent."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Gallon Jugs"
+msgstr ""
+
+#. ~ Description for mission 'Gallon Jugs'
+#: lang/json/mission_def_from_json.py
+msgid "Find 5 gallon jugs."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "I need storage for various liquid products when the fruits come in."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"Every season we produce so much fruit. Some of it will be turned into juice "
+"and some into alcohol. I need easy containers to load it on the caravan."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Thank you for accepting.  I'm almost out after the last caravan."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "I guess I'll have to make stomach waterskins."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"Gallon jugs are not that rare to find.  They are commonly found in kitchens."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Do you have those jugs now?"
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "I am grateful for the help you've done. I have one more task to do."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Faulty CBMs"
+msgstr ""
+
+#. ~ Description for mission 'Faulty CBMs'
+#: lang/json/mission_def_from_json.py
+msgid "Find 5 faulty CBMs."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "We have the ability to manufacture CBMs but lack resources."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "If you can bring me faulty CBMs we can recycle them into new ones."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"Thank you for accepting.  You're really making yourself useful to the phyle."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"These materials are often in dangerous areas. I understand your decision."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"Zombie scientists, technicians, shocker zombies.  These are not undertaken "
+"lightly."
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid "Do you have those CBMs now?"
+msgstr ""
+
+#: lang/json/mission_def_from_json.py
+msgid ""
+"I am grateful for the help you've done. I think we might be able to "
+"introduce you to others soon."
+msgstr ""
+
 #. ~ 1$s is monster name, 2$s bodypart in accusative
 #: lang/json/monster_attack_from_json.py src/monattack.cpp
 #, c-format, no-python-format
@@ -110341,6 +111677,27 @@ msgid ""
 "footing."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr ""
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr ""
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr ""
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr ""
@@ -116237,6 +117594,17 @@ msgid ""
 "equivalent."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "PrepNet Tag"
+msgstr ""
+
+#. ~ Description for PrepNet Tag
+#: lang/json/mutation_from_json.py
+msgid ""
+"NPC trait that makes monsters see it as a Prepnet.  It is a bug if you have "
+"it."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Alpine Conditioning"
 msgstr ""
@@ -116968,6 +118336,15 @@ msgstr ""
 msgid "I'm the owner of a trade caravan."
 msgstr ""
 
+#: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
+#: lang/json/npc_from_json.py
+msgid "Gardener"
+msgstr ""
+
+#: lang/json/npc_class_from_json.py
+msgid "When the end came, we were ready. Now I grow food for my phyle."
+msgstr ""
+
 #: lang/json/npc_class_from_json.py
 msgid "Operator"
 msgstr ""
@@ -118532,6 +119909,10 @@ msgstr ""
 msgid "hotel parking"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr ""
@@ -118901,7 +120282,7 @@ msgid "spiked trench"
 msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
+msgid "fabrication workshop survey"
 msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
@@ -118916,6 +120297,14 @@ msgstr ""
 msgid "livestock survey"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr ""
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr ""
@@ -119602,6 +120991,10 @@ msgstr ""
 msgid "shooting range roof"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr ""
@@ -120047,6 +121440,10 @@ msgstr ""
 msgid "municipal reactor"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "PrepNet orchard"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "warehouse"
 msgstr ""
@@ -120268,10 +121665,6 @@ msgstr ""
 msgid "dense urban"
 msgstr ""
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr ""
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr ""
@@ -127283,11 +128676,6 @@ msgstr ""
 msgid "MEDICAL"
 msgstr ""
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr ""
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -129492,6 +130880,182 @@ msgid ""
 "a roof on the southwest side of the livestock field."
 msgstr ""
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of "
+"salt for our needs in a log building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of "
+"salt for our needs in a metal shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal "
+"wall brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of "
+"salt for our needs in a stone building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of "
+"salt for our needs in an adobe hut."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of "
+"salt for our needs in a wooden shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -129734,6 +131298,122 @@ msgstr ""
 msgid "build NW wood panel bedroom walls"
 msgstr ""
 
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southeast bedroom with a regular bed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southeast bedroom with a straw bed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the west bedroom with a straw bed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southeast bedroom with a makeshift bed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the west bedroom with a makeshift bed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southwest bedroom with a regular bed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southwest bedroom with a straw bed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southwest bedroom with a makeshift bed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southern bedroom with a regular beds."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "furnish the S bedroom"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southern bedroom with a straw beds."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southern bedroom with a makeshift beds."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southern bedroom with regular beds."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southern bedroom with straw beds."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Let's furnish the southern bedroom with makeshift beds."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"Let's build some living quarters so we can expand.  We will start in the "
+"northwest corner."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"Let's build some living quarters so we can expand.  We will continue along "
+"the west wall."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"Let's build some living quarters so we can expand.  We will continue along "
+"the southwest corner."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"Let's build some living quarters so we can expand.  We will continue along "
+"the south wall."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "build S log bedroom walls"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "build S rock bedroom walls"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "build S standard bedroom walls"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "build S wattle and daub bedroom walls"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "build NW wood bedroom walls"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "build W wood bedroom walls"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "build SW wood bedroom walls"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "build S wood bedroom walls"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We could use a large log central storage building.  Begin by building the "
@@ -130336,6 +132016,10 @@ msgstr ""
 msgid "Central Storage Building"
 msgstr ""
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr ""
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
 msgstr ""
@@ -132336,7 +134020,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Rotten food typically attracts bugs, and bugs got a lot bigger recently..."
+"Rotten food typically attracts bugs, and bugs got a lot bigger recently…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -132431,7 +134115,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Routine kills.  Stay alert! Don't let your guard down."
+msgid "Routine kills.  Stay alert!  Don't let your guard down."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -132525,7 +134209,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "A survivor saved is a friend earned.  Most of the time..."
+msgid "A survivor saved is a friend earned.  Most of the time…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -132742,7 +134426,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "There's this type of zombie that can shoot bolts of lightning!  Stay away "
-"from walls and stuff when they do... the electricity can travel along solid "
+"from walls and stuff when they do… the electricity can travel along solid "
 "surfaces."
 msgstr ""
 
@@ -132787,7 +134471,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Don't try to take on a skeleton with a bladed weapon... you'll just leave "
+"Don't try to take on a skeleton with a bladed weapon… you'll just leave "
 "scratch marks.  You've got to shatter those bones with a hammer or something."
 msgstr ""
 
@@ -132801,12 +134485,12 @@ msgstr ""
 msgid ""
 "I have a buddy who was sleeping in this cabin way out in the woods, when he "
 "suddenly woke up to trees and vines growing right up through the floor and "
-"walls!  He said it was some kind of huge tree beast..."
+"walls!  He said it was some kind of huge tree beast…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Oh man, have you gone down into the old subway systems?  I'd be careful... "
+"Oh man, have you gone down into the old subway systems?  I'd be careful… "
 "there's these things down there that are like zombies, but tougher."
 msgstr ""
 
@@ -132827,7 +134511,7 @@ msgstr ""
 msgid ""
 "Have you seen those eyebots flying around?  It's hard to say, but some "
 "faction's controlling them--maybe the military.  All I know is, I don't want "
-"them taking my picture..."
+"them taking my picture…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -132840,7 +134524,7 @@ msgstr ""
 msgid ""
 "They're rare, but molebots are nasty things.  They bore through the ground, "
 "then pop up to stab ya.  Still, you're safe from them if you stay on "
-"pavement..."
+"pavement…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -132857,7 +134541,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Zombies are pretty dumb... heck, most monsters are!  If you can get a fire "
+"Zombies are pretty dumb… heck, most monsters are!  If you can get a fire "
 "going between you and them, they'll just run straight through it."
 msgstr ""
 
@@ -132906,13 +134590,13 @@ msgstr ""
 msgid ""
 "For a good melee weapon, you can't beat a machete.  I've seen a guy take "
 "down a zombie brute with one!  Of course, if you can find a katana, that "
-"might be even better..."
+"might be even better…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
 "A knife spear makes a good weapon in a pinch, but a spike strapped to a "
-"stick isn't the sturdiest construction. At least you can strap the spike "
+"stick isn't the sturdiest construction.  At least you can strap the spike "
 "back on when it comes off."
 msgstr ""
 
@@ -132920,7 +134604,7 @@ msgstr ""
 msgid ""
 "You know, a glass bottle can make a good weapon in a pinch.  If you break it "
 "over someone's head, the shattering glass will hurt them extra.  Of course, "
-"it might hurt your hands, too..."
+"it might hurt your hands, too…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -132989,8 +134673,8 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "I've seen a couple guys running around with laser pistols.  They seem like "
-"the perfect weapon... quiet, accurate, and deadly.  But I've never found "
-"one, and I bet ammo is wicked scarce..."
+"the perfect weapon… quiet, accurate, and deadly.  But I've never found one, "
+"and I bet ammo is wicked scarce…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -133020,7 +134704,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"There's basically no reason not to wear safety glasses... nothing is worse "
+"There's basically no reason not to wear safety glasses… nothing is worse "
 "than taking a hit to the eyes and getting blinded for a few seconds."
 msgstr ""
 
@@ -133259,7 +134943,7 @@ msgstr ""
 msgid ""
 "I've spent many nights in the changing rooms at the back of clothing "
 "stores.  Walls on four sides, far from the store's entrance, a corridor for "
-"easy defense... it's perfect!"
+"easy defense… it's perfect!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -133379,7 +135063,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"They said: go solar, save the environment and yourself.  Well... there is no "
+"They said: go solar, save the environment and yourself.  Well… there is no "
 "environment to save now, but one can still save thyself I guess."
 msgstr ""
 
@@ -133397,8 +135081,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"So, methinks: if you could convince the cop-bots that you are their "
-"superior..."
+"So, methinks: if you could convince the cop-bots that you are their superior…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -133424,7 +135107,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"I'm fed up with smoked meat, but it lasts so long.  Well... if I had more "
+"I'm fed up with smoked meat, but it lasts so long.  Well… if I had more "
 "heart for learning cooking I guess I'd be able to diversify my food without "
 "sacrificing its shelf life."
 msgstr ""
@@ -133475,7 +135158,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Met a mad chemist once.  She made a battery from a potato... or was it lemon?"
+"Met a mad chemist once.  She made a battery from a potato… or was it lemon?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -133501,7 +135184,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"I've heard of a gang called The Doctors. You know, bank robbers wearing "
+"I've heard of a gang called The Doctors.  You know, bank robbers wearing "
 "stethoscopes.  What are they trying to achieve?  I use paper money to start "
 "fires now."
 msgstr ""
@@ -133517,7 +135200,7 @@ msgstr ""
 msgid ""
 "I thought about putting a bag on my dog to carry some of my stuff.  It "
 "didn't work, because it was a chihuahua, and it was eaten by a rottweiler.  "
-"Should have put some kevlar on it like those Z9.  Oh well..."
+"Should have put some kevlar on it like those Z9.  Oh well…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -133652,10 +135335,10 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "I know it's not best of times, but try to sleep well.  You're not yourself "
-"if you're sleep deprived.  Grab a pillow and a blanket. If you can't, even a "
-"teddy bear under your head and a pile of clothes to keep you warm can make a "
-"difference.  And pick a spot well, even a chair or a bench is better than a "
-"cold ground."
+"if you're sleep deprived.  Grab a pillow and a blanket.  If you can't, even "
+"a teddy bear under your head and a pile of clothes to keep you warm can make "
+"a difference.  And pick a spot well, even a chair or a bench is better than "
+"a cold ground."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -133686,16 +135369,16 @@ msgid "You don't need thorazine, it's limiting you."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Thorazine... That's what 'they' use to keep you tame."
+msgid "Thorazine…  That's what 'they' use to keep you tame."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Don't. This thorazine seriously clouds your mind. You need to stay sharp."
+"Don't.  This thorazine seriously clouds your mind.  You need to stay sharp."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Pink tablets! I love those!"
+msgid "Pink tablets!  I love those!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -133715,11 +135398,11 @@ msgid "Perfect, those pink tablets will keep us going, take some!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "You know what would make all this more bearable? Pink Tablets!"
+msgid "You know what would make all this more bearable?  Pink Tablets!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "An odd pink tablet from the ground? I don't see why not!"
+msgid "An odd pink tablet from the ground?  I don't see why not!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -133735,7 +135418,7 @@ msgid "I don't want to trade with you."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I have the best stuff. And I'm keeping it!"
+msgid "I have the best stuff.  And I'm keeping it!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -133779,7 +135462,7 @@ msgid "Who put you in charge of what I do?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Great idea! Call me when you find SOMEONE ELSE to do it."
+msgid "Great idea!  Call me when you find SOMEONE ELSE to do it."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134031,7 +135714,7 @@ msgid "I'm parched, I need to drink something."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I'm thirsty..."
+msgid "I'm thirsty…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134055,7 +135738,7 @@ msgid "<ill_die> if I don't drink something."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Water... Is there an oasis nearby?"
+msgid "Water…  Is there an oasis nearby?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134086,13 +135769,13 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "Hey <name_g>, I bet a chat would be all the sweeter with a nice, cold beer "
-"in hand. How's it going?"
+"in hand.  How's it going?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"While we chat, what say you we open a beer and just... pretend the world "
-"isn't ending, just for a while?"
+"While we chat, what say you we open a beer and just… pretend the world isn't "
+"ending, just for a while?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134140,15 +135823,16 @@ msgid "Definitely, I'm game.  How you holding up?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Good idea <name_g>. Let's forget the world for a while. How you doin'?"
+msgid ""
+"Good idea <name_g>.  Let's forget the world for a while.  How you doin'?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Ah, what the heck. How's life been treating you?"
+msgid "Ah, what the heck.  How's life been treating you?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Sure. So, how about that weather ey?"
+msgid "Sure.  So, how about that weather ey?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134244,6 +135928,7 @@ msgid "dejected"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
+msgctxt "<sad>"
 msgid "down"
 msgstr ""
 
@@ -134251,7 +135936,8 @@ msgstr ""
 msgid "glum"
 msgstr ""
 
-#: lang/json/snippet_from_json.py src/color.cpp
+#: lang/json/snippet_from_json.py
+msgctxt "<sad>"
 msgid "blue"
 msgstr ""
 
@@ -134323,7 +136009,8 @@ msgstr ""
 msgid "never"
 msgstr ""
 
-#: lang/json/snippet_from_json.py src/auto_note.cpp src/editmap.cpp
+#: lang/json/snippet_from_json.py
+msgctxt "<no>"
 msgid "no"
 msgstr ""
 
@@ -134424,7 +136111,7 @@ msgid "Our paths must part, for now at least."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "There's something I gotta do on my own. Sorry."
+msgid "There's something I gotta do on my own.  Sorry."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134672,7 +136359,7 @@ msgid "I don't belong to a faction, <name_g>."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I'm currently not under any contract. Why, you hiring?"
+msgid "I'm currently not under any contract.  Why, you hiring?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134828,7 +136515,7 @@ msgid "What time is it?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I'm tired..."
+msgid "I'm tired…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134860,7 +136547,7 @@ msgid "I'll just go to sleep, <okay>?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I just...gotta close my eyes for a bit, okay?"
+msgid "I just… gotta close my eyes for a bit, okay?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134868,7 +136555,7 @@ msgid "Can't remember the last time I had a proper kip."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I can't keep going for long <name_g>. I need some rest, bad."
+msgid "I can't keep going for long <name_g>.  I need some rest, bad."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134896,7 +136583,7 @@ msgid "Good night!  Wake me if you need me."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Calling it a night for now. You get some rest too, okay?"
+msgid "Calling it a night for now.  You get some rest too, okay?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -134995,11 +136682,13 @@ msgstr ""
 msgid "staggeringly"
 msgstr ""
 
-#: lang/json/snippet_from_json.py src/iuse.cpp
+#: lang/json/snippet_from_json.py
+msgctxt "<okay>"
 msgid "fine"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
+msgctxt "<okay>"
 msgid "okay"
 msgstr ""
 
@@ -135012,6 +136701,7 @@ msgid "you dig"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
+msgctxt "<okay>"
 msgid "dig"
 msgstr ""
 
@@ -135144,7 +136834,7 @@ msgid "See you in hell, <name_b>!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I'm outta here! <done_mugging>"
+msgid "I'm outta here!  <done_mugging>"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135160,11 +136850,11 @@ msgid "Now beat it, you <name_b>."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Good haul. See you around<punc>"
+msgid "Good haul.  See you around<punc>"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Hey! I <swear> saw you take that <name_b>! Drop it. Now."
+msgid "Hey!  I <swear> saw you take that <name_b>!  Drop it.  Now."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135176,7 +136866,7 @@ msgid "I've got eyes, you <swear> <name_b> thief!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Hey! That belongs to us! Drop it."
+msgid "Hey!  That belongs to us!  Drop it."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135184,7 +136874,7 @@ msgid "<swear>, I've seen a <swear> thief!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I saw that! Drop what you just stole!"
+msgid "I saw that!  Drop what you just stole!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135197,7 +136887,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "You think I'm <swear> blind <name_b>? Don't touch our stuff."
+msgid "You think I'm <swear> blind <name_b>?  Don't touch our stuff."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135205,7 +136895,7 @@ msgid "You have one chance to put it back."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Return the stolen goods. You have to the count of three to comply."
+msgid "Return the stolen goods.  You have to the count of three to comply."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135310,11 +137000,11 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Please put down your weapon. I'll give you to the count of three. One..."
+"Please put down your weapon.  I'll give you to the count of three.  One…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Let's take it easy now, okay? Put the weapon down."
+msgid "Let's take it easy now, okay?  Put the weapon down."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135394,7 +137084,7 @@ msgid "Look, <name_g><punc> let's talk!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Hey, what's the rush? Let's chat a tad."
+msgid "Hey, what's the rush?  Let's chat a tad."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135510,7 +137200,7 @@ msgid "Perfect time for a lunch break."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I'm hungry..."
+msgid "I'm hungry…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135700,7 +137390,7 @@ msgid "Bombs away!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Shrapnel, incoming! Watch it!"
+msgid "Shrapnel, incoming!  Watch it!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135740,7 +137430,7 @@ msgid "Incoming!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Prepare yourself! We have a"
+msgid "Prepare yourself!  We have a"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -135960,7 +137650,7 @@ msgid "I'd kill for a coke."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Weapons check everyone. There may be more."
+msgid "Weapons check everyone.  There may be more."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136172,12 +137862,12 @@ msgid "Watch my back while I stitch my arm back on <name_g>."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Gotta bandage this or I'll bleed out. Give me a sec."
+msgid "Gotta bandage this or I'll bleed out.  Give me a sec."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"I ain't got time to ble-wait, that's a lot of blood. Give me a second while "
+"I ain't got time to ble-wait, that's a lot of blood.  Give me a second while "
 "I patch this."
 msgstr ""
 
@@ -136311,7 +138001,7 @@ msgid "Aye."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Whew... smells like skunk!"
+msgid "Whew… smells like skunk!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136355,7 +138045,7 @@ msgid "Is that the devil's lettuce I smell?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I don't know... should you really be smoking that stuff?"
+msgid "I don't know… should you really be smoking that stuff?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136371,7 +138061,7 @@ msgid "You're going to kill yourself smoking that stuff, <name_g>."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Oh, wow, that smell... Can I have some?"
+msgid "Oh, wow, that smell…  Can I have some?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136379,7 +138069,7 @@ msgid "I smell heresy."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Seriously? You're smoking that?"
+msgid "Seriously?  You're smoking that?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136416,7 +138106,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Internal batteries running low. How many batteries can you spare right now?"
+"Internal batteries running low.  How many batteries can you spare right now?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136431,13 +138121,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
+msgid "Pass some ethanol, I need to power my ethanol burner."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136445,19 +138129,12 @@ msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on you?"
+msgid "I require ethanol for my internal power supply.  Anything on you?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
+"Got any alcohol to spare?  Need to recharge my drives.  Methanol, would do."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136574,11 +138251,11 @@ msgid "I'd like to ask you about something else."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Moving on..."
+msgid "Moving on…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Anyway..."
+msgid "Anyway…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136594,7 +138271,7 @@ msgid "Let's head out."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Time's a-wasting. Let's head out."
+msgid "Time's a-wasting.  Let's head out."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136606,7 +138283,7 @@ msgid "Let's hit the road."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "We'll pick this up another time. Let's go."
+msgid "We'll pick this up another time.  Let's go."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136875,7 +138552,7 @@ msgid "<move>!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Retreat! Retreat!"
+msgid "Retreat!  Retreat!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136919,7 +138596,7 @@ msgid "Put the fire out!  Put it out!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Fire bad! <move>!"
+msgid "Fire bad!  <move>!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -137147,7 +138824,7 @@ msgid ""
 "potent EM radiation source, and the origin of the interference.  After 30 "
 "min, PE-01 receded and the expedition was aborted in accordance of procedure "
 "EMER-12.  The expedition team suffered no injuries, physical or mental, "
-"during the incident. \n"
+"during the incident.\n"
 "\n"
 "It's become clear we have greatly underestimated the risk posed by phase "
 "immersions.  Engineering has been tasked with designing a new, improved "
@@ -137178,7 +138855,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "\n"
-"ANALISIS OF TRANSPLANAR MATERIALS \n"
+"ANALISIS OF TRANSPLANAR MATERIALS\n"
 "\n"
 "T-SUBSTRATE\n"
 "\n"
@@ -137500,8 +139177,8 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Awareness seems to only come with a battle... and your body seem to be on "
-"its side."
+"Awareness seems to only come with a battle… and your body seem to be on its "
+"side."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -137540,6 +139217,11 @@ msgstr ""
 msgid "funky"
 msgstr ""
 
+#: lang/json/snippet_from_json.py
+msgctxt "<musicdesc_evaluation>"
+msgid "okay"
+msgstr ""
+
 #: lang/json/snippet_from_json.py
 msgid "pretty good"
 msgstr ""
@@ -138201,7 +139883,7 @@ msgid "How are you today?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Shut up! Don't lie to me."
+msgid "Shut up!  Don't lie to me."
 msgstr ""
 
 #: lang/json/snippet_from_json.py src/iuse.cpp
@@ -138323,7 +140005,7 @@ msgid "Shouldn't you put a bandage on that?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Please don't die! No one else lets me kill things!"
+msgid "Please don't die!  No one else lets me kill things!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -138351,7 +140033,7 @@ msgid "I need healing!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I hurt all over..."
+msgid "I hurt all over…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -138359,7 +140041,7 @@ msgid "You can put me back together, right?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "I... I can't move my legs!"
+msgid "I… I can't move my legs!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -138375,7 +140057,7 @@ msgid "They got me!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "*cough cough* Go on without me..."
+msgid "*cough cough* Go on without me…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -138434,7 +140116,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "You are being watched... by THEM."
+msgid "You are being watched… by THEM."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -138494,7 +140176,7 @@ msgid "\"Stay away from me!\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "\"No! Stop!\""
+msgid "\"No!  Stop!\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -138555,7 +140237,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 #, no-python-format
-msgid "%1$s was working for... THEM"
+msgid "%1$s was working for… THEM"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -138833,21 +140515,21 @@ msgid ""
 "repeated in several languages, reads: Due to the recent outbreak of the A "
 "H3N2 flu strain, the CDC would like to remind the public to cover your nose "
 "and mouth with a tissue when you cough or sneeze and wash your hands "
-"frequently with soap and water. The CDC also recommends an annual flu "
+"frequently with soap and water.  The CDC also recommends an annual flu "
 "vaccine for everyone 6 months of age and older, which can be found at your "
 "local doctor's office or pharmacy."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"This is a public alert from the Centers for Disease Control. Its message, "
+"This is a public alert from the Centers for Disease Control.  Its message, "
 "repeated in several languages, reads: PUBLIC HEALTH ALERT: Due to recent "
-"events, the CDC is issuing a warning to avoid public areas and spaces. An "
+"events, the CDC is issuing a warning to avoid public areas and spaces.  An "
 "unknown biological contaminant is suspected to be affecting citizens, "
-"possibly an unexpected mutation in the A H3N2 flu strain. The CDC would like "
-"to remind the public to cover your nose and mouth when sneezing, wash your "
-"hands frequently, and recieve an up-to-date flu shot if possible. Boiling "
-"water is recommended until further notice."
+"possibly an unexpected mutation in the A H3N2 flu strain.  The CDC would "
+"like to remind the public to cover your nose and mouth when sneezing, wash "
+"your hands frequently, and recieve an up-to-date flu shot if possible.  "
+"Boiling water is recommended until further notice."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -138855,17 +140537,18 @@ msgid ""
 "This is a public alert from the Federal Emergency Management Agency.  Its "
 "message, repeated in several languages, reads: STAY IN YOUR HOMES!  All "
 "residents of the New England Disaster Area are advised to shelter in place "
-"wherever possible. The United States Armed Forces are working to contain the "
-"area. If there is a nearby evacuation shelter you can get to safely, you are "
-"recommended to do so. Otherwise, stay in your homes until authorized "
-"personnel evacuate you to a secured facility. Thank you for your compliance."
+"wherever possible.  The United States Armed Forces are working to contain "
+"the area.  If there is a nearby evacuation shelter you can get to safely, "
+"you are recommended to do so.  Otherwise, stay in your homes until "
+"authorized personnel evacuate you to a secured facility.  Thank you for your "
+"compliance."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
 "This is a public alert from the Federal Emergency Management Agency.  Its "
 "message, repeated in several languages, consists of a list of towns serving "
-"as major evacuation points from the New England Disaster Area. Someone has "
+"as major evacuation points from the New England Disaster Area.  Someone has "
 "scribbled off most of the town names, and scrawled \"OVERRUN\" next to each "
 "one, with the exception of the Tacoma evacuation point."
 msgstr ""
@@ -138875,9 +140558,9 @@ msgid ""
 "This is a public warning from an unnamed source.  Its rambling message, "
 "poorly-photocopied onto both sides of the page, reads: Don't believe the "
 "lies!  The Army is rounding up people in death camps and executing them at "
-"mass graves. They cannot stop this.  Do not believe what the mainstream news-"
-"media is reporting.  All official evacuation points are death-traps.  Secure "
-"supplies and escape the cities while there is still time."
+"mass graves.  They cannot stop this.  Do not believe what the mainstream "
+"news-media is reporting.  All official evacuation points are death-traps.  "
+"Secure supplies and escape the cities while there is still time."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -138896,7 +140579,7 @@ msgid ""
 "has declared unilateral martial law to be in effect for the 48 contiguous "
 "states in response to the ongoing national crisis.  Continue to shelter in "
 "place until evacuated to an appropriate emergency management camp by "
-"authorized military personnel. A 24-hour curfew has been established. This "
+"authorized military personnel.  A 24-hour curfew has been established.  This "
 "curfew will remain in effect until further notice.  Stay indoors.  Violators "
 "will be shot on sight."
 msgstr ""
@@ -139142,8 +140825,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"\"A man in a black robe came up to me, said he wanted to make a deal...\""
+msgid "\"A man in a black robe came up to me, said he wanted to make a deal…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139156,7 +140838,7 @@ msgstr ""
 msgid ""
 "\"If only I had had more time with that Autodoc I could have saved them!  "
 "But with that damn chip in their brain those poor cyborg wil never be human "
-"again...\""
+"again…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139282,7 +140964,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"I get air conditioners, but... this whole laboratory is frozen to ice!\""
+"\"I get air conditioners, but… this whole laboratory is frozen to ice!\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139299,7 +140981,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"Imagine if this spread to, like, Australia.  Zombie kangaroos.  Haha...\""
+"\"Imagine if this spread to, like, Australia.  Zombie kangaroos.  Haha…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139335,7 +141017,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "\"Those evac shelters have basements.  Remember when they were full of "
-"food?  Every single one is fucking empty now...\""
+"food?  Every single one is fucking empty now…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139359,7 +141041,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "\"Local auto shop is full of the things.  And to think I worked with them on "
-"repairing cars... now they're just... fucking corpses.\""
+"repairing cars… now they're just… fucking corpses.\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139368,13 +141050,13 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"I used to be human.  But... my arms... they are like tentacles.  I slither "
+"\"I used to be human.  But… my arms… they are like tentacles.  I slither "
 "along akin to a snail and I shed my feathers every day.\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"Killed a giant worm thing, but now I'm only three feet tall. Should've "
+"\"Killed a giant worm thing, but now I'm only three feet tall.  Should've "
 "just left the damn worm alone, now none of my clothes fit!\""
 msgstr ""
 
@@ -139421,8 +141103,8 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"The bricks of this bathroom look like a face.  Haha... it's all I can "
-"focus on.  At least let me shit before you break down the door.  Please...\""
+"\"The bricks of this bathroom look like a face.  Haha… it's all I can focus "
+"on.  At least let me shit before you break down the door.  Please…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139439,8 +141121,8 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"If you see a trail of dirt getting displaced in your direction... run.  "
-"Run for your life.\""
+"\"If you see a trail of dirt getting displaced in your direction… run.  Run "
+"for your life.\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139454,7 +141136,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "\"I swear to God I've seen these plant things before!  In a book, or "
-"something!  I swear...\""
+"something!  I swear…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139468,13 +141150,13 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"I found some kind of stone pyramid with spikes.  I feel... I feel like I'm "
+"\"I found some kind of stone pyramid with spikes.  I feel…  I feel like I'm "
 "being watched.\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"Why would you ever hide in a damn gun store?  The owner... he was a moron "
+"\"Why would you ever hide in a damn gun store?  The owner… he was a moron "
 "alright.\""
 msgstr ""
 
@@ -139504,8 +141186,8 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"I thought my damn terminal cancer was bad enough... now the dead are "
-"rising?!\""
+"\"I thought my damn terminal cancer was bad enough… now the dead are rising?!"
+"\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139519,7 +141201,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"Everyone used their gas to get to another town... but it's the same story "
+"\"Everyone used their gas to get to another town… but it's the same story "
 "everywhere.\""
 msgstr ""
 
@@ -139599,8 +141281,8 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"They said a walking cane was a useless weapon... but then I hit one of "
-"them with it.\""
+"\"They said a walking cane was a useless weapon… but then I hit one of them "
+"with it.\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139629,7 +141311,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"My skin is crawling and I teleport every few minutes... what is going o\""
+"\"My skin is crawling and I teleport every few minutes… what is going o\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139637,7 +141319,7 @@ msgid "\"You can't see them through the smoke but they can't either.\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "\"There's gotta be a better use of all this rebar...\""
+msgid "\"There's gotta be a better use of all this rebar…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139664,7 +141346,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"Anyone else seen those really... SQUARE-looking towns?  I don't think "
+"\"Anyone else seen those really… SQUARE-looking towns?  I don't think "
 "they're normal.\""
 msgstr ""
 
@@ -139740,7 +141422,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"So... what happens if the military rescues us?  We're all freaks by now, "
+"\"So… what happens if the military rescues us?  We're all freaks by now, "
 "right?  How the fuck are we gonna go back to real life?\""
 msgstr ""
 
@@ -139761,7 +141443,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "\"Heard of a place up in Maine where people have their shit together.  "
-"Hundreds of people, defense, food and shelter... let's go raid it, guys!\""
+"Hundreds of people, defense, food and shelter… let's go raid it, guys!\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139821,8 +141503,8 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"This is all just a dream, right??! I'M GOING TO WAKE UP, SHE'S GOING TO BE "
-"OK\""
+"\"This is all just a dream, right??!  I'M GOING TO WAKE UP, SHE'S GOING TO "
+"BE OK\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139941,14 +141623,14 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"WBLF 970 went off-air three days ago. There's nobody left on the radio. "
-"Might as well throw this thing away...\""
+"\"WBLF 970 went off-air three days ago.  There's nobody left on the radio.  "
+"Might as well throw this thing away…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"I've heard it's safer across the Mississippi. Going to start driving "
-"today. If you're reading this, pray for me\""
+"\"I've heard it's safer across the Mississippi.  Going to start driving "
+"today.  If you're reading this, pray for me\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139987,7 +141669,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "\"Check out my cooking show on The Television!  Making Mannwurst sausages "
-"out of some of those assholes who tried to raid my kitchen earlier...\""
+"out of some of those assholes who tried to raid my kitchen earlier…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140018,7 +141700,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "\"when it started, we could still hope The Man was gonna save us...\""
+msgid "\"when it started, we could still hope The Man was gonna save us…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140041,9 +141723,9 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"This has to be China's fault. Seriously, why is nobody suspecting the "
-"people we're having a cold war with! This is an invasion! These aren't "
-"zombies, it's just camoflauge! WAKE UP, SHEEPLE!\""
+"\"This has to be China's fault.  Seriously, why is nobody suspecting the "
+"people we're having a cold war with!  This is an invasion!  These aren't "
+"zombies, it's just camoflauge!  WAKE UP, SHEEPLE!\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140116,7 +141798,7 @@ msgid "\"ay why aint my bullets fuckin explodin\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "\"Those Fiktok clan people picked this place clean... no food...\""
+msgid "\"Those Fiktok clan people picked this place clean… no food…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140134,8 +141816,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"\"Got my mortar and pestle.  Now if I could just find some avocados...\""
+msgid "\"Got my mortar and pestle.  Now if I could just find some avocados…\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140238,7 +141919,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"\"followed what toby wrote down. shells looked like theyd hold more, I put "
+"\"followed what toby wrote down.  shells looked like theyd hold more, I put "
 "in some more.  traded most to h raiders for crank.  shot my 38 today and it "
 "fuckn exploded.  low on crank, good as dead, no gun, no toby.  headed to "
 "montreal real sorry bout the bullets\""
@@ -140265,7 +141946,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "RIOTERS NOT HUMAN?: An earlier command by regional police has backfired.  "
-"\"The hooligans don't register as human.\" says a local police chief. \"The "
+"\"The hooligans don't register as human.\" says a local police chief.  \"The "
 "securibots turned on us when we tried to fight them.  We don't have enough "
 "people left to reprogram them.\""
 msgstr ""
@@ -140273,8 +141954,8 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "GENETIC MODIFICATIONS?: Eyewitnesses from the New England Disaster Area have "
-"claimed that the infected are displaying inhuman qualities. \"I swear to "
-"God, one of them was the size of a tree!\", said one panicked survivor. "
+"claimed that the infected are displaying inhuman qualities.  \"I swear to "
+"God, one of them was the size of a tree!\", said one panicked survivor.  "
 "There are also reports of infected with acidic and/or electric properties."
 msgstr ""
 
@@ -140282,7 +141963,7 @@ msgstr ""
 msgid ""
 "SUPER-SOLDIERS DEPLOYED: General Westinghouse released a statement today "
 "that elite troops equipped with top-of-the-line experimental combat bionics "
-"have been deployed via helicopter into the New England Disaster Area. "
+"have been deployed via helicopter into the New England Disaster Area.  "
 "\"Through the strength of American technology and American soldiers, we will "
 "fix this disaster!\""
 msgstr ""
@@ -140360,7 +142041,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"SECURIBOTS: Keeping your home safe, ready the second the alarm goes off...  "
+"SECURIBOTS: Keeping your home safe, ready the second the alarm goes off…  "
 "Who needs people?"
 msgstr ""
 
@@ -140392,14 +142073,14 @@ msgstr ""
 msgid ""
 "A WHOLE NEW YOU!  Augment your world with CBMs!  This ad features a man "
 "covered in glowing tattoos with a miniature flashlight in the middle of his "
-"head. He's waving at the reader; all of his fingertips are Allen wrenches."
+"head.  He's waving at the reader; all of his fingertips are Allen wrenches."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"The Future...  powered by COFFEE!  Rivtech brings you the greatest "
-"revolution since espresso.  Why wait for milk to boil?  Have your coffee "
-"ready instantly with \"THE POWER OF THE ATOM\"!"
+"The Future… powered by COFFEE!  Rivtech brings you the greatest revolution "
+"since espresso.  Why wait for milk to boil?  Have your coffee ready "
+"instantly with \"THE POWER OF THE ATOM\"!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140499,7 +142180,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Coffee of The Future...  RIGHT NOW!  No one has really has the time to make "
+"Coffee of The Future… RIGHT NOW!  No one has really has the time to make "
 "great coffee, but now you don't have to!  Rivtech gives you inexhaustible "
 "ATOMIC power!  To make boiling hot coffee the MINUTE you want it!  Atomic "
 "Coffeemaker."
@@ -140514,7 +142195,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"BIRDHOUSE MONTHLY...  This month we look at some Dutch innovations in "
+"BIRDHOUSE MONTHLY…  This month we look at some Dutch innovations in "
 "birdhouse design, and compare with the often confused Scandinavian Birdhouse "
 "design.  Our article on sheet metal birdhouses will have you riveted!"
 msgstr ""
@@ -140539,8 +142220,8 @@ msgid ""
 "MUTANT COLD: A new cold virus has emerged in the New England area.  \"There "
 "don't appear to be complications, but many sufferers are dealing with sudden "
 "muscle weakness and a greater-than-normal amount of lethargy from this virus,"
-"\" said a doctor. \"In addition, it's been documented to last up to ten days."
-"\""
+"\" said a doctor.  \"In addition, it's been documented to last up to ten "
+"days.\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140571,21 +142252,21 @@ msgstr ""
 msgid ""
 "DRUG USE ON THE RISE: Recent statistic suggest drug use in New England has "
 "climbed more than 20% in the last two years.  \"People are scared for their "
-"jobs, their country, even their life...  of course some will turn to drugs,"
-"\" said an expert."
+"jobs, their country, even their life… of course some will turn to drugs,\" "
+"said an expert."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
 "FEELING BLUE?  Try \"Greens\" for Magazines!  Your local Supermarket!  "
-"Nothing cheers you up like a good magazine...  Unless it's JUNK FOOD!  Or "
-"why not buy an MP3 PLAYER or a GAME CONSOLE?  Chase those blues away at "
-"GREENS Supermarket"
+"Nothing cheers you up like a good magazine…  Unless it's JUNK FOOD!  Or why "
+"not buy an MP3 PLAYER or a GAME CONSOLE?  Chase those blues away at GREENS "
+"Supermarket"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"BIRDHOUSE MONTHLY...  Which wood would a woodpecker prefer?  This month we "
+"BIRDHOUSE MONTHLY…  Which wood would a woodpecker prefer?  This month we "
 "discuss hardwood versus soft woods, whether to lacquer, oil or paint, and "
 "which type of nails you should use!"
 msgstr ""
@@ -140600,18 +142281,18 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-" ...What do you know about surviving in the Wilderness?  If you can't make a "
+"…What do you know about surviving in the Wilderness?  If you can't make a "
 "snare you don't know TRAP!  Hunt down a copy of TRAPPERS' LIFE and learn "
-"about wildlife!...  And how to kill it.  This week, a CROSSBOW TRAP!"
+"about wildlife!…  And how to kill it.  This week, a CROSSBOW TRAP!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
 "NEW LAB OPENS: The H.R. Bennett Research Facility has been officially opened "
-"by the Department of Energy. According to Deputy Secretary of Energy Randall "
-"Balakrishnan , \"This facility is one of the most state-of-the-art in the "
-"world. With the opening of the H.R. Bennett research complex, New England's "
-"future is looking brighter than ever.\""
+"by the Department of Energy.  According to Deputy Secretary of Energy "
+"Randall Balakrishnan, \"This facility is one of the most state-of-the-art in "
+"the world.  With the opening of the H.R. Bennett research complex, New "
+"England's future is looking brighter than ever.\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140620,7 +142301,7 @@ msgid ""
 "unpopularly, the president today suggested the possible institution of a "
 "peacetime draft in response to increasing Chinese aggression towards Taiwan "
 "and the Philippines.  \"We must pray for the best while preparing for the "
-"worst. We cannot abandon key allies in the face of Chinese bullying.\""
+"worst.  We cannot abandon key allies in the face of Chinese bullying.\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140651,14 +142332,14 @@ msgid ""
 "TIME TRAVEL: TRUTH OR FICTION?  Leaked federal documents describe the "
 "formation of a new federal agency called XEDRA, to oversee \"4th Axis "
 "technology\" already in use.  Our expert's opinion suggests time-travel or "
-"parallel worlds. The meaning of the acronym is currently unknown."
+"parallel worlds.  The meaning of the acronym is currently unknown."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-" ...What do you know about surviving in the Wilderness?  If you can't make a "
+"…What do you know about surviving in the Wilderness?  If you can't make a "
 "snare you don't know TRAP!  Hunt down a copy of TRAPPERS' LIFE and learn "
-"about wildlife!...  And how to kill it.  Classic BEAR TRAP returns in this "
+"about wildlife!…  And how to kill it.  Classic BEAR TRAP returns in this "
 "issue!"
 msgstr ""
 
@@ -140674,7 +142355,7 @@ msgid ""
 "MYTH DEBUNKED: DEAD ARE STAYING DEAD: Stories about the dead rising \"are "
 "completely unfounded.\", a general said today.  \"It's an obvious hoax by "
 "people just looking for five minutes of fame, or to scare people in these "
-"uncertain times. After all, remember the clown thing a few years ago?\""
+"uncertain times.  After all, remember the clown thing a few years ago?\""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140711,16 +142392,16 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "BAGS, BAGS, BAGS!  They're very useful things!  If we didn't have BAGS, what-"
-"would-we-use...  to PUT a lot of things in!?  (Ad by the \"Play "
-"SchoolClothing Co.\")"
+"would-we-use… to PUT a lot of things in!?  (Ad by the \"Play SchoolClothing "
+"Co.\")"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
 "FEELING BLUE?  Try \"Greens\" for Magazines!  Your local Supermarket!  "
-"Nothing cheers you up like a good magazine...  Unless it's JUNK FOOD!  Or "
-"why not buy an MP3 PLAYER or a GAME CONSOLE?  Chase those Blues away at "
-"GREENS Supermarket"
+"Nothing cheers you up like a good magazine…  Unless it's JUNK FOOD!  Or why "
+"not buy an MP3 PLAYER or a GAME CONSOLE?  Chase those Blues away at GREENS "
+"Supermarket"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -140770,7 +142451,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"The card is printed for a game of golf. Someone has filled out their score "
+"The card is printed for a game of golf.  Someone has filled out their score "
 "for the first 9 holes."
 msgstr ""
 
@@ -140841,7 +142522,7 @@ msgid "You need to ignite something."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "You daydream of crackling fire..."
+msgid "You daydream of crackling fire…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -141608,8 +143289,8 @@ msgstr ""
 msgid ""
 "You're listening to KDDA from Boston, I'm Jenny Sanders with a special "
 "emergency news update.  Road closures by military and police forces have "
-"been reported on interstates 90, 91, 93, and 95. Alternative routes have not "
-"been suggested. Due to dangers on non-interstate roads, it is strongly "
+"been reported on interstates 90, 91, 93, and 95.  Alternative routes have "
+"not been suggested.  Due to dangers on non-interstate roads, it is strongly "
 "recommended that you avoid major thoroughfares and population centers when "
 "travelling by car."
 msgstr ""
@@ -141649,7 +143330,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "DJ Dustbowl back, you're listening to Dark Days Radio.  Quick survivor tip: "
-"remember, killing a zombie isn't enough. You've gotta smash that thing to a "
+"remember, killing a zombie isn't enough.  You've gotta smash that thing to a "
 "pulp or chop it into pieces if you don't want it getting back up.  Good news "
 "though, you don't need to worry about headshots!  Any major damage will lay "
 "a shambler out."
@@ -141661,7 +143342,7 @@ msgid ""
 "for any survivors listening: one zombie is bad news, two are worse.  Don't "
 "go Rambo on me.  Tackle threats in small numbers or through bottlenecks.  "
 "You aren't tougher than a zombie but you are smarter, use that to your "
-"advantage... or just run away."
+"advantage… or just run away."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -141674,10 +143355,10 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "This is Escort, frequency one-fifty-five, nineteen-thousand, here's your "
-"report.  Can you gimme an 'amen', it's ...kshhhsk.... days after Armageddon "
-"and I'm still kicking.  The 49ers are headed southwards towards Neufolk, so "
-"if you're there and listening, barricade or lay low until they go by.  "
-"There's another horde forming out of Metro Bay."
+"report.  Can you gimme an 'amen', it's …kshhhsk… days after Armageddon and "
+"I'm still kicking.  The 49ers are headed southwards towards Neufolk, so if "
+"you're there and listening, barricade or lay low until they go by.  There's "
+"another horde forming out of Metro Bay."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -141685,14 +143366,14 @@ msgid ""
 "I'll be calling them the Pigskins, and they're circling the city right now, "
 "but trickles tell me they're going to converge on Neufolk in the next few "
 "days, so once the 49ers pass, Neufolkians, get all the supplies you can, "
-"cause this is gonna be a big one..."
+"cause this is gonna be a big one…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
 "This is an emergency broadcast from the National Emergency Alert System.  "
 "This is not a test.  There has been several hundred confirmed cases of an "
-"unknown pathogen in the metropolitan area of ...kshhssk... in the last 24 "
+"unknown pathogen in the metropolitan area of …kshhssk… in the last 24 "
 "hours.  The contagion is believed to be highly transmittable.  Residents are "
 "advised to remain in their homes at this time.  More information will be "
 "released as it becomes available."
@@ -141712,8 +143393,8 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "This is not a test.  Seek immediate shelter.  Multiple missile launches have "
-"been confirmed to be targeting the ..ksshhsk... Seek immediate shelter.  If "
-"a community shelter is not available, alternative shelter locations are "
+"been confirmed to be targeting the …ksshhsk… Seek immediate shelter.  If a "
+"community shelter is not available, alternative shelter locations are "
 "basements, beneath stairwells, or central rooms with no windows.  Ensure "
 "that you have sufficient protection from falling debris.  Ensure that you "
 "have food and water for at least one week.  Repeat.  Seek immediate shelter."
@@ -141738,7 +143419,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 msgid ""
 "First Fleet, this is Mount Wheater, we've send a helicopter with a squad to "
-"the location of the Guard Outpost. If any survivors of the crash are to "
+"the location of the Guard Outpost.  If any survivors of the crash are to "
 "reach the outpost, contact the base, we are short on men and one of the big "
 "ones has just breached the perimeter.  Over."
 msgstr ""
@@ -141756,17 +143437,17 @@ msgstr ""
 msgid ""
 "Seagull 54 to USS Eagle of Freedom.  It's as we predicted.  Going down on "
 "last reserves of fuel, with dropping evacuated unit out of question at that "
-"point.  This is our last call.  Will try emergency landing at ..."
-"kshssssssk... Don't send us a rescue team, we know the odds.  Will be moving "
-"east towards the shore, and if we're not there in T minus 3 days, count us "
-"dead.  Proud to serve the country.  Over and out."
+"point.  This is our last call.  Will try emergency landing at …kshssssssk… "
+"Don't send us a rescue team, we know the odds.  Will be moving east towards "
+"the shore, and if we're not there in T minus 3 days, count us dead.  Proud "
+"to serve the country.  Over and out."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
 "ENTRY 47:\n"
 "Our normal mining routine has unearthed a hollow chamber.  This would not be "
-"out of the ordinary, save for the odd, perfectly vertical faultline found. "
+"out of the ordinary, save for the odd, perfectly vertical faultline found.  "
 "This faultline has several odd concavities in it which have the more "
 "superstitious crew members alarmed; they seem to be of human origin.\n"
 "ENTRY 48:\n"
@@ -141818,7 +143499,7 @@ msgid ""
 "VIOLATION OF REGULATION 87.08 AND TRANSFERRED TO LAB 89-C FOR USE AS "
 "SUBJECTS.\n"
 "QUALITY OF FAULTLINE NOT COMPROMISED.\n"
-"INITIATING STANDARD TREMOR TEST..."
+"INITIATING STANDARD TREMOR TEST…"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -145377,41 +147058,41 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I know of certain bones that could be of use, if you'd like to know more."
+"The song is... quiet for now. Perhaps with time, more notes will be etched "
+"in the bones of this world."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There is an additional song you could take on, if you'd like."
+msgid "An acolyte should not take on too many songs at once."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "A song may yet be sung by you, should you wish to."
+msgid "That is all for now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
+msgid "A song may yet be sung by you, should you wish to."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
+msgid "There is an additional song you could take on, if you'd like."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgid ""
+"I know of certain bones that could be of use, if you'd like to know more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That is all for now."
+msgid "There are bones to etch, songs to sing. Wish to join me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "An acolyte should not take on too many songs at once."
+msgid "Do you wish to take on more songs?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid ""
-"The song is... quiet for now. Perhaps with time, more notes will be etched "
-"in the bones of this world."
+msgid "Do you believe you can take on the burden of additional bones?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -145523,10 +147204,10 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of "
-"things for you: I can fight, I can train you or you can train me, I can "
-"carry stuff, I can bandage your wounds, I can build faction camps, I can do "
-"some other activites, I can ride horses, I can go places, I can guard "
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a "
+"lot of things for you: I can fight, I can train you or you can train me, I "
+"can carry stuff, I can bandage your wounds, I can build faction camps, I can "
+"do some other activites, I can ride horses, I can go places, I can guard "
 "things, I can use some bionics, I can even chit-chat with you or give you "
 "tips or talk about my background.  You can give me instructions in "
 "conversation or by radio or shout commands at me.\n"
@@ -145541,6 +147222,10 @@ msgstr ""
 msgid "Skip it, let's get going."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr ""
@@ -145598,13 +147283,32 @@ msgid "What about chit-chatting and your background?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a "
+"seat in my vehicle?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't "
+"mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail "
+"to keep me fed, and I'll like you less and less.  If it gets bad enough, "
+"I'll mutiny - and if you have anyone else following you, I may convince some "
+"of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, "
+"and you're probably going to want to kill me for betrayal and I may need to "
+"kill you to get my fair share of the loot.  So keep me fed and satisfied so "
+"it doesn't come to that."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start "
@@ -145681,7 +147385,14 @@ msgid ""
 "do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
 "  If we're someplace safe and you're reading a book that improves skills, "
 "I'll listen if I don't have that skill.  You can even read me books for "
-"skills that you already have."
+"skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to "
+"someone with my current skill, you can ask me about my current activity and "
+"tell me to read it, and I'll learn from the book.  But while I'm reading, I "
+"won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  "
+"My brain just doesn't work that way, so I don't know any to teach you and "
+"it's pointless trying to get me to learn any."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -145715,14 +147426,17 @@ msgid ""
 "  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, "
 "or to draw blueprints for a building, or to define where  you want to plant "
 "some crops, or where you'd like some trees cut down, or where you want a "
-"vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down "
-"trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best "
-"to get what you want done.  If I need tools, you should leave them pretty "
-"close to where you want me to work - axes for logging, shovels and seeds and "
-"fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a "
-"vehicle.  I can pretty much sort out our stuff without needing tools, but "
-"keep the piles of unsorted and sorted stuff kind of close together because I "
-"don't want to walk back and forth carrying junk too much."
+"vehicle dismantled or repaired, or a good fishing spot.  Then talk to me "
+"about my current activity and tell me to sort stuff, or build stuff, or cut "
+"down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some "
+"fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want "
+"me to work - axes for logging, shovels and seeds and fertilizer for farming, "
+"wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to "
+"put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the "
+"piles of unsorted and sorted stuff kind of close together because I don't "
+"want to walk back and forth carrying junk too much."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -145773,12 +147487,14 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "You tell me to guard, I'll stay where I am and guard it - unless I'm in a "
-"vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous "
-"happening, I'm going to go see what it is instead of getting jumped in the "
-"dark.  If you want me to stay put, tell me not to investigate noises - but "
-"if I get shot by some bandit because I can't see where he is and you don't "
-"want me to go looking, I won't be happy.\n"
+"vehicle, in which case I'll stick with the vehicle.  I might not be able to "
+"sop a horde of zombies, but I can keep people other people from stealing our "
+"stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, "
+"I'm going to go see what it is instead of getting jumped in the dark.  If "
+"you want me to stay put, tell me not to investigate noises - but if I get "
+"shot by some bandit because I can't see where he is and you don't want me to "
+"go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate "
 "zone, so if there's some monsters behind a door that you know about, I can "
 "ignore them.  You can also set on an investigate-only zone, and I won't "
@@ -145796,6 +147512,10 @@ msgstr ""
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable "
@@ -145894,6 +147614,33 @@ msgstr ""
 msgid "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like "
+"you go around breaking into houses and taking whatever you think you need or "
+"want, well, other survivors do the same thing.  And that stack of loot "
+"you've been accumulating looks just like some random dead person's loot when "
+"it's left alone.  If some other scavenger comes around and sees that loot, "
+"and you or I or another ally isn't around to claim it, that other survivor "
+"is just going to take it.  So try to detail someone to watch your stuff - "
+"whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are "
+"going to do the same, forming little factions just like we did.  If you open "
+"the faction manager (keybind '#'), you can see a list of all your allies, as "
+"well as all the other factions you've met so far.  Some factions are really "
+"just some guy trying to survive on his own, but other factions have dozens "
+"of members and fortified bases and such.  You might want to find some of "
+"them and try to make friends with them."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other "
@@ -145902,7 +147649,13 @@ msgid ""
 "in me, for a while.  But now I can use some active bionics, and I can "
 "explain some details on how I use bionics.\n"
 "  I can also ride horses, and you can give me orders to do things like "
-"farmwork, cutting trees, or even building houses from a blueprint."
+"farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend "
+"time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's "
+"food reserves when I'm hungry.  And if the camp has a well, I'll drink from "
+"the well when thirsty. Be careful, though - if other people are out on "
+"missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -145913,6 +147666,10 @@ msgstr ""
 msgid "Tell me more about the activities you can do now."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -146031,11 +147788,11 @@ msgid "Go back to sleep."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What is it, friend?"
+msgid " *pshhhttt* I'm reading you boss, over."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid " *pshhhttt* I'm reading you boss, over."
+msgid "What is it, friend?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146426,11 +148183,11 @@ msgid "Show me what needs to be done at the camp."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not doing much currently."
+msgid "I'm currently <current_activity>."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm currently <current_activity>."
+msgid "I'm not doing much currently."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146526,14 +148283,14 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"OK, let's take a moment, oh, and thanks for helping me with that thing, "
-"so... what's up?"
+"Definitely, by the way, thanks for helping me so much with my tasks!  "
+"Anyway, you coping OK, <name_g>? "
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Definitely, by the way, thanks for helping me so much with my tasks!  "
-"Anyway, you coping OK, <name_g>? "
+"OK, let's take a moment, oh, and thanks for helping me with that thing, "
+"so... what's up?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146609,11 +148366,11 @@ msgid "Keep your distance!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "This is my territory, <name_b>."
+msgid "<drop_it>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<drop_it>"
+msgid "This is my territory, <name_b>."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146633,11 +148390,11 @@ msgid "&Put hands up."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "*drops_her_weapon."
+msgid "*drops his weapon."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
+msgid "*drops_her_weapon."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146669,27 +148426,27 @@ msgid "I don't care."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I just have one job for you.  Want to hear about it?"
+msgid "I don't have any jobs for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have another job for you.  Want to hear about it?"
+msgid "I don't have any more jobs for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
+msgid "I have another job for you.  Want to hear about it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
+msgid "I just have one job for you.  Want to hear about it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I don't have any more jobs for you."
+msgid "I have other jobs for you.  Want to hear about them?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I don't have any jobs for you."
+msgid "I have more jobs for you.  Want to hear about them?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146702,7 +148459,7 @@ msgid "Never mind, I'm not interested."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What about it?"
+msgid "You're not working on anything for me now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146710,7 +148467,7 @@ msgid "Which job?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You're not working on anything for me now."
+msgid "What about it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146921,6 +148678,10 @@ msgstr ""
 msgid "Thanks!"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "I must focus on the road!"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "I have some reason for not telling you."
 msgstr ""
@@ -146941,10 +148702,6 @@ msgstr ""
 msgid "I'm too thirsty, give me something to drink."
 msgstr ""
 
-#: lang/json/talk_topic_from_json.py
-msgid "I must focus on the road!"
-msgstr ""
-
 #: lang/json/talk_topic_from_json.py
 msgid "Focus on the road, mate!"
 msgstr ""
@@ -147054,15 +148811,15 @@ msgid "On second thought, never mind."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have some reason for denying you training."
+msgid "I can't train you properly while I'm operating a vehicle!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Give it some time, I'll show you something new later..."
+msgid "I have some reason for denying you training."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I can't train you properly while I'm operating a vehicle!"
+msgid "Give it some time, I'll show you something new later..."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -147388,13 +149145,36 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your "
+"companions to perform missions, such as crafting new items, building up the "
+"camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
+msgid "Give me an overview of how camps work."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -147415,74 +149195,231 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets "
-"too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the "
+"bulletin board to get a list of available missions with descriptions, and to "
+"assign an NPC to work on a mission.  The bulletin board is the primary way "
+"to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions "
+"to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board "
+"at the current location, and that will establish a faction camp at that "
+"overmap tile.  A faction camp has a central tile where the bulletin board "
+"is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions "
+"will eat from that food when performing camp missions, or even when they're "
+"just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and "
+"in some evac shelters."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
+msgid "Wait, we can talk with radios?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can "
-"'e'xamine the bulletin board to get a list of tasks that can be done and "
-"that are  currently complete at the camp.  You can select a task and choose "
-"an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you "
-"can hit 'TAB' to move between the central camp and each expansion and see "
-"the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any "
-"friendly NPC who also has a two way radio."
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some "
+"zones if you haven't already.  One of those zones must be a camp food zone.  "
+"If you drop food in the camp food zone and select the 'Distribute Food' "
+"mission, then the food will disappear and be converted into stored "
+"kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored "
+"food when they return at the rate of 2,500 kcalories per day.  Some missions "
+"have variable length, and companions will become upset if there isn't enough "
+"food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will "
+"also eat from the camp food stores whenever they're hungry and within 2 "
+"overmap tiles of the camp.  This drastically simplifies keeping your "
+"followers fed, so it's worthwhile to build a minimal faction camp just for "
+"this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers "
+"will also drink from the well when they're thirsty."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and "
-"lots of forests around it.  Forests are your primary source of construction "
-"materials in the early game while fields can be used for farming.  You don't "
-"have to be too picky, you can build as many camps as you want.  You need a "
-"friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take "
-"over some other buildings.  If you talk to a friendly NPC about faction "
-"camps and the NPC is standing in a building that can be used as a basecamp, "
-"you'll get the option to build a camp in that building."
+"When you assign an NPC to a faction camp mission, they'll disappear while "
+"they go do whatever you want them to do.  When the duration of the mission "
+"has elapsed, you'll see a new mission on the bulletin board to have them "
+"return and complete the mission by upgrading your camp, returning their "
+"hunting kills, dropping off whatever they were crafting, or whatever else "
+"the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, "
+"recruiting new allies, hunting and trapping game, scrounging for materials, "
+"farming, disassembling cars, and more.  Not all activities can be done at "
+"every camp - you may need to build some additional buildings, or expand the "
+"camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but "
+"building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a "
+"list of available missions for your central camp tile.  If your camp has "
+"expansions, you can tab through the expansions to see the available missions "
+"at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become "
+"angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this "
+"to retrieve any companion on a faction camp mission, but this cancels the "
+"mission and wastes any resources used on it.  Only use it to recover allies "
+"when something has gone really wrong with your camp and you can't get them "
+"to come back any ohter way."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the "
-"camp further to access new missions.  The first new missions are focused on "
-"gathering materials to upgrade the camp so you don't have to.  After two or "
-"three upgrades you will have access to the <color_yellow>[Menial Labor]</"
-"color> mission which will allow you to task companions with sorting all of "
-"the items around your camp into categories.  Later upgrades allow you to "
-"send companions to recruit new members, build overmap fortifications, or "
-"even conduct combat patrols"
+"Currently, there are three types of camps that you can start building: "
+"modular field camps, fire station camps, and evac shelter camps.  There used "
+"to be a fourth called the primitive field camp, but you can't start those "
+"anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build "
+"them almost anywhere and can locate them to have plenty of space for "
+"expansions, but you start with nothing in a field and have to build every "
+"building, so they can require a lot of resources.  Fire station and evac "
+"shelter camps are faster to build since you start in an existing building, "
+"but you have to establish them in an existing building and there may not be "
+"any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The "
+"various missions have descriptions.  In general, though, you'll need to "
+"establish housing if you want to expand, and some missions such as hunting "
+"or recruiting will require that you have some kind of kitchen or office that "
+"you can use to help schedule activities."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Modular field camps are the most flexible kind of camp, but they require a "
+"lot of time and resources to build.  You start with an empty field - and it "
+"has to be a real empty field, not a field on a ranch or farm - and build up "
+"from nothing.  You can build from wattle-and-dab if you're feeling "
+"primitive, wood panels if you have a lot of nails, metal plate if you're a "
+"welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the "
+"central camp, and then add a fire place, and expand out until you have a "
+"small shelter for two people.  When that is complete, you can expand the "
+"camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the "
+"camp.\n"
+"  2.  You can build a central building in the south half of the camp, "
+"between the rooms.  The central building will act as a command center, "
+"allowing your camp to perform hunting, recruiting, and combat patrol "
+"missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly "
+"connect to the rooms on the sides to minimize the amount of trenching you "
+"need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve "
+"food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different "
+"material, so you aren't constrained by what you start with.  Tents are fast "
+"to put up, but fragile and likely to get destroyed by zombies.  The central "
+"building has to be made from wattle-and-daub, wood, or metal, and requires "
+"more materials if the side rooms are made from tents."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
+msgid "Got it.  Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Fire stations make good basecamps.  You start with a brick building with "
+"secure metal doors, so you're not going to see your efforts destroyed by "
+"zombies.  On the downside, there may not be many fields around, so you may "
+"not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, "
+"but you can build a small pottery or blacksmithy, a chop shop in one of the "
+"garage bays, and even tear up some of the pavement to create a garden.  The "
+"existing kitchen makes it easy to cook from the start, though you may need "
+"to spruce it up a bit."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You can build a faction camp in the common evac shelter - the basic design "
+"with a single, wide open room.  Evac shelters are everywhere and often have "
+"fields surrounding them, so they're a little more flexible than a modular "
+"field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to "
+"decide between building more bedrooms or adding for crafting and cooking "
+"space."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  "
+"Expansions add to the capabilities of your camp, such as adding a farm field "
+"or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and "
+"currently, expansions can only be built in fields and have to be built up "
+"from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set "
+"of missions per location, and you'll need to hit 'tab' to see them.  The "
+"currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or "
+"send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions "
+"here to disassemble vehicles.  Of course, you can also assign companions to "
+"disassemble vehicles without a garage, so this expansion is not very "
+"useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock "
+"such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of "
+"crafts.  Companions can use some of the furniture in this expansion to craft "
+"some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to "
+"keep your companions fed without needing to regularly give them food, so "
+"it's a good idea to establish a minimal camp anywhere you intend to be for a "
+"while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp "
+"can be very resource intensive, but building one up allows you to send "
+"companions off to hunt and farm for you, so there's quite the pay-off.  If "
+"nothing else, you should consider upgrading the northeast tent to the point "
+"where you can build a water well, or if you started with a fire station or "
+"evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to "
+"build your camp in them.  Both of those camps are are very compact, but have "
+"much of the same functionality as an upgraded field camp without requiring "
+"so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm "
+"or fabrication workshop.  The farm makes it easy to grow your own food, "
+"while the fabrication workshop can allow you to craft some of the resources "
+"you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably "
+"shouldn't be your first expansions, but they all have their uses."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -147509,6 +149446,14 @@ msgid ""
 "available buildings is constantly growing, so you'll have to experiment."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and "
@@ -151895,13 +153840,13 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Ma'am, I don't know how the hell you got down here but if you have any sense "
+"Sir, I don't know how the hell you got down here but if you have any sense "
 "you'll get out while you can."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sir, I don't know how the hell you got down here but if you have any sense "
+"Ma'am, I don't know how the hell you got down here but if you have any sense "
 "you'll get out while you can."
 msgstr ""
 
@@ -152308,7 +154253,7 @@ msgid "All right!  Let's get going."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Have I told you about cardboard, friend?  Do you have any?"
+msgid "We've done it!  We've solved the list!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -152317,7 +154262,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "We've done it!  We've solved the list!"
+msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154038,6 +155983,10 @@ msgid ""
 "idea of trying it."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -155846,11 +157795,11 @@ msgid "Just on watch, move along."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ma'am, you really shouldn't be traveling out there."
+msgid "Rough out there, isn't it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Rough out there, isn't it?"
+msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157358,6 +159307,142 @@ msgid ""
 "could use a hand."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Howdy!  You seem new, what brings you here?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "How are you?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Welcome!"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "How's the weather?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "How do I join the phyle?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I'm going on my way now."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I'm a gardener for PrepNet Phyle.  Who are you?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I am a beggar who really needs something to eat."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I am just a fellow survivor."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I'm bringing order back to the land."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"This is a PrepNet Phyle orchard. We were a community of survivalists "
+"gathering resources to prepare for climate change, but it left us better "
+"prepared for what actually happened than most."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can you give me something to eat then?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What can I buy here?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Only the insane will prosper, I guess."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"This food has to go back to our core communities. But maybe we can trade "
+"some food for services"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I can pay."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Well I'm heading out then"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You have to earn the right to trade with us. Plus we created our own "
+"currency before the cataclysm"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "It was worth a try."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What kind of currency?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"This is just an outpost, you'd have to find our main camp and currently we "
+"don't want you to."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I didn't want to join your club anyway."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but "
+"you need crypto coins"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Ok."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What are crypto coins?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"I got introduced to the movement through Mutual Aid Society. From there it "
+"became an all consuming part of my life to prepare for a post consumption "
+"world. It seems to have worked better for us than for many others."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"It can get lonely out here between caravans.  But there's plenty of work and "
+"my Cyber Mastiffs.  If a horde comes through we hunker down in a nearby "
+"shelter if it's too large for us."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I'm glad you stay busy."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"We use crypto coins for money here. They were a pre cataclysm attempt to "
+"abstract money even further and create electronic cash. We figured we'd keep "
+"it up. Barter only gets you so far."
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "Heya, scav."
 msgstr ""
@@ -162278,10 +164363,6 @@ msgid ""
 "could obtain edible plants, acorns, eggs, and mushrooms from it."
 msgstr ""
 
-#: lang/json/terrain_from_json.py
-msgid "brush."
-msgstr ""
-
 #. ~ Description for underbrush
 #: lang/json/terrain_from_json.py
 msgid ""
@@ -163732,6 +165813,13 @@ msgid ""
 "were still running."
 msgstr ""
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle "
+"on this."
+msgstr ""
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr ""
@@ -163777,6 +165865,11 @@ msgstr ""
 msgid "A metal backboard."
 msgstr ""
 
+#. ~ Description for this should never actually show up, it's a pseudo terrain
+#: lang/json/terrain_from_json.py
+msgid "this should never actually show up, it's a pseudo terrain"
+msgstr ""
+
 #. ~ Description for open air
 #: lang/json/terrain_from_json.py
 msgid "This is open air."
@@ -165340,6 +167433,10 @@ msgstr ""
 msgid "pressurizing"
 msgstr ""
 
+#: lang/json/tool_quality_from_json.py
+msgid "churn"
+msgstr ""
+
 #: lang/json/tool_quality_from_json.py
 msgid "mana focusing"
 msgstr ""
@@ -166149,6 +168246,10 @@ msgstr ""
 msgid "Rail Motorcycle"
 msgstr ""
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr ""
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr ""
@@ -168107,6 +170208,14 @@ msgstr ""
 msgid "rail wheel (steerable)"
 msgstr ""
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr ""
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr ""
@@ -170284,7 +172393,7 @@ msgstr ""
 msgid "You refill the %s."
 msgstr ""
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr ""
 
@@ -170302,7 +172411,7 @@ msgstr ""
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You learn a little about the spell : %s"
+msgid "You learn a little about the spell: %s"
 msgstr ""
 
 #: src/activity_handlers.cpp src/character_martial_arts.cpp
@@ -170452,14 +172561,9 @@ msgstr ""
 msgid "You heat up the food."
 msgstr ""
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr ""
-
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
+msgid "You are currently unable to mend the %s."
 msgstr ""
 
 #: src/activity_handlers.cpp
@@ -170708,6 +172812,16 @@ msgid ""
 "<npcname> stops crafting."
 msgstr ""
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "There is nothing left of the %s to craft from."
+msgstr ""
+
+#: src/activity_handlers.cpp
+#, c-format
+msgid "There is nothing left of the %s <npcname> was crafting."
+msgstr ""
+
 #: src/activity_handlers.cpp
 msgid "You feel much better."
 msgstr ""
@@ -170764,6 +172878,7 @@ msgstr ""
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
 #: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr ""
 
@@ -170813,14 +172928,6 @@ msgstr ""
 msgid "You unload your %s."
 msgstr ""
 
-#: src/activity_handlers.cpp
-msgid "You harvested all the plots you could."
-msgstr ""
-
-#: src/activity_handlers.cpp
-msgid "You tilled every tile you could."
-msgstr ""
-
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You have run out of %s"
@@ -170830,10 +172937,6 @@ msgstr ""
 msgid "You fertilized every plot you could."
 msgstr ""
 
-#: src/activity_handlers.cpp
-msgid "You planted all seeds you could."
-msgstr ""
-
 #: src/activity_handlers.cpp
 msgid "Target lost.  IFF override failed."
 msgstr ""
@@ -171627,7 +173730,7 @@ msgid "Source area is the same as destination (%s)."
 msgstr ""
 
 #: src/advanced_inv.cpp
-msgid "No vehicle there!"
+msgid "No vehicle storage space there!"
 msgstr ""
 
 #: src/advanced_inv.cpp
@@ -172721,6 +174824,10 @@ msgstr ""
 msgid "Discover more special encounters to populate this list"
 msgstr ""
 
+#: src/auto_note.cpp src/editmap.cpp
+msgid "no"
+msgstr ""
+
 #: src/auto_note.cpp src/crafting_gui.cpp
 #: src/crafting_gui.cpp src/editmap.cpp
 msgid "yes"
@@ -173342,6 +175449,31 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr ""
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr ""
+
+#: src/avatar.cpp
+#, c-format
+msgid ""
+"Points left: <color_%s>%d</color>%c<color_%s>%d</color>%c<color_%s>%d</"
+"color>=<color_%s>%d</color>"
+msgstr ""
+
+#: src/avatar.cpp
+#, c-format
+msgid "Points left: %4d"
+msgstr ""
+
+#: src/avatar.cpp
+msgid "Character Transfer: No changes can be made."
+msgstr ""
+
+#: src/avatar.cpp src/newcharacter.cpp
+msgid "Freeform"
+msgstr ""
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr ""
@@ -173476,11 +175608,13 @@ msgid "The %s must be attached to a gun, it can not be fired separately."
 msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
+#, c-format
+msgid "You can no longer fire your %s."
 msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
+#, c-format
+msgid "You can't use your %s while driving!"
 msgstr ""
 
 #: src/avatar_action.cpp
@@ -173489,7 +175623,8 @@ msgid "You need two free hands to fire your %s."
 msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
+#, c-format
+msgid "Your %s is empty!"
 msgstr ""
 
 #: src/avatar_action.cpp
@@ -173501,16 +175636,18 @@ msgstr ""
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
+"charges to fire the %s!"
 msgstr ""
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
 msgstr ""
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
 msgstr ""
 
@@ -173746,6 +175883,16 @@ msgstr ""
 msgid "Your %s automatically turns off."
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr ""
@@ -173863,10 +176010,6 @@ msgstr ""
 msgid "No effects."
 msgstr ""
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr ""
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr ""
@@ -173879,10 +176022,6 @@ msgstr ""
 msgid "Start a fire where?"
 msgstr ""
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr ""
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -174098,6 +176237,21 @@ msgstr ""
 msgid "You feel your throat open up and air filling your lungs!"
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr ""
@@ -174418,14 +176572,16 @@ msgstr ""
 msgid ""
 "<color_green>Activating</color>  <color_yellow>!</color> to examine, "
 "<color_yellow>=</color> to reassign, <color_yellow>TAB</color> to switch "
-"tabs."
+"tabs, <color_yellow>s</color> to toggle fuel saving mode, <color_yellow>A</"
+"color> to toggle auto start mode."
 msgstr ""
 
 #: src/bionics_ui.cpp
 msgid ""
 "<color_light_blue>Examining</color>  <color_yellow>!</color> to activate, "
 "<color_yellow>=</color> to reassign, <color_yellow>TAB</color> to switch "
-"tabs."
+"tabs, <color_yellow>s</color> to toggle fuel saving mode, <color_yellow>A</"
+"color> to toggle auto start mode."
 msgstr ""
 
 #: src/bionics_ui.cpp
@@ -174460,6 +176616,14 @@ msgstr ""
 msgid "(incapacitated)"
 msgstr ""
 
+#: src/bionics_ui.cpp
+msgid "(fuel saving ON)"
+msgstr ""
+
+#: src/bionics_ui.cpp
+msgid "(auto start ON)"
+msgstr ""
+
 #: src/bionics_ui.cpp
 #, c-format
 msgid "ACTIVE (%i)"
@@ -174504,6 +176668,14 @@ msgid ""
 "%s"
 msgstr ""
 
+#: src/bionics_ui.cpp
+msgid "You can't toggle fuel saving mode on a non-fueled CBM."
+msgstr ""
+
+#: src/bionics_ui.cpp
+msgid "You can't toggle auto start mode on a non-fueled CBM."
+msgstr ""
+
 #: src/bionics_ui.cpp
 #, c-format
 msgid ""
@@ -174851,7 +177023,11 @@ msgstr ""
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
+msgid "You"
+msgstr ""
+
+#: src/character.cpp
+msgid "Your"
 msgstr ""
 
 #: src/character.cpp
@@ -175085,6 +177261,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr ""
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr ""
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr ""
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -175107,10 +177291,20 @@ msgstr ""
 msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr ""
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr ""
+
 #: src/character.cpp
 msgid "Parched"
 msgstr ""
@@ -175522,6 +177716,28 @@ msgstr ""
 msgid "Your body strains under the weight!"
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr ""
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr ""
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr ""
@@ -175760,260 +177976,6 @@ msgid ""
 "this area."
 msgstr ""
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
-"sort items inside.  It can overlap with Loot zones of different types."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles.  If more specific food zone is not defined, all "
-"food is moved here."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles.  Does include perishable drinks if "
-"such zone is not specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks.  Does include perishable drinks if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing.  Does include filthy clothing if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor.  Does include filthy armor if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr ""
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr ""
@@ -176081,6 +178043,16 @@ msgstr ""
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr ""
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr ""
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr ""
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
 msgstr ""
@@ -176193,6 +178165,10 @@ msgstr ""
 msgid "light blue"
 msgstr ""
 
+#: src/color.cpp
+msgid "blue"
+msgstr ""
+
 #: src/color.cpp
 msgid "white"
 msgstr ""
@@ -176904,7 +178880,7 @@ msgstr ""
 msgid "Press %s to show next stage(s)."
 msgstr ""
 
-#: src/construction.cpp
+#: src/construction.cpp src/iexamine.cpp
 msgid "It is too dark to construct right now."
 msgstr ""
 
@@ -178702,6 +180678,10 @@ msgstr ""
 msgid "t[e]leport"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr ""
@@ -181299,6 +183279,14 @@ msgstr ""
 msgid "%s has abandoned the camp."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr ""
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -181314,67 +183302,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you "
-"wish to distribute in the camp food zone.  You must have a camp food zone, "
-"an unsorted loot zone, and at least one loot destination zone or you will be "
-"prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay "
-"laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] "
-"mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, "
-"an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone "
-"will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the "
-"normal rules for automatic zone sorting."
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -181410,30 +183337,6 @@ msgid ""
 "Positions: %d/1\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open "
-"up new opportunities but can be expensive and time consuming.  Pick them "
-"carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is "
-"always a solid choice since food is used to support companion missions and "
-"little is needed to get it going.  With minimal investment, a mechanic can "
-"be useful as a chop-shop to rapidly dismantle large vehicles, and a forge "
-"provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of "
-"the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -181600,14 +183503,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -181689,6 +183584,72 @@ msgid ""
 "Positions: 0/1\n"
 msgstr ""
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open "
+"up new opportunities but can be expensive and time consuming.  Pick them "
+"carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is "
+"always a solid choice since food is used to support companion missions and "
+"little is needed to get it going.  With minimal investment, a mechanic can "
+"be useful as a chop-shop to rapidly dismantle large vehicles, and a forge "
+"provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of "
+"the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you "
+"wish to distribute in the camp food zone.  You must have a camp food zone, "
+"and a camp storage zone, or you will be prompted to create them using the "
+"zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay "
+"laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -181704,6 +183665,10 @@ msgid ""
 "becomes available."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr ""
@@ -181740,10 +183705,6 @@ msgstr ""
 msgid "departs to search for recruits…"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr ""
@@ -182194,8 +184155,7 @@ msgstr ""
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
+"create a camp food zone, and a camp storage zone."
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -183833,6 +185793,11 @@ msgstr ""
 msgid "Your mount can't fit there."
 msgstr ""
 
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr ""
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr ""
@@ -184342,7 +186307,7 @@ msgid ""
 "characters (e.g. empty boxes or question marks). You have been warned."
 msgstr ""
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr ""
 
@@ -184959,11 +186924,6 @@ msgstr ""
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr ""
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr ""
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -184995,7 +186955,7 @@ msgid "/!\\ CBM is highly contaminated. /!\\"
 msgstr ""
 
 #: src/game_inventory.cpp
-msgid "/!\\ CBM is not sterile. /!\\"
+msgid "/!\\ CBM is not sterile. /!\\ Please use autoclave to sterilize."
 msgstr ""
 
 #: src/game_inventory.cpp
@@ -185506,36 +187466,6 @@ msgid ""
 "holding one."
 msgstr ""
 
-#: src/handle_action.cpp
-msgid "Till farm plots"
-msgstr ""
-
-#: src/handle_action.cpp
-msgid "Till farm plots… you need a tool to dig with"
-msgstr ""
-
-#: src/handle_action.cpp
-msgid "Tills nearby Farm: Plot zones."
-msgstr ""
-
-#: src/handle_action.cpp
-msgid "Plant seeds… it is too cold for planting"
-msgstr ""
-
-#: src/handle_action.cpp
-msgid "Plant seeds"
-msgstr ""
-
-#: src/handle_action.cpp
-msgid "Plant seeds… you don't have any"
-msgstr ""
-
-#: src/handle_action.cpp
-msgid ""
-"Plant seeds into nearby Farm: Plot zones.  Farm plot has to be set to "
-"specific plant seed and you must have seeds in your inventory."
-msgstr ""
-
 #: src/handle_action.cpp
 msgid "Fertilize plots"
 msgstr ""
@@ -185548,14 +187478,6 @@ msgstr ""
 msgid "Fertilize any nearby Farm: Plot zones."
 msgstr ""
 
-#: src/handle_action.cpp
-msgid "Harvest plots"
-msgstr ""
-
-#: src/handle_action.cpp
-msgid "Harvest any full-grown plants from nearby Farm: Plot zones."
-msgstr ""
-
 #: src/handle_action.cpp
 msgid "Construct plots"
 msgstr ""
@@ -185612,19 +187534,6 @@ msgstr ""
 msgid "Auto-butcher anything in corpse loot zones - auto-fetch tools."
 msgstr ""
 
-#: src/handle_action.cpp
-msgid "You need a tool to dig with."
-msgstr ""
-
-#: src/handle_action.cpp src/iexamine.cpp
-#: src/mission_companion.cpp src/vehicle_part.cpp
-msgid "It is too cold to plant anything now."
-msgstr ""
-
-#: src/handle_action.cpp
-msgid "You don't have any seeds."
-msgstr ""
-
 #: src/handle_action.cpp
 #, c-format
 msgid "The %s is out of ammo."
@@ -186083,7 +187992,7 @@ msgid "Purchase cash card?"
 msgstr ""
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
+msgid "You need $10.00 in your account to purchase a card."
 msgstr ""
 
 #: src/iexamine.cpp
@@ -186125,7 +188034,8 @@ msgid "Your account now holds %s."
 msgstr ""
 
 #: src/iexamine.cpp
-msgid "This will automatically deduct $1.00 from your bank account.  Continue?"
+msgid ""
+"This will automatically deduct $10.00 from your bank account.  Continue?"
 msgstr ""
 
 #: src/iexamine.cpp
@@ -186604,6 +188514,10 @@ msgstr ""
 msgid "You plant some %s."
 msgstr ""
 
+#: src/iexamine.cpp src/mission_companion.cpp src/vehicle_part.cpp
+msgid "It is too cold to plant anything now."
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "You have no seeds to plant."
 msgstr ""
@@ -186883,6 +188797,10 @@ msgstr ""
 msgid "You weren't able to start a fire."
 msgstr ""
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr ""
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -187566,6 +189484,20 @@ msgstr ""
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr ""
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious "
+"injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that "
+"you will not take any legal actions against this facility in case of an "
+"accident. "
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr ""
@@ -188150,6 +190082,10 @@ msgstr ""
 msgid "Anatomies"
 msgstr ""
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr ""
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr ""
@@ -188194,10 +190130,6 @@ msgstr ""
 msgid "Scenarios"
 msgstr ""
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr ""
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr ""
@@ -189716,19 +191648,19 @@ msgid ""
 msgstr ""
 
 #: src/item.cpp
-msgid "<info>can be upsized</info>."
+msgid "<info>can be upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "<info>can be downsized</info>."
+msgid "<info>can be downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "<bad>can not be downsized</bad>."
+msgid "<bad>can not be downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "<bad>can not be upsized</bad>."
+msgid "<bad>can not be upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
@@ -189737,24 +191669,24 @@ msgid "* This clothing %s."
 msgstr ""
 
 #: src/item.cpp
-msgid " and <info>upsized</info>."
+msgid " and <info>upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid " and <info>downsized</info>."
+msgid " and <info>downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid " but <bad>not downsized</bad>."
+msgid " but <bad>not downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid " but <bad>not upsized</bad>."
+msgid " but <bad>not upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
 #, c-format
-msgid "* This clothing <info>can be refitted </info>%s."
+msgid "* This clothing <info>can be refitted</info>%s."
 msgstr ""
 
 #: src/item.cpp
@@ -189836,6 +191768,22 @@ msgstr ""
 msgid "This bionic is installed in the following body part(s):"
 msgstr ""
 
+#: src/item.cpp
+msgid ""
+"* This bionic is <bad>not sterile</bad>, use an <info>autoclave</info> and "
+"an <info>autoclave pouch</info> to sterilize it. "
+msgstr ""
+
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr ""
+
 #: src/item.cpp
 msgid "<bold>Power Capacity:</bold>"
 msgstr ""
@@ -191790,18 +193738,27 @@ msgid "Scan the ground"
 msgstr ""
 
 #: src/iuse.cpp
-msgid "Scan yourself"
+msgid "Scan yourself or other person"
 msgstr ""
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr ""
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr ""
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -191869,6 +193826,10 @@ msgstr ""
 msgid "You've already released the handle, try throwing it instead."
 msgstr ""
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr ""
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr ""
@@ -192751,6 +194712,10 @@ msgstr ""
 msgid "exceptional"
 msgstr ""
 
+#: src/iuse.cpp
+msgid "fine"
+msgstr ""
+
 #: src/iuse.cpp
 msgid "Tablet's batteries are dead."
 msgstr ""
@@ -196740,6 +198705,11 @@ msgstr ""
 msgid "Casting Cost (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Not Enough Energy"
 msgstr ""
@@ -196752,6 +198722,10 @@ msgstr ""
 msgid "Casting Time (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+msgid "self"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr ""
@@ -196765,27 +198739,35 @@ msgid "Healing"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Variance"
+msgid "Spell Radius"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spawn"
+msgid "Cone Arc"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Summon"
+msgid "degrees"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spell Radius"
+msgid "Line Width"
 msgstr ""
 
-#: src/magic.cpp src/veh_interact.cpp
-msgid "Range"
+#: src/magic.cpp
+msgid "Variance"
 msgstr ""
 
 #: src/magic.cpp
-msgid "self"
+msgid "Spawn"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Summon"
+msgstr ""
+
+#: src/magic.cpp src/veh_interact.cpp
+msgid "Range"
 msgstr ""
 
 #: src/magic.cpp
@@ -196876,6 +198858,11 @@ msgstr ""
 msgid "No valid targets to teleport."
 msgstr ""
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr ""
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr ""
@@ -196975,6 +198962,11 @@ msgctxt "Main Menu|World"
 msgid "<C|c>opy World Settings"
 msgstr ""
 
+#: src/main_menu.cpp
+msgctxt "Main Menu|World"
+msgid "Character to <T|t>emplate"
+msgstr ""
+
 #: src/main_menu.cpp
 msgctxt "Main Menu|Settings"
 msgid "<O|o>ptions"
@@ -197425,19 +199417,8 @@ msgid "You're violently teleported!"
 msgstr ""
 
 #: src/map_field.cpp
-msgid "The bees sting you!"
-msgstr ""
-
-#: src/map_field.cpp
-msgid "The bees sting you several times!"
-msgstr ""
-
-#: src/map_field.cpp
-msgid "The bees sting you many times!"
-msgstr ""
-
-#: src/map_field.cpp
-msgid "The bees sting you all over your body!"
+#, c-format
+msgid "The bees sting you in %s!"
 msgstr ""
 
 #: src/map_field.cpp
@@ -197711,7 +199692,7 @@ msgstr ""
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
+msgid "The %1$s is not a valid %2$s weapon."
 msgstr ""
 
 #: src/martialarts.cpp
@@ -200475,25 +202456,19 @@ msgstr ""
 msgid "You don't have any companions to send out…"
 msgstr ""
 
-#. ~ %1$s: npc name
 #: src/mission_companion.cpp
-#, c-format
-msgctxt "companion"
-msgid "%1$s (Guarding)"
+msgid "Who do you want to send?"
 msgstr ""
 
-#. ~ %1$s: companion name, %2$d: companion skill level
 #: src/mission_companion.cpp
-#, c-format
-msgctxt "companion skill"
-msgid "[%1$s %2$d]"
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
 msgstr ""
 
-#. ~ %1$s: companion name, %2$d: companion skill level, %3$d: skill requirement
+#. ~ %1$s: npc name
 #: src/mission_companion.cpp
 #, c-format
-msgctxt "companion skill"
-msgid "[%1$s %2$d/%3$d]"
+msgctxt "companion"
+msgid "%1$s (Guarding)"
 msgstr ""
 
 #: src/mission_companion.cpp
@@ -200502,17 +202477,22 @@ msgctxt "companion ranking"
 msgid "%s [ %4d : %4d : %4d ]"
 msgstr ""
 
+#. ~ %1$s: skill name, %2$d: companion skill level
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
 msgstr ""
 
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
+msgid "You choose to send no one…"
 msgstr ""
 
 #: src/mission_companion.cpp
@@ -202395,11 +204375,6 @@ msgstr ""
 msgid "zombie slave"
 msgstr ""
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr ""
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -202801,22 +204776,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr ""
 
@@ -202881,6 +204861,16 @@ msgstr ""
 msgid "wearing %1$s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr ""
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr ""
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -203699,22 +205689,6 @@ msgctxt "Full Name"
 msgid "%1$s '%3$s' %2$s"
 msgstr ""
 
-#: src/newcharacter.cpp
-#, c-format
-msgid ""
-"Points left: <color_%s>%d</color>%c<color_%s>%d</color>%c<color_%s>%d</"
-"color>=<color_%s>%d</color>"
-msgstr ""
-
-#: src/newcharacter.cpp
-#, c-format
-msgid "Points left: %4d"
-msgstr ""
-
-#: src/newcharacter.cpp
-msgid "Freeform"
-msgstr ""
-
 #: src/newcharacter.cpp src/player.cpp
 #, c-format
 msgid "Select a style.  (press %s for more info)"
@@ -204126,10 +206100,19 @@ msgstr ""
 msgid "Search by profession name."
 msgstr ""
 
+#. ~ levels here are skill levels at character creation time
 #: src/newcharacter.cpp
 #, c-format
-msgid "Upgrading %s costs %d point"
-msgid_plural "Upgrading %s costs %d points"
+msgid "%d level"
+msgid_plural "%d levels"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Second string is e.g. "1 level" or "2 levels"
+#: src/newcharacter.cpp
+#, c-format
+msgid "Upgrading %s by %s costs %d point"
+msgid_plural "Upgrading %s by %s costs %d points"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -204556,7 +206539,7 @@ msgstr ""
 msgid "%s disappears."
 msgstr ""
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr ""
@@ -205549,6 +207532,11 @@ msgstr ""
 msgid "My current location"
 msgstr ""
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -205581,10 +207569,6 @@ msgstr ""
 msgid "You decide to hold off…"
 msgstr ""
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr ""
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -205651,6 +207635,11 @@ msgstr ""
 msgid "%s leaves."
 msgstr ""
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -205710,6 +207699,11 @@ msgstr ""
 msgid "Examine which item?"
 msgstr ""
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr ""
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -206281,11 +208275,11 @@ msgid "If true, automatically follow the crosshair when firing/throwing."
 msgstr ""
 
 #: src/options.cpp
-msgid "Query on disassembly"
+msgid "Query on disassembly while butchering"
 msgstr ""
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
+msgid "If true, will query before disassembling items while butchering."
 msgstr ""
 
 #: src/options.cpp
@@ -206503,6 +208497,16 @@ msgstr ""
 msgid "Vertical"
 msgstr ""
 
+#: src/options.cpp
+msgid "Full screen Advanced Inventory Manager"
+msgstr ""
+
+#: src/options.cpp
+msgid ""
+"If true, Advanced Inventory Manager menu will fit full screen, otherwise it "
+"will leave sidebar visible."
+msgstr ""
+
 #: src/options.cpp
 msgid "Move view offset"
 msgstr ""
@@ -209243,14 +211247,6 @@ msgstr ""
 msgid "There is not enough %s left to siphon it."
 msgstr ""
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr ""
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr ""
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr ""
@@ -209296,11 +211292,6 @@ msgstr ""
 msgid "Your %s aches."
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr ""
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -209327,421 +211318,6 @@ msgstr ""
 msgid "Your bowels gurgle as something inside them dies."
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr ""
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr ""
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr ""
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr ""
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr ""
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr ""
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr ""
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr ""
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr ""
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr ""
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr ""
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your balance."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr ""
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr ""
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr ""
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr ""
@@ -209959,11 +211535,6 @@ msgstr ""
 msgid "You are too weak to wield %s with only one arm."
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr ""
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr ""
@@ -210033,22 +211604,52 @@ msgstr ""
 msgid "The %s doesn't have any faults to mend."
 msgstr ""
 
+#: src/player.cpp
+#, c-format
+msgid ""
+"It is damaged, and could be repaired with %s.  %s to use one of those items."
+msgstr ""
+
 #: src/player.cpp
 msgid "Mend which fault?"
 msgstr ""
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
 msgstr ""
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr ""
+
+#: src/player.cpp
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "Skills: %s\n"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
 msgstr ""
 
-#. ~ %1$s represents the internal color name which shouldn't be translated, %2$s is skill name, and %3$i is skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
+msgid "You are currently unable to mend the %s this way."
 msgstr ""
 
 #: src/player.cpp
@@ -210163,14 +211764,6 @@ msgstr ""
 msgid "<npcname> takes off their %s."
 msgstr ""
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr ""
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -210218,20 +211811,6 @@ msgstr ""
 msgid "You can't remove partially depleted plutonium!"
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] ""
-msgstr[1] ""
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -210456,6 +212035,13 @@ msgstr ""
 msgid "Pain "
 msgstr ""
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr ""
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -211793,10 +213379,6 @@ msgstr ""
 msgid "<color_cyan>none</color>"
 msgstr ""
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr ""
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -212043,6 +213625,10 @@ msgstr ""
 msgid "Something is making noise."
 msgstr ""
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr ""
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -212058,6 +213644,11 @@ msgstr ""
 msgid "You hear %1$s"
 msgstr ""
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr ""
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr ""
@@ -212087,6 +213678,409 @@ msgstr ""
 msgid "d: delete history"
 msgstr ""
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr ""
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr ""
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr ""
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your balance."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr ""
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr ""
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr ""
@@ -212236,7 +214230,7 @@ msgstr ""
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
+msgid "The %s stumbles over the cot!"
 msgstr ""
 
 #: src/trapfunc.cpp
@@ -212392,11 +214386,6 @@ msgstr ""
 msgid "A snare closes on <npcname>s leg."
 msgstr ""
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr ""
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -212618,6 +214607,13 @@ msgstr ""
 msgid "You fall down under %s!"
 msgstr ""
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr ""
@@ -212753,6 +214749,10 @@ msgstr ""
 msgid "Select part"
 msgstr ""
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr ""
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr ""
diff --git a/lang/po/de.po b/lang/po/de.po
index 67f7cf90ef0c9..d4e73047fc606 100644
--- a/lang/po/de.po
+++ b/lang/po/de.po
@@ -3,8 +3,8 @@
 # Nico Brandt <nicobaustandere@web.de>, 2018
 # Enrico Grunitz, 2018
 # OzoneH3 <satori.jj@email.com>, 2018
-# Kitty M <dominique.bnghff@googlemail.com>, 2018
 # Robert Boettcher <archezwei@gmail.com>, 2018
+# Kitty M <dominique.bnghff@googlemail.com>, 2018
 # Nipaporn P. <nuch.pongsaket@gmail.com>, 2018
 # Mark Bies, 2018
 # - - <timo2609@t-online.de>, 2018
@@ -17,17 +17,17 @@
 # Xtrem532 <xtrem532.tg@gmail.com>, 2019
 # kurtice087 <debbex2002@yahoo.de>, 2019
 # Pupsi <pupsi.mupsi@online.de>, 2019
+# Vlasov Vitaly <vnigtha@gmail.com>, 2019
 # Brett Dong <brett.browning.dong@gmail.com>, 2019
 # Wuzzy <almikes@aol.com>, 2019
-# Vlasov Vitaly <vnigtha@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
-"Last-Translator: Vlasov Vitaly <vnigtha@gmail.com>, 2019\n"
+"Last-Translator: Wuzzy <almikes@aol.com>, 2019\n"
 "Language-Team: German (https://www.transifex.com/cataclysm-dda-translators/teams/2217/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -227,6 +227,19 @@ msgstr ""
 msgid "watery plutonium slurry"
 msgstr "wässriger Plutoniumschlamm"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr "Stein"
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr ""
+"Ein Stein in der Größe eines Baseballs. Ist eine passable Nahkampfwaffe und "
+"ist auch gut zum Schmeißen auf Gegner geeignet."
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "Kieselstein"
@@ -736,12 +749,8 @@ msgstr "spitze selbstgemachte Rakete"
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
+" of this grade of weapon, but packs a fierce punch… if it hits."
 msgstr ""
-"Eine selbstgebaute Rakete, bestehend aus einem Stachel, welcher an ein Rohr "
-"geschweißt wurde, gefüllt mit improvisiertem Raketentreibstoff. Fürchterlich"
-" ungenau, was man von dieser Art Waffe erwarten kann, aber sie haut mächtig "
-"rein … falls sie trifft."
 
 #: lang/json/AMMO_from_json.py
 msgid "explosive home-made rocket"
@@ -794,11 +803,9 @@ msgstr "unfertiges Kalziumkarbid"
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
 msgstr ""
-"Eine unvollständige Verarbeitung von Kohle und Kalk zu Kalziumkarbid. "
-"Unbrauchbar in diesem Stadium/"
 
 #: lang/json/AMMO_from_json.py
 msgid "chain link"
@@ -1298,8 +1305,8 @@ msgstr[1] ""
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1311,7 +1318,7 @@ msgstr[1] ""
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr ""
@@ -1325,10 +1332,10 @@ msgstr[1] ""
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1340,8 +1347,8 @@ msgstr[1] ""
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
 msgstr ""
 
@@ -1373,9 +1380,9 @@ msgstr[1] ""
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1674,8 +1681,8 @@ msgstr[1] ""
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -2108,14 +2115,10 @@ msgstr[1] "Flammenwerfer Brennstoff"
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
 msgstr ""
-"Eine Mischung aus Benzin und Dieselöl zu gleichen Teilen. Die "
-"Verbrennungseigenschaften machen es ungeeignet für die Anwendung in "
-"Bereichen, in denen du einen der Bestandteile separat nutzen würdest. Dafür "
-"kann man es verwenden um einen Flammenwerfer zu füllen."
 
 #: lang/json/AMMO_from_json.py
 msgid "autoclave pouch"
@@ -3693,42 +3696,47 @@ msgid "reloaded .460 Rowland"
 msgstr "wiedergeladene .460 Rowland"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr ".50 BMG Leuchtspur"
+msgid ".50 BMG M17 tracer"
+msgstr ""
+
+#. ~ Description for .50 BMG M17 tracer
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG M33 Ball"
+msgstr ""
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"Dies ist eine Leuchtspurvariante der populären .50-BMG-"
-"Scharfschützengewehrpatrone. Leuchtspurpatronen helfen der Waffe, von der "
-"sie gefeuert wurden, beim Zielen, jedoch unter dem Risiko, entflammbare "
-"Substanzen zu entzünden."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr ".50 BMG Ball"
+msgid ".50 BMG Match"
+msgstr ""
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
 msgstr ""
-"Die .50 BMG ist eine sehr starke Gewehrpatrone, die für für hohe Reichweiten"
-" gedacht ist. Ihre enorme Treffgenaugkeit und Panzerbrechung machen sie zu "
-"einer der tödlichsten verfügbaren Patronen, was nur durch ihren drastischen "
-"Rückstoß und Krach aufgewogen wird."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
-msgstr ".50 BMG AP"
+msgid ".50 BMG M2 AP"
+msgstr ""
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
@@ -3738,6 +3746,23 @@ msgstr ""
 " gehärtetem Wolframstahl. Die Penetration wurde erhöht, aber der Schaden "
 "reduziert."
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr ""
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
 msgstr "wiedergeladene .50 BMG Leuchtspur"
@@ -3745,31 +3770,24 @@ msgstr "wiedergeladene .50 BMG Leuchtspur"
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
 msgstr ""
-"Dies ist eine Leuchtspurvariante der populären .50-BMG-"
-"Scharfschützengewehrpatrone. Leuchtspurpatronen helfen der Waffe, von der "
-"sie gefeuert wurden, beim Zielen, jedoch unter dem Risiko, entflammbare "
-"Substanzen zu entzünden. Diese Patrone wurde wiedergeladen."
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr "wiedergeladene .50 BMG Ball"
+msgid "reloaded .50 BMG Match"
+msgstr ""
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"Die .50 BMG ist eine sehr starke Gewehrpatrone, die für für hohe Reichweiten"
-" gedacht ist. Ihre enorme Treffgenaugkeit und Panzerbrechung machen sie zu "
-"einer der tödlichsten verfügbaren Patronen, was nur durch ihren drastischen "
-"Rückstoß und Krach aufgewogen wird. Dieser Patrone wurde wiedergeladen."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
@@ -3778,13 +3796,9 @@ msgstr "wiedergeladene .50 BMG AP"
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
 msgstr ""
-"Eine Variante der Patrone .50 BMG; sie verwendet einen Kern aus sehr dichtem"
-" gehärtetem Wolframstahl. Die Penetration wurde erhöht, aber der Schaden "
-"reduziert. Diese Patrone wurde wiedergeladen."
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -4897,6 +4911,106 @@ msgstr "Einige Pilzsporen."
 msgid "fungal flower"
 msgstr "Fungusblume"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr ""
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr ""
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr ""
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr ""
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr ""
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr ""
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr ""
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr ""
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr ""
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr ""
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -5055,7 +5169,7 @@ msgstr[1] ""
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
 msgstr ""
@@ -5146,7 +5260,7 @@ msgstr "Türscharnier"
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
 msgstr ""
 
@@ -5199,6 +5313,359 @@ msgid ""
 "explosions."
 msgstr ""
 
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr ""
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr ""
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr ""
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr ""
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr ""
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr ""
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] "Neoprentuch"
+msgstr[1] "Neoprentücher"
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr ""
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr ""
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr ""
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr ""
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
 msgid_plural "handloaded .22 CB"
@@ -5800,6 +6267,18 @@ msgstr ""
 "ist dazu ausgelegt, heiß beim Einschlag zu brennen, Panzerungen zu "
 "durchdringen und brennbare Substanzen anzuzünden."
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr ""
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -5847,8 +6326,29 @@ msgstr[1] ""
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr ""
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr ""
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
@@ -6458,13 +6958,6 @@ msgstr ""
 "Eine Mischung aus diversen Arten von organischem Material, enthält alles, "
 "was der Blob braucht, um gesund zu sein. Glaubst du zumindest."
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "Stein"
-msgstr[1] "Steine"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -7050,8 +7543,10 @@ msgstr[1] "Wehrgehänge"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "Du steckst %s in die Scheide."
@@ -7742,6 +8237,46 @@ msgid ""
 "small straps designed to better distribute the weight."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -7917,6 +8452,28 @@ msgstr ""
 "Ein buntes und lächerliches Kostüm für einen Clown. Bietet angemessenen "
 "Lagerplatz."
 
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
@@ -8205,6 +8762,22 @@ msgid "A white button-down shirt with long sleeves.  Looks professional!"
 msgstr ""
 "Ein weißes Button-Down-Hemd mit langen Ärmeln. Sieht professionell aus!"
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -8364,6 +8937,32 @@ msgstr[1] "Bauchtaschen"
 msgid "Provides a bit of extra storage, with minimal encumbrance."
 msgstr "Bietet ein bisschen zusätzlichen Lagerraum mit minimaler Hinderung."
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -8380,6 +8979,34 @@ msgstr ""
 "von Fechtern benutzt, um Unfälle zu vermeiden. Sie hat keinerlei Lagerraum, "
 "aber ist sehr bequem."
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -8404,6 +9031,32 @@ msgstr ""
 "Eine verstärkte Hose, die von Fechtern benutzt wird, um Verletzungen zu "
 "vermeiden."
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -8824,22 +9477,6 @@ msgstr[1] "Paar Pelzhandschuhe"
 msgid "A pair of warm fur gloves.  They are somewhat cumbersome."
 msgstr "Ein Paar warme Pelzhandschuhe. Sie sind etwas hinderlich."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] "Paar Überlebendentaucheranzugshandschuhe"
-msgstr[1] "Paar Überlebendentaucheranzugshandschuhe"
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr ""
-"Ein Paar angepasste, mit Kevlar gepanzerte Neoprenhandschuhe, die so "
-"modifiziert wurden, dass sie einfach zu tragen sind und gleichzeitig "
-"maximalen Schutz unter extremen Bedingungen bieten."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -8909,6 +9546,20 @@ msgstr ""
 "wurden, dass sie einfach zu tragen sind und gleichzeitig maximalen Schutz "
 "unter extremen Bedingungen bieten."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -9165,17 +9816,6 @@ msgstr ""
 "Eine große Brille, welche deine Augen komplett abdeckt. Bietet "
 "hervorragenden Schutz vor Umweltgefahren."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] "Schwimmbrille"
-msgstr[1] "Schwimmbrillen"
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "Ein kleine Brille, die fürs Schwimmen gemacht wurde."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -9219,23 +9859,6 @@ msgstr ""
 "Eine schwere Wolljacke in Lebensgröße. Schwer zu tragen, aber warm und mit "
 "tiefen Taschen."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] "Überlebendentaucheranzug"
-msgstr[1] "Überlebendentaucheranzüge"
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr ""
-"Eine leichte, handgefertigte Verbundrüstung aus einer zerschnittenen "
-"kugelsicheren Weste und einem Neoprentaucheranzug. Schützt vor den Elementen"
-" sowie vor Schaden."
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -9815,20 +10438,6 @@ msgstr ""
 "Eine maßgeschneiderte gepanzerte Nomex- und Kevlarkapuze, sehr stark und "
 "strapazierfähig."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] "Überlebendentaucheranzugsmaske"
-msgstr[1] "Überlebendentaucheranzugsmasken"
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr ""
-"Eine maßgeschneiderte gepanzerte Neopren- und Kevlarkapuze, sehr stark und "
-"strapazierfähig."
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -10632,18 +11241,25 @@ msgstr[0] "Ledergürtel"
 msgstr[1] "Ledergürtel"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "Du steckst %s in %s"
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "Was in deinen Gürtel stecken"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
 msgstr "Ein Ledergürtel. Nützlich, um deine Hose passend zu machen."
 
@@ -10826,6 +11442,20 @@ msgstr ""
 "Ein paar Taschen, die an den Schenkeln mittels gekrümmter Riemen getragen "
 "werden können. Diese Variante wird vom Militär bevorzugt."
 
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
 msgid_plural "Linux t-shirts"
@@ -11753,39 +12383,6 @@ msgstr ""
 "Eine große flexible Scheide zum Halten von Schwertern und anderen großen "
 "Klingen. Aktiviere sie, um eine Waffe reinzustecken oder zu ziehen."
 
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] "Haischutzanzug"
-msgstr[1] "Haischutzanzüge"
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr ""
-"Ein einteiliger Kettenpanzeranzug, der von Sporttauchern für den Schutz "
-"gegen Haibisse getragen wird. Zum Anzug gehören ein angebrachter Plastikhelm"
-" und Schuhe."
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] "Faraday-Haischutzanzug"
-msgstr[1] "Faraday-Haischutzanzüge"
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr ""
-"Ein einteiliger Kettenpanzeranzug, der von Sporttauchern für den Schutz "
-"gegen Haibisse getragen wird. Er wurde so isoliert, dass er vor Elektrizität"
-" schützt."
-
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
 msgid_plural "sheathes"
@@ -11865,6 +12462,19 @@ msgstr ""
 "Eine kurze Jeanshose. Sie ist dick und feste und bietet ausgezeichneten "
 "Schutz vor Schnitten."
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
@@ -12384,13 +12994,9 @@ msgstr[1] "Testpersonenanzüge"
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
 msgstr ""
-"Ein dünner kurzärmeliger und kurzbeiniger Anzug in einem Stück. Nach dem "
-"merkwürdigem Schnitt und den Anpassungsstellen zu urteilen … willst du "
-"vielleicht nicht wissen, wer ihn trug. Bietet geringfügigen Lagerplatz und "
-"ist nicht sehr hinderlich."
 
 #: lang/json/ARMOR_from_json.py
 msgid "suit"
@@ -12473,6 +13079,7 @@ msgstr[1] "Überlebendengürtel"
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "Klinge einstecken"
@@ -12892,17 +13499,6 @@ msgstr ""
 "einer Siedlung oder einer postapokalyptischen Crew bist, ist dieser Hut "
 "genau für dich geeignet."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] "Badehose"
-msgstr[1] "Badehosen"
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "Eine Badehose mit Netz."
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
@@ -13181,60 +13777,6 @@ msgstr ""
 "Eine elegante Weste. Ideal für diese Momente, wenn das Tragen eines Hemdes "
 "zu gewöhnlich und ein Anzug zu hochnäsig wäre."
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] "Taucheranzug"
-msgstr[1] "Taucheranzüge"
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "Ein Ganzkörper-Neoprenanzug"
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] "Paar Schwimmhandschuhe"
-msgstr[1] "Paar Schwimmhandschuhe"
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr ""
-"Ein Paar sehr flexibler Neopren-Silikon-Gummihandschuhe, welche fürs "
-"Schwimmen und Tauchen geeignet sind."
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] "Neoprenanzugskapuze"
-msgstr[1] "Neoprenanzugskapuzen"
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr "Eine Neoprenanzugskapuze, üblicherweise von Tauchern getragen."
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] "kurzer Nassanzug"
-msgstr[1] "kurze Nassanzüge"
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr ""
-"Ein langärmeliger kurzer Nassanzug mit rosa Farbdetails und einer "
-"dekoletéschönenden, hüftenbetonenden Machart. Nicht so schützend wie ein "
-"Ganzkörperanzug, dafür aber auch weniger hinderlich."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -13597,6 +14139,35 @@ msgstr ""
 "Ein Plastiklaken mit mehreren Ösen, um ihn mit Seil oder Kordel zu sichern. "
 "Nützlich für improvisierten Regenschutz."
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -16551,6 +17122,162 @@ msgstr ""
 "alle DoubleTech-Energierüstungen erfordern die Steuerungs- und "
 "Klimaregulierungssysteme direkten Hautkontakt."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] "Badehose"
+msgstr[1] "Badehosen"
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "Eine Badehose mit Netz."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] "Taucheranzug"
+msgstr[1] "Taucheranzüge"
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "Ein Ganzkörper-Neoprenanzug"
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] "Neoprenanzugskapuze"
+msgstr[1] "Neoprenanzugskapuzen"
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr "Eine Neoprenanzugskapuze, üblicherweise von Tauchern getragen."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] "Überlebendentaucheranzugsmaske"
+msgstr[1] "Überlebendentaucheranzugsmasken"
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr ""
+"Eine maßgeschneiderte gepanzerte Neopren- und Kevlarkapuze, sehr stark und "
+"strapazierfähig."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] "Überlebendentaucheranzug"
+msgstr[1] "Überlebendentaucheranzüge"
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr ""
+"Eine leichte, handgefertigte Verbundrüstung aus einer zerschnittenen "
+"kugelsicheren Weste und einem Neoprentaucheranzug. Schützt vor den Elementen"
+" sowie vor Schaden."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] "Paar Überlebendentaucheranzugshandschuhe"
+msgstr[1] "Paar Überlebendentaucheranzugshandschuhe"
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr ""
+"Ein Paar angepasste, mit Kevlar gepanzerte Neoprenhandschuhe, die so "
+"modifiziert wurden, dass sie einfach zu tragen sind und gleichzeitig "
+"maximalen Schutz unter extremen Bedingungen bieten."
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] "kurzer Nassanzug"
+msgstr[1] "kurze Nassanzüge"
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr ""
+"Ein langärmeliger kurzer Nassanzug mit rosa Farbdetails und einer "
+"dekoletéschönenden, hüftenbetonenden Machart. Nicht so schützend wie ein "
+"Ganzkörperanzug, dafür aber auch weniger hinderlich."
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] "Faraday-Haischutzanzug"
+msgstr[1] "Faraday-Haischutzanzüge"
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+"Ein einteiliger Kettenpanzeranzug, der von Sporttauchern für den Schutz "
+"gegen Haibisse getragen wird. Er wurde so isoliert, dass er vor Elektrizität"
+" schützt."
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] "Haischutzanzug"
+msgstr[1] "Haischutzanzüge"
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr ""
+"Ein einteiliger Kettenpanzeranzug, der von Sporttauchern für den Schutz "
+"gegen Haibisse getragen wird. Zum Anzug gehören ein angebrachter Plastikhelm"
+" und Schuhe."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] "Schwimmbrille"
+msgstr[1] "Schwimmbrillen"
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "Ein kleine Brille, die fürs Schwimmen gemacht wurde."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] "Paar Schwimmhandschuhe"
+msgstr[1] "Paar Schwimmhandschuhe"
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr ""
+"Ein Paar sehr flexibler Neopren-Silikon-Gummihandschuhe, welche fürs "
+"Schwimmen und Tauchen geeignet sind."
+
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
 msgid_plural "helmet nettings"
@@ -17171,6 +17898,54 @@ msgid_plural "shotgun bandoliers"
 msgstr[0] "Flintenpatronengurt"
 msgstr[1] "Flintenpatronengurte"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -17193,7 +17968,7 @@ msgstr[1] ""
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
 msgstr ""
 
@@ -17390,6 +18165,24 @@ msgid ""
 "minimize encumbrance."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -17947,9 +18740,9 @@ msgstr[1] "Ethanolverbrennungs-KBMs"
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -17959,8 +18752,7 @@ msgstr[0] "Luftverdampfungs-KBM"
 msgstr[1] "Luftverdampfungs-KBMs"
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -18032,10 +18824,10 @@ msgstr[1] "Fingerhack-KBMs"
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18401,7 +19193,7 @@ msgstr[1] "Energierüstung-Mk.-II-Schnittstellen-KBMs"
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
 
@@ -18960,8 +19752,7 @@ msgstr[1] ""
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
@@ -19585,8 +20376,8 @@ msgstr[1] "Die Kunst des Servierens"
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
-msgstr "Es ist … es ist ein Kochbuch!"
+msgid "It's… it's a cookbook!"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Cucina Italiana"
@@ -19697,11 +20488,8 @@ msgstr[1] "PE050 »Alpha«: Vorbericht"
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
+"\"APPROVED\"…"
 msgstr ""
-"Dieser Bündel Papier – datiert auf zwei Wochen, bevor all dies begann – "
-"beschreibt eine neue chemische Formel sowie ihre Auswirkungen auf "
-"Testpersonen. Er ist mit »ZUGELASSEN« abgestempelt."
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Dionne"
@@ -19731,8 +20519,8 @@ msgstr[1] "PE065 »Chimera«: Optimale Vorgehensweisen"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -19746,13 +20534,8 @@ msgstr[1] "Laborjournale: Smythe"
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
+"look promising but the procurement methods seem awfully vague…"
 msgstr ""
-"Dieses Teamlogbuch erklärt detailliert mehrere Varianten mutagener "
-"Experimente und konzentiert sich auf diejenigen, die von Fleisch, das mit "
-"XE037 kontaminiert wurde, abgeleitet wurden. Die Ergebnisse sehen "
-"vielversprechend aus, aber die Beschaffungsmethoden scheinen fürchterlich "
-"vage zu sein."
 
 #: lang/json/BOOK_from_json.py
 msgid "standpipe maintenance log"
@@ -19765,11 +20548,8 @@ msgstr[1] "Standrohr-Wartungsprotokolle"
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
+"with… a chemical formula?"
 msgstr ""
-"Dieser Einband beschreibt detailliert die planmäßige Wartung für "
-"verschiedene Rohrsysteme durch die Einrichtung. Allerdings scheinen ein paar"
-" der Protokollbögen mit einer … chemischen Formel (?) ausgefüllt zu sein."
 
 #: lang/json/BOOK_from_json.py
 msgid "chemical reference-CLASSIFIED"
@@ -19819,11 +20599,8 @@ msgstr[1] "PE023 »Medizinisch«: Anwendung und Erkenntnisse"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
 msgstr ""
-"Dieser Einband aus hoch-technischen wissenschaftlichen Arbeiten beschreibt "
-"irgendeine neue chemische Formel sowie ihre Auswirkungen auf Testpersonen. "
-"Er wurde mit »zugelassen« abgestempelt."
 
 #: lang/json/BOOK_from_json.py
 msgid "PE070 \"Raptor\": Proposal"
@@ -20148,11 +20925,8 @@ msgstr[1] "Laborjournale: Herrera"
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
+"symbols you've not seen before…"
 msgstr ""
-"Dieser dicke Einband enthält eine Vielzahl von Diagrammen und technischen "
-"Spezifikationen für diverse elektronische Materialien. Einige der Diagramme "
-"benutzen Symbole, die du zuvor noch nicht gesehen hast …"
 
 #: lang/json/BOOK_from_json.py
 msgid "2XI design binder-CLASSIFIED"
@@ -20228,13 +21002,13 @@ msgstr[1] ""
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -20593,13 +21367,9 @@ msgstr[1] "Handladers Helfer"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
 msgstr ""
-"Alles, was du jemals über das Wiederladen von Munition wissen wollen "
-"könntest, versiegelt mit einem … kindersicheren Umschlag. Scheinbar ist es "
-"wegen der Haftung, denn das Kapitel über Explosivmunition behandelt sie auch"
-" sehr ausführlich."
 
 #: lang/json/BOOK_from_json.py
 msgid "Rivtech design binder"
@@ -21178,7 +21948,7 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -22626,6 +23396,34 @@ msgid ""
 " that the author's real name is Fereidoun M. Esfandiary."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
 msgid_plural "phone books"
@@ -22709,9 +23507,8 @@ msgstr[1] "Bestandsbücher"
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
+msgid "If you knew what to look for something might stand out…"
 msgstr ""
-"Wenn du wüsstest, wonach du suchen müsstest, könnte etwas herausstechen …"
 
 #: lang/json/BOOK_from_json.py
 msgid "patient treatment records"
@@ -22966,6 +23763,106 @@ msgstr ""
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -24024,11 +24921,12 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -24039,28 +24937,61 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
 "along with emulating their healing factor."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -24564,7 +25495,7 @@ msgstr ""
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr ""
 
@@ -25592,6 +26523,41 @@ msgstr ""
 "Der Magen einer großen menschenartigen Kreatur. Er ist überraschend lange "
 "haltbar."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr ""
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr ""
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -25642,6 +26608,61 @@ msgstr ""
 "Ein winziges Stück essbaren Fleisches. Nicht viel, aber zur Not wird es "
 "schon reichen."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr ""
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr ""
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -25681,6 +26702,24 @@ msgid_plural "cooked scraps of meat"
 msgstr[0] "gekochte Fleischfetzen"
 msgstr[1] "gekochte Fleischfetzen"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr ""
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "rohe Innereien"
@@ -25918,8 +26957,8 @@ msgstr[1] "rohe Gehirne"
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
-msgstr "Das Gehirn eines Tieres. Du solltest es nicht roh verzehren."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cooked brains"
@@ -25978,9 +27017,8 @@ msgstr "gekochtes Bries"
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
+msgid "Normally a delicacy, it needs a little… something."
 msgstr ""
-"Normalerweise eine Delikatesse, es braucht aber noch das gewisse etwas..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bone"
@@ -26040,6 +27078,78 @@ msgstr ""
 "sehr lange Zeit essbar bleiben und kann als Zutat für viele Lebensmittel und"
 " Projekte benutzt werden."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr ""
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr ""
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr ""
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr ""
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
 msgid_plural "chunks of tainted meat"
@@ -26243,14 +27353,8 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
-"Eine dicke, massive Masse an Fleisch, oberflächig ähnlich dem Herz eines "
-"Säugetiers, überzogen von gerippten Rillen und leicht so groß wie dein Kopf."
-" Es ist noch voll von, ähm, was auch immer als Blut in Jabberwocks durchgeht"
-" und es liegt schwer in deinen Händen. Nach allem, was du in letzter Zeit "
-"gesehen hast, kannst du nicht lassen an alte Geschichten zu denken, über das"
-" Verspeißen der Herzen deiner Feinde..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "desiccated putrid heart"
@@ -26268,7 +27372,7 @@ msgstr ""
 "könnte gegessen werden, wenn du besonders hungrig bist, aber es sieht "
 "einfach nur ekelhaft aus."
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] ""
@@ -26594,7 +27698,7 @@ msgstr[1] ""
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
 msgstr ""
 
@@ -27577,11 +28681,12 @@ msgstr "Konservierte Ananasringe in Wasser. Recht lecker."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
-msgstr[0] "Limonadenpulvermischung"
-msgstr[1] "Portionen Limonadenpulvermischung"
+msgid_plural "lemonade drink mix"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -28412,8 +29517,8 @@ msgstr[1] "Erdnussbuttersüßigkeiten"
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
-msgstr "Einige Erdnussbutterbecher... deine Lieblingssüßigkeit!"
+msgid "A handful of peanut butter cups… your favorite!"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate candy"
@@ -28540,10 +29645,8 @@ msgstr "Leckerer Schokoladenkuchen. Er hat den ganzen Zuckerguss. Den ganzen!"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr ""
-"Ein Kuchen, der die dickste Glasur, die du jemals gesehen hast, hat. Jemand "
-"hat »Furz« in Anführungszeichen draufgeschrieben."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate-covered coffee bean"
@@ -28588,10 +29691,8 @@ msgstr[1] "Pfefferminzplätzchen"
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
 msgstr ""
-"Eine Handvoll mit Schokolade überzogene Pfefferminzpasteten... "
-"schmackotastisch!"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Necco wafers"
@@ -29282,6 +30383,17 @@ msgstr ""
 " rosa, seltsam gummiartig und nicht sehr lecker ist, bleibt es ziemlich "
 "stopfend. Überhaupt nicht schmackhaft, aber sehr stopfend."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr ""
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "konservierte Sardine"
@@ -31127,8 +32239,8 @@ msgstr[1] ""
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31195,15 +32307,8 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
-"Eine apfelrote Gelkapsel in der Größe deines Fingernagels, gefüllit mit "
-"einer dicken öligen Flüssigkeit, die sich von schwarz nach lila in "
-"unvorhersehbaren Zeitabständen verfärbt und mit winzigen grauen Punkten "
-"befleckt ist. Zieht man den Ort, von dem du sie her hast, in Betracht, ist "
-"sie entweder sehr wirksam oder hochexperimentell. Wenn du sie so hältst, "
-"scheinen all die kleinen Wehwehchen schwächer zu werden, jedenfalls für "
-"einen Augenblick …"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattail jelly"
@@ -31677,11 +32782,9 @@ msgstr "abstraktes iv-Mutagenaroma"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
 msgstr ""
-"Ein superkonzentriertes Mutagen. Du brauchst eine Spritze, um es zu "
-"injizieren … wenn du unbedingt willst?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagenic serum"
@@ -31695,10 +32798,8 @@ msgstr "Alpha-Serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
+"to inject it… if you really want to?"
 msgstr ""
-"Ein superkonzentriertes Mutagen, das Blut stark nachempfunden ist. Du "
-"brauchst eine Spritze, um es zu injizieren … wenn du unbedingt willst?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "beast serum"
@@ -31708,7 +32809,7 @@ msgstr "Biestserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31719,10 +32820,8 @@ msgstr "Vogelserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
+"need a syringe to inject it… if you really want to?"
 msgstr ""
-"Ein superkonzentriertes Mutagen in der Farbe des vorapokalyptischen Himmels."
-" Du brauchst eine Spritze, um es zu injizieren … wenn du unbedingt willst?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattle serum"
@@ -31732,10 +32831,8 @@ msgstr "Rindsserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
+"inject it… if you really want to?"
 msgstr ""
-"Ein superkonzentriertes Mutagen in der Farbe von Gras. Du brauchst eine "
-"Spritze, um es zu injizieren … wenn du unbedingt willst?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cephalopod serum"
@@ -31745,7 +32842,7 @@ msgstr "Kopffüßlerserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
+"it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31756,7 +32853,7 @@ msgstr "Chimärenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31767,7 +32864,7 @@ msgstr "Elfaserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31778,7 +32875,7 @@ msgstr "Katzenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31789,11 +32886,8 @@ msgstr "Fischserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
+"top.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Ein superkonzentriertes Mutagen in der Farbe des Ozeans und weißem Schaum "
-"oben drauf. Du brauchst eine Spritze, um es zu injizieren … wenn du "
-"unbedingt willst?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "insect serum"
@@ -31803,7 +32897,7 @@ msgstr "Insektenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31814,7 +32908,7 @@ msgstr "Echsenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31825,7 +32919,7 @@ msgstr "Luchsenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
+" inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31836,7 +32930,7 @@ msgstr "medizinisches Serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31847,7 +32941,7 @@ msgstr "Pflanzenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31858,7 +32952,7 @@ msgstr "Raptorenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
+"at it.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31869,7 +32963,7 @@ msgstr "Rattenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31880,7 +32974,7 @@ msgstr "Schleimsserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31891,7 +32985,7 @@ msgstr "Spinnenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31902,7 +32996,7 @@ msgstr "Troglobiontenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31913,7 +33007,7 @@ msgstr "Bärenserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
+"thick.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31924,7 +33018,7 @@ msgstr "Mausserum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31939,11 +33033,8 @@ msgstr "geronnenes Blut"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
+"bubble with an intelligence of its own…"
 msgstr ""
-"Eine dicke, suppenartige rote Flüssigkeit. Sie sieht ekelhaft aus und riecht"
-" auch nicht viel besser. Irgendwie scheint sie mit einer eigentümlichen "
-"Intelligenz vor sich hin zu blubbern..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "alpha mutagen"
@@ -32140,23 +33231,23 @@ msgstr ""
 "ist wahrscheinlich viel sicherer zu trinken, als vorher."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
+msgid "pine nuts"
+msgid_plural "pine nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
+msgid "junipers"
+msgid_plural "junipers"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -32164,68 +33255,82 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
 msgstr "Eine Handvoll Nussfrüchte eines Pistazienbaums ohne Schalen."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
-msgstr[0] "Pistazie (geröstet)"
-msgstr[1] "Pistazien (geröstet)"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr "Eine Handvoll geröstete Nussfrüchte eines Pistazienbaums."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
 msgstr "Eine Handvoll harter Nüsse eines Mandelbaums ohne Schalen."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
-msgstr[0] "Mandel (geröstet)"
-msgstr[1] "Mandeln (geröstet)"
+msgid "almond pulp"
+msgid_plural "almond pulp"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr ""
 
-#. ~ Description for handful of roasted almonds
+#: lang/json/COMESTIBLE_from_json.py
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
 msgstr "Eine Handvoll geröstete Nüsse eines Mandelbaums."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
+msgid "cashews"
+msgid_plural "cashews"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr "Eine Handvoll salziger Cashewnüsse."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -32235,45 +33340,45 @@ msgstr ""
 "Schalen."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
-msgstr[0] "Pekannuss (geröstet)"
-msgstr[1] "Pekannüsse (geröstet)"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr "Eine Handvoll geröstete Nüsse eines Pekannussbaums."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
-msgstr[0] "Erdnuss (geschält)"
-msgstr[1] "Erdnüsse (geschält)"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr "Salzige Erdnüsse ohne Schalen."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
+msgid "beech nuts"
+msgid_plural "beech nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
-msgstr[0] "Walnuss (geschält)"
-msgstr[1] "Walnüsse (geschält)"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -32281,23 +33386,24 @@ msgid ""
 msgstr "Eine Handvoll roher, harter Nüsse eines Walnussbaums ohne Schalen."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
-msgstr[0] "Walnuss (geröstet)"
-msgstr[1] "Walnüsse (geröstet)"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr "Eine Handvoll geröstete Nüsse eines Walnussbaums."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
-msgstr[0] "Kastanie (geschält)"
-msgstr[1] "Kastanien (geschält)"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -32305,23 +33411,25 @@ msgid ""
 msgstr "Eine Handvoll roher, harter Nüsse eines Kastanienbaums ohne Schalen."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
-msgstr[0] "Kastanie (geröstet)"
-msgstr[1] "Kastanien (geröstet)"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr "Eine Handvoll geröstete Nüsse eines Kastanienbaums."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -32329,45 +33437,47 @@ msgid ""
 msgstr "Eine Handvoll roher, harter Nüsse eines Haselnussbaums ohne Schalen."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
-msgstr[0] "Haselnuss (geröstet)"
-msgstr[1] "Haselnüsse (geröstet)"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr "Eine Handvoll geröstete Nüsse eines Haselnussbaums."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
-msgstr[0] "Handvoll geschälter Hickory-Nüsse"
-msgstr[1] "Handvoll geschälter Hickory-Nüsse"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -32377,12 +33487,13 @@ msgstr ""
 "entfernt wurden."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
-msgstr[0] "geröstete Hickory-Nuss"
-msgstr[1] "Handvoll gerösteter Hickory-Nüsse"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr "Eine Handvoll geröstete Nüsse eines Hickorybaums."
@@ -32397,12 +33508,12 @@ msgid "Delicious hickory nut ambrosia.  A drink worthy of the gods."
 msgstr "Leckere Hickorynuss-Ambrosia. Ein Getränk, dass Göttern würdig ist."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
-msgstr[0] "Handvoll Eicheln"
-msgstr[1] "Handvoll Eicheln"
+msgid "acorns"
+msgid_plural "acorns"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
@@ -32413,12 +33524,12 @@ msgstr ""
 "Essen."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
-msgstr[0] "Eichel (geröstet)"
-msgstr[1] "Eicheln (geröstet)"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr "Eine Handvoll geröstete Nussfrüchte einer Eiche."
@@ -33030,11 +34141,12 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
-msgstr[0] "Soylent-Green-Pulver"
-msgstr[1] "Portionen Soylent-Green-Pulver"
+msgid_plural "soylent green powder"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -33086,11 +34198,11 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
-msgstr[0] "Proteinpulver"
-msgstr[1] "Portionen Proteinpulver"
+msgid_plural "protein powder"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -33168,67 +34280,67 @@ msgstr ""
 "Sehr saure Zitrusfrucht. Kann gegessen werden, wenn du wirklich willst."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
-msgstr[0] "Heidelbeeren"
-msgstr[1] "Heidelbeeren"
+msgid "blueberries"
+msgid_plural "blueberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr "Sie sind blau, was aber nicht heißt, dass sie besoffen sind."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
-msgstr[0] "Erdbeeren"
-msgstr[1] "Erdbeeren"
+msgid "strawberries"
+msgid_plural "strawberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr "Leckere saftige Beere. Oft wild in Feldern gefunden."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
-msgstr[0] "Cranberrys"
-msgstr[1] "Cranberrys"
+msgid "cranberries"
+msgid_plural "cranberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr "Saure rote Beeren. Gut für deine Gesundheit."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
-msgstr[0] "Himbeeren"
-msgstr[1] "Himbeeren"
+msgid "raspberries"
+msgid_plural "raspberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "Eine süße rote Beere."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
-msgstr[0] "Huckleberrys"
-msgstr[1] "Huckleberrys"
+msgid "huckleberries"
+msgid_plural "huckleberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr "Heidelbeeren, werden oft mit Blaubeeren verwechselt."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
-msgstr[0] "Maulbeeren"
-msgstr[1] "Maulbeeren"
+msgid "mulberries"
+msgid_plural "mulberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -33238,12 +34350,12 @@ msgstr ""
 "die geschmacksintensivste Sorten der Welt sein."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
-msgstr[0] "Holunderbeeren"
-msgstr[1] "Holunderbeeren"
+msgid "elderberries"
+msgid_plural "elderberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr ""
@@ -33251,12 +34363,12 @@ msgstr ""
 "Geschmack."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
-msgstr[0] "Hagebutten"
-msgstr[1] "Hagebutten"
+msgid "rose hips"
+msgid_plural "rose hips"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "Die Frucht einer bestäubten Rose."
@@ -33293,12 +34405,12 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "Eine Zitrusfrucht, dessen Gemack von sauer zu halbsüß reicht."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
-msgstr[0] "Kirschen"
-msgstr[1] "Kirschen"
+msgid "cherries"
+msgid_plural "cherries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr "Eine rote süße Frucht, welche in Bäumen wächst."
@@ -33315,12 +34427,12 @@ msgstr ""
 "Eine handvoll großer violetter Pflaumen. Gesund und gut für deine Verdauung."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
-msgstr[0] "Trauben"
-msgstr[1] "Trauben"
+msgid "grapes"
+msgid_plural "grapes"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr "Eine Rispe saftiger Weintrauben."
@@ -33374,12 +34486,12 @@ msgid "A large and very sweet fruit."
 msgstr "Eine große und sehr süße Frucht."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
-msgstr[0] "Brombeeren"
-msgstr[1] "Brombeeren"
+msgid "blackberries"
+msgid_plural "blackberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "Eine dunklere Cousine der Himbeere."
@@ -33425,16 +34537,27 @@ msgstr ""
 "Eine große braune und flauschige Beere. Ihr leckeres Inneres ist grün."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
-msgstr[0] "Aprikosen"
-msgstr[1] "Aprikosen"
+msgid "apricots"
+msgid_plural "apricots"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "Eine weichhäutige Frucht, verwandt zur Pfirsich."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr ""
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr ""
@@ -33627,11 +34750,11 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -33641,11 +34764,11 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
+msgid_plural "chicory"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -33770,12 +34893,12 @@ msgstr ""
 "sehr lecker, aber großartig zum Kochen."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
-msgstr[0] "Handvoll Löwenzahn"
-msgstr[1] "Handvoll Löwenzahn"
+msgid "dandelions"
+msgid_plural "dandelions"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -33916,12 +35039,12 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -35887,8 +37010,8 @@ msgstr[1] ""
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35900,7 +37023,7 @@ msgstr[1] ""
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
 msgstr ""
 
@@ -36383,7 +37506,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36396,7 +37519,7 @@ msgstr[1] ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36493,8 +37616,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36505,8 +37628,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36517,8 +37641,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36529,8 +37653,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36541,9 +37665,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36578,7 +37702,7 @@ msgstr[1] ""
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36595,6 +37719,16 @@ msgid ""
 " properties."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr ""
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
 msgstr "verharzte Kordel"
@@ -37339,15 +38473,6 @@ msgstr[1] "Reismehl"
 msgid "This rice flour is useful for baking."
 msgstr "Dieses Maismehl ist nützlich zum Backen."
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr ""
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr ""
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr "Wiederbelebungsserum"
@@ -37671,8 +38796,8 @@ msgstr[1] ""
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -37684,8 +38809,8 @@ msgstr[1] ""
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -38259,8 +39384,8 @@ msgstr[1] ""
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -38873,8 +39998,8 @@ msgstr[1] ""
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -38886,7 +40011,7 @@ msgstr[1] ""
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr ""
 
@@ -38902,36 +40027,36 @@ msgid "A root from a hickory tree.  It has an earthy smell."
 msgstr "Eine Wurzel eines Hickorybaums. Sie hat einen erdigen Geruch."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr ""
 "Eine Handvoll harter Nüsse von einem Hickory-Baum, noch in der Schale."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
+msgid "pecans"
+msgid_plural "pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr ""
 "Eine Handvoll harter Nüsse eines Pekannussbaums, immer noch in ihrer Schale."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
+msgid "pistachios"
+msgid_plural "pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr ""
@@ -38939,24 +40064,24 @@ msgstr ""
 "Schale."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
+msgid "almonds"
+msgid_plural "almonds"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
 msgstr ""
 "Eine Handvoll harter Nüsse eines Mandelbaums, immer noch in ihrer Schale."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
+msgid "peanuts"
+msgid_plural "peanuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr ""
@@ -38964,24 +40089,24 @@ msgstr ""
 "Schale."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr ""
 "Eine Handvoll harter Nüsse eines Haselnussbaums, immer noch in ihrer Schale."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
+msgid "chestnuts"
+msgid_plural "chestnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr ""
@@ -38989,12 +40114,12 @@ msgstr ""
 "Schale."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
+msgid "walnuts"
+msgid_plural "walnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr ""
@@ -39139,7 +40264,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr ""
 
@@ -39163,7 +40288,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr ""
 
@@ -39271,6 +40396,12 @@ msgstr "Muskelkraft"
 msgid "wind"
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "eine Räuchervorrichtung und eine Feuerquelle"
@@ -39325,7 +40456,7 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -39480,8 +40611,8 @@ msgstr[1] ""
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -39813,6 +40944,18 @@ msgstr ""
 "Ein Stück Bewehrungsstab; er ist eine nette Nahkampfwaffe und könnte sich "
 "für den Bau stärkerer Wände und so als nützlich erweisen."
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -39957,8 +41100,8 @@ msgstr[1] "Fernseher"
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
-msgstr "Ein großer Röhrenfernseher, voller köstlicher Elektronik-Bauteile."
+msgid "A large LCD television, full of delicious electronics."
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -40428,6 +41571,19 @@ msgstr ""
 "Ein Modul, das viele Signalarten zu empfängt. Nützlich, um "
 "Kommunikationsequipment zu fertigen."
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -40889,10 +42045,8 @@ msgstr[1] "Wissenschaft-SD-Speicherkarten"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
+"encrypted.  Looks *Interesting*, though…"
 msgstr ""
-"Diese Speicherkarte scheint etwas mit XEDRA zu tun zu haben und ist bestimmt"
-" verschlüsselt. Sieht … interessant … aus …"
 
 #: lang/json/GENERIC_from_json.py
 msgid "hand mirror"
@@ -40976,12 +42130,13 @@ msgstr ""
 "Samen, die noch nicht von Tieren gegessen wurden."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -41280,10 +42435,10 @@ msgstr ""
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -41339,10 +42494,8 @@ msgstr[1] "Zigarettenstummel"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr ""
-"Was einstmals ein wunderbar süchtigmachendes Rohr aus getrockneten Tabaksblättern war, ist nun nur noch ein stinkendes Stück Müll. Welch Tragödie!\n"
-"Der restliche Tabak in einigen von diesen könnte vielleicht benutzt werden, um eine weitere Zigarette zu drehen. Falls du so weit gehen möchtest …"
 
 #. ~ Use action msg for joint.
 #: lang/json/GENERIC_from_json.py
@@ -41393,11 +42546,11 @@ msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
-msgstr[0] "Rohtabak"
-msgstr[1] "Handvoll Rohtabak"
+msgid_plural "raw tobacco"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -41454,12 +42607,6 @@ msgid ""
 "panel, if you can find one."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] "Neoprentuch"
-msgstr[1] "Neoprentücher"
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -41966,15 +43113,6 @@ msgstr ""
 "Ein einhändiges Beil. Ist eine großartige Nahkampfwaffe und ist sowohl als "
 "Hammer als auch zum Zerhacken von Dingen nützlich."
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr ""
-"Ein Stein in der Größe eines Baseballs. Ist eine passable Nahkampfwaffe und "
-"ist auch gut zum Schmeißen auf Gegner geeignet."
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -42606,11 +43744,8 @@ msgstr[1] "Blattfedern"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
+" an awful lot like a bow.  You can barely bend it…"
 msgstr ""
-"Eine große leistungsfähige Blattfeder. Wahrscheinlich von einem Auto oder "
-"Lastwagen, und sie sieht einem Bogen verdammt ähnlich. Du kannst sie kaum "
-"verbiegen …"
 
 #: lang/json/GENERIC_from_json.py
 msgid "hydrangea"
@@ -43284,7 +44419,7 @@ msgstr[1] "Atomkaffeemaschinen"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
@@ -43299,7 +44434,9 @@ msgstr[1] "Atomlampen"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "Abdeckung schließen"
 
@@ -43327,7 +44464,9 @@ msgstr[1] "Atomlampen (abgedeckt)"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "Abdeckung öffnen"
 
@@ -43629,8 +44768,8 @@ msgstr[1] "Enterhaken"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -44539,9 +45678,7 @@ msgstr[1] ""
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
+msgid "A complete guide to Wing Chun Kung-fu."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
@@ -44555,8 +45692,8 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -45744,6 +46881,20 @@ msgstr[1] ""
 msgid "This is a slip of paper signed by the issuer."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -46088,11 +47239,9 @@ msgstr[1] "Gabeln"
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
 msgstr ""
-"Eine Gabel, wenn du etwas damit erstichst, kannst du es gleich aufessen. "
-"Moment mal … Ach, vergiss es."
 
 #: lang/json/GENERIC_from_json.py
 msgid "plastic fork"
@@ -47358,7 +48507,7 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
 
@@ -47843,8 +48992,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
 msgstr ""
 
 #. ~ Description for estoc
@@ -47960,21 +49109,18 @@ msgstr ""
 "Schafts und der stumpfen Spitze."
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
-msgstr[0] "Fechtdegen"
-msgstr[1] "Fechtdegen"
+msgid "fencing épée"
+msgid_plural "fencing épées"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
 msgstr ""
-"Eine Waffe, die zum Fechten benutzt wird, die Nobelste aller Sportarten. Der"
-" Degen ist die schwerste und steifste der Fechtwaffen und daher "
-"wahrscheinlich die nützlichste."
 
 #: lang/json/GENERIC_from_json.py
 msgid "fencing saber"
@@ -47986,11 +49132,53 @@ msgstr[1] "Fechtsäbel"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
+"is marginally shorter than the foil and épée, but no less effective."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
 msgstr ""
-"Eine Waffe, die zum Fechten benutzt wird, die Nobelste aller Sportarten. Der"
-" Fechtsäbel ist geringfügig kürzer als Florett oder Degen, aber nicht "
-"weniger effektiv."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
@@ -48300,12 +49488,8 @@ msgstr[1] "Aluminiumbarren"
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
+"down to a powder, for more… high-profile applications."
 msgstr ""
-"Ein kleiner Aluminiumbarren, für die weitere Verarbeitung standardisiert. "
-"Leicht aber widerstandsfähig, er könnte zu diversen Formen für den Bau "
-"gegossen werden oder zu einem Pulver gemahlen werden, für … etwas "
-"»prominentere« Anwendungszwecke."
 
 #: lang/json/GENERIC_from_json.py
 msgid "scrap copper"
@@ -48645,6 +49829,46 @@ msgid ""
 " can also serve as an improvised stabbing weapon, but will break quickly."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -50280,7 +51504,7 @@ msgstr[1] ""
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -50292,8 +51516,8 @@ msgstr[1] ""
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -51483,6 +52707,27 @@ msgid ""
 "art."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr ""
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -51987,6 +53232,138 @@ msgid_plural "dao +2s"
 msgstr[0] ""
 msgstr[1] ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
@@ -52264,6 +53641,21 @@ msgid ""
 "to land astoundingly powerful blows."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -52346,6 +53738,19 @@ msgid ""
 "prized for their beauty and power."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -52372,100 +53777,6 @@ msgid ""
 "scales could make a suit of armor as hard as steel and half as heavy."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr ""
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -52540,6 +53851,56 @@ msgstr[1] ""
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr ""
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] "Gungnir"
+msgstr[1] "Gungnirs"
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] "Laevateinn"
+msgstr[1] "Laevateinns"
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -52785,8 +54146,8 @@ msgstr[1] ""
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -52800,7 +54161,7 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -53566,8 +54927,34 @@ msgstr[1] ""
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -53585,6 +54972,17 @@ msgid ""
 "rock and lava everywhere."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
@@ -54546,12 +55944,6 @@ msgstr ""
 " Lage sei, Berge mit einem Schlag zerschlagen. Er ist mit Gold- und "
 "Silberverzierungen dekoriert."
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] "Gungnir"
-msgstr[1] "Gungnirs"
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -55647,6 +57039,11 @@ msgstr "CHEMISCHES ZEUG"
 msgid "SPARE PARTS"
 msgstr "ERSATZTEILE"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "BEHÄLTER"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "ARTEFAKTE"
@@ -55657,6 +57054,313 @@ msgstr "ARTEFAKTE"
 msgid "ARMOR"
 msgstr "KLEIDUNG"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "GETRAGENES"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "GEHALTENE WAFFEN"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr "Beute: Unsortiert"
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr "Beute: Essen"
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr "Beute: verd. Essen"
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr "Beute: Getränke"
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr "Beute: verd. Getränke"
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr "Zielfeld für verderbliche Getränke."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr ""
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr "Beute: Feuerwaffen"
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr "Beute: Magazine"
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr "Zielfeld für Waffenmagazine."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr "Beute: Munition"
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr "Zielfeld für Munition."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr "Beute: Waffen"
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr "Zielfeld für Nahkampfwaffen."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr "Beute: Werkzeuge"
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr "Zielfeld für Werkzeuge."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr "Beute: Kleidung"
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr "Beute: vers. Kleidung"
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr "Zielfeld für versiffte Kleidung."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr "Beute: Drogen"
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr "Zielfeld für Drogen, Medikamente und andere medizinische Artikel."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr "Beute: Bücher"
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr "Zielfeld für Bücher und Zeitschriften."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr "Beute: Mods"
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr "Zielfeld für Schusswaffenmodifikationen und ähnliche Gegenstände."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr "Beute: Mutagene"
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr "Zielfeld für Mutagene, Seren und Purifizierer."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr "Beute: Bioniken"
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr "Beute: Fahrzeugteile"
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr "Zielfeld für Fahrzeugteile."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr "Beute: Andere"
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr "Zielfeld für andere sonstige Gegenstände."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr "Beute: Treibstoff"
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr ""
+"Zielfeld für Benzin, Diesel, Lampenöl und andere als Kraftstoff verwendete "
+"Substanzen."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr "Beute: Samen"
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr "Zielfeld für Samen, Stängel und ähnliche Gegenstände."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr "Beute: Chemisches Zeug"
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr "Zielfeld für Chemikalien."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr "Beute: Ersatzteile"
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr "Zielfeld für Ersatzteile."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr "Beute: Artefakte"
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr "Zielfeld für Artefakte"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr ""
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr "Beute: Rüstungen"
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr "Beute: vers. Rüstungen"
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr "Zielfeld für versiffte Rüstungen."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr "Beute: Holz"
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr ""
+"Zielfeld für Brennholz und Gegenstände, die als solches verwendet werden "
+"können."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr ""
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr "Beute: Ignorieren"
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr ""
+"Gegenstände innerhalb dieses Zielfeldes werden von der Zone-Aktion »Meine "
+"Beute aussortieren« ignoriert."
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -55878,7 +57582,7 @@ msgstr[1] ""
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
 msgstr ""
 
@@ -56274,8 +57978,8 @@ msgstr "H&K-G3-Trommelmagazin"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
-msgstr "Ein Trommelmagazin mit 50 Schuss für das H&K-G3-Gewehr."
+msgid "A 50-round drum magazine for the H&K G3 rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "H&K G3 magazine"
@@ -56320,8 +58024,8 @@ msgstr "FN-SCAR-H-Trommelmagazin"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
-msgstr "Ein Trommelmagazin mit 50 Schuss für das FN-SCAR-H-Gewehr."
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "FN SCAR-H magazine"
@@ -56421,17 +58125,6 @@ msgstr ""
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr ""
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "Taurus-.38-Magazin"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr ""
-"Ein kompaktes Stahlkastenmagazin zur Verwendung mit der Pistole Taurus Pro "
-".38."
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr ""
@@ -56505,6 +58198,16 @@ msgstr ""
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr ""
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr ""
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr ""
@@ -59531,7 +61234,7 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
+"appears to have a mininuke inside.  If this is targeting you…  Run."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -60065,11 +61768,8 @@ msgstr[1] ""
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
+"off in popularity… and price."
 msgstr ""
-"Früher betrachtete man diese Dinger als eine Plage, die es nicht wert sind, "
-"gegessen zu werden, dann fing ein Marketing-Genie an, sie an Leute als "
-"Delikatesse zu verkaufen, dann wurden sie rasch beliebter … und teurer."
 
 #: lang/json/MONSTER_from_json.py
 msgid "crayfish"
@@ -60081,10 +61781,8 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
+"water, and some spicy seasonings…"
 msgstr ""
-"Wenn du nur ein paar weitere von diesen Exemplaren fangen könntest und einen"
-" großen Topf mit kochendem Wasser und ein paar pikante Gewürze hättest …"
 
 #: lang/json/MONSTER_from_json.py
 msgid "Blinky"
@@ -61547,10 +63245,8 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
+"makes it sound… hungry."
 msgstr ""
-"Ein wurmschwänziger Nager mit langen Schnurrhaaren und Knopfaugen. Die Art "
-"und Weise, wie es quiekt, lässt es … hungig klingen."
 
 #: lang/json/MONSTER_from_json.py
 msgid "lamb"
@@ -62066,12 +63762,22 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
 msgstr ""
-"Dieser Boomer, normalerweise angeschwollen und bereit zum Explodieren, hat "
-"sich verstärkt und verfestigt. Die Galle, die aus seinem Mund tropft, "
-"scheint sich ebenfalls verändert zu haben."
 
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
@@ -62130,7 +63836,7 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -63057,15 +64763,11 @@ msgstr[1] "Shia LaBeouf"
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
-"Lebt im Wald,\n"
-"tötet zum Spaß,\n"
-"isst alle Körper:\n"
-"Ist-Kannibale Shia LeBeouf."
 
 #: lang/json/MONSTER_from_json.py
 msgid "shoggoth"
@@ -63365,7 +65067,7 @@ msgstr[1] ""
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr ""
@@ -63559,19 +65261,13 @@ msgstr[1] ""
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
 msgstr ""
-"Der übelste Gestank ist in der Luft:\n"
-"Vierzigtausend Jahre Sterben.\n"
-"Und grausige Ghule kommen aus jedem Grabe, \n"
-"um zu besiegeln dein Verderben.\n"
-"\n"
-"Der Tänzer bemerkt dich nicht mal, es scheint, dass etwas in der Nähe ihn lenkt."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie dog"
@@ -63894,15 +65590,11 @@ msgstr[1] ""
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
-"Und wenn du ums Überleben kämpfst, \n"
-"und du am ganzen Leibe zitterst, \n"
-"kannst du Sterblicher ihr nicht widersteh’n: \n"
-"Der Boshaftigkeit des Thrillers."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie snapper"
@@ -65630,8 +67322,8 @@ msgstr ""
 "Roboter ist, stinkt es wie der Tod."
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -66268,21 +67960,23 @@ msgid "The black pudding burns you with acid!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
+msgid "krabgek"
+msgid_plural "krabgeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
 msgstr ""
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
+msgid "The krabgek gazes at %3$s!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -66330,8 +68024,47 @@ msgstr[1] ""
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -68613,9 +70346,9 @@ msgid "Reveals an area around you on the overmap"
 msgstr ""
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
-msgstr "Du hast eine Vision über Umgebung …"
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
+msgstr ""
 
 #: lang/json/SPELL_from_json.py
 msgid "Artifact Firestorm"
@@ -68820,8 +70553,8 @@ msgstr ""
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -68859,7 +70592,7 @@ msgstr ""
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -68908,6 +70641,20 @@ msgstr ""
 msgid "Translocates the user to an attuned gate."
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr ""
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr ""
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr ""
@@ -68957,7 +70704,7 @@ msgstr ""
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69114,7 +70861,7 @@ msgstr ""
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr ""
 
@@ -69125,8 +70872,8 @@ msgstr ""
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69173,8 +70920,8 @@ msgstr ""
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69200,6 +70947,10 @@ msgstr ""
 msgid "Lava Bomb"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr ""
@@ -69207,7 +70958,7 @@ msgstr ""
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr ""
@@ -69219,9 +70970,9 @@ msgstr ""
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69294,7 +71045,7 @@ msgstr ""
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -69337,8 +71088,8 @@ msgstr ""
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py lang/json/effects_from_json.py
@@ -69357,6 +71108,15 @@ msgstr ""
 msgid "Fox's Cunning"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr ""
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr ""
@@ -69396,8 +71156,8 @@ msgstr ""
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69458,8 +71218,8 @@ msgstr ""
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69486,6 +71246,10 @@ msgstr ""
 msgid "Mirror Image"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr ""
@@ -70062,6 +71826,46 @@ msgstr ""
 "Benutze sie, um sie einzuschalten. Sie ist momentan eingeschaltet und "
 "verbraucht kontinuierlich Batterie. Benutze sie, um sie auszuschalten."
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -70151,8 +71955,8 @@ msgstr[1] ""
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
 
@@ -71295,13 +73099,11 @@ msgstr "Die Batterien des Ohrenschützers sind leer."
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
 msgstr ""
-"Ein Ohrenschützer, wie er von Schützen bevorzugt wird. Der Ohrenschützer ist"
-" ausgeschaltet. Er wird Geräusche über einen bestimmten Dezibelpegel "
-"blockieren, angenommen, dass er mit Batterien geladen ist."
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -71773,6 +73575,213 @@ msgid ""
 "power."
 msgstr ""
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr ""
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -72118,9 +74127,9 @@ msgstr[1] ""
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
 
@@ -72253,11 +74262,9 @@ msgstr[1] "Hellseherstäbe"
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr ""
-"Gegenstand, um das aep_clairvoyance_plus-Flag zu testen. Wenn dies zufällig "
-"irgendwo auftaucht, ist es ein Bug."
 
 #: lang/json/TOOL_from_json.py
 msgid "boulder anvil"
@@ -72578,7 +74585,7 @@ msgstr "Du zündest die Zündschnur von %s an."
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr ""
@@ -72599,8 +74606,8 @@ msgstr "Du hast die Zündschnur bereits angezündet – worauf wartest du?"
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -72612,7 +74619,7 @@ msgstr[1] ""
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
@@ -72627,8 +74634,8 @@ msgstr[1] ""
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr ""
 
@@ -72648,8 +74655,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -72662,8 +74669,8 @@ msgstr[1] ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -72674,9 +74681,9 @@ msgstr[1] ""
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "Licht"
 
@@ -72710,7 +74717,7 @@ msgstr ""
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
+"  The face shifts."
 msgstr ""
 
 #. ~ Description for battle axe
@@ -72874,6 +74881,27 @@ msgstr ""
 "Dies ist eine Blechdose, die bis zur Kante mit Schwarzpulver gefüllt ist. "
 "Eine angezündete Zündschnur steckt drin."
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] "Landstreicherherd (angezündet)"
+msgstr[1] "Landstreicherherde (angezündet)"
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "Die glühende Asche ist gelöscht."
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -73139,11 +75167,9 @@ msgstr[1] "Wassermühlen"
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
 msgstr ""
-"Eine kleine Wasserbetriebene Mühle, die stärkehaltige Produkte zu Mehl "
-"mahlen kann. Wird über das Konstruktionsmenü gebaut."
 
 #: lang/json/TOOL_from_json.py lang/json/furniture_from_json.py
 msgid "wind mill"
@@ -73154,11 +75180,9 @@ msgstr[1] "Windmühlen"
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
 msgstr ""
-"Eine kleine Windbetriebene Mühle, die stärkehaltige Produkte zu Mehl mahlen "
-"kann. Wird über das Konstruktionsmenü gebaut."
 
 #: lang/json/TOOL_from_json.py
 msgid "banjo"
@@ -73556,12 +75580,9 @@ msgstr[1] "Tranchiergeräte (aus)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
 msgstr ""
-"Ein elektronischer Tranchierer, der mit Batterien betrieben wird. Zwei "
-"gezackte Klingen, die gemeinsam vibrieren, um praktisch alles von Truthahn "
-"zu Fleisch zu schneiden – sogar von Zombies!"
 
 #: lang/json/TOOL_from_json.py
 msgid "electric carver (on)"
@@ -73761,7 +75782,7 @@ msgstr[1] ""
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr ""
@@ -74290,10 +76311,8 @@ msgstr[1] "elektronische Handschellen"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-"Ein Paar elektronische Handschellen, von Polizei und Antikrawallrobotern verwendet, um Festnahmen vorzunehmen. Ihre ständige Sirene identifiziert den Träger als einen verhafteten Kriminellen und alarmiert die menschliche Polizei. Warte darauf, bis sie ankommt, versuch nicht, zu fliehen, oder die Handschellen zu entfernen – sie würden dir einen Elektroschock verpassen.\n"
-"Aber seit die einzige Polizei, die wahrscheinlich reagieren würde, untot ist, könntest du eine lange Wartezeit vor dir haben, es sei denn, du wirst kreativ …"
 
 #: lang/json/TOOL_from_json.py
 msgid "entrenching tool"
@@ -76531,8 +78550,8 @@ msgstr[1] ""
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -77580,12 +79599,8 @@ msgstr ""
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr ""
-"Dies ist eine selbstgemachte Explosivvorrichtung, die aus einem großen "
-"Platikkrug mit Schwarzpulver und Metallschrott besteht und mit einer langen "
-"Zundschnur versehen wurde. Benutze diesen Gegenstand, um die Zündschnur "
-"anzuzünden. Sie sollte in wenigen Minuten explodieren …"
 
 #: lang/json/TOOL_from_json.py
 msgid "active black gunpowder charge"
@@ -78200,37 +80215,6 @@ msgid_plural "hobo stoves"
 msgstr[0] "Landstreicherherd"
 msgstr[1] "Landstreicherherde"
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr ""
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "Du brauchst eine Feuerquelle!"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr ""
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] "Landstreicherherd (angezündet)"
-msgstr[1] "Landstreicherherde (angezündet)"
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "Die glühende Asche ist gelöscht."
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -78423,8 +80407,8 @@ msgstr[1] ""
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -78819,7 +80803,7 @@ msgstr ""
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -78837,7 +80821,7 @@ msgstr[1] ""
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -78927,9 +80911,9 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -78981,7 +80965,7 @@ msgstr ""
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -79010,8 +80994,8 @@ msgstr ""
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
@@ -79037,7 +81021,7 @@ msgstr ""
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
 msgstr ""
@@ -79061,8 +81045,8 @@ msgstr ""
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
 msgstr ""
 
@@ -79085,8 +81069,8 @@ msgstr ""
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
 msgstr ""
 
@@ -79110,9 +81094,9 @@ msgstr ""
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -79134,7 +81118,7 @@ msgstr ""
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
 msgstr ""
@@ -79188,7 +81172,7 @@ msgstr ""
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -79218,8 +81202,8 @@ msgstr ""
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
@@ -79245,10 +81229,10 @@ msgstr ""
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
 
@@ -79615,7 +81599,7 @@ msgstr[1] ""
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
+"of a stick.  However it's quite fragile."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -79722,6 +81706,21 @@ msgstr ""
 "könnte tödlich sein, entweder in den richtigen Händen, oder wenn es als ein "
 "Bajonett befestigt wird."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -80123,6 +82122,21 @@ msgstr ""
 "einer Feuerwaffe oder einer Armbrust angebracht werden kann, was sie zu "
 "einer Pike macht."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -80233,6 +82247,57 @@ msgstr ""
 "Dies ist ein riesiges, gekrümmtes, zweihändiges Schwert aus Japan. Für "
 "dessen Größe ist es überraschend leicht."
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -80648,6 +82713,34 @@ msgstr ""
 "Dies ist ein Stück Plastik. Es könnte benutzt werden, um Gegenstände "
 "herzustellen, zu reparieren oder, um Plastikgegenstände zu verstärken."
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -81170,12 +83263,8 @@ msgstr[1] "Funksprechgeräte"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
 msgstr ""
-"Dies ist ein Funkgerät mit einer Sendeeinheit. Du könntest es benutzen, um "
-"jemanden zu kontaktieren, der ebenfalls eins hat. Leider scheint heutzutage "
-"niemand mehr diese Dinger zu benutzen."
 
 #: lang/json/TOOL_from_json.py
 msgid "remote vehicle controller"
@@ -81373,7 +83462,7 @@ msgstr[1] ""
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
@@ -81578,7 +83667,7 @@ msgstr[1] "Hochleistungskabel"
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr ""
 
@@ -82000,7 +84089,7 @@ msgstr ""
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr ""
 
@@ -82031,7 +84120,7 @@ msgstr[1] ""
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -83188,12 +85277,6 @@ msgstr ""
 "Dies ist ein Stock, der zu einem Schaltmechanismus für eine Fallstrickfalle "
 "geschnitzt wurde."
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] "Laevateinn"
-msgstr[1] "Laevateinns"
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -84587,6 +86670,17 @@ msgid ""
 " terribly when not on a rail."
 msgstr ""
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr ""
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr ""
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "Motorrad-Rad"
@@ -85003,6 +87097,10 @@ msgstr ""
 msgid "cranking"
 msgstr ""
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr ""
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr ""
@@ -85283,6 +87381,10 @@ msgstr "Pfeile"
 msgid "pebbles"
 msgstr "Kieselsteine"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "Steine"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr ""
@@ -85647,7 +87749,7 @@ msgstr "Legierungsplattierung – Arme"
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -85685,7 +87787,7 @@ msgstr "Legierungsplattierung – Beine"
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -86037,17 +88139,20 @@ msgstr "Ethanolverbrennung"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
 msgstr ""
-"Du verbrennst Alkohol als Treibstoff auf extrem effiziente Weise. Allerdings"
-" wirst du immer noch unter den berauschenden Wirkungen der Substanz leiden."
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "Luftverdampfer"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr ""
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "Diamant-Hornhaut"
@@ -86331,10 +88436,10 @@ msgstr ""
 " ausschaltet."
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "Miniflammenwerfer"
+msgid "Finger Lighter"
+msgstr ""
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -86367,8 +88472,8 @@ msgstr "Elektromagnetische Einheit"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -86435,8 +88540,8 @@ msgstr "Reparaturnanoroboter"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -86473,11 +88578,8 @@ msgstr ""
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
+"Increases mouth encumbrance by ten."
 msgstr ""
-"Du hast keine Ahnung, wie das KBM in deine Nase gelangt ist, aber egal, wie "
-"es dahin gekommen ist, macht dieses furchtbar fehlinstallierte Bionik es "
-"schwierig zum Atmen. Erhöht die Mundhinderung um 1."
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -86511,7 +88613,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
+"mild optic neuropathy.  Increases eye encumbrance by ten."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -86544,7 +88646,7 @@ msgstr "Stromspeicher"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
 msgstr ""
@@ -86555,8 +88657,7 @@ msgstr "Stromspeicher Mk. II"
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
 msgstr ""
 
 #. ~ Description for Power Overload
@@ -86892,12 +88993,8 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
+" by ten, while failing to improve your ability to hold objects whatsoever."
 msgstr ""
-"Selbsteinrastende Daumen halten fest (auch wenn du das eigentlich nicht "
-"willst) und lassen nicht los (auch wenn du das eigentlich willst). Erhöht "
-"die Handhinderung um 2 und erhöht die Fähigkeit, Gegenstände festzuhalten, "
-"überhaupt nicht."
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -87039,8 +89136,8 @@ msgstr ""
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
@@ -87108,7 +89205,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr ""
@@ -87810,6 +89907,18 @@ msgstr ""
 msgid "Make Woodchip Floor"
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr "Holzfußboden bauen"
@@ -88473,6 +90582,10 @@ msgstr ""
 msgid "Build a radio tower console."
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr ""
@@ -89296,6 +91409,42 @@ msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr ""
 "Du träumst von Bienen, die sich über deinen süßen Nektar streiten. Mmmh."
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr ""
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -90681,6 +92830,25 @@ msgstr "Deine Hände hören einfach nicht auf, zu zittern."
 msgid "You tremble"
 msgstr "Du zitterst"
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr ""
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr ""
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr ""
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "Blutung"
@@ -91631,6 +93799,26 @@ msgstr "Dein Stoffwechsel ist gestört."
 msgid "Your metabolism becomes more stable."
 msgstr "Dein Stoffwechsel stabilisiert sich."
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr ""
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "Erhellt"
@@ -91892,6 +94080,17 @@ msgstr "Hochaufgeladen"
 msgid "You've been struck by lightning, and feel... different."
 msgstr "Du wurdest vom Blitz getroffen und fühlst dich jetzt... anders."
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr ""
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr "Religiöse Beleidigung"
@@ -92649,6 +94848,192 @@ msgstr ""
 "weiterer Polizeikräfte zu warten, wurde er von den Untoten, die vom Tumult "
 "angezogen wurden, in Stücke zerfetzt."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr ""
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -93005,6 +95390,167 @@ msgstr ""
 "zu verbrauchen. Zwei Wochen, nachdem sie in ihre Zelle gezerrt wurde, starb "
 "sie an Dehydrierung."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr ""
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "Deine Gefährten"
@@ -93170,10 +95716,10 @@ msgid "A small family surviving on their generational land."
 msgstr ""
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
+msgid "New England Church Community"
 msgstr ""
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -93219,105 +95765,213 @@ msgstr ""
 msgid "Dusty"
 msgstr ""
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "It's dusty.  Has no effect - obsolete fault."
+msgstr ""
+
+#. ~ name of mending method for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "Wipe clean"
+msgstr ""
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
+#, python-format
+msgid "You clean you %s."
 msgstr ""
 
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr ""
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr ""
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr ""
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr ""
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
 
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr ""
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr ""
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr ""
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr ""
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr ""
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
 
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
 msgstr ""
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "Benötigt für den Betrieb einer angeschlossenen Lichtmaschine."
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr ""
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr ""
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr ""
 "Hilft, wenn man einen Motor bei niedrigen Umgebungstemparaturen starten "
 "will."
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr ""
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "Verhindert das Starten eines Fahrzeugs ohne den passenden Schlüssel."
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr ""
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr ""
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr ""
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr ""
 "Benötigt, um Diesel aus einem Fahrzeugtank zu pumpen und druckfest zu "
 "machen."
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr ""
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
@@ -93325,11 +95979,23 @@ msgstr ""
 "Ein abgelaufener Filter reduziert die Treibstoffeffizienz und erhöht die "
 "Raucherzeugung."
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr ""
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
@@ -93337,35 +96003,83 @@ msgstr ""
 "Ein abgelaufener Filter reduziert die Leistung und erhöht die "
 "Wahrscheinlichkeit von Fehlzündungen."
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr ""
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr "Benötigt, um Benzin aus einem Fahrzeugtank zu pumpen."
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr ""
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr ""
 "Benötigt, um Wasser in einen außenliegenden Heizkörper oder Kühlkörper zu "
 "pumpen."
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr ""
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "Benötigt, um den Motor das erste Mal zu starten."
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr ""
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -93852,6 +96566,10 @@ msgstr ""
 msgid "smoke vent"
 msgstr "Rauchventil"
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr ""
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
 msgstr ""
@@ -94040,11 +96758,11 @@ msgstr "Eine Straßensperre. Zum Verbarrikadieren von Straßen."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "»Schepper!«."
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "»Wumms!«."
 
@@ -94159,7 +96877,8 @@ msgstr "Statue"
 msgid "A carved statue made of stone."
 msgstr ""
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "»Bums.«."
 
@@ -94170,7 +96889,7 @@ msgstr "Mannequin"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
 msgstr ""
 
@@ -94559,7 +97278,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "»Knirsch!«."
 
@@ -94572,7 +97291,7 @@ msgstr "Marlossblume"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
+"and… delicious?"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -95011,9 +97730,9 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -95083,7 +97802,7 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -95249,7 +97968,7 @@ msgstr "Laufband"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
+" taken apart for its… parts."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -95275,7 +97994,7 @@ msgstr "Klavier"
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -95436,6 +98155,17 @@ msgstr "Hocker"
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr ""
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "Pinnwand"
@@ -95913,7 +98643,7 @@ msgstr ""
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
 msgstr ""
 
@@ -95987,11 +98717,11 @@ msgid "This beaded curtain could be pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
+msgid "clickity clack… clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
+msgid "clickity clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -96004,7 +98734,7 @@ msgid "This beaded curtain has been pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
+msgid "clickity clack… clack… clack!"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -96152,8 +98882,7 @@ msgstr "mülliger Dreckshaufen"
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -96687,6 +99416,15 @@ msgid ""
 "blood, candles, and other small knick-knacks."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr ""
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr "knirsch!"
@@ -96716,8 +99454,8 @@ msgstr "Das Tor ist geöffnet!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
-msgstr "Du drehst den Griff."
+msgid "You turn the handle…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -96736,8 +99474,8 @@ msgstr "Die Scheunentore öffneten sich!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
-msgstr "Du ziehst das Seil."
+msgid "You pull the rope…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -96771,8 +99509,8 @@ msgstr "Die Türe erhebt sich!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
-msgstr "Du betätigst den Hebel …"
+msgid "You throw the lever…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -96967,12 +99705,8 @@ msgstr[1] "Primitiv-Bögen"
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr ""
-"Ein primitiver, aus einem einzigen Holzstück hergestellter Bogen, der "
-"speziell für die ihn verwendende Person angefertigt wurde. Schwach, "
-"wahnsinnig ungenau und funktioniert unglücklicherweise zudem nicht "
-"sonderlich gut..."
 
 #: lang/json/gun_from_json.py
 msgid "short bow"
@@ -97198,9 +99932,7 @@ msgstr ""
 "ist. Von dieser Waffe abgefeuerte Bolzen haben eine gute Chance, für die "
 "Wiederverwendung intakt zu bleiben."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "Pistole"
@@ -97407,6 +100139,18 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "werfen"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -97502,6 +100246,10 @@ msgstr ""
 "um die Aufstrahlung zu verringern. Obwohl stark, leidet sie an einer kurzen "
 "Reichweite. Von Esz. betrieben."
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "halbautomatisch"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -97511,10 +100259,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -97533,8 +100281,7 @@ msgstr ""
 " anderen für Schrotmunition. Sie wurde aus Rohren und Teilen, die aus einer "
 "doppelläufigen Flinte ausgeschlachtet wurden, gebaut."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "Schrotflinte"
@@ -97732,6 +100479,10 @@ msgstr ""
 "Fahrzeug montiert ist, könnte es benutzt werden, um Feuer oder "
 "»Demonstranten« zu stoppen."
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -98045,8 +100796,8 @@ msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 
@@ -98157,10 +100908,6 @@ msgstr ""
 "würde deine Garantie erlöschen lassen. Es gibt keine wirklichen Stellen, um "
 "dieser nutzlosen Protowaffe Modifikationen aus dem Zubehörmarkt anzubringen."
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "halbautomatisch"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -98801,16 +101548,10 @@ msgstr[1] "M24"
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
-"Die M24 Sniper ist die Militär- und Polizeivariante des Gewehrs Remington "
-"Model 700. »M24« ist der von der Armee der Vereinigten Staaten vergebene "
-"Modellname nach der Übernahme als ihr Standardscharfschützengewehr im Jahre "
-"1988. Die M24 wird als »Waffensystem« bezeichnet, da sie nicht nur aus einem"
-" Gewehr, sondern auch aus einem abnehmbaren Zielfernrohr und anderen "
-"Ausstattungen besteht."
 
 #: lang/json/gun_from_json.py
 msgid "HK417 A2"
@@ -98980,20 +101721,17 @@ msgstr ""
 "auseinanderfällt."
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
-msgstr[0] "COP .38"
-msgstr[1] "COP .38"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
 msgstr ""
-"Die COP .38 ist eine kleine dicke Deringerpistole, die eine leichte "
-"Ähnlichkeit mit der Mossberg Brownie aufweist. Sie hat vier Läufe, die "
-"quadradisch angeordnet sind."
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -99029,20 +101767,6 @@ msgstr ""
 "Ein siebenschüssiger .38-Revolver, der von Smith & Wesson verkauft wird. Er "
 "hat eine feste Kimme und einen verstärkten Rahmen."
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] "Taurus Pro .38"
-msgstr[1] "Taurus Pro .38"
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr ""
-"Eine beliebte .38-Pistole. Sie wurde mit zahlreichen Sicherheitsfunktionen "
-"entworfen und von hochqualitativen langlebigen Materialen gebaut."
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -99110,10 +101834,22 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
 msgid_plural "M1911A1s"
@@ -99216,9 +101952,9 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -99244,8 +101980,9 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -99669,8 +102406,9 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -100814,9 +103552,9 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -100828,8 +103566,8 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -100845,7 +103583,7 @@ msgstr[1] ""
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -100858,7 +103596,7 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
@@ -100871,10 +103609,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
 
@@ -100887,10 +103625,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -101659,10 +104397,6 @@ msgid ""
 "and destruction it can cause."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr ""
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -102649,10 +105383,62 @@ msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] "Ichaival"
+msgstr[1] "Ichaivals"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -102780,12 +105566,6 @@ msgstr ""
 "Sehne zu ziehen. Abgefeuerte Bolzen bleiben wahrscheinlich intakt, um zum "
 "Wiedergebrauch wieder geborgen werden zu können."
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] "Ichaival"
-msgstr[1] "Ichaivals"
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -104053,7 +106833,7 @@ msgstr ""
 msgid "accessories"
 msgstr "Zubehör"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "Bogen"
@@ -104190,7 +106970,7 @@ msgstr[1] "Esztests"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
+"it's a bug.  50x more UPS drain."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -104363,8 +107143,8 @@ msgstr[1] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -104393,7 +107173,7 @@ msgstr[1] ""
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
+"energy efficiency.  Decreases power consumption."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -104408,11 +107188,9 @@ msgstr[1] "hochdichte Kondensatoren"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
 msgstr ""
-"Ein Kondensator mit einer höheren Energiedichte erhöht Reichweite und "
-"Schaden auf Kosten eines merklich erhöhten Strombedarfs."
 
 #: lang/json/gunmod_from_json.py
 msgid "Leadworks magazine adapter"
@@ -104645,6 +107423,20 @@ msgstr ""
 "den Rückstoß zu verbessern, aber sie erhöht das Gewicht, den Lärm und "
 "verringert die Treffgenauigkeit leicht."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
 msgid_plural "homemade suppressors"
@@ -104791,6 +107583,20 @@ msgstr ""
 msgid "rail"
 msgstr "Schiene"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
@@ -104806,6 +107612,19 @@ msgstr ""
 "ist dafür gedacht, verwendet zu werden, wenn ein Zielfernrohr oder eine "
 "andere Modifikation die Verwendung einer Primärvisierung verhindert."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
@@ -104818,6 +107637,18 @@ msgstr ""
 "Eine zusätzliche Schiene, die um 45° versetzt moniert ist, um eine "
 "Sekundäroptik aufzunehmen."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
@@ -104849,6 +107680,20 @@ msgstr ""
 " wird und welches die Vibration deiner Waffe reduziert, wodurch der Rückstoß"
 " stark verringert und die Treffgenauigkeit geringfügig erhöht wird."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -104977,6 +107822,20 @@ msgid ""
 " mrad increments and is remarkably small and light for its magnification."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
@@ -104989,6 +107848,19 @@ msgid ""
 "crosshair."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
 msgid_plural "RS1219 scopes"
@@ -105206,6 +108078,21 @@ msgstr ""
 "Handhabbarkeit des Rückstoßes stark verbessern, können sie nur auf "
 "bestimmten Oberflächen benutzt werden und es braucht lange, sie anzubringen."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -105249,6 +108136,19 @@ msgstr ""
 "Nicht so effektiv wie ein Zweibein, kann aber unter allen Bedingungen "
 "benutzt werden."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
@@ -105321,6 +108221,20 @@ msgstr ""
 "werden, aber heute kann sie zu fast jedem Gewehr angebracht werden. Mit ihr "
 "kann eine einzelne 40mm-Granate geladen und abgefeuert werden."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
@@ -105339,6 +108253,21 @@ msgstr ""
 " Es kann etweder an ein Gewehr angebracht werden oder mit einem Schaft zu "
 "einer eigenständigen Waffe kombiniert werden."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "masterkey shotgun"
 msgid_plural "masterkey shotguns"
@@ -105355,6 +108284,20 @@ msgstr ""
 "Gewehre angebracht werden kann. Sie kann insgesamt vier "
 "Schrotflintenpatronen laden und feuern."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
 msgid_plural "40mm pipe launchers"
@@ -105363,12 +108306,9 @@ msgstr[1] "40mm-Rohrwerfer"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
 msgstr ""
-"Dies ist ein selbstgemachtes Abschussgerät, das an fast jedes Gewehr "
-"angebracht werden kann. Sie kann eine einzelne 40mm-Granate laden und "
-"abfeuern."
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -105401,6 +108341,20 @@ msgstr ""
 " die hülsenlose Munition aus Magazinen verschießt. Sie kann unter dem Lauf "
 "vieler Gewehre angebracht werden. Akzeptiert RMSA10-Kastenmagazine."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
 msgid_plural "underslung shotguns"
@@ -105416,6 +108370,20 @@ msgstr ""
 "angebracht werden. Mit ihr können zwei Schrotpatronen geladen und abgefeuert"
 " werden."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
 msgid_plural "LW underbarrel laser sights"
@@ -105725,6 +108693,58 @@ msgstr ""
 "aufwändiger Veränderungen kann die Schusswaffe ohne einer Esz. nicht mehr "
 "benutzt werden."
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -107720,9 +110740,10 @@ msgstr "Strahlung messen"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
-msgstr "…"
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
+msgstr ""
 
 #: lang/json/item_action_from_json.py
 msgid "Control an RC car"
@@ -108395,6 +111416,13 @@ msgstr ""
 msgid "This bionic can provide power to powered armor."
 msgstr "Dieses Bionik ist eine Stromquelle für bestromte Rüstungen."
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr ""
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -109944,6 +112972,7 @@ msgstr "Benutzerdefinierte Farbe löschen"
 msgid "Load color template"
 msgstr "Farbvorlage laden"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -112517,7 +115546,7 @@ msgstr ""
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -112560,41 +115589,6 @@ msgid ""
 "Lasts 2 turns."
 msgstr ""
 
-#: lang/json/martial_art_from_json.py
-msgid "Zui Quan"
-msgstr "Zui Quan"
-
-#. ~ Description for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
-msgstr ""
-"Auch bekannt als »betrunkenes Boxen« imitiert Zui Quan die Bewegungen eines "
-"Betrunkenen, um den Gegner zu verwirren, was dir einen passiven "
-"Ausweichbonus, basierend auf deiner Intelligenz, gibt. Nach dem Zug, in dem "
-"du erfolgreich angreifst, kannst du einer beliebigen Anzahl von Angriffen "
-"ohne Einbuße ausweichen, und das erfolgreiche Ausweichen eines Angriffs gibt"
-" dir Bonusschaden und zusätzlichen Treffbonus, basierend auf deiner "
-"Intelligenz."
-
-#. ~ Description of buff for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "Intelligenz erhöht Ausweichfertigkeit"
-
-#: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
-msgstr "Gegenschlag"
-
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
-msgstr "Zusatzschaden und Treffbonus nach erfolgreichem Ausweichen"
-
 #: lang/json/martial_art_from_json.py
 msgid "Tiger Kung Fu"
 msgstr "Tiger-Kung-Fu"
@@ -112617,17 +115611,136 @@ msgstr "Tiger-Rage"
 
 #. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "+3 Schlag/Angriff"
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger's Strength"
+msgstr ""
+
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Wing Chun"
+msgstr ""
+
+#. ~ Description for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
+"learn effective techniques from the various Shaolin animal forms.  It has a "
+"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
+"sensitivity to the opponent's direction of force, and flowing around it to "
+"get back to hitting."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr ""
 
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "Tigerstärke"
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
 
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "Stärke bietet zusätzlichen Schadensbonus."
+msgid "Chi-Sao Sensitivity"
+msgstr ""
+
+#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Zui Quan"
+msgstr "Zui Quan"
+
+#. ~ Description for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Zui Quan Stance"
+msgstr ""
+
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Advanced Zui Quan"
+msgstr ""
+
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Drunken Stumble"
+msgstr ""
+
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Drunken Dodging"
+msgstr ""
+
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Debug Mastery"
@@ -112653,29 +115766,6 @@ msgstr ""
 "+Stärke Schlagpanzerung, +Geschick Säurepanzerung, +Intelligenz "
 "Elektropanzerung, +Wahrnehmung Feuerpanzerung."
 
-#: lang/json/martial_art_from_json.py
-msgid "Wing Chun"
-msgstr ""
-
-#. ~ Description for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
-"learn effective techniques from the various Shaolin animal forms.  It has a "
-"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
-"sensitivity to the opponent's direction of force, and flowing around it to "
-"get back to hitting."
-msgstr ""
-
-#: lang/json/martial_art_from_json.py
-msgid "Chi-Sao Sensitivity"
-msgstr ""
-
-#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
-msgstr ""
-
 #: lang/json/martial_art_from_json.py
 msgid "Bionic Combatives"
 msgstr "Bionik-Kampfgeist"
@@ -112829,14 +115919,11 @@ msgstr "Kröten-Kung-Fu"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
 msgstr ""
-"Eines der »Fünf Tödlichen Gifte«. Die Meister des Krötenstils können sich "
-"selbst gegen alle Angriffe konzentrieren. Du kannst durch Pausieren "
-"meditieren, was dir Panzerung gibt, wobei du Konzentration verlierst, wenn "
-"du dich bewegst."
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -112844,8 +115931,11 @@ msgstr "Der Kröte Eisenhaut"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "Gibt bis zu +6 Panzerung beim Stillstehen"
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -112854,8 +115944,12 @@ msgstr "Eisenhautzerstreuung"
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
-msgstr "Die Eisenhaut wird weich, wenn du dich bewegst!"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Viper Kung Fu"
@@ -112864,42 +115958,49 @@ msgstr "Viper-Kung-Fu"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
 msgstr ""
-"Ein Erbe der »Fünf Tödlichen Gifte«. Der Viperstil hat eine einzigartige "
-"dreiteilige Kombi, welche mit einem kritischem Treffer beginnen sollte, zu "
-"dem dann Stichschaden und ein zweihändiger Viperschlag folgen."
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "Viperschlag verfügbar"
+msgid "Viper's Patience"
+msgstr ""
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
-msgstr "Guter Biss! Dein nächster Angriff wird der Viperschlag sein!"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "Vipergeduld"
+msgid "Viper's Ambush"
+msgstr ""
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
-msgstr "+2 Ausweichen. Ein erfolgreiches Ausweichmanöver startet eine Kombi."
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
-msgstr "Viper-Hinterhalt"
+msgid "Viper's Venom"
+msgstr ""
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
 msgstr ""
-"Du hast sie in die Falle gelockt! Dein nächster Angriff wird der Viperbiss "
-"sein."
 
 #: lang/json/martial_art_from_json.py
 msgid "C.R.I.T Blade-work"
@@ -113280,6 +116381,10 @@ msgstr "Blei"
 msgid "Leather"
 msgstr "Leder"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "Milch"
@@ -113344,6 +116449,10 @@ msgstr "Superlegierung"
 msgid "layered carbide"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Tin"
 msgstr ""
@@ -113454,6 +116563,10 @@ msgstr ""
 msgid "Arcane Skin"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr ""
@@ -113463,7 +116576,7 @@ msgid "Sugar"
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
+msgid "Gather bones for the Brigitte.  About 8 should do it."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -117252,8 +120365,8 @@ msgstr ""
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -120186,8 +123299,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -120197,7 +123310,7 @@ msgstr ""
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
 msgstr ""
 
@@ -120320,7 +123433,7 @@ msgstr ""
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
 msgstr ""
 
@@ -120423,6 +123536,27 @@ msgstr ""
 "Du kannst dich schneller bewegen als die Meisten, was dir bei sicherem Halt "
 "einen Geschwindigkeitsbonus von 15% gibt."
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr ""
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr ""
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr ""
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "Gutes Gehör"
@@ -120983,13 +124117,10 @@ msgstr "Stimulanspsychose"
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
-"Du hast eine einzigartige Vorgeschichte mit Stimulanzien (wie Kaffee oder "
-"Amphetaminen). Du kannst sie viel eher tolerieren, ohne eine Überdosis zu "
-"erleiden, aber wenn du es übertreibst, wirst du Dinge sehen …"
 
 #. ~ Description for Stylish
 #: lang/json/mutation_from_json.py
@@ -121147,6 +124278,18 @@ msgid ""
 " Pentjak Silat, or Sōjutsu."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr ""
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
 msgstr "Schwacher Geruch"
@@ -121998,11 +125141,9 @@ msgstr "Naturgeistaugen"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
 msgstr ""
-"Deine Augen sind … grün geworden. Es ist schwer, den genauen Farbton zu "
-"nennen, weil er sich zu verändern scheint. Die Wirkung ist … angenehm."
 
 #: lang/json/mutation_from_json.py
 msgid "Fey Vision"
@@ -122925,11 +126066,8 @@ msgstr "Marlossträger"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
+"nose, and you have a strong desire to try some seeds and… sap?"
 msgstr ""
-"Seitdem du diese Marlossbeere gegessen hast, kannst du nicht mehr ihren "
-"Geruch aus deiner Nase bekommen und hast ein starkes Verlangen, ein paar "
-"Samen zu probieren und … Saft?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vessel"
@@ -122939,11 +126077,8 @@ msgstr "Marlosswird"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
+"tongue, and you have a strong desire to try some berries and… sap?"
 msgstr ""
-"Seitdem du diesen Marlosssamen gegessen hast, kannst du nicht mehr ihren "
-"Gemack aus deiner Zunge bekommen und hast ein starkes Verlangen, ein paar "
-"Beeren zu probieren und … Saft?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vector"
@@ -123414,12 +126549,9 @@ msgstr "Säbelzähne"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
 msgstr ""
-"Deine Reißzähne sind extrem groß und unglaublich scharf geworden. Sie machen"
-" es unmöglich, Mundbekleidungen zu tragen und das Essen schwer. Aber sie "
-"hinterlassen schlimme Wunden, wenn du beißt."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
@@ -124857,11 +127989,9 @@ msgstr "Schnauze"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
 msgstr ""
-"Dein Gesicht und Kiefer begannen sich zu … verändern. Masken und ähnliches "
-"passen noch einigermaßen, aber du bist merklich mutiert."
 
 #: lang/json/mutation_from_json.py
 msgid "Bovine Snout"
@@ -125732,14 +128862,12 @@ msgstr "Ektotherm"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
-"Dein Körper ist permanent kaltblütig geworden. Deine Geschwindigkeit sinkt "
-"bzw. steigt für alle 2 °F (1,1 °C) unter bzw. über 65 °F (18,3 °C). Du musst"
-" nur halb so viel wie ein durchschnittlicher Mensch essen."
 
 #: lang/json/mutation_from_json.py
 msgid "Growling Voice"
@@ -126086,10 +129214,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
+"every need… but how would you keep them in line?"
 msgstr ""
-"Es wäre gut, eine Königin zu sein und Arbeiter zu haben, die permanent jeden"
-" deiner Bedürfnisse erfüllen … aber wie würdest du sie auf Zack halten?"
 
 #. ~ Description for Plant
 #: lang/json/mutation_from_json.py
@@ -126107,11 +129233,9 @@ msgstr "Wässrig"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
 msgstr ""
-"Wie ging nochmal die alte Werbung? »Mal die Welt bunt an!«? Das könnte ein "
-"gutes langfristiges Ziel sein, aber jetzt …"
 
 #: lang/json/mutation_from_json.py
 msgid "Subterranean"
@@ -127939,8 +131063,8 @@ msgid "Scientist"
 msgstr "Wissenschaftler"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
-msgstr "Ich suche nach Hinweisen über die Ursprünge dieser Monster."
+msgid "I'm looking for clues concerning these monsters' origins…"
+msgstr ""
 
 #: lang/json/npc_class_from_json.py
 msgid "Bounty Hunter"
@@ -128003,7 +131127,7 @@ msgid "Real Person"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -128019,7 +131143,7 @@ msgid "Foodperson"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
@@ -128027,7 +131151,7 @@ msgid "Cyborg"
 msgstr "Cyborg"
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -128171,6 +131295,14 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr ""
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
+msgstr ""
+
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 #: lang/json/npc_from_json.py
 msgid "Captive"
@@ -129767,6 +132899,10 @@ msgstr "Kaufhausdach"
 msgid "hotel parking"
 msgstr "Hotelparkplatz"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "Hotel"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "Hoteleingang"
@@ -130136,7 +133272,7 @@ msgid "spiked trench"
 msgstr "Stachelgraben"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
+msgid "fabrication workshop survey"
 msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
@@ -130151,6 +133287,14 @@ msgstr "Schmiede"
 msgid "livestock survey"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr ""
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr ""
@@ -130836,6 +133980,10 @@ msgstr "Schießplatz"
 msgid "shooting range roof"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "Golfplatz"
@@ -131502,10 +134650,6 @@ msgstr "Roboterzentrale"
 msgid "dense urban"
 msgstr "dichtes Stadtgebiet"
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "Hotel"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "Schule"
@@ -131526,6 +134670,10 @@ msgstr ""
 msgid "mechanics garage"
 msgstr "Mechanikergarage"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
 msgstr "Abwasserkläranlage"
@@ -136553,6 +139701,36 @@ msgid ""
 "on. This displeases you."
 msgstr ""
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -139652,11 +142830,6 @@ msgstr "FÜSSE"
 msgid "MEDICAL"
 msgstr "MEDIZIN"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "BEHÄLTER"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -140642,7 +143815,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
 msgstr ""
 
@@ -140699,7 +143872,7 @@ msgstr ""
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
+"grab a pot.  Let's put it in that dining area."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -141444,7 +144617,7 @@ msgid "build 2 wood stoves"
 msgstr ""
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
+msgid "We should build a well.  This will make cooking more convenient."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -141941,6 +145114,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr ""
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -141961,8 +145310,8 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -142067,7 +145416,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
 msgstr ""
 
@@ -142077,7 +145426,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
 msgstr ""
 
@@ -142087,7 +145436,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
 msgstr ""
 
@@ -142519,7 +145868,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
+"Some benches around the outside would be nice.  Build some to the northwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -142528,7 +145877,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
+"Some benches around the outside would be nice.  Build some to the northeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -142537,7 +145886,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
+"Some benches around the outside would be nice.  Build some to the southeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -142546,7 +145895,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
+"Some benches around the outside would be nice.  Build some to the southwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -142788,6 +146137,10 @@ msgstr ""
 msgid "Central Storage Building"
 msgstr ""
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr ""
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
 msgstr ""
@@ -144187,6 +147540,44 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr ""
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -149426,13 +152817,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
+msgid "Pass some ethanol, I need to power my ethanol burner."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -149440,20 +152825,12 @@ msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
+msgid "I require ethanol for my internal power supply.  Anything on you?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -157296,7 +160673,7 @@ msgid "a static hissing sound."
 msgstr "ein rauschendes Zischgeräusch."
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157310,11 +160687,11 @@ msgid "\"Hold on, I want to pulp that zombie corpse.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
+msgid "\"Burning… from the inside…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
+msgid "\"This smell…  Don't know…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157326,19 +160703,19 @@ msgid "a scraping noise."
 msgstr "ein Kratzgeräusch."
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
+msgid "\"No…  Stop the burning!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
+msgid "\"Hunger…  Must eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
+msgid "\"Run…  Chase…  Eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157464,7 +160841,7 @@ msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
+msgid "\"Can't… breathe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157477,8 +160854,8 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157490,7 +160867,7 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157498,11 +160875,11 @@ msgid "\"This is a dream.  This has to be a dream.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
+msgid "\"This is my life now… this is my life now… this is my life now…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
+msgid "\"Wanna go home…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157558,7 +160935,7 @@ msgstr ""
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157581,18 +160958,18 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157715,7 +161092,7 @@ msgid "\"Police inbound.  Stay where you are!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157736,7 +161113,7 @@ msgid "\"FoodPlace: It's the Calories.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157804,8 +161181,8 @@ msgid "You shouldn't have done that."
 msgstr "Das solltest du nicht getan haben."
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
-msgstr "Lasst uns Russisch Roulette spielen."
+msgid "Let's play… Russian roulette."
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "I hate you."
@@ -157816,8 +161193,8 @@ msgid "Go kill yourself!"
 msgstr "Los, bring dich um!"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
-msgstr "Der große Bruder sieht dich an."
+msgid "Big Brother is watching you…"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Die for me!"
@@ -157828,12 +161205,12 @@ msgid "Why won't you die?"
 msgstr "Warum stirbst du nicht?"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
-msgstr "Blut … lecker!"
+msgid "Blood…  Delicious."
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
-msgstr "Wir sehen uns. In der HÖLLE!"
+msgid "See you… IN HELL!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "AAAIEEEEEEE!"
@@ -157848,8 +161225,8 @@ msgid "What did you do with my Mommy?"
 msgstr "Was hast du mit meiner Mami getan?"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
-msgstr "Begleite mich … für immer!"
+msgid "Stay with me… forever!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Hey kids.  Want some candy?"
@@ -159309,6 +162686,10 @@ msgstr "Sammlerbunker"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#: lang/json/start_location_from_json.py
+msgid "Wizard's lake retreat"
+msgstr ""
+
 #: lang/json/start_location_from_json.py
 msgid "Candy Shop"
 msgstr ""
@@ -159358,16 +162739,16 @@ msgid "You there. Quiet down. Can you hear it? The song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
+msgid "What?  What do you mean?  What song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
+msgid "So about the songs…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
 msgstr ""
 
@@ -159384,7 +162765,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159394,11 +162775,11 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
+msgid "What?  Singing bones?  What are you talking about?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159447,7 +162828,7 @@ msgid "I will bear that in mind"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159459,7 +162840,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
+msgid "End the world?  What?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159471,8 +162852,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159487,7 +162868,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
+msgid "I… thank you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159516,28 +162897,28 @@ msgid "That is all for now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgid "A song may yet be sung by you, should you wish to."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
+msgid "There is an additional song you could take on, if you'd like."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
+msgid ""
+"I know of certain bones that could be of use, if you'd like to know more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "A song may yet be sung by you, should you wish to."
+msgid "There are bones to etch, songs to sing. Wish to join me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There is an additional song you could take on, if you'd like."
+msgid "Do you wish to take on more songs?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid ""
-"I know of certain bones that could be of use, if you'd like to know more."
+msgid "Do you believe you can take on the burden of additional bones?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159561,7 +162942,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159569,7 +162950,7 @@ msgid "Not interested."
 msgstr "Bin nicht interessiert."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
+msgid "Consider it done.  But I also wanted to ask…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159585,7 +162966,7 @@ msgid "I'm off then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159595,7 +162976,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
+msgid "I see.  Very well then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159613,11 +162994,11 @@ msgid "I am glad to hear it. Let's go then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
+msgid "Maybe some other time.  Changing the topic…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159639,17 +163020,17 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
 
@@ -159661,6 +163042,10 @@ msgstr ""
 msgid "Skip it, let's get going."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr ""
@@ -159718,13 +163103,25 @@ msgid "What about chit-chatting and your background?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -159768,7 +163165,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159791,7 +163190,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159830,8 +163231,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
 
@@ -159839,6 +163240,10 @@ msgstr ""
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -159896,11 +163301,27 @@ msgid ""
 "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159911,6 +163332,10 @@ msgstr ""
 msgid "Tell me more about the activities you can do now."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -160117,19 +163542,19 @@ msgid "Let's go."
 msgstr "Los geht’s!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
-msgstr "Ändere deine Angriffsstrategie…"
+msgid "Change your engagement rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
-msgstr "Ändere deine Zielregeln…"
+msgid "Change your aiming rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
+msgid "Change your bionic power reserve rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
+msgid "Change your bionic power recharge rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160141,11 +163566,11 @@ msgid "Stick close to me, no matter what."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
+msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_false_text>"
+msgid "<ally_rule_follow_distance_2_true_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160406,7 +163831,7 @@ msgid "Nah, I'm just kidding."
 msgstr "Ach was, ich mach nur Scherze."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
+msgid "Please go to this location…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160543,8 +163968,8 @@ msgstr ""
 "um?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
-msgstr "Ach weißt du, nicht schlecht, nicht schlecht ..."
+msgid "Oh you know, not bad, not bad…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "<hallu_dont_trade>"
@@ -160631,14 +164056,14 @@ msgstr ""
 msgid "&Put hands up."
 msgstr "&Hände hoch!"
 
-#: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
-msgstr "*lässt seine Waffe fallen."
-
 #: lang/json/talk_topic_from_json.py
 msgid "*drops_her_weapon."
 msgstr "*lässt ihre Waffe fallen."
 
+#: lang/json/talk_topic_from_json.py
+msgid "*drops his weapon."
+msgstr "*lässt seine Waffe fallen."
+
 #: lang/json/talk_topic_from_json.py
 msgid "Now get out of here"
 msgstr "Jetzt verschwinde von hier"
@@ -160652,12 +164077,12 @@ msgid "Okay, I'm going."
 msgstr "Okay, ich komme."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
-msgstr "Über diese Aufgabe …"
+msgid "About that job…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
-msgstr "Über eine dieser Aufgaben …"
+msgid "About one of those jobs…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "What's the matter?"
@@ -160675,14 +164100,6 @@ msgstr "Ich hab nichts für dich zu tun."
 msgid "I don't have any more jobs for you."
 msgstr "Ich hab nichts weiteres für dich zu tun."
 
-#: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
-msgstr ""
-
 #: lang/json/talk_topic_from_json.py
 msgid "I have another job for you.  Want to hear about it?"
 msgstr "Ich habe noch eine Aufgabe für dich. Willst du sie hören?"
@@ -160691,6 +164108,14 @@ msgstr "Ich habe noch eine Aufgabe für dich. Willst du sie hören?"
 msgid "I just have one job for you.  Want to hear about it?"
 msgstr "Ich hab nur eine Aufgabe für dich. Willst du sie hören?"
 
+#: lang/json/talk_topic_from_json.py
+msgid "I have other jobs for you.  Want to hear about them?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I have more jobs for you.  Want to hear about them?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
 #: src/npctalk.cpp
 msgid "Oh, okay."
@@ -160749,8 +164174,8 @@ msgid "Whatever.  Bye."
 msgstr "Wie auch immer. Tschüss."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
-msgstr "Es tut mir leid, ich … ich habe versagt."
+msgid "I'm sorry…  I failed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not yet."
@@ -160769,7 +164194,7 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "Nein. Ich werde darauf zurückkommen, tschüss!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
+msgid "Yup!  Here it is!"
 msgstr "Ja! Hier ist es!"
 
 #: lang/json/talk_topic_from_json.py
@@ -161031,8 +164456,8 @@ msgid "Alright.  You can lead now."
 msgstr "In Ordnung. Du übernimmst die Führung."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
-msgstr "Gut. Noch etwas …"
+msgid "Good.  Something else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alright, let's go."
@@ -161111,8 +164536,8 @@ msgid "I'd prefer to keep that to myself."
 msgstr "Ich behalte das lieber für mich."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
-msgstr "Ich verstehe …"
+msgid "I understand…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "You just asked me for stuff; ask later."
@@ -161135,8 +164560,8 @@ msgid "Because I'm your friend!"
 msgstr "Weil ich dein Freund bin."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
-msgstr "Naja, ich helf dir."
+msgid "Well, I am helping you out…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'll give it back!"
@@ -161183,15 +164608,15 @@ msgid "No, I'm keeping it. Try and take it off me, I dare you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
+msgid "Look, I really need this.  Please let me have it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
+msgid "What, this?  It's not the same one, you are mistaken."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
+msgid "I'm sorry.  Look, I already dropped it, okay?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161199,7 +164624,7 @@ msgid "Don't try and talk yourself out of this, drop it now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
+msgid "Okay, I'm dropping it…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161261,8 +164686,8 @@ msgid "Pleasure doing business!"
 msgstr "Es war mir ein Vergnügen, Geschäfte zu machen!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
-msgstr "Du könntest mich eventuell öfters sehen …"
+msgid "You might be seeing more of me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey again. *kzzz*"
@@ -161275,21 +164700,21 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
+msgid "Hey.  Let's chat for a second."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
+msgid "That's because I saved you.  Listen, I could use your help…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161301,7 +164726,7 @@ msgid "Come with me. We can help each other out."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
+msgid "We both go our separate ways.  Enjoy your freedom."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161318,8 +164743,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161340,7 +164765,7 @@ msgid "Get out of my sight."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161356,7 +164781,7 @@ msgid "Not if I kill you first!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
+msgid "I'm sorry!  I shouldn't have said that!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161397,18 +164822,37 @@ msgstr "Nichts. Lasst uns wieder an die Arbeit gehen."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
-"Das Fraktionslagersystem wurde so ausgelegt, um dir mehr Kontrolle über "
-"deine Gefährten zu geben, indem du ihnen ihre eigenen Missionen zuweisen "
-"kannst. Diese Missionen können von Sammeln und Fertigen bis zu eventuellen "
-"Kampfpatrouillen reichen."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
-msgstr "Sprich weiter."
+msgid "Give me an overview of how camps work."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Never mind, let's go back to talking about camps."
@@ -161428,92 +164872,120 @@ msgstr "Vergiss es. Lass uns gehen."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
 msgstr ""
-"Nahrung wird während jeder Mission benötigt oder produziert. Für Missionen, "
-"die eine feste Dauer haben, musst du im Voraus bezahlen, während für "
-"wiederholende Missionen, wie Feuerholz sammeln, nachher bezahlt werden muss."
-" Wenn Nahrung, um einen Begleiter zu bezahlen, fehlt, wird das zu einen "
-"Rufverlust in der Fraktion führen. Was wiederum zu SEHR schlechten Dingen "
-"führen kann, wenn der Ruf zu weit unten ist."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
-msgstr "Warte, bitte wiederhole was du gesagt hast."
+msgid "Wait, we can talk with radios?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
 msgstr ""
-"Nachdem du einen Platz ausgesucht hast, wirst du Materialien finden oder "
-"herstellen müssen, um das Lager weiter aufzuwerten und auf weitere Missionen"
-" zugreifen zu können. Die ersten neuen Missionen konzentrieren sich auf das "
-"Sammeln von Materialien, um das Lager aufzuwerten, damit du es nicht tun "
-"musst. Nach zwei oder drei Aufwertungen wirst du Zugriff auf die "
-"»<color_yellow>Niedere Arbeiten</color>«-Mission haben, mit der du Begleiter"
-" beauftragen kannst, all die Gegenstände, die im Lager herumliegen, in "
-"Kategorien zu sortieren. Mit späteren Aufwertungen kannst du Begleiter "
-"entsenden, um neue Mitglieder zu rekrutieren, Oberkartenbefestigungen zu "
-"bauen oder sogar auf Kampfpatrouille zu gehen"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
 msgstr ""
-"Wenn du dein erstes Zelt vollkommen aufgewertet hast, wirst du die Fähigkeit"
-" freischalten, Expansionen zu bauen. Expansionen ermöglichen es dir, jedes "
-"Lager zu spezialisieren, indem du dich auf die Industrien konzentrierst, die"
-" du brauchst. Ein <color_light_green>[Bauernhof]</color> wird für Spieler "
-"empfohlen, die eine große Fraktion anstreben, während eine "
-"<color_light_green>[Küche]</color> besser für Spieler ist, die die "
-"Bequemlichkeit haben wollen, einen NPC all die Kocharbeiten machen zu "
-"lassen. Eine <color_light_green>[Garage]</color> ist nützlich für Missionen "
-"zum Ausschlachten von Fahrzeugen, in denen du Fahrzeuge gegen große Mengen "
-"von Bauteilen und Ressourcen eintauschen kannst. All diese Ressourcen können"
-" in der <color_light_green>[Schmiede]</color>zu wertvollem Equipment "
-"verarbeitet werden. Du kannst eine zusätzliche Expansion nach jeder zweiten "
-"Stufe, nach dem die erste freigeschaltet wurde, bauen. Und wenn ein Lager "
-"voll ist, kannst du einfach ein weiteres bauen."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
-msgstr "Danke, aber lass uns wieder über Lager reden."
+msgid "Got it.  Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -161526,6 +164998,14 @@ msgid ""
 "6.  You can now set up faction camps in select buildings.  The list of available buildings is constantly growing, so you'll have to experiment."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr "Danke, aber lass uns wieder über Lager reden."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -161627,11 +165107,11 @@ msgid "Well, sure."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
+msgid "I'd… rather not."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161662,7 +165142,7 @@ msgid "Oh, but you already have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
+msgid "Yes… yes I have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161727,7 +165207,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
+msgid "Horrible.  Did you get any pictures yourself?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161879,8 +165359,8 @@ msgid "This is a npc allies 1 test response."
 msgstr "Das ist eine NPC-Verbündeten-1-Testantwort."
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
-msgstr "Das ist eine error! NPC-Verbündeten-2-Testantwort."
+msgid "This an error!  npc allies 2 test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a npc engagement rule test response."
@@ -162079,8 +165559,8 @@ msgid "This is a u_has_items beer test response."
 msgstr "Das ist eine Du-hast-Gegenstände-Bier-Testantwort."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
-msgstr "Testfehler! Das ist eine Du-hast-Gegenstände-Testantwort."
+msgid "Test failure!  This is a u_has_items test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a u_has_item_category books test response."
@@ -162091,7 +165571,7 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162179,7 +165659,7 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162235,11 +165715,7 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
+msgid "Greetings…  Foodperson?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162281,7 +165757,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
+msgid "Ah…  Well, nice to meet you Foodperson."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162309,7 +165785,7 @@ msgid "Sure, whatever."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
+msgid "Ok…  I believe you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162405,7 +165881,7 @@ msgid "That sounds great!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
+msgid "Ok…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162413,7 +165889,7 @@ msgid "I need to think about it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
+msgid "Huh…  No thanks."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162430,7 +165906,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr ""
 
@@ -163468,8 +166944,8 @@ msgid "Giant bees?  Tell me more."
 msgstr "Riesige Bienen?  Erzähl mir mehr."
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
-msgstr "Aber Bienen sind normalerweise nicht aggressiv..."
+msgid "But bees aren't usually aggressive…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -163485,10 +166961,8 @@ msgstr ""
 "wie ein von der Tarantel gestochenes Hühnchen rannte."
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
 msgstr ""
-"Aber Bienen sind normalerweise nicht aggressiv... Meinst du vielleicht "
-"Wespen?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -164098,8 +167572,8 @@ msgid "No.  I can't.  Just, no."
 msgstr "Nein.  Ich kann nicht.  Einfach nein."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
-msgstr "Entschuldigung ... Ich lass dich in Ruhe."
+msgid "Sorry…  I'll let you be."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -164480,8 +167954,8 @@ msgstr ""
 "Königreich verlassen mussten, bevor es zerfiel."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
-msgstr "Okay..."
+msgid "Okay…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165011,8 +168485,8 @@ msgid "What do you think happened?"
 msgstr "Was denkst du, was passiert ist?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
-msgstr "Das klingt ein wenig verrückt ..."
+msgid "That does sound a little crazy…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165086,8 +168560,8 @@ msgid "What happened to you after that?"
 msgstr "Was ist mit dir danach passiert?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
-msgstr "Es kann nicht gesund sein, deine Vergangenheit so aufzugeben ..."
+msgid "It can't be healthy to abandon your past like that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165716,8 +169190,8 @@ msgstr ""
 "sich alles rechtzeitig aufklären."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
-msgstr "Meinst du im religiösen Sinn oder...?"
+msgid "Do you mean in a religious sense, or…?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166177,11 +169651,9 @@ msgstr "Was wurde daraus?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
 msgstr ""
-"Wenn ich dir die richtigen Sachen gebe, glaubst du, dass du so etwas wie … "
-"Wissenschaft damit machen könntest?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166356,8 +169828,8 @@ msgstr ""
 "Hochzeitstag."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
-msgstr "Oh, tut mir leid ..."
+msgid "Oh, I'm sorry…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166706,7 +170178,7 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
+msgid "I'd like to ask you something else…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166997,7 +170469,8 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167187,16 +170660,16 @@ msgid "What do you need done?"
 msgstr "Wass musst du tun?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
-msgstr "Über die Mission…"
+msgid "About the mission…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
-msgstr "Über eine deiner Missionen…"
+msgid "About one of those missions…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
-msgstr "Ich muss gehen…"
+msgid "I've got to go…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -167220,8 +170693,8 @@ msgstr ""
 "unserer Kräfte für Bergungsmissionen verfügbar zu machen."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
-msgstr "Scheint ein guter Plan zu sein."
+msgid "Seems like a decent plan…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -167250,10 +170723,8 @@ msgstr ""
 "Ebenen umgeleitet wurde."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
+msgid "Whatever they did it must have worked since we are still alive…"
 msgstr ""
-"Was auch immer sie getan haben, es muss wohl funktioniert haben, weil wir "
-"immer noch leben."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Marshal, I'm rather surprised to see you here."
@@ -167292,8 +170763,8 @@ msgstr ""
 "wenn du irgendwelche Fragen hast."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
-msgstr "Dann versuche ich es und finde deinen Anführer …"
+msgid "I'll try and find your commander then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -167366,8 +170837,8 @@ msgstr ""
 "begleiten würdest?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
-msgstr "Ignorier mich einfach."
+msgid "Don't mind me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -167649,7 +171120,7 @@ msgstr ""
 "Hab ich dir was über Pappkarton erzählt, mein Freund? Hast du welchen?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
+msgid "About that shopping list of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167717,8 +171188,8 @@ msgid "Would you like me to give you some cardboard?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
-msgstr "Ich denke ich muss los ..."
+msgid "I think I have to get going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -167750,7 +171221,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
+msgid "…What were you saying before?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167770,7 +171241,7 @@ msgid "No."
 msgstr "Nein."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167862,8 +171333,8 @@ msgid "I found a sample of alien fungus for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
-msgstr "OK ... auf Wiedersehen."
+msgid "Ok… see ya."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -167964,8 +171435,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167997,7 +171468,7 @@ msgid "You sound more optimistic than usual."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168117,7 +171588,7 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168227,7 +171698,7 @@ msgstr ""
 "verhungere. Kannst du einer armen schwachen Seele helfen?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168662,7 +172133,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168918,7 +172389,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
+msgid "About that sourdough starter you had me looking for…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169213,7 +172684,7 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
+msgid "Yes, yes I would… you monster."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169409,6 +172880,10 @@ msgid ""
 "idea of trying it."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr "Sprich weiter."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -169663,7 +173138,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -170206,7 +173681,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr ""
 
@@ -170905,7 +174380,7 @@ msgid "Are you looking to buy anything else?"
 msgstr "Willst du etwas anderes kaufen?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
+msgid "Very well… let's talk about something else."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -171257,8 +174732,8 @@ msgstr ""
 "Hast du irgendjemanden gesehen, der vielleicht etwas verstecken könnte?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
-msgstr "Tschüss…"
+msgid "Bye…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171273,16 +174748,16 @@ msgid "Keep your head down and stay out of my way."
 msgstr "Kopf runter! Und bleib mir aus dem Weg."
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
-msgstr "In Ordnung …"
+msgid "OK…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like what?"
 msgstr "Was denn zum Beispiel?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
-msgstr "Ich bin mir nicht sicher …"
+msgid "I'm not sure…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like they could be working for someone else?"
@@ -171301,8 +174776,8 @@ msgid "Got something to hide?"
 msgstr "Hast du etwas zu verbergen?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
-msgstr "Tschuldigung, ich wollte dich nicht beleidigen …"
+msgid "Sorry, I didn't mean to offend you…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171358,7 +174833,7 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr "Gnä’ Frau, Sie sollten wirklich nicht hier draußen reisen."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
+msgid "I heard this place was a refugee center…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -171382,8 +174857,8 @@ msgid "Can I do anything for the center?"
 msgstr "Kann ich irgendwas für das Lager tun?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
-msgstr "Ich glaube, du suchst nach etwas Hilfe…"
+msgid "I figured you might be looking for some help…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, I'd better be going.  Bye."
@@ -171439,7 +174914,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
 msgstr ""
 
@@ -171500,8 +174975,8 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr "Es tut mir leid, aber wir wollen momentan keine Risiken eingehen."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
-msgstr "Ist gebongt!"
+msgid "Fine…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171517,8 +174992,8 @@ msgstr ""
 " haben."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
-msgstr "In Ordnung … *hustleckmichhust*"
+msgid "Fine… *coughupyourscough*"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171555,8 +175030,8 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[STÄ 11] Ich kann wirklich gut ins Gesicht zuschlagen!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
-msgstr "Ich denke, ich schau woanders nach …"
+msgid "I guess I'll look somewhere else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171583,8 +175058,8 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr "Von irgendwas besserem als diesen seltsamen Waffenschatz gehört?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
-msgstr "Ich hatte auf etwas mehr gehofft …"
+msgid "Was hoping for something more…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171687,8 +175162,8 @@ msgid "So what are you doing right now?"
 msgstr "Also was machst du gerade?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
-msgstr "Schon gut."
+msgid "Never mind…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171719,8 +175194,8 @@ msgstr ""
 "braucht Hoffnung zum Überleben."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
-msgstr "Viel Glück damit..."
+msgid "Good luck with that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171769,8 +175244,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
-msgstr "Nicht gut …"
+msgid "Sucks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171790,8 +175265,8 @@ msgstr ""
 "diesem Zeug gebaut wurde, durchbrechen zu können."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
-msgstr "Na dann …"
+msgid "Well, then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171893,8 +175368,8 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr "Hö? Ich dachte, ich hätte jemand Neues gerochen. Kann ich dir helfen?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
-msgstr "Du … hast mich gerochen?"
+msgid "You… smelled me?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Got anything for sale?"
@@ -171953,8 +175428,8 @@ msgstr ""
 "Abendessen heran!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
-msgstr "Großartig, nun ist mein Mund ganz wässerig …"
+msgid "Great, now my mouth is watering…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172086,8 +175561,8 @@ msgstr ""
 "Helden willkommen geheißen."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
-msgstr "Hmmm…"
+msgid "Hmmm…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172152,8 +175627,8 @@ msgstr ""
 " lebenden Menschen zu machen."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
-msgstr "Ich habe nichts falsches getan …"
+msgid "I haven't done anything wrong…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any tips for surviving?"
@@ -172323,7 +175798,7 @@ msgid "Something to say?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
+msgid "I charge hourly, so be quick…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -172436,7 +175911,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
+msgid "I guess I could help with that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -172547,8 +176022,8 @@ msgid "[$10] I'll get a haircut"
 msgstr "[10 $] Ich will mir die Haare schneiden lassen"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
-msgstr "Vielleich ein anderes Mal …"
+msgid "Maybe another time…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172568,8 +176043,8 @@ msgid "Stand still while I get my clippers..."
 msgstr "Rühr dich nicht vom Fleck, während ich meine Schere hole …"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
-msgstr "Danke."
+msgid "Thanks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Want a drink?"
@@ -172588,8 +176063,8 @@ msgid "What do you have on tap?"
 msgstr "Was hast du im Angebot?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
-msgstr "Ich gehe dann mal …"
+msgid "I'll be going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172648,8 +176123,8 @@ msgstr ""
 "solltest ihn fragen über das, was getan werden muss."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
-msgstr "Dann werde ich mit ihm sprechen."
+msgid "I'll talk to him then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172669,8 +176144,8 @@ msgid "I hope you are here to do business."
 msgstr "Hoffentlich bist du hier, um Geschäfte zu machen."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
-msgstr "Ich bin daran interessiert, in Landwirtschaft zu investieren."
+msgid "I'm interested in investing in agriculture…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172700,14 +176175,12 @@ msgid "I imagine we might be able to work something out."
 msgstr "Ich denke, dass wir etwas aushandeln können."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
+msgid "I was wondering if you could install a cybernetic implant…"
 msgstr ""
-"Ich hab mich gefragt, ob du mir ein kybernetisches Implantat installieren "
-"könntest."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
-msgstr "Ich brauche Hilfe bei der Entfernung eines Implantats."
+msgid "I need help removing an implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'd like to hire your services."
@@ -172756,8 +176229,8 @@ msgstr ""
 "Erfolg ist."
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
-msgstr "Es könnte schlimmer sein."
+msgid "It could be worse…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172768,8 +176241,8 @@ msgstr ""
 "brauchst, such nach dem Vorarbeiter oder Feldaufseher."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
-msgstr "Dann werde ich mit ihnen sprechen."
+msgid "I'll talk with them then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Can I help you, marshal?"
@@ -172851,8 +176324,8 @@ msgstr ""
 "dem Verfungern und untoten Überfällen gegenüber."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
-msgstr "Hoffentlich war es das wert, hier auszuziehen."
+msgid "Hopefully moving out here was worth it…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -173427,13 +176900,13 @@ msgstr "Viperbiss"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
-msgstr "Du verpasst %s einen Viperbiss"
+msgid "You lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
-msgstr "<npcname> verpasst %s einen Viperbiss"
+msgid "<npcname> lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Strike"
@@ -173441,18 +176914,28 @@ msgstr "Viperschlag"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
-msgstr "Du verpasst %s einen Viperschlag"
+msgid "You hit %s with a spectacular Viper Strike"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
-msgstr "<npcname> viperschlägt %s"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr "Viperwinden"
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr ""
@@ -173495,6 +176978,34 @@ msgstr ""
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr "<npcname> verpasst %s mit einer Scherenfaust einen Jab"
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr "Froschzunge"
@@ -175241,32 +178752,18 @@ msgid "<npcname> double-handed palm strikes %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
-msgstr "Betrunkenheit vortäuschen"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "You stumble and leer at %s"
-msgstr "Du stolperst und schielst auf %s"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "<npcname> stumbles and leers at %s"
-msgstr "<npcname> stolpert und schielt auf %s"
-
-#: lang/json/technique_from_json.py
-msgid "Drunk counter"
-msgstr "betrunkener Konter"
+msgid "Tiger Palm"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
-msgstr "Du torkelst und dein wilder Schwung trifft %s"
+msgid "You land a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
-msgstr "<npcname> taumelt und trifft %s"
+msgid "<npcname> lands a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Tiger Takedown"
@@ -175274,95 +178771,78 @@ msgstr "Tigerstampfer"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
-msgstr "Du greifst und wirfst %s auf den Boden"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "<npcname> grabs and grounds %s"
-msgstr "<npcname> greift und wirft %s auf den Boden"
-
-#: lang/json/technique_from_json.py
-msgid "slow strike"
-msgstr "langsamer Schlag"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "You slowly strike %s"
-msgstr "Du schlägst %s langsam"
+msgid "You slam %s to the ground"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
-msgstr "<npcname> schlägt %s langsam"
+msgid "<npcname> slams %s to the ground"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
-msgstr "Phasenschlag"
+msgid "Straight Punch"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
-msgstr "Du verpasst %s einen Phasenschlag"
+msgid "You deliver a vertical straight punch to %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
-msgstr "<npcname> verpasst %s einen Phasenschlag"
-
-#: lang/json/technique_from_json.py
-msgid "Chain Punch"
+msgid "<npcname> delivers a vertical straight punch to %s"
 msgstr ""
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
+msgid "Straight Punch (Knockback)"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
+msgid "You force %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
+msgid "<npcname> forces %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
+msgid "L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
+#, python-format
+msgid "You deliver a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "ask the way"
+#, python-format
+msgid "<npcname> delivers a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-#, python-format
-msgid "You miss but keep striking at %s"
+msgid "L-hook (Knockback)"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
+msgid "You knock %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "White Crane stumble"
+#, python-format
+msgid "<npcname> knocks %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
+msgid "Your attack misses %s but you don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
+msgid "<npcname>'s attack misses %s but they don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
@@ -175379,15 +178859,71 @@ msgstr ""
 msgid "<npcname> receives %s's attack, and counters"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "Drunken Feint"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You stumble and leer at %s"
+msgstr "Du stolperst und schielst auf %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> stumbles and leers at %s"
+msgstr "<npcname> stolpert und schielt auf %s"
+
+#: lang/json/technique_from_json.py
+msgid "Drunk Counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You lurch, and your wild swing hits %s"
+msgstr "Du torkelst und dein wilder Schwung trifft %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> lurches, and hits %s"
+msgstr "<npcname> taumelt und trifft %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they stumble away!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "slow strike"
+msgstr "langsamer Schlag"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You slowly strike %s"
+msgstr "Du schlägst %s langsam"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> slowly strikes %s"
+msgstr "<npcname> schlägt %s langsam"
+
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
+msgstr "Phasenschlag"
+
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
-msgstr "Du entwaffnest %s"
+msgid "You phase-strike %s"
+msgstr "Du verpasst %s einen Phasenschlag"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
-msgstr "<npcname> entwaffnet %s"
+msgid "<npcname> phase-strikes %s"
+msgstr "<npcname> verpasst %s einen Phasenschlag"
 
 #: lang/json/technique_from_json.py
 msgid "Pressure Crunch"
@@ -176025,7 +179561,7 @@ msgstr ""
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr ""
 
@@ -176036,8 +179572,8 @@ msgstr ""
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -176047,7 +179583,7 @@ msgstr ""
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr ""
 
@@ -177276,7 +180812,7 @@ msgstr "Holzfußboden"
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
 msgstr ""
 
@@ -177614,7 +181150,7 @@ msgstr ""
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr ""
 
@@ -177966,10 +181502,10 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
 
 #. ~ Description for juniper tree
@@ -179002,10 +182538,11 @@ msgstr "Geldautomat"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -179111,8 +182648,8 @@ msgstr "Zentrifuge"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -179733,7 +183270,7 @@ msgstr ""
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
 msgstr ""
@@ -179745,7 +183282,7 @@ msgstr ""
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
 msgstr ""
@@ -179838,6 +183375,13 @@ msgid ""
 " were still running."
 msgstr ""
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr ""
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "Sandkasten"
@@ -179904,7 +183448,7 @@ msgstr ""
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr ""
 
@@ -179916,7 +183460,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
 msgstr ""
 
@@ -180817,7 +184361,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr ""
 
@@ -182167,13 +185711,8 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
-"Du hast gerade eine Granate aktiviert! Vielleicht willst du sie werfen. Um "
-"einen Gegenstand zu werfen, drücke »t«, dann wähle den Gegenstand, den du "
-"werfen willst, aus. Die maximale Wurfweite hängt von deiner Stärke, dem "
-"Gewicht und der Größe des Objektes ab. Das Werfen ist in den meisten "
-"Kampfsituationen ungeeignet, aber wenn deine Waffen stark genug sind, …"
 
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
@@ -182279,15 +185818,10 @@ msgstr ""
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr ""
-"»~« ist ein Symbol, das für Wasser steht. Aus einer Wasserquelle wie dieser "
-"kannst du jeden beliebigen Behälter, den du vielleicht hast, befüllen. "
-"Untersuche das Wasser (»e«) und drücke »c«, um einen Behälter zu füllen, "
-"dann wähle einen wasserdichten Behälter, in dem du das Wasser hereinschütten"
-" willst."
 
 #: lang/json/vehicle_from_json.py
 msgid "work light"
@@ -182633,6 +186167,10 @@ msgstr ""
 msgid "Rail Motorcycle"
 msgstr ""
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr ""
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "Tieflader"
@@ -183549,7 +187087,7 @@ msgstr ""
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
 msgstr ""
 
 #. ~ Description for shredder
@@ -184068,8 +187606,8 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr ""
 
 #. ~ Description for autoclave
@@ -184268,7 +187806,7 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
 msgstr ""
 
@@ -184927,6 +188465,14 @@ msgstr ""
 msgid "rail wheel (steerable)"
 msgstr ""
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr ""
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "Walzenbandage"
@@ -186722,6 +190268,10 @@ msgstr "Vitamin B12"
 msgid "Vitamin C"
 msgstr "Vitamin C"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr ""
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr "Drücke "
@@ -187266,7 +190816,7 @@ msgstr "Du setzt eine Patrone in %s ein."
 msgid "You refill the %s."
 msgstr "Du befüllst %s wieder."
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "Dort ist nichts zum Anzünden."
 
@@ -187285,6 +190835,16 @@ msgstr ""
 "Es gibt nicht genügend Sonnenlicht, um jetzt ein Feuer zu entfachen. Du "
 "brichst deine Versuche ab."
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr ""
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "Du lernst %s."
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -187295,11 +190855,6 @@ msgstr "Du hast %s zur Stufe %d trainiert."
 msgid "You get some training in %s."
 msgstr ""
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "Du lernst %s."
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr ""
@@ -187418,15 +190973,22 @@ msgstr ""
 msgid "Your %s is already fully repaired."
 msgstr "%s ist bereits vollständig repariert."
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr "Du bist momentan nicht in der Lage, den Defekt von %s zu beheben."
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgstr ""
+
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr "Du taust die Nahrung auf und erhitzt sie anschließend."
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr "Du erhitzt die Nahrung."
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
-msgstr "Du hast den Defekt von %s erfolgreich behoben."
+msgid "You are currently unable to mend the %s."
+msgstr "Du bist momentan nicht in der Lage, den Defekt von %s zu beheben."
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -187728,7 +191290,7 @@ msgstr "Du bist fertig mit Bohren."
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr "»Schipp!«"
 
@@ -188365,12 +191927,12 @@ msgstr ""
 "Geschwindigkeitsreduktion. Depression. Schwaches Immunsystem. Häufiges Verlangen."
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
-msgstr "Wahrnehmung −1; Intelligenz −1; Häufige Entzugserscheinungen."
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
-msgstr "Wahrnehmung −2; Intelligenz −2; Häufige Entzugserscheinungen."
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
 msgid ""
@@ -188556,38 +192118,6 @@ msgstr "Que Anz Gew.   Vol"
 msgid "Name (charges)"
 msgstr "Name (Ladungen)"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "Kein Fahrzeug festgehalten!"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "Kein festgehaltenes Fahrzeug!"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "Ungültiger Behälter!"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "Alle 9 Felder"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr " <color_white_red>FEUER</color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr " GEFAHR"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr " FALLE"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr " WASSER"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -188712,7 +192242,39 @@ msgstr ""
 msgid "The destination is already full!"
 msgstr "Das Ziel ist schon voll!"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "Kein Fahrzeug festgehalten!"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "Kein festgehaltenes Fahrzeug!"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "Ungültiger Behälter!"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "Alle 9 Felder"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr " <color_white_red>FEUER</color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr " GEFAHR"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr " FALLE"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr " WASSER"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "Ungültiger Behälter"
 
@@ -188850,6 +192412,14 @@ msgstr "Schlag:"
 msgid "Cut:"
 msgstr "Schnitt:"
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr ""
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr ""
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "Umgebungsschutz:"
@@ -189536,19 +193106,15 @@ msgstr "%s Leiden"
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
+"  Seeing this is a bug!"
 msgstr ""
-"%s ist irgendwie vage unzufrieden, obwohl es nichts will. Wenn du dies "
-"siehst, ist es ein Bug!"
 
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
 msgstr ""
-"%s ist zufrieden, wie es sein sollte, weil es keine Selbstachtung hat. Wenn "
-"du dies siehst, ist es ein Bug!"
 
 #: src/artifact.cpp
 #, c-format
@@ -189573,10 +193139,8 @@ msgstr "Du drückst %s gegen deine Haut."
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr ""
-"%s ist verwirrt, als es sah, dass du träumst, während du wach warst. Wenn du"
-" dies siehst, ist es ein Bug!"
 
 #: src/artifact.cpp
 #, c-format
@@ -190351,6 +193915,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr ""
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr "Was soll mit %s getan werden?"
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr ""
@@ -190489,12 +194058,14 @@ msgstr ""
 "alleine gefeuert werden."
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
-msgstr "Du kannst nicht mehr feuern."
+#, c-format
+msgid "You can no longer fire your %s."
+msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "Du brauchst einen freien Arm zum Fahren!"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -190502,8 +194073,9 @@ msgid "You need two free hands to fire your %s."
 msgstr "%s benötigt zwei freie Hände zum Feuern."
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "Du musst nachladen!"
+#, c-format
+msgid "Your %s is empty!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -190514,18 +194086,18 @@ msgstr "%s benötigt %i Ladungen zum Feuern!"
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
+"charges to fire the %s!"
 msgstr ""
-"Du brauchst eine Esz. mit wenigstens %d Ladungen oder eine fortgeschrittene "
-"Esz. mit wenigstens %d Ladungen, um dies zu feuern!"
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
 msgstr ""
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
 msgstr ""
 
@@ -190760,6 +194332,16 @@ msgstr "%s hat sich automatisch abgeschaltet."
 msgid "Your %s automatically turns off."
 msgstr "%s hat sich automatisch abgeschaltet."
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "Du änderst deine Meinung und schaltest es aus."
@@ -190877,10 +194459,6 @@ msgstr "Bluttestergebnisse"
 msgid "No effects."
 msgstr "Keine Wirkung."
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr "Die Luftfeuchtigkeit ist zu gering, um Wasser zu erhalten!"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr "Deine Torsionsratsche rastet in deinen Gelenken ein."
@@ -190893,10 +194471,6 @@ msgstr ""
 msgid "Start a fire where?"
 msgstr "Wo soll ein Feuer entfacht werden?"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "Hier kannst du kein Feuer entfachen."
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -191074,6 +194648,20 @@ msgstr ""
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr ""
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -191103,6 +194691,21 @@ msgid "You feel your throat open up and air filling your lungs!"
 msgstr ""
 "Du spürst, wie sich deine Kehle öffnet und Luft in deine Lungen strömt!"
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr ""
@@ -191902,8 +195505,12 @@ msgstr "に坂索トし荷測のンおク妙免イロコヤ梅棋厚れ表幌"
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
-msgstr "dich"
+msgid "You"
+msgstr "Du"
+
+#: src/character.cpp
+msgid "Your"
+msgstr ""
 
 #: src/character.cpp
 msgid "your"
@@ -192143,6 +195750,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr ""
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr "Du kannst hier keine Gegenstände platzieren!"
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr "<npcname> kann hier keine Gegenstände platzieren!"
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -192166,10 +195781,20 @@ msgstr "Du brauchst mindestens %1$s, um %2$s mit %3$s zu benutzen."
 msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr "<npcname> braucht mindestens %1$s, um %2$s mit %3$s zu benutzen."
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr "Du kannst dich nicht von %s entwaffnen."
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr "Flüssigkeit aus deinem Inventar ist auf den Boden ausgelaufen."
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr "Dein momentaner Gesundheitswert ist %d."
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "Verdurstend"
@@ -192239,6 +195864,77 @@ msgstr ""
 msgid "Your %s bionic shorts out!"
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "Dein %s wird in in den nächsten Stunden erfrieren."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "Dein %s wird in dieser Stunde erfrieren!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr "In wenigen Minuten wird %s erfrieren!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr "Du spürst deinen %s von der Kälte taub werden!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr "Du spürst, wie dein %s sehr kalt wird."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr "Du spürst, wie dein %s kühl wird."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr "Du spürst, wie dein %s glühend heiß von der Hitze wird!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr "Du spürst, wie dein %s sehr heiß wird."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr "Du spürst, wie dein %s warm wird."
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "Der Wind lässt dich d. %s ziemlich kalt anfühlen."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr ""
+"Der Wind ist sehr stark, du solltest etwas windfestere Kleidung für dein %s "
+"finden."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr "Deine Kleidung bietet nicht genug Schutz vor dem Wind für dein %s!"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "Linker Arm"
@@ -192404,8 +196100,8 @@ msgstr ""
 msgid "Big"
 msgstr ""
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "Normal"
 
@@ -192509,6 +196205,32 @@ msgstr ""
 msgid "EXTRA_EXERCISE"
 msgstr ""
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr "Dein Körper verrenkt sich unter der Last!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] "Dein %s braucht %d Ladung von irgendeiner Esz."
+msgstr[1] "Dein %s braucht %d Ladungen von irgendeiner Esz."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] "Dein %s hat %d Ladung, benötigt aber %d."
+msgstr[1] "Dein %s hat %d Ladungen, benötigt aber %d."
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "Du hustest sehr stark."
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "einen trockenen Husten."
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr ""
@@ -192689,6 +196411,21 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr "Ging in den Winterschlaf über."
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr ""
+"Aufgrund der ausdauernden Übung mit der Nahkampfbionik hast du %s erlernt."
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr "%s um einen Kampfkunststil auszuwählen."
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "k. Stil"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "Kein Auto-Aufheben"
@@ -192734,280 +196471,6 @@ msgid ""
 "this area."
 msgstr ""
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr "Beute: Unsortiert"
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr ""
-"Bereich um unsortierte Beute bzw. Gegenstände abzulegen. Du kannst die "
-"Zonenaktion »Meine Beute aussortieren« verwenden, um Gegenstände auch "
-"innerhalb dieser Zone zu sortieren, da der Bereich sich mit Beute-Zonen "
-"anderer Typen überschneiden darf."
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr "Beute: Essen"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr ""
-"Zielfeld für Lebensmittel. Wenn keine spezifischeren Lebensmittelzonen "
-"definiert sind, werden alle Lebensmittel hierher verschoben."
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr "Beute: verd. Essen"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr ""
-"Zielfeld für verderbliche Lebensmittel. Enthält auch verderbliche Getränke, "
-"wenn die entsprechende Zone nicht definiert wurde."
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr "Beute: Getränke"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr ""
-"Zielfeld für Getränke. Enthält auch verderbliche Getränke, wenn die "
-"entsprechende Zone nicht definiert wurde."
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr "Beute: verd. Getränke"
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr "Zielfeld für verderbliche Getränke."
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr "Beute: Feuerwaffen"
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr "Zielfeld für Feuerwaffen, Bögen und ähnliche Waffen."
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr "Beute: Magazine"
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr "Zielfeld für Waffenmagazine."
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr "Beute: Munition"
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr "Zielfeld für Munition."
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr "Beute: Waffen"
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr "Zielfeld für Nahkampfwaffen."
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr "Beute: Werkzeuge"
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr "Zielfeld für Werkzeuge."
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr "Beute: Kleidung"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr ""
-"Zielfeld für Kleidung. Enthält auch versiffte Kleidung, wenn die "
-"entsprechende Zone nicht definiert wurde."
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr "Beute: vers. Kleidung"
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr "Zielfeld für versiffte Kleidung."
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr "Beute: Drogen"
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr "Zielfeld für Drogen, Medikamente und andere medizinische Artikel."
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr "Beute: Bücher"
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr "Zielfeld für Bücher und Zeitschriften."
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr "Beute: Mods"
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr "Zielfeld für Schusswaffenmodifikationen und ähnliche Gegenstände."
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr "Beute: Mutagene"
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr "Zielfeld für Mutagene, Seren und Purifizierer."
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr "Beute: Bioniken"
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr "Zielfeld für Kompakte Bionikmodule aka KBMs."
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr "Beute: Fahrzeugteile"
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr "Zielfeld für Fahrzeugteile."
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr "Beute: Andere"
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr "Zielfeld für andere sonstige Gegenstände."
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr "Beute: Treibstoff"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr ""
-"Zielfeld für Benzin, Diesel, Lampenöl und andere als Kraftstoff verwendete "
-"Substanzen."
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr "Beute: Samen"
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr "Zielfeld für Samen, Stängel und ähnliche Gegenstände."
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr "Beute: Chemisches Zeug"
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr "Zielfeld für Chemikalien."
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr "Beute: Ersatzteile"
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr "Zielfeld für Ersatzteile."
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr "Beute: Artefakte"
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr "Zielfeld für Artefakte"
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr "Beute: Rüstungen"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr ""
-"Zielfeld für Rüstungen. Enthält versiffte Rüstung, wenn diese Zone nicht "
-"definiert ist."
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr "Beute: vers. Rüstungen"
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr "Zielfeld für versiffte Rüstungen."
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr "Beute: Holz"
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr ""
-"Zielfeld für Brennholz und Gegenstände, die als solches verwendet werden "
-"können."
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr "Beute: Ignorieren"
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr ""
-"Gegenstände innerhalb dieses Zielfeldes werden von der Zone-Aktion »Meine "
-"Beute aussortieren« ignoriert."
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr ""
@@ -193015,7 +196478,7 @@ msgstr ""
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
 msgstr ""
 
@@ -193075,6 +196538,16 @@ msgstr ""
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr ""
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr ""
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr ""
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
 msgstr ""
@@ -194405,24 +197878,6 @@ msgstr "Du spürst, wie %s dich ausfüllt."
 msgid "<npcname> looks better after eating the %s."
 msgstr "<npcname> sieht besser aus, nach dem Essen von %s."
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "Dein interner Stromspeicher ist voll aufgeladen."
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr "Der interne Stromspeicher von <npcname> ist voll aufgeladen."
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr "Du lädst dein Batteriesystem mit %s auf."
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr "<npcname> lädt das Batteriesystem mit %s auf."
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr "Das ist VIEL Plutonium. Bist du dir sicher, dass du soviel willst?"
@@ -195439,6 +198894,10 @@ msgstr ""
 msgid "Toggle display temperature"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr ""
@@ -195479,6 +198938,10 @@ msgstr ""
 msgid "Print faction info to console"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Test weather"
 msgstr "Wetter testen"
@@ -195758,6 +199221,10 @@ msgstr "Statusfenster [@]"
 msgid "t[e]leport"
 msgstr "T[e]leportieren"
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr "[M]issionen bearbeiten (ACHTUNG: Instabil!)"
@@ -196343,10 +199810,12 @@ msgstr ""
 msgid "Spell"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
 msgstr ""
@@ -198388,6 +201857,14 @@ msgstr ", Lagerleiter"
 msgid "%s has abandoned the camp."
 msgstr "%s hat das Lager aufgegeben."
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr " Expansion"
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr "Rufe zurück Verbündeten, "
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -198403,59 +201880,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr "Nahrung verteilen"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr "Sortierungspunkte zurücksetzen"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -198490,23 +201914,6 @@ msgid ""
 "Positions: %d/1\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -198669,14 +202076,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr " Expansion"
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr "Rufe zurück Verbündeten, "
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -198758,6 +202157,61 @@ msgid ""
 "Positions: 0/1\n"
 msgstr ""
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr "Nahrung verteilen"
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -198768,6 +202222,10 @@ msgid ""
 "Companions must be on missions for at least 24 hours before emergency recall becomes available."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr ""
@@ -198804,10 +202262,6 @@ msgstr ""
 msgid "departs to search for recruits…"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr ""
@@ -199095,7 +202549,7 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
 
@@ -199273,8 +202727,7 @@ msgstr ""
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
+"create a camp food zone, and a camp storage zone."
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -199304,18 +202757,18 @@ msgstr ">Fertig:    %15d (m)\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
-msgstr ">Reisen:  %23s\n"
+msgid ">Travel:  %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
-msgstr ">Arbeiten: %23s\n"
+msgid ">Working: %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
-msgstr "Summe:    %23s\n"
+msgid "Total:    %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -199371,8 +202824,8 @@ msgstr "Pflügen notwendig: "
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
-msgstr "Name:     %25s\n"
+msgid "Name:     %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 msgid "----          Engines          ----\n"
@@ -199380,8 +202833,8 @@ msgstr "----          Motoren          ----\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
-msgstr "Motor:   %25s\n"
+msgid "Engine:   %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -199390,8 +202843,8 @@ msgstr ">Zustand: %24d%%\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
-msgstr ">Treibstoff: %25s\n"
+msgid ">Fuel:    %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 msgid "----  Fuel Storage & Battery   ----\n"
@@ -200883,7 +204336,7 @@ msgstr "Du benötigst mindestens 1 %s, um %s nachzuladen!"
 msgid "The %s is already full!"
 msgstr "%s ist schon voll!"
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr "Du kannst %s nicht nachladen!"
@@ -200971,6 +204424,19 @@ msgstr "Wirklich in %s treten?"
 msgid "Your %s refuses to move over that ledge!"
 msgstr ""
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr ""
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr ""
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "Festgehaltenes Objekt konnte nicht gefunden werden."
@@ -201164,6 +204630,16 @@ msgstr "Du strengst dich bei dem Versuch an, das schwere %s zu bewegen!"
 msgid "There's stuff in the way."
 msgstr "Da ist Zeug im Weg."
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr ""
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -201501,7 +204977,7 @@ msgstr ""
 "seltsame Zeichen sehen (z.B. leere Boxen oder Fragezeichen). Du wurdest "
 "gewarnt."
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr "Du fühlt plötzlich grundlos einen stechenden Schmerz."
 
@@ -201787,10 +205263,6 @@ msgstr "FRISCHE"
 msgid "SPOILS IN"
 msgstr "VERDIRBT IN"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "Batterie"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "Reaktor"
@@ -201815,10 +205287,6 @@ msgstr "Verschüttete Flüssigkeiten können nicht getrunken werden"
 msgid "Your biology is not compatible with that item."
 msgstr ""
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr "Du bist voll aufgeladen"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -201911,10 +205379,6 @@ msgid_plural "Needs at least %d charges"
 msgstr[0] "Braucht mindestens %d Ladung"
 msgstr[1] "Braucht mindestens %d Ladungen"
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr ""
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "Gegenstand benutzen"
@@ -202133,11 +205597,6 @@ msgstr ""
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr ""
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr ""
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -203270,8 +206729,8 @@ msgid "Purchase cash card?"
 msgstr "Eine Geldkarte kaufen?"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
-msgstr "Sie benötigen 1,00 $ auf Ihrem Konto, um eine Karte zu kaufen."
+msgid "You need $10.00 in your account to purchase a card."
+msgstr ""
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -203314,7 +206773,7 @@ msgstr "Ihr Konto hat nun %s."
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
 msgstr ""
 
 #: src/iexamine.cpp
@@ -203601,7 +207060,8 @@ msgstr ""
 "Der Dietrich stumpft bei deinem Versuch, den Waffentresor zu knacken, ab."
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
 msgstr ""
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
@@ -203610,6 +207070,16 @@ msgstr ""
 msgid "You attempt to pry open the %1$s using your %2$s…"
 msgstr ""
 
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
+msgstr ""
+
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
 msgstr ""
@@ -204079,6 +207549,10 @@ msgstr ""
 msgid "You weren't able to start a fire."
 msgstr ""
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "Hier kannst du kein Feuer entfachen."
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -204798,6 +208272,17 @@ msgstr ""
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr ""
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr ""
@@ -205341,6 +208826,10 @@ msgstr "Oberkartenverbindungen"
 msgid "Overmap specials"
 msgstr "Oberkartenbesonderheiten"
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "Oberkartenörtlichkeiten"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr "Fahrzeugprototypen"
@@ -205397,6 +208886,10 @@ msgstr "Erntelisten"
 msgid "Anatomies"
 msgstr "Anatomien"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "Mutationen"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "Feldbilder-Satz"
@@ -205441,18 +208934,10 @@ msgstr "Berufungen"
 msgid "Scenarios"
 msgstr "Szenarios"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "Mutationen"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "Mutationskategorien"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "Oberkartenörtlichkeiten"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr ""
@@ -205820,14 +209305,6 @@ msgstr ""
 msgid "Page %d/%d"
 msgstr "Seite %d/%d"
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "GETRAGENES"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "GEHALTENE WAFFEN"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -206294,11 +209771,9 @@ msgstr ""
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
 msgstr ""
-"Dieses Lebensmittel fing an, zu <bad>verderben</bad>. Es wäre eine <bad>sehr"
-" schlechte Idee</bad>, es zu <info>essen</info>."
 
 #: src/item.cpp
 #, c-format
@@ -206369,12 +209844,6 @@ msgstr ""
 msgid "This ammo <neutral>starts fires</neutral>."
 msgstr ""
 
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr ""
-"Werte der aktiven <info>Waffenmodifikation (%s)</info> werden gezeigt."
-
 #: src/item.cpp
 msgid "Skill used: "
 msgstr "Ben. Fertigk.: "
@@ -206519,8 +209988,9 @@ msgid "Used on: "
 msgstr "Benutzt mit: "
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "Standort: "
+#, c-format
+msgid "Location: %s"
+msgstr ""
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -207048,42 +210518,45 @@ msgid ""
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
+msgid "<info>can be upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
+msgid "<info>can be downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
+msgid "<bad>can not be downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
+msgid "<bad>can not be upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
+#, c-format
+msgid "* This clothing %s."
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
+msgid " and <info>upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
+msgid " and <info>downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
+msgid " but <bad>not downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
+msgid " but <bad>not upsized</bad>"
+msgstr ""
+
+#: src/item.cpp
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
 msgstr ""
 
 #: src/item.cpp
@@ -207186,6 +210659,20 @@ msgstr ""
 msgid "This bionic is installed in the following body part(s):"
 msgstr "Dieses Bionik wurde in den folgenden Körperteil(en) installiert:"
 
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr ""
+
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr ""
+
 #: src/item.cpp
 msgid "<bold>Encumbrance:</bold> "
 msgstr ""
@@ -207312,6 +210799,12 @@ msgstr "Du könntest es benutzen, um diverse andere Dinge zu fertigen."
 msgid "You could use it to craft: %s"
 msgstr "Du könntest es zum Fertigen davon verwenden: %s"
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr ""
+"Werte der aktiven <info>Waffenmodifikation (%s)</info> werden gezeigt."
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -208535,8 +212028,8 @@ msgid "You do not have that item!"
 msgstr "Diesen Gegenstand hast du nicht!"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
-msgstr "Welches Signal soll den Gegenstand aktivieren?:"
+msgid "Which signal should activate the item?"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "\"Blue\""
@@ -208787,16 +212280,6 @@ msgstr "»KNISTER!«, »RAUSCH!« und »ZISCH!«"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr "Der höllische Krach verstummt, als der Krachmacher sich abschaltet."
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr "Du lernst die wesentlichen Elemente von: %s."
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr "%s um einen Kampfkunststil auszuwählen."
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr "Du hebelst den Zaunpfosten aus."
@@ -209225,18 +212708,27 @@ msgid "Scan the ground"
 msgstr "Den Boden messen"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "Dich selbst messen"
+msgid "Scan yourself or other person"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "Dauermessung einschalten"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr ""
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -209304,6 +212796,10 @@ msgstr "Tick!"
 msgid "You've already released the handle, try throwing it instead."
 msgstr "Du hast den Stift bereits gezogen, versuche es lieber mit Werfen."
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "Du brauchst eine Feuerquelle!"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr "Du entzündest den Pfeil!"
@@ -209805,10 +213301,6 @@ msgstr "Du bewegst den Mop umher, unsicher, ob es irgendetwas bringt."
 msgid "You mop up the spill."
 msgstr "Du wischst das Verschüttete weg."
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr ""
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr "Die Raumgefüge scheint zu verfallen."
@@ -209870,17 +213362,9 @@ msgid "You don't have appropriate food to heat up."
 msgstr "Du hast nicht die passenden Lebensmittel zum Erhitzen."
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgid "You start heating up the food."
 msgstr ""
 
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
-msgstr "Du taust die Nahrung auf und erhitzt sie anschließend."
-
-#: src/iuse.cpp
-msgid "You heat up the food."
-msgstr "Du erhitzt die Nahrung."
-
 #: src/iuse.cpp
 msgid "There is no fire around, use your integrated toolset instead?"
 msgstr ""
@@ -210893,8 +214377,8 @@ msgid "Your %s is too heavy or bulky for this RC car."
 msgstr "%s ist zu schwer oder klobig für dieses Funkmodellauto."
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
-msgstr "Du hast dein Funkmodellauto entschäft."
+msgid "You disarmed your RC car."
+msgstr ""
 
 #. ~Sound of a radio controlled car moving around
 #: src/iuse.cpp
@@ -210906,12 +214390,12 @@ msgid "What to do with activated RC car?"
 msgstr "Was mit dem aktiven Funkmodellauto tun?"
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
-msgstr "Du hast dein Funkmodellauto ausgeschaltet."
+msgid "You turned off your RC car."
+msgstr ""
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
-msgstr "»Piep!«"
+#: src/iuse.cpp
+msgid "beep"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Take control of RC car"
@@ -210948,11 +214432,16 @@ msgstr "Du übernimmst die Steuerung über das Funkmodellauto."
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
+msgstr ""
+
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
 "sending the signal."
 msgstr ""
-"%s würde bei diesem Signal in deinem Inventar explodieren. Leg es ab, bevor "
-"du das Signal sendest."
 
 #: src/iuse.cpp
 msgid "This vehicle's security system has locked you out!"
@@ -212776,9 +216265,29 @@ msgstr ""
 msgid "How do you want to modify it?"
 msgstr "Wie möchtest du den Gegenstand anpassen?"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
 msgstr ""
 
 #: src/iuse_actor.cpp
@@ -214199,6 +217708,23 @@ msgstr ""
 msgid "All knowledge of %s leaves you."
 msgstr ""
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr ""
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr ""
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr ""
@@ -214207,6 +217733,10 @@ msgstr ""
 msgid "Popup Distractions"
 msgstr ""
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr ""
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr ""
@@ -214271,6 +217801,15 @@ msgstr ""
 msgid "Casting Cost (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr ""
@@ -214279,6 +217818,10 @@ msgstr ""
 msgid "Casting Time (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+msgid "self"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr ""
@@ -214292,29 +217835,37 @@ msgid "Healing"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Variance"
+msgid "Spell Radius"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spawn"
+msgid "Cone Arc"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Summon"
+msgid "degrees"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spell Radius"
+msgid "Line Width"
 msgstr ""
 
-#: src/magic.cpp src/veh_interact.cpp
-msgid "Range"
-msgstr "Reichweite"
+#: src/magic.cpp
+msgid "Variance"
+msgstr ""
 
 #: src/magic.cpp
-msgid "self"
+msgid "Spawn"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Summon"
 msgstr ""
 
+#: src/magic.cpp src/veh_interact.cpp
+msgid "Range"
+msgstr "Reichweite"
+
 #: src/magic.cpp
 msgid "Duration"
 msgstr ""
@@ -214339,18 +217890,22 @@ msgstr ""
 msgid "Damage Type"
 msgstr ""
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr ""
@@ -214399,6 +217954,11 @@ msgstr ""
 msgid "No valid targets to teleport."
 msgstr ""
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr ""
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr ""
@@ -214539,6 +218099,10 @@ msgstr ""
 msgid "Unable to make sound directory.  Check permissions."
 msgstr ""
 
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr ""
+
 #: src/main_menu.cpp
 msgid "Really quit?"
 msgstr "Wirklich beenden?"
@@ -215237,7 +218801,7 @@ msgstr ""
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
+msgid "The %1$s is not a valid %2$s weapon."
 msgstr ""
 
 #: src/martialarts.cpp
@@ -215669,12 +219233,6 @@ msgid_plural "%d enemies hit!"
 msgstr[0] "%d Feind getroffen!"
 msgstr[1] "%d Feinde getroffen!"
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr ""
-"Aufgrund der ausdauernden Übung mit der Nahkampfbionik hast du %s erlernt."
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -218028,17 +221586,43 @@ msgid "You don't have any companions to send out…"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
-msgstr "Wen möchtest du entsenden? [ KAMPF : ÜBERLEBEN: INDUSTRIE]"
+msgid "Who do you want to send?"
+msgstr "Wen möchtest du losschicken?"
 
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
+msgstr ""
+
+#. ~ %1$s: npc name
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
-msgstr "Der Begleiter, den du ausgewählt hast, hat nicht die Fertigkeiten!"
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
+msgstr ""
+
+#: src/mission_companion.cpp
+msgid "You choose to send no one…"
+msgstr ""
 
 #: src/mission_companion.cpp
 msgid "You don't have any companions ready to return…"
@@ -219795,6 +223379,11 @@ msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr ""
 "Der Arm von %1$s trifft %2$s von <npcname>, prallt aber von der Rüstung ab!"
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr ""
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -220004,11 +223593,6 @@ msgstr "Beim Treffer auf %s spritzt Säure hinaus!"
 msgid "zombie slave"
 msgstr "Zombiesklave"
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr "Was soll mit %s getan werden?"
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -220412,22 +223996,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr "winzig"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr "klein"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr "mittelgroß"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr "groß"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr "riesig"
 
@@ -220492,6 +224081,16 @@ msgstr "dichte Geleemasse"
 msgid "wearing %1$s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr "Das %s"
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr ""
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -220534,6 +224133,11 @@ msgstr ""
 msgid "Rider: %s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr ""
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr "Schwierigkeitsgrad "
@@ -221195,8 +224799,8 @@ msgid "Crossed a threshold"
 msgstr "Eine Schwelle überschritten"
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
-msgstr "Oh, ja! Das bringt’s!"
+msgid "Oh, yeah!  That's the stuff!"
+msgstr ""
 
 #: src/mutation_ui.cpp
 msgid "Reassigning."
@@ -222220,7 +225824,7 @@ msgstr "Wut: "
 msgid "%s disappears."
 msgstr ""
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "%s stirbt!"
@@ -222976,6 +226580,16 @@ msgstr "Ich habe Neuigkeiten."
 msgid "Yes, let's resume training "
 msgstr "Ja, lasst uns weiter trainieren mit "
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr ""
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr ""
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -223144,10 +226758,6 @@ msgstr ""
 msgid "I need a %s to consume that!"
 msgstr "Ich brauche 1 %s, um dies zu konsumieren!"
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr "Es sieht nicht nach einer guten Idee aus, dies zu konsumieren …"
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr "Was anbieten?"
@@ -223225,6 +226835,11 @@ msgstr ""
 msgid "My current location"
 msgstr ""
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -223257,10 +226872,6 @@ msgstr "Welches Bionik möchtest du deinstallieren?"
 msgid "You decide to hold off…"
 msgstr ""
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr ""
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -223327,6 +226938,11 @@ msgstr "%s flieht!"
 msgid "%s leaves."
 msgstr "%s geht weg."
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -223388,6 +227004,11 @@ msgstr "Weiter >"
 msgid "Examine which item?"
 msgstr "Was untersuchen?"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr ""
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -223729,12 +227350,9 @@ msgstr "Züge zum Reaktivieren des Sicherheitsmodus"
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
 msgstr ""
-"Die Anzahl Züge, nachdem der Sicherheitsmodus reaktiviert wird. Wird sich "
-"nur reaktivieren, wenn keine Feinde sich im Sicherheitsmodus-"
-"Annäherungsabstand aufhalten."
 
 #: src/options.cpp
 msgid "Turns to remember ignored monsters"
@@ -223844,12 +227462,9 @@ msgstr "Leere Behälter fallen lassen"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
 msgstr ""
-"Stell ein, welche Behälter automatisch fallen gelassen werden. Nein: Nichts "
-"fallen lassen. – Wasserdichte: Alle außer wasserdichte Behälter. – Alle: "
-"Alle Behälter fallen lassen."
 
 #: src/options.cpp
 msgid "Watertight"
@@ -224021,13 +227636,12 @@ msgstr ""
 "Falls wahr, wird dem Fadenkreuz beim Feuern oder Werfen automatisch gefolgt."
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "Vor Demontage nachfragen"
+msgid "Query on disassembly while butchering"
+msgstr ""
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
+msgid "If true, will query before disassembling items while butchering."
 msgstr ""
-"Falls wahr, wird das Spiel vor der Demontage von Gegenständen nachfragen."
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -224320,9 +227934,9 @@ msgstr "Automatische Inventarbuchstaben"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
 msgstr ""
 
 #: src/options.cpp
@@ -224705,7 +228319,7 @@ msgstr ""
 msgid "Display"
 msgstr "Anzeige"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr ""
@@ -224804,8 +228418,8 @@ msgid "Scaling factor"
 msgstr "Skalierfaktor"
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
-msgstr "Faktor, um den die Anzeige skaliert werden soll. Erfordert Neustart."
+msgid "Factor by which to scale the display.  Requires restart."
+msgstr ""
 
 #: src/options.cpp
 msgid "1x"
@@ -225109,8 +228723,8 @@ msgstr "Starttag"
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
 msgstr ""
 
@@ -225120,9 +228734,9 @@ msgstr ""
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
 msgstr ""
 
 #: src/options.cpp
@@ -225192,11 +228806,9 @@ msgstr "Statische NPCs"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
 msgstr ""
-"Falls wahr, werden statische NPCs an vordefinierten Orten erscheinen. "
-"Erfordert Zurücksetzung der Welt."
 
 #: src/options.cpp
 msgid "Starting NPCs spawn"
@@ -226510,6 +230122,7 @@ msgstr ""
 msgid "Underground"
 msgstr "Unterirdisch"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
 msgstr ""
@@ -226571,10 +230184,6 @@ msgstr "Taub!"
 msgid "Weapon  :"
 msgstr "Waffe   :"
 
-#: src/panels.cpp
-msgid "No Style"
-msgstr "k. Stil"
-
 #: src/panels.cpp
 msgid "Day "
 msgstr "Tag"
@@ -226587,10 +230196,12 @@ msgstr ""
 msgid "to open sidebar options"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
 msgstr ""
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
 msgstr ""
@@ -226847,77 +230458,6 @@ msgstr "Um nicht den Inhalt zu verschütten, setzt <npcname> %1$s auf %2$s."
 msgid "You have learned a new style: %s!"
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "Dein %s wird in in den nächsten Stunden erfrieren."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "Dein %s wird in dieser Stunde erfrieren!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr "In wenigen Minuten wird %s erfrieren!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr "Du spürst deinen %s von der Kälte taub werden!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr "Du spürst, wie dein %s sehr kalt wird."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr "Du spürst, wie dein %s kühl wird."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr "Du spürst, wie dein %s glühend heiß von der Hitze wird!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr "Du spürst, wie dein %s sehr heiß wird."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr "Du spürst, wie dein %s warm wird."
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "Der Wind lässt dich d. %s ziemlich kalt anfühlen."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr ""
-"Der Wind ist sehr stark, du solltest etwas windfestere Kleidung für dein %s "
-"finden."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr "Deine Kleidung bietet nicht genug Schutz vor dem Wind für dein %s!"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "Du rollst dich auf dem Boden und versuchst, das Feuer zu ersticken!"
@@ -227295,14 +230835,6 @@ msgstr "Die desinfizierten Wunden auf %s sind verheilt."
 msgid "There is not enough %s left to siphon it."
 msgstr "Es ist nicht genügend %s übrig zum absaugen."
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "Du hustest sehr stark."
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "einen trockenen Husten."
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "Du spürst an deinem ganzen Körper unerträgliche Schmerzen!"
@@ -227348,11 +230880,6 @@ msgstr "Dein %s tut dir weh!"
 msgid "Your %s aches."
 msgstr "Dein %s tut weh."
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr "Dein momentaner Gesundheitswert ist %d."
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -227381,432 +230908,6 @@ msgstr "Etwas bebt in dir, während es stirbt."
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "Deine Gedärme gurgeln, während irgendetwas darin stirbt."
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr "Du bist zu dehydriert, um mit %s weiterzumachen."
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr "Du bist zu erschöpft, um mit %s weiterzumachen."
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "Du bist im Begriff, zu ertrinken!"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr "Dir fällt ein Zahn aus!"
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "»BZZZZZ«"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "Du bist plötzlich empfindungslos."
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "Du fühlst plötzlich einen Schmerz."
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "Du fühlst dich plötzlich ein bisschen benommen."
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "Du fühlst dich plötzlich hungrig."
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "Du fühlst dich plötzlich ein bisschen satt."
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "Du fühlst dich plötzlich ein bisschen durstig."
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "Du fühlst dich plötzlich müde."
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "Dir ist plötzlich sehr kalt."
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "Dir ist plötzlich kalt."
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "Dir ist plötzlich sehr heiß."
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "Dir ist plötzlich heiß."
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr "%1$s wird wütend!"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr "%1$s sagt: »%2$s«."
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "Du beginnst, unkontrolliert zu zittern."
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr ""
-"Plötzlich überkommt dich das Verlangen nach Schlaf und du wirst bewusstlos."
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "Du hast einen Asthmaanfall!"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr ""
-"Du verwendest deine Oxygenierer-KBM um deine Atemwege zu befreien und legst "
-"dich dann wieder schlafen"
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr "Du benutzt einen Inhalator und legst dich wieder schlafen."
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "Du benutzt deine letzte Inhalatorladung."
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] "Du benutzt deinen Inhalator, nur noch %d Ladung übrig."
-msgstr[1] "Du benutzt deinen Inhalator, nur noch %d Ladungen übrig."
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "Das Sonnenlicht reizt deine Augen sehr."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "Das Sonnenlicht verbrennt deine Haut!"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "Das Sonnenlicht lenkt dich ab."
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "Du kannst das Sonnenlicht nicht aushalten!"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "Plötzlich kannst du nichts hören."
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "Plötzlich funktionieren deine Augen nicht mehr."
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr ""
-"Du merkst, wie ein unnormales Gefühl aus deinen Strahlungssensoren "
-"schleicht."
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr "Dein Oberkörper brennnt, als dein Stromsystem überlastet wird!"
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "Du erleidest eine schmerzhafte elektische Entladung!"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr "Die %s scheinen von der Entladung betroffen zu sein."
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "Du erleidest eine brennende Säureentladung!"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "Deine Batterien entladen sich ein bisschen."
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "Ein Bionik knistert laut!"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "Du fühlst, wie dein defektes Bionik wackelt."
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr "Knistern!"
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "Deine Sicht verpixelt sich!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr "Dein defektes Bionik verursacht einen Krampf und du fällst zu Boden!"
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr "Deine Bioniken haben einen Kurzschluss, was dich zum Zittern bringt."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "Dein defektes Bionik tut weh."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr "Deine Muskeln verkrampfen sich!"
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr "Du fällst zu Boden!"
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr "Dir geht die Luft aus."
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr "Du zitterst unkontrolliert."
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr "Du fällst in Ohnmacht!"
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "Deine Atmung verlangsamt sich."
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr "Du stolperst und fällst hin!"
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr "Müde reibst du deine Augen."
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr ""
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr "Du gähnst ein wenig."
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr "Du streckst deinen Rücken."
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr "Du fühlst dich geistig erschöpft."
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr "Du fühlst dich für einen Moment benommen."
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr "Deine Muskeln verkrampfen sich unangenehm."
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr "Deine Sicht verschwimmt ein wenig."
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr "Für einen Augenblick verlierst du all dein Wissen."
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr "Deine Muskeln schmerzen auf eine nervende und unvorhersehbare Weise."
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr "Du hast ablenkende Kopfschmerzen."
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr ""
-"Du hast Sodbrennen und dadurch auch einen üblen, sauren Geschmack im Mund."
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr ""
-"Dein Verstand ist so müde, dass du das Gefühl hast, deinen Augen nicht mehr "
-"trauen zu können."
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr ""
-"Deine Muskeln verkrampfen sich unangenehm. Du hast Probleme, das "
-"Gleichgewicht zu halten."
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr "Deine zitternden Beine lassen dich stolpern."
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr "Du fällst um!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr "Die Strahlungsplakette wechselt von %1$s zu %2$s!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr "Dein %s hat damit begonnen, sich zu heilen."
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr "Aus dem %1$s hörst du %2$s"
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr ""
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr ""
@@ -228025,11 +231126,6 @@ msgstr "%s kann nicht mit nur einem Arm gehalten werden."
 msgid "You are too weak to wield %s with only one arm."
 msgstr "Du bist zu schwach, um %s mit nur einem Arm zu halten."
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr "Du kannst dich nicht von %s entwaffnen."
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "Hände freihalten (aus)"
@@ -228105,20 +231201,43 @@ msgstr "%s hat keine Defekte, die behoben werden müssen."
 msgid "Mend which fault?"
 msgstr "Welchen Defekt beheben?"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white>Benötigte Zeit:</color>\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr ""
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white>Fertigkeiten:</color>\n"
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr ""
+
+#: src/player.cpp
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "Skills: %s\n"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr ""
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
-msgstr "> <color_%1$s>%2$s %3$i</color>\n"
+msgid "You are currently unable to mend the %s this way."
+msgstr ""
 
 #: src/player.cpp
 msgid "You are already wearing that."
@@ -228236,14 +231355,6 @@ msgstr "Du ziehst %s aus."
 msgid "<npcname> takes off their %s."
 msgstr "<npcname> zieht sich %s aus."
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr "Du kannst hier keine Gegenstände platzieren!"
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr "<npcname> kann hier keine Gegenstände platzieren!"
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -228292,20 +231403,6 @@ msgstr "Du verwertest %i unbenutztes Plutonium wieder."
 msgid "You can't remove partially depleted plutonium!"
 msgstr "Du kannst teilweise verbrauchtes Plutonium nicht entfernen!"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] "Dein %s braucht %d Ladung von irgendeiner Esz."
-msgstr[1] "Dein %s braucht %d Ladungen von irgendeiner Esz."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] "Dein %s hat %d Ladung, benötigt aber %d."
-msgstr[1] "Dein %s hat %d Ladungen, benötigt aber %d."
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -228489,10 +231586,6 @@ msgstr "Du versuchst, auszuweichen, aber es gibt keinen Platz!"
 msgid "%s tries to dodge but there's no room!"
 msgstr "%s versucht, auszuweichen, aber es gibt keinen Platz!"
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr "Dein Körper verrenkt sich unter der Last!"
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -228548,6 +231641,13 @@ msgstr "Hungrig"
 msgid "Pain "
 msgstr ""
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr ""
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -228774,47 +231874,57 @@ msgstr "Geschwindigkeit:"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
-msgstr "Überlastung         −%s%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
-msgstr "Schmerz             −%s%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
-msgstr "Durst               −%s%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr ""
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
-msgstr "Nicht in der Sonne  −%s%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
+msgstr ""
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
-msgstr "Schnell             +%s%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
-msgstr "Bionikgeschwindigk. +%s%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
@@ -229025,8 +232135,8 @@ msgid "\"Oh God, what's happening?\""
 msgstr "»Oh Gott, was passiert hier?«"
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
-msgstr "»Natürlich … Alles Fraktale!«"
+msgid "\"Of course… it's all fractals!\""
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "\"Huh?  What was that?\""
@@ -229061,8 +232171,8 @@ msgid "You quiver from the cold."
 msgstr "Du zitterst vor Kälte."
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
-msgstr "Dein Torso ist einkalt. Du solltest mehr Kleidungsschichten anziehen."
+msgid "Your torso is freezing cold.  You should put on a few more layers."
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "Your shivering makes you unsteady."
@@ -229457,6 +232567,47 @@ msgstr ""
 msgid "Your alarm went off."
 msgstr ""
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr ""
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -229878,10 +233029,6 @@ msgstr "»KRAWENG!«."
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>keine</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr ""
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -230120,13 +233267,6 @@ msgstr ""
 msgid "KILLS"
 msgstr ""
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr ""
-"Setzt den Bildschirm, auf welchem das Spiel angezeigt werden soll. Erfordert"
-" Neustart."
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr ""
@@ -230139,6 +233279,10 @@ msgstr "Dein Trommelfell schmerzt plötzlich!"
 msgid "Something is making noise."
 msgstr "Etwas macht Krach."
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr ""
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -230154,6 +233298,11 @@ msgstr ""
 msgid "You hear %1$s"
 msgstr "Du hörst %1$s"
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr "Aus dem %1$s hörst du %2$s"
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "Dein Wecker weckt dich endlich auf."
@@ -230185,6 +233334,420 @@ msgstr ""
 msgid "d: delete history"
 msgstr "d: Protokoll leeren"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr "Du bist zu dehydriert, um mit %s weiterzumachen."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr "Du bist zu erschöpft, um mit %s weiterzumachen."
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "Du bist im Begriff, zu ertrinken!"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr ""
+"Plötzlich überkommt dich das Verlangen nach Schlaf und du wirst bewusstlos."
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "Du bist plötzlich empfindungslos."
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "Du fühlst plötzlich einen Schmerz."
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "Du fühlst dich plötzlich ein bisschen benommen."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "Du fühlst dich plötzlich hungrig."
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "Du fühlst dich plötzlich ein bisschen satt."
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "Du fühlst dich plötzlich ein bisschen durstig."
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "Du fühlst dich plötzlich müde."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "Dir ist plötzlich sehr kalt."
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "Dir ist plötzlich kalt."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "Dir ist plötzlich sehr heiß."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "Dir ist plötzlich heiß."
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "Du beginnst, unkontrolliert zu zittern."
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr "%1$s sagt: »%2$s«."
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr "%1$s wird wütend!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "Du hast einen Asthmaanfall!"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr ""
+"Du verwendest deine Oxygenierer-KBM um deine Atemwege zu befreien und legst "
+"dich dann wieder schlafen"
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr "Du benutzt einen Inhalator und legst dich wieder schlafen."
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "Du benutzt deine letzte Inhalatorladung."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] "Du benutzt deinen Inhalator, nur noch %d Ladung übrig."
+msgstr[1] "Du benutzt deinen Inhalator, nur noch %d Ladungen übrig."
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "Das Sonnenlicht verbrennt deine Haut!"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "Das Sonnenlicht lenkt dich ab."
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "Du kannst das Sonnenlicht nicht aushalten!"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "Das Sonnenlicht reizt deine Augen sehr."
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr "Dir fällt ein Zahn aus!"
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "»BZZZZZ«"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "Plötzlich kannst du nichts hören."
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "Plötzlich funktionieren deine Augen nicht mehr."
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr ""
+"Du merkst, wie ein unnormales Gefühl aus deinen Strahlungssensoren "
+"schleicht."
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr "Dein Oberkörper brennnt, als dein Stromsystem überlastet wird!"
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "Du erleidest eine schmerzhafte elektische Entladung!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr "Die %s scheinen von der Entladung betroffen zu sein."
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "Du erleidest eine brennende Säureentladung!"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "Deine Batterien entladen sich ein bisschen."
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "Ein Bionik knistert laut!"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "Du fühlst, wie dein defektes Bionik wackelt."
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr "Knistern!"
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "Deine Sicht verpixelt sich!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr "Dein defektes Bionik verursacht einen Krampf und du fällst zu Boden!"
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr "Deine Bioniken haben einen Kurzschluss, was dich zum Zittern bringt."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "Dein defektes Bionik tut weh."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr "Deine Muskeln verkrampfen sich!"
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr "Du fällst zu Boden!"
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr "Dir geht die Luft aus."
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr "Du zitterst unkontrolliert."
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr "Du fällst in Ohnmacht!"
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "Deine Atmung verlangsamt sich."
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr "Du stolperst und fällst hin!"
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr "Müde reibst du deine Augen."
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr "Du gähnst ein wenig."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr "Du streckst deinen Rücken."
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr "Du fühlst dich geistig erschöpft."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr "Du fühlst dich für einen Moment benommen."
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr "Deine Muskeln verkrampfen sich unangenehm."
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr "Deine Sicht verschwimmt ein wenig."
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr "Für einen Augenblick verlierst du all dein Wissen."
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr "Deine Muskeln schmerzen auf eine nervende und unvorhersehbare Weise."
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr "Du hast ablenkende Kopfschmerzen."
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr ""
+"Du hast Sodbrennen und dadurch auch einen üblen, sauren Geschmack im Mund."
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr ""
+"Dein Verstand ist so müde, dass du das Gefühl hast, deinen Augen nicht mehr "
+"trauen zu können."
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr ""
+"Deine Muskeln verkrampfen sich unangenehm. Du hast Probleme, das "
+"Gleichgewicht zu halten."
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr "Deine zitternden Beine lassen dich stolpern."
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr "Du fällst um!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr "Die Strahlungsplakette wechselt von %1$s zu %2$s!"
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr "Dein %s hat damit begonnen, sich zu heilen."
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr ""
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr ""
@@ -230334,8 +233897,8 @@ msgstr ""
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "%s stolpert über das Notbett"
+msgid "The %s stumbles over the cot!"
+msgstr ""
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -230490,11 +234053,6 @@ msgstr "Ein Fallstrick schließt sich um dein Bein."
 msgid "A snare closes on <npcname>s leg."
 msgstr "Ein Fallstrick schließt sich um <npcname>s Bein."
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr ""
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -230729,6 +234287,13 @@ msgstr "<npcname> fällt um eine Ebene herunter!"
 msgid "You fall down under %s!"
 msgstr "Du fällst unter %s!"
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname> flattert mit den Flügeln und schwebt sanft nach unten."
@@ -230867,6 +234432,10 @@ msgstr ""
 msgid "Select part"
 msgstr "Teil wählen"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white>Benötigte Zeit:</color>\n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr "<color_white>Benötigte Fertigkeiten:</color>\n"
@@ -233332,8 +236901,8 @@ msgstr "bei %2d: %s  "
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
-msgstr "Setzt »%s« auf …"
+msgid "Set '%s' to…"
+msgstr ""
 
 #: src/wish.cpp
 msgid " (current)"
diff --git a/lang/po/es_AR.po b/lang/po/es_AR.po
index b275e8d9af9e1..14fd304561545 100644
--- a/lang/po/es_AR.po
+++ b/lang/po/es_AR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
 "Last-Translator: Noctivagante <noctivagante@yahoo.com>, 2019\n"
 "Language-Team: Spanish (Argentina) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/es_AR/)\n"
@@ -207,6 +207,19 @@ msgstr ""
 msgid "watery plutonium slurry"
 msgstr "lechada acuosa de plutonio"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr "piedra"
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr ""
+"Es una piedra del tamaño de una pelota de tenis. Funciona bien como arma de "
+"cuerpo a cuerpo, y también se puede tirar a los enemigos."
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "piedrita"
@@ -726,7 +739,7 @@ msgstr "misil casero con espiga"
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
+" of this grade of weapon, but packs a fierce punch… if it hits."
 msgstr ""
 "Es un misil hecho a mano, que consiste en una punta soldada a un caño que "
 "fue rellenado con combustible improvisado para misiles. Es espantosamente "
@@ -783,8 +796,8 @@ msgstr "carburo de calcio inconcluso"
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
 msgstr ""
 "Es el proceso incompleto de convertir carbón y cal en carburo de calcio. En "
 "este estado no sirve para nada."
@@ -1289,8 +1302,8 @@ msgstr[1] "óxido de zinc"
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
 msgstr ""
 "Es un puñado de óxido de zinc. Puede ser reducido a zinc, o ser usado para "
 "otras reacciones."
@@ -1304,7 +1317,7 @@ msgstr[1] "óxido de manganeso"
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr ""
@@ -1321,10 +1334,10 @@ msgstr[1] "cloruro de potasio"
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr ""
 "Es un puñado de cloruro de potasio. Aunque aparece naturalmente en el "
 "mineral silvina, puede obtenerse como derivado de la reacción entre el "
@@ -1340,8 +1353,8 @@ msgstr[1] "hidróxido de potasio"
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
 msgstr ""
 "Es un puñado de hidróxido de potasio. Comúnmente denominado potasa cáustica,"
@@ -1376,9 +1389,9 @@ msgstr[1] "ácido hidroclórico"
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
 msgstr ""
 "Es ácido hidroclórico, también conocido como ácido muriático. Es un ácido "
 "fuerte con un olor distintivo, importante y usado frecuentemente desde su "
@@ -1685,8 +1698,8 @@ msgstr[1] ""
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -2112,7 +2125,7 @@ msgstr[1] "combustible para lanzallamas"
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
 msgstr ""
@@ -2311,7 +2324,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "handmade 20x66mm buckshot"
-msgstr "perdigón 20x66mm casero"
+msgstr "perdigón grande 20x66mm casero"
 
 #. ~ Description for handmade 20x66mm buckshot
 #: lang/json/AMMO_from_json.py
@@ -2412,7 +2425,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "20x66mm buckshot"
-msgstr "perdigón 20x66mm"
+msgstr "perdigón grande 20x66mm"
 
 #. ~ Description for 20x66mm buckshot
 #: lang/json/AMMO_from_json.py
@@ -2421,9 +2434,9 @@ msgid ""
 "Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or "
 "reloaded."
 msgstr ""
-"Son balas 20x66mm sin casquillo, con perdigones. Es munición exclusiva para "
-"escopetas Rivtech. Al no tener casquillo, no pueden ser desarmadas ni "
-"recargadas."
+"Son balas 20x66mm sin casquillo, con perdigones grandes. Es munición "
+"exclusiva para escopetas Rivtech. Al no tener casquillo, no pueden ser "
+"desarmadas ni recargadas."
 
 #: lang/json/AMMO_from_json.py
 msgid "20x66mm slug"
@@ -3242,7 +3255,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "40mm buckshot"
-msgstr "perdigón 40mm"
+msgstr "perdigón grande 40mm"
 
 #. ~ Description for 40mm buckshot
 #: lang/json/AMMO_from_json.py
@@ -3679,41 +3692,55 @@ msgid "reloaded .460 Rowland"
 msgstr ".460 Rowland recargada"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr ".50 BMG trazadora"
+msgid ".50 BMG M17 tracer"
+msgstr ".50 BMG M17 trazadora"
+
+#. ~ Description for .50 BMG M17 tracer
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
+msgstr ""
+"Es la variante trazadora de la poderosa bala .50 BMG. Las balas trazadoras "
+"ayudan a mantener apuntada el arma mientras se dispara, con el riesgo de "
+"incendiar sustancias inflamables."
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG M33 Ball"
+msgstr ".50 BMG M33 bola"
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"Es la variante trazadora de la poderosa bala .50 BMG de francotirador. Las "
-"balas trazadoras ayudan a mantener apuntada el arma mientras se dispara, con"
-" el riesgo de incendiar sustancias inflamables."
+"Es munición .50 BMG con núcleo de acero, 661gr FMJ. Es una bala de rifle muy"
+" poderosa diseñada para uso anti-aéreo, y luego adaptada como anti-vehicular"
+" y anti-personal. Su estupenda energía y penetración de blindaje la "
+"convierten en una de las balas más letales, con la desventaja de su drástico"
+" retroceso y su ruido."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr ".50 BMG bola"
+msgid ".50 BMG Match"
+msgstr ""
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
 msgstr ""
-"La .50 BMG es una bala de rifle muy poderosa diseñada para largo alcance. Su"
-" estupenda precisión y capacidad de penetración de blindaje la convierten en"
-" una de las bala más mortales, con la desventaja del retroceso drástico y "
-"ser ruidosa."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
-msgstr ".50 BMG AP"
+msgid ".50 BMG M2 AP"
+msgstr ".50 BMG M2 AP"
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
@@ -3722,6 +3749,31 @@ msgstr ""
 "Una variante de la .50 BMG con su núcleo hecho de carburo de tungsteno "
 "endurecido. La penetración es mejor pero su capacidad de daño es menor."
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr ".50 BMG Raufoss Mk 211"
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+"Esta variante de la .50 BMG logra el mayor potencial de su carga explosiva: "
+"la punta está cargada con una mezcla incendiaria, que se enciende al hacer "
+"impacto, detonando la carga RDX o PETN. Esto también enciende la carga "
+"secundaria de polvo de circonio que envuelve el perforante de carburo de "
+"tungsteno, dentro de una copa de acero dulce. Los fragmentos de la copa y el"
+" polvo metálico encendido van detrás del perforante a través del objetivo, "
+"lo que aumenta su letalidad. Es improbable que estas balas raras, "
+"complicadas y caras sean fabricadas nuevamente. Usalas inteligentemente."
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
 msgstr ".50 BMG trazadora recargada"
@@ -3729,31 +3781,32 @@ msgstr ".50 BMG trazadora recargada"
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
 msgstr ""
-"Es la variante trazadora de la poderosa bala .50 BMG de francotirador. Las "
-"balas trazadoras ayudan a mantener apuntada el arma mientras se dispara, con"
-" el riesgo de incendiar sustancias inflamables. Esta ha sido recargada a "
-"mano."
+"Es la variante trazadora de la poderosa bala .50 BMG. Las balas trazadoras "
+"ayudan a mantener apuntada el arma mientras se dispara, con el riesgo de "
+"incendiar sustancias inflamables. Esta ha sido recargada a mano."
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr ".50 BMG bola recargadas"
+msgid "reloaded .50 BMG Match"
+msgstr ""
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"La .50 BMG es una bala de rifle muy poderosa diseñada para largo alcance. Su"
-" estupenda precisión y capacidad de penetración de blindaje la convierten en"
-" una de las bala más mortales, con la desventaja del retroceso drástico y "
-"ser ruidosa. Esta ha sido recargada a mano."
+"Es munición .50 BMG FMJ con núcleo de plomo. Es una bala de rifle muy "
+"poderosa diseñada para uso anti-aéreo, y luego adaptada como anti-vehicular "
+"y anti-personal. Su estupenda energía y penetración de blindaje la "
+"convierten en una de las balas más letales, con la desventaja de su drástico"
+" retroceso y su ruido."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
@@ -3762,13 +3815,9 @@ msgstr ".50 BMG AP recargadas"
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
 msgstr ""
-"Una variante de la .50 BMG con su núcleo hecho de carburo de tungsteno "
-"endurecido. La penetración es mejor pero su capacidad de daño es menor. Esta"
-" ha sido recargada a mano."
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -4601,7 +4650,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded birdshot"
-msgstr "perdigones recargados"
+msgstr "perdigones pequeños recargados"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded dragon's breath shell"
@@ -4621,7 +4670,7 @@ msgstr "postas recargadas de escopeta"
 
 #: lang/json/AMMO_from_json.py
 msgid "blackpowder birdshot"
-msgstr "perdigón pólvora"
+msgstr "perdigón pequeño pólvora"
 
 #: lang/json/AMMO_from_json.py
 msgid "blackpowder dragon's breath shell"
@@ -4666,7 +4715,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "birdshot"
-msgstr "perdigones"
+msgstr "perdigones pequeños"
 
 #. ~ Description for birdshot
 #: lang/json/AMMO_from_json.py
@@ -4733,12 +4782,12 @@ msgid ""
 "A shotgun shell filled with whatever was lying around.  They are more "
 "damaging than birdshot, but fairly inaccurate."
 msgstr ""
-"Un cartucho de escopeta lleno con cosas que estaban tiradas por ahí. Causa "
-"más daño que los perdigones, pero es menos preciso."
+"Es un cartucho de escopeta lleno con cosas que estaban tiradas por ahí. "
+"Causa más daño que los perdigones pequeños, pero es menos preciso."
 
 #: lang/json/AMMO_from_json.py
 msgid "makeshift shotgun shot (black powder)"
-msgstr ""
+msgstr "cartucho improvisado de perdigones (pólvora)"
 
 #: lang/json/AMMO_from_json.py
 msgid "shotgun slug"
@@ -4810,7 +4859,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "birdshot paper cartridge"
-msgstr ""
+msgstr "cartucho de papel de perdigones pequeños"
 
 #. ~ Description for birdshot paper cartridge
 #: lang/json/AMMO_from_json.py
@@ -4818,10 +4867,13 @@ msgid ""
 "A paper cartridge containing a premeasured amount of black powder and an "
 "equal volume of birdshot.  Used mostly for hunting small game or fowl."
 msgstr ""
+"Es un cartucho de papel con una cantidad específica de pólvora  y el mismo "
+"volumen de perdigones pequeños. Es utilizado principalmente para caza menor "
+"o aves salvajes."
 
 #: lang/json/AMMO_from_json.py
 msgid "pyrotechnic paper cartridge"
-msgstr ""
+msgstr "cartucho de papel pirotécnico"
 
 #. ~ Description for pyrotechnic paper cartridge
 #: lang/json/AMMO_from_json.py
@@ -4830,10 +4882,13 @@ msgid ""
 "equal volume of flammable metals.  When fired, burning chunks of metal and "
 "sparks will shoot out of the barrel, igniting everything in their path."
 msgstr ""
+"Es un cartucho de papel con una cantidad específica de pólvora y el mismo "
+"volumen de metales inflamables. Cuando se lo dispara, los pedazos ardientes "
+"de metal y chispas salen disparadas del caño, incendiando todo lo que toca."
 
 #: lang/json/AMMO_from_json.py
 msgid "buckshot paper cartridge"
-msgstr ""
+msgstr "cartucho de papel de perdigones grandes"
 
 #. ~ Description for buckshot paper cartridge
 #: lang/json/AMMO_from_json.py
@@ -4841,10 +4896,12 @@ msgid ""
 "A paper cartridge containing a premeasured amount of black powder and an "
 "equal volume of 00 buckshot."
 msgstr ""
+"Es un cartucho de papel con una cantidad específica de pólvora y el mismo "
+"volumen de perdigones grandes 00."
 
 #: lang/json/AMMO_from_json.py
 msgid ".62 paper cartridge"
-msgstr ""
+msgstr "cartucho de papel .62"
 
 #. ~ Description for .62 paper cartridge
 #: lang/json/AMMO_from_json.py
@@ -4852,6 +4909,8 @@ msgid ""
 "A paper cartridge containing a premeasured amount of black powder and a .605"
 " inch lead ball."
 msgstr ""
+"Es un cartucho de papel con una cantidad específica de pólvora y el mismo "
+"volumen de pólvora y una bola de plomo de .605 pulgadas."
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "signal flare"
@@ -4895,6 +4954,119 @@ msgstr "Son unas semillas de hongos."
 msgid "fungal flower"
 msgstr "flor fúngica"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr "alumbre potásico"
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+"Son pequeños cristales blancos solubles en agua con olor metálico, utilizado"
+" históricamente para diferentes cosas. Es conocido también como alumbre de "
+"potasio y sulfato de potasio de aluminio, a veces se lo denomina simplemente"
+" alumbre, ya que es el elemento más importante de los componentes genéricos "
+"denominados alumbres."
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr "polvo para teñir lana"
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr ""
+"Es un polvo colorido que puede ser utilizado para teñir muchas telas si se "
+"lo combina con agua y mordiente."
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr "hebilla de acero"
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr "Es una hebilla de acero, como la que tienen los cinturones."
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr "botón plástico"
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr "Es un botón de plástico, como el que se usa en mucha ropa."
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr "botón de acero"
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr "Es un botón de acero, como el que se usa en mucha ropa."
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr "botón de madera"
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr ""
+"Es un botón simple de madera, como el que se usaba en ropas antiguamente."
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr "broche metálico de acero"
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr ""
+"Es uno de esos broches redondos de acero, como el que se usa en mucha ropa."
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr "cierre abrojo"
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr ""
+"Son un par de tiras de tela, una de las cuales tiene pequeños ganchos y la "
+"otra tiene pequeños bucles. Es útil para ajustar la ropa y el calzado."
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr "cierre grande de plástico"
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr "Es un  cierre grande de plástico, como el que se usa en mucha ropa."
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr "cierre chico de plástico"
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr ""
+"Es un cierre chico de plástico, como el que se usa en el calzado y en "
+"bolsillos."
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -5055,7 +5227,7 @@ msgstr[1] "zinc"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
 msgstr ""
@@ -5147,7 +5319,7 @@ msgstr "bisagra de puerta"
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
 msgstr ""
 "Es una pequeña bisagra de metal con dos pedazos con agujeros para tornillos."
@@ -5163,6 +5335,8 @@ msgid ""
 "A fine gray powder composed of tin, usable for making solder and lining "
 "containers to prevent corrosion."
 msgstr ""
+"Es un polvo fino y gris compuesto de estaño, útil para soldaduras y revestir"
+" contenedores para evitar la corrosión."
 
 #: lang/json/AMMO_from_json.py
 msgid "solder"
@@ -5193,8 +5367,8 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "fuse"
 msgid_plural "fuse"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "mecha"
+msgstr[1] "mecha"
 
 #. ~ Description for fuse
 #: lang/json/AMMO_from_json.py
@@ -5202,6 +5376,422 @@ msgid ""
 "A piece of fuse, long enough to give you enough time to get away from most "
 "explosions."
 msgstr ""
+"Es un pedazo de mecha, lo suficientemente larga como para darte tiempo a "
+"escapar de la explosión."
+
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr "suela de goma"
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr "Es una suela hecha de goma, comúnmente usado en botas."
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] "pedazos de algodón"
+msgstr[1] "pedazos de algodón"
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr ""
+"Son pequeños pedazos irregulares de algodón, desperdicio de algún proyecto "
+"de sastrería. No son muy útiles, pero pueden ser reciclados para hacer hilo,"
+" si querés."
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] "pedazos de piel artificial"
+msgstr[1] "pedazos de piel artificial"
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+"Son pequeños pedazos irregulares de piel artificial, desperdicio de algún "
+"proyecto de sastrería. No son muy útiles para nada."
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] "trozos de fieltro"
+msgstr[1] "trozos de fieltro"
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr ""
+"Son pequeños pedazos irregulares de fieltro, desperdicio de algún proyecto "
+"de sastrería. No son muy útiles, pero pueden ser reciclados para hacer fibra"
+" de algodón, si querés."
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] "pedazos de piel"
+msgstr[1] "pedazos de piel"
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr ""
+"Son pequeños pedazos irregulares de piel, desperdicio de algún proyecto de "
+"sastrería. No son muy útiles para nada."
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] "pedazos de Kevlar"
+msgstr[1] "pedazos de Kevlar"
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+"Son pequeños pedazos irregulares de tela Kevlar, desperdicio de algún "
+"proyecto de sastrería. No son muy útiles, pero dado que el Kevlar puede ser "
+"muy difícil de fabricar en un mundo post-apocalíptico, es mejor recuperar su"
+" hilo de Kevlar."
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] "pedazos de cuero"
+msgstr[1] "pedazos de cuero"
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+"Son pequeños pedazos irregulares de cuero, desperdicio de algún proyecto de "
+"sastrería. No son muy útiles para nada."
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] "pedazos de licra"
+msgstr[1] "pedazos de licra"
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr ""
+"Son pequeños pedazos irregulares de licra, desperdicio de algún proyecto de "
+"sastrería. No son muy útiles para nada."
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] "pedazos de neopreno"
+msgstr[1] "pedazos de neopreno"
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+"Son pequeños pedazos irregulares de neopreno, desperdicio de algún proyecto "
+"de sastrería. No son muy útiles para nada."
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] "pedazos de tela sintética"
+msgstr[1] "pedazos de tela sintética"
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr ""
+"Son pequeños pedazos irregulares de tela sintética, desperdicio de algún "
+"proyecto de sastrería. No son muy útiles para nada."
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] "trozos de Nomex"
+msgstr[1] "trozos de Nomex"
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr ""
+"Son pequeños pedazos irregulares de tela Nomex resistente al calor, "
+"desperdicio de algún proyecto de sastrería. No son muy útiles, pero dado que"
+" el Nomex puede ser muy difícil de fabricar en un mundo post-apocalíptico, "
+"es mejor recuperar su hilo de Nomex."
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr "tela de algodón"
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr "Es una tela de algodón, ideal para hacer ropa."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] "retazos de ropa de algodón"
+msgstr[1] "retazos de ropa de algodón"
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+"Es una selección de diversos pedazos de ropa, cocidos juntos de pedazos de "
+"tela de algodón. Útil para hacer ropa, aunque es mucho menos eficiente que "
+"si utilizaras telas apropiadas."
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr "tela de piel artificial"
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr "Es una tela colorida de piel artificial, ideal para hacer ropa."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] "retazos de ropa de piel artificial"
+msgstr[1] "retazos de ropa de piel artificial"
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr ""
+"Es una selección de diversos pedazos de ropa, cocidos juntos de pedazos de "
+"tela de piel artificial. Útil para hacer ropa, aunque es mucho menos "
+"eficiente que si utilizaras telas apropiadas."
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr "tela de fieltro"
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr "Es una tela de fieltro, ideal para hacer ropa."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] "retazos de ropa de fieltro"
+msgstr[1] "retazos de ropa de fieltro"
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr ""
+"Es una selección de diversos pedazos de ropa, cocidos juntos de pedazos de "
+"tela de fieltro. Útil para hacer ropa, aunque es mucho menos eficiente que "
+"si utilizaras telas apropiadas."
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr "tela de Kevlar"
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr ""
+"Es una tela sintética de Kevlar, ideal para hacer armadura antibalas. En "
+"esta forma, a diferencia de las placas rígidas, puede ser cocida."
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr "tela de licra"
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr ""
+"Es una tela sintética con mezcla de fibras de licra, ideal para hacer ropa "
+"resistente y flexible."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] "retazos de ropa de licra"
+msgstr[1] "retazos de ropa de licra"
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+"Es una selección de diversos pedazos de ropa, cocidos juntos de pedazos de "
+"tela de licra. Útil para hacer ropa, aunque es mucho menos eficiente que si "
+"utilizaras telas apropiadas."
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] "lámina de neopreno"
+msgstr[1] "láminas de neopreno"
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr ""
+"Es una tela de neopreno, una goma sintética, ideal para hacer ropa "
+"sumergible."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] "retazos de ropa de neopreno"
+msgstr[1] "retazos de ropa de neopreno"
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr ""
+"Es una selección de diversos pedazos de ropa, cocidos juntos de pedazos de "
+"tela de neopreno, con costuras a prueba de agua. Útil para hacer ropa, "
+"aunque es mucho menos eficiente que si utilizaras telas apropiadas."
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr "tela de Nomex"
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr ""
+"Es una tela sintética de Nomex, ideal para hacer ropa resistente al calor."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] "retazos de ropa de Nomex"
+msgstr[1] "retazos de ropa de Nomex"
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr ""
+"Es una selección de diversos pedazos de ropa, cocidos juntos de pedazos de "
+"tela de Nomex. Útil para hacer ropa, aunque es mucho menos eficiente que si "
+"utilizaras telas apropiadas."
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr "tela sintética"
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr "Es una tela sintética, ideal para hacer ropa."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] "retazos de ropa de tela sintética"
+msgstr[1] "retazos de ropa de tela sintética"
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr ""
+"Es una selección de diversos pedazos de ropa, cocidos juntos de pedazos de "
+"tela sintética. Útil para hacer ropa, aunque es mucho menos eficiente que si"
+" utilizaras telas apropiadas."
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr "hilo de Kevlar"
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+"Es hilo muy resistente de Kevlar que es particularmente útil para hacer "
+"armadura antibalas, aunque puede ser utilizado en lugar del hilo común, en "
+"la mayoría de los casos. Hacer tela de Kevlar a partir de esto necesitará el"
+" uso de un telar resistente, y otras máquinas especializadas."
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr "hilo de Nomex"
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr ""
+"Es hilo resistente al calor de Nomex, que es particularmente útil para hacer"
+" ropa resistente al calor, aunque puede ser usado en lugar del hilo común, "
+"en la mayoría de los casos."
 
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
@@ -5812,11 +6402,26 @@ msgstr ""
 "militar, diseñada para arder en el impacto, penetrando blindaje y "
 "encendiendo sustancias inflamables."
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr "flecha de oricalco"
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr ""
+"Es una flecha compuesta con un pedacito de oricalco. La flecha posee un "
+"brillo misterioso. Tiene muy alta probabilidad de permanecer intacta una vez"
+" disparada, pero solo puede ser disparada desde un Ichaival."
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sangre de dragón"
+msgstr[1] "sangre de dragón"
 
 #. ~ Description for dragon blood
 #: lang/json/AMMO_from_json.py
@@ -5824,12 +6429,14 @@ msgid ""
 "Blood of a dragon, it radiates warmth and looking at it you see moving "
 "patterns form and disappear in it as if looking at an actual fire."
 msgstr ""
+"Es la sangre de un dragón, emite calor y al mirarla podés ver patrones "
+"formándose y despareciendo como si estuvieras mirando un fuego."
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "tainted blood"
 msgid_plural "tainted blood"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sangre contaminada"
+msgstr[1] "sangre contaminada"
 
 #. ~ Description for tainted blood
 #: lang/json/AMMO_from_json.py
@@ -5837,6 +6444,8 @@ msgid ""
 "Blood from a blob corrupted creature.  The surface of this black sluge "
 "ondulate slowy as if agitated by a soft breeze."
 msgstr ""
+"Sangre de una criatura corrompida. La superficie de este barro negro se "
+"mueve lentamente como si fuera agitado por una leve brisa."
 
 #: lang/json/AMMO_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/ammunition_type_from_json.py
@@ -5859,12 +6468,36 @@ msgstr[1] "maná cristalizado"
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
 msgstr ""
 "Es un poco de maná cristalizado. Puede ser puesto en cristales recargables "
 "de maná, pero no puede ser descargado."
 
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr "conglomerado de oricalco"
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr ""
+"Es un pedazo pesado de un metal extraño. Útil para fabricar algunas cosas."
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr "pedacito de oricalco"
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
+msgstr ""
+"Es un pedazo pequeño de un metal extraño. Útil como arma, pero es mejor para"
+" fabricar otra cosa."
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "fire lance charge"
 msgstr "carga de lanza de fuego"
@@ -6064,9 +6697,9 @@ msgid ""
 "amount of buckshot.  Effectively similar to no-longer-produced canister "
 "shot, but of lower quality."
 msgstr ""
-"Un proyectil de 120mm con un iniciador eléctrico instalado, relleno con gran"
-" cantidad de perdigones. Similar en eficacia al bote de metralla que ya no "
-"se produce, pero de menor calidad."
+"Es un proyectil de 120mm con un iniciador eléctrico instalado, relleno con "
+"muchos perdigones grandes. Similar en eficacia al bote de metralla que ya no"
+" se produce, pero de menor calidad."
 
 #: lang/json/AMMO_from_json.py
 msgid "makeshift 120mm slug"
@@ -6118,9 +6751,9 @@ msgid ""
 "amount of buckshot.  Effectively turns a howitzer into a punt gun on "
 "steroids."
 msgstr ""
-"Un proyectil de 155mm con un iniciador eléctrico instalado, relleno con una "
-"enorme cantidad de perdigones. Efectivamente, convierte un obús en una "
-"escopeta punt drogada."
+"Es un proyectil de 155mm con iniciador eléctrico instalado, relleno con una "
+"enorme cantidad de perdigones grandes. Efectivamente, convierte un obús en "
+"una escopeta punt drogada."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 155mm slug"
@@ -6454,13 +7087,6 @@ msgstr ""
 "Es una amalgama de varias clases de materiales orgánicos. Contiene todo lo "
 "que un blobo necesita para estar sano. Eso te parece..."
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "piedra"
-msgstr[1] "piedras"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -7057,8 +7683,10 @@ msgstr[1] "tahalís"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "Enfundás tu %s."
@@ -7555,8 +8183,8 @@ msgstr "Útil para llevar plata, documentos, o contrabando."
 #: lang/json/ARMOR_from_json.py
 msgid "H&K operational briefcase (empty)"
 msgid_plural "H&K operational briefcase (empty)s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "maletín operativo H&K (vacío)"
+msgstr[1] "maletines operativos H&K (vacíos)"
 
 #. ~ Description for H&K operational briefcase (empty)
 #: lang/json/ARMOR_from_json.py
@@ -7566,6 +8194,10 @@ msgid ""
 "nothing, as it is empty.  Don't forget to put a suitable MP5 back inside "
 "before you try to pay any ransom fees with lead."
 msgstr ""
+"Es un simple maletín rígido y negro con un gatillo en la manija y un agujero"
+" escondido en uno de los costados. Al apretar el gatillo no va a hacer nada "
+"porque está vacío. No te olvides de poner una MP5 adentro si querés pagar "
+"algún rescate con plomo."
 
 #: lang/json/ARMOR_from_json.py
 msgid "briefs"
@@ -7764,6 +8396,46 @@ msgstr ""
 "Es un chaleco de cota de malla. No tiene mangas pero tiene pequeñas correas "
 "diseñadas para distribuir mejor el peso."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -7931,6 +8603,28 @@ msgstr ""
 "Un disfraz de payaso muy colorido y muy ridículo. Tiene buena capacidad de "
 "almacenamiento."
 
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
@@ -8229,6 +8923,22 @@ msgid "A white button-down shirt with long sleeves.  Looks professional!"
 msgstr ""
 "Una camisa blanca con mangas largas. ¡Con esto parecés un profesional!"
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -8382,6 +9092,32 @@ msgstr[1] "riñoneras"
 msgid "Provides a bit of extra storage, with minimal encumbrance."
 msgstr "Nos da un poco más de almacenamiento, y no es muy incómoda."
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -8398,6 +9134,34 @@ msgstr ""
 "esgrimistas para prevenir accidentes. No tiene capacidad de almacenamiento, "
 "pero es muy cómoda."
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -8424,6 +9188,32 @@ msgstr ""
 "Un par de pantalones reforzados usado por los esgrimistas para prevenir "
 "lesiones."
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -8844,22 +9634,6 @@ msgstr[1] "pares de guantes de piel"
 msgid "A pair of warm fur gloves.  They are somewhat cumbersome."
 msgstr "Es un par de guantes de piel, muy abrigados. Son un poco incómodos."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] "par de guantes acuáticos de supervivencia"
-msgstr[1] "pares de guantes acuáticos de supervivencia"
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr ""
-"Un par de guantes personalizados de neopreno reforzados con kevlar. Están "
-"modificados para ser cómodos y brindar la máxima protección en condiciones "
-"extremas."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -8929,6 +9703,20 @@ msgstr ""
 "modificados para ser cómodos y brindar una máxima protección en condiciones "
 "extremas."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -9190,17 +9978,6 @@ msgstr ""
 "Es un par de anteojos grandes que cubren completamente los ojos. Brinda "
 "excelente protección contra los daños."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] "par de antiparras"
-msgstr[1] "pares de antiparras"
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "Un par de antiparras pequeñas para nadar."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -9243,23 +10020,6 @@ msgstr ""
 "Un abrigo pesado de lana de cuerpo entero. Incómodo pero abrigado y con "
 "bolsillos grandes."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] "traje acuático de supervivencia"
-msgstr[1] "trajes acuáticos de supervivencia"
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr ""
-"Es un traje ligero hecho a mano, es una combinación entre un chaleco "
-"antibalas cortado y un traje acuático de neopreno reforzado. Protege tanto "
-"del ambiente como del daño."
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -9836,20 +10596,6 @@ msgstr ""
 "Es una capucha personalizada de nomex reforzada con kevlar, muy resistente y"
 " duradera."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] "capucha acuática de supervivencia"
-msgstr[1] "capuchas acuáticas de supervivencia"
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr ""
-"Es una capucha personalizada de neopreno reforzada con kevlar, muy "
-"resistente y duradera."
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -10658,18 +11404,25 @@ msgstr[0] "cinturón de cuero"
 msgstr[1] "cinturones de cuero"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "Metés tu %s en tu %s."
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "Qué es lo que querés meter en el cinturón?"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
 msgstr ""
 "Es un cinturón de cuero. Útil para hacer que los pantalones te queden bien."
@@ -10862,6 +11615,20 @@ msgstr ""
 "Son unas pierneras que se sujetan a los muslos con correas con hebillas, y "
 "sirven para llevar cosas. Son las que utilizan los soldados."
 
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
 msgid_plural "Linux t-shirts"
@@ -11802,38 +12569,6 @@ msgstr ""
 "Es una funda larga y ajustable para espadas y otras armas blancas grandes. "
 "Hay que usarla para enfundar y desenfundar el arma."
 
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] "traje anti-tiburón"
-msgstr[1] "trajes anti-tiburón"
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr ""
-"Un traje entero de cota de malla que usan los buzos para protegerse contra "
-"las mordidas de tiburón. Viene con un casco de plástico y botas."
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] "traje anti-tiburón faraday"
-msgstr[1] "trajes anti-tiburón faraday"
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr ""
-"Un traje entero de cota de malla que usan los buzos para protegerse contra "
-"las mordidas de tiburón. Ha sido interconectado conductivamente, lo que "
-"brinda protección contra la electricidad."
-
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
 msgid_plural "sheathes"
@@ -11915,6 +12650,19 @@ msgstr ""
 "Es un pantalón corto de jean, grueso y resistente. Excelente material para "
 "protegerte de las heridas cortantes."
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
@@ -12438,13 +13186,9 @@ msgstr[1] "trajes de paciente"
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
 msgstr ""
-"Un traje fino de mangas cortas tanto en los brazos como en las piernas. A "
-"juzgar por el extraño corte y los puntos de ajuste... quizá sea mejor no "
-"saber quién lo usó antes. Tiene una mínimia capacidad de almacenamiento y no"
-" es incómodo."
 
 #: lang/json/ARMOR_from_json.py
 msgid "suit"
@@ -12527,6 +13271,7 @@ msgstr[1] "cinturones de supervivencia"
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "Enfundar cuchilla"
@@ -12950,17 +13695,6 @@ msgstr ""
 "de un asentamiento, o el capitán de una pandilla postapocalíptica, este es "
 "el sombrero indicado para vos."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] "malla"
-msgstr[1] "mallas"
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "Una malla con una pequeña red interior para mejor soporte."
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
@@ -13263,60 +13997,6 @@ msgstr ""
 "Es un chaleco elegante. Ideal para esos momentos donde usar solo una remera "
 "sería demasiado informal, pero un traje sería demasiado elegante."
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] "traje acuático"
-msgstr[1] "trajes acuáticos"
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "Un traje de neopreno de cuerpo entero."
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] "par de guantes de nado"
-msgstr[1] "pares de guantes de nado"
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr ""
-"Es un par de guantes muy flexibles de neopreno y goma de silicona. Perfectos"
-" para usar debajo del agua."
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] "capucha acuática"
-msgstr[1] "capuchas acuáticas"
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr "Una capucha de neopreno, generalmente utilizada por buzos."
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] "traje acuático corto"
-msgstr[1] "trajes acuáticos cortos"
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr ""
-"Es un traje de neopreno corto con mangas largas y detalles en rosa, y "
-"entallado a la cadera y el escote. No protege tanto como el traje largo, "
-"pero es más cómodo."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -13690,6 +14370,35 @@ msgstr ""
 "Una tela plástica con varias arandelas para poder atarla con una soga o una "
 "cuerda. Es útil para improvisar un techo durante la lluvia."
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -16745,6 +17454,161 @@ msgstr ""
 "armaduras de poder de DoubleTech, los controles y sistemas de regulación de "
 "ambiente requieren contacto directo con la piel."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] "malla"
+msgstr[1] "mallas"
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "Una malla con una pequeña red interior para mejor soporte."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] "traje acuático"
+msgstr[1] "trajes acuáticos"
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "Un traje de neopreno de cuerpo entero."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] "capucha acuática"
+msgstr[1] "capuchas acuáticas"
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr "Una capucha de neopreno, generalmente utilizada por buzos."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] "capucha acuática de supervivencia"
+msgstr[1] "capuchas acuáticas de supervivencia"
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr ""
+"Es una capucha personalizada de neopreno reforzada con kevlar, muy "
+"resistente y duradera."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] "traje acuático de supervivencia"
+msgstr[1] "trajes acuáticos de supervivencia"
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr ""
+"Es un traje ligero hecho a mano, es una combinación entre un chaleco "
+"antibalas cortado y un traje acuático de neopreno reforzado. Protege tanto "
+"del ambiente como del daño."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] "par de guantes acuáticos de supervivencia"
+msgstr[1] "pares de guantes acuáticos de supervivencia"
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr ""
+"Un par de guantes personalizados de neopreno reforzados con kevlar. Están "
+"modificados para ser cómodos y brindar la máxima protección en condiciones "
+"extremas."
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] "traje acuático corto"
+msgstr[1] "trajes acuáticos cortos"
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr ""
+"Es un traje de neopreno corto con mangas largas y detalles en rosa, y "
+"entallado a la cadera y el escote. No protege tanto como el traje largo, "
+"pero es más cómodo."
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] "traje anti-tiburón faraday"
+msgstr[1] "trajes anti-tiburón faraday"
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+"Un traje entero de cota de malla que usan los buzos para protegerse contra "
+"las mordidas de tiburón. Ha sido interconectado conductivamente, lo que "
+"brinda protección contra la electricidad."
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] "traje anti-tiburón"
+msgstr[1] "trajes anti-tiburón"
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr ""
+"Un traje entero de cota de malla que usan los buzos para protegerse contra "
+"las mordidas de tiburón. Viene con un casco de plástico y botas."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] "par de antiparras"
+msgstr[1] "pares de antiparras"
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "Un par de antiparras pequeñas para nadar."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] "par de guantes de nado"
+msgstr[1] "pares de guantes de nado"
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr ""
+"Es un par de guantes muy flexibles de neopreno y goma de silicona. Perfectos"
+" para usar debajo del agua."
+
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
 msgid_plural "helmet nettings"
@@ -17491,6 +18355,54 @@ msgid_plural "shotgun bandoliers"
 msgstr[0] "canana de escopeta"
 msgstr[1] "cananas de escopeta"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -17515,11 +18427,9 @@ msgstr[1] "diademas de cobre"
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
 msgstr ""
-"Es una banda de madera con adornos de cobre, que se usa en la cabeza. Al "
-"estar en contacto con tus sienes te hace sentir muy calmado."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of black dragonscale boots"
@@ -17738,6 +18648,24 @@ msgstr ""
 "tentáculos que agarran cualquier cosa que pongas dentro. Cambia y se ajusta "
 "para minimizar la incomodidad."
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -18361,13 +19289,10 @@ msgstr[1] "MCB Quemador de etanol"
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
 msgstr ""
-"Es un reactor que quema alcohol para ser usado como combustible de una "
-"manera extremadamente eficiente. Sin embargo, el usuario sufrirá los efectos"
-" embriagantes de la sustancia."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Aero-Evaporator CBM"
@@ -18376,8 +19301,7 @@ msgstr[0] "MCB Aero-vaporador"
 msgstr[1] "MCB Aero-vaporador"
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -18455,15 +19379,11 @@ msgstr[1] "MCB Dedo-hackeador"
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
-"Es un electrohackeador miniatura, quirúrgicamente incorporado en un dedo de "
-"la mano derecha. Es una unidad de hackeo útil para anular paneles de control"
-" y cosas similares, pero no computadoras. Tu habilidad en computadoras es "
-"importante y un uso fallido puede causar daño."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Flashbang Generator CBM"
@@ -18842,7 +19762,7 @@ msgstr[1] "MCB Interfaz Mk. II de armadura de poder"
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
 
@@ -19405,10 +20325,8 @@ msgstr[1] "Cosas Brillantes"
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
 msgstr ""
-"Es una... ¿cosa? Que brilla, por lo menos lo hacía cuando estaba enchufada."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Leaky Bionic"
@@ -20046,8 +20964,8 @@ msgstr[1] "Servir al Hombre"
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
-msgstr "Es... ¡un libro de recetas!"
+msgid "It's… it's a cookbook!"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Cucina Italiana"
@@ -20157,11 +21075,8 @@ msgstr[1] "PE050 \"Alpha\": Informe Preliminar"
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
+"\"APPROVED\"…"
 msgstr ""
-"Este manojo de artículos -con fecha dos semanas antes de que empiece todo "
-"esto- describe algunas fórmulas químicas nuevas y sus efectos sobre humanos."
-" Tiene un sello que dice \"APROBADO\"..."
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Dionne"
@@ -20191,12 +21106,9 @@ msgstr[1] "PE065 \"Chimera\": Mejores Prácticas"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
 msgstr ""
-"Este manojo de artículos describe una nueva fórmula química en detalle y "
-"ofrece las instrucciones para su uso como algún tipo de... ¿catalizador para"
-" controlar a las masas? Debe ser un error..."
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Smythe"
@@ -20209,12 +21121,8 @@ msgstr[1] "registros de laboratorio-Smythe"
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
+"look promising but the procurement methods seem awfully vague…"
 msgstr ""
-"Este registro del equipo de trabajo detalla diversas variedades de "
-"experimentos con mutágenos, centrándose en aquellos derivados de carne "
-"contaminada con XE037. Los resultados son prometedores pero los métodos de "
-"obtención parecen muy confusos..."
 
 #: lang/json/BOOK_from_json.py
 msgid "standpipe maintenance log"
@@ -20227,11 +21135,8 @@ msgstr[1] "registros de mantenimiento de tuberías"
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
+"with… a chemical formula?"
 msgstr ""
-"Esta carpeta detalla el mantenimiento programada para varios sistemas de "
-"cañerías de toda la instalación. Sin embargo, algunas registros parecen "
-"estar llenos de... ¿fórmulas químicas?"
 
 #: lang/json/BOOK_from_json.py
 msgid "chemical reference-CLASSIFIED"
@@ -20281,11 +21186,8 @@ msgstr[1] "PE023 \"Medicinal\": Aplicación y Descubrimientos"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
 msgstr ""
-"Esta carpeta con artículos altamente técnicos describe algunas fórmulas "
-"químicas nuevas y sus efectos en los humanos. Tiene un sello que dice "
-"\"APROBADO\"..."
 
 #: lang/json/BOOK_from_json.py
 msgid "PE070 \"Raptor\": Proposal"
@@ -20610,11 +21512,8 @@ msgstr[1] "registros de laboratorio-Herrera"
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
+"symbols you've not seen before…"
 msgstr ""
-"Esta carpeta robusta contiene muchísimos diagramas y especificaciones "
-"técnicas de varios materiales electrónicos. Algunos de los diagramas usan "
-"símbolos que nunca viste en tu vida..."
 
 #: lang/json/BOOK_from_json.py
 msgid "2XI design binder-CLASSIFIED"
@@ -20688,13 +21587,13 @@ msgstr[1] "esquemas genéricos"
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -21098,13 +21997,9 @@ msgstr[1] "El Ayudante del Cargador a Mano"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
 msgstr ""
-"Todo lo que siempre quisiste saber acerca de la recarga manual de las "
-"municiones, cerradas con... cubierta a prueba de niños. Parece que es algo "
-"confiable, porque en el capítulo sobre balas explosivas habla de ellas con "
-"lujo de detalle."
 
 #: lang/json/BOOK_from_json.py
 msgid "Rivtech design binder"
@@ -21674,7 +22569,7 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -23119,6 +24014,34 @@ msgid ""
 " that the author's real name is Fereidoun M. Esfandiary."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
 msgid_plural "phone books"
@@ -23202,8 +24125,8 @@ msgstr[1] "libros de contabilidad de corporaciones"
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
-msgstr "Si supieras qué buscar, tal vez encontrarías algo..."
+msgid "If you knew what to look for something might stand out…"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "patient treatment records"
@@ -23494,6 +24417,106 @@ msgstr "Es una copia de \"El Conde de Monte Cristo\" de Dumas."
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr "Es una copia de \"El jardín secreto\" de Frances Burnett."
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -24621,11 +25644,12 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -24636,11 +25660,12 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
-msgstr[0] "Guía de Principiante en Alquimia"
-msgstr[1] "Guía de Principiante en Alquimia"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr ""
@@ -24649,17 +25674,49 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
 "along with emulating their healing factor."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -25178,7 +26235,7 @@ msgstr ""
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr ""
 
@@ -26207,6 +27264,41 @@ msgstr ""
 "Es el estómago de una criatura humanoide grande. Es sorprendentemente "
 "duradero."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr ""
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr ""
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -26258,6 +27350,61 @@ msgstr ""
 "Esto es un pedacito de carne. No es mucho, pero sirve cuando no hay nada "
 "más."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr ""
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr ""
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -26296,6 +27443,24 @@ msgid_plural "cooked scraps of meat"
 msgstr[0] "pedazo de carne cocinada"
 msgstr[1] "pedazos de carne cocinada"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr ""
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "achura cruda"
@@ -26537,8 +27702,8 @@ msgstr[1] "cerebros crudos"
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
-msgstr "Es el cerebro de un animal. No vas a querer comerte esto crudo..."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cooked brains"
@@ -26597,8 +27762,8 @@ msgstr "molleja cocinada"
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
-msgstr "Comúnmente, es una exquisitez, pero le falta un poco de... algo."
+msgid "Normally a delicacy, it needs a little… something."
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bone"
@@ -26657,6 +27822,78 @@ msgstr ""
 "echarse a perder, y puede ser usado como ingrediente en muchas comidas y "
 "proyectos."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr ""
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr ""
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr ""
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr ""
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
 msgid_plural "chunks of tainted meat"
@@ -26858,14 +28095,8 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
-"Es una enorme masa gruesa de carne que recuerda superficialmente al corazón "
-"de un mamífero, cubierto de estrías y del tamaño de tu cabeza. Sigue estando"
-" lleno de...., eh... lo que sea que sirva de sangre en un jabberwock, y se "
-"siente pesado en tus manos. Después de todo lo que viste por estos días, no "
-"podés evitar recordar ese antiguo dicho de comerse el corazón de tus "
-"enemigos..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "desiccated putrid heart"
@@ -26882,7 +28113,7 @@ msgstr ""
 " ha sido cordato y drenado de sangre. Podría comerlo si tenés hambre, pero "
 "tiene una apariencia *desagradble*."
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] "leche sin pasteurizar"
@@ -27229,7 +28460,7 @@ msgstr[1] ""
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
 msgstr ""
 
@@ -28200,11 +29431,12 @@ msgstr "Son aros de ananá enlatados con agua. Bastante sabrosos."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
-msgstr[0] "bebida de limonada"
-msgstr[1] "raciones de bebida de limonada"
+msgid_plural "lemonade drink mix"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -29029,8 +30261,8 @@ msgstr[1] "golosinas de mantequilla de maní"
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
-msgstr "Es un puñado de bocaditos de mantequilla de maní... ¡tus favoritos!"
+msgid "A handful of peanut butter cups… your favorite!"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate candy"
@@ -29156,10 +30388,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr ""
-"Un bizcochuelo bañado en el glaseado más grueso que viste en tu vida. "
-"Alguien le escribió guarangadas con signos de pregunta arriba..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate-covered coffee bean"
@@ -29204,9 +30434,8 @@ msgstr[1] "medallones de menta"
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
 msgstr ""
-"Es un puñado de medallones de menta recubiertos con chocolate... ¡rico!"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Necco wafers"
@@ -29883,6 +31112,17 @@ msgstr ""
 "natural, curiosamente gomoso y no muy sabroso, pero igual te llenará. Es lo "
 "opuesto de apetitoso pero bueno para tu estómago."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr ""
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "sardina enlatada"
@@ -31704,8 +32944,8 @@ msgstr[1] ""
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31771,13 +33011,8 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
-"Es una cápsula roja de gel del tamaño de tu pulgar, rellena con un líquido "
-"espeso y aceitoso que cambia entre el púrpura y el negro a intervalos "
-"impredecibles, lleno de lunares grises pequeños. Pensando el lugar de donde "
-"lo sacaste, puede ser muy potente, o muy experimental. Al sostenerlo, todos "
-"los pequeños dolores parecen desaparecer, solo por un momento..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattail jelly"
@@ -32248,11 +33483,9 @@ msgstr "sabor abstracto de mutágeno iv"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
 msgstr ""
-"Es un mutágeno super-concentrado. Necesitás una jeringa para inyectarlo... "
-"si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagenic serum"
@@ -32266,10 +33499,8 @@ msgstr "suero alfa"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
+"to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno super-concentrado muy similar a la sangre. Necesitás una "
-"jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "beast serum"
@@ -32279,10 +33510,8 @@ msgstr "suero de bestia"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado tan rojo como la capa de un torero. "
-"Necesitás una jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bird serum"
@@ -32292,11 +33521,8 @@ msgstr "suero de pájaro"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
+"need a syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno super-concentrado con el color de los cielos pre-"
-"cataclísmicos. Necesitás una jeringa para inyectarlo... si realmente querés "
-"hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattle serum"
@@ -32306,10 +33532,8 @@ msgstr "suero de ganado"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
+"inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno super-concentrado con el color del pasto. Necesitás una "
-"jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cephalopod serum"
@@ -32319,10 +33543,8 @@ msgstr "suero de cefalópodo"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
+"it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado tan negro como la tinta. Necesitás una "
-"jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chimera serum"
@@ -32332,10 +33554,8 @@ msgstr "suero de quimera"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado que vibra iridiscente. Necesitás una jeringa"
-" para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "elf-a serum"
@@ -32345,10 +33565,8 @@ msgstr "suero elf-a"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado de un verde silvano chocante. Necesitás una "
-"jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "feline serum"
@@ -32358,10 +33576,8 @@ msgstr "suero de felino"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado, amarillo y altamente reflectivo. Necesitás "
-"una jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "fish serum"
@@ -32371,11 +33587,8 @@ msgstr "suero de pez"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
+"top.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno super-concentrado con el color del océano, con espuma blanca "
-"encima. Necesitás una jeringa para inyectarlo... si realmente querés "
-"hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "insect serum"
@@ -32385,10 +33598,8 @@ msgstr "suero de insecto"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado de un hermoso color ámbar. Necesitás una "
-"jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lizard serum"
@@ -32398,10 +33609,8 @@ msgstr "suero de lagarto"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado que cambia entre diferentes tonalidades de "
-"verde. Necesitás una jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lupine serum"
@@ -32411,10 +33620,8 @@ msgstr "suero de lobuno"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
+" inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado tan blanco como la luna llena. Necesitás una"
-" jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "medical serum"
@@ -32424,10 +33631,8 @@ msgstr "suero médico"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado que parece una mezcla de fluidos corporales."
-" Necesitás una jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "plant serum"
@@ -32437,10 +33642,8 @@ msgstr "suero de planta"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado que parece puré de espinaca. Necesitás una "
-"jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raptor serum"
@@ -32450,11 +33653,8 @@ msgstr "suero de raptor"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
+"at it.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado que parece cambiar ligeramente cada vez que "
-"lo mirás. Necesitás una jeringa para inyectarlo... si realmente querés "
-"hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "rat serum"
@@ -32464,10 +33664,8 @@ msgstr "suero de rata"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado de un beige bastante poco atractivo. "
-"Necesitás una jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "slime serum"
@@ -32477,11 +33675,8 @@ msgstr "suero de slime"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno super-concentrado que se parece mucho a la viscosidad negra "
-"que tienen los zombis en los ojos. Necesitás una jeringa para inyectarlo... "
-"si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "spider serum"
@@ -32491,10 +33686,8 @@ msgstr "suero de araña"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado con filamentos pálidos en suspensión. "
-"Necesitás una jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "troglobite serum"
@@ -32504,10 +33697,8 @@ msgstr "suero de troglobio"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado que parece esconderse ante la luz. Necesitás"
-" una jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "ursine serum"
@@ -32517,10 +33708,8 @@ msgstr "suero de osuno"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
+"thick.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado del color de la miel, e igual de espeso. "
-"Necesitás una jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mouse serum"
@@ -32530,10 +33719,8 @@ msgstr "suero de ratón"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado que parece metal líquido. Necesitás una "
-"jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagen"
@@ -32547,10 +33734,8 @@ msgstr "sangre coagulada"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
+"bubble with an intelligence of its own…"
 msgstr ""
-"Es un líquido espeso y rojo. Tiene una apariencia y olor desagradables, y "
-"parece bullir con inteligencia propia..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "alpha mutagen"
@@ -32753,23 +33938,23 @@ msgstr ""
 "probablemente es mucho más seguro de tomar ahora que antes."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
+msgid "pine nuts"
+msgid_plural "pine nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
-msgstr[0] "puñado de gálbulos"
-msgstr[1] "puñado de gálbulos"
+msgid "junipers"
+msgid_plural "junipers"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -32779,68 +33964,82 @@ msgstr ""
 "tiene un sabor similar al romero."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
 msgstr "Es un puñado de frutos secos del árbol del pistacho, sin cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
-msgstr[0] "puñado de pistachos tostados"
-msgstr[1] "puñados de pistachos tostados"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr "Es un puñado de frutos secos tostados del árbol del pistacho."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
 msgstr "Es un puñado de frutos secos del almendro, sin cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
-msgstr[0] "puñado de almendras tostadas"
-msgstr[1] "puñados de almendras tostadas"
+msgid "almond pulp"
+msgid_plural "almond pulp"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted almonds
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
 msgstr "Es un puñado de frutos secos tostados del almendro."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
+msgid "cashews"
+msgid_plural "cashews"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr "Es un puñado de castañas de cajú saladas."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -32850,45 +34049,45 @@ msgstr ""
 " No tienen cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
-msgstr[0] "puñado de nueces de pacana tostadas"
-msgstr[1] "puñados de nueces de pacana tostadas"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr "Es un puñado de frutos secos tostados del árbol del pacano."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
-msgstr[0] "puñado de maníes sin cáscara"
-msgstr[1] "puñados de maníes sin cáscara"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr "Son unos maníes salados sin cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
+msgid "beech nuts"
+msgid_plural "beech nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
-msgstr[0] "puñado de nueces sin cáscara"
-msgstr[1] "puñados de nueces sin cáscara"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -32896,23 +34095,24 @@ msgid ""
 msgstr "Es un puñado de nueces crudas y duras de un nogal. Están sin cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
-msgstr[0] "puñado de nueces tostadas"
-msgstr[1] "puñados de nueces tostadas"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr "Es un puñado de frutos secos tostados del nogal."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
-msgstr[0] "puñado de castañas sin cáscara"
-msgstr[1] "puñados de castañas sin cáscara"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -32921,23 +34121,25 @@ msgstr ""
 "Es un puñado de nueces crudas y duras de un castaño. Están sin cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
-msgstr[0] "puñado de castañas tostadas"
-msgstr[1] "puñados de castañas tostadas"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr "Es un puñado de frutos secos tostados del castaño."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -32946,45 +34148,47 @@ msgstr ""
 "Es un puñado de frutos secos crudos y duros de un roble. Están sin cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
-msgstr[0] "puñado de avellanas tostadas"
-msgstr[1] "puñados de avellanas tostadas"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr "Es un puñado de frutos secos tostados del avellano."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
-msgstr[0] "puñado de nueces hickory sin cáscara"
-msgstr[1] "puñados de nueces hickory sin cáscara"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -32994,12 +34198,13 @@ msgstr ""
 "cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
-msgstr[0] "puñado de nueces hickory tostadas"
-msgstr[1] "puñados de nueces hickory tostadas"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr "Es un puñado de nueces tostadas de un nogal americano o hickory."
@@ -33015,12 +34220,12 @@ msgstr ""
 "Es una deliciosa ambrosía de nuez hickory. Una bebida digna de los dioses."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
-msgstr[0] "puñado de bellotas"
-msgstr[1] "puñados de bellotas"
+msgid "acorns"
+msgid_plural "acorns"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
@@ -33030,12 +34235,12 @@ msgstr ""
 "gustan, pero para vos no es bueno comerlas así como están."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
-msgstr[0] "puñado de bellotas tostadas"
-msgstr[1] "puñados de bellotas tostadas"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr "Es un puñado de frutos secos tostados del roble."
@@ -33642,11 +34847,12 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
-msgstr[0] "soylent verde en polvo"
-msgstr[1] "raciones de soylent verde en polvo"
+msgid_plural "soylent green powder"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -33697,11 +34903,11 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
-msgstr[0] "proteína en polvo"
-msgstr[1] "raciones de proteína en polvo"
+msgid_plural "protein powder"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -33777,67 +34983,67 @@ msgid "Very sour citrus.  Can be eaten if you really want."
 msgstr "Cítrico muy agrio. Se puede comer si querés."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
-msgstr[0] "puñado de moras azules"
-msgstr[1] "puñado de moras azules"
+msgid "blueberries"
+msgid_plural "blueberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr "Son azules, pero eso no significa que sean de la realeza."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
-msgstr[0] "puñado de frutillas"
-msgstr[1] "puñado de frutillas"
+msgid "strawberries"
+msgid_plural "strawberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr "Es una baya sabrosa y jugosa. A menudo crece silvestre en los campos."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
-msgstr[0] "puñado de arándanos"
-msgstr[1] "puñado de arándanos"
+msgid "cranberries"
+msgid_plural "cranberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr "Arándanos rojos y agrios. Buenos para la salud."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
-msgstr[0] "puñado de frambuesas"
-msgstr[1] "puñado de frambuesas"
+msgid "raspberries"
+msgid_plural "raspberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "Una frambuesa roja y dulce."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
-msgstr[0] "puñado de arándanos agrios"
-msgstr[1] "puñado de arándanos agrios"
+msgid "huckleberries"
+msgid_plural "huckleberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr "Son arándanos agrios, a menudo confundidos con las moras azules."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
-msgstr[0] "puñado de moras"
-msgstr[1] "puñado de moras"
+msgid "mulberries"
+msgid_plural "mulberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -33847,12 +35053,12 @@ msgstr ""
 " por tener el sabor más fuerte de todas las variedades del mundo."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
-msgstr[0] "puñado de bayas del saúco"
-msgstr[1] "puñado de bayas del saúco"
+msgid "elderberries"
+msgid_plural "elderberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr ""
@@ -33860,12 +35066,12 @@ msgstr ""
 "buenísimas cuando se cocinan."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
-msgstr[0] "puñado de escaramujos"
-msgstr[1] "puñado de escaramujos"
+msgid "rose hips"
+msgid_plural "rose hips"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "Es el fruto de una flor de rosa polinizada."
@@ -33902,12 +35108,12 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "Una fruta cítrica, cuyo gusto va desde lo agrio hasta lo semidulce."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
-msgstr[0] "puñado de cerezas"
-msgstr[1] "puñado de cerezas"
+msgid "cherries"
+msgid_plural "cherries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr "Una fruta dulce y roja que crece en árboles."
@@ -33925,12 +35131,12 @@ msgstr ""
 "digestión."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
-msgstr[0] "puñado de uvas"
-msgstr[1] "puñado de uvas"
+msgid "grapes"
+msgid_plural "grapes"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr "Es un racimo de jugosas uvas."
@@ -33983,12 +35189,12 @@ msgid "A large and very sweet fruit."
 msgstr "Una fruta grande y muy dulce."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
-msgstr[0] "puñado de zarzamoras"
-msgstr[1] "puñado de zarzamoras"
+msgid "blackberries"
+msgid_plural "blackberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "Un primo oscuro de la frambuesa."
@@ -34035,16 +35241,27 @@ msgstr ""
 " delicioso."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
-msgstr[0] "puñado de damascos"
-msgstr[1] "puñado de damascos"
+msgid "apricots"
+msgid_plural "apricots"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "Es una fruta de cáscara suave, parecida al durazno."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr ""
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr ""
@@ -34235,11 +35452,11 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -34249,11 +35466,11 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
+msgid_plural "chicory"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -34377,12 +35594,12 @@ msgstr ""
 "así cruda, pero está buenísima para cocinar."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
-msgstr[0] "puñado de dientes de león"
-msgstr[1] "puñados de dientes de león"
+msgid "dandelions"
+msgid_plural "dandelions"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -34527,12 +35744,12 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -36488,8 +37705,8 @@ msgstr[1] ""
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36501,7 +37718,7 @@ msgstr[1] ""
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
 msgstr ""
 
@@ -36978,7 +38195,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36991,7 +38208,7 @@ msgstr[1] ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -37088,8 +38305,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -37100,8 +38317,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -37112,8 +38330,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -37124,8 +38342,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -37136,9 +38354,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -37173,7 +38391,7 @@ msgstr[1] ""
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -37190,6 +38408,16 @@ msgid ""
 " properties."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr ""
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
 msgstr "cuerda resinosa"
@@ -37931,15 +39159,6 @@ msgstr[1] "harina de arroz"
 msgid "This rice flour is useful for baking."
 msgstr "Esta harina de arroz es útil para cocinar."
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr ""
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr ""
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr "suero de resucitación"
@@ -38256,8 +39475,8 @@ msgstr[1] ""
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -38269,8 +39488,8 @@ msgstr[1] ""
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -38850,8 +40069,8 @@ msgstr[1] ""
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -39458,8 +40677,8 @@ msgstr[1] ""
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -39471,11 +40690,9 @@ msgstr[1] "zincita"
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr ""
-"Es un pedazo de zincita. Puede ser refinado para crear óxido de zinc y luego"
-" en zinc por reducción con una fuente de carbono."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hickory root"
@@ -39489,12 +40706,12 @@ msgid "A root from a hickory tree.  It has an earthy smell."
 msgstr "Es una raíz de un nogal americano o hickory. Tiene olor a tierra."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr ""
@@ -39502,24 +40719,24 @@ msgstr ""
 "con sus cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
+msgid "pecans"
+msgid_plural "pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr ""
 "Es un puñado de frutos secos duros del pacano, todavía con sus cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
+msgid "pistachios"
+msgid_plural "pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr ""
@@ -39527,60 +40744,60 @@ msgstr ""
 "cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
+msgid "almonds"
+msgid_plural "almonds"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
 msgstr ""
 "Es un puñado de frutos secos duros del almendro, todavía con sus cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
+msgid "peanuts"
+msgid_plural "peanuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr ""
 "Es un puñado de frutos secos duros del maní, todavía con sus cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr ""
 "Es un puñado de frutos secos duros del avellano, todavía con sus cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
+msgid "chestnuts"
+msgid_plural "chestnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr ""
 "Es un puñado de frutos secos duros del castaño, todavía con sus cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
+msgid "walnuts"
+msgid_plural "walnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr ""
@@ -39725,7 +40942,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr ""
 
@@ -39749,7 +40966,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr ""
 
@@ -39855,6 +41072,12 @@ msgstr "músculo"
 msgid "wind"
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "algo para fumar y algo para encender fuego"
@@ -39909,7 +41132,7 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -40063,8 +41286,8 @@ msgstr[1] ""
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -40397,6 +41620,18 @@ msgstr ""
 " puede ser útil para construir paredes más resistentes y cosas de ese "
 "estilo."
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -40541,10 +41776,8 @@ msgstr[1] "televisores"
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
+msgid "A large LCD television, full of delicious electronics."
 msgstr ""
-"Un televisor grande de tubo de rayos catódicos, lleno de deliciosas piezas "
-"electrónicas."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -41009,6 +42242,19 @@ msgstr ""
 "Es un módulo diseñado para recibir muchas formas de señales. Útil para "
 "fabricar equipos de comunicación."
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -41461,10 +42707,8 @@ msgstr[1] "tarjetas de memoria SD científicas"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
+"encrypted.  Looks *Interesting*, though…"
 msgstr ""
-"Esta tarjeta de memoria parece estar relacionada con el 'XEDRA', y "
-"seguramente está encriptada. Parece * interesante *, igual..."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hand mirror"
@@ -41547,12 +42791,13 @@ msgstr ""
 "que todavía no han sido comidas por animales."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -41852,10 +43097,10 @@ msgstr ""
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -41909,10 +43154,8 @@ msgstr[1] "colillas de cigarrillos"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr ""
-"Lo que alguna vez fue un maravilloso y adictivo cilindro de hojas secas de tabaco, ahora es solo un pedazo apestoso de basura. ¡Qué tragedia!\n"
-"Si juntas varias colillas, tal vez te puedas armar un cigarrillo nuevo. Si estás dispuesto a llegar tan lejos..."
 
 #. ~ Use action msg for joint.
 #: lang/json/GENERIC_from_json.py
@@ -41962,11 +43205,11 @@ msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
-msgstr[0] "puñado de tabaco crudo"
-msgstr[1] "puñados de tabaco crudo"
+msgid_plural "raw tobacco"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -42023,12 +43266,6 @@ msgid ""
 "panel, if you can find one."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] "lámina de neopreno"
-msgstr[1] "láminas de neopreno"
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -42050,7 +43287,7 @@ msgid ""
 "A laser cannon stripped from the barrel of a TX-5LR Cerberus laser turret.  "
 "Unusable as a weapon on its own without the necessary parts."
 msgstr ""
-"Un cañón láser que pertenecía a una torreta láser TX-5LR Cerberus. No se "
+"Es un cañón láser que pertenecía a una torreta láser TX-5LR Cerberus. No se "
 "puede usar como arma así solo sin las partes necesarias."
 
 #: lang/json/GENERIC_from_json.py
@@ -42532,15 +43769,6 @@ msgstr ""
 "Un hacha de una sola mano. Es útil como arma de cuerpo a cuerpo, y se puede "
 "usar para cortar cosas y como martillo."
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr ""
-"Es una piedra del tamaño de una pelota de tenis. Funciona bien como arma de "
-"cuerpo a cuerpo, y también se puede tirar a los enemigos."
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -43169,10 +44397,8 @@ msgstr[1] "elásticos"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
+" an awful lot like a bow.  You can barely bend it…"
 msgstr ""
-"Es un elástico grande y resistente. Probablemente de un auto o camión, y se "
-"parece mucha a un arco. Apenas si podés doblarlo..."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hydrangea"
@@ -43850,7 +45076,7 @@ msgstr[1] "cafeteras atómicas"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
@@ -43865,7 +45091,9 @@ msgstr[1] "lámparas atómicas"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "Cerrar tapa"
 
@@ -43893,7 +45121,9 @@ msgstr[1] "lámparas atómicas (cubiertas)"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "Abrir tapa"
 
@@ -44195,8 +45425,8 @@ msgstr[1] "ganchos de agarre"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -45097,9 +46327,7 @@ msgstr[1] ""
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
+msgid "A complete guide to Wing Chun Kung-fu."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
@@ -45113,8 +46341,8 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -46288,6 +47516,20 @@ msgstr[1] ""
 msgid "This is a slip of paper signed by the issuer."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -46632,11 +47874,9 @@ msgstr[1] "tenedores"
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
 msgstr ""
-"Un tenedor, si se lo clavás a algo te lo podés comer ahí nomás. Pará... "
-"mejor no."
 
 #: lang/json/GENERIC_from_json.py
 msgid "plastic fork"
@@ -47899,7 +49139,7 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
 
@@ -48380,8 +49620,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
 msgstr ""
 
 #. ~ Description for estoc
@@ -48493,21 +49733,18 @@ msgstr ""
 "a su hoja flexible y punta sin filo."
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
-msgstr[0] "espada de esgrima"
-msgstr[1] "espadas de esgrima"
+msgid "fencing épée"
+msgid_plural "fencing épées"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
 msgstr ""
-"Un arma utilizada en el esgrima, el más noble de todos los deportes. Esta "
-"espada es la más pesada y rígida de todas las armas del esgrima, y por lo "
-"tanto puede ser la más útil en esta situación."
 
 #: lang/json/GENERIC_from_json.py
 msgid "fencing saber"
@@ -48519,11 +49756,53 @@ msgstr[1] "sables de esgrima"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
+"is marginally shorter than the foil and épée, but no less effective."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
 msgstr ""
-"Un arma utilizada en el esgrima, el más noble de todos los deportes. Este "
-"sable es bastante más corto que el florete y la espada de esgrima, pero no "
-"es menos eficaz."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
@@ -48827,11 +50106,8 @@ msgstr[1] "lingotes de aluminio"
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
+"down to a powder, for more… high-profile applications."
 msgstr ""
-"Un pequeño lingote de aluminio, normalizado para un proceso posterior. "
-"Ligero pero duradero, puede ser moldeado en diferentes formas para la "
-"construcción o molido en polvo, para usos más... notorios."
 
 #: lang/json/GENERIC_from_json.py
 msgid "scrap copper"
@@ -49168,6 +50444,46 @@ msgid ""
 " can also serve as an improvised stabbing weapon, but will break quickly."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -50795,7 +52111,7 @@ msgstr[1] ""
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -50807,8 +52123,8 @@ msgstr[1] ""
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -51995,6 +53311,27 @@ msgid ""
 "art."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr ""
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -52499,6 +53836,138 @@ msgid_plural "dao +2s"
 msgstr[0] ""
 msgstr[1] ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
@@ -52776,6 +54245,21 @@ msgid ""
 "to land astoundingly powerful blows."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -52858,6 +54342,19 @@ msgid ""
 "prized for their beauty and power."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -52884,100 +54381,6 @@ msgid ""
 "scales could make a suit of armor as hard as steel and half as heavy."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr ""
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -53052,6 +54455,56 @@ msgstr[1] ""
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr ""
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] "Gungnir"
+msgstr[1] "Gungnirs"
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] "Laevateinn"
+msgstr[1] "Laevateinns"
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -53297,8 +54750,8 @@ msgstr[1] ""
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -53312,7 +54765,7 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -54078,8 +55531,34 @@ msgstr[1] ""
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -54097,6 +55576,17 @@ msgid ""
 "rock and lava everywhere."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
@@ -55044,12 +56534,6 @@ msgstr ""
 "Una réplica de Mjölnir, el martillo de Thor. Un rumor dice que es capaz de "
 "aplanar montañas de un solo golpe. Está decorado con adornos de oro y plata."
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] "Gungnir"
-msgstr[1] "Gungnirs"
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -56117,6 +57601,11 @@ msgstr "COSAS QUÍMICAS"
 msgid "SPARE PARTS"
 msgstr "REPUESTOS"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "RECIPIENTES"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "ARTEFACTOS"
@@ -56127,6 +57616,311 @@ msgstr "ARTEFACTOS"
 msgid "ARMOR"
 msgstr "ARMADURA"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "OBJETOS PUESTOS"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "ARMA EMPUÑADA"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr "Cosas: Desordenadas"
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr "Cosas: Comida"
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr "Cosas: P.Comida"
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr "Cosas: Bebidas"
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr "Cosas: P.Bebidas"
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr "Lugar para bebidas perecederas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr ""
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr "Cosas: Armas de Fuego"
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr "Cosas: Cargadores"
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr "Lugar para cargadores de armas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr "Cosas: Munición"
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr "Lugar para la munición."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr "Cosas: Armas"
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr "Lugar para las armas de cuerpo a cuerpo."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr "Cosas: Herramientas"
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr "Lugar para herramientas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr "Cosas: Ropa"
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr "Cosas: Ropa Sucia"
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr "Lugar para la ropa sucia."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr "Cosas: Drogas"
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr "Lugar para drogas y otros objetos médicos."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr "Cosas: Libros"
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr "Lugar para libros y revistas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr "Cosas: Modificaciones"
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr "Lugar para modificaciones de armas de fuego y similares."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr "Cosas: Mutágenos"
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr "Lugar para mutágenos, sueros y purificantes."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr "Cosas: Biónicos"
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr "Cosas: Partes de Vehículos"
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr "Lugar para partes de vehículos."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr "Cosas: Otros"
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr "Lugar para otros objetos varios."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr "Cosas: Combustible"
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr ""
+"Lugar para nafta, gasoil, aceite para lámpara y otras sustancias utilzadas "
+"como combustible."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr "Cosas: Semillas"
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr "Lugar para semillas, tallos y similares."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr "Cosas: Químicos"
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr "Lugar para químicos."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr "Cosas: S.Partes"
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr "Lugar para partes sueltas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr "Cosas: Artefactos"
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr "Lugar para artefactos."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr ""
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr "Cosas: Armadura"
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr "Cosas: Armadura Sucia"
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr "Lugar para armaduras sucias."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr "Cosas: Madera"
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr "Lugar para leña y objetos que pueden usarse como tal."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr ""
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr "Cosas: Ignorar"
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr ""
+"Los objetos dentro de esta zona son ignorados por la acción \"ordenar "
+"cosas\"."
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -56348,7 +58142,7 @@ msgstr[1] ""
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
 msgstr ""
 
@@ -56744,8 +58538,8 @@ msgstr "cargador de tambor H&K G3"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
-msgstr "Es un cargador de caja de 50 balas para el rifle H&K G3."
+msgid "A 50-round drum magazine for the H&K G3 rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "H&K G3 magazine"
@@ -56790,8 +58584,8 @@ msgstr "cargador de tambor FN SCAR-H"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
-msgstr "Es un cargador de tambor de 50 balas para le rifle FN SCAR-H."
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "FN SCAR-H magazine"
@@ -56892,17 +58686,6 @@ msgstr ""
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr ""
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "cargador Taurus .38"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr ""
-"Es un cargador compacto de caja de acero para usar con la pistola Taurus Pro"
-" .38."
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr ""
@@ -56976,6 +58759,16 @@ msgstr ""
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr ""
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr ""
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr ""
@@ -59976,7 +61769,7 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
+"appears to have a mininuke inside.  If this is targeting you…  Run."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -60511,11 +62304,8 @@ msgstr[1] ""
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
+"off in popularity… and price."
 msgstr ""
-"Estas cosas fueron consideradas alguna vez como una plaga que no valía la "
-"pena comerse. Después, algún genio del marketing empezó a venderlas como una"
-" exquisitez y se volvieron muy populares... y caras."
 
 #: lang/json/MONSTER_from_json.py
 msgid "crayfish"
@@ -60527,10 +62317,8 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
+"water, and some spicy seasonings…"
 msgstr ""
-"Si pudieras conseguir una buena cantidad de estos, una olla grande con agua "
-"hirviendo, y algunos condimentos..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "Blinky"
@@ -61978,10 +63766,8 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
+"makes it sound… hungry."
 msgstr ""
-"Un roedor con la cola como un gusano, largos bigotes ojos pequeños y "
-"brillantes. La manera en que chilla la hace parecer... hambrienta."
 
 #: lang/json/MONSTER_from_json.py
 msgid "lamb"
@@ -62495,11 +64281,22 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
 msgstr ""
-"Este boomer, hinchado y listo para explotar como todos, se ha fortalecido y "
-"solidificado. La bilis que gotea de su boca también parece haber cambiado..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
@@ -62555,7 +64352,7 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -63466,15 +65263,11 @@ msgstr[1] "Shia LaBeouf"
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
-"Viviendo en el bosque, \n"
-"matando por deporte, \n"
-"comiéndose todos los cadáveres, \n"
-"es el verdadero caníbal Shia LaBeouf."
 
 #: lang/json/MONSTER_from_json.py
 msgid "shoggoth"
@@ -63769,7 +65562,7 @@ msgstr[1] ""
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr ""
@@ -63962,19 +65755,13 @@ msgstr[1] ""
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
 msgstr ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
-"Are closing in to seal your doom!\n"
-"\n"
-"El bailarín ni siquiera nota tu presencia, parece como si algo lo estuviera controlando."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie dog"
@@ -64296,15 +66083,11 @@ msgstr[1] ""
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
-"The evil of the thriller."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie snapper"
@@ -66010,8 +67793,8 @@ msgstr ""
 "apestosa."
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -66643,21 +68426,23 @@ msgid "The black pudding burns you with acid!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
+msgid "krabgek"
+msgid_plural "krabgeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
 msgstr ""
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
+msgid "The krabgek gazes at %3$s!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -66705,8 +68490,47 @@ msgstr[1] ""
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -68936,9 +70760,9 @@ msgid "Reveals an area around you on the overmap"
 msgstr ""
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
-msgstr "Tenés una visión del área circundante..."
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
+msgstr ""
 
 #: lang/json/SPELL_from_json.py
 msgid "Artifact Firestorm"
@@ -69143,8 +70967,8 @@ msgstr ""
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69182,7 +71006,7 @@ msgstr ""
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -69231,6 +71055,20 @@ msgstr ""
 msgid "Translocates the user to an attuned gate."
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr ""
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr ""
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr ""
@@ -69280,7 +71118,7 @@ msgstr ""
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69437,7 +71275,7 @@ msgstr ""
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr ""
 
@@ -69448,8 +71286,8 @@ msgstr ""
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69496,8 +71334,8 @@ msgstr ""
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69523,6 +71361,10 @@ msgstr ""
 msgid "Lava Bomb"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr ""
@@ -69530,7 +71372,7 @@ msgstr ""
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr ""
@@ -69542,9 +71384,9 @@ msgstr ""
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69617,7 +71459,7 @@ msgstr ""
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -69660,8 +71502,8 @@ msgstr ""
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py lang/json/effects_from_json.py
@@ -69680,6 +71522,15 @@ msgstr ""
 msgid "Fox's Cunning"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr ""
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr ""
@@ -69719,8 +71570,8 @@ msgstr ""
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69781,8 +71632,8 @@ msgstr ""
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69809,6 +71660,10 @@ msgstr ""
 msgid "Mirror Image"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr ""
@@ -70374,6 +72229,46 @@ msgstr ""
 "utilizarlo cómodamente en la cabeza o en un casco. Está encendido, "
 "consumiendo gradualmente sus baterías. Usalo para apagarlo."
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -70464,8 +72359,8 @@ msgstr[1] ""
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
 
@@ -71596,13 +73491,11 @@ msgstr "Las orejeras se quedaron sin batería."
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
 msgstr ""
-"Es un par de orejeras que utilizan los tiradores. Están apagadas. Bloquean "
-"los sonidos que sobrepasan una cierta cantidad de decibeles, asumiendo que "
-"tiene batería."
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -72067,6 +73960,213 @@ msgid ""
 "power."
 msgstr ""
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr ""
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -72412,9 +74512,9 @@ msgstr[1] ""
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
 
@@ -72547,11 +74647,9 @@ msgstr[1] "varas de clarividencia"
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr ""
-"Objeto para probar la eitqueta aep_clairvoyance_plus. Si te aparece en "
-"cualquier lugar, es un bug."
 
 #: lang/json/TOOL_from_json.py
 msgid "boulder anvil"
@@ -72872,7 +74970,7 @@ msgstr "Encendés la mecha del/a %s."
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr ""
@@ -72893,8 +74991,8 @@ msgstr "Ya encendiste la mecha - ¿qué estás esperando?"
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -72906,7 +75004,7 @@ msgstr[1] ""
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
@@ -72921,8 +75019,8 @@ msgstr[1] ""
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr ""
 
@@ -72942,8 +75040,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -72956,8 +75054,8 @@ msgstr[1] ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -72968,9 +75066,9 @@ msgstr[1] ""
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "Luz"
 
@@ -73004,7 +75102,7 @@ msgstr ""
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
+"  The face shifts."
 msgstr ""
 
 #. ~ Description for battle axe
@@ -73167,6 +75265,27 @@ msgstr ""
 "Es una lata de hojalata llena hasta el tope de pólvora negra y con un mecha "
 "encendida."
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] "cocina de indigente (enc.)"
+msgstr[1] "cocinas de indigente (enc.)"
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "Las brasas se extinguieron."
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -73426,8 +75545,8 @@ msgstr[1] ""
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py lang/json/furniture_from_json.py
@@ -73439,8 +75558,8 @@ msgstr[1] ""
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -73832,12 +75951,9 @@ msgstr[1] "cuchillos eléctricos (apag.)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
 msgstr ""
-"Es un cuchillo eléctrico de carne, alimentado con baterías. Son dos "
-"cuchillas serradas que vibran juntas para cortar cualquier cosas, desde pavo"
-" hasta jamón... ¡incluso zombis!"
 
 #: lang/json/TOOL_from_json.py
 msgid "electric carver (on)"
@@ -74026,7 +76142,7 @@ msgstr[1] ""
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr ""
@@ -74546,10 +76662,8 @@ msgstr[1] "pares de esposas electrónicas"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-"Es un par de esposas electrónicas, usada por la policía y los antidisturbots para detener a los prisioneros. Tiene una sirena que continuamente identifica al detenido como un criminal arrestado y alerta a la policía humana. Esperá que lleguen, no intentes escapar o quitarte las esposas, porque recibirás un shock eléctrico.\n"
-"Sin embargo, como los únicos policías que podrían venir son muertos vivientes, te vas a tener que quedar esperando mucho tiempo, excepto que se te ocurra algo..."
 
 #: lang/json/TOOL_from_json.py
 msgid "entrenching tool"
@@ -76750,8 +78864,8 @@ msgstr[1] ""
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -77784,11 +79898,8 @@ msgstr ""
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr ""
-"Es un dispositivo explosivo casero, que consiste en una gran jarra de "
-"plástico llena de pólvora negra y chatarra, equipada con una mecha larga. "
-"Usala para encender la mecha. Debería explotar en pocos minutos..."
 
 #: lang/json/TOOL_from_json.py
 msgid "active black gunpowder charge"
@@ -78390,37 +80501,6 @@ msgid_plural "hobo stoves"
 msgstr[0] "cocina de indigente"
 msgstr[1] "cocinas de indigente"
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr ""
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "¡Necesitás una fuente de fuego!"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr ""
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] "cocina de indigente (enc.)"
-msgstr[1] "cocinas de indigente (enc.)"
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "Las brasas se extinguieron."
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -78609,8 +80689,8 @@ msgstr[1] ""
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -78993,7 +81073,7 @@ msgstr ""
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -79011,7 +81091,7 @@ msgstr[1] ""
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -79101,9 +81181,9 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -79155,7 +81235,7 @@ msgstr ""
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -79184,8 +81264,8 @@ msgstr ""
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
@@ -79211,7 +81291,7 @@ msgstr ""
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
 msgstr ""
@@ -79235,8 +81315,8 @@ msgstr ""
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
 msgstr ""
 
@@ -79259,8 +81339,8 @@ msgstr ""
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
 msgstr ""
 
@@ -79284,9 +81364,9 @@ msgstr ""
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -79308,7 +81388,7 @@ msgstr ""
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
 msgstr ""
@@ -79367,7 +81447,7 @@ msgstr ""
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -79397,8 +81477,8 @@ msgstr ""
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
@@ -79424,10 +81504,10 @@ msgstr ""
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
 
@@ -79789,7 +81869,7 @@ msgstr[1] ""
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
+"of a stick.  However it's quite fragile."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -79895,6 +81975,21 @@ msgstr ""
 "Es un cuchillo de combate militar. Es liviano y extremadamente filoso, y "
 "puede ser letal en las manos indicadas o cuando se pone como bayoneta."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -80288,6 +82383,21 @@ msgstr ""
 "Una bayoneta espada es un arma cortante larga que puede ser adjuntada al "
 "frente de un arma de fuego o de una ballesta, convirtiéndola en una lanza."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -80398,6 +82508,57 @@ msgstr ""
 "Es una enorme espada de dos manos curvada de origen japonés. Es "
 "sorprendentemente liviana para el tamaño que tiene."
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -80804,6 +82965,34 @@ msgstr ""
 "Es un pedazo de plástico. Puede ser usado para fabricar, reparar o reforzar "
 "objetos de plástico."
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -81320,12 +83509,8 @@ msgstr[1] "radios handy"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
 msgstr ""
-"Esto es una radio con una unidad de transmisión. La podés usar para "
-"contactarte con alguien que también tenga una. Lamentablemente, no parece "
-"que haya nadie que use una por estos días..."
 
 #: lang/json/TOOL_from_json.py
 msgid "remote vehicle controller"
@@ -81520,7 +83705,7 @@ msgstr[1] ""
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
@@ -81725,7 +83910,7 @@ msgstr[1] "cables reforzados"
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr ""
 
@@ -82144,7 +84329,7 @@ msgstr ""
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr ""
 
@@ -82175,7 +84360,7 @@ msgstr[1] ""
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -83315,12 +85500,6 @@ msgstr ""
 "Es un palo que ha sido recortado para funcionar como mecanismo disparador de"
 " una trampa de lazo."
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] "Laevateinn"
-msgstr[1] "Laevateinns"
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -84671,6 +86850,17 @@ msgid ""
 " terribly when not on a rail."
 msgstr ""
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr ""
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr ""
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "rueda de moto"
@@ -85084,6 +87274,10 @@ msgstr ""
 msgid "cranking"
 msgstr ""
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr ""
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr ""
@@ -85364,6 +87558,10 @@ msgstr "flechas"
 msgid "pebbles"
 msgstr "piedritas"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "piedras"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr ""
@@ -85727,7 +87925,7 @@ msgstr "Placas de Aleación - Brazos"
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -85765,7 +87963,7 @@ msgstr "Placas de Aleación - Piernas"
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -86112,17 +88310,20 @@ msgstr "Quemador de Etanol"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
 msgstr ""
-"Podés usar alcohol como combustible de una manera muy eficiente. Sin "
-"embargo, sufrirás los efectos embriagantes de la sustancia."
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "Aero-Vaporador"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr ""
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "Córnea de Diamante"
@@ -86404,10 +88605,10 @@ msgstr ""
 "causar algunos efectos secundarios feos si se lo apaga."
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "Mini-Lanzallamas"
+msgid "Finger Lighter"
+msgstr ""
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -86439,8 +88640,8 @@ msgstr "Unidad Electromagnética"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -86506,8 +88707,8 @@ msgstr "Nanobots de Reparación"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -86545,11 +88746,8 @@ msgstr ""
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
+"Increases mouth encumbrance by ten."
 msgstr ""
-"No estás muy seguro de como terminó un MCB en tu nariz, pero sin importar "
-"cómo llegó, este biónico mal colocado te dificulta la respiración. Aumenta "
-"la incomodidad de la boca en un punto."
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -86582,7 +88780,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
+"mild optic neuropathy.  Increases eye encumbrance by ten."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -86615,7 +88813,7 @@ msgstr "Almacenamiento de Energía"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
 msgstr ""
@@ -86626,8 +88824,7 @@ msgstr "Almacenamiento de Energía Mk. II"
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
 msgstr ""
 
 #. ~ Description for Power Overload
@@ -86959,12 +89156,8 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
+" by ten, while failing to improve your ability to hold objects whatsoever."
 msgstr ""
-"Los pulgares auto-trabables se traban firmemente (incluso cuando vos no "
-"querés que suceda) y no se sueltan (incluso cuando vos preferirías que se "
-"suelten). Incrementa la incomodidad de las manos en dos puntos, y no mejora "
-"tu habilidad para agarrar objetos."
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -87111,8 +89304,8 @@ msgstr ""
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
@@ -87177,7 +89370,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr ""
@@ -87876,6 +90069,18 @@ msgstr ""
 msgid "Make Woodchip Floor"
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr ""
@@ -88537,6 +90742,10 @@ msgstr ""
 msgid "Build a radio tower console."
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr ""
@@ -89327,6 +91536,42 @@ msgstr ""
 msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr "Soñás con abejas luchando por tu dulce néctar. Mmm."
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr ""
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -90707,6 +92952,25 @@ msgstr "Tus manos no paran de temblar."
 msgid "You tremble"
 msgstr "Temblás."
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr ""
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr ""
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr ""
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "Sangrando"
@@ -91649,6 +93913,26 @@ msgstr "Tu metabolismo se ha vuelto inestable."
 msgid "Your metabolism becomes more stable."
 msgstr "Tu metabolismo se vuelve más estable."
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr ""
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "Encendido"
@@ -91905,6 +94189,17 @@ msgstr "Supercarga"
 msgid "You've been struck by lightning, and feel... different."
 msgstr "Has sido golpeado por un rayo, y te sentís... diferente."
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr ""
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr "Ofensa Religiosa"
@@ -92645,6 +94940,192 @@ msgstr ""
 "era mantenido en el suelo esperando la respuesta de más unidades policiales,"
 " fue destrozado por los muertos vivientes que fueron atraídos a la escena."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr ""
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -92981,6 +95462,167 @@ msgstr ""
 "ayuda y consumiendo lentamente las provisiones que tenía. Dos semanas "
 "después de ser arrastrada a su celda, murió por deshidratación."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr ""
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "Tus Seguidores"
@@ -93145,10 +95787,10 @@ msgid "A small family surviving on their generational land."
 msgstr ""
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
+msgid "New England Church Community"
 msgstr ""
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -93194,103 +95836,211 @@ msgstr ""
 msgid "Dusty"
 msgstr ""
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "It's dusty.  Has no effect - obsolete fault."
+msgstr ""
+
+#. ~ name of mending method for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "Wipe clean"
+msgstr ""
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
+#, python-format
+msgid "You clean you %s."
 msgstr ""
 
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr ""
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr ""
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr ""
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr ""
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
 
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr ""
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr ""
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr ""
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr ""
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr ""
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
 
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
 msgstr ""
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "Se necesita para operar un alternador unido."
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr ""
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr ""
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr "Ayuda a arrancar un motor con bajas temperaturas ambientales."
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr ""
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "Evita arrancar un vehículo sin la llave apropiada."
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr ""
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr ""
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr ""
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr ""
 "Se necesita para bombear y presurizar combustible diésel desde el tanque del"
 " vehículo."
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr ""
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
@@ -93298,11 +96048,23 @@ msgstr ""
 "Un filtro gastado reduce la eficiencia de combustible y aumenta la "
 "generación de humo."
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr ""
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
@@ -93310,33 +96072,81 @@ msgstr ""
 "Un filtro gastado reduce la performance y aumenta la probabilidad de las "
 "detonaciones en el escape."
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr ""
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr "Se necesita para bombear nafta desde el tanque del vehículo."
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr ""
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr "Se necesita para bombear agua hacia un radiador externo o disipador."
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr ""
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "Se necesita para iniciar el motor."
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr ""
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -93823,6 +96633,10 @@ msgstr ""
 msgid "smoke vent"
 msgstr "salida de humo"
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr ""
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
 msgstr ""
@@ -94009,11 +96823,11 @@ msgstr "Es una barricada de caminos. Se usa para cortar calles."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "¡smash!"
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "whump."
 
@@ -94128,7 +96942,8 @@ msgstr "estatua"
 msgid "A carved statue made of stone."
 msgstr ""
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "tomp."
 
@@ -94139,7 +96954,7 @@ msgstr "maniquí"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
 msgstr ""
 
@@ -94528,7 +97343,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "¡crunch!"
 
@@ -94541,7 +97356,7 @@ msgstr "flor de marloss"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
+"and… delicious?"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -94975,9 +97790,9 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -95047,7 +97862,7 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -95215,7 +98030,7 @@ msgstr "cinta para correr"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
+" taken apart for its… parts."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -95241,7 +98056,7 @@ msgstr "piano"
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -95401,6 +98216,17 @@ msgstr "banquito"
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr ""
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "tablón de anuncios"
@@ -95877,7 +98703,7 @@ msgstr ""
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
 msgstr ""
 
@@ -95951,11 +98777,11 @@ msgid "This beaded curtain could be pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
+msgid "clickity clack… clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
+msgid "clickity clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -95968,7 +98794,7 @@ msgid "This beaded curtain has been pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
+msgid "clickity clack… clack… clack!"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -96115,8 +98941,7 @@ msgstr "pila de escombros de basura"
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -96648,6 +99473,15 @@ msgid ""
 "blood, candles, and other small knick-knacks."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr ""
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr "crash!"
@@ -96677,8 +99511,8 @@ msgstr "¡La verja está abierta!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
-msgstr "Girás la manija..."
+msgid "You turn the handle…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -96697,8 +99531,8 @@ msgstr "¡Las puertas del granero se abren!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
-msgstr "Tirás de la soga..."
+msgid "You pull the rope…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -96732,8 +99566,8 @@ msgstr "¡La puerta se levanta!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
-msgstr "Tirás de la palanca..."
+msgid "You throw the lever…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -96926,11 +99760,8 @@ msgstr[1] "arcos de una pieza"
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr ""
-"Es un arco primitivo de una sola pieza de madera, hecho específicamente para"
-" la persona que lo está usando. No es potente y poco preciso... "
-"lamentablemente, no es muy bueno."
 
 #: lang/json/gun_from_json.py
 msgid "short bow"
@@ -97149,9 +99980,7 @@ msgstr ""
 "debido a su tamaño pequeño y corto tensado. Los pernos disparados con esta "
 "arma tienen una gran probabilidad de no romperse."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "pistola"
@@ -97352,6 +100181,18 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "tirar"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -97447,6 +100288,10 @@ msgstr ""
 "el brote. Aunque es poderoso, no es adecuada para distancias largas. Se "
 "alimenta con un UPS."
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "semi-auto"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -97456,10 +100301,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -97474,12 +100319,11 @@ msgid ""
 "other for shotgun shells.  It is made from pipes and parts cannibalized from"
 " a double barrel shotgun."
 msgstr ""
-"Un arma de triple cañón hecha en casa. Un cañón con calibre .30-06 y los "
-"otros dos para cartuchos de escopeta. Está hecho de caños y partes extraídas"
-" de una escopeta de doble caño."
+"Es un arma de triple cañón hecha en casa. Uno de los cañones tiene calibre "
+".30-06 y los otros dos son para cartuchos de escopeta. Está hecho de caños y"
+" partes extraídas de una escopeta de doble caño."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "escopeta"
@@ -97509,8 +100353,8 @@ msgid ""
 "An eight-shot, revolving barrel, pneumatic bolt driver handcrafted from "
 "scrap.  It is very quiet and deadly."
 msgstr ""
-"Un bolt-driver neumático de ocho disparos, cañón giratorio, hecho a mano con"
-" chatarra. Es muy silencioso y letal."
+"Es un bolt-driver neumático de ocho disparos, cañón giratorio, hecho a mano "
+"con chatarra. Es muy silencioso y letal."
 
 #: lang/json/gun_from_json.py
 msgid "pneumatic shotgun"
@@ -97675,6 +100519,10 @@ msgstr ""
 "Un cañón de agua que pertenecía a un camión de bomberos. Si lo montás en un "
 "vehículo, puede ser usado para apagar fuegos o \"manifestantes\"."
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -97985,8 +100833,8 @@ msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 
@@ -98095,10 +100943,6 @@ msgstr ""
 " no se aconseja ese uso y cancelaría la garantía. No tiene espacio para "
 "incorporarle modificaciones en esta proto-arma inútil."
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "semi-auto"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -98724,15 +101568,10 @@ msgstr[1] "M24"
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
-"El M24 francotirador es una versión militar y policíaca del rifle Remington "
-"modelo 700. M24 es el nombre asignado por el Ejército de Estados Unidos "
-"luego de adoptarlo como su rifle de francotirador estándar en 1988. El M24 "
-"es llamado 'sistema de armas' porque además del rifle tiene una mira "
-"telescópica removible y otros accesorios."
 
 #: lang/json/gun_from_json.py
 msgid "HK417 A2"
@@ -98898,19 +101737,17 @@ msgstr ""
 "disparos que podrás hacer."
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
-msgstr[0] "COP .38"
-msgstr[1] "COP .38"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
 msgstr ""
-"La COP .38 es una pistola pequeña y regordeta que tiene un ligero parecido a"
-" la Mossberg Brownie. Tiene cuatro caños dispuestos en forma de cuadrado."
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -98946,20 +101783,6 @@ msgstr ""
 "Un revólver de siete disparos calibre .38, vendida por Smith & Wesson. Posee"
 " una mirilla trasera fija y una estructura reforzada."
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] "Taurus Pro .38"
-msgstr[1] "Taurus Pro .38"
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr ""
-"Una pistola calibre .38 popular. Diseñada con muchas características de "
-"seguridad y construida con materiales duraderos de alta calidad."
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -99027,10 +101850,22 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
 msgid_plural "M1911A1s"
@@ -99133,9 +101968,9 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -99161,8 +101996,9 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -99579,8 +102415,9 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -100705,9 +103542,9 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -100719,8 +103556,8 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -100736,7 +103573,7 @@ msgstr[1] ""
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -100749,7 +103586,7 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
@@ -100762,10 +103599,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
 
@@ -100778,10 +103615,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -101539,10 +104376,6 @@ msgid ""
 "and destruction it can cause."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr ""
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -102517,10 +105350,62 @@ msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] "Ichaival"
+msgstr[1] "Ichaivals"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -102646,12 +105531,6 @@ msgstr ""
 " como otros diseños de ballesta, pero es fácil de cargar. Los pernos "
 "disparados con esta arma tienen una gran probabilidad de no romperse."
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] "Ichaival"
-msgstr[1] "Ichaivals"
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -103889,7 +106768,7 @@ msgstr ""
 msgid "accessories"
 msgstr "accesorios"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "arco"
@@ -104024,7 +106903,7 @@ msgstr[1] "upstests"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
+"it's a bug.  50x more UPS drain."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -104196,8 +107075,8 @@ msgstr[1] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -104225,7 +107104,7 @@ msgstr[1] ""
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
+"energy efficiency.  Decreases power consumption."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -104240,11 +107119,9 @@ msgstr[1] "capacitores de alta densidad"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
 msgstr ""
-"Es un capacitor con energía de alta densidad que incrementa el alcance y el "
-"daño, pero consume bastante más energía."
 
 #: lang/json/gunmod_from_json.py
 msgid "Leadworks magazine adapter"
@@ -104474,6 +107351,20 @@ msgstr ""
 "compensar el levantamiento de la bocacha. Disminuye el retroceso pero "
 "aumenta el tamaño y el ruido, y reduce un poco la precisión."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
 msgid_plural "homemade suppressors"
@@ -104620,6 +107511,20 @@ msgstr ""
 msgid "rail"
 msgstr "riel"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
@@ -104635,6 +107540,19 @@ msgstr ""
 "cuando una mira o alguna otra modificación impide el uso de las mirillas "
 "primarias."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
@@ -104647,6 +107565,18 @@ msgstr ""
 "Es un conjunto de ranuras adicionales a 45º para poner una óptica "
 "secundaria."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
@@ -104678,6 +107608,20 @@ msgstr ""
 "fuego y reduce la vibración, lo que reduce mucho el retroceso e incrementa "
 "levemente la precisión."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -104802,6 +107746,20 @@ msgid ""
 " mrad increments and is remarkably small and light for its magnification."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
@@ -104814,6 +107772,19 @@ msgid ""
 "crosshair."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
 msgid_plural "RS1219 scopes"
@@ -105030,6 +108001,21 @@ msgstr ""
 "el manejo del retroceso, solo pueden usarse en ciertas superficies y son "
 "lentos para armar."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -105073,6 +108059,19 @@ msgstr ""
 "control. No es tan efectivo como un bípode pero se puede usar bajo cualquier"
 " condición."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
@@ -105145,6 +108144,20 @@ msgstr ""
 "M16, pero hoy en día puede ser adjuntado a cualquier rifle. Permite cargar y"
 " disparar una granada 40mm."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
@@ -105162,6 +108175,21 @@ msgstr ""
 "grandes en un tamaño pequeño, a cambio de una menor precisión. Puede ser "
 "adjuntado a un rifle o combinado con una culata para ser usado solo."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "masterkey shotgun"
 msgid_plural "masterkey shotguns"
@@ -105178,6 +108206,20 @@ msgstr ""
 "del cañón de varios rifles. Permite cargar y disparar un total de cuatro "
 "cartuchos de escopeta."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
 msgid_plural "40mm pipe launchers"
@@ -105186,11 +108228,9 @@ msgstr[1] "caños lanzadores 40mm"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
 msgstr ""
-"Es un tubo lanzador casero que puede ser adjuntado a casi cualquier rifle. "
-"Permite cargar y disparar una granada 40mm."
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -105223,6 +108263,20 @@ msgstr ""
 "que puede ser montada debajo del cañón de varios rifles. Acepta los "
 "cargadores de caja RMSA10."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
 msgid_plural "underslung shotguns"
@@ -105237,6 +108291,20 @@ msgstr ""
 "Es una escopeta corta con 2 cañones, que puede ser montada debajo del cañón "
 "de varios rifles. Permite cargar y disparar dos cartuchos de escopeta."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
 msgid_plural "LW underbarrel laser sights"
@@ -105542,6 +108610,58 @@ msgstr ""
 "dispara y debido a las modificaciones extensivas, el arma ya no puede usarse"
 " sin un UPS."
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -107531,9 +110651,10 @@ msgstr "Medir radiación"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
-msgstr "..."
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
+msgstr ""
 
 #: lang/json/item_action_from_json.py
 msgid "Control an RC car"
@@ -108185,6 +111306,13 @@ msgstr ""
 msgid "This bionic can provide power to powered armor."
 msgstr "Este biónico puede dar energía a una armadura de poder."
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr ""
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -109729,6 +112857,7 @@ msgstr "Quitar color usado"
 msgid "Load color template"
 msgstr "Cargar plantilla de color"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -112297,7 +115426,7 @@ msgstr ""
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -112340,6 +115469,91 @@ msgid ""
 "Lasts 2 turns."
 msgstr ""
 
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Kung Fu"
+msgstr "Kung Fu del Tigre"
+
+#. ~ Description for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
+"attacks above all else.  Your Strength determines your accuracy, and your "
+"attacks do increasing damage as you continue attacking."
+msgstr ""
+"Uno de los cinco estilos animales Shaolin. El Tigre se focaliza más que nada"
+" en ataques implacables. Tu fuerza determina tu precisión, y tus ataques "
+"causan mayor daño mientras sigas atacando."
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Fury"
+msgstr "Furia del Tigre"
+
+#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger's Strength"
+msgstr ""
+
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Wing Chun"
+msgstr ""
+
+#. ~ Description for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
+"learn effective techniques from the various Shaolin animal forms.  It has a "
+"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
+"sensitivity to the opponent's direction of force, and flowing around it to "
+"get back to hitting."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr ""
+
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chi-Sao Sensitivity"
+msgstr ""
+
+#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
+msgstr ""
+
 #: lang/json/martial_art_from_json.py
 msgid "Zui Quan"
 msgstr "Zui Quan"
@@ -112348,63 +115562,64 @@ msgstr "Zui Quan"
 #: lang/json/martial_art_from_json.py
 msgid ""
 "AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
-msgstr ""
-"También conocido como \"boxeo de borracho\", Zui Quan imita el movimiento de"
-" un borracho para confundir al enemigo, otorgándote un bonus a esquivar "
-"basado en tu inteligencia. El turno después de atacar, podés esquivar todos "
-"los ataques sin penalidad, y si esquivás éxitosamente un ataque recibís un "
-"bonus al daño y al acierto basado en tu inteligencia."
-
-#. ~ Description of buff for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "La inteligencia aumenta la habilidad de esquivar"
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
-msgstr "Contra Golpe"
+msgid "Zui Quan Stance"
+msgstr ""
 
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
-msgstr "Bonus de acierto y de daño después de una evasión exitosa"
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Kung Fu"
-msgstr "Kung Fu del Tigre"
+msgid "Advanced Zui Quan"
+msgstr ""
 
-#. ~ Description for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
+#, no-python-format
 msgid ""
-"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
-"attacks above all else.  Your Strength determines your accuracy, and your "
-"attacks do increasing damage as you continue attacking."
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
 msgstr ""
-"Uno de los cinco estilos animales Shaolin. El Tigre se focaliza más que nada"
-" en ataques implacables. Tu fuerza determina tu precisión, y tus ataques "
-"causan mayor daño mientras sigas atacando."
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Fury"
-msgstr "Furia del Tigre"
+msgid "Drunken Stumble"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "+3 Daño golpeante"
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "Fuerza del Tigre"
+msgid "Drunken Dodging"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "La fuerza otorga un bonus adicional al daño que causás."
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Debug Mastery"
@@ -112432,29 +115647,6 @@ msgstr ""
 "+Inteligencia armadura contra electricidad, +Percepción armadura contra "
 "fuego."
 
-#: lang/json/martial_art_from_json.py
-msgid "Wing Chun"
-msgstr ""
-
-#. ~ Description for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
-"learn effective techniques from the various Shaolin animal forms.  It has a "
-"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
-"sensitivity to the opponent's direction of force, and flowing around it to "
-"get back to hitting."
-msgstr ""
-
-#: lang/json/martial_art_from_json.py
-msgid "Chi-Sao Sensitivity"
-msgstr ""
-
-#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
-msgstr ""
-
 #: lang/json/martial_art_from_json.py
 msgid "Bionic Combatives"
 msgstr "Combativo Biónico"
@@ -112608,13 +115800,11 @@ msgstr "Kung Fu del Sapo"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
 msgstr ""
-"Uno de los Cinco Venenos Mortales. Los maestros del estilo del Sapo pueden "
-"enfocarse a sí mismos contra todos los ataques. Podés meditar deteniéndote, "
-"otorgándote armadura, aunque vas a perder enfoque cuando te movés."
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -112622,8 +115812,11 @@ msgstr "Piel de Hierro de Sapo"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "Recibís hasta un +6 de armadura cuando te mantenés quieto"
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -112632,8 +115825,12 @@ msgstr "Disipación de Piel de Hierro"
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
-msgstr "¡La Piel de Hierro se suaviza mientras te movés!"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Viper Kung Fu"
@@ -112642,40 +115839,49 @@ msgstr "Kung Fu de la Víbora"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
 msgstr ""
-"Un heredero de los Cinco Venenos Mortales. El estilo de la Víbora tiene un "
-"combo único de tres partes, que comienza con esquivar un golpe, después "
-"contraatacar con un manotazo aturdidor y el legendario Golpe de Víbora."
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "Traba de Víbora"
+msgid "Viper's Patience"
+msgstr ""
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
-msgstr "¡Mordiste! ¡Tu próximo ataque será el Golpe de Víbora!"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "Paciencia de Víbora"
+msgid "Viper's Ambush"
+msgstr ""
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
-msgstr "+2 Esquivar. Esquivar un ataque inicia un combo."
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
-msgstr "Emboscada de Víbora"
+msgid "Viper's Venom"
+msgstr ""
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
-msgstr "¡Lograste atraerlo! Tu próximo ataque será una Mordida de Víbora."
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "C.R.I.T Blade-work"
@@ -113056,6 +116262,10 @@ msgstr "Plomo"
 msgid "Leather"
 msgstr "Cuero"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "Leche"
@@ -113120,6 +116330,10 @@ msgstr "Superaleación"
 msgid "layered carbide"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Tin"
 msgstr ""
@@ -113230,6 +116444,10 @@ msgstr ""
 msgid "Arcane Skin"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr "Oricalco"
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr ""
@@ -113239,7 +116457,7 @@ msgid "Sugar"
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
+msgid "Gather bones for the Brigitte.  About 8 should do it."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -116964,8 +120182,8 @@ msgstr ""
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -119864,8 +123082,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -119875,7 +123093,7 @@ msgstr ""
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
 msgstr ""
 
@@ -119998,7 +123216,7 @@ msgstr ""
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
 msgstr ""
 
@@ -120101,6 +123319,27 @@ msgstr ""
 "Podés moverte más rápido que la mayoría. Tenés un 15% de bonus sobre la "
 "velocidad normal a pie."
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr ""
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr ""
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr ""
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "Buen Oído"
@@ -120647,13 +123886,10 @@ msgstr "Psicosis con Estimulantes"
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
-"Tenés una historia única con los estimulantes (como el café o las "
-"anfetaminas). Tolerás mucho más sin llegar a la sobredosis, pero si te "
-"entregás demasiado, empezás a ver cosas..."
 
 #. ~ Description for Stylish
 #: lang/json/mutation_from_json.py
@@ -120810,6 +124046,18 @@ msgid ""
 " Pentjak Silat, or Sōjutsu."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr ""
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
 msgstr "Poco Olor"
@@ -121650,11 +124898,9 @@ msgstr "Ojos de Fey"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
 msgstr ""
-"Tus ojos se han vuelto... verdes. Es difícil decir exactamente de qué matiz "
-"son porque parecen cambiar. El efecto es... placentero."
 
 #: lang/json/mutation_from_json.py
 msgid "Fey Vision"
@@ -122568,10 +125814,8 @@ msgstr "Cargador/a de Marloss"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
+"nose, and you have a strong desire to try some seeds and… sap?"
 msgstr ""
-"Desde que comiste esas bayas Marloss, no te podés sacar su olor de la nariz,"
-" y tenés como un fuerte deseo de probar semillas y... ¿savia?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vessel"
@@ -122581,10 +125825,8 @@ msgstr "Recipiente de Marloss"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
+"tongue, and you have a strong desire to try some berries and… sap?"
 msgstr ""
-"Desde que comiste esas semillas de Marloss, no te podés sacar su gusto de la"
-" lengua, y tenés como un fuerte deseo de probar unas bayas y... ¿savia?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vector"
@@ -123050,12 +126292,9 @@ msgstr "Dientes de Sable"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
 msgstr ""
-"Tus colmillos han crecido extremadamente grandes e increíblemente afilados. "
-"Te va a ser imposible usar equipo que cubre tu boca, y te resultará díficil "
-"comer... pero dejás unas horribles heridas cuando mordés."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
@@ -124477,11 +127716,9 @@ msgstr "Hocico"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
 msgstr ""
-"Tu cara y mandíbula han empezado a... cambiar. Las máscaras te quedan bien, "
-"pero se te nota la mutación."
 
 #: lang/json/mutation_from_json.py
 msgid "Bovine Snout"
@@ -125349,15 +128586,12 @@ msgstr "Ectotérmico/a"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
-"Ahora tu cuerpo se ha vuelto permanentemente de sangre fría. Tu velocidad "
-"disminuye o aumenta por cada 1.1 C (2 F) grados por debajo o por encima de "
-"18.3 C (65 F). Solo necesitás comer la mitad de lo que come un humano "
-"promedio."
 
 #: lang/json/mutation_from_json.py
 msgid "Growling Voice"
@@ -125701,10 +128935,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
+"every need… but how would you keep them in line?"
 msgstr ""
-"Estaría bueno ser Reina, tener a los obreros constantemente a tu servicio..."
-" pero ¿cómo hacés para mantenerlos controlados?"
 
 #. ~ Description for Plant
 #: lang/json/mutation_from_json.py
@@ -125722,11 +128954,9 @@ msgstr "Acuoso"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
 msgstr ""
-"¿Cómo era esa publicidad vieja, 'pintar el planeta'? Eso puede ser un buen "
-"objetivo a largo plazo, pero por ahora..."
 
 #: lang/json/mutation_from_json.py
 msgid "Subterranean"
@@ -127524,8 +130754,8 @@ msgid "Scientist"
 msgstr "Científico"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
-msgstr "Estoy buscando pistas acerca del origen de estos monstruos..."
+msgid "I'm looking for clues concerning these monsters' origins…"
+msgstr ""
 
 #: lang/json/npc_class_from_json.py
 msgid "Bounty Hunter"
@@ -127588,7 +130818,7 @@ msgid "Real Person"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -127604,7 +130834,7 @@ msgid "Foodperson"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
@@ -127612,7 +130842,7 @@ msgid "Cyborg"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -127756,6 +130986,14 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr ""
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
+msgstr ""
+
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 #: lang/json/npc_from_json.py
 msgid "Captive"
@@ -129348,6 +132586,10 @@ msgstr "techo de supermercado"
 msgid "hotel parking"
 msgstr "estacionamiento del hotel"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "hotel"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "entrada del hotel"
@@ -129717,7 +132959,7 @@ msgid "spiked trench"
 msgstr "trinchera con púas"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
+msgid "fabrication workshop survey"
 msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
@@ -129732,6 +132974,14 @@ msgstr "herrería"
 msgid "livestock survey"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr ""
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr ""
@@ -130417,6 +133667,10 @@ msgstr "campo de tiro"
 msgid "shooting range roof"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "cancha de golf"
@@ -131083,10 +134337,6 @@ msgstr "centro de despacho de robots"
 msgid "dense urban"
 msgstr "urbanización densa"
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "hotel"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "escuela"
@@ -131107,6 +134357,10 @@ msgstr ""
 msgid "mechanics garage"
 msgstr "taller mecánico"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
 msgstr "tratamiento de aguas cloacales"
@@ -136089,6 +139343,36 @@ msgid ""
 "on. This displeases you."
 msgstr ""
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -139170,11 +142454,6 @@ msgstr "PIES"
 msgid "MEDICAL"
 msgstr "MEDICAMENTOS"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "RECIPIENTES"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -140160,7 +143439,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
 msgstr ""
 
@@ -140217,7 +143496,7 @@ msgstr ""
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
+"grab a pot.  Let's put it in that dining area."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -140956,7 +144235,7 @@ msgid "build 2 wood stoves"
 msgstr ""
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
+msgid "We should build a well.  This will make cooking more convenient."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -141453,6 +144732,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr ""
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -141473,8 +144928,8 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -141579,7 +145034,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
 msgstr ""
 
@@ -141589,7 +145044,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
 msgstr ""
 
@@ -141599,7 +145054,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
 msgstr ""
 
@@ -142031,7 +145486,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
+"Some benches around the outside would be nice.  Build some to the northwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -142040,7 +145495,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
+"Some benches around the outside would be nice.  Build some to the northeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -142049,7 +145504,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
+"Some benches around the outside would be nice.  Build some to the southeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -142058,7 +145513,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
+"Some benches around the outside would be nice.  Build some to the southwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -142300,6 +145755,10 @@ msgstr ""
 msgid "Central Storage Building"
 msgstr ""
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr ""
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
 msgstr ""
@@ -143693,6 +147152,44 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr ""
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -148901,13 +152398,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
+msgid "Pass some ethanol, I need to power my ethanol burner."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -148915,20 +152406,12 @@ msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
+msgid "I require ethanol for my internal power supply.  Anything on you?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -156686,7 +160169,7 @@ msgid "a static hissing sound."
 msgstr "un siseo de estática."
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156700,11 +160183,11 @@ msgid "\"Hold on, I want to pulp that zombie corpse.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
+msgid "\"Burning… from the inside…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
+msgid "\"This smell…  Don't know…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156716,19 +160199,19 @@ msgid "a scraping noise."
 msgstr "un ruido de rasguño."
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
+msgid "\"No…  Stop the burning!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
+msgid "\"Hunger…  Must eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
+msgid "\"Run…  Chase…  Eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156854,7 +160337,7 @@ msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
+msgid "\"Can't… breathe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156867,8 +160350,8 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156880,7 +160363,7 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156888,11 +160371,11 @@ msgid "\"This is a dream.  This has to be a dream.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
+msgid "\"This is my life now… this is my life now… this is my life now…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
+msgid "\"Wanna go home…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156948,7 +160431,7 @@ msgstr ""
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156971,18 +160454,18 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157105,7 +160588,7 @@ msgid "\"Police inbound.  Stay where you are!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157126,7 +160609,7 @@ msgid "\"FoodPlace: It's the Calories.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -157194,8 +160677,8 @@ msgid "You shouldn't have done that."
 msgstr "No deberías haber hecho eso."
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
-msgstr "Vamos a jugar a... la Ruleta Rusa."
+msgid "Let's play… Russian roulette."
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "I hate you."
@@ -157206,8 +160689,8 @@ msgid "Go kill yourself!"
 msgstr "¡Por qué no te matás!"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
-msgstr "Gran Hermano te está mirando..."
+msgid "Big Brother is watching you…"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Die for me!"
@@ -157218,12 +160701,12 @@ msgid "Why won't you die?"
 msgstr "¿Por qué no te morís?"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
-msgstr "Sangre... Deliciosa."
+msgid "Blood…  Delicious."
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
-msgstr "Nos vemos... ¡EN EL INFIERNO!"
+msgid "See you… IN HELL!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "AAAIEEEEEEE!"
@@ -157238,8 +160721,8 @@ msgid "What did you do with my Mommy?"
 msgstr "¿Qué hiciste con mi mamá?"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
-msgstr "Quedate conmigo... ¡para siempre!"
+msgid "Stay with me… forever!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Hey kids.  Want some candy?"
@@ -158688,6 +162171,10 @@ msgstr "Búnker de Cartonero"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#: lang/json/start_location_from_json.py
+msgid "Wizard's lake retreat"
+msgstr ""
+
 #: lang/json/start_location_from_json.py
 msgid "Candy Shop"
 msgstr ""
@@ -158737,16 +162224,16 @@ msgid "You there. Quiet down. Can you hear it? The song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
+msgid "What?  What do you mean?  What song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
+msgid "So about the songs…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
 msgstr ""
 
@@ -158763,7 +162250,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158773,11 +162260,11 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
+msgid "What?  Singing bones?  What are you talking about?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158826,7 +162313,7 @@ msgid "I will bear that in mind"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158838,7 +162325,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
+msgid "End the world?  What?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158850,8 +162337,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158866,7 +162353,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
+msgid "I… thank you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158895,28 +162382,28 @@ msgid "That is all for now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgid "A song may yet be sung by you, should you wish to."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
+msgid "There is an additional song you could take on, if you'd like."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
+msgid ""
+"I know of certain bones that could be of use, if you'd like to know more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "A song may yet be sung by you, should you wish to."
+msgid "There are bones to etch, songs to sing. Wish to join me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There is an additional song you could take on, if you'd like."
+msgid "Do you wish to take on more songs?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid ""
-"I know of certain bones that could be of use, if you'd like to know more."
+msgid "Do you believe you can take on the burden of additional bones?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158940,7 +162427,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158948,7 +162435,7 @@ msgid "Not interested."
 msgstr "No estoy interesado."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
+msgid "Consider it done.  But I also wanted to ask…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158964,7 +162451,7 @@ msgid "I'm off then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158974,7 +162461,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
+msgid "I see.  Very well then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158992,11 +162479,11 @@ msgid "I am glad to hear it. Let's go then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
+msgid "Maybe some other time.  Changing the topic…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159018,17 +162505,17 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
 
@@ -159040,6 +162527,10 @@ msgstr ""
 msgid "Skip it, let's get going."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr ""
@@ -159097,13 +162588,25 @@ msgid "What about chit-chatting and your background?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -159147,7 +162650,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159170,7 +162675,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159209,8 +162716,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
 
@@ -159218,6 +162725,10 @@ msgstr ""
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -159275,11 +162786,27 @@ msgid ""
 "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159290,6 +162817,10 @@ msgstr ""
 msgid "Tell me more about the activities you can do now."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -159496,19 +163027,19 @@ msgid "Let's go."
 msgstr "Vamos."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
-msgstr "Cambiar tus reglas de enfrentamiento..."
+msgid "Change your engagement rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
-msgstr "Cambiar tus reglas para apuntar..."
+msgid "Change your aiming rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
+msgid "Change your bionic power reserve rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
+msgid "Change your bionic power recharge rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159520,11 +163051,11 @@ msgid "Stick close to me, no matter what."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
+msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_false_text>"
+msgid "<ally_rule_follow_distance_2_true_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159784,7 +163315,7 @@ msgid "Nah, I'm just kidding."
 msgstr "Nah, te estaba boludeando."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
+msgid "Please go to this location…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159918,8 +163449,8 @@ msgstr ""
 "desde que... desde todo esto. ¿Cómo la vas llevando?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
-msgstr "Ah, ya sabés, no me quejo, no me quejo..."
+msgid "Oh you know, not bad, not bad…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "<hallu_dont_trade>"
@@ -160006,14 +163537,14 @@ msgstr ""
 msgid "&Put hands up."
 msgstr "&Levanta las manos."
 
-#: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
-msgstr "*suelta su arma."
-
 #: lang/json/talk_topic_from_json.py
 msgid "*drops_her_weapon."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "*drops his weapon."
+msgstr "*suelta su arma."
+
 #: lang/json/talk_topic_from_json.py
 msgid "Now get out of here"
 msgstr "Ahora andate de acá"
@@ -160027,12 +163558,12 @@ msgid "Okay, I'm going."
 msgstr "Bueno, me voy."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
-msgstr "Hablando de ese laburo..."
+msgid "About that job…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
-msgstr "Hablando de esos laburos que me dijiste..."
+msgid "About one of those jobs…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "What's the matter?"
@@ -160050,14 +163581,6 @@ msgstr "No tengo ningún trabajo para vos."
 msgid "I don't have any more jobs for you."
 msgstr "No tengo ningún otro trabajo para vos."
 
-#: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
-msgstr ""
-
 #: lang/json/talk_topic_from_json.py
 msgid "I have another job for you.  Want to hear about it?"
 msgstr "Tengo otro trabajo para vos. ¿Querés que te cuente?"
@@ -160066,6 +163589,14 @@ msgstr "Tengo otro trabajo para vos. ¿Querés que te cuente?"
 msgid "I just have one job for you.  Want to hear about it?"
 msgstr "Tengo un trabajo para vos. ¿Querés que te cuente?"
 
+#: lang/json/talk_topic_from_json.py
+msgid "I have other jobs for you.  Want to hear about them?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I have more jobs for you.  Want to hear about them?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
 #: src/npctalk.cpp
 msgid "Oh, okay."
@@ -160124,8 +163655,8 @@ msgid "Whatever.  Bye."
 msgstr "Como quieras. Chau."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
-msgstr "Perdón... no pude."
+msgid "I'm sorry…  I failed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not yet."
@@ -160144,8 +163675,8 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "No. ¡Ahora sigo con eso, chau!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
-msgstr "¡Sip! ¡Acá está!"
+msgid "Yup!  Here it is!"
+msgstr "¡Sip! ¡Acá está/n!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "We're here!"
@@ -160402,8 +163933,8 @@ msgid "Alright.  You can lead now."
 msgstr "Bueno. Ahora podés guiarme."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
-msgstr "Bieno. Algo más..."
+msgid "Good.  Something else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alright, let's go."
@@ -160483,8 +164014,8 @@ msgid "I'd prefer to keep that to myself."
 msgstr "Prefiero quedarme con eso para mí."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
-msgstr "Entiendo..."
+msgid "I understand…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "You just asked me for stuff; ask later."
@@ -160507,8 +164038,8 @@ msgid "Because I'm your friend!"
 msgstr "¡Porque soy tu amigo!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
-msgstr "Bueno, te estoy ayudando..."
+msgid "Well, I am helping you out…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'll give it back!"
@@ -160555,15 +164086,15 @@ msgid "No, I'm keeping it. Try and take it off me, I dare you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
+msgid "Look, I really need this.  Please let me have it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
+msgid "What, this?  It's not the same one, you are mistaken."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
+msgid "I'm sorry.  Look, I already dropped it, okay?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160571,7 +164102,7 @@ msgid "Don't try and talk yourself out of this, drop it now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
+msgid "Okay, I'm dropping it…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160633,8 +164164,8 @@ msgid "Pleasure doing business!"
 msgstr "¡Un placer hacer negocios!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
-msgstr "Tal vez me vuelvas a ver..."
+msgid "You might be seeing more of me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey again. *kzzz*"
@@ -160647,21 +164178,21 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
+msgid "Hey.  Let's chat for a second."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
+msgid "That's because I saved you.  Listen, I could use your help…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160673,7 +164204,7 @@ msgid "Come with me. We can help each other out."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
+msgid "We both go our separate ways.  Enjoy your freedom."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160690,8 +164221,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160712,7 +164243,7 @@ msgid "Get out of my sight."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160728,7 +164259,7 @@ msgid "Not if I kill you first!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
+msgid "I'm sorry!  I shouldn't have said that!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160769,17 +164300,37 @@ msgstr "Nada. Sigamos trabajando."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
-"El sistema de campamento de bando está diseñado para darte mayor control "
-"sobre tus compañeros, permitiéndote asignarlos a sus propias misiones. Estas"
-" misiones pueden ir desde recolectar y fabricar, hasta patrullas de combate."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
-msgstr "Continua."
+msgid "Give me an overview of how camps work."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Never mind, let's go back to talking about camps."
@@ -160799,90 +164350,120 @@ msgstr "Olvidate. Vamos."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
 msgstr ""
-"La comida es necesario o producida durante cada misión. Las misiones que son"
-" durante un tiempo determinado requerirán que pagues por adelantado, "
-"mientras que las misiones de repetición, como puede ser recolectar leña, se "
-"pagan cuando se completan. Si no tenés la comida necesaria para pagarle a un"
-" compañero, perderás reputación en el bando. Lo que puede llevar a que la "
-"cosa se ponga FEA si baja mucho."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
-msgstr "Esperá, repetime lo que dijiste."
+msgid "Wait, we can talk with radios?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
 msgstr ""
-"Después de que elegiste el lugar vas a necesitar encontrar o fabricar "
-"materiales para mejorar el campamento para acceder a nuevas misiones. Las "
-"primeras misiones están enfocadas en recolectar materiales para mejorar el "
-"campamento, así vos no lo tenés que hacer. Después de dos o tres mejoras vas"
-" a tener acceso a las misiones de <color_yellow>[Trabajos Menores]</color> "
-"que te permiten hacer que un compañero ordene por categoría todos los "
-"objetos que haya en el campamento. Las mejoras posteriores te permiten "
-"enviar compañeros a reclutar nuevos miembros, construir fortificaciones o "
-"hacer patrullas de combate."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
 msgstr ""
-"Cuando mejorás tu primera carpa hasta el máximo, vas a obtener la habilidad "
-"de construir expansiones. Las expansiones te permiten especializar cada "
-"campamento en la industria que necesites. Una "
-"<color_light_green>[Granja]</color> es lo más recomendable para los que "
-"quieran tener bandos grandes, mientras que una "
-"<color_light_green>[Cocina]</color> es mejor para los que quieren mejorar la"
-" calidad de vida al tener un PNJ que se dedique a cocinar. Un "
-"<color_light_green>[Garage]</color> es útil para misiones de desarmadero que"
-" te permiten comerciar vehículos por grandes cantidades de componentes y "
-"recursos. Todos esos recursos pueden ser convertidos en equipamiento valioso"
-" en la <color_light_green>[Herrería]</color>. Podés construir expansiones "
-"adicionales cada dos niveles después del primero, y cuando un campamento "
-"está lleno te conviene construir otro."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
-msgstr "Gracias, sigamos hablando de los campamentos."
+msgid "Got it.  Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -160895,6 +164476,14 @@ msgid ""
 "6.  You can now set up faction camps in select buildings.  The list of available buildings is constantly growing, so you'll have to experiment."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr "Gracias, sigamos hablando de los campamentos."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -160996,11 +164585,11 @@ msgid "Well, sure."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
+msgid "I'd… rather not."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161031,7 +164620,7 @@ msgid "Oh, but you already have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
+msgid "Yes… yes I have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161096,7 +164685,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
+msgid "Horrible.  Did you get any pictures yourself?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161248,7 +164837,7 @@ msgid "This is a npc allies 1 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
+msgid "This an error!  npc allies 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161448,7 +165037,7 @@ msgid "This is a u_has_items beer test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
+msgid "Test failure!  This is a u_has_items test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161460,7 +165049,7 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161548,7 +165137,7 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161604,11 +165193,7 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
+msgid "Greetings…  Foodperson?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161650,7 +165235,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
+msgid "Ah…  Well, nice to meet you Foodperson."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161678,7 +165263,7 @@ msgid "Sure, whatever."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
+msgid "Ok…  I believe you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161774,7 +165359,7 @@ msgid "That sounds great!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
+msgid "Ok…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161782,7 +165367,7 @@ msgid "I need to think about it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
+msgid "Huh…  No thanks."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161799,7 +165384,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr ""
 
@@ -162793,8 +166378,8 @@ msgid "Giant bees?  Tell me more."
 msgstr "¿Abejas gigantes? Contame de eso."
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
-msgstr "Pero por lo general, las abejas no son agresivas..."
+msgid "But bees aren't usually aggressive…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -162809,10 +166394,8 @@ msgstr ""
 "No tengo vergüenza de admitir que salí corriendo como una gallina <swear> ."
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
 msgstr ""
-"Pero por lo general, las abejas no son agresivas... ¿Te referís a las "
-"avispas?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -163389,8 +166972,8 @@ msgid "No.  I can't.  Just, no."
 msgstr "No. No puedo. No."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
-msgstr "Perdón... te dejo tranquilo."
+msgid "Sorry…  I'll let you be."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -163743,8 +167326,8 @@ msgstr ""
 "que caiga."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
-msgstr "Bueno..."
+msgid "Okay…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -164246,8 +167829,8 @@ msgid "What do you think happened?"
 msgstr "¿Y qué pensás que pasó?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
-msgstr "La verdad que suena bastante loco..."
+msgid "That does sound a little crazy…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -164316,8 +167899,8 @@ msgid "What happened to you after that?"
 msgstr "¿Y qué te pasó después de eso?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
-msgstr "No puede ser sano abandonar tu pasado de esa manera..."
+msgid "It can't be healthy to abandon your past like that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -164917,8 +168500,8 @@ msgstr ""
 "supongo que en algún momento lo sabré."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
-msgstr "¿Te referís en un sentido religioso, o...?"
+msgid "Do you mean in a religious sense, or…?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165363,9 +168946,9 @@ msgstr "¿Qué estaba saliendo de ahí?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
-msgstr "Si te consigo las cosas, pensás que vas a poder... ¿hacerle ciencia?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165528,8 +169111,8 @@ msgid ""
 msgstr "Oh, qué historia. <the_cataclysm> fue justo el día de mi boda."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
-msgstr "Uh, lo lamento..."
+msgid "Oh, I'm sorry…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165860,7 +169443,7 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
+msgid "I'd like to ask you something else…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166151,7 +169734,8 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166339,16 +169923,16 @@ msgid "What do you need done?"
 msgstr "¿Hay algo que sea necesario hacer?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
-msgstr "Acerca de la misión..."
+msgid "About the mission…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
-msgstr "Acerca de una de esas misiones..."
+msgid "About one of those missions…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
-msgstr "Me tengo que ir..."
+msgid "I've got to go…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166372,8 +169956,8 @@ msgstr ""
 "recuperación."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
-msgstr "Parece un plan decente..."
+msgid "Seems like a decent plan…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166401,9 +169985,8 @@ msgstr ""
 "niveles inferiores."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
+msgid "Whatever they did it must have worked since we are still alive…"
 msgstr ""
-"Sea lo que hayan hecho debe haber funcionado porque todavía estamos vivos..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Marshal, I'm rather surprised to see you here."
@@ -166441,8 +170024,8 @@ msgstr ""
 "mi comandante si tenés alguna pregunta."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
-msgstr "Voy a intentar encontrar a tu comandante entonces..."
+msgid "I'll try and find your commander then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166512,8 +170095,8 @@ msgstr ""
 "Hey señorita, ¿no le parece que estaría más segura si se queda conmigo?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
-msgstr "No me prestes atención..."
+msgid "Don't mind me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166790,7 +170373,7 @@ msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr "¿Te conté sobre el cartón, amigo? ¿Tenés un poco?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
+msgid "About that shopping list of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166858,8 +170441,8 @@ msgid "Would you like me to give you some cardboard?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
-msgstr "Me parece que me tengo que ir yendo..."
+msgid "I think I have to get going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166890,7 +170473,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
+msgid "…What were you saying before?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166910,7 +170493,7 @@ msgid "No."
 msgstr "No."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167002,8 +170585,8 @@ msgid "I found a sample of alien fungus for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
-msgstr "OK, nos vemos."
+msgid "Ok… see ya."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -167104,8 +170687,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167137,7 +170720,7 @@ msgid "You sound more optimistic than usual."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167257,7 +170840,7 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167367,7 +170950,7 @@ msgstr ""
 "me muera de hambre. ¿Podés ayudar a este pobre mendigo?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167793,7 +171376,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168049,7 +171632,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
+msgid "About that sourdough starter you had me looking for…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168343,7 +171926,7 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
+msgid "Yes, yes I would… you monster."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168539,6 +172122,10 @@ msgid ""
 "idea of trying it."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr "Continua."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -168793,7 +172380,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169219,7 +172806,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr ""
 
@@ -169912,7 +173499,7 @@ msgid "Are you looking to buy anything else?"
 msgstr "¿Querés comprar algo más?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
+msgid "Very well… let's talk about something else."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -170263,8 +173850,8 @@ msgid "Have you seen anyone who might be hiding something?"
 msgstr "¿Viste a alguien que podría estar ocultando algo?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
-msgstr "Chau..."
+msgid "Bye…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170280,16 +173867,16 @@ msgid "Keep your head down and stay out of my way."
 msgstr "Mantené tu cabeza agachada y no te metas en mi camino."
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
-msgstr "OK..."
+msgid "OK…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like what?"
 msgstr "¿Como qué?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
-msgstr "No estoy seguro..."
+msgid "I'm not sure…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like they could be working for someone else?"
@@ -170308,8 +173895,8 @@ msgid "Got something to hide?"
 msgstr "¿Tenés algo que esconder?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
-msgstr "Perdón, no te quise ofender..."
+msgid "Sorry, I didn't mean to offend you…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170362,7 +173949,7 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr "Señora, no debería estar viajando por ahí afuera."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
+msgid "I heard this place was a refugee center…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -170386,8 +173973,8 @@ msgid "Can I do anything for the center?"
 msgstr "¿Puedo hacer algo por el centro?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
-msgstr "Me supuse que estarías buscando ayuda..."
+msgid "I figured you might be looking for some help…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, I'd better be going.  Bye."
@@ -170442,7 +174029,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
 msgstr ""
 
@@ -170501,8 +174088,8 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr "Lo lamento, ahora no estamos dispuestos a correr ningún riesgo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
-msgstr "Bien..."
+msgid "Fine…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170517,8 +174104,8 @@ msgstr ""
 "el pelo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
-msgstr "Bien... *tosjodeteforrotos*"
+msgid "Fine… *coughupyourscough*"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170553,8 +174140,8 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[STR 11] ¡Le pego piñas a las cosas bastante bien!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
-msgstr "Supongo que buscaré en otro lado..."
+msgid "I guess I'll look somewhere else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170580,8 +174167,8 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr "¿Conocés algo mejor que la provisión de armas raras?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
-msgstr "Estaba esperando algo más..."
+msgid "Was hoping for something more…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170684,8 +174271,8 @@ msgid "So what are you doing right now?"
 msgstr "Así que, ¿qué andás haciendo?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
-msgstr "No importa..."
+msgid "Never mind…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170715,8 +174302,8 @@ msgstr ""
 "tal vez una cura. Es poco probable, pero hay que tener esperanza."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
-msgstr "Que tengas suerte con eso..."
+msgid "Good luck with that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170764,8 +174351,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
-msgstr "Una porquería..."
+msgid "Sucks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170783,8 +174370,8 @@ msgstr ""
 "monstruos parecen poder romper una valla o una pared construido con al cosa."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
-msgstr "Bueno, entonces..."
+msgid "Well, then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170887,8 +174474,8 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr "Ah, me pareció oler a alguien nuevo. ¿Te puedo ayudar en algo?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
-msgstr "Vos... ¿me oliste?"
+msgid "You… smelled me?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Got anything for sale?"
@@ -170946,8 +174533,8 @@ msgstr ""
 "nada es tan bueno para cenar como un bife de alce recién cocinado!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
-msgstr "Buenísimo, ahora se me hace agua la boca..."
+msgid "Great, now my mouth is watering…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171076,8 +174663,8 @@ msgstr ""
 " héroes."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
-msgstr "Hmmm..."
+msgid "Hmmm…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171139,8 +174726,8 @@ msgstr ""
 "de hacerte conocido entre los hombres más poderosos que quedan en el mundo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
-msgstr "Yo no hice nada malo..."
+msgid "I haven't done anything wrong…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any tips for surviving?"
@@ -171308,7 +174895,7 @@ msgid "Something to say?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
+msgid "I charge hourly, so be quick…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -171421,7 +175008,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
+msgid "I guess I could help with that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -171532,8 +175119,8 @@ msgid "[$10] I'll get a haircut"
 msgstr "[$10] Quiero que me cortes el pelo"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
-msgstr "Tal vez en otro momento..."
+msgid "Maybe another time…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171552,8 +175139,8 @@ msgid "Stand still while I get my clippers..."
 msgstr "Quedate quieto mientras busco mis tijeras..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
-msgstr "Gracias... "
+msgid "Thanks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Want a drink?"
@@ -171572,8 +175159,8 @@ msgid "What do you have on tap?"
 msgstr "¿Qué tenés en la canilla?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
-msgstr "Me voy yendo..."
+msgid "I'll be going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171631,8 +175218,8 @@ msgstr ""
 "acerca de lo que se necesita hacer."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
-msgstr "Voy a hablar con él entonces..."
+msgid "I'll talk to him then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171652,8 +175239,8 @@ msgid "I hope you are here to do business."
 msgstr "Espero que hayas venido para hacer negocios."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
-msgstr "Estoy interesado en invertir en la agricultura..."
+msgid "I'm interested in investing in agriculture…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171683,12 +175270,12 @@ msgid "I imagine we might be able to work something out."
 msgstr "Me imagino que podemos llegar a encontrarle la vuelta."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
-msgstr "Me preguntaba si podrías instalar un implante cibernético..."
+msgid "I was wondering if you could install a cybernetic implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
-msgstr "Necesito ayuda para quitar un implante..."
+msgid "I need help removing an implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'd like to hire your services."
@@ -171736,8 +175323,8 @@ msgstr ""
 "exitoso."
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
-msgstr "Podría ser peor..."
+msgid "It could be worse…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171748,8 +175335,8 @@ msgstr ""
 "capataz o un supervisor de cultivos."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
-msgstr "Voy a hablar con ellos entonces..."
+msgid "I'll talk with them then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Can I help you, marshal?"
@@ -171830,8 +175417,8 @@ msgstr ""
 "los ataques de muertos vivientes."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
-msgstr "Con suerte, mudarme acá valdrá la pena..."
+msgid "Hopefully moving out here was worth it…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172392,13 +175979,13 @@ msgstr "Mordida de Víbora"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
-msgstr "Usás tu mordida de víbora con %s"
+msgid "You lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
-msgstr "<npcname> usa su mordida de víbora con %s"
+msgid "<npcname> lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Strike"
@@ -172406,18 +175993,28 @@ msgstr "Golpe de Víbora"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
-msgstr "Le das un Golpe de Víbora al %s"
+msgid "You hit %s with a spectacular Viper Strike"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
-msgstr "<npcname> le da un Golpe de Víbora al %s"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr "Retorcimiento de Víbora"
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr ""
@@ -172460,6 +176057,34 @@ msgstr ""
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr "<npcname> golpea %s con una Pinza Puño!"
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr "Lengua de Sapo"
@@ -174203,32 +177828,18 @@ msgid "<npcname> double-handed palm strikes %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
-msgstr "Amague de borracho"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "You stumble and leer at %s"
-msgstr "Tropezás y mirás maliciosamente al %s"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "<npcname> stumbles and leers at %s"
-msgstr "<npcname> tropieza y mira maliciosamente al %s"
-
-#: lang/json/technique_from_json.py
-msgid "Drunk counter"
-msgstr "Cotnrataque de borracho"
+msgid "Tiger Palm"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
-msgstr "Tambaleás, y tu golpe salvaje le pega al %s"
+msgid "You land a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
-msgstr "<npcname> tambalea, y golpea %s"
+msgid "<npcname> lands a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Tiger Takedown"
@@ -174236,95 +177847,78 @@ msgstr "Derribo de Tigre"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
-msgstr "Agarrás y tirás al suelo al %s"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "<npcname> grabs and grounds %s"
-msgstr "<npcname> agarra y tira al suelo al %s"
-
-#: lang/json/technique_from_json.py
-msgid "slow strike"
-msgstr "golpe lento"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "You slowly strike %s"
-msgstr "Golpeás lentamente %s"
+msgid "You slam %s to the ground"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
-msgstr "<npcname> golpea lentamente %s"
+msgid "<npcname> slams %s to the ground"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
-msgstr "golpe de fase"
+msgid "Straight Punch"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
-msgstr "Le das un golpe de fase %s"
+msgid "You deliver a vertical straight punch to %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
-msgstr "<npcname> le da un golpe de fase %s"
-
-#: lang/json/technique_from_json.py
-msgid "Chain Punch"
+msgid "<npcname> delivers a vertical straight punch to %s"
 msgstr ""
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
+msgid "Straight Punch (Knockback)"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
+msgid "You force %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
+msgid "<npcname> forces %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
+msgid "L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
+#, python-format
+msgid "You deliver a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "ask the way"
+#, python-format
+msgid "<npcname> delivers a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-#, python-format
-msgid "You miss but keep striking at %s"
+msgid "L-hook (Knockback)"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
+msgid "You knock %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "White Crane stumble"
+#, python-format
+msgid "<npcname> knocks %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
+msgid "Your attack misses %s but you don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
+msgid "<npcname>'s attack misses %s but they don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
@@ -174341,15 +177935,71 @@ msgstr ""
 msgid "<npcname> receives %s's attack, and counters"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "Drunken Feint"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You stumble and leer at %s"
+msgstr "Tropezás y mirás maliciosamente al %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> stumbles and leers at %s"
+msgstr "<npcname> tropieza y mira maliciosamente al %s"
+
+#: lang/json/technique_from_json.py
+msgid "Drunk Counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You lurch, and your wild swing hits %s"
+msgstr "Tambaleás, y tu golpe salvaje le pega al %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> lurches, and hits %s"
+msgstr "<npcname> tambalea, y golpea %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
-msgstr "Desarmás a %s"
+msgid "The %s tries to grab <npcname>, but they stumble away!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "slow strike"
+msgstr "golpe lento"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
-msgstr "<npcname> desarma a %s"
+msgid "You slowly strike %s"
+msgstr "Golpeás lentamente %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> slowly strikes %s"
+msgstr "<npcname> golpea lentamente %s"
+
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
+msgstr "golpe de fase"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You phase-strike %s"
+msgstr "Le das un golpe de fase %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> phase-strikes %s"
+msgstr "<npcname> le da un golpe de fase %s"
 
 #: lang/json/technique_from_json.py
 msgid "Pressure Crunch"
@@ -174987,7 +178637,7 @@ msgstr ""
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr ""
 
@@ -174998,8 +178648,8 @@ msgstr ""
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -175009,7 +178659,7 @@ msgstr ""
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr ""
 
@@ -176230,7 +179880,7 @@ msgstr ""
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
 msgstr ""
 
@@ -176566,7 +180216,7 @@ msgstr ""
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr ""
 
@@ -176913,16 +180563,11 @@ msgstr "enebro"
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
-"Es una de las especies de 'Juniperus' que crece en New England, los frutos "
-"del enebro crecen en dos o tres años, luego de florecer. Al segundo año "
-"produce un fruto verde, al último, producen los más conocidos de color azul."
-" Si examinás el follaje más de cerca, podrías encontrar algunos racimos. "
-"También podrías talarlo con las herramientas adecuadas."
 
 #. ~ Description for juniper tree
 #: lang/json/terrain_from_json.py
@@ -177960,10 +181605,11 @@ msgstr "cajero automático"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -178068,8 +181714,8 @@ msgstr "centrifugadora"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -178687,7 +182333,7 @@ msgstr ""
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
 msgstr ""
@@ -178699,7 +182345,7 @@ msgstr ""
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
 msgstr ""
@@ -178792,6 +182438,13 @@ msgid ""
 " were still running."
 msgstr ""
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr ""
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "arenero"
@@ -178858,7 +182511,7 @@ msgstr ""
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr ""
 
@@ -178870,7 +182523,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
 msgstr ""
 
@@ -179764,7 +183417,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr ""
 
@@ -181085,12 +184738,8 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
-"¡Acabás de activar una granada! Probablemente quieras tirarla. Para tirar un"
-" objeto, apretá 't' y elegí lo que querés tirar. El alcance máximo depende "
-"de tu fuerza y del peso y tamaño del objeto. Tirar cosas no es lo mejor para"
-" un combate, pero si tenés artillería pesada..."
 
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
@@ -181192,14 +184841,10 @@ msgstr ""
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr ""
-"~ es un símbolo del terreno que indica agua. De una fuente de agua como "
-"esta, podés llenar los recipientes que tengas. Examiná el agua ('e') y "
-"apretá 'c' para llenar un recipiente, después seleccioná un recipiente "
-"hermético para poner el agua."
 
 #: lang/json/vehicle_from_json.py
 msgid "work light"
@@ -181545,6 +185190,10 @@ msgstr ""
 msgid "Rail Motorcycle"
 msgstr ""
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr ""
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "Camión de Plataforma"
@@ -182453,7 +186102,7 @@ msgstr ""
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
 msgstr ""
 
 #. ~ Description for shredder
@@ -182966,8 +186615,8 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr ""
 
 #. ~ Description for autoclave
@@ -183165,7 +186814,7 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
 msgstr ""
 
@@ -183813,6 +187462,14 @@ msgstr ""
 msgid "rail wheel (steerable)"
 msgstr ""
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr ""
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "tambor de apisonadora"
@@ -185589,6 +189246,10 @@ msgstr "Vitamina B12"
 msgid "Vitamin C"
 msgstr "Vitamina C"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr ""
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr "Apretá "
@@ -186124,7 +189785,7 @@ msgstr "Metés un cartucho en el/a %s."
 msgid "You refill the %s."
 msgstr "Rellenás el %s."
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "Ahí no hay nada para prender fuego."
 
@@ -186142,6 +189803,16 @@ msgstr ""
 "Ahora no hay suficiente luz solar para encender un fuego. Dejás de "
 "intentarlo."
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr ""
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "Aprendiste %s."
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -186152,11 +189823,6 @@ msgstr "Terminaste de entrenar %s al nivel %d."
 msgid "You get some training in %s."
 msgstr ""
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "Aprendiste %s."
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr ""
@@ -186275,15 +189941,22 @@ msgstr ""
 msgid "Your %s is already fully repaired."
 msgstr "Tu %s ya está completamente reparado."
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr "En este momento, no podés arreglar el/a %s."
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgstr ""
+
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr "Descongelás y calentás la comida."
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr "Calentás la comida."
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
-msgstr "Pudiste arreglar satisfactoriamente el/a %s."
+msgid "You are currently unable to mend the %s."
+msgstr "En este momento, no podés arreglar el/a %s."
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -186585,7 +190258,7 @@ msgstr "Terminaste de agujerear."
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr "hsh!"
 
@@ -187227,12 +190900,12 @@ msgstr ""
 "Reducción del movimiento. Depresión. Sistema inmunológico débil. Antojos frecuentes."
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
-msgstr "Percepción - 1; Inteligencia - 1; Antojos frecuentes."
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
-msgstr "Percepción - 2; Inteligencia - 2; Antojos frecuentes."
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
 msgid ""
@@ -187418,38 +191091,6 @@ msgstr "lug cant  peso  vol"
 msgid "Name (charges)"
 msgstr "Nombre (cargas)"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "¡No estás arrastrando ningún vehículo!"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "¡Sin vehículo arrastrado!"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "¡Recipiente no válido!"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "Los 9 espacios"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr " <color_white_red>FUEGO</color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr "PELIGRO"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr "TRAMPA"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr "AGUA"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -187573,7 +191214,39 @@ msgstr ""
 msgid "The destination is already full!"
 msgstr "¡El destino ya está lleno!"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "¡No estás arrastrando ningún vehículo!"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "¡Sin vehículo arrastrado!"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "¡Recipiente no válido!"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "Los 9 espacios"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr " <color_white_red>FUEGO</color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr "PELIGRO"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr "TRAMPA"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr "AGUA"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "Recipiente no válido"
 
@@ -187711,6 +191384,14 @@ msgstr "Golpe:"
 msgid "Cut:"
 msgstr "Corte: "
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr ""
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr ""
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "Ambiental: "
@@ -188396,19 +192077,15 @@ msgstr "%s Sufrimiento"
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
+"  Seeing this is a bug!"
 msgstr ""
-"El %s está de alguna manera insatisfecho incluso aunque no quería nada. ¡Ver"
-" esto es un bug!"
 
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
 msgstr ""
-"El %s está satisfecho, y debería estarlo porque no tiene ningún requisito. "
-"¡Ver esto es un bug!"
 
 #: src/artifact.cpp
 #, c-format
@@ -188433,10 +192110,8 @@ msgstr "Apretás tu %s contra tu piel."
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr ""
-"El %s está confundido al verte soñando mientras estás despierto. ¡Ver esto "
-"es un bug!"
 
 #: src/artifact.cpp
 #, c-format
@@ -189209,6 +192884,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr ""
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr "¿Qué querés hacer con tu %s?"
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr ""
@@ -189345,12 +193025,14 @@ msgstr ""
 "separado."
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
-msgstr "Ya no podés disparar."
+#, c-format
+msgid "You can no longer fire your %s."
+msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "¡Necesitás un brazo libre para manejar!"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -189358,8 +193040,9 @@ msgid "You need two free hands to fire your %s."
 msgstr "Necesitás las dos manos libres para poder disparar tu %s."
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "¡Necesitás recargar!"
+#, c-format
+msgid "Your %s is empty!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -189370,18 +193053,18 @@ msgstr "¡Tu %s necesita %i cargas para poder disparar!"
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
+"charges to fire the %s!"
 msgstr ""
-"¡Necesitás un UPS con %d cargas como mínimo o un UPS mejorado con %d cargas "
-"como mínimo para poder disparar eso!"
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
 msgstr ""
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
 msgstr ""
 
@@ -189616,6 +193299,16 @@ msgstr "Tus %s se desactivan automáticamente."
 msgid "Your %s automatically turns off."
 msgstr "Tu %s se desactiva automáticamente."
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "Te arrepentís y lo apagás."
@@ -189733,10 +193426,6 @@ msgstr "Resultado del Análisis de Sangre"
 msgid "No effects."
 msgstr "Sin efectos."
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr "¡No había suficiente humedad en el aire para poder extraer agua!"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr ""
@@ -189749,10 +193438,6 @@ msgstr ""
 msgid "Start a fire where?"
 msgstr "¿Dónde querés encender un fuego?"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "No podés encender un fuego ahí."
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -189929,6 +193614,20 @@ msgstr ""
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr ""
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -189957,6 +193656,21 @@ msgstr "Tu %s ha perdido conexión y se está apagando."
 msgid "You feel your throat open up and air filling your lungs!"
 msgstr "¡Sentís cómo se te abre la garganta y el aire llena tus pulmones!"
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr ""
@@ -190748,8 +194462,12 @@ msgstr "に坂索トし荷測のンおク妙免イロコヤ梅棋厚れ表幌"
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
-msgstr "vos"
+msgid "You"
+msgstr "Vos"
+
+#: src/character.cpp
+msgid "Your"
+msgstr ""
 
 #: src/character.cpp
 msgid "your"
@@ -190981,6 +194699,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr ""
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr "¡No podés poner objetos acá!"
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr "¡<npcname> no puede poner los objetos acá!"
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -191005,10 +194731,20 @@ msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr ""
 "<npcname> necesita por lo menos %1$s para usar este/a %2$s con su %3$s."
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr "No podés dejar de empuñar tu %s."
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr "El líquido de tu inventario se ha chorreado al suelo."
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr "Tu nivel actual de salud es %d."
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "Muerto/a de sed"
@@ -191078,6 +194814,78 @@ msgstr ""
 msgid "Your %s bionic shorts out!"
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "Tu %s será quemado/a por el frío en las próximas horas."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "¡Tu %s se te congelará en menos de una hora!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr "¡Tu %s se te congelará en cualquier momento!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr "¡Sentís tu %s comenzando a entumecerse por el frío!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr "Sentís que tu %s se está enfriando mucho."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr "Sentís que tu %s se está helando."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr "¡Sentís tu %s ardiendo del calor!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr "Sentís que tu %s se está poniendo muy caliente."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr "Sentís que tu %s se está entibiando."
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "El viento hace que tu %s se sienta bastante frío/a."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr ""
+"El viento es muy fuerte, deberías conseguir abrigo un poco más resistente al"
+" viento para tu %s."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr ""
+"¡Tu ropa no te brinda protección suficiente contra el viento para tu %s!"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "Brazo Izq."
@@ -191242,8 +195050,8 @@ msgstr ""
 msgid "Big"
 msgstr ""
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "Normal"
 
@@ -191347,6 +195155,32 @@ msgstr ""
 msgid "EXTRA_EXERCISE"
 msgstr ""
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr "¡Tu cuerpo se esfuerza en mantener tanto peso!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] "Tu %s necesita %d carga de algún UPS."
+msgstr[1] "Tu %s necesita %d cargas de algún UPS."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] "Tu %s tiene %d carga pero necesita %d."
+msgstr[1] "Tu %s tiene %d cargas pero necesita %d."
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "Tosés fuertemente."
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "una tos seca."
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr ""
@@ -191527,6 +195361,22 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr "Hibernación comenzada."
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr ""
+"Has aprendido %s por tu exhaustiva práctica con el Biónico de Pelea en "
+"espacios cerrados."
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr "%s para elegir el estilo de arte marcial."
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "Sin estilo"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "No Auto Agarrar"
@@ -191571,277 +195421,6 @@ msgid ""
 "this area."
 msgstr ""
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr "Cosas: Desordenadas"
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr ""
-"Lugar para dejar las cosas sin orden. Podés usar la acción de zona \"ordenar"
-" cosas\" para ordenar los objetos dentro. Se puede sobreponer con otras "
-"zonas de cosas."
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr "Cosas: Comida"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr ""
-"Lugar para lo comestible. Si no hay una zona más específica para la comida, "
-"va toda acá."
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr "Cosas: P.Comida"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr ""
-"Lugar para los comestibles perecederos. Incluye bebidas perecederas si no "
-"hay una zona específica para ellas."
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr "Cosas: Bebidas"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr ""
-"Lugar para las bebidas. Incluye bebidas perecederas si no hay una zona "
-"específica para ellas."
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr "Cosas: P.Bebidas"
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr "Lugar para bebidas perecederas."
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr "Cosas: Armas de Fuego"
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr "Lugar para armas de fuego, arcos y similares."
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr "Cosas: Cargadores"
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr "Lugar para cargadores de armas."
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr "Cosas: Munición"
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr "Lugar para la munición."
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr "Cosas: Armas"
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr "Lugar para las armas de cuerpo a cuerpo."
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr "Cosas: Herramientas"
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr "Lugar para herramientas."
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr "Cosas: Ropa"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr ""
-"Lugar para ropa. Incluye la ropa sucia si no hay una zona específica para "
-"ella."
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr "Cosas: Ropa Sucia"
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr "Lugar para la ropa sucia."
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr "Cosas: Drogas"
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr "Lugar para drogas y otros objetos médicos."
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr "Cosas: Libros"
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr "Lugar para libros y revistas."
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr "Cosas: Modificaciones"
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr "Lugar para modificaciones de armas de fuego y similares."
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr "Cosas: Mutágenos"
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr "Lugar para mutágenos, sueros y purificantes."
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr "Cosas: Biónicos"
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr "Lugar para Módulos Compactos de Biónicos, también conocidos como MCB."
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr "Cosas: Partes de Vehículos"
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr "Lugar para partes de vehículos."
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr "Cosas: Otros"
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr "Lugar para otros objetos varios."
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr "Cosas: Combustible"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr ""
-"Lugar para nafta, gasoil, aceite para lámpara y otras sustancias utilzadas "
-"como combustible."
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr "Cosas: Semillas"
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr "Lugar para semillas, tallos y similares."
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr "Cosas: Químicos"
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr "Lugar para químicos."
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr "Cosas: S.Partes"
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr "Lugar para partes sueltas."
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr "Cosas: Artefactos"
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr "Lugar para artefactos."
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr "Cosas: Armadura"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr ""
-"Lugar para armaduras. Incluye armaduras sucias si no hay una zona específica"
-" para ella."
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr "Cosas: Armadura Sucia"
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr "Lugar para armaduras sucias."
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr "Cosas: Madera"
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr "Lugar para leña y objetos que pueden usarse como tal."
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr "Cosas: Ignorar"
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr ""
-"Los objetos dentro de esta zona son ignorados por la acción \"ordenar "
-"cosas\"."
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr ""
@@ -191849,7 +195428,7 @@ msgstr ""
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
 msgstr ""
 
@@ -191909,6 +195488,16 @@ msgstr ""
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr ""
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr ""
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr ""
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
 msgstr ""
@@ -193231,26 +196820,6 @@ msgstr "Sentís que el/a %s te llena."
 msgid "<npcname> looks better after eating the %s."
 msgstr "<npcname> se ve mejor después de comerse el/a %s."
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "Tu almacenamiento interno de energía está completamente cargado."
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr ""
-"El almacenamiento interno de energía de <npcname> está completamente "
-"cargado."
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr "Recargás tu sistema de batería con el %s."
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr "<npcname> recarga su sistema de batería con el %s."
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr "Eso es MUCHO plutonio. ¿Estás seguro de que querés tanto?"
@@ -194269,6 +197838,10 @@ msgstr ""
 msgid "Toggle display temperature"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr ""
@@ -194309,6 +197882,10 @@ msgstr ""
 msgid "Print faction info to console"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Test weather"
 msgstr ""
@@ -194588,6 +198165,10 @@ msgstr "Ventana de Estado [@]"
 msgid "t[e]leport"
 msgstr "t[e]letransportar"
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr "Editar [M]isiones (CUIDADO: ¡Inestable!)"
@@ -195174,10 +198755,12 @@ msgstr ""
 msgid "Spell"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
 msgstr ""
@@ -197218,6 +200801,14 @@ msgstr ", Administrador de Campamento"
 msgid "%s has abandoned the camp."
 msgstr "%s ha abandonado el campamento."
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr "Expansión"
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr "Recuperar Aliado"
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -197233,59 +200824,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr "Distribuir Comida"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr "Resetear Puntos de Orden"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -197320,23 +200858,6 @@ msgid ""
 "Positions: %d/1\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -197499,14 +201020,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr "Expansión"
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr "Recuperar Aliado"
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -197588,6 +201101,61 @@ msgid ""
 "Positions: 0/1\n"
 msgstr ""
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr "Distribuir Comida"
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -197598,6 +201166,10 @@ msgid ""
 "Companions must be on missions for at least 24 hours before emergency recall becomes available."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr ""
@@ -197634,10 +201206,6 @@ msgstr ""
 msgid "departs to search for recruits…"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr ""
@@ -197927,7 +201495,7 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
 
@@ -198102,8 +201670,7 @@ msgstr ""
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
+"create a camp food zone, and a camp storage zone."
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -198133,18 +201700,18 @@ msgstr ">Recorridos: %15d (m)\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
-msgstr ">Viaje:  %23s\n"
+msgid ">Travel:  %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
-msgstr ">Trabajo: %23s\n"
+msgid ">Working: %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
-msgstr "Total:    %23s\n"
+msgid "Total:    %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -198200,8 +201767,8 @@ msgstr "Necesita Arar: "
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
-msgstr "Nombre:     %25s\n"
+msgid "Name:     %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 msgid "----          Engines          ----\n"
@@ -198209,8 +201776,8 @@ msgstr "----          Motores          ----\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
-msgstr "Motor:  %25s\n"
+msgid "Engine:   %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -198219,8 +201786,8 @@ msgstr ">Estado:  %24d%%\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
-msgstr ">Combustible:    %25s\n"
+msgid ">Fuel:    %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 msgid "----  Fuel Storage & Battery   ----\n"
@@ -199693,7 +203260,7 @@ msgstr "¡Necesitás por lo menos un/a %s para recargar el/a %s!"
 msgid "The %s is already full!"
 msgstr "¡El %s ya está lleno!"
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr "¡No podés recargar un/a %s!"
@@ -199781,6 +203348,19 @@ msgstr "¿Seguro? ¿Querés meterte en %s?"
 msgid "Your %s refuses to move over that ledge!"
 msgstr ""
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr ""
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr ""
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "No se encuentra objeto agarrado."
@@ -199975,6 +203555,16 @@ msgstr "¡Te esforzás mucho tratando de mover el pesado %s!"
 msgid "There's stuff in the way."
 msgstr "Hay cosas en el medio."
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr ""
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -200300,7 +203890,7 @@ msgstr ""
 " extraños (por ejemplo, cuadrados vacíos o signos de interrogación). Quedás "
 "advertido."
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr "De repente, sentís un dolor agudo sin razón aparente."
 
@@ -200585,10 +204175,6 @@ msgstr "FRESCURA"
 msgid "SPOILS IN"
 msgstr "SE PUDRE EN"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "Batería"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "Reactor"
@@ -200613,10 +204199,6 @@ msgstr "No podés tomar líquidos derramados"
 msgid "Your biology is not compatible with that item."
 msgstr ""
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr "Ya estás completamente cargado/a"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -200709,10 +204291,6 @@ msgid_plural "Needs at least %d charges"
 msgstr[0] "Necesita por lo menos %d carga"
 msgstr[1] "Necesita por lo menos %d cargas"
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr ""
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "Usar objeto"
@@ -200929,11 +204507,6 @@ msgstr ""
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr ""
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr ""
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -202058,8 +205631,8 @@ msgid "Purchase cash card?"
 msgstr "¿Comprar tarjeta de crédito?"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
-msgstr "Necesitás $1.00 en tu cuenta para poder comprar una tarjeta."
+msgid "You need $10.00 in your account to purchase a card."
+msgstr ""
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -202102,7 +205675,7 @@ msgstr "Tu cuenta ahora tiene %s."
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
 msgstr ""
 
 #: src/iexamine.cpp
@@ -202387,7 +205960,8 @@ msgstr ""
 "La caja fuerte de armas no cede a tus intentos de forzar la cerradura."
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
 msgstr ""
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
@@ -202396,6 +205970,16 @@ msgstr ""
 msgid "You attempt to pry open the %1$s using your %2$s…"
 msgstr ""
 
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
+msgstr ""
+
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
 msgstr ""
@@ -202865,6 +206449,10 @@ msgstr ""
 msgid "You weren't able to start a fire."
 msgstr ""
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "No podés encender un fuego ahí."
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -203585,6 +207173,17 @@ msgstr ""
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr ""
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr ""
@@ -204125,6 +207724,10 @@ msgstr "Conexiones de mapa"
 msgid "Overmap specials"
 msgstr "Especiales de mapa"
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "Lugares del mapa"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr "Prototipos de vehículos"
@@ -204181,6 +207784,10 @@ msgstr "Listas de cosecha"
 msgid "Anatomies"
 msgstr "Anatomías"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "Mutaciones"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "Tileset"
@@ -204225,18 +207832,10 @@ msgstr "Profesiones"
 msgid "Scenarios"
 msgstr "Escenarios"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "Mutaciones"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "Categorías de Mutaciones"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "Lugares del mapa"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr ""
@@ -204604,14 +208203,6 @@ msgstr ""
 msgid "Page %d/%d"
 msgstr "Página %d/%d"
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "OBJETOS PUESTOS"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "ARMA EMPUÑADA"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -205068,11 +208659,9 @@ msgstr ""
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
 msgstr ""
-"Esta comida ha empezado a <bad>pudrirse</bad>. Sería una <bad>muy mala "
-"idea</bad> <info>comerla</info>."
 
 #: src/item.cpp
 #, c-format
@@ -205143,13 +208732,6 @@ msgstr ""
 msgid "This ammo <neutral>starts fires</neutral>."
 msgstr ""
 
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr ""
-"Se muestran las características de la <info>modificación del arma "
-"(%s)</info> activa."
-
 #: src/item.cpp
 msgid "Skill used: "
 msgstr "Habilidad usada: "
@@ -205294,8 +208876,9 @@ msgid "Used on: "
 msgstr "Se usa en: "
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "Lugar:"
+#, c-format
+msgid "Location: %s"
+msgstr ""
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -205824,42 +209407,45 @@ msgid ""
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
+msgid "<info>can be upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
+msgid "<info>can be downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
+msgid "<bad>can not be downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
+msgid "<bad>can not be upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
+#, c-format
+msgid "* This clothing %s."
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
+msgid " and <info>upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
+msgid " and <info>downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
+msgid " but <bad>not downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
+msgid " but <bad>not upsized</bad>"
+msgstr ""
+
+#: src/item.cpp
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
 msgstr ""
 
 #: src/item.cpp
@@ -205960,6 +209546,20 @@ msgstr ""
 msgid "This bionic is installed in the following body part(s):"
 msgstr "Este biónico se instala en las siguientes partes del cuerpo:"
 
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr ""
+
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr ""
+
 #: src/item.cpp
 msgid "<bold>Encumbrance:</bold> "
 msgstr ""
@@ -206091,6 +209691,13 @@ msgstr "Lo podés usar para fabricar varios objetos más."
 msgid "You could use it to craft: %s"
 msgstr "Se puede usar para fabricar: %s"
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr ""
+"Se muestran las características de la <info>modificación del arma "
+"(%s)</info> activa."
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -207303,8 +210910,8 @@ msgid "You do not have that item!"
 msgstr "¡No tenés eso!"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
-msgstr "¿Qué señal activa el objeto?:"
+msgid "Which signal should activate the item?"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "\"Blue\""
@@ -207554,16 +211161,6 @@ msgstr "¡KXSHHHHRRCRKLKKK!"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr "El barullo infernal se termina cuando el emisor de ruido se apaga."
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr "Aprendés los elementos esenciales del %s."
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr "%s para elegir el estilo de arte marcial."
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr "Sacás a la fuerza el poste de la valla."
@@ -207985,18 +211582,27 @@ msgid "Scan the ground"
 msgstr "Escanear el suelo"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "Escanearte a vos"
+msgid "Scan yourself or other person"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "Encender escaneo continuo"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr ""
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -208065,6 +211671,10 @@ msgstr "¡Tick!"
 msgid "You've already released the handle, try throwing it instead."
 msgstr "Ya soltaste la palanca, ahora intentá tirarla."
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "¡Necesitás una fuente de fuego!"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr "¡Encendiste la flecha!"
@@ -208562,10 +212172,6 @@ msgstr ""
 msgid "You mop up the spill."
 msgstr "Limpiás el derrame con el lampazo."
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr ""
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr "La tela del espacio parece estar en descomposición."
@@ -208627,17 +212233,9 @@ msgid "You don't have appropriate food to heat up."
 msgstr "No tenés la comida apropiada para calentar."
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgid "You start heating up the food."
 msgstr ""
 
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
-msgstr "Descongelás y calentás la comida."
-
-#: src/iuse.cpp
-msgid "You heat up the food."
-msgstr "Calentás la comida."
-
 #: src/iuse.cpp
 msgid "There is no fire around, use your integrated toolset instead?"
 msgstr "No hay ningún fuego cerca, ¿querés usar tus herramientas integradas?"
@@ -209660,8 +213258,8 @@ msgid "Your %s is too heavy or bulky for this RC car."
 msgstr "Tu %s es demasiado pesado o incómodo para este auto a control remoto."
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
-msgstr "Desarmás el auto radiocontrolado"
+msgid "You disarmed your RC car."
+msgstr ""
 
 #. ~Sound of a radio controlled car moving around
 #: src/iuse.cpp
@@ -209673,12 +213271,12 @@ msgid "What to do with activated RC car?"
 msgstr "¿Qué querés hacer con el auto radiocontrolado activado?"
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
-msgstr "Apagás tu auto radiocontrolado"
+msgid "You turned off your RC car."
+msgstr ""
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
-msgstr "bip."
+#: src/iuse.cpp
+msgid "beep"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Take control of RC car"
@@ -209715,11 +213313,16 @@ msgstr "Tomás el control del auto radiocontrolado."
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
+msgstr ""
+
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
 "sending the signal."
 msgstr ""
-"El %s en tu inventario explotará con esta señal. Ponelo en algún lugar antes"
-" de mandarle la señal."
 
 #: src/iuse.cpp
 msgid "This vehicle's security system has locked you out!"
@@ -211521,9 +215124,29 @@ msgstr ""
 msgid "How do you want to modify it?"
 msgstr "¿Cómo querés modificarlo?"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
 msgstr ""
 
 #: src/iuse_actor.cpp
@@ -212934,6 +216557,23 @@ msgstr ""
 msgid "All knowledge of %s leaves you."
 msgstr ""
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr ""
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr ""
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr ""
@@ -212942,6 +216582,10 @@ msgstr ""
 msgid "Popup Distractions"
 msgstr ""
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr ""
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr ""
@@ -213006,6 +216650,15 @@ msgstr ""
 msgid "Casting Cost (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr ""
@@ -213014,6 +216667,10 @@ msgstr ""
 msgid "Casting Time (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+msgid "self"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr ""
@@ -213027,29 +216684,37 @@ msgid "Healing"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Variance"
+msgid "Spell Radius"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spawn"
+msgid "Cone Arc"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Summon"
+msgid "degrees"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spell Radius"
+msgid "Line Width"
 msgstr ""
 
-#: src/magic.cpp src/veh_interact.cpp
-msgid "Range"
-msgstr "Alcance"
+#: src/magic.cpp
+msgid "Variance"
+msgstr ""
 
 #: src/magic.cpp
-msgid "self"
+msgid "Spawn"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Summon"
 msgstr ""
 
+#: src/magic.cpp src/veh_interact.cpp
+msgid "Range"
+msgstr "Alcance"
+
 #: src/magic.cpp
 msgid "Duration"
 msgstr ""
@@ -213074,18 +216739,22 @@ msgstr ""
 msgid "Damage Type"
 msgstr ""
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr ""
@@ -213134,6 +216803,11 @@ msgstr ""
 msgid "No valid targets to teleport."
 msgstr ""
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr ""
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr ""
@@ -213274,6 +216948,10 @@ msgstr ""
 msgid "Unable to make sound directory.  Check permissions."
 msgstr ""
 
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr ""
+
 #: src/main_menu.cpp
 msgid "Really quit?"
 msgstr "¿Querés salir?"
@@ -213966,7 +217644,7 @@ msgstr ""
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
+msgid "The %1$s is not a valid %2$s weapon."
 msgstr ""
 
 #: src/martialarts.cpp
@@ -214395,13 +218073,6 @@ msgid_plural "%d enemies hit!"
 msgstr[0] "¡%d enemigo golpeado!"
 msgstr[1] "¡%d enemigos golpeados!"
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr ""
-"Has aprendido %s por tu exhaustiva práctica con el Biónico de Pelea en "
-"espacios cerrados."
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -216745,19 +220416,43 @@ msgid "You don't have any companions to send out…"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
+msgid "Who do you want to send?"
+msgstr "¿A quién querés enviar?"
+
+#: src/mission_companion.cpp
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
 msgstr ""
-"¿A quién querés enviar?                    [ COMBATE : SUPERVIVENCIA : "
-"INDUSTRIA ]"
 
+#. ~ %1$s: npc name
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
-msgstr "¡El compañero que elegiste no tiene esas habilidades!"
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
+msgstr ""
+
+#: src/mission_companion.cpp
+msgid "You choose to send no one…"
+msgstr ""
 
 #: src/mission_companion.cpp
 msgid "You don't have any companions ready to return…"
@@ -218491,6 +222186,11 @@ msgstr "¡El brazo de %1$s golpea tu %2$s, pero rebota en tu armadura!"
 msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr "¡El/a %1$s golpea el/a %2$s de <npcname>, pero rebota en la armadura!"
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr ""
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -218699,11 +222399,6 @@ msgstr "¡Cuando el %s es golpeado, suelta ácido!"
 msgid "zombie slave"
 msgstr "esclavo zombi"
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr "¿Qué querés hacer con tu %s?"
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -219107,22 +222802,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr "pequeño"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr "chico"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr "mediano"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr "grande"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr "enorme"
 
@@ -219187,6 +222887,16 @@ msgstr ""
 msgid "wearing %1$s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr "El %s"
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr ""
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -219229,6 +222939,11 @@ msgstr ""
 msgid "Rider: %s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr ""
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr ""
@@ -219890,8 +223605,8 @@ msgid "Crossed a threshold"
 msgstr "Cruzó un umbral"
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
-msgstr "¡Uh, sí! ¡Eso está bueno!"
+msgid "Oh, yeah!  That's the stuff!"
+msgstr ""
 
 #: src/mutation_ui.cpp
 msgid "Reassigning."
@@ -220906,7 +224621,7 @@ msgstr "Enojo:"
 msgid "%s disappears."
 msgstr ""
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "¡%s se muere!"
@@ -221648,6 +225363,16 @@ msgstr "Tengo noticias."
 msgid "Yes, let's resume training "
 msgstr "Sí, sigamos entrenando."
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr ""
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr ""
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -221816,10 +225541,6 @@ msgstr ""
 msgid "I need a %s to consume that!"
 msgstr "¡Necesito un/a %s para consumir eso!"
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr "No parece una buena idea consumir esto..."
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr "¿Qué querés ofrecer?"
@@ -221897,6 +225618,11 @@ msgstr ""
 msgid "My current location"
 msgstr ""
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -221929,10 +225655,6 @@ msgstr "¿Qué biónico querés desinstalar?"
 msgid "You decide to hold off…"
 msgstr ""
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr ""
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -221999,6 +225721,11 @@ msgstr "¡%s empieza a huir!"
 msgid "%s leaves."
 msgstr "%s se va."
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -222059,6 +225786,11 @@ msgstr "Más >"
 msgid "Examine which item?"
 msgstr "¿Cuál examinar?"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr ""
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -222402,12 +226134,9 @@ msgstr "Turnos para auto reactivar modo seguro"
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
 msgstr ""
-"Número de turnos que pasarán para que el modo seguro sea reactivado. Solo se"
-" reacivará si no hay hostiles en la 'Distancia de proximidad de modo "
-"seguro'."
 
 #: src/options.cpp
 msgid "Turns to remember ignored monsters"
@@ -222517,12 +226246,9 @@ msgstr "Soltar recipientes vacíos"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
 msgstr ""
-"Podés activar soltar los recipientes que quedan vacíos luego de utilizarse. "
-"No: no soltar nada. - Hermético: soltar todo excepto los recipientes "
-"herméticos. - Todo: soltar todos los recipientes."
 
 #: src/options.cpp
 msgid "Watertight"
@@ -222697,13 +226423,12 @@ msgstr ""
 "un objeto."
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "Preguntar antes de desarmar"
+msgid "Query on disassembly while butchering"
+msgstr ""
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
+msgid "If true, will query before disassembling items while butchering."
 msgstr ""
-"Si está activado, se te pedirá confirmación antes de desarmar un objeto."
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -222997,9 +226722,9 @@ msgstr "Letras de inventario automáticas"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
 msgstr ""
 
 #: src/options.cpp
@@ -223381,7 +227106,7 @@ msgstr ""
 msgid "Display"
 msgstr "Pantalla"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr ""
@@ -223477,7 +227202,7 @@ msgid "Scaling factor"
 msgstr ""
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
+msgid "Factor by which to scale the display.  Requires restart."
 msgstr ""
 
 #: src/options.cpp
@@ -223787,8 +227512,8 @@ msgstr ""
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
 msgstr ""
 
@@ -223798,9 +227523,9 @@ msgstr ""
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
 msgstr ""
 
 #: src/options.cpp
@@ -223870,11 +227595,9 @@ msgstr "PNJ estáticos"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
 msgstr ""
-"Si está activado, se generarán PNJ estáticos en las locaciones predefinidas."
-" Necesita resetear el mundo para activarse."
 
 #: src/options.cpp
 msgid "Starting NPCs spawn"
@@ -225162,6 +228885,7 @@ msgstr ""
 msgid "Underground"
 msgstr "Bajo tierra"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
 msgstr ""
@@ -225223,10 +228947,6 @@ msgstr "¡Sordo!"
 msgid "Weapon  :"
 msgstr ""
 
-#: src/panels.cpp
-msgid "No Style"
-msgstr "Sin estilo"
-
 #: src/panels.cpp
 msgid "Day "
 msgstr ""
@@ -225239,10 +228959,12 @@ msgstr ""
 msgid "to open sidebar options"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
 msgstr ""
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
 msgstr ""
@@ -225500,78 +229222,6 @@ msgstr ""
 msgid "You have learned a new style: %s!"
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "Tu %s será quemado/a por el frío en las próximas horas."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "¡Tu %s se te congelará en menos de una hora!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr "¡Tu %s se te congelará en cualquier momento!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr "¡Sentís tu %s comenzando a entumecerse por el frío!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr "Sentís que tu %s se está enfriando mucho."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr "Sentís que tu %s se está helando."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr "¡Sentís tu %s ardiendo del calor!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr "Sentís que tu %s se está poniendo muy caliente."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr "Sentís que tu %s se está entibiando."
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "El viento hace que tu %s se sienta bastante frío/a."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr ""
-"El viento es muy fuerte, deberías conseguir abrigo un poco más resistente al"
-" viento para tu %s."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr ""
-"¡Tu ropa no te brinda protección suficiente contra el viento para tu %s!"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "¡Rodás por el suelo, intentando apagar el fuego!"
@@ -225947,14 +229597,6 @@ msgstr "Las heridas desinfectadas en tu %s han sanado."
 msgid "There is not enough %s left to siphon it."
 msgstr "No queda suficiente %s para chuparlo."
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "Tosés fuertemente."
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "una tos seca."
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "¡Tu cuerpo se retuerce por el dolor insoportable!"
@@ -226000,11 +229642,6 @@ msgstr "¡Te duele el/a %s!"
 msgid "Your %s aches."
 msgstr "Sentís dolor en el/a %s."
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr "Tu nivel actual de salud es %d."
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -226031,428 +229668,6 @@ msgstr "Algo se retuerce y muere adentro tuyo."
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "Tus intestinos borbotean ya que algo dentro se murió."
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr "Estás demasiado deshidratado para mantener funcionando tu %s."
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr "Estás demasiado exhausto para mantener funcionando tu %s."
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "¡Te estás ahogando!"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr ""
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "BZZZZZ"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "De repente, te sentís adormecido."
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "De repente, sentís dolor."
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "Te sentiste mareado por un momento."
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "De repente, tenés hambre."
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "De repente, de sentís un poco lleno."
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "De repente, sentís sed."
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "Repentinamente, te sentís fatigado."
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "De repente, sentís mucho frío."
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "De repente, sentís frío."
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "De repente, sentís mucho calor."
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "De repente, sentís calor."
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr "¡%1$s se enoja!"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr "%1$s dice: \"%2$s\""
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "Empezás a temblar descontroladamente."
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr ""
-"De repente, la urgencia por dormir te gana la batalla y caes desmayado/a."
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "¡Tenés un ataque de asma!"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr "Usás tu Oxigenador para aclarlo, y seguís durmiendo."
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr "Usás tu inhalador y seguís durmiendo."
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "Usás la última carga de tu inhalador."
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] "Usás tu inhalador, y te queda %d cargas más."
-msgstr[1] "Usás tu inhalador, y te quedan %d cargas más."
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "La luz del sol te está irritando mucho los ojos."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "¡La luz del sol te quema la piel!"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "La luz del sol te distrae."
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "¡No soportás la luz del sol!"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "¡De repente, no podés oir nada!"
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "¡De repente, tus ojos dejaron de funcionar!"
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr "Sentís una sensación anómala viniendo de tus sensores de radiación."
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr ""
-"¡Te quema el pecho porque tus sistemas de energía están sobrecargados!"
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "¡Sufrís una dolorosa descarga eléctrica!"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr "Parece que el %s ha sido afectado por la descarga."
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "¡Sufrís una descarga ardiente de ácido!"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "Tus baterías se descargan un poco."
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "¡Un biónico emite un ruido como un crujido!"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "Sentís escalofríos en tus biónicos defectuosos."
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "¡Tu visión se pixela!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr "¡Tu biónico que falla te causa un espasmo y te caés al suelo!"
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr ""
-"Tus biónicos entran en cortocircuito, lo que te hace estremecer y temblar."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "¡Tu biónico que falla te pica!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr "¡Sentís espasmos musculares!"
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr "¡Te caés al suelo!"
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr "Sentís que te falta el aliento."
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr "Temblás descontroladamente."
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr "¡Te desvaneciste!"
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "Tu respiración comienza a ser más lenta."
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr "¡Te tropezás y te caés!"
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr "Te frotás los ojos, cansado/a."
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr ""
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr "Se te escapa un pequeño bostezo."
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr "Estirás la espalda."
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr "Te sentís mentalmente cansado/a."
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr "Por un momento, te sentís un poco mareado/a."
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr "Sentís incómodos espamos musculares."
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr "Se te nubla la visión un poco."
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr "Tu mente cae en la inconsciencia por un instante."
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr "Te duelen los músculos de una forma estresante e impredecible."
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr "Tenés un dolor de cabeza que te distrae."
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr "Sentís un ardor en el estómago y un gusto ácido en la boca."
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr ""
-"Tu mente está tan cansada que sentís que no podés confiar en tus ojos."
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr ""
-"Tenés espasmos musculares incontrolables, y te cuesta mantener el "
-"equilibrio."
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr "Tropezás por culpa de tus piernas temblorosas."
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr "¡Te caés!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr "¡Tu placa dosimétrica pasa de %1$s a %2$s!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr "¡Tu %s empezó a sanar!"
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr "Desde el %1$s escuchás %2$s"
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr ""
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr ""
@@ -226671,11 +229886,6 @@ msgstr "El/a %s no puede ser empuñado/a con una sola mano."
 msgid "You are too weak to wield %s with only one arm."
 msgstr "Sos demasiado débil para empuñar %s con una sola mano."
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr "No podés dejar de empuñar tu %s."
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "Manos libres (no)"
@@ -226751,20 +229961,43 @@ msgstr "El/a %s no tiene niguna falla para arreglar."
 msgid "Mend which fault?"
 msgstr "¿Qué falla querés arreglar?"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white>Tiempo necesario:</color>\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr ""
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white>Habilidades:</color>\n"
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr ""
+
+#: src/player.cpp
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "Skills: %s\n"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr ""
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
-msgstr "> <color_%1$s>%2$s %3$i</color>\n"
+msgid "You are currently unable to mend the %s this way."
+msgstr ""
 
 #: src/player.cpp
 msgid "You are already wearing that."
@@ -226882,14 +230115,6 @@ msgstr "Te sacás tu %s."
 msgid "<npcname> takes off their %s."
 msgstr "<npcname> se saca su %s."
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr "¡No podés poner objetos acá!"
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr "¡<npcname> no puede poner los objetos acá!"
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -226937,20 +230162,6 @@ msgstr "Recuperás %i de plutonio sin utilizar."
 msgid "You can't remove partially depleted plutonium!"
 msgstr "¡No podés quitar plutonio parcialmente agotado!"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] "Tu %s necesita %d carga de algún UPS."
-msgstr[1] "Tu %s necesita %d cargas de algún UPS."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] "Tu %s tiene %d carga pero necesita %d."
-msgstr[1] "Tu %s tiene %d cargas pero necesita %d."
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -227127,10 +230338,6 @@ msgstr "¡Intentás esquivar pero no hay lugar!"
 msgid "%s tries to dodge but there's no room!"
 msgstr "¡%s intenta esquivar pero no hay lugar!"
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr "¡Tu cuerpo se esfuerza en mantener tanto peso!"
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -227186,6 +230393,13 @@ msgstr ""
 msgid "Pain "
 msgstr ""
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr ""
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -227412,47 +230626,57 @@ msgstr "Velocidad actual:"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
-msgstr "Sobrecargado        -%s%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
-msgstr "Dolor               -%s%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
-msgstr "Sed                 -%s%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr ""
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
-msgstr "Sin Luz Solar       -%s%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
+msgstr ""
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
-msgstr "Rápido              +%s%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
-msgstr "Velocidad Biónica   +%s%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
@@ -227663,8 +230887,8 @@ msgid "\"Oh God, what's happening?\""
 msgstr "\"Oh Dios, ¿qué está pasando?\""
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
-msgstr "\"Por supuesto... ¡son todos fractales!\""
+msgid "\"Of course… it's all fractals!\""
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "\"Huh?  What was that?\""
@@ -227699,9 +230923,8 @@ msgid "You quiver from the cold."
 msgstr "Estás temblando de frío."
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
+msgid "Your torso is freezing cold.  You should put on a few more layers."
 msgstr ""
-"Se te está congelando el torso. Tendrías que ponerte algo más de ropa."
 
 #: src/player_hardcoded_effects.cpp
 msgid "Your shivering makes you unsteady."
@@ -228092,6 +231315,47 @@ msgstr ""
 msgid "Your alarm went off."
 msgstr ""
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr ""
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -228513,10 +231777,6 @@ msgstr "¡kerblam!"
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>nada</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr ""
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -228754,12 +232014,6 @@ msgstr ""
 msgid "KILLS"
 msgstr ""
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr ""
-"Establece qué monitor será usado para mostrar el juego. Necesita reiniciar."
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr ""
@@ -228772,6 +232026,10 @@ msgstr "¡De repente, te duelen los tímpanos!"
 msgid "Something is making noise."
 msgstr "Algo está haciendo ruido."
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr ""
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -228787,6 +232045,11 @@ msgstr ""
 msgid "You hear %1$s"
 msgstr ""
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr "Desde el %1$s escuchás %2$s"
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "Tu reloj alarma consigue despertarte finalmente."
@@ -228818,6 +232081,416 @@ msgstr ""
 msgid "d: delete history"
 msgstr "d: borrar historial"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr "Estás demasiado deshidratado para mantener funcionando tu %s."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr "Estás demasiado exhausto para mantener funcionando tu %s."
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "¡Te estás ahogando!"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr ""
+"De repente, la urgencia por dormir te gana la batalla y caes desmayado/a."
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "De repente, te sentís adormecido."
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "De repente, sentís dolor."
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "Te sentiste mareado por un momento."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "De repente, tenés hambre."
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "De repente, de sentís un poco lleno."
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "De repente, sentís sed."
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "Repentinamente, te sentís fatigado."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "De repente, sentís mucho frío."
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "De repente, sentís frío."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "De repente, sentís mucho calor."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "De repente, sentís calor."
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "Empezás a temblar descontroladamente."
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr "%1$s dice: \"%2$s\""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr "¡%1$s se enoja!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "¡Tenés un ataque de asma!"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr "Usás tu Oxigenador para aclarlo, y seguís durmiendo."
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr "Usás tu inhalador y seguís durmiendo."
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "Usás la última carga de tu inhalador."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] "Usás tu inhalador, y te queda %d cargas más."
+msgstr[1] "Usás tu inhalador, y te quedan %d cargas más."
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "¡La luz del sol te quema la piel!"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "La luz del sol te distrae."
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "¡No soportás la luz del sol!"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "La luz del sol te está irritando mucho los ojos."
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr ""
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "BZZZZZ"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "¡De repente, no podés oir nada!"
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "¡De repente, tus ojos dejaron de funcionar!"
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr "Sentís una sensación anómala viniendo de tus sensores de radiación."
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr ""
+"¡Te quema el pecho porque tus sistemas de energía están sobrecargados!"
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "¡Sufrís una dolorosa descarga eléctrica!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr "Parece que el %s ha sido afectado por la descarga."
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "¡Sufrís una descarga ardiente de ácido!"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "Tus baterías se descargan un poco."
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "¡Un biónico emite un ruido como un crujido!"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "Sentís escalofríos en tus biónicos defectuosos."
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "¡Tu visión se pixela!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr "¡Tu biónico que falla te causa un espasmo y te caés al suelo!"
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr ""
+"Tus biónicos entran en cortocircuito, lo que te hace estremecer y temblar."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "¡Tu biónico que falla te pica!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr "¡Sentís espasmos musculares!"
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr "¡Te caés al suelo!"
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr "Sentís que te falta el aliento."
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr "Temblás descontroladamente."
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr "¡Te desvaneciste!"
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "Tu respiración comienza a ser más lenta."
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr "¡Te tropezás y te caés!"
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr "Te frotás los ojos, cansado/a."
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr "Se te escapa un pequeño bostezo."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr "Estirás la espalda."
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr "Te sentís mentalmente cansado/a."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr "Por un momento, te sentís un poco mareado/a."
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr "Sentís incómodos espamos musculares."
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr "Se te nubla la visión un poco."
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr "Tu mente cae en la inconsciencia por un instante."
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr "Te duelen los músculos de una forma estresante e impredecible."
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr "Tenés un dolor de cabeza que te distrae."
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr "Sentís un ardor en el estómago y un gusto ácido en la boca."
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr ""
+"Tu mente está tan cansada que sentís que no podés confiar en tus ojos."
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr ""
+"Tenés espasmos musculares incontrolables, y te cuesta mantener el "
+"equilibrio."
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr "Tropezás por culpa de tus piernas temblorosas."
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr "¡Te caés!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr "¡Tu placa dosimétrica pasa de %1$s a %2$s!"
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr "¡Tu %s empezó a sanar!"
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr ""
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr ""
@@ -228967,8 +232640,8 @@ msgstr ""
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "El %s se tropieza sobre el catre"
+msgid "The %s stumbles over the cot!"
+msgstr ""
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -229123,11 +232796,6 @@ msgstr "Un lazo se cierra en tu pierna."
 msgid "A snare closes on <npcname>s leg."
 msgstr "Un lazo se cierra en la pierna de <npcname>."
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr ""
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -229355,6 +233023,13 @@ msgstr "¡<npcname> cayó un nivel!"
 msgid "You fall down under %s!"
 msgstr "¡Te caés abajo de %s!"
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname> bate sus alas y baja aleteando elegantemente."
@@ -229491,6 +233166,10 @@ msgstr ""
 msgid "Select part"
 msgstr "Elegir parte"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white>Tiempo necesario:</color>\n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr "<color_white>Habilidades necesarias:</color>\n"
@@ -231939,8 +235618,8 @@ msgstr "@ %d: %s  "
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
-msgstr "Establecer '%s' en.."
+msgid "Set '%s' to…"
+msgstr ""
 
 #: src/wish.cpp
 msgid " (current)"
diff --git a/lang/po/es_ES.po b/lang/po/es_ES.po
index 03f9b43619402..8f0d0fc615bfa 100644
--- a/lang/po/es_ES.po
+++ b/lang/po/es_ES.po
@@ -5,18 +5,18 @@
 # keno xite <kenoxite@gmail.com>, 2019
 # Emma Forner, 2019
 # lokatronao <lokatronao@gmail.com>, 2019
-# Brett Dong <brett.browning.dong@gmail.com>, 2019
 # Vlasov Vitaly <vnigtha@gmail.com>, 2019
 # Toni López <roosterfarlopez@gmail.com>, 2019
 # Miguel de Dios Matias <tres.14159@gmail.com>, 2019
+# Brett Dong <brett.browning.dong@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
-"Last-Translator: Miguel de Dios Matias <tres.14159@gmail.com>, 2019\n"
+"Last-Translator: Brett Dong <brett.browning.dong@gmail.com>, 2019\n"
 "Language-Team: Spanish (Spain) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -204,6 +204,19 @@ msgstr ""
 msgid "watery plutonium slurry"
 msgstr "lodo acuosa de plutonio"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr ""
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr ""
+"Es una piedra del tamaño de una pelota de tenis. Funciona bien como arma de "
+"cuerpo a cuerpo, y también se puede tirar a los enemigos."
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "guijarro"
@@ -708,12 +721,8 @@ msgstr "cohete casero con pinchos"
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
+" of this grade of weapon, but packs a fierce punch… if it hits."
 msgstr ""
-"Un misil casero, que consiste en una punta soldada a un tubo que fue "
-"rellenado con combustible improvisado para misiles. Es espantosamente poco "
-"preciso, como puede esperarse de este tipo de armas, pero tiene un impacto "
-"potente... si es que acierta."
 
 #: lang/json/AMMO_from_json.py
 msgid "explosive home-made rocket"
@@ -765,8 +774,8 @@ msgstr ""
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1234,8 +1243,8 @@ msgstr[1] ""
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1247,7 +1256,7 @@ msgstr[1] ""
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr ""
@@ -1261,10 +1270,10 @@ msgstr[1] ""
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1276,8 +1285,8 @@ msgstr[1] ""
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
 msgstr ""
 
@@ -1309,9 +1318,9 @@ msgstr[1] ""
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1605,8 +1614,8 @@ msgstr[1] ""
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -2000,7 +2009,7 @@ msgstr[1] ""
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
 msgstr ""
@@ -3475,41 +3484,47 @@ msgid "reloaded .460 Rowland"
 msgstr ".460 Rowland recargada"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr ".50 BMG trazadora"
+msgid ".50 BMG M17 tracer"
+msgstr ""
+
+#. ~ Description for .50 BMG M17 tracer
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG M33 Ball"
+msgstr ""
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"Es la variante trazadora de la poderosa bala .50 BMG de francotirador. Las "
-"balas trazadoras ayudan a mantener apuntada el arma mientras se dispara, con"
-" el riesgo de incendiar sustancias inflamables."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr ".50 BMG bolas"
+msgid ".50 BMG Match"
+msgstr ""
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
 msgstr ""
-"La .50 BMG es una bala de rifle muy poderosa diseñada para largo alcance. Su"
-" estupenda precisión y capacidad de penetración de blindaje la convierten en"
-" una de las bala más mortales, con la desventaja del retroceso drástico y "
-"ser ruidosa."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
-msgstr ".50 BMG con penetración de armadura"
+msgid ".50 BMG M2 AP"
+msgstr ""
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
@@ -3518,6 +3533,23 @@ msgstr ""
 "Una variante de la .50 BMG con su núcleo hecho de carburo de tungsteno "
 "endurecido. La penetración es mejor pero su capacidad de daño es menor."
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr ""
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
 msgstr ".50 BMG trazadora recargada"
@@ -3525,30 +3557,24 @@ msgstr ".50 BMG trazadora recargada"
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
 msgstr ""
-"Una variante trazadora de la poderosa bala de francotirador .50 BMG que "
-"ayuda a mantener el arma sobre el objetivo, bajo el riesgo de prender fuego "
-"a sustancias inflamables. Esta ha sido recargada a mano. "
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr ".50 BMG bola recargadas"
+msgid "reloaded .50 BMG Match"
+msgstr ""
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"La .50 BMG es una bala de rifle muy poderosa diseñada para largo alcance. Su"
-" estupenda precisión y capacidad de penetración de blindaje la convierten en"
-" una de las bala más mortales, con la desventaja del retroceso drástico y "
-"ser ruidosa. Esta ha sido recargada a mano."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
@@ -3557,13 +3583,9 @@ msgstr ".50 BMG AP recargadas"
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
 msgstr ""
-"Una variante de la .50 BMG con su núcleo hecho de carburo de tungsteno "
-"endurecido. La penetración es mejor pero su capacidad de daño es menor. Esta"
-" ha sido recargada a mano."
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -4654,6 +4676,106 @@ msgstr "Algunas semillas de hongos."
 msgid "fungal flower"
 msgstr "flor fúngica"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr ""
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr ""
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr ""
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr ""
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr ""
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr ""
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr ""
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr ""
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr ""
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr ""
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -4812,7 +4934,7 @@ msgstr[1] ""
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
 msgstr ""
@@ -4900,7 +5022,7 @@ msgstr ""
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
 msgstr ""
 
@@ -4954,6 +5076,359 @@ msgid ""
 "explosions."
 msgstr ""
 
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr ""
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr ""
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr ""
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr ""
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr ""
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr ""
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] "lámina de neopreno"
+msgstr[1] "láminas de neopreno"
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr ""
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr ""
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr ""
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr ""
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
 msgid_plural "handloaded .22 CB"
@@ -5538,6 +6013,18 @@ msgstr ""
 "militar, diseñada para arder en el impacto, penetrando blindaje y "
 "encendiendo sustancias inflamables."
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr ""
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -5585,8 +6072,29 @@ msgstr[1] ""
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr ""
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr ""
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
@@ -6177,13 +6685,6 @@ msgstr ""
 "que un monstruo masa amorfa gelatinosa necesita para estar sano. Eso te "
 "parece..."
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "piedra"
-msgstr[1] "piedras"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -6768,8 +7269,10 @@ msgstr[1] "tahalís"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "Enfundas tu %s."
@@ -7462,6 +7965,46 @@ msgid ""
 "small straps designed to better distribute the weight."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -7627,6 +8170,28 @@ msgstr ""
 "Un disfraz de payaso muy colorido y muy ridículo. Tiene buena capacidad de "
 "almacenamiento."
 
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
@@ -7912,6 +8477,22 @@ msgid "A white button-down shirt with long sleeves.  Looks professional!"
 msgstr ""
 "Una camisa blanca con mangas largas. ¡Con esto pareces un profesional!"
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -8064,6 +8645,32 @@ msgstr[1] "riñoneras"
 msgid "Provides a bit of extra storage, with minimal encumbrance."
 msgstr "Nos da un poco más de almacenamiento, y no es muy incómoda."
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -8080,6 +8687,34 @@ msgstr ""
 "esgrimistas para prevenir accidentes. No tiene capacidad de almacenamiento, "
 "pero es muy cómodo."
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -8105,6 +8740,32 @@ msgstr ""
 "Un par de pantalones reforzados usado por los esgrimistas para prevenir "
 "lesiones."
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -8522,22 +9183,6 @@ msgstr[1] "pares de guantes de piel"
 msgid "A pair of warm fur gloves.  They are somewhat cumbersome."
 msgstr "Es un par de guantes de piel, muy abrigados. Son un poco incómodos."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] "par de guantes acuáticos de supervivencia"
-msgstr[1] "pares de guantes acuáticos de supervivencia"
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr ""
-"Un par de guantes personalizados de neopreno reforzados con kevlar. Están "
-"modificados para ser cómodos y brindar la máxima protección en condiciones "
-"extremas."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -8607,6 +9252,20 @@ msgstr ""
 "modificados para ser cómodos y brindar una máxima protección en condiciones "
 "extremas."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -8851,17 +9510,6 @@ msgid ""
 "excellent protection from environmental dangers."
 msgstr ""
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] "par de gafas de nadar"
-msgstr[1] "pares de gafas de nadar"
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "Un par de gafas pequeñas para nadar."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -8904,23 +9552,6 @@ msgstr ""
 "Un abrigo pesado de lana de cuerpo entero. Incómodo pero abrigado y con "
 "bolsillos grandes."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] "traje acuático de supervivencia"
-msgstr[1] "trajes acuáticos de supervivencia"
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr ""
-"Es un traje ligero hecho a mano, es una combinación entre un chaleco "
-"antibalas cortado y un traje acuático de neopreno reforzado. Protege tanto "
-"del ambiente como del daño."
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -9489,20 +10120,6 @@ msgstr[1] "capuchas ignífugas de supervivencia"
 msgid "A customized armored Nomex and Kevlar hood, very strong and durable."
 msgstr ""
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] "capucha acuática de supervivencia"
-msgstr[1] "capuchas acuáticas de supervivencia"
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr ""
-"Es una capucha personalizada de neopreno reforzada con kevlar, muy "
-"resistente y duradera."
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -10290,18 +10907,25 @@ msgstr[0] "cinturón de cuero"
 msgstr[1] "cinturones de cuero"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "Metes tu %s en tu %s."
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "Qué es lo que quieres meter en el cinturón?"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
 msgstr "Cinturón de cuero. Útil para ajustar los pantalones."
 
@@ -10484,6 +11108,20 @@ msgstr ""
 "Son unas pierneras que se sujetan a los muslos con correas con hebillas, y "
 "sirven para llevar cosas. Son las que utilizan los soldados."
 
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
 msgid_plural "Linux t-shirts"
@@ -11418,38 +12056,6 @@ msgstr ""
 "Una funda larga y ajustable para espadas y otras armas blancas grandes. Hay "
 "que activarla para enfundar y desenfundar el arma."
 
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] "traje anti-tiburón"
-msgstr[1] "trajes anti-tiburón"
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr ""
-"Un traje entero de cota de malla que usan los buzos para protegerse contra "
-"las mordidas de tiburón. Viene con un casco de plástico y botas."
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] "traje anti-tiburón faraday"
-msgstr[1] "trajes anti-tiburón faraday"
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr ""
-"Un traje entero de cota de malla que usan los buzos para protegerse contra "
-"las mordidas de tiburón. Ha sido interconectado conductivamente, lo que "
-"brinda protección contra la electricidad."
-
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
 msgid_plural "sheathes"
@@ -11531,6 +12137,19 @@ msgstr ""
 "Es un pantalón corto de tela vaquera, grueso y resistente. Excelente "
 "material para protegerte de las heridas cortantes."
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
@@ -12045,13 +12664,9 @@ msgstr[1] "trajes de paciente"
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
 msgstr ""
-"Un traje fino de mangas cortas tanto en los brazos como en las piernas. A "
-"juzgar por el extraño corte y los puntos de ajuste... quizá sea mejor no "
-"saber quién lo usó antes. Tiene una mínimia capacidad de almacenamiento y no"
-" es incómodo."
 
 #: lang/json/ARMOR_from_json.py
 msgid "suit"
@@ -12131,6 +12746,7 @@ msgstr[1] "cinturones de supervivencia"
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "Enfundar cuchilla"
@@ -12547,17 +13163,6 @@ msgstr ""
 "de un asentamiento, o el capitán de una pandilla postapocalíptica, este es "
 "el sombrero indicado para ti."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] "bañador de hombre"
-msgstr[1] "bañadores de hombre"
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "Un bañador de hombre, con malla interior."
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
@@ -12837,60 +13442,6 @@ msgstr ""
 "Es un chaleco elegante. Ideal para esos momentos donde usar solo una "
 "camiseta sería demasiado informal, pero un traje sería demasiado elegante."
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] "traje de buceo"
-msgstr[1] "trajes de buceo"
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "Un traje de neopreno de cuerpo entero."
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] "par de guantes de nado"
-msgstr[1] "pares de guantes de nado"
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr ""
-"Es un par de guantes muy flexibles de neopreno y goma de silicona. Perfectos"
-" para usar debajo del agua."
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] "capucha acuática"
-msgstr[1] "capuchas acuáticas"
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr "Una capucha de neopreno, generalmente utilizada por buzos."
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] "traje acuático corto"
-msgstr[1] "trajes acuáticos cortos"
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr ""
-"Es un traje de neopreno corto con mangas largas y detalles en rosa, y "
-"entallado a la cadera y el escote. No protege tanto como el traje largo, "
-"pero es más cómodo."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -13245,6 +13796,35 @@ msgstr ""
 "Una tela plástica con varias arandelas para poder atarla con una soga o una "
 "cuerda. Es útil para improvisar un techo durante la lluvia."
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -16135,6 +16715,161 @@ msgid ""
 "direct skin contact."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] "bañador de hombre"
+msgstr[1] "bañadores de hombre"
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "Un bañador de hombre, con malla interior."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] "traje de buceo"
+msgstr[1] "trajes de buceo"
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "Un traje de neopreno de cuerpo entero."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] "capucha acuática"
+msgstr[1] "capuchas acuáticas"
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr "Una capucha de neopreno, generalmente utilizada por buzos."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] "capucha acuática de supervivencia"
+msgstr[1] "capuchas acuáticas de supervivencia"
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr ""
+"Es una capucha personalizada de neopreno reforzada con kevlar, muy "
+"resistente y duradera."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] "traje acuático de supervivencia"
+msgstr[1] "trajes acuáticos de supervivencia"
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr ""
+"Es un traje ligero hecho a mano, es una combinación entre un chaleco "
+"antibalas cortado y un traje acuático de neopreno reforzado. Protege tanto "
+"del ambiente como del daño."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] "par de guantes acuáticos de supervivencia"
+msgstr[1] "pares de guantes acuáticos de supervivencia"
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr ""
+"Un par de guantes personalizados de neopreno reforzados con kevlar. Están "
+"modificados para ser cómodos y brindar la máxima protección en condiciones "
+"extremas."
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] "traje acuático corto"
+msgstr[1] "trajes acuáticos cortos"
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr ""
+"Es un traje de neopreno corto con mangas largas y detalles en rosa, y "
+"entallado a la cadera y el escote. No protege tanto como el traje largo, "
+"pero es más cómodo."
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] "traje anti-tiburón faraday"
+msgstr[1] "trajes anti-tiburón faraday"
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+"Un traje entero de cota de malla que usan los buzos para protegerse contra "
+"las mordidas de tiburón. Ha sido interconectado conductivamente, lo que "
+"brinda protección contra la electricidad."
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] "traje anti-tiburón"
+msgstr[1] "trajes anti-tiburón"
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr ""
+"Un traje entero de cota de malla que usan los buzos para protegerse contra "
+"las mordidas de tiburón. Viene con un casco de plástico y botas."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] "par de gafas de nadar"
+msgstr[1] "pares de gafas de nadar"
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "Un par de gafas pequeñas para nadar."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] "par de guantes de nado"
+msgstr[1] "pares de guantes de nado"
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr ""
+"Es un par de guantes muy flexibles de neopreno y goma de silicona. Perfectos"
+" para usar debajo del agua."
+
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
 msgid_plural "helmet nettings"
@@ -16759,6 +17494,54 @@ msgid_plural "shotgun bandoliers"
 msgstr[0] "bandolera de escopeta"
 msgstr[1] "bandoleras de escopeta"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -16781,7 +17564,7 @@ msgstr[1] ""
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
 msgstr ""
 
@@ -16980,6 +17763,24 @@ msgid ""
 "minimize encumbrance."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -17543,9 +18344,9 @@ msgstr[1] "MCB Quemador de etanol"
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -17555,8 +18356,7 @@ msgstr[0] "MCB Aero-evaporador"
 msgstr[1] "MCB Aero-evaporadores"
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -17627,10 +18427,10 @@ msgstr[1] "MCB Dedo-hackeador"
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -17996,7 +18796,7 @@ msgstr[1] "MCB Interfaz Mk. II de armadura de poder"
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
 
@@ -18555,8 +19355,7 @@ msgstr[1] ""
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
@@ -19181,8 +19980,8 @@ msgstr[1] "Servir al Hombre"
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
-msgstr "Es... ¡un libro de recetas!"
+msgid "It's… it's a cookbook!"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Cucina Italiana"
@@ -19292,11 +20091,8 @@ msgstr[1] "PE050 \"Alpha\": Informe Preliminar"
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
+"\"APPROVED\"…"
 msgstr ""
-"Este manojo de artículos -con fecha dos semanas antes de que empiece todo "
-"esto- describe algunas fórmulas químicas nuevas y sus efectos sobre humanos."
-" Tiene un sello que dice \"APROBADO\"..."
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Dionne"
@@ -19326,8 +20122,8 @@ msgstr[1] "PE065 \"Chimera\": Mejores Prácticas"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -19341,12 +20137,8 @@ msgstr[1] "registros de laboratorio-Smythe"
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
+"look promising but the procurement methods seem awfully vague…"
 msgstr ""
-"Este registro del equipo de trabajo detalla diversas variedades de "
-"experimentos con mutágenos, centrándose en aquellos derivados de carne "
-"contaminada con XE037. Los resultados son prometedores pero los métodos de "
-"obtención parecen muy confusos..."
 
 #: lang/json/BOOK_from_json.py
 msgid "standpipe maintenance log"
@@ -19359,11 +20151,8 @@ msgstr[1] "registros de mantenimiento de tuberías"
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
+"with… a chemical formula?"
 msgstr ""
-"Esta carpeta detalla el mantenimiento programada para varios sistemas de "
-"cañerías de toda la instalación. Sin embargo, algunas registros parecen "
-"estar llenos de... ¿fórmulas químicas?"
 
 #: lang/json/BOOK_from_json.py
 msgid "chemical reference-CLASSIFIED"
@@ -19413,11 +20202,8 @@ msgstr[1] "PE023 \"Medicinal\": Aplicación y Descubrimientos"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
 msgstr ""
-"Esta carpeta con artículos altamente técnicos describe algunas fórmulas "
-"químicas nuevas y sus efectos en los humanos. Tiene un sello que dice "
-"\"APROBADO\"..."
 
 #: lang/json/BOOK_from_json.py
 msgid "PE070 \"Raptor\": Proposal"
@@ -19742,11 +20528,8 @@ msgstr[1] "registros de laboratorio-Herrera"
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
+"symbols you've not seen before…"
 msgstr ""
-"Esta carpeta robusta contiene muchísimos diagramas y especificaciones "
-"técnicas de varios materiales electrónicos. Algunos de los diagramas usan "
-"símbolos que nunca viste en tu vida..."
 
 #: lang/json/BOOK_from_json.py
 msgid "2XI design binder-CLASSIFIED"
@@ -19820,13 +20603,13 @@ msgstr[1] ""
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -20186,13 +20969,9 @@ msgstr[1] "El Ayudante del Cargador a Mano"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
 msgstr ""
-"Todo lo que siempre quisiste saber acerca de la recarga manual de las "
-"municiones, cerradas con... cubierta a prueba de niños. Parece que es algo "
-"confiable, porque en el capítulo sobre balas explosivas habla de ellas con "
-"lujo de detalle."
 
 #: lang/json/BOOK_from_json.py
 msgid "Rivtech design binder"
@@ -20762,7 +21541,7 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -22202,6 +22981,34 @@ msgid ""
 " that the author's real name is Fereidoun M. Esfandiary."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
 msgid_plural "phone books"
@@ -22285,8 +23092,8 @@ msgstr[1] "libros de contabilidad de corporaciones"
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
-msgstr "Si supieras qué buscar, tal vez encontrarías algo..."
+msgid "If you knew what to look for something might stand out…"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "patient treatment records"
@@ -22582,6 +23389,106 @@ msgstr "Esta es una copia de \"El conde de Montecristo\" de Dumas."
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr "Esta es una copia de \"El jardín secreto\" de Frances Burnett."
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -23683,11 +24590,12 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -23698,28 +24606,61 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
 "along with emulating their healing factor."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -24218,7 +25159,7 @@ msgstr ""
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr ""
 
@@ -25214,6 +26155,41 @@ msgstr ""
 "Es el estómago de una criatura humanoide grande. Es sorprendentemente "
 "duradero."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr ""
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr ""
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -25263,6 +26239,61 @@ msgid ""
 "pinch."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr ""
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr ""
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -25295,6 +26326,24 @@ msgid_plural "cooked scraps of meat"
 msgstr[0] ""
 msgstr[1] ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr ""
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "menudencias crudas"
@@ -25516,8 +26565,8 @@ msgstr[1] ""
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
-msgstr "Es el cerebro de un animal. No vas a querer comerte esto crudo..."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cooked brains"
@@ -25571,8 +26620,8 @@ msgstr ""
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
-msgstr "Comúnmente, es una exquisitez, pero le falta un poco de... algo."
+msgid "Normally a delicacy, it needs a little… something."
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bone"
@@ -25632,6 +26681,78 @@ msgstr ""
 "echarse a perder, y puede ser usado como ingrediente en muchas comidas y "
 "proyectos."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr ""
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr ""
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr ""
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr ""
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
 msgid_plural "chunks of tainted meat"
@@ -25829,14 +26950,8 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
-"Es una enorme masa gruesa de carne que recuerda superficialmente al corazón "
-"de un mamífero, cubierto de estrías y del tamaño de tu cabeza. Sigue estando"
-" lleno de...., eh... lo que sea que sirva de sangre en un jabberwock, y se "
-"siente pesado en tus manos. Después de todo lo que viste por estos días, no "
-"podés evitar recordar ese antiguo dicho de comerse el corazón de tus "
-"enemigos..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "desiccated putrid heart"
@@ -25850,7 +26965,7 @@ msgid ""
 "looks *disgusting*."
 msgstr ""
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] ""
@@ -26176,7 +27291,7 @@ msgstr[1] ""
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
 msgstr ""
 
@@ -27116,11 +28231,12 @@ msgstr "Son rodajas de piña enlatados con agua. Bastante sabrosos."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
-msgstr[0] "sobre de limonada en polvo"
-msgstr[1] "sobres de limonada en polvo"
+msgid_plural "lemonade drink mix"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -27941,7 +29057,7 @@ msgstr[1] "golosinas de mantequilla de cacahuetes"
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
+msgid "A handful of peanut butter cups… your favorite!"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -28066,10 +29182,8 @@ msgstr "Es un delicioso bizcocho de chocolate. Tiene todo el glaseado. Todo."
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr ""
-"Un bizcocho bañado en el glaseado más grueso que viste en tu vida. Alguien "
-"le escribió chorradas con signos de pregunta arriba..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate-covered coffee bean"
@@ -28114,9 +29228,8 @@ msgstr[1] "medallones de menta"
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
 msgstr ""
-"Es un puñado de medallones de menta recubiertos con chocolate... ¡rico!"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Necco wafers"
@@ -28778,6 +29891,17 @@ msgstr ""
 "curiosamente gomoso y no muy sabroso, de todas maneras esto te llenará. Lo "
 "opuesto de apetitoso pero bueno para tu estómago."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr ""
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "sardina enlatada"
@@ -30585,8 +31709,8 @@ msgstr[1] ""
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -30645,13 +31769,8 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
-"Es una cápsula roja de gel del tamaño de tu pulgar, rellena con un líquido "
-"espeso y aceitoso que cambia entre el púrpura y el negro a intervalos "
-"impredecibles, lleno de lunares grises pequeños. Pensando el lugar de donde "
-"lo sacaste, puede ser muy potente, o muy experimental. Al sostenerlo, todos "
-"los pequeños dolores parecen desaparecer, solo por un momento..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattail jelly"
@@ -31078,11 +32197,9 @@ msgstr "sabor abstracto de mutágeno iv"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
 msgstr ""
-"Un mutágeno super-concentrado. Necesitas una jeringa para inyectarlo... si "
-"realmente quieres hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagenic serum"
@@ -31096,10 +32213,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
+"to inject it… if you really want to?"
 msgstr ""
-"Un mutágeno super-concentrado muy similar a la sangre. Necesitas una jeringa"
-" para inyectarlo... si realmente quieres hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "beast serum"
@@ -31109,7 +32224,7 @@ msgstr "suero de bestia"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31120,10 +32235,8 @@ msgstr "suero de pájaro"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
+"need a syringe to inject it… if you really want to?"
 msgstr ""
-"Un mutágeno super-concentrado con el color de los cielos pre-cataclísmicos. "
-"Necesitas una jeringa para inyectarlo... si realmente quieres hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattle serum"
@@ -31133,10 +32246,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
+"inject it… if you really want to?"
 msgstr ""
-"Un mutágeno super-concentrado con el color del verde hierba. Necesitas una "
-"jeringa para inyectarlo... si realmente quieres hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cephalopod serum"
@@ -31146,10 +32257,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
+"it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado tan negro como la tinta. Necesitas una "
-"jeringa para inyectarlo... si realmente quieres hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chimera serum"
@@ -31159,7 +32268,7 @@ msgstr "suero de quimera"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31170,7 +32279,7 @@ msgstr "suero elf-a"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31181,7 +32290,7 @@ msgstr "suero felino"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31192,7 +32301,7 @@ msgstr "suero de pescado"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
+"top.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31203,7 +32312,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31214,7 +32323,7 @@ msgstr "suero de lagarto"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31225,7 +32334,7 @@ msgstr "suero de lobuno"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
+" inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31236,7 +32345,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31247,7 +32356,7 @@ msgstr "suero de planta"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31258,7 +32367,7 @@ msgstr "suero de raptor"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
+"at it.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31269,7 +32378,7 @@ msgstr "suero de rata"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31280,7 +32389,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31291,7 +32400,7 @@ msgstr "suero de araña"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31302,7 +32411,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31313,10 +32422,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
+"thick.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Es un mutágeno superconcentrado del color de la miel, e igual de espeso. "
-"Necesitás una jeringa para inyectarlo... si realmente querés hacerlo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mouse serum"
@@ -31326,7 +32433,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31341,10 +32448,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
+"bubble with an intelligence of its own…"
 msgstr ""
-"Es un líquido espeso y rojo. Tiene una apariencia y olor desagradables, y "
-"parece bullir con inteligencia propia..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "alpha mutagen"
@@ -31541,23 +32646,23 @@ msgstr ""
 "probablemente es mucho más seguro de beber ahora que antes."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
+msgid "pine nuts"
+msgid_plural "pine nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
+msgid "junipers"
+msgid_plural "junipers"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -31565,68 +32670,82 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
 msgstr "Es un puñado de frutos secos del árbol del pistacho, sin cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
-msgstr[0] "puñado de pistachos tostados"
-msgstr[1] "puñados de pistachos tostados"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr "Es un puñado de frutos secos tostados del árbol del pistacho."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
 msgstr "Es un puñado de frutos secos del almendro, sin cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
-msgstr[0] "puñado de almendras tostadas"
-msgstr[1] "puñados de almendras tostadas"
+msgid "almond pulp"
+msgid_plural "almond pulp"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted almonds
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
+msgid "cashews"
+msgid_plural "cashews"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -31634,45 +32753,45 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
+msgid "beech nuts"
+msgid_plural "beech nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
-msgstr[0] "puñado de nueces sin cáscara"
-msgstr[1] "puñados de nueces sin cáscara"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -31680,23 +32799,24 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
-msgstr[0] "puñado de nueces tostadas"
-msgstr[1] "puñados de nueces tostadas"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -31704,23 +32824,25 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
-msgstr[0] "puñado de castañas tostadas"
-msgstr[1] "puñados de castañas tostadas"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -31728,45 +32850,47 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
-msgstr[0] "puñado de avellanas tostadas"
-msgstr[1] "puñados de avellanas tostadas"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
-msgstr[0] "puñado de nueces de pecana sin cáscara"
-msgstr[1] "puñados de nueces de pecana sin cáscara"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -31776,12 +32900,13 @@ msgstr ""
 "cáscara."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr ""
@@ -31797,12 +32922,12 @@ msgstr ""
 "Es una deliciosa ambrosía de nuez de pecana. Una bebida digna de los dioses."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
-msgstr[0] "puñado de bellotas"
-msgstr[1] "puñados de bellotas"
+msgid "acorns"
+msgid_plural "acorns"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
@@ -31812,12 +32937,12 @@ msgstr ""
 "gustan, pero para ti no es bueno comerlas así como están."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
-msgstr[0] "puñado de bellotas tostadas"
-msgstr[1] "puñados de bellotas tostadas"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr ""
@@ -32418,11 +33543,12 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
-msgstr[0] "soylent verde en polvo"
-msgstr[1] "raciones de soylent verde en polvo"
+msgid_plural "soylent green powder"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -32470,11 +33596,11 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
-msgstr[0] "proteína en polvo"
-msgstr[1] "raciones de proteína en polvo"
+msgid_plural "protein powder"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -32548,67 +33674,67 @@ msgid "Very sour citrus.  Can be eaten if you really want."
 msgstr "Cítrico muy agrio. Se puede comer si quieres."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
+msgid "blueberries"
+msgid_plural "blueberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr "Son azules, pero eso no significa que sean de la realeza."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
+msgid "strawberries"
+msgid_plural "strawberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr "Es una baya sabrosa y jugosa. A menudo crece silvestre en los campos."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
+msgid "cranberries"
+msgid_plural "cranberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr "Arándanos rojos y agrios. Buenos para la salud."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
+msgid "raspberries"
+msgid_plural "raspberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "Una frambuesa roja y dulce."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
+msgid "huckleberries"
+msgid_plural "huckleberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr "Son arándanos agrios, a menudo confundidos con las moras azules."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
+msgid "mulberries"
+msgid_plural "mulberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -32616,23 +33742,23 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
+msgid "elderberries"
+msgid_plural "elderberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
+msgid "rose hips"
+msgid_plural "rose hips"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "Es el fruto de una flor de rosa polinizada."
@@ -32669,12 +33795,12 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "Una fruta cítrica, cuyo gusto va desde lo agrio hasta lo semidulce."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
-msgstr[0] "puñado de cerezas"
-msgstr[1] "puñado de cerezas"
+msgid "cherries"
+msgid_plural "cherries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr "Una fruta dulce y roja que crece en árboles."
@@ -32692,12 +33818,12 @@ msgstr ""
 "digestión."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
+msgid "grapes"
+msgid_plural "grapes"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr ""
@@ -32750,12 +33876,12 @@ msgid "A large and very sweet fruit."
 msgstr "Una fruta grande y muy dulce."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
-msgstr[0] "puñado de zarzamoras"
-msgstr[1] "puñado de zarzamoras"
+msgid "blackberries"
+msgid_plural "blackberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "Un primo oscuro de la frambuesa."
@@ -32802,16 +33928,27 @@ msgstr ""
 " delicioso."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
+msgid "apricots"
+msgid_plural "apricots"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "Una fruta de cáscara suave, parecida al melocotón."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr ""
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr ""
@@ -33002,11 +34139,11 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -33016,11 +34153,11 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
+msgid_plural "chicory"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -33142,12 +34279,12 @@ msgstr ""
 "así cruda, pero está buenísima para cocinar."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
-msgstr[0] "puñado de dientes de león"
-msgstr[1] "puñados de dientes de león"
+msgid "dandelions"
+msgid_plural "dandelions"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -33292,12 +34429,12 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -35247,8 +36384,8 @@ msgstr[1] ""
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35260,7 +36397,7 @@ msgstr[1] ""
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
 msgstr ""
 
@@ -35734,7 +36871,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35747,7 +36884,7 @@ msgstr[1] ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35844,8 +36981,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35856,8 +36993,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35868,8 +37006,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35880,8 +37018,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35892,9 +37030,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35929,7 +37067,7 @@ msgstr[1] ""
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35946,6 +37084,16 @@ msgid ""
 " properties."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr ""
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
 msgstr ""
@@ -36616,15 +37764,6 @@ msgstr[1] "harinas de arroz"
 msgid "This rice flour is useful for baking."
 msgstr "Esta harina de arroz es útil para cocinar."
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr ""
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr ""
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr ""
@@ -36937,8 +38076,8 @@ msgstr[1] ""
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -36950,8 +38089,8 @@ msgstr[1] ""
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -37527,8 +38666,8 @@ msgstr[1] ""
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -38113,8 +39252,8 @@ msgstr[1] ""
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -38126,7 +39265,7 @@ msgstr[1] ""
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr ""
 
@@ -38142,12 +39281,12 @@ msgid "A root from a hickory tree.  It has an earthy smell."
 msgstr "Es una raíz de un nogal americano o pacana. Tiene olor a tierra."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr ""
@@ -38155,23 +39294,23 @@ msgstr ""
 "cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
+msgid "pecans"
+msgid_plural "pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
+msgid "pistachios"
+msgid_plural "pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr ""
@@ -38179,59 +39318,59 @@ msgstr ""
 "cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
+msgid "almonds"
+msgid_plural "almonds"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
 msgstr ""
 "Es un puñado de frutos secos duros del almendro, todavía con sus cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
+msgid "peanuts"
+msgid_plural "peanuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr ""
 "Es un puñado de frutos secos duros del cacahuete, todavía con sus cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr ""
 "Es un puñado de frutos secos duros del avellano, todavía con sus cáscaras."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
+msgid "chestnuts"
+msgid_plural "chestnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
+msgid "walnuts"
+msgid_plural "walnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr ""
@@ -38376,7 +39515,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr ""
 
@@ -38400,7 +39539,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr ""
 
@@ -38504,6 +39643,12 @@ msgstr "músculo"
 msgid "wind"
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "algo para fumar y algo para encender fuego"
@@ -38558,7 +39703,7 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -38709,8 +39854,8 @@ msgstr[1] ""
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -39036,6 +40181,18 @@ msgstr ""
 "Un pedazo de varilla corrugada, que sirve como arma de cuerpo a cuerpo, y "
 "puede ser útil para construir paredes más resistentes y cosas de ese estilo."
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -39179,10 +40336,8 @@ msgstr[1] "televisores"
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
+msgid "A large LCD television, full of delicious electronics."
 msgstr ""
-"Un televisor grande de tubo de rayos catódicos, lleno de deliciosas piezas "
-"electrónicas."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -39645,6 +40800,19 @@ msgstr ""
 "Un módulo diseñado para recibir muchas formas de señales. Útil para fabricar"
 " equipos de comunicación."
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -40088,10 +41256,8 @@ msgstr[1] "tarjetas de memoria SD científicas"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
+"encrypted.  Looks *Interesting*, though…"
 msgstr ""
-"Esta tarjeta de memoria parece estar relacionada con el 'XEDRA', y "
-"seguramente está encriptada. Parece * interesante *, igual..."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hand mirror"
@@ -40172,12 +41338,13 @@ msgid ""
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -40477,10 +41644,10 @@ msgstr ""
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -40534,10 +41701,8 @@ msgstr[1] "colillas de cigarrillos"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr ""
-"Lo que alguna vez fue un maravilloso y adictivo cilindro de hojas secas de tabaco, ahora es solo un pedazo apestoso de basura. ¡Qué tragedia!\n"
-"Si juntas varias colillas, tal vez te puedas liar un cigarrillo nuevo. Si estás dispuesto a llegar tan lejos..."
 
 #. ~ Use action msg for joint.
 #: lang/json/GENERIC_from_json.py
@@ -40587,11 +41752,11 @@ msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
-msgstr[0] "puñado de tabaco crudo"
-msgstr[1] "puñados de tabaco crudo"
+msgid_plural "raw tobacco"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -40646,12 +41811,6 @@ msgid ""
 "panel, if you can find one."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] "lámina de neopreno"
-msgstr[1] "láminas de neopreno"
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -41145,15 +42304,6 @@ msgstr ""
 "Un hacha de una sola mano. Es útil como arma de cuerpo a cuerpo, y se puede "
 "usar para cortar cosas y como martillo."
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr ""
-"Es una piedra del tamaño de una pelota de tenis. Funciona bien como arma de "
-"cuerpo a cuerpo, y también se puede tirar a los enemigos."
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -41778,7 +42928,7 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
+" an awful lot like a bow.  You can barely bend it…"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -42444,7 +43594,7 @@ msgstr[1] "cafeteras atómicas"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
@@ -42459,7 +43609,9 @@ msgstr[1] "lámparas atómicas"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "Cerrar cubierta"
 
@@ -42487,7 +43639,9 @@ msgstr[1] "lámparas atómicas (cubiertas)"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "Abrir cubierta"
 
@@ -42781,8 +43935,8 @@ msgstr[1] "ganchos de agarre"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -43665,9 +44819,7 @@ msgstr[1] ""
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
+msgid "A complete guide to Wing Chun Kung-fu."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
@@ -43681,8 +44833,8 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -44774,6 +45926,20 @@ msgstr[1] ""
 msgid "This is a slip of paper signed by the issuer."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -45118,11 +46284,9 @@ msgstr[1] "tenedores"
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
 msgstr ""
-"Un tenedor, si se lo clavas a algo te lo puedes comer como siempre. "
-"Espera... mejor no."
 
 #: lang/json/GENERIC_from_json.py
 msgid "plastic fork"
@@ -46360,7 +47524,7 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
 
@@ -46836,8 +48000,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
 msgstr ""
 
 #. ~ Description for estoc
@@ -46941,21 +48105,18 @@ msgstr ""
 "a su hoja flexible y punta sin filo."
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
-msgstr[0] "espada de esgrima"
-msgstr[1] "espadas de esgrima"
+msgid "fencing épée"
+msgid_plural "fencing épées"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
 msgstr ""
-"Un arma utilizada en el esgrima, el más noble de todos los deportes. Esta "
-"espada es la más pesada y rígida de todas las armas del esgrima, y por lo "
-"tanto puede ser la más útil en esta situación."
 
 #: lang/json/GENERIC_from_json.py
 msgid "fencing saber"
@@ -46967,11 +48128,53 @@ msgstr[1] "sables de esgrima"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
+"is marginally shorter than the foil and épée, but no less effective."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
 msgstr ""
-"Un arma utilizada en el esgrima, el más noble de todos los deportes. Este "
-"sable es bastante más corto que el florete y la espada de esgrima, pero no "
-"es menos eficaz."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
@@ -47273,11 +48476,8 @@ msgstr[1] "lingotes de aluminio"
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
+"down to a powder, for more… high-profile applications."
 msgstr ""
-"Un pequeño lingote de aluminio, normalizado para un proceso posterior. "
-"Ligero pero duradero, puede ser moldeado en diferentes formas para la "
-"construcción o molido en polvo, para usos más... notorios."
 
 #: lang/json/GENERIC_from_json.py
 msgid "scrap copper"
@@ -47612,6 +48812,46 @@ msgid ""
 " can also serve as an improvised stabbing weapon, but will break quickly."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -49180,7 +50420,7 @@ msgstr[1] ""
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -49192,8 +50432,8 @@ msgstr[1] ""
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -50377,6 +51617,27 @@ msgid ""
 "art."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr ""
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -50881,6 +52142,138 @@ msgid_plural "dao +2s"
 msgstr[0] ""
 msgstr[1] ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
@@ -51158,6 +52551,21 @@ msgid ""
 "to land astoundingly powerful blows."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -51240,6 +52648,19 @@ msgid ""
 "prized for their beauty and power."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -51266,100 +52687,6 @@ msgid ""
 "scales could make a suit of armor as hard as steel and half as heavy."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr ""
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -51434,6 +52761,56 @@ msgstr[1] ""
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr ""
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] "Gungnir"
+msgstr[1] "Gungnirs"
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] "Laevateinn"
+msgstr[1] "Laevateinns"
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -51679,8 +53056,8 @@ msgstr[1] ""
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -51694,7 +53071,7 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -52460,8 +53837,34 @@ msgstr[1] ""
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -52479,6 +53882,17 @@ msgid ""
 "rock and lava everywhere."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
@@ -53394,12 +54808,6 @@ msgstr ""
 "Una réplica de Mjölnir, el martillo de Thor. Un rumor dice que es capaz de "
 "aplanar montañas de un solo golpe. Está decorado con adornos de oro y plata."
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] "Gungnir"
-msgstr[1] "Gungnirs"
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -54415,6 +55823,11 @@ msgstr "COSAS QUÍMICAS"
 msgid "SPARE PARTS"
 msgstr "REPUESTOS"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "RECIPIENTES"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "ARTEFACTOS"
@@ -54425,6 +55838,309 @@ msgstr "ARTEFACTOS"
 msgid "ARMOR"
 msgstr "ARMADURA"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "OBJETOS PUESTOS"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "ARMA EMPUÑADA"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr ""
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr "Cosas: Comida"
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr "Cosas: P.Comida"
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr ""
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr "Cosas: P.Bebidas"
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr ""
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr "Cosas: Armas de Fuego"
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr "Cosas: Cargadores"
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr "Cosas: Munición"
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr "Lugar para la munición."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr ""
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr ""
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr "Cosas: Ropa"
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr ""
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr "Lugar para la ropa sucia."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr "Cosas: Drogas"
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr "Lugar para drogas y otros objetos médicos."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr "Cosas: Libros"
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr "Lugar para libros y revistas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr ""
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr "Lugar para modificaciones de armas de fuego y similares."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr ""
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr "Lugar para mutágenos, sueros y purificantes."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr "Cosas: Biónicos"
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr "Cosas: Partes de Vehículos"
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr "Cosas: Otros"
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr "Lugar para otros objetos varios."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr "Cosas: Combustible"
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr "Cosas: Semillas"
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr "Lugar para semillas, tallos y similares."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr "Cosas: Químicos"
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr "Lugar para químicos."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr "Cosas: S.Partes"
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr "Lugar para partes sueltas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr ""
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr ""
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr ""
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr ""
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr ""
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr ""
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr "Cosas: Ignorar"
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr ""
+"Los objetos dentro de esta zona son ignorados por la acción \"ordenar "
+"cosas\"."
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -54646,7 +56362,7 @@ msgstr[1] ""
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
 msgstr ""
 
@@ -55040,8 +56756,8 @@ msgstr "cargador de tambor H&K G3"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
-msgstr "Es un cargador de caja de 50 balas para el rifle H&K G3."
+msgid "A 50-round drum magazine for the H&K G3 rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "H&K G3 magazine"
@@ -55086,8 +56802,8 @@ msgstr "cargador de tambor FN SCAR-H"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
-msgstr "Es un cargador de tambor de 50 balas para le rifle FN SCAR-H."
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "FN SCAR-H magazine"
@@ -55188,17 +56904,6 @@ msgstr ""
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr ""
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "cargador Taurus .38"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr ""
-"Es un cargador compacto de caja de acero para usar con la pistola Taurus Pro"
-" .38."
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr ""
@@ -55272,6 +56977,16 @@ msgstr ""
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr ""
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr ""
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr ""
@@ -58228,7 +59943,7 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
+"appears to have a mininuke inside.  If this is targeting you…  Run."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -58763,11 +60478,8 @@ msgstr[1] ""
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
+"off in popularity… and price."
 msgstr ""
-"Estas cosas fueron consideradas alguna vez como una plaga que no valía la "
-"pena comerse. Después, algún genio del marketing empezó a venderlas como una"
-" exquisitez y se volvieron muy populares... y caras."
 
 #: lang/json/MONSTER_from_json.py
 msgid "crayfish"
@@ -58779,10 +60491,8 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
+"water, and some spicy seasonings…"
 msgstr ""
-"Si pudieras conseguir una buena cantidad de estos, una olla grande con agua "
-"hirviendo, y algunos condimentos..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "Blinky"
@@ -60186,10 +61896,8 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
+"makes it sound… hungry."
 msgstr ""
-"Un roedor con la cola como un gusano, largos bigotes ojos pequeños y "
-"brillantes. La manera en que chilla la hace parecer... hambrienta."
 
 #: lang/json/MONSTER_from_json.py
 msgid "lamb"
@@ -60696,11 +62404,22 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
 msgstr ""
-"Este boomer, hinchado y listo para explotar como todos, se ha fortalecido y "
-"solidificado. La bilis que gotea de su boca también parece haber cambiado..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
@@ -60753,7 +62472,7 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -61630,15 +63349,11 @@ msgstr[1] "Shia LaBeouf"
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
-"Viviendo en el bosque, \n"
-"matando por deporte, \n"
-"comiéndose todos los cadáveres, \n"
-"es el verdadero caníbal Shia LaBeouf."
 
 #: lang/json/MONSTER_from_json.py
 msgid "shoggoth"
@@ -61920,7 +63635,7 @@ msgstr[1] ""
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr ""
@@ -62108,19 +63823,13 @@ msgstr[1] ""
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
 msgstr ""
-"El hedor más asqueroso está en el aire,\n"
-"El funk de cuarenta mil años,\n"
-"Y espeluznantes demonios de cada tumba,\n"
-"se están acercando para sellar tu perdición!\n"
-"\n"
-"El bailarín ni siquiera se fija en ti, parece que algo cercano lo está controlando."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie dog"
@@ -62442,15 +64151,11 @@ msgstr[1] ""
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
-"Y aunque luches para seguir vivo,\n"
-"Su cuerpo comienza a temblar.\n"
-"Porque ningún mortal puede resistirse,\n"
-"El mal del thriller."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie snapper"
@@ -64139,8 +65844,8 @@ msgstr ""
 "casa, pequeño cerdito no no. Aunque es un robot, apesta a muerte."
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -64769,21 +66474,23 @@ msgid "The black pudding burns you with acid!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
+msgid "krabgek"
+msgid_plural "krabgeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
 msgstr ""
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
+msgid "The krabgek gazes at %3$s!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -64831,8 +66538,47 @@ msgstr[1] ""
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -66892,9 +68638,9 @@ msgid "Reveals an area around you on the overmap"
 msgstr ""
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
-msgstr "Tienes una visión del área circundante..."
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
+msgstr ""
 
 #: lang/json/SPELL_from_json.py
 msgid "Artifact Firestorm"
@@ -67099,8 +68845,8 @@ msgstr ""
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67138,7 +68884,7 @@ msgstr ""
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -67187,6 +68933,20 @@ msgstr ""
 msgid "Translocates the user to an attuned gate."
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr ""
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr ""
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr ""
@@ -67236,7 +68996,7 @@ msgstr ""
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67393,7 +69153,7 @@ msgstr ""
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr ""
 
@@ -67404,8 +69164,8 @@ msgstr ""
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67452,8 +69212,8 @@ msgstr ""
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67479,6 +69239,10 @@ msgstr ""
 msgid "Lava Bomb"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr ""
@@ -67486,7 +69250,7 @@ msgstr ""
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr ""
@@ -67498,9 +69262,9 @@ msgstr ""
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67573,7 +69337,7 @@ msgstr ""
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -67616,8 +69380,8 @@ msgstr ""
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py lang/json/effects_from_json.py
@@ -67636,6 +69400,15 @@ msgstr ""
 msgid "Fox's Cunning"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr ""
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr ""
@@ -67675,8 +69448,8 @@ msgstr ""
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67737,8 +69510,8 @@ msgstr ""
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67765,6 +69538,10 @@ msgstr ""
 msgid "Mirror Image"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr ""
@@ -68312,6 +70089,46 @@ msgid ""
 "It is turned on, and continually draining batteries.  Use it to turn it off."
 msgstr ""
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -68402,8 +70219,8 @@ msgstr[1] ""
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
 
@@ -69507,13 +71324,11 @@ msgstr "Las orejeras se quedaron sin baterías."
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
 msgstr ""
-"Es un par de orejeras que utilizan los tiradores. Están apagadas. Bloquean "
-"los sonidos que sobrepasan una cierta cantidad de decibeles, asumiendo que "
-"tiene batería."
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -69968,6 +71783,213 @@ msgid ""
 "power."
 msgstr ""
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr ""
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -70313,9 +72335,9 @@ msgstr[1] ""
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
 
@@ -70448,8 +72470,8 @@ msgstr[1] "varas de clarividencia"
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -70771,7 +72793,7 @@ msgstr "Enciendes la mecha de %s."
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr ""
@@ -70792,8 +72814,8 @@ msgstr "Ya has encendido la mecha - ¿Qué estás esperando?"
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -70805,7 +72827,7 @@ msgstr[1] ""
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
@@ -70820,8 +72842,8 @@ msgstr[1] ""
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr ""
 
@@ -70841,8 +72863,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -70855,8 +72877,8 @@ msgstr[1] ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -70867,9 +72889,9 @@ msgstr[1] ""
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "Luz"
 
@@ -70903,7 +72925,7 @@ msgstr ""
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
+"  The face shifts."
 msgstr ""
 
 #. ~ Description for battle axe
@@ -71066,6 +73088,27 @@ msgstr ""
 "Es una lata de hojalata llena hasta el tope de pólvora negra y con un mecha "
 "encendida."
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] "cocina de vagabundo (encendida)"
+msgstr[1] "cocinas de vagabundo (encendidas)"
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "Las brasas se extinguieron."
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -71320,8 +73363,8 @@ msgstr[1] ""
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py lang/json/furniture_from_json.py
@@ -71333,8 +73376,8 @@ msgstr[1] ""
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -71721,12 +73764,9 @@ msgstr[1] "cuchillos eléctricos (apagados)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
 msgstr ""
-"Es un cuchillo eléctrico de carne, alimentado con baterías. Son dos "
-"cuchillas serradas que vibran juntas para cortar cualquier cosas, desde pavo"
-" hasta jamón... ¡incluso zombis!"
 
 #: lang/json/TOOL_from_json.py
 msgid "electric carver (on)"
@@ -71907,7 +73947,7 @@ msgstr[1] ""
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr ""
@@ -72421,10 +74461,8 @@ msgstr[1] "pares de esposas electrónicas"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-"Un par de esposas electrónicas, usada por la policía y los antidisturbots para detener a los prisioneros. Tiene una sirena que continuamente identifica al detenido como un criminal arrestado y alerta a la policía humana. Espera que lleguen, no intentes escapar o quitarte las esposas, porque recibirás un shock eléctrico.\n"
-"Sin embargo, como los únicos policías que podrían venir son muertos vivientes, te vas a tener que quedar esperando mucho tiempo, excepto que se te ocurra algo..."
 
 #: lang/json/TOOL_from_json.py
 msgid "entrenching tool"
@@ -74609,8 +76647,8 @@ msgstr[1] ""
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -75634,7 +77672,7 @@ msgstr ""
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -76225,37 +78263,6 @@ msgid_plural "hobo stoves"
 msgstr[0] "cocina de vagabundo"
 msgstr[1] "cocinas de vagabundo"
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr ""
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "¡Necesitas una fuente de fuego!"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr ""
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] "cocina de vagabundo (encendida)"
-msgstr[1] "cocinas de vagabundo (encendidas)"
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "Las brasas se extinguieron."
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -76442,8 +78449,8 @@ msgstr[1] ""
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -76806,7 +78813,7 @@ msgstr ""
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -76824,7 +78831,7 @@ msgstr[1] ""
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -76914,9 +78921,9 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -76968,7 +78975,7 @@ msgstr ""
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -76997,8 +79004,8 @@ msgstr ""
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
@@ -77024,7 +79031,7 @@ msgstr ""
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
 msgstr ""
@@ -77048,8 +79055,8 @@ msgstr ""
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
 msgstr ""
 
@@ -77072,8 +79079,8 @@ msgstr ""
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
 msgstr ""
 
@@ -77097,9 +79104,9 @@ msgstr ""
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -77121,7 +79128,7 @@ msgstr ""
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
 msgstr ""
@@ -77176,7 +79183,7 @@ msgstr ""
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -77206,8 +79213,8 @@ msgstr ""
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
@@ -77233,10 +79240,10 @@ msgstr ""
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
 
@@ -77592,7 +79599,7 @@ msgstr[1] ""
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
+"of a stick.  However it's quite fragile."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -77695,6 +79702,21 @@ msgstr ""
 "Se trata de un cuchillo de combate militar.  Es ligero y muy fuerte y puede "
 "ser mortal en buenas manos o cuando se le une como una bayoneta."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -78083,6 +80105,21 @@ msgstr ""
 "Una bayoneta espada. Es un arma grande y cortante que puede colocarse al "
 "frente de un arma de fuego o ballesta convirtiéndola en una pica."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -78193,6 +80230,57 @@ msgstr ""
 "Es una enorme espada de dos manos curvada de origen jacolocas. Es "
 "sorprendentemente liviana para el tamaño que tiene."
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -78597,6 +80685,34 @@ msgstr ""
 "Es un pedazo de plástico. Puede ser usado para fabricar, reparar o reforzar "
 "objetos de plástico."
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -79103,12 +81219,8 @@ msgstr[1] "waltitalkies"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
 msgstr ""
-"Esto es una radio con una unidad de transmisión. La puedes usar para "
-"contactarte con alguien que también tenga una. Lamentablemente, no parece "
-"que haya nadie que use una por estos días..."
 
 #: lang/json/TOOL_from_json.py
 msgid "remote vehicle controller"
@@ -79295,7 +81407,7 @@ msgstr[1] ""
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
@@ -79500,7 +81612,7 @@ msgstr[1] "cables reforzados"
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr ""
 
@@ -79912,7 +82024,7 @@ msgstr ""
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr ""
 
@@ -79943,7 +82055,7 @@ msgstr[1] ""
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -81046,12 +83158,6 @@ msgstr ""
 "Es un palo que ha sido recortado para funcionar como mecanismo disparador de"
 " una trampa de lazo."
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] "Laevateinn"
-msgstr[1] "Laevateinns"
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -82338,6 +84444,17 @@ msgid ""
 " terribly when not on a rail."
 msgstr ""
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr ""
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr ""
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "rueda de moto"
@@ -82732,6 +84849,10 @@ msgstr ""
 msgid "cranking"
 msgstr ""
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr ""
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr ""
@@ -83012,6 +85133,10 @@ msgstr "flechas"
 msgid "pebbles"
 msgstr "guijarros"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "piedras"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr ""
@@ -83375,7 +85500,7 @@ msgstr "Placas de Aleación - Brazos"
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -83413,7 +85538,7 @@ msgstr "Placas de Aleación - Piernas"
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -83752,17 +85877,20 @@ msgstr "Quemador de Etanol"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
 msgstr ""
-"Puedes usar alcohol como combustible de una manera muy eficiente. Sin "
-"embargo, sufrirás los efectos embriagantes de la sustancia."
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "Aero-Evaporador"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr ""
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "Córnea de Diamante"
@@ -84030,10 +86158,10 @@ msgstr ""
 "causar algunos efectos secundarios feos si se lo apaga."
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "Mini-Lanzallamas"
+msgid "Finger Lighter"
+msgstr ""
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -84065,8 +86193,8 @@ msgstr "Unidad Electromagnética"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -84127,8 +86255,8 @@ msgstr "Nanobots de Reparación"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -84166,11 +86294,8 @@ msgstr ""
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
+"Increases mouth encumbrance by ten."
 msgstr ""
-"No estás muy seguro de como terminó un MCB en tu nariz, pero sin importar "
-"cómo llegó, este biónico mal colocado te dificulta la respiración. Aumenta "
-"la incomodidad de la boca en un punto."
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -84203,7 +86328,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
+"mild optic neuropathy.  Increases eye encumbrance by ten."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -84236,7 +86361,7 @@ msgstr "Almacenamiento de Energía"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
 msgstr ""
@@ -84247,8 +86372,7 @@ msgstr "Almacenamiento de Energía Mk. II"
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
 msgstr ""
 
 #. ~ Description for Power Overload
@@ -84567,12 +86691,8 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
+" by ten, while failing to improve your ability to hold objects whatsoever."
 msgstr ""
-"Los pulgares auto-trabables se traban firmemente (incluso cuando no quieres "
-"que suceda) y no se sueltan (incluso cuando preferirías que se suelten). "
-"Incrementa la incomodidad de las manos en dos puntos, y no mejora tu "
-"habilidad para coger objetos."
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -84710,8 +86830,8 @@ msgstr ""
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
@@ -84764,7 +86884,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr ""
@@ -85456,6 +87576,18 @@ msgstr ""
 msgid "Make Woodchip Floor"
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr ""
@@ -86112,6 +88244,10 @@ msgstr ""
 msgid "Build a radio tower console."
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr ""
@@ -86899,6 +89035,42 @@ msgstr ""
 msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr "Sueñas con abejas luchando por tu dulce néctar. Mmm."
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr ""
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -88271,6 +90443,25 @@ msgstr "Tus manos no paran de temblar."
 msgid "You tremble"
 msgstr "Temblás."
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr ""
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr ""
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr ""
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "Sangrando"
@@ -89201,6 +91392,26 @@ msgstr "Tu metabolismo se ha vuelto inestable."
 msgid "Your metabolism becomes more stable."
 msgstr "Tu metabolismo se vuelve más estable."
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr ""
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "Iluminar"
@@ -89446,6 +91657,17 @@ msgstr "Supercarga"
 msgid "You've been struck by lightning, and feel... different."
 msgstr ""
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr ""
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr ""
@@ -90095,6 +92317,192 @@ msgstr ""
 "era mantenido en el suelo esperando la respuesta de más unidades policiales,"
 " fue destrozado por los muertos vivientes que fueron atraídos a la escena."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr ""
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -90344,6 +92752,167 @@ msgstr ""
 "ayuda y consumiendo lentamente las provisiones que tenía. Dos semanas "
 "después de ser arrastrada a su celda, murió por deshidratación."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr ""
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "Tus Seguidores"
@@ -90508,10 +93077,10 @@ msgid "A small family surviving on their generational land."
 msgstr ""
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
+msgid "New England Church Community"
 msgstr ""
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -90548,103 +93117,211 @@ msgstr ""
 msgid "Dusty"
 msgstr ""
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
+msgid "It's dusty.  Has no effect - obsolete fault."
+msgstr ""
+
+#. ~ name of mending method for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "Wipe clean"
+msgstr ""
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean you %s."
 msgstr ""
 
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr ""
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr ""
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr ""
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr ""
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
 
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr ""
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr ""
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr ""
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr ""
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr ""
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
 
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
 msgstr ""
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "Se necesita para operar un alternador unido."
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr ""
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr ""
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr "Ayuda a arrancar un motor con bajas temperaturas ambientales."
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr ""
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "Evita arrancar un vehículo sin la llave apropiada."
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr ""
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr ""
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr ""
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr ""
 "Se necesita para bombear y presurizar combustible diésel desde el tanque del"
 " vehículo."
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr ""
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
@@ -90652,11 +93329,23 @@ msgstr ""
 "Un filtro gastado reduce la eficiencia de combustible y aumenta la "
 "generación de humo."
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr ""
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
@@ -90664,33 +93353,81 @@ msgstr ""
 "Un filtro gastado reduce la performance y aumenta la probabilidad de las "
 "detonaciones en el escape."
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr ""
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr "Se necesita para bombear gasolina desde el tanque del vehículo."
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr ""
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr "Se necesita para bombear agua hacia un radiador externo o disipador."
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr ""
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "Se necesita para iniciar el motor."
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr ""
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -91177,6 +93914,10 @@ msgstr ""
 msgid "smoke vent"
 msgstr ""
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr ""
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
 msgstr ""
@@ -91363,11 +94104,11 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "¡smash!"
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "whump."
 
@@ -91480,7 +94221,8 @@ msgstr "estatua"
 msgid "A carved statue made of stone."
 msgstr ""
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "tomp."
 
@@ -91491,7 +94233,7 @@ msgstr "maniquí"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
 msgstr ""
 
@@ -91880,7 +94622,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "¡crunch!"
 
@@ -91893,7 +94635,7 @@ msgstr "flor de marloss"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
+"and… delicious?"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -92325,9 +95067,9 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -92397,7 +95139,7 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -92562,7 +95304,7 @@ msgstr "cinta para correr"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
+" taken apart for its… parts."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -92588,7 +95330,7 @@ msgstr "piano"
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -92747,6 +95489,17 @@ msgstr "taburete"
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr ""
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "tablón de anuncios"
@@ -93215,7 +95968,7 @@ msgstr ""
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
 msgstr ""
 
@@ -93289,11 +96042,11 @@ msgid "This beaded curtain could be pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
+msgid "clickity clack… clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
+msgid "clickity clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -93306,7 +96059,7 @@ msgid "This beaded curtain has been pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
+msgid "clickity clack… clack… clack!"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -93450,8 +96203,7 @@ msgstr "pila de escombros de basura"
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -93967,6 +96719,15 @@ msgid ""
 "blood, candles, and other small knick-knacks."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr ""
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr ""
@@ -93996,8 +96757,8 @@ msgstr "¡La verja está abierta!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
-msgstr "Giraste la manivela..."
+msgid "You turn the handle…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -94016,8 +96777,8 @@ msgstr "¡Las puertas del granero se abren!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
-msgstr "Tiras de la soga..."
+msgid "You pull the rope…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -94051,8 +96812,8 @@ msgstr "¡La puerta se levanta!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
-msgstr "Tiras de la palanca..."
+msgid "You throw the lever…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -94245,7 +97006,7 @@ msgstr[1] "arcos de una pieza"
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -94454,9 +97215,7 @@ msgstr ""
 "debido a su tamaño pequeño y corto tensado. Los pernos disparados con esta "
 "arma tienen una gran probabilidad de no romperse."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "pistola"
@@ -94650,6 +97409,18 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "tirar"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -94745,6 +97516,10 @@ msgstr ""
 "el brote. Aunque es poderoso, no es adecuada para distancias largas. Se "
 "alimenta con un UPS."
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "semiautomático"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -94754,10 +97529,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -94773,8 +97548,7 @@ msgid ""
 " a double barrel shotgun."
 msgstr ""
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "escopeta"
@@ -94970,6 +97744,10 @@ msgstr ""
 "Un cañón de agua que pertenecía a un camión de bomberos. Si lo montás en un "
 "vehículo, puede ser usado para apagar fuegos o \"manifestantes\"."
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -95277,8 +98055,8 @@ msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 
@@ -95381,10 +98159,6 @@ msgstr ""
 " no se aconseja ese uso y cancelaría la garantía. No tiene espacio para "
 "incorporarle modificaciones en esta proto-arma inútil."
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "semiautomático"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -96000,15 +98774,10 @@ msgstr[1] "M24"
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
-"El M24 francotirador es una versión militar y policíaca del rifle Remington "
-"modelo 700. M24 es el nombre asignado por el Ejército de Estados Unidos "
-"luego de adoptarlo como su rifle de francotirador estándar en 1988. El M24 "
-"es llamado 'sistema de armas' porque además del rifle tiene una mira "
-"telescópica removible y otros accesorios."
 
 #: lang/json/gun_from_json.py
 msgid "HK417 A2"
@@ -96174,20 +98943,17 @@ msgstr ""
 "disparos que podrás hacer."
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
-msgstr[0] "COP .38"
-msgstr[1] "COP .38"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
 msgstr ""
-"El COP.38 es una pistola derringer pequeña y gordita que tiene un ligero "
-"parecido con el Mossberg Brownie. Tiene cuatro cañones dispuestos en una "
-"formación cuadrada."
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -96223,20 +98989,6 @@ msgstr ""
 "Un revólver de siete disparos calibre .38, vendida por Smith & Wesson. Posee"
 " una mira trasera fija y una estructura reforzada."
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr ""
-"Una pistola calibre .38 popular. Diseñada con muchas características de "
-"seguridad y construida con materiales duraderos de alta calidad."
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -96304,10 +99056,22 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
 msgid_plural "M1911A1s"
@@ -96410,9 +99174,9 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -96438,8 +99202,9 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -96853,8 +99618,9 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -97958,9 +100724,9 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -97972,8 +100738,8 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -97989,7 +100755,7 @@ msgstr[1] ""
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -98002,7 +100768,7 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
@@ -98015,10 +100781,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
 
@@ -98031,10 +100797,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -98782,10 +101548,6 @@ msgid ""
 "and destruction it can cause."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr ""
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -99751,10 +102513,62 @@ msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -99880,12 +102694,6 @@ msgstr ""
 " como otros diseños de ballesta, pero es fácil de cargar. Los pernos "
 "disparados con esta arma tienen una gran probabilidad de no romperse."
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -101072,7 +103880,7 @@ msgstr ""
 msgid "accessories"
 msgstr "accesorios"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "arco"
@@ -101207,7 +104015,7 @@ msgstr[1] ""
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
+"it's a bug.  50x more UPS drain."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -101374,8 +104182,8 @@ msgstr[1] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -101403,7 +104211,7 @@ msgstr[1] ""
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
+"energy efficiency.  Decreases power consumption."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -101418,8 +104226,8 @@ msgstr[1] "capacitores de alta densidad"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -101638,6 +104446,20 @@ msgstr ""
 "compensar el levantamiento de la bocacha. Disminuye el retroceso pero "
 "aumenta el tamaño y el ruido, y reduce un poco la precisión."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
 msgid_plural "homemade suppressors"
@@ -101778,6 +104600,20 @@ msgstr ""
 msgid "rail"
 msgstr "riel"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
@@ -101793,6 +104629,19 @@ msgstr ""
 " una mira telescópica u otra modificación impide el uso de los lugares de "
 "interés principales."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
@@ -101805,6 +104654,18 @@ msgstr ""
 "Es un conjunto de ranuras adicionales a 45º para poner una óptica "
 "secundaria."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
@@ -101836,6 +104697,20 @@ msgstr ""
 "fuego y reduce la vibración, lo que reduce mucho el retroceso e incrementa "
 "levemente la precisión."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -101955,6 +104830,20 @@ msgid ""
 " mrad increments and is remarkably small and light for its magnification."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
@@ -101967,6 +104856,19 @@ msgid ""
 "crosshair."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
 msgid_plural "RS1219 scopes"
@@ -102179,6 +105081,21 @@ msgstr ""
 "que mejoran en gran medida la manipulación del retroceso son utilizables "
 "sólo en ciertas superficies y son lentos para equipar."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -102222,6 +105139,19 @@ msgstr ""
 "control. No es tan eficaz como un bípode pero utilizable en todas las "
 "condiciones."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
@@ -102294,6 +105224,20 @@ msgstr ""
 "M16, pero hoy en día puede ser adjuntado a cualquier rifle. Permite cargar y"
 " disparar una granada 40mm."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
@@ -102311,6 +105255,21 @@ msgstr ""
 "grandes en un tamaño pequeño, a cambio de una menor precisión. Puede ser "
 "adjuntado a un rifle o combinado con una culata para ser usado solo."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "masterkey shotgun"
 msgid_plural "masterkey shotguns"
@@ -102327,6 +105286,20 @@ msgstr ""
 "del cañón de varios rifles. Permite cargar y disparar un total de cuatro "
 "cartuchos de escopeta."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
 msgid_plural "40mm pipe launchers"
@@ -102335,11 +105308,9 @@ msgstr[1] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
 msgstr ""
-"Es un tubo lanzador casero que puede ser adjuntado a casi cualquier rifle. "
-"Permite cargar y disparar una granada 40mm."
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -102372,6 +105343,20 @@ msgstr ""
 "casquillo, que puede ser montada debajo del cañón de varios rifles. Acepta "
 "los cargadores de caja RMSA10."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
 msgid_plural "underslung shotguns"
@@ -102386,6 +105371,20 @@ msgstr ""
 "Es una escopeta corta con 2 cañones, que puede ser montada debajo del cañón "
 "de varios rifles. Permite cargar y disparar dos cartuchos de escopeta."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
 msgid_plural "LW underbarrel laser sights"
@@ -102682,6 +105681,58 @@ msgstr ""
 "dispara y debido a las modificaciones extensivas, el arma ya no puede usarse"
 " sin un UPS."
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -104649,9 +107700,10 @@ msgstr "Medir radiación"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
-msgstr "..."
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
+msgstr ""
 
 #: lang/json/item_action_from_json.py
 msgid "Control an RC car"
@@ -105289,6 +108341,13 @@ msgstr ""
 msgid "This bionic can provide power to powered armor."
 msgstr ""
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr ""
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -106802,6 +109861,7 @@ msgstr "Quitar color usado"
 msgid "Load color template"
 msgstr "Cargar plantilla de color"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -109355,7 +112415,7 @@ msgstr ""
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -109398,6 +112458,91 @@ msgid ""
 "Lasts 2 turns."
 msgstr ""
 
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Kung Fu"
+msgstr "Kung Fu del Tigre"
+
+#. ~ Description for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
+"attacks above all else.  Your Strength determines your accuracy, and your "
+"attacks do increasing damage as you continue attacking."
+msgstr ""
+"Uno de los cinco estilos animales Shaolin. El Tigre se focaliza más que nada"
+" en ataques implacables. Tu fuerza determina tu precisión, y tus ataques "
+"causan mayor daño mientras sigas atacando."
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Fury"
+msgstr "Furia del Tigre"
+
+#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger's Strength"
+msgstr ""
+
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Wing Chun"
+msgstr ""
+
+#. ~ Description for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
+"learn effective techniques from the various Shaolin animal forms.  It has a "
+"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
+"sensitivity to the opponent's direction of force, and flowing around it to "
+"get back to hitting."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr ""
+
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chi-Sao Sensitivity"
+msgstr ""
+
+#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
+msgstr ""
+
 #: lang/json/martial_art_from_json.py
 msgid "Zui Quan"
 msgstr "Zui Quan"
@@ -109406,63 +112551,64 @@ msgstr "Zui Quan"
 #: lang/json/martial_art_from_json.py
 msgid ""
 "AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
-msgstr ""
-"También conocido como \"boxeo de borracho\", Zui Quan imita el movimiento de"
-" un borracho para confundir al enemigo, otorgándote un bonus a esquivar "
-"basado en tu inteligencia. El turno después de atacar, puedes esquivar todos"
-" los ataques sin penalización, y si esquivas exitosamente un ataque recibes "
-"un bonus al daño y al acierto basado en tu inteligencia."
-
-#. ~ Description of buff for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "La inteligencia aumenta la habilidad de esquivar"
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
-msgstr "Contra Golpe"
+msgid "Zui Quan Stance"
+msgstr ""
 
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
-msgstr "Bonus de acierto y de daño después de una evasión exitosa"
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Kung Fu"
-msgstr "Kung Fu del Tigre"
+msgid "Advanced Zui Quan"
+msgstr ""
 
-#. ~ Description for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
+#, no-python-format
 msgid ""
-"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
-"attacks above all else.  Your Strength determines your accuracy, and your "
-"attacks do increasing damage as you continue attacking."
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
 msgstr ""
-"Uno de los cinco estilos animales Shaolin. El Tigre se focaliza más que nada"
-" en ataques implacables. Tu fuerza determina tu precisión, y tus ataques "
-"causan mayor daño mientras sigas atacando."
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Fury"
-msgstr "Furia del Tigre"
+msgid "Drunken Stumble"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "+3 Daño golpeante"
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "Fuerza del Tigre"
+msgid "Drunken Dodging"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "La fuerza otorga un bonus adicional al daño que causas."
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Debug Mastery"
@@ -109490,29 +112636,6 @@ msgstr ""
 "+Inteligencia armadura contra electricidad, +Percepción armadura contra "
 "fuego."
 
-#: lang/json/martial_art_from_json.py
-msgid "Wing Chun"
-msgstr ""
-
-#. ~ Description for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
-"learn effective techniques from the various Shaolin animal forms.  It has a "
-"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
-"sensitivity to the opponent's direction of force, and flowing around it to "
-"get back to hitting."
-msgstr ""
-
-#: lang/json/martial_art_from_json.py
-msgid "Chi-Sao Sensitivity"
-msgstr ""
-
-#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
-msgstr ""
-
 #: lang/json/martial_art_from_json.py
 msgid "Bionic Combatives"
 msgstr "Combativo Biónico"
@@ -109666,13 +112789,11 @@ msgstr "Kung Fu del Sapo"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
 msgstr ""
-"Uno de los Cinco Venenos Mortales. Los maestros del estilo del Sapo pueden "
-"enfocarse a sí mismos contra todos los ataques. Puedes meditar deteniéndote,"
-" otorgándote armadura, aunque vas a perder enfoque cuando te muevas."
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -109680,8 +112801,11 @@ msgstr "Piel de Hierro de Sapo"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "Recibes hasta un +6 de armadura cuando te mantienes quieto"
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -109690,7 +112814,11 @@ msgstr ""
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -109700,39 +112828,48 @@ msgstr "Kung Fu de la Víbora"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
 msgstr ""
-"Un heredero de los Cinco Venenos Mortales. El estilo de la Víbora tiene un "
-"combo único de tres partes, que comienza con esquivar un golpe, después "
-"contraatacar con un manotazo aturdidor y el legendario Golpe de Víbora."
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "Traba de Víbora"
+msgid "Viper's Patience"
+msgstr ""
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
-msgstr "¡Mordiste! ¡Tu próximo ataque será el Golpe de Víbora!"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "Paciencia de Víbora"
+msgid "Viper's Ambush"
+msgstr ""
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
-msgstr "+2 Esquivar. Esquivar un ataque inicia un combo."
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
+msgid "Viper's Venom"
 msgstr ""
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -110114,6 +113251,10 @@ msgstr "Plomo"
 msgid "Leather"
 msgstr "Cuero"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "Leche"
@@ -110178,6 +113319,10 @@ msgstr "Superaleación"
 msgid "layered carbide"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Tin"
 msgstr ""
@@ -110288,6 +113433,10 @@ msgstr ""
 msgid "Arcane Skin"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr ""
@@ -110297,7 +113446,7 @@ msgid "Sugar"
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
+msgid "Gather bones for the Brigitte.  About 8 should do it."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -113705,8 +116854,8 @@ msgstr ""
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -116394,8 +119543,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -116405,7 +119554,7 @@ msgstr ""
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
 msgstr ""
 
@@ -116528,7 +119677,7 @@ msgstr ""
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
 msgstr ""
 
@@ -116631,6 +119780,27 @@ msgstr ""
 "Puedes moverte más rápido que la mayoría. Tienes un 15% de bonus sobre la "
 "velocidad normal a pie."
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr ""
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr ""
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr ""
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "Buen Oído"
@@ -117168,9 +120338,9 @@ msgstr ""
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
 
 #. ~ Description for Stylish
@@ -117328,6 +120498,18 @@ msgid ""
 " Pentjak Silat, or Sōjutsu."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr ""
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
 msgstr "Poco Olor"
@@ -118139,11 +121321,9 @@ msgstr "Ojos de Fey"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
 msgstr ""
-"Tus ojos se han vuelto... verdes. Es difícil decir exactamente de qué matiz "
-"son porque parecen cambiar. El efecto es... placentero."
 
 #: lang/json/mutation_from_json.py
 msgid "Fey Vision"
@@ -119024,10 +122204,8 @@ msgstr "Cargador/a de Marloss"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
+"nose, and you have a strong desire to try some seeds and… sap?"
 msgstr ""
-"Desde que comiste esas bayas Marloss, no te puedes sacar su olor de la "
-"nariz, y tienes como un fuerte deseo de probar semillas y... ¿savia?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vessel"
@@ -119037,10 +122215,8 @@ msgstr "Recipiente de Marloss"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
+"tongue, and you have a strong desire to try some berries and… sap?"
 msgstr ""
-"Desde que comiste esas semillas de Marloss, no te puedes sacar su gusto de "
-"la lengua, y tienes como un fuerte deseo de probar unas bayas y... ¿savia?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vector"
@@ -119486,12 +122662,9 @@ msgstr "Dientes de Sable"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
 msgstr ""
-"Tus colmillos han crecido extremadamente grandes e increíblemente afilados. "
-"Te va a ser imposible usar equipo que cubre tu boca, y te resultará díficil "
-"comer... pero dejas unas horribles heridas cuando muerdas."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
@@ -120861,11 +124034,9 @@ msgstr "Hocico"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
 msgstr ""
-"Tu cara y mandíbula han empezado a... cambiar. Las máscaras te quedan bien, "
-"pero se te nota la mutación."
 
 #: lang/json/mutation_from_json.py
 msgid "Bovine Snout"
@@ -121694,10 +124865,11 @@ msgstr "Ectotérmico/a"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -122029,10 +125201,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
+"every need… but how would you keep them in line?"
 msgstr ""
-"Estaría bueno ser Reina, tener a los obreros constantemente a tu servicio..."
-" pero ¿cómo haces para mantenerlos controlados?"
 
 #. ~ Description for Plant
 #: lang/json/mutation_from_json.py
@@ -122050,11 +125220,9 @@ msgstr "Acuoso"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
 msgstr ""
-"¿Cómo era esa publicidad vieja, 'pintar el planeta'? Eso puede ser un buen "
-"objetivo a largo plazo, pero por ahora..."
 
 #: lang/json/mutation_from_json.py
 msgid "Subterranean"
@@ -123742,7 +126910,7 @@ msgid "Scientist"
 msgstr "Científico"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
+msgid "I'm looking for clues concerning these monsters' origins…"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -123806,7 +126974,7 @@ msgid "Real Person"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -123822,7 +126990,7 @@ msgid "Foodperson"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
@@ -123830,7 +126998,7 @@ msgid "Cyborg"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -123974,6 +127142,14 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr ""
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
+msgstr ""
+
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 #: lang/json/npc_from_json.py
 msgid "Captive"
@@ -125546,6 +128722,10 @@ msgstr "tejado del supermercado"
 msgid "hotel parking"
 msgstr "estacionamiento del hotel"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "hotel"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "entrada del hotel"
@@ -125915,7 +129095,7 @@ msgid "spiked trench"
 msgstr "trinchera con púas"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
+msgid "fabrication workshop survey"
 msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
@@ -125930,6 +129110,14 @@ msgstr "herrería"
 msgid "livestock survey"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr ""
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr ""
@@ -126615,6 +129803,10 @@ msgstr ""
 msgid "shooting range roof"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "campo de golf"
@@ -127281,10 +130473,6 @@ msgstr "centro de despacho de robots"
 msgid "dense urban"
 msgstr ""
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "hotel"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "escuela"
@@ -127305,6 +130493,10 @@ msgstr ""
 msgid "mechanics garage"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
 msgstr "tratamiento de aguas cloacales"
@@ -132209,6 +135401,36 @@ msgid ""
 "on. This displeases you."
 msgstr ""
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -135236,11 +138458,6 @@ msgstr "PIES"
 msgid "MEDICAL"
 msgstr "MEDICAMENTOS"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "RECIPIENTES"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -136226,7 +139443,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
 msgstr ""
 
@@ -136283,7 +139500,7 @@ msgstr ""
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
+"grab a pot.  Let's put it in that dining area."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -136987,7 +140204,7 @@ msgid "build 2 wood stoves"
 msgstr ""
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
+msgid "We should build a well.  This will make cooking more convenient."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -137484,6 +140701,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr ""
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -137504,8 +140897,8 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -137610,7 +141003,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
 msgstr ""
 
@@ -137620,7 +141013,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
 msgstr ""
 
@@ -137630,7 +141023,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
 msgstr ""
 
@@ -138062,7 +141455,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
+"Some benches around the outside would be nice.  Build some to the northwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -138071,7 +141464,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
+"Some benches around the outside would be nice.  Build some to the northeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -138080,7 +141473,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
+"Some benches around the outside would be nice.  Build some to the southeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -138089,7 +141482,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
+"Some benches around the outside would be nice.  Build some to the southwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -138331,6 +141724,10 @@ msgstr ""
 msgid "Central Storage Building"
 msgstr ""
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr ""
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
 msgstr ""
@@ -139710,6 +143107,44 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr ""
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -144792,13 +148227,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
+msgid "Pass some ethanol, I need to power my ethanol burner."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -144806,20 +148235,12 @@ msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
+msgid "I require ethanol for my internal power supply.  Anything on you?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -152519,7 +155940,7 @@ msgid "a static hissing sound."
 msgstr "un siseo de estática."
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152533,11 +155954,11 @@ msgid "\"Hold on, I want to pulp that zombie corpse.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
+msgid "\"Burning… from the inside…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
+msgid "\"This smell…  Don't know…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152549,19 +155970,19 @@ msgid "a scraping noise."
 msgstr "un ruido de rasguño."
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
+msgid "\"No…  Stop the burning!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
+msgid "\"Hunger…  Must eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
+msgid "\"Run…  Chase…  Eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152687,7 +156108,7 @@ msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
+msgid "\"Can't… breathe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152700,8 +156121,8 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152713,7 +156134,7 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152721,11 +156142,11 @@ msgid "\"This is a dream.  This has to be a dream.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
+msgid "\"This is my life now… this is my life now… this is my life now…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
+msgid "\"Wanna go home…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152781,7 +156202,7 @@ msgstr ""
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152804,18 +156225,18 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152938,7 +156359,7 @@ msgid "\"Police inbound.  Stay where you are!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152959,7 +156380,7 @@ msgid "\"FoodPlace: It's the Calories.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -153027,8 +156448,8 @@ msgid "You shouldn't have done that."
 msgstr "No deberías haber hecho eso."
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
-msgstr "Vamos a jugar a... la Ruleta Rusa."
+msgid "Let's play… Russian roulette."
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "I hate you."
@@ -153039,8 +156460,8 @@ msgid "Go kill yourself!"
 msgstr "¡Por qué no te matas!"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
-msgstr "Gran Hermano te está mirando..."
+msgid "Big Brother is watching you…"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Die for me!"
@@ -153051,12 +156472,12 @@ msgid "Why won't you die?"
 msgstr "¿Por qué no te mueres?"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
-msgstr "Sangre... Deliciosa."
+msgid "Blood…  Delicious."
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
-msgstr "Nos vemos... ¡EN EL INFIERNO!"
+msgid "See you… IN HELL!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "AAAIEEEEEEE!"
@@ -153071,8 +156492,8 @@ msgid "What did you do with my Mommy?"
 msgstr "¿Qué hiciste con mi mamá?"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
-msgstr "Quedate conmigo... ¡para siempre!"
+msgid "Stay with me… forever!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Hey kids.  Want some candy?"
@@ -154487,6 +157908,10 @@ msgstr ""
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#: lang/json/start_location_from_json.py
+msgid "Wizard's lake retreat"
+msgstr ""
+
 #: lang/json/start_location_from_json.py
 msgid "Candy Shop"
 msgstr ""
@@ -154536,16 +157961,16 @@ msgid "You there. Quiet down. Can you hear it? The song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
+msgid "What?  What do you mean?  What song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
+msgid "So about the songs…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
 msgstr ""
 
@@ -154562,7 +157987,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154572,11 +157997,11 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
+msgid "What?  Singing bones?  What are you talking about?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154625,7 +158050,7 @@ msgid "I will bear that in mind"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154637,7 +158062,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
+msgid "End the world?  What?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154649,8 +158074,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154665,7 +158090,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
+msgid "I… thank you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154694,28 +158119,28 @@ msgid "That is all for now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgid "A song may yet be sung by you, should you wish to."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
+msgid "There is an additional song you could take on, if you'd like."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
+msgid ""
+"I know of certain bones that could be of use, if you'd like to know more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "A song may yet be sung by you, should you wish to."
+msgid "There are bones to etch, songs to sing. Wish to join me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There is an additional song you could take on, if you'd like."
+msgid "Do you wish to take on more songs?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid ""
-"I know of certain bones that could be of use, if you'd like to know more."
+msgid "Do you believe you can take on the burden of additional bones?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154739,7 +158164,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154747,7 +158172,7 @@ msgid "Not interested."
 msgstr "No estoy interesado."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
+msgid "Consider it done.  But I also wanted to ask…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154763,7 +158188,7 @@ msgid "I'm off then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154773,7 +158198,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
+msgid "I see.  Very well then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154791,11 +158216,11 @@ msgid "I am glad to hear it. Let's go then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
+msgid "Maybe some other time.  Changing the topic…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154817,17 +158242,17 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
 
@@ -154839,6 +158264,10 @@ msgstr ""
 msgid "Skip it, let's get going."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr ""
@@ -154896,13 +158325,25 @@ msgid "What about chit-chatting and your background?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -154946,7 +158387,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154969,7 +158412,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -155008,8 +158453,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
 
@@ -155017,6 +158462,10 @@ msgstr ""
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -155074,11 +158523,27 @@ msgid ""
 "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -155089,6 +158554,10 @@ msgstr ""
 msgid "Tell me more about the activities you can do now."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -155295,19 +158764,19 @@ msgid "Let's go."
 msgstr "Vamos."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
-msgstr "Cambiar tus reglas de enfrentamiento..."
+msgid "Change your engagement rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
-msgstr "Cambiar tus reglas para apuntar..."
+msgid "Change your aiming rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
+msgid "Change your bionic power reserve rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
+msgid "Change your bionic power recharge rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -155319,11 +158788,11 @@ msgid "Stick close to me, no matter what."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
+msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_false_text>"
+msgid "<ally_rule_follow_distance_2_true_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -155583,7 +159052,7 @@ msgid "Nah, I'm just kidding."
 msgstr "Nah, te estaba tomando el pelo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
+msgid "Please go to this location…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -155715,8 +159184,8 @@ msgstr ""
 "desde que... desde todo esto. ¿Cómo la vas llevando?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
-msgstr "Ah, ya sabés, no me quejo, no me quejo..."
+msgid "Oh you know, not bad, not bad…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "<hallu_dont_trade>"
@@ -155803,14 +159272,14 @@ msgstr ""
 msgid "&Put hands up."
 msgstr "&Levanta las manos."
 
-#: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
-msgstr "*suelta su arma."
-
 #: lang/json/talk_topic_from_json.py
 msgid "*drops_her_weapon."
 msgstr "*suelta_su_arma."
 
+#: lang/json/talk_topic_from_json.py
+msgid "*drops his weapon."
+msgstr "*suelta su arma."
+
 #: lang/json/talk_topic_from_json.py
 msgid "Now get out of here"
 msgstr "Ahora vete de aquí"
@@ -155824,12 +159293,12 @@ msgid "Okay, I'm going."
 msgstr "Vale, me voy."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
-msgstr "Hablando de ese trabajo..."
+msgid "About that job…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
-msgstr "Hablando de esos trabajos que me dijiste..."
+msgid "About one of those jobs…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "What's the matter?"
@@ -155847,14 +159316,6 @@ msgstr "No tengo ningún trabajo para ti."
 msgid "I don't have any more jobs for you."
 msgstr "No tengo ningún otro trabajo para ti."
 
-#: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
-msgstr ""
-
 #: lang/json/talk_topic_from_json.py
 msgid "I have another job for you.  Want to hear about it?"
 msgstr "Tengo otro trabajo para ti. ¿Quieres que te cuente?"
@@ -155863,6 +159324,14 @@ msgstr "Tengo otro trabajo para ti. ¿Quieres que te cuente?"
 msgid "I just have one job for you.  Want to hear about it?"
 msgstr "Tengo un trabajo para ti. ¿Quieres que te cuente?"
 
+#: lang/json/talk_topic_from_json.py
+msgid "I have other jobs for you.  Want to hear about them?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I have more jobs for you.  Want to hear about them?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
 #: src/npctalk.cpp
 msgid "Oh, okay."
@@ -155921,8 +159390,8 @@ msgid "Whatever.  Bye."
 msgstr "Como quieras. Adiós."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
-msgstr "Perdón... fracasé."
+msgid "I'm sorry…  I failed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not yet."
@@ -155941,8 +159410,8 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "No. ¡Ahora sigo con eso, adiós!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
-msgstr ""
+msgid "Yup!  Here it is!"
+msgstr "¡Sip! ¡Aquí está/n!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "We're here!"
@@ -156199,8 +159668,8 @@ msgid "Alright.  You can lead now."
 msgstr "Bueno. Ahora puedes guiarme."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
-msgstr "Bieno. Algo más..."
+msgid "Good.  Something else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alright, let's go."
@@ -156279,8 +159748,8 @@ msgid "I'd prefer to keep that to myself."
 msgstr "Prefiero quedarme con eso para mí."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
-msgstr "Entiendo..."
+msgid "I understand…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "You just asked me for stuff; ask later."
@@ -156303,8 +159772,8 @@ msgid "Because I'm your friend!"
 msgstr "¡Porque soy tu amigo!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
-msgstr "Bueno, te estoy ayudando..."
+msgid "Well, I am helping you out…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'll give it back!"
@@ -156351,15 +159820,15 @@ msgid "No, I'm keeping it. Try and take it off me, I dare you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
+msgid "Look, I really need this.  Please let me have it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
+msgid "What, this?  It's not the same one, you are mistaken."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
+msgid "I'm sorry.  Look, I already dropped it, okay?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156367,7 +159836,7 @@ msgid "Don't try and talk yourself out of this, drop it now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
+msgid "Okay, I'm dropping it…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156429,8 +159898,8 @@ msgid "Pleasure doing business!"
 msgstr "¡Un placer hacer negocios!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
-msgstr "Tal vez me vuelvas a ver..."
+msgid "You might be seeing more of me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey again. *kzzz*"
@@ -156443,21 +159912,21 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
+msgid "Hey.  Let's chat for a second."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
+msgid "That's because I saved you.  Listen, I could use your help…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156469,7 +159938,7 @@ msgid "Come with me. We can help each other out."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
+msgid "We both go our separate ways.  Enjoy your freedom."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156486,8 +159955,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156508,7 +159977,7 @@ msgid "Get out of my sight."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156524,7 +159993,7 @@ msgid "Not if I kill you first!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
+msgid "I'm sorry!  I shouldn't have said that!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156565,14 +160034,37 @@ msgstr "Nada. Sigamos trabajando."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
-msgstr "Continua."
+msgid "Give me an overview of how camps work."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Never mind, let's go back to talking about camps."
@@ -156592,62 +160084,120 @@ msgstr "Olvídalo. Vamonos."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
+msgid "Wait, we can talk with radios?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
-msgstr "Gracias, sigamos hablando de los campamentos."
+msgid "Got it.  Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -156660,6 +160210,14 @@ msgid ""
 "6.  You can now set up faction camps in select buildings.  The list of available buildings is constantly growing, so you'll have to experiment."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr "Gracias, sigamos hablando de los campamentos."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -156759,11 +160317,11 @@ msgid "Well, sure."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
+msgid "I'd… rather not."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156794,7 +160352,7 @@ msgid "Oh, but you already have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
+msgid "Yes… yes I have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156859,7 +160417,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
+msgid "Horrible.  Did you get any pictures yourself?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157011,7 +160569,7 @@ msgid "This is a npc allies 1 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
+msgid "This an error!  npc allies 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157211,7 +160769,7 @@ msgid "This is a u_has_items beer test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
+msgid "Test failure!  This is a u_has_items test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157223,7 +160781,7 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157311,7 +160869,7 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157367,11 +160925,7 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
+msgid "Greetings…  Foodperson?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157413,7 +160967,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
+msgid "Ah…  Well, nice to meet you Foodperson."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157441,7 +160995,7 @@ msgid "Sure, whatever."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
+msgid "Ok…  I believe you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157537,7 +161091,7 @@ msgid "That sounds great!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
+msgid "Ok…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157545,7 +161099,7 @@ msgid "I need to think about it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
+msgid "Huh…  No thanks."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157562,7 +161116,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr ""
 
@@ -158330,7 +161884,7 @@ msgid "Giant bees?  Tell me more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
+msgid "But bees aren't usually aggressive…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158342,7 +161896,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158770,7 +162324,7 @@ msgid "No.  I can't.  Just, no."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
+msgid "Sorry…  I'll let you be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159006,8 +162560,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
-msgstr "Bueno..."
+msgid "Okay…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -159379,7 +162933,7 @@ msgid "What do you think happened?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
+msgid "That does sound a little crazy…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159428,7 +162982,7 @@ msgid "What happened to you after that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
+msgid "It can't be healthy to abandon your past like that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159872,8 +163426,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
-msgstr "¿Te refieres en un sentido religioso, o...?"
+msgid "Do you mean in a religious sense, or…?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -160201,8 +163755,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160313,7 +163867,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
+msgid "Oh, I'm sorry…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160640,7 +164194,7 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
+msgid "I'd like to ask you something else…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160931,7 +164485,8 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161119,16 +164674,16 @@ msgid "What do you need done?"
 msgstr "¿Hay algo que sea necesario hacer?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
-msgstr "Acerca de la misión..."
+msgid "About the mission…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
-msgstr "Acerca de una de esas misiones..."
+msgid "About one of those missions…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
-msgstr "Me tengo que ir..."
+msgid "I've got to go…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -161143,8 +164698,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
-msgstr "Parece un plan decente..."
+msgid "Seems like a decent plan…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -161172,9 +164727,8 @@ msgstr ""
 "niveles inferiores."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
+msgid "Whatever they did it must have worked since we are still alive…"
 msgstr ""
-"Sea lo que hayan hecho debe haber funcionado porque todavía estamos vivos..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Marshal, I'm rather surprised to see you here."
@@ -161212,8 +164766,8 @@ msgstr ""
 "mi comandante si tienes alguna pregunta."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
-msgstr "Voy a intentar encontrar a tu comandante entonces..."
+msgid "I'll try and find your commander then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -161281,8 +164835,8 @@ msgstr ""
 "Hey señorita, ¿no le parece que estaría más segura si se queda conmigo?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
-msgstr "No me prestes atención..."
+msgid "Don't mind me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -161545,7 +165099,7 @@ msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
+msgid "About that shopping list of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161611,7 +165165,7 @@ msgid "Would you like me to give you some cardboard?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
+msgid "I think I have to get going…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161640,7 +165194,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
+msgid "…What were you saying before?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161658,7 +165212,7 @@ msgid "No."
 msgstr "No."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161750,7 +165304,7 @@ msgid "I found a sample of alien fungus for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
+msgid "Ok… see ya."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161848,8 +165402,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161881,7 +165435,7 @@ msgid "You sound more optimistic than usual."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162001,7 +165555,7 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162109,7 +165663,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162516,7 +166070,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162772,7 +166326,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
+msgid "About that sourdough starter you had me looking for…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -163066,7 +166620,7 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
+msgid "Yes, yes I would… you monster."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -163262,6 +166816,10 @@ msgid ""
 "idea of trying it."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr "Continua."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -163516,7 +167074,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -163942,7 +167500,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr ""
 
@@ -164635,7 +168193,7 @@ msgid "Are you looking to buy anything else?"
 msgstr "¿Quieres comprar algo más?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
+msgid "Very well… let's talk about something else."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -164986,8 +168544,8 @@ msgid "Have you seen anyone who might be hiding something?"
 msgstr "¿Viste a alguien que podría estar ocultando algo?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
-msgstr "Adiós..."
+msgid "Bye…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165003,16 +168561,16 @@ msgid "Keep your head down and stay out of my way."
 msgstr "Mantené tu cabeza agachada y no te metas en mi camino."
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
-msgstr "OK..."
+msgid "OK…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like what?"
 msgstr "¿Como qué?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
-msgstr "No estoy seguro..."
+msgid "I'm not sure…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like they could be working for someone else?"
@@ -165031,8 +168589,8 @@ msgid "Got something to hide?"
 msgstr "¿Tienes algo que esconder?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
-msgstr "Perdón, no te quise ofender..."
+msgid "Sorry, I didn't mean to offend you…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165085,7 +168643,7 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr "Señora, no debería estar viajando por ahí afuera."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
+msgid "I heard this place was a refugee center…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165109,8 +168667,8 @@ msgid "Can I do anything for the center?"
 msgstr "¿Puedo hacer algo por el centro?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
-msgstr "Me supuse que estarías buscando ayuda..."
+msgid "I figured you might be looking for some help…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, I'd better be going.  Bye."
@@ -165165,7 +168723,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
 msgstr ""
 
@@ -165224,8 +168782,8 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr "Lo lamento, ahora no estamos dispuestos a correr ningún riesgo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
-msgstr "Bien..."
+msgid "Fine…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165240,8 +168798,8 @@ msgstr ""
 "el pelo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
-msgstr "Bien... *tosatupropiatos*"
+msgid "Fine… *coughupyourscough*"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165276,8 +168834,8 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[STR 11] ¡Le pego piñas a las cosas bastante bien!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
-msgstr "Supongo que buscaré en otro lado..."
+msgid "I guess I'll look somewhere else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165303,8 +168861,8 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr "¿Conocés algo mejor que la provisión de armas raras?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
-msgstr "Estaba esperando algo más..."
+msgid "Was hoping for something more…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165404,8 +168962,8 @@ msgid "So what are you doing right now?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
-msgstr "No importa..."
+msgid "Never mind…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165427,8 +168985,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
-msgstr "Que tengas suerte con eso..."
+msgid "Good luck with that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165471,8 +169029,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
-msgstr "Una porquería..."
+msgid "Sucks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165490,8 +169048,8 @@ msgstr ""
 "monstruos parecen poder romper una valla o una pared construido con al cosa."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
-msgstr "Bueno, entonces..."
+msgid "Well, then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165595,8 +169153,8 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr "Ah, me pareció oler a alguien nuevo. ¿Te puedo ayudar en algo?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
-msgstr "Tú... ¿me oliste?"
+msgid "You… smelled me?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Got anything for sale?"
@@ -165654,8 +169212,8 @@ msgstr ""
 "nada es tan bueno para cenar como un bife de alce recién cocinado!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
-msgstr "Buenísimo, ahora se me hace agua la boca..."
+msgid "Great, now my mouth is watering…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165769,8 +169327,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
-msgstr "Hmmm..."
+msgid "Hmmm…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165829,8 +169387,8 @@ msgstr ""
 "de hacerte conocido entre los hombres más poderosos que quedan en el mundo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
-msgstr "Yo no hice nada malo..."
+msgid "I haven't done anything wrong…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any tips for surviving?"
@@ -165998,7 +169556,7 @@ msgid "Something to say?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
+msgid "I charge hourly, so be quick…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166111,7 +169669,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
+msgid "I guess I could help with that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166222,8 +169780,8 @@ msgid "[$10] I'll get a haircut"
 msgstr "[$10] Quiero que me cortes el pelo"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
-msgstr "Tal vez en otro momento..."
+msgid "Maybe another time…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166242,8 +169800,8 @@ msgid "Stand still while I get my clippers..."
 msgstr "Quedate quieto mientras busco mis tijeras..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
-msgstr "Gracias... "
+msgid "Thanks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Want a drink?"
@@ -166262,8 +169820,8 @@ msgid "What do you have on tap?"
 msgstr "¿Qué tienes en el grifo?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
-msgstr "Me voy yendo..."
+msgid "I'll be going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166321,8 +169879,8 @@ msgstr ""
 "acerca de lo que se necesita hacer."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
-msgstr "Voy a hablar con él entonces..."
+msgid "I'll talk to him then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166342,8 +169900,8 @@ msgid "I hope you are here to do business."
 msgstr "Espero que hayas venido para hacer negocios."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
-msgstr "Estoy interesado en invertir en la agricultura..."
+msgid "I'm interested in investing in agriculture…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166373,12 +169931,12 @@ msgid "I imagine we might be able to work something out."
 msgstr "Me imagino que podemos llegar a encontrarle la vuelta."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
-msgstr "Me preguntaba si podrías instalar un implante cibernético..."
+msgid "I was wondering if you could install a cybernetic implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
-msgstr "Necesito ayuda para quitar un implante..."
+msgid "I need help removing an implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'd like to hire your services."
@@ -166427,8 +169985,8 @@ msgstr ""
 "exitoso."
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
-msgstr "Podría ser peor..."
+msgid "It could be worse…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166439,8 +169997,8 @@ msgstr ""
 "capataz o un supervisor de cultivos."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
-msgstr "Voy a hablar con ellos entonces..."
+msgid "I'll talk with them then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Can I help you, marshal?"
@@ -166521,8 +170079,8 @@ msgstr ""
 "los ataques de muertos vivientes."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
-msgstr "Con suerte, mudarme aquí valdrá la pena..."
+msgid "Hopefully moving out here was worth it…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -167069,13 +170627,13 @@ msgstr "Mordida de Víbora"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
-msgstr "Usas tu mordida de víbora con %s"
+msgid "You lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
-msgstr "<npcname> usa su mordida de víbora con %s"
+msgid "<npcname> lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Strike"
@@ -167083,18 +170641,28 @@ msgstr "Golpe de Víbora"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
-msgstr "Le das un Golpe de Víbora al %s"
+msgid "You hit %s with a spectacular Viper Strike"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
-msgstr "<npcname> le da un Golpe de Víbora al %s"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr "Retorcimiento de Víbora"
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr ""
@@ -167137,6 +170705,34 @@ msgstr ""
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr "Lengua de Sapo"
@@ -168879,32 +172475,18 @@ msgid "<npcname> double-handed palm strikes %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
-msgstr "Amague de borracho"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "You stumble and leer at %s"
-msgstr "Tropiezas y miras fijamente al %s"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "<npcname> stumbles and leers at %s"
-msgstr "<npcname> tropieza y mira fijamente al %s"
-
-#: lang/json/technique_from_json.py
-msgid "Drunk counter"
-msgstr "Contraataque de borracho"
+msgid "Tiger Palm"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
-msgstr "Tambaleás, y tu golpe salvaje le pega al %s"
+msgid "You land a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
-msgstr "<npcname> tambalea, y golpea %s"
+msgid "<npcname> lands a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Tiger Takedown"
@@ -168912,95 +172494,78 @@ msgstr "Derribo de Tigre"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
-msgstr "Agarrás y tirás al suelo al %s"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "<npcname> grabs and grounds %s"
-msgstr "<npcname> agarra y tira al suelo al %s"
-
-#: lang/json/technique_from_json.py
-msgid "slow strike"
-msgstr "golpe lento"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "You slowly strike %s"
-msgstr "Golpeas lentamente %s"
+msgid "You slam %s to the ground"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
-msgstr "<npcname> golpea lentamente %s"
+msgid "<npcname> slams %s to the ground"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
-msgstr "golpe de fase"
+msgid "Straight Punch"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
-msgstr "Le das un golpe de fase %s"
+msgid "You deliver a vertical straight punch to %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
-msgstr "<npcname> le da un golpe de fase %s"
-
-#: lang/json/technique_from_json.py
-msgid "Chain Punch"
+msgid "<npcname> delivers a vertical straight punch to %s"
 msgstr ""
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
+msgid "Straight Punch (Knockback)"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
+msgid "You force %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
+msgid "<npcname> forces %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
+msgid "L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
+#, python-format
+msgid "You deliver a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "ask the way"
+#, python-format
+msgid "<npcname> delivers a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-#, python-format
-msgid "You miss but keep striking at %s"
+msgid "L-hook (Knockback)"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
+msgid "You knock %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "White Crane stumble"
+#, python-format
+msgid "<npcname> knocks %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
+msgid "Your attack misses %s but you don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
+msgid "<npcname>'s attack misses %s but they don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
@@ -169017,15 +172582,71 @@ msgstr ""
 msgid "<npcname> receives %s's attack, and counters"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "Drunken Feint"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You stumble and leer at %s"
+msgstr "Tropiezas y miras fijamente al %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> stumbles and leers at %s"
+msgstr "<npcname> tropieza y mira fijamente al %s"
+
+#: lang/json/technique_from_json.py
+msgid "Drunk Counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You lurch, and your wild swing hits %s"
+msgstr "Tambaleás, y tu golpe salvaje le pega al %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> lurches, and hits %s"
+msgstr "<npcname> tambalea, y golpea %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they stumble away!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "slow strike"
+msgstr "golpe lento"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You slowly strike %s"
+msgstr "Golpeas lentamente %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> slowly strikes %s"
+msgstr "<npcname> golpea lentamente %s"
+
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
+msgstr "golpe de fase"
+
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
-msgstr "Desarmas a %s"
+msgid "You phase-strike %s"
+msgstr "Le das un golpe de fase %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
-msgstr "<npcname> desarma a %s"
+msgid "<npcname> phase-strikes %s"
+msgstr "<npcname> le da un golpe de fase %s"
 
 #: lang/json/technique_from_json.py
 msgid "Pressure Crunch"
@@ -169661,7 +173282,7 @@ msgstr ""
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr ""
 
@@ -169672,8 +173293,8 @@ msgstr ""
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -169683,7 +173304,7 @@ msgstr ""
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr ""
 
@@ -170802,7 +174423,7 @@ msgstr ""
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
 msgstr ""
 
@@ -171113,7 +174734,7 @@ msgstr ""
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr ""
 
@@ -171428,10 +175049,10 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
 
 #. ~ Description for juniper tree
@@ -172409,10 +176030,11 @@ msgstr "cajero automático"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -172517,8 +176139,8 @@ msgstr "centrifugadora"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -173125,7 +176747,7 @@ msgstr ""
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
 msgstr ""
@@ -173137,7 +176759,7 @@ msgstr ""
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
 msgstr ""
@@ -173228,6 +176850,13 @@ msgid ""
 " were still running."
 msgstr ""
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr ""
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "arenero"
@@ -173294,7 +176923,7 @@ msgstr ""
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr ""
 
@@ -173306,7 +176935,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
 msgstr ""
 
@@ -174133,7 +177762,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr ""
 
@@ -175410,12 +179039,8 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
-"¡Acabas de activar una granada! Probablemente quieras tirarla. Para tirar un"
-" objeto, pulsa 't' y elige lo que quieres tirar. El alcance máximo depende "
-"de tu fuerza y del peso y tamaño del objeto. Tirar cosas no es lo mejor para"
-" un combate, pero si tienes artillería pesada..."
 
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
@@ -175511,7 +179136,7 @@ msgstr ""
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr ""
@@ -175860,6 +179485,10 @@ msgstr ""
 msgid "Rail Motorcycle"
 msgstr ""
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr ""
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "Camión de Plataforma"
@@ -176685,7 +180314,7 @@ msgstr ""
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
 msgstr ""
 
 #. ~ Description for shredder
@@ -177176,8 +180805,8 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr ""
 
 #. ~ Description for autoclave
@@ -177363,7 +180992,7 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
 msgstr ""
 
@@ -177902,6 +181531,14 @@ msgstr ""
 msgid "rail wheel (steerable)"
 msgstr ""
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr ""
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "rodillo"
@@ -179594,6 +183231,10 @@ msgstr "Vitamina B12"
 msgid "Vitamin C"
 msgstr "Vitamina C"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr ""
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr "Pulsa "
@@ -180103,7 +183744,7 @@ msgstr "Metes un cartucho en el/la %s."
 msgid "You refill the %s."
 msgstr "Has rellenado el %s."
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "Ahí no hay nada para prender fuego."
 
@@ -180121,6 +183762,16 @@ msgstr ""
 "Ahora no hay suficiente luz solar para encender un fuego. Dejás de "
 "intentarlo."
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr ""
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "Aprendiste %s."
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -180131,11 +183782,6 @@ msgstr "Terminaste de entrenar %s al nivel %d."
 msgid "You get some training in %s."
 msgstr ""
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "Aprendiste %s."
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr ""
@@ -180254,15 +183900,22 @@ msgstr ""
 msgid "Your %s is already fully repaired."
 msgstr ""
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr "En este momento, no puedes arreglar el/la %s."
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgstr ""
+
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr ""
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr "Calientas la comida."
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
-msgstr "Pudiste arreglar satisfactoriamente el/la %s."
+msgid "You are currently unable to mend the %s."
+msgstr "En este momento, no puedes arreglar el/la %s."
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -180564,7 +184217,7 @@ msgstr "Has terminado de taladrar ."
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr "¡hsh!"
 
@@ -181193,12 +184846,12 @@ msgstr ""
 "Reducción del movimiento. Depresión. Sistema inmunológico débil. Antojos frecuentes."
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
-msgstr "Percepción - 1; Inteligencia - 1; Antojos frecuentes."
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
-msgstr "Percepción - 2; Inteligencia - 2; Antojos frecuentes."
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
 msgid ""
@@ -181384,38 +185037,6 @@ msgstr "lug cant  peso  vol"
 msgid "Name (charges)"
 msgstr "Nombre (Cargas)"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "¡No estás arrastrando ningún vehículo!"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "¡Sin vehículo arrastrado!"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "¡Contenedor no válido!"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "Los 9 espacios"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr " <color_white_red>FUEGO</color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr " PELIGRO"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr "TRAMPA"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr "AGUA"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -181539,7 +185160,39 @@ msgstr ""
 msgid "The destination is already full!"
 msgstr "¡El destino ya está lleno!"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "¡No estás arrastrando ningún vehículo!"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "¡Sin vehículo arrastrado!"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "¡Contenedor no válido!"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "Los 9 espacios"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr " <color_white_red>FUEGO</color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr " PELIGRO"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr "TRAMPA"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr "AGUA"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "Contenedor no válido"
 
@@ -181677,6 +185330,14 @@ msgstr "Golpe:"
 msgid "Cut:"
 msgstr "Corte: "
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr ""
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr ""
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "Ambiental: "
@@ -182362,17 +186023,15 @@ msgstr "%s Sufrimiento"
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
+"  Seeing this is a bug!"
 msgstr ""
 
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
 msgstr ""
-"El %s está satisfecho, y debería estarlo porque no tiene ningún requisito. "
-"¡Ver esto es un bug!"
 
 #: src/artifact.cpp
 #, c-format
@@ -182397,10 +186056,8 @@ msgstr "Apretás tu %s contra tu piel."
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr ""
-"El %s está confundido al verte soñando mientras estás despierto. ¡Ver esto "
-"es un bug!"
 
 #: src/artifact.cpp
 #, c-format
@@ -183173,6 +186830,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr ""
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr "¿Qué quieres hacer con tu %s?"
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr ""
@@ -183309,12 +186971,14 @@ msgstr ""
 "separado."
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
+#, c-format
+msgid "You can no longer fire your %s."
 msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "¡Necesitas un brazo libre para conducir!"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -183322,8 +186986,9 @@ msgid "You need two free hands to fire your %s."
 msgstr "Necesitas las dos manos libres para poder disparar tu %s."
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "¡Necesitas recargar!"
+#, c-format
+msgid "Your %s is empty!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -183334,18 +186999,18 @@ msgstr "¡Tu %s necesita %i cargas para poder disparar!"
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
+"charges to fire the %s!"
 msgstr ""
-"¡Necesitas un UPS con %d cargas como mínimo o un UPS mejorado con %d cargas "
-"como mínimo para poder disparar eso!"
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
 msgstr ""
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
 msgstr ""
 
@@ -183580,6 +187245,16 @@ msgstr "Tus %s se desactivan automáticamente."
 msgid "Your %s automatically turns off."
 msgstr "Tu %s se desactiva automáticamente."
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "Te arrepientes y lo apagas."
@@ -183697,10 +187372,6 @@ msgstr "Resultado del Análisis de Sangre"
 msgid "No effects."
 msgstr "Sin efectos."
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr "¡No había suficiente humedad en el aire para poder extraer agua!"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr ""
@@ -183713,10 +187384,6 @@ msgstr ""
 msgid "Start a fire where?"
 msgstr "¿Dónde quieres encender un fuego?"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "No puedes encender un fuego ahí."
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -183893,6 +187560,20 @@ msgstr ""
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr ""
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -183921,6 +187602,21 @@ msgstr "Tu %s ha perdido conexión y se está apagando."
 msgid "You feel your throat open up and air filling your lungs!"
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr ""
@@ -184702,8 +188398,12 @@ msgstr "に坂索トし荷測のンおク妙免イロコヤ梅棋厚れ表幌"
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
-msgstr "tú"
+msgid "You"
+msgstr "Tú"
+
+#: src/character.cpp
+msgid "Your"
+msgstr ""
 
 #: src/character.cpp
 msgid "your"
@@ -184935,6 +188635,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr ""
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr "¡No puedes poner objetos aquí!"
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr "¡<npcname> no puede poner los objetos aquí!"
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -184958,10 +188666,20 @@ msgstr "Necesitas al menos %1$s para usar %2$s con tu %3$s."
 msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr "<npcname> necesita al menos %1$s para usar %2$s con su %3$s."
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr "No puedes dejar de empuñar tu %s."
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr "Tu actual valor de salud es %d. "
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "Muerto de sed"
@@ -185031,6 +188749,78 @@ msgstr ""
 msgid "Your %s bionic shorts out!"
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "Tu %s será quemado/a por el frío en las próximas horas."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "¡Tu %s se te congelará en menos de una hora!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr "¡Tu %s se te congelará en cualquier momento!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr "¡Sientes tu %s comenzando a entumecerse por el frío!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr "Sientes que tu %s se está enfriando mucho."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr "Sientes que tu %s se está helando."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr "¡Sientes tu %s ardiendo del calor!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr "Sientes que tu %s se está poniendo muy caliente."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr "Sientes que tu %s se está calentando."
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "El viento hace que tu %s se sienta bastante frío/a."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr ""
+"El viento es muy fuerte, deberías conseguir abrigo un poco más resistente al"
+" viento para tu %s."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr ""
+"¡Tu ropa no te brinda protección suficiente contra el viento para tu %s!"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "Brazo Izq."
@@ -185195,8 +188985,8 @@ msgstr ""
 msgid "Big"
 msgstr ""
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "Normal"
 
@@ -185300,6 +189090,32 @@ msgstr ""
 msgid "EXTRA_EXERCISE"
 msgstr ""
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr "¡Tu cuerpo se esfuerza en mantener tanto peso!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] "Tu %s necesita %d carga de algún UPS."
+msgstr[1] "Tu %s necesita %d cargas de algún UPS."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] "Tu %s tiene %d carga pero necesita %d."
+msgstr[1] "Tu %s tiene %d cargas pero necesita %d."
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "Toses fuertemente."
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "una tos seca."
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr ""
@@ -185480,6 +189296,22 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr "Hibernación comenzada."
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr ""
+"Has aprendido %s por tu exhaustiva práctica con el Biónico de Pelea en "
+"espacios cerrados."
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr ""
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "Sin estilo"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "No Auto-recogida"
@@ -185524,269 +189356,6 @@ msgid ""
 "this area."
 msgstr ""
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr ""
-"Lugar para dejar las cosas sin orden. Podés usar la acción de zona \"ordenar"
-" cosas\" para ordenar los objetos dentro. Se puede sobreponer con otras "
-"zonas de cosas."
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr "Cosas: Comida"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr "Cosas: P.Comida"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr ""
-"Lugar para los comestibles perecederos. Incluye bebidas perecederas si no "
-"hay una zona específica para ellas."
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr "Cosas: P.Bebidas"
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr "Cosas: Armas de Fuego"
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr "Cosas: Cargadores"
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr "Cosas: Munición"
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr "Lugar para la munición."
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr "Cosas: Ropa"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr "Lugar para la ropa sucia."
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr "Cosas: Drogas"
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr "Lugar para drogas y otros objetos médicos."
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr "Cosas: Libros"
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr "Lugar para libros y revistas."
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr "Lugar para modificaciones de armas de fuego y similares."
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr "Lugar para mutágenos, sueros y purificantes."
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr "Cosas: Biónicos"
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr "Lugar para Módulos Compactos de Biónicos, también conocidos como MCB."
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr "Cosas: Partes de Vehículos"
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr "Cosas: Otros"
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr "Lugar para otros objetos varios."
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr "Cosas: Combustible"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr "Cosas: Semillas"
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr "Lugar para semillas, tallos y similares."
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr "Cosas: Químicos"
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr "Lugar para químicos."
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr "Cosas: S.Partes"
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr "Lugar para partes sueltas."
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr ""
-"Lugar para armaduras. Incluye armaduras sucias si no hay una zona específica"
-" para ella."
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr "Cosas: Ignorar"
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr ""
-"Los objetos dentro de esta zona son ignorados por la acción \"ordenar "
-"cosas\"."
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr ""
@@ -185794,7 +189363,7 @@ msgstr ""
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
 msgstr ""
 
@@ -185854,6 +189423,16 @@ msgstr ""
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr ""
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr ""
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr ""
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
 msgstr ""
@@ -187170,26 +190749,6 @@ msgstr "Sientes que el/la %s te llena."
 msgid "<npcname> looks better after eating the %s."
 msgstr "<npcname> se ve mejor después de comerse el/la %s."
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "Tu almacenamiento interno de energía está completamente cargado."
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr ""
-"El almacenamiento interno de energía de <npcname> está completamente "
-"cargado."
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr "Recargás tu sistema de batería con el %s."
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr "<npcname> recarga su sistema de batería con el %s."
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr ""
@@ -188187,6 +191746,10 @@ msgstr ""
 msgid "Toggle display temperature"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr ""
@@ -188227,6 +191790,10 @@ msgstr ""
 msgid "Print faction info to console"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Test weather"
 msgstr ""
@@ -188506,6 +192073,10 @@ msgstr "Ventana de Estado [@]"
 msgid "t[e]leport"
 msgstr "t[e]letransportar"
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr "Editar [M]isiones (PELIGRO: ¡Inestable!)"
@@ -189092,10 +192663,12 @@ msgstr ""
 msgid "Spell"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
 msgstr ""
@@ -191132,6 +194705,14 @@ msgstr ", Administrador de Campamento"
 msgid "%s has abandoned the camp."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr " Expansión"
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr ""
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -191147,59 +194728,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr "Distribuir Comida"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr "Resetear Puntos de Orden"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -191234,23 +194762,6 @@ msgid ""
 "Positions: %d/1\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -191413,14 +194924,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr " Expansión"
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -191502,6 +195005,61 @@ msgid ""
 "Positions: 0/1\n"
 msgstr ""
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr "Distribuir Comida"
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -191512,6 +195070,10 @@ msgid ""
 "Companions must be on missions for at least 24 hours before emergency recall becomes available."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr ""
@@ -191548,10 +195110,6 @@ msgstr ""
 msgid "departs to search for recruits…"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr ""
@@ -191831,7 +195389,7 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
 
@@ -192004,8 +195562,7 @@ msgstr ""
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
+"create a camp food zone, and a camp storage zone."
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -192035,18 +195592,18 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
-msgstr ">Viaje:  %23s\n"
+msgid ">Travel:  %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
-msgstr ">Trabajando: %23s\n"
+msgid ">Working: %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
-msgstr "Total:    %23s\n"
+msgid "Total:    %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -192098,8 +195655,8 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
-msgstr "Nombre:     %25s\n"
+msgid "Name:     %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 msgid "----          Engines          ----\n"
@@ -192107,8 +195664,8 @@ msgstr "----          Motores          ----\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
-msgstr "Motor:  %25s\n"
+msgid "Engine:   %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -192117,8 +195674,8 @@ msgstr ">Estado:  %24d%%\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
-msgstr ">Combustible:    %25s\n"
+msgid ">Fuel:    %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 msgid "----  Fuel Storage & Battery   ----\n"
@@ -193566,7 +197123,7 @@ msgstr "¡Necesitas por lo menos un/a %s para recargar el/la %s!"
 msgid "The %s is already full!"
 msgstr "¡El %s ya está lleno!"
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr ""
@@ -193654,6 +197211,19 @@ msgstr "¿Seguro? ¿Quieres meterte en %s?"
 msgid "Your %s refuses to move over that ledge!"
 msgstr ""
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr ""
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr ""
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "No se encuentra objeto agarrado."
@@ -193848,6 +197418,16 @@ msgstr "¡Te esfuerzas mucho tratando de mover el pesado %s!"
 msgid "There's stuff in the way."
 msgstr "Hay cosas en el medio."
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr ""
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -194170,7 +197750,7 @@ msgstr ""
 "caracteres extraños (por ejemplo, cuadrados vacíos o signos de "
 "interrogación). Quedás advertido."
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr "De repente, sientes un dolor agudo sin razón aparente."
 
@@ -194456,10 +198036,6 @@ msgstr "FRESCURA"
 msgid "SPOILS IN"
 msgstr "SE PUDRE EN"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "Batería"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "Reactor"
@@ -194484,10 +198060,6 @@ msgstr ""
 msgid "Your biology is not compatible with that item."
 msgstr ""
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr ""
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -194580,10 +198152,6 @@ msgid_plural "Needs at least %d charges"
 msgstr[0] "Necesitas al menos %d carga"
 msgstr[1] "Necesitas al menos %d cargas"
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr ""
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "Usar objeto"
@@ -194798,11 +198366,6 @@ msgstr ""
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr ""
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr ""
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -195927,8 +199490,8 @@ msgid "Purchase cash card?"
 msgstr "¿Comprar tarjeta de crédito?"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
-msgstr "Necesitas $1.00 en tu cuenta para poder comprar una tarjeta."
+msgid "You need $10.00 in your account to purchase a card."
+msgstr ""
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -195971,7 +199534,7 @@ msgstr ""
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
 msgstr ""
 
 #: src/iexamine.cpp
@@ -196256,7 +199819,8 @@ msgstr ""
 "La caja fuerte de armas no cede a tus intentos de forzar la cerradura."
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
 msgstr ""
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
@@ -196265,6 +199829,16 @@ msgstr ""
 msgid "You attempt to pry open the %1$s using your %2$s…"
 msgstr ""
 
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
+msgstr ""
+
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
 msgstr ""
@@ -196732,6 +200306,10 @@ msgstr ""
 msgid "You weren't able to start a fire."
 msgstr ""
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "No puedes encender un fuego ahí."
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -197441,6 +201019,17 @@ msgstr ""
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr ""
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr ""
@@ -197967,6 +201556,10 @@ msgstr "Conexiones de mapa"
 msgid "Overmap specials"
 msgstr ""
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "Lugares del mapa"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr ""
@@ -198023,6 +201616,10 @@ msgstr ""
 msgid "Anatomies"
 msgstr "Anatomías"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "Mutaciones"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "Tileset"
@@ -198067,18 +201664,10 @@ msgstr "Profesiones"
 msgid "Scenarios"
 msgstr "Escenarios"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "Mutaciones"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "Categoría de mutación"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "Lugares del mapa"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr ""
@@ -198446,14 +202035,6 @@ msgstr ""
 msgid "Page %d/%d"
 msgstr "Página %d/%d"
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "OBJETOS PUESTOS"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "ARMA EMPUÑADA"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -198897,11 +202478,9 @@ msgstr ""
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
 msgstr ""
-"Esta comida ha empezado a <bad>pudrirse</bad>. Sería una <bad>muy mala "
-"idea</bad> <info>comerla</info>."
 
 #: src/item.cpp
 #, c-format
@@ -198972,13 +202551,6 @@ msgstr ""
 msgid "This ammo <neutral>starts fires</neutral>."
 msgstr ""
 
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr ""
-"Se muestran las características de la <info>modificación del arma "
-"(%s)</info> activa."
-
 #: src/item.cpp
 msgid "Skill used: "
 msgstr "Habilidad usada: "
@@ -199123,8 +202695,9 @@ msgid "Used on: "
 msgstr "Se usa en: "
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "Lugar:"
+#, c-format
+msgid "Location: %s"
+msgstr ""
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -199647,42 +203220,45 @@ msgid ""
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
+msgid "<info>can be upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
+msgid "<info>can be downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
+msgid "<bad>can not be downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
+msgid "<bad>can not be upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
+#, c-format
+msgid "* This clothing %s."
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
+msgid " and <info>upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
+msgid " and <info>downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
+msgid " but <bad>not downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
+msgid " but <bad>not upsized</bad>"
+msgstr ""
+
+#: src/item.cpp
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
 msgstr ""
 
 #: src/item.cpp
@@ -199783,6 +203359,20 @@ msgstr ""
 msgid "This bionic is installed in the following body part(s):"
 msgstr "Este biónico se instala en las siguientes partes del cuerpo:"
 
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr ""
+
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr ""
+
 #: src/item.cpp
 msgid "<bold>Encumbrance:</bold> "
 msgstr ""
@@ -199914,6 +203504,13 @@ msgstr "Lo puedes usar para fabricar varios objetos más."
 msgid "You could use it to craft: %s"
 msgstr "Se puede usar para fabricar: %s"
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr ""
+"Se muestran las características de la <info>modificación del arma "
+"(%s)</info> activa."
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -201113,8 +204710,8 @@ msgid "You do not have that item!"
 msgstr "¡No tienes eso!"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
-msgstr "¿Qué señal activa el objeto?:"
+msgid "Which signal should activate the item?"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "\"Blue\""
@@ -201364,16 +204961,6 @@ msgstr "¡KXSHHHHRRCRKLKKK!"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr "El barullo infernal se termina cuando el emisor de ruido se apaga."
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr "Aprendés los elementos esenciales del %s."
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr ""
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr "Sacas a la fuerza el poste de la valla."
@@ -201794,18 +205381,27 @@ msgid "Scan the ground"
 msgstr "Escanear el suelo"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "Escanearte a ti mismo"
+msgid "Scan yourself or other person"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "Encender escaneo continuo"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr ""
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -201874,6 +205470,10 @@ msgstr "¡Tick!"
 msgid "You've already released the handle, try throwing it instead."
 msgstr "Ya soltaste la palanca, ahora intenta tirarla."
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "¡Necesitas una fuente de fuego!"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr "¡Encendiste la flecha!"
@@ -202369,10 +205969,6 @@ msgstr ""
 msgid "You mop up the spill."
 msgstr "Limpias el derrame con la fregona."
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr ""
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr "La tela del espacio parece estar en descomposición."
@@ -202434,17 +206030,9 @@ msgid "You don't have appropriate food to heat up."
 msgstr "No tienes la comida apropiada para calentar."
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
-msgstr ""
-
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
+msgid "You start heating up the food."
 msgstr ""
 
-#: src/iuse.cpp
-msgid "You heat up the food."
-msgstr "Calientas la comida."
-
 #: src/iuse.cpp
 msgid "There is no fire around, use your integrated toolset instead?"
 msgstr ""
@@ -203459,8 +207047,8 @@ msgstr ""
 "Tu %s es demasiado pesado o incómodo para este coche a control remoto."
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
-msgstr "Desarmas el coche radiocontrol"
+msgid "You disarmed your RC car."
+msgstr ""
 
 #. ~Sound of a radio controlled car moving around
 #: src/iuse.cpp
@@ -203472,12 +207060,12 @@ msgid "What to do with activated RC car?"
 msgstr "¿Qué quieres hacer con el coche radiocontrol activado?"
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
-msgstr "Apagas tu coche radiocontrol"
+msgid "You turned off your RC car."
+msgstr ""
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
-msgstr "bip."
+#: src/iuse.cpp
+msgid "beep"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Take control of RC car"
@@ -203514,11 +207102,16 @@ msgstr "Tomas el control del coche radiocontrol."
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
+msgstr ""
+
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
 "sending the signal."
 msgstr ""
-"El %s en tu inventario explotará con esta señal. Ponelo en algún lugar antes"
-" de mandarle la señal."
 
 #: src/iuse.cpp
 msgid "This vehicle's security system has locked you out!"
@@ -205319,9 +208912,29 @@ msgstr ""
 msgid "How do you want to modify it?"
 msgstr "¿Cómo quieres modificarlo?"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
 msgstr ""
 
 #: src/iuse_actor.cpp
@@ -206733,6 +210346,23 @@ msgstr ""
 msgid "All knowledge of %s leaves you."
 msgstr ""
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr ""
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr ""
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr ""
@@ -206741,6 +210371,10 @@ msgstr ""
 msgid "Popup Distractions"
 msgstr ""
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr ""
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr ""
@@ -206805,6 +210439,15 @@ msgstr ""
 msgid "Casting Cost (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr ""
@@ -206813,6 +210456,10 @@ msgstr ""
 msgid "Casting Time (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+msgid "self"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr ""
@@ -206826,29 +210473,37 @@ msgid "Healing"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Variance"
+msgid "Spell Radius"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spawn"
+msgid "Cone Arc"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Summon"
+msgid "degrees"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spell Radius"
+msgid "Line Width"
 msgstr ""
 
-#: src/magic.cpp src/veh_interact.cpp
-msgid "Range"
-msgstr "Alcance"
+#: src/magic.cpp
+msgid "Variance"
+msgstr ""
 
 #: src/magic.cpp
-msgid "self"
+msgid "Spawn"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Summon"
 msgstr ""
 
+#: src/magic.cpp src/veh_interact.cpp
+msgid "Range"
+msgstr "Alcance"
+
 #: src/magic.cpp
 msgid "Duration"
 msgstr ""
@@ -206873,18 +210528,22 @@ msgstr ""
 msgid "Damage Type"
 msgstr ""
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr ""
@@ -206933,6 +210592,11 @@ msgstr ""
 msgid "No valid targets to teleport."
 msgstr ""
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr ""
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr ""
@@ -207073,6 +210737,10 @@ msgstr ""
 msgid "Unable to make sound directory.  Check permissions."
 msgstr ""
 
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr ""
+
 #: src/main_menu.cpp
 msgid "Really quit?"
 msgstr "¿Seguro que quiere salir?"
@@ -207764,7 +211432,7 @@ msgstr ""
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
+msgid "The %1$s is not a valid %2$s weapon."
 msgstr ""
 
 #: src/martialarts.cpp
@@ -208193,13 +211861,6 @@ msgid_plural "%d enemies hit!"
 msgstr[0] "¡%d enemigo golpeado!"
 msgstr[1] "¡%d enemigos golpeados!"
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr ""
-"Has aprendido %s por tu exhaustiva práctica con el Biónico de Pelea en "
-"espacios cerrados."
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -210541,18 +214202,42 @@ msgid "You don't have any companions to send out…"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
+msgid "Who do you want to send?"
+msgstr "¿A quién quieres enviar?"
+
+#: src/mission_companion.cpp
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
 msgstr ""
-"¿A quién querés enviar?                    [ COMBATE : SUPERVIVENCIA : "
-"INDUSTRIA ]"
 
+#. ~ %1$s: npc name
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
+msgstr ""
+
+#: src/mission_companion.cpp
+msgid "You choose to send no one…"
 msgstr ""
 
 #: src/mission_companion.cpp
@@ -212287,6 +215972,11 @@ msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr ""
 "¡El/a %1$s golpea el/la %2$s de <npcname>, pero rebota en la armadura!"
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr ""
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -212496,11 +216186,6 @@ msgstr "¡Cuando el %s es golpeado, suelta ácido!"
 msgid "zombie slave"
 msgstr "esclavo zombi"
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr "¿Qué quieres hacer con tu %s?"
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -212904,22 +216589,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr "minúsculo"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr "pequeño"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr "mediano"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr "grande"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr "enorme"
 
@@ -212984,6 +216674,16 @@ msgstr ""
 msgid "wearing %1$s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr "El %s"
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr ""
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -213026,6 +216726,11 @@ msgstr ""
 msgid "Rider: %s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr ""
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr ""
@@ -213687,8 +217392,8 @@ msgid "Crossed a threshold"
 msgstr ""
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
-msgstr "¡Uh, sí! ¡Eso está bueno!"
+msgid "Oh, yeah!  That's the stuff!"
+msgstr ""
 
 #: src/mutation_ui.cpp
 msgid "Reassigning."
@@ -214696,7 +218401,7 @@ msgstr "Enojo:"
 msgid "%s disappears."
 msgstr ""
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "¡%s se muere!"
@@ -215438,6 +219143,16 @@ msgstr "Tengo noticias."
 msgid "Yes, let's resume training "
 msgstr "Sí, sigamos entrenando."
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr ""
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr ""
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -215606,10 +219321,6 @@ msgstr ""
 msgid "I need a %s to consume that!"
 msgstr "¡Necesito un/a %s para consumir eso!"
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr "No parece una buena idea consumir esto..."
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr "¿Qué quieres ofrecer?"
@@ -215687,6 +219398,11 @@ msgstr ""
 msgid "My current location"
 msgstr ""
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -215719,10 +219435,6 @@ msgstr "¿Qué biónico quieres desinstalar?"
 msgid "You decide to hold off…"
 msgstr ""
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr ""
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -215789,6 +219501,11 @@ msgstr "¡%s empieza a huir!"
 msgid "%s leaves."
 msgstr "%s se va."
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -215849,6 +219566,11 @@ msgstr "Más >"
 msgid "Examine which item?"
 msgstr "¿Cuál examinar?"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr ""
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -216175,12 +219897,9 @@ msgstr "Turnos para auto reactivar modo seguro"
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
 msgstr ""
-"Número de turnos que pasarán para que el modo seguro sea reactivado. Solo se"
-" reacivará si no hay hostiles en la 'Distancia de proximidad de modo "
-"seguro'."
 
 #: src/options.cpp
 msgid "Turns to remember ignored monsters"
@@ -216287,12 +220006,9 @@ msgstr "Soltar recipientes vacíos"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
 msgstr ""
-"Actívalo para tirar contenedores vacíos tras usarlos. No: No tires nada. - "
-"Estancos: Todos salvo los contenedores estancos. - Todos: Tirar todos los "
-"contenedores."
 
 #: src/options.cpp
 msgid "Watertight"
@@ -216466,13 +220182,12 @@ msgstr ""
 "un objeto."
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "Preguntar antes de desmontar"
+msgid "Query on disassembly while butchering"
+msgstr ""
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
+msgid "If true, will query before disassembling items while butchering."
 msgstr ""
-"Si está activado, se te pedirá confirmación antes de desmontar un objeto."
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -216761,9 +220476,9 @@ msgstr "Letras de inventario automáticas"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
 msgstr ""
 
 #: src/options.cpp
@@ -217144,7 +220859,7 @@ msgstr ""
 msgid "Display"
 msgstr "Pantalla"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr ""
@@ -217234,7 +220949,7 @@ msgid "Scaling factor"
 msgstr ""
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
+msgid "Factor by which to scale the display.  Requires restart."
 msgstr ""
 
 #: src/options.cpp
@@ -217539,8 +221254,8 @@ msgstr ""
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
 msgstr ""
 
@@ -217550,9 +221265,9 @@ msgstr ""
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
 msgstr ""
 
 #: src/options.cpp
@@ -217623,11 +221338,9 @@ msgstr "PNJs estáticos"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
 msgstr ""
-"Si está activado, se generarán PNJ estáticos en las locaciones predefinidas."
-" Necesita resetear el mundo para activarse."
 
 #: src/options.cpp
 msgid "Starting NPCs spawn"
@@ -218911,6 +222624,7 @@ msgstr ""
 msgid "Underground"
 msgstr "Bajo tierra"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
 msgstr ""
@@ -218972,10 +222686,6 @@ msgstr "¡Sordo!"
 msgid "Weapon  :"
 msgstr ""
 
-#: src/panels.cpp
-msgid "No Style"
-msgstr "Sin estilo"
-
 #: src/panels.cpp
 msgid "Day "
 msgstr ""
@@ -218988,10 +222698,12 @@ msgstr ""
 msgid "to open sidebar options"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
 msgstr ""
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
 msgstr ""
@@ -219249,78 +222961,6 @@ msgstr ""
 msgid "You have learned a new style: %s!"
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "Tu %s será quemado/a por el frío en las próximas horas."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "¡Tu %s se te congelará en menos de una hora!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr "¡Tu %s se te congelará en cualquier momento!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr "¡Sientes tu %s comenzando a entumecerse por el frío!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr "Sientes que tu %s se está enfriando mucho."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr "Sientes que tu %s se está helando."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr "¡Sientes tu %s ardiendo del calor!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr "Sientes que tu %s se está poniendo muy caliente."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr "Sientes que tu %s se está calentando."
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "El viento hace que tu %s se sienta bastante frío/a."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr ""
-"El viento es muy fuerte, deberías conseguir abrigo un poco más resistente al"
-" viento para tu %s."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr ""
-"¡Tu ropa no te brinda protección suficiente contra el viento para tu %s!"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "¡Ruedas por el suelo, intentando apagar el fuego!"
@@ -219694,14 +223334,6 @@ msgstr "Las heridas desinfectadas en tu %s han sanado."
 msgid "There is not enough %s left to siphon it."
 msgstr "No queda suficiente %s para chuparlo."
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "Toses fuertemente."
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "una tos seca."
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "¡Tu cuerpo se retuerce por el dolor insoportable!"
@@ -219747,11 +223379,6 @@ msgstr "¡Te duele el/la %s!"
 msgid "Your %s aches."
 msgstr "Sientes dolor en el/la %s."
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr "Tu actual valor de salud es %d. "
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -219778,424 +223405,6 @@ msgstr "Algo se retuerce y muere adentro tuyo."
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "Tus intestinos borbotean ya que algo dentro se murió."
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr "Estás demasiado deshidratado para mantener funcionando tu %s."
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr "Estás demasiado exhausto para mantener funcionando tu %s."
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "¡Te estás ahogando!"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr ""
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "BZZZZZ"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "De repente, te sientes adormecido."
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "De repente, sientes dolor."
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "Te sentiste mareado por un momento."
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "De repente, tienes hambre."
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "De repente, de sientes un poco lleno."
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "De repente, sientes sed."
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "Repentinamente, te sientes fatigado."
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "De repente, sientes mucho frío."
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "De repente, sientes frío."
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "De repente, sientes mucho calor."
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "De repente, sientes calor."
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr "%1$s dice: \"%2$s\""
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "Empiezas a temblar descontroladamente."
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr ""
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "¡Tienes un ataque de asma!"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "Usas la última carga de tu inhalador."
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] "Usas tu inhalador, y te queda %d cargas más."
-msgstr[1] "Usas tu inhalador, y te quedan %d cargas más."
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "La luz del sol te está irritando mucho los ojos."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "¡La luz del sol te quema la piel!"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "La luz del sol te distrae."
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "¡No soportas la luz del sol!"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "¡De repente, no puedes oir nada!"
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "¡De repente, tus ojos dejaron de funcionar!"
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr ""
-"¡Te quema el pecho porque tus sistemas de energía están sobrecargados!"
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "¡Sufres una dolorosa descarga eléctrica!"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr "Parece que el %s ha sido afectado por la descarga."
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "¡Sufres una descarga ardiente de ácido!"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "Tus baterías se descargan un poco."
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "¡Un biónico emite un ruido como un crujido!"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "Sentís escalofríos en tus biónicos defectuosos."
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "¡Tu visión se pixela!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr "¡Tu biónico que falla te causa un espasmo y te caes al suelo!"
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr ""
-"Tus biónicos entran en cortocircuito, lo que te hace estremecer y temblar."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "¡Tu biónico que falla te pica!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr ""
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "Tu respiración comienza a ser más lenta."
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr ""
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr "Se te escapa un pequeño bostezo."
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr "Se te nubla la visión un poco."
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr ""
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr "Sentís un ardor en el estómago y un gusto ácido en la boca."
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr ""
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr "¡Tu placa dosimétrica pasa de %1$s a %2$s!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr "¡Tu %s empezó a sanar!"
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr "Oyes %2$s desde el %1$s"
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr ""
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr ""
@@ -220414,11 +223623,6 @@ msgstr "El/la %s no puede ser empuñado/a con una sola mano."
 msgid "You are too weak to wield %s with only one arm."
 msgstr "Eres demasiado débil para empuñar %s con una sola mano."
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr "No puedes dejar de empuñar tu %s."
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "Manos libres (no)"
@@ -220494,20 +223698,43 @@ msgstr "El/la %s no tiene niguna falla para arreglar."
 msgid "Mend which fault?"
 msgstr "¿Qué falla quieres arreglar?"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white>Tiempo necesario:</color>\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr ""
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white>Habilidades:</color>\n"
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr ""
+
+#: src/player.cpp
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "Skills: %s\n"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr ""
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
-msgstr "> <color_%1$s>%2$s %3$i</color>\n"
+msgid "You are currently unable to mend the %s this way."
+msgstr ""
 
 #: src/player.cpp
 msgid "You are already wearing that."
@@ -220625,14 +223852,6 @@ msgstr "Te sacas tu %s."
 msgid "<npcname> takes off their %s."
 msgstr "<npcname> se saca su %s."
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr "¡No puedes poner objetos aquí!"
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr "¡<npcname> no puede poner los objetos aquí!"
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -220680,20 +223899,6 @@ msgstr "Recuperas %i de plutonio sin utilizar."
 msgid "You can't remove partially depleted plutonium!"
 msgstr "¡No puedes quitar plutonio parcialmente agotado!"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] "Tu %s necesita %d carga de algún UPS."
-msgstr[1] "Tu %s necesita %d cargas de algún UPS."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] "Tu %s tiene %d carga pero necesita %d."
-msgstr[1] "Tu %s tiene %d cargas pero necesita %d."
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -220868,10 +224073,6 @@ msgstr "¡Intentas esquivar pero no hay lugar!"
 msgid "%s tries to dodge but there's no room!"
 msgstr "¡%s intenta esquivar pero no hay lugar!"
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr "¡Tu cuerpo se esfuerza en mantener tanto peso!"
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -220925,6 +224126,13 @@ msgstr ""
 msgid "Pain "
 msgstr "Dolor"
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr ""
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -221149,47 +224357,57 @@ msgstr "Velocidad actual:"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
-msgstr "Sobrecargado        -%s%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
-msgstr "Dolor               -%s%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
-msgstr "Sed                 -%s%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr ""
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
-msgstr "Sin Luz Solar       -%s%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
+msgstr ""
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
-msgstr "Rápido              +%s%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
-msgstr "Velocidad Biónica   +%s%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
@@ -221400,8 +224618,8 @@ msgid "\"Oh God, what's happening?\""
 msgstr "\"Oh Dios, ¿qué está pasando?\""
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
-msgstr "\"Por supuesto... ¡son todos fractales!\""
+msgid "\"Of course… it's all fractals!\""
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "\"Huh?  What was that?\""
@@ -221436,9 +224654,8 @@ msgid "You quiver from the cold."
 msgstr "Estás temblando de frío."
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
+msgid "Your torso is freezing cold.  You should put on a few more layers."
 msgstr ""
-"Se te está congelando el torso. Tendrías que ponerte algo más de ropa."
 
 #: src/player_hardcoded_effects.cpp
 msgid "Your shivering makes you unsteady."
@@ -221825,6 +225042,47 @@ msgstr ""
 msgid "Your alarm went off."
 msgstr ""
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr ""
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -222246,10 +225504,6 @@ msgstr "¡kerblam!"
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>ninguno</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr ""
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -222487,12 +225741,6 @@ msgstr ""
 msgid "KILLS"
 msgstr ""
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr ""
-"Establece qué monitor será usado para mostrar el juego. Necesita reiniciar."
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr ""
@@ -222505,6 +225753,10 @@ msgstr "¡De repente, te duelen los tímpanos!"
 msgid "Something is making noise."
 msgstr "Algo está haciendo ruido."
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr ""
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -222520,6 +225772,11 @@ msgstr ""
 msgid "You hear %1$s"
 msgstr ""
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr "Oyes %2$s desde el %1$s"
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "Tu reloj alarma consigue despertarte finalmente."
@@ -222549,6 +225806,412 @@ msgstr ""
 msgid "d: delete history"
 msgstr "d: borrar historial"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr "Estás demasiado deshidratado para mantener funcionando tu %s."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr "Estás demasiado exhausto para mantener funcionando tu %s."
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "¡Te estás ahogando!"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "De repente, te sientes adormecido."
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "De repente, sientes dolor."
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "Te sentiste mareado por un momento."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "De repente, tienes hambre."
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "De repente, de sientes un poco lleno."
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "De repente, sientes sed."
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "Repentinamente, te sientes fatigado."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "De repente, sientes mucho frío."
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "De repente, sientes frío."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "De repente, sientes mucho calor."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "De repente, sientes calor."
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "Empiezas a temblar descontroladamente."
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr "%1$s dice: \"%2$s\""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "¡Tienes un ataque de asma!"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "Usas la última carga de tu inhalador."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] "Usas tu inhalador, y te queda %d cargas más."
+msgstr[1] "Usas tu inhalador, y te quedan %d cargas más."
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "¡La luz del sol te quema la piel!"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "La luz del sol te distrae."
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "¡No soportas la luz del sol!"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "La luz del sol te está irritando mucho los ojos."
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr ""
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "BZZZZZ"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "¡De repente, no puedes oir nada!"
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "¡De repente, tus ojos dejaron de funcionar!"
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr ""
+"¡Te quema el pecho porque tus sistemas de energía están sobrecargados!"
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "¡Sufres una dolorosa descarga eléctrica!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr "Parece que el %s ha sido afectado por la descarga."
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "¡Sufres una descarga ardiente de ácido!"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "Tus baterías se descargan un poco."
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "¡Un biónico emite un ruido como un crujido!"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "Sentís escalofríos en tus biónicos defectuosos."
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "¡Tu visión se pixela!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr "¡Tu biónico que falla te causa un espasmo y te caes al suelo!"
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr ""
+"Tus biónicos entran en cortocircuito, lo que te hace estremecer y temblar."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "¡Tu biónico que falla te pica!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "Tu respiración comienza a ser más lenta."
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr "Se te escapa un pequeño bostezo."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr "Se te nubla la visión un poco."
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr "Sentís un ardor en el estómago y un gusto ácido en la boca."
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr ""
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr "¡Tu placa dosimétrica pasa de %1$s a %2$s!"
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr "¡Tu %s empezó a sanar!"
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr ""
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr ""
@@ -222698,8 +226361,8 @@ msgstr ""
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "El/la %s se tropieza sobre la catre"
+msgid "The %s stumbles over the cot!"
+msgstr ""
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -222854,11 +226517,6 @@ msgstr "Un lazo se cierra en tu pierna."
 msgid "A snare closes on <npcname>s leg."
 msgstr "Un lazo se cierra en la pierna de <npcname>."
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr ""
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -223085,6 +226743,13 @@ msgstr "¡<npcname> cayó un nivel!"
 msgid "You fall down under %s!"
 msgstr "¡Te caes abajo de %s!"
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname> bate sus alas y baja aleteando elegantemente."
@@ -223221,6 +226886,10 @@ msgstr ""
 msgid "Select part"
 msgstr "Selecciona parte"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white>Tiempo necesario:</color>\n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr "<color_white>Habilidades necesarias:</color>\n"
@@ -225654,8 +229323,8 @@ msgstr "@ %d: %s  "
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
-msgstr "Establecer '%s' en.."
+msgid "Set '%s' to…"
+msgstr ""
 
 #: src/wish.cpp
 msgid " (current)"
diff --git a/lang/po/hu.po b/lang/po/hu.po
index 871d3ecf6eb9a..7219c9b78ec73 100644
--- a/lang/po/hu.po
+++ b/lang/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
 "Last-Translator: Daniel Szollosi-Nagy <dsn-transifex@kdconsulting.net>, 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/cataclysm-dda-translators/teams/2217/hu/)\n"
@@ -196,6 +196,19 @@ msgstr "Erősen radioaktív iszap. Jobb minél távolabb maradni tőle."
 msgid "watery plutonium slurry"
 msgstr "vizes plutónium iszap"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr ""
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr ""
+"Baseball labda méretű kő. Közelharcra nem rossz, és az ellenségeket is meg "
+"lehet vele dobni. Nem dobnak vissza kenyérrel."
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "kavics"
@@ -703,12 +716,12 @@ msgstr "tüskés házi rakéta"
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
+" of this grade of weapon, but packs a fierce punch… if it hits."
 msgstr ""
 "Házi készítésű rakéta, amely egy kézi készítésű rakéta üzemanyaggal töltött "
 "csőből, valamint a csőre hegesztett tüskéből áll. Fegyvernek rendkívül "
 "pontatlan, ahogy egy ilyen hevenyészett fegyvertől elvárható, viszont nagyon"
-" üt.. ha célba talál."
+" üt... ha célba talál."
 
 #: lang/json/AMMO_from_json.py
 msgid "explosive home-made rocket"
@@ -760,8 +773,8 @@ msgstr "félbemaradt kalcium-karbid"
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
 msgstr ""
 "Szén- és mészpor kiégetésével készülő kalcium-karbid félbehagyott "
 "állapotban. Így haszálhatatlan."
@@ -882,6 +895,8 @@ msgid ""
 "damage to the target.  Stands a decent chance of remaining intact once "
 "fired."
 msgstr ""
+"Fából készült, tollas, pengefejű nyílvessző, a célpontba maximális sebzést "
+"visz be. Kilövés után jó eséllyel marad továbbra is egy darabban."
 
 #: lang/json/AMMO_from_json.py
 msgid "simple wooden arrow"
@@ -949,6 +964,8 @@ msgid ""
 "A fletched aluminum arrow shaft with a bladed tip.  Useful for maximizing "
 "damage to the target.  Stands a good chance of remaining intact once fired."
 msgstr ""
+"Alumíniumból készült, tollas, pengefejű nyílvessző, a célpontba maximális "
+"sebzést visz be. Kilövés után jó eséllyel marad továbbra is egy darabban."
 
 #: lang/json/AMMO_from_json.py
 msgid "aluminum field point arrow"
@@ -1080,7 +1097,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "anesthetic"
-msgstr "altatószerek"
+msgstr "altatószer"
 
 #. ~ Description for anesthetic
 #: lang/json/AMMO_from_json.py
@@ -1107,6 +1124,10 @@ msgid ""
 "smoke, that is deadly to bacteria and humans alike, or oxidized to make "
 "paper-bleaching agents."
 msgstr ""
+"Egy maréknyi vegytiszta, sárga kénpor. Elsősorban akkumulátorsav "
+"készítésénél használják, néha pedig robbanóanyagokhoz. Égetésénél savas füst"
+" jön létre, amely egyaránt végzetes baktériumokra és emberekre, illetve "
+"oxidálásával papírfehérítő szert lehet készíteni."
 
 #: lang/json/AMMO_from_json.py
 msgid "chunk of sulfur"
@@ -1117,7 +1138,7 @@ msgstr[1] "kéndarab"
 #. ~ Description for chunk of sulfur
 #: lang/json/AMMO_from_json.py
 msgid "A chunk of pure sulfur.  Break it up to use it."
-msgstr ""
+msgstr "Egy darab vegytiszta kén. Használatához törd szét."
 
 #: lang/json/AMMO_from_json.py
 msgid "cement"
@@ -1242,58 +1263,70 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "zinc oxide"
 msgid_plural "zinc oxide"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "cink-oxid"
+msgstr[1] "cink-oxid"
 
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
 msgstr ""
+"Egy maréknyi cink-oxid. Redukálásával cink hozható létre, illetve önmagában "
+"is használható kémiai reakciókhoz."
 
 #: lang/json/AMMO_from_json.py
 msgid "manganese dioxide"
 msgid_plural "manganese dioxide"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "mangán-dioxid"
+msgstr[1] "mangán-dioxid"
 
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr ""
+"Egy maréknyi mangán-dioxid por. Természetes előfordulása a piroluzit "
+"ásványban is megtalálható, ipari hasznosítása az alkáli és a zink-szén "
+"elemek gyártásánál lényeges."
 
 #: lang/json/AMMO_from_json.py
 msgid "potassium chloride"
 msgid_plural "potassium chloride"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "kálium-klorid"
+msgstr[1] "kálium-klorid"
 
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr ""
+"Egy maréknyi kálium-klorid. Bár természetes előfordulása a szilvin ásványban"
+" is megtalálható, nagyrészt salétrom és sósav reakciójánál jön létre "
+"melléktermékként. Felhasználási területei: műtrágya-gyártás, vagy "
+"elektrolízissel kálium-hidroxid létrehozása."
 
 #: lang/json/AMMO_from_json.py
 msgid "potassium hydroxide"
 msgid_plural "potassium hydroxide"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "kálium-hidroxid"
+msgstr[1] "kálium-hidroxid"
 
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
 msgstr ""
+"Egy maréknyi kálium-hidroxid. Gyakoribb nevén kálisó, ipari felhasználása "
+"főleg maró hatását hasznosítja. Többek között alkáli elemek gyártásánál "
+"haszálják elektrolitként."
 
 #: lang/json/AMMO_from_json.py
 msgid "sulfuric acid"
@@ -1316,16 +1349,18 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "hydrochloric acid"
 msgid_plural "hydrochloric acid"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sósav"
+msgstr[1] "sósav"
 
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
 msgstr ""
+"Hidrogén-klorid sav, ismertebb nevén sósav. Jellegzetes szagú, erős sav, "
+"amelyet felfedezése óta sok mindenre használnak."
 
 #: lang/json/AMMO_from_json.py
 msgid "acetone"
@@ -1380,6 +1415,10 @@ msgid ""
 "CVD machine and a laboratory worth of reagents, they might be able to "
 "produce very durable ceramic layers."
 msgstr ""
+"Egy marék króm-oxid. Általában az egyetlen stabil pigmentanyag festékeknél, "
+"a króm-oxid ezen túl még enyhe oxidálószer, amelyet termites hegesztéshez "
+"alumínium porral lehet összekeverni. Egy CVD géppel és egy laboratóriumnyi "
+"reagenssel valaki nagyon tartós kerámia páncélréteget is tudna készíteni."
 
 #: lang/json/AMMO_from_json.py
 msgid "calcium carbide"
@@ -1396,6 +1435,11 @@ msgid ""
 "and sealed, it will explode with little strength, but with relatively loud "
 "noise and could maybe be used as a decoy."
 msgstr ""
+"Egy maroknyi kalcium-karbid, enyhén fokhagyma-szagú. Ipari alkalmazása során"
+" a kalcium-karbidot acetilén helyi előállítására használták, illetve "
+"régebben acetilénlámpák tüzelőanyagaként. Vízzel összekeverve majd lezárva "
+"kisméretű robbanást idéz elő, ami viszont jó nagyot szól, és talán "
+"csalétekként is használható."
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "hexamine"
@@ -1609,16 +1653,19 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "match head powder"
 msgid_plural "match head powder"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "gyufafej-por"
+msgstr[1] "gyufafej-por"
 
 #. ~ Description for match head powder
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
 msgstr ""
+"Levágott gyufafejekből készült por. Hasonlít a fekete lőporhoz, de annál "
+"gyengébb. Robbanószerek és kanócok készítéséhez használható, ha a célnak "
+"jobban megfelelő anyagok nem állnak rendelkezésre."
 
 #: lang/json/AMMO_from_json.py
 msgid "RDX"
@@ -2016,8 +2063,8 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "gelled gasoline"
 msgid_plural "gelled gasoline"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "zselésített benzin"
+msgstr[1] "zselésített benzin"
 
 #. ~ Description for gelled gasoline
 #: lang/json/AMMO_from_json.py
@@ -2026,26 +2073,31 @@ msgid ""
 "roughly similar in properties to napalm b.  It's meant to be used with a "
 "flamethrower."
 msgstr ""
+"Benzinből és hungarocel darabkákból készült éghető zselé, hatásában sokban "
+"hasonlít a napalmra. Lángszóróban használható."
 
 #: lang/json/AMMO_from_json.py
 msgid "flamethrower fuel"
 msgid_plural "flamethrower fuel"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "lángszóró tüzelőanyag"
+msgstr[1] "lángszóró tüzelőanyag"
 
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
 msgstr ""
+"Benzin és dízel egy-az-egy arányában elkevert egyvelege. Az égési "
+"tulajdonságai miatt nem használható ott, ahol az alkotórészeinek "
+"valamelyikére lenne szükség, viszont lángszóróba jól illik."
 
 #: lang/json/AMMO_from_json.py
 msgid "autoclave pouch"
 msgid_plural "autoclave pouches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "autókláv tasak"
+msgstr[1] "autókláv tasak"
 
 #. ~ Description for autoclave pouch
 #: lang/json/AMMO_from_json.py
@@ -2054,6 +2106,10 @@ msgid ""
 "Administration).  If used properly, these pouches can keep things sterile "
 "indefinitely."
 msgstr ""
+"Ezen az orvostechnikai kelléken az amerikai élelmiszer- és gyógyszerügyi "
+"hatóság, az FDA jóváhagyási pecsétje szerepel. Megfelelő felhasználás "
+"mellett ezek a tasakok a tartalmukat örökké steril állapotban képesek "
+"megőrizni."
 
 #: lang/json/AMMO_from_json.py
 msgid "shrapnel"
@@ -2100,10 +2156,12 @@ msgid ""
 "A prepared blunderbuss shot of homemade flechette made out of nails.  Shreds"
 " armor."
 msgstr ""
+"Előre elkészített mordály lövedék házi gyártású, szögekből álló "
+"nyilacskákkal. A páncélt cafatokra tépi."
 
 #: lang/json/AMMO_from_json.py
 msgid "throwing stick"
-msgstr ""
+msgstr "dobóbot"
 
 #. ~ Description for throwing stick
 #: lang/json/AMMO_from_json.py
@@ -2117,8 +2175,8 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "bolas"
 msgid_plural "bolases"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "bolas"
+msgstr[1] "bolas"
 
 #. ~ Description for bolas
 #: lang/json/AMMO_from_json.py
@@ -2126,10 +2184,12 @@ msgid ""
 "Some ropes with weights, designed to tangle the legs of a target when "
 "thrown, usually at an animal.  Used by the Gauchos of Argentina."
 msgstr ""
+"Súlyokkal ellátott kötél, amely a célpontra, általában állatra dobása után "
+"annak lába köré tekeredik. Az argentin gauchók kedvenc szerszáma."
 
 #: lang/json/AMMO_from_json.py
 msgid "net"
-msgstr ""
+msgstr "háló"
 
 #. ~ Description for net
 #: lang/json/AMMO_from_json.py
@@ -2137,6 +2197,8 @@ msgid ""
 "A mesh of string and weights, traditionally used to catch fish, and to "
 "entangle oponents in combat."
 msgstr ""
+"Zsinórokból és súlyokból álló háló, segítségével halat lehet fogni, és "
+"közelharcban az ellenfél is belegabalyodhat."
 
 #: lang/json/AMMO_from_json.py
 msgid "anesthetic kit"
@@ -2157,7 +2219,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "10mm Auto FMJ"
-msgstr ""
+msgstr "10mm Auto FMJ"
 
 #. ~ Description for 10mm Auto FMJ
 #: lang/json/AMMO_from_json.py
@@ -2165,14 +2227,16 @@ msgid ""
 "A jacketed 10mm Auto round.  The 10mm Auto cartridge is a rather powerful "
 "handgun round and the progenitor to the more popular .40 S&W."
 msgstr ""
+"Fémköpenyes 10mm-es auto lövedék. A sokkal népszerűbb .40 S&W ősatyának "
+"tekinthető lövedék erősebb stopphatású."
 
 #: lang/json/AMMO_from_json.py
 msgid "10mm Auto FMJ blackpowder"
-msgstr ""
+msgstr "10mm auto FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 10mm Auto FMJ"
-msgstr ""
+msgstr "újratöltött 10 mm auto FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid "H&K 12mm"
@@ -2416,11 +2480,11 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".22 LR FMJ blackpowder"
-msgstr ""
+msgstr ".22 LR FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".22 LR blackpowder"
-msgstr ""
+msgstr ".22 LR fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 LR"
@@ -2479,31 +2543,31 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".223 Remington blackpowder"
-msgstr ""
+msgstr ".223 Remington fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "5.56 NATO blackpowder"
-msgstr ""
+msgstr "5.56 NATO fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "5.56 NATO tracer blackpowder"
-msgstr ""
+msgstr "5.56 NATO nyomjelző fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .223 Remington"
-msgstr "utántöltött .223 Remington"
+msgstr "újratöltött .223 Remington"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 5.56 NATO"
-msgstr "utántöltött 5,56 NATO"
+msgstr "újratöltött 5,56 NATO"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 5.56 NATO tracer"
-msgstr "utántöltött 5,56 NATO nyomjelző"
+msgstr "újratöltött 5,56 NATO nyomjelző"
 
 #: lang/json/AMMO_from_json.py
 msgid ".270 Winchester JSP"
-msgstr ""
+msgstr ".270 Winchester JSP"
 
 #. ~ Description for .270 Winchester JSP
 #: lang/json/AMMO_from_json.py
@@ -2513,14 +2577,18 @@ msgid ""
 "most popular rifle cartridges for hunting and silhouette shooting.  It is a "
 "powerful round capable of taking down large targets with ease."
 msgstr ""
+".270 Winchester lőszer 130 graines lövedékcsúcsos lövedékkel. A .270-es "
+"töltény a kezdetekkor nem ért el áttörő sikereket, de az évtizedek múlásával"
+" azonban az egyik legnépszerűbb vadászati lőszerré vált. Erős lövedék, "
+"amellyel nagyméretű célokat is könnyedén le lehet küzdeni."
 
 #: lang/json/AMMO_from_json.py
 msgid ".270 Winchester JSP blackpowder"
-msgstr ""
+msgstr ".270 Winchester JSP fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .270 Winchester JSP"
-msgstr ""
+msgstr "újratöltött .270 Winchester JSP"
 
 #: lang/json/AMMO_from_json.py
 msgid ".300 Winchester Magnum"
@@ -2541,11 +2609,11 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".300 Winchester Magnum blackpowder"
-msgstr ""
+msgstr ".300 Winchester Magnum fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .300 Winchester Magnum"
-msgstr "utántöltött .300 Winchester Magnum"
+msgstr "újratöltött .300 Winchester Magnum"
 
 #. ~ Description for reloaded .300 Winchester Magnum
 #: lang/json/AMMO_from_json.py
@@ -2556,7 +2624,7 @@ msgid ""
 msgstr ""
 "A .300 Winchester Magnum egy rendkívül sokoldalú lövedék, és a számos "
 "sportlövészen túl vadászok, katonák és rendvédelmi szervek is választották. "
-"Ezt kézzel utántöltötték."
+"Ezt kézzel újratöltötték."
 
 #: lang/json/AMMO_from_json.py
 msgid ".30-06 Springfield"
@@ -2605,31 +2673,31 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".30-06 Springfield blackpowder"
-msgstr ""
+msgstr ".30-06 Springfield fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".30-06 Springfield tracer blackpowder"
-msgstr ""
+msgstr ".30-06 Springfield nyomjelző fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".30-06 Springfield M2 AP blackpowder"
-msgstr ""
+msgstr ".30-06 Springfield M2 AP fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .30-06 Springfield"
-msgstr "utántöltött .30-06 Springfield"
+msgstr "újratöltött .30-06 Springfield"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .30-06 incendiary"
-msgstr "utántöltött .30-06 gyújtólövedék"
+msgstr "újratöltött .30-06 gyújtólövedék"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .30-06 M2 AP"
-msgstr "utántöltött .30-06 M2 AP"
+msgstr "újratöltött .30-06 M2 AP"
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid ".300 AAC Blackout"
-msgstr ""
+msgstr ".300 AAC Blackout"
 
 #. ~ Description for .300 AAC Blackout
 #: lang/json/AMMO_from_json.py
@@ -2639,6 +2707,10 @@ msgid ""
 "similar ballistics to 7.62x39mm.  It is compatible with standard AR-15 lower"
 " receivers and will feed from STANAG magazines."
 msgstr ""
+"Egy .300 AAC Blackout lőszer 125 graines open tip lövedékkel. A 300 BLK egy "
+"átmeneti lőszer, amelyet az 5.56x45mm-es lövedék alapján készítettek, hogy "
+"elérjék a 7.62x39mm lövedék ballisztikai tulajdonságait. Kompatibilis az "
+"AR-15 fegyvertokjával, és STANAG tölténytárakkal."
 
 #. ~ Description for .300 AAC Blackout
 #: lang/json/AMMO_from_json.py
@@ -2648,14 +2720,19 @@ msgid ""
 "achieve similar ballistics to 7.62x39mm.  It is compatible with standard "
 "AR-15 lower receivers and will feed from STANAG magazines."
 msgstr ""
+"Egy hangsebesség alatti .300 AAC Blackout lőszer 220 graines open tip "
+"lövedékkel. A 300 BLK egy átmeneti lőszer, amelyet az 5.56x45mm-es lövedék "
+"alapján készítettek, hogy elérjék a 7.62x39mm lövedék ballisztikai "
+"tulajdonságait. Kompatibilis az AR-15 fegyvertokjával, és STANAG "
+"tölténytárakkal."
 
 #: lang/json/AMMO_from_json.py
 msgid ".300 AAC Blackout blackpowder"
-msgstr ""
+msgstr ".300 AAC Blackout fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .300 AAC Blackout"
-msgstr ""
+msgstr "újratöltött .300 AAC Blackout"
 
 #. ~ Description for reloaded .300 AAC Blackout
 #: lang/json/AMMO_from_json.py
@@ -2666,6 +2743,11 @@ msgid ""
 "requires a specific barrel, so will not work in a standard M4 or similar "
 "carbine.  This one has been hand-reloaded."
 msgstr ""
+"A .300 AAC Blackout lőszer egy átmeneti lőszer, amelyet a 7.62x39mm lövedék "
+"ballisztikai tulajdonságaira terveztek, és az AR-15 platformban használható."
+" Az 5.56mm NATO lövedékekből készítették, de STANAG tölténytárban "
+"használható. Különleges fegyvercsövet igényel, így egy módosítatlan M4-ben, "
+"vagy hasonló karabélyban nem használható. Ezt kézzel újratöltötték."
 
 #: lang/json/AMMO_from_json.py
 msgid ".308 Winchester"
@@ -2711,27 +2793,27 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".308 Winchester blackpowder"
-msgstr ""
+msgstr ".308 Winchester fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "7.62x51mm blackpowder"
-msgstr ""
+msgstr "7.62x51mm fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "7.62x51mm tracer blackpowder"
-msgstr ""
+msgstr "7,62x51mm nyomjelző fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .308 Winchester"
-msgstr "utántöltött .308 Winchester"
+msgstr "újratöltött .308 Winchester"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 7.62x51mm"
-msgstr "utántöltött 7.62x51mm"
+msgstr "újratöltött 7.62x51mm"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 7.62x51mm incendiary"
-msgstr "utántöltött 7,62x51 mm gyújtólövedék"
+msgstr "újratöltött 7,62x51 mm gyújtólövedék"
 
 #: lang/json/AMMO_from_json.py
 msgid ".32 ACP"
@@ -2748,15 +2830,15 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".32 ACP blackpowder"
-msgstr ""
+msgstr ".32 ACP fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .32 ACP"
-msgstr "utántöltött .32 ACP"
+msgstr "újratöltött .32 ACP"
 
 #: lang/json/AMMO_from_json.py
 msgid ".357 magnum FMJ"
-msgstr ""
+msgstr ".357 Magnum FMJ"
 
 #. ~ Description for .357 magnum FMJ
 #: lang/json/AMMO_from_json.py
@@ -2765,10 +2847,12 @@ msgid ""
 "earlier .38 special, with a marginally longer case and generating greater "
 "pressure."
 msgstr ""
+".357-es magnum lövedék. Elődje a .38 Special, amelynél kicsit hosszabb a "
+"töltényhüvelye, és nagyobb a nyomása."
 
 #: lang/json/AMMO_from_json.py
 msgid ".357 magnum JHP"
-msgstr ""
+msgstr ".357 magnum JHP"
 
 #. ~ Description for .357 magnum JHP
 #: lang/json/AMMO_from_json.py
@@ -2777,26 +2861,28 @@ msgid ""
 "derived from the earlier .38 special, with a marginally longer case and "
 "generating greater pressure."
 msgstr ""
+"Lövedékcsúcsos .357-es magnum lövedék. Elődje a .38 Special, amelynél kicsit"
+" hosszabb a töltényhüvelye, és nagyobb a nyomása."
 
 #: lang/json/AMMO_from_json.py
 msgid ".357 Magnum FMJ blackpowder"
-msgstr ""
+msgstr ".357 Magnum FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".357 Magnum JHP blackpowder"
-msgstr ""
+msgstr ".357 Magnum JHP fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .357 Magnum FMJ"
 msgid_plural "reloaded .357 Magnum FMJ"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "utántöltött .357 Magnum FMJ"
+msgstr[1] "újratöltött .357 Magnum FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .357 Magnum JHP"
 msgid_plural "reloaded .357 Magnum JHP"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "utántöltött .357 Magnum JHP"
+msgstr[1] "újratöltött .357 Magnum JHP"
 
 #: lang/json/AMMO_from_json.py
 msgid ".357 SIG FMJ"
@@ -2827,11 +2913,11 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .357 SIG FMJ"
-msgstr "utántöltött .357 SIG FMJ"
+msgstr "újratöltött .357 SIG FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .357 SIG JHP"
-msgstr "utántöltött .357 SIG JHP"
+msgstr "újratöltött .357 SIG JHP"
 
 #: lang/json/AMMO_from_json.py
 msgid ".36 paper cartridge"
@@ -2890,27 +2976,27 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .38 FMJ"
-msgstr "utántöltött .38 FMJ"
+msgstr "újratöltött .38 FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .38 Special"
-msgstr "utántöltött .38 Special"
+msgstr "újratöltött .38 Special"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .38 Super"
-msgstr "utántöltött .38 Super"
+msgstr "újratöltött .38 Super"
 
 #: lang/json/AMMO_from_json.py
 msgid ".38 FMJ blackpowder"
-msgstr ""
+msgstr ".38 FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".38 Special blackpowder"
-msgstr ""
+msgstr ".38 Special fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".380 ACP FMJ"
-msgstr ""
+msgstr ".380 ACP FMJ"
 
 #. ~ Description for .380 ACP FMJ
 #: lang/json/AMMO_from_json.py
@@ -2920,10 +3006,14 @@ msgid ""
 "consider carrying.  One should be careful not to chamber it in 9x18mm "
 "Makarov or 9x19mm firearms."
 msgstr ""
+"Bronzköpenyes, 95 graines .380 ACP lőszer. Egy évszázada népszerű "
+"zsebpisztoly lövedék, amelyet gyakran a leggyengébb kalibernek tartanak. "
+"Vigyázni kell, hogy véletlenül ne kerüljön 9x18mm Makarov vagy 9x19mm "
+"fegyverekbe."
 
 #: lang/json/AMMO_from_json.py
 msgid ".380 ACP JHP"
-msgstr ""
+msgstr ".380 ACP JHP"
 
 #. ~ Description for .380 ACP JHP
 #: lang/json/AMMO_from_json.py
@@ -2933,10 +3023,14 @@ msgid ""
 "recommended defensive caliber.  One should be careful not to chamber it in "
 "9x18mm Makarov or 9x19mm firearms."
 msgstr ""
+"Burkolatlan lövedékcsúcsos (JHP), 95 graines .380 ACP lőszer. Népszerű "
+"rejtett pisztoly lövedék, amelyet gyakran a leggyengébb önvédelmi kalibernek"
+" tartanak. Vigyázni kell, hogy véletlenül ne kerüljön 9x18mm Makarov vagy "
+"9x19mm fegyverekbe."
 
 #: lang/json/AMMO_from_json.py
 msgid ".380 ACP +P"
-msgstr ""
+msgstr ".380 ACP +P"
 
 #. ~ Description for .380 ACP +P
 #: lang/json/AMMO_from_json.py
@@ -2946,30 +3040,34 @@ msgid ""
 " more accurate than practice ammo.  One should be careful not to chamber it "
 "in 9x18mm Makarov or 9x19mm firearms."
 msgstr ""
+"Túlnyomásos, burkolatlan lövedékcsúcsos (JHP), 90 graines .380 ACP lőszer. "
+"Ezeket az önvédelmi töltényeket a maximális teljesítmény elérésére "
+"tervezték, és a gyakorló lőszernél is pontosabbak. Vigyázni kell, hogy "
+"véletlenül ne kerüljön 9x18mm Makarov vagy 9x19mm fegyverekbe."
 
 #: lang/json/AMMO_from_json.py
 msgid ".380 ACP FMJ blackpowder"
-msgstr ""
+msgstr ".380 ACP FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".380 ACP JHP blackpowder"
-msgstr ""
+msgstr ".380 ACP JHP fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .380 ACP FMJ"
-msgstr ""
+msgstr "újratöltött .380 ACP FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .380 ACP JHP"
-msgstr ""
+msgstr "újratöltött .380 ACP JHP"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .380 ACP +P"
-msgstr ""
+msgstr "újratöltött .380 ACP +P"
 
 #: lang/json/AMMO_from_json.py
 msgid ".38 Super FMJ"
-msgstr ""
+msgstr ".38 Super FMJ"
 
 #. ~ Description for .38 Super FMJ
 #: lang/json/AMMO_from_json.py
@@ -2978,10 +3076,13 @@ msgid ""
 "developed from .38 ACP in the 1920s, designed to penetrate the body armor of"
 " the era."
 msgstr ""
+".38 Super lőszer 147 graines bronzköpenyes (FMJ) lövedékkel. A .38 Super "
+"lőszert a .38 ACP-ből fejlesztették ki az 1920-as években, célja az akkori "
+"korszak testpáncéljainak átütése volt."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .38 Super FMJ"
-msgstr ""
+msgstr "újratöltött .38 Super FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid ".40 S&W FMJ"
@@ -3015,19 +3116,19 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".40 S&W FMJ blackpowder"
-msgstr ""
+msgstr ".40 S&W FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".40 S&W JHP blackpowder"
-msgstr ""
+msgstr ".40 S&W JHP fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .40 S&W FMJ"
-msgstr "utántöltött .40 S&W FMJ"
+msgstr "újratöltött .40 S&W FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .40 S&W JHP"
-msgstr "utántöltött .40 S&W JHP"
+msgstr "újratöltött .40 S&W JHP"
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "40mm grenade"
@@ -3043,6 +3144,8 @@ msgid ""
 "A 40mm less-lethal beanbag that delivers strong impact on target, causing "
 "major pain and disorientation.  May still injure or kill."
 msgstr ""
+"A 40 mm-es babzsák gránát a célpontra erős hatást mér, amely fájdalmat és "
+"zavarodást kelt. Sebzést és halált is okozhat."
 
 #: lang/json/AMMO_from_json.py
 msgid "40mm concussive"
@@ -3087,7 +3190,7 @@ msgstr "40 mm nyilacska"
 #. ~ Description for 40mm flechette
 #: lang/json/AMMO_from_json.py
 msgid "A 40mm shell loaded with a large number of armor-piercing flechettes."
-msgstr ""
+msgstr "Páncélt átütő acélnyilacskákkal töltött 40 mm-es lövedék."
 
 #: lang/json/AMMO_from_json.py
 msgid "40mm frag"
@@ -3125,6 +3228,8 @@ msgid ""
 "A 40mm shell with a powerful buckshot load, designed to be used as "
 "alternative to shotguns or when breaching barricades and other obstacles."
 msgstr ""
+"Erőteljes söréttöltettel ellátott 40mm-es lövedék, amelyet sörétes puskák "
+"alternatívájaként, valamint barikádok áttöréséhez használnak."
 
 #: lang/json/AMMO_from_json.py
 msgid "40mm smoke cover"
@@ -3150,7 +3255,7 @@ msgstr "40 mm-es könnygázgránát, cselekvésképtelenné tevő gázzal töltv
 
 #: lang/json/AMMO_from_json.py
 msgid "40mm slug"
-msgstr ""
+msgstr "40mm dumdum"
 
 #. ~ Description for 40mm slug
 #: lang/json/AMMO_from_json.py
@@ -3158,19 +3263,22 @@ msgid ""
 "A 40mm shell loaded with a massive bullet.  Say goodbye to your shoulder, I "
 "guess."
 msgstr ""
+"Hatalmas lövedékkel megtöltött 40mm-es gránát. Elbúcsúzhatsz a válladtól."
 
 #: lang/json/AMMO_from_json.py
 msgid ".410 000 shot"
-msgstr ""
+msgstr ".410 000 sörét"
 
 #. ~ Description for .410 000 shot
 #: lang/json/AMMO_from_json.py
 msgid "A .410 shell with 5 000 pellets.  Good for a hunting or combat load."
 msgstr ""
+"5000 darab söréttel megtöltött .410-es lövedék. Vadászásra és harcolásra is "
+"megfelelő."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .410 000 shot"
-msgstr ""
+msgstr "újratöltött .410 000 sörét"
 
 #: lang/json/AMMO_from_json.py
 msgid ".44 Magnum FMJ"
@@ -3202,19 +3310,19 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .44 Magnum FMJ"
-msgstr "utántöltött .44 Magnum FMJ"
+msgstr "újratöltött .44 Magnum FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .44 Magnum"
-msgstr "utántöltött .44 Magnum"
+msgstr "újratöltött .44 Magnum"
 
 #: lang/json/AMMO_from_json.py
 msgid ".44 Magnum blackpowder"
-msgstr ""
+msgstr ".44 Magnum fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".44 Magnum FMJ blackpowder"
-msgstr ""
+msgstr ".44 Magnum FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".44 paper cartridge"
@@ -3274,23 +3382,23 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".45 ACP FMJ blackpowder"
-msgstr ""
+msgstr ".45 ACP FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".45 ACP JHP blackpowder"
-msgstr ""
+msgstr ".45 ACP JHP fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .45 FMJ"
-msgstr "utántöltött .45 FMJ"
+msgstr "újratöltött .45 FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .45 ACP JHP"
-msgstr "utántöltött .45 ACP JHP"
+msgstr "újratöltött .45 ACP JHP"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .45 ACP +P"
-msgstr "utántöltött .45 ACP +P"
+msgstr "újratöltött .45 ACP +P"
 
 #: lang/json/AMMO_from_json.py
 msgid ".454 Casull"
@@ -3313,15 +3421,15 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .454 Casull"
-msgstr "utántöltött .454 Casull"
+msgstr "újratöltött .454 Casull"
 
 #: lang/json/AMMO_from_json.py
 msgid ".454 Casull blackpowder"
-msgstr ""
+msgstr ".454 Casull fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".45-70 SP"
-msgstr ""
+msgstr ".45-70 SP"
 
 #. ~ Description for .45-70 SP
 #: lang/json/AMMO_from_json.py
@@ -3330,10 +3438,13 @@ msgid ""
 "of the oldest cartridges still in use, it is still a favorite for large game"
 " hunting at short ranges."
 msgstr ""
+".45-70 Government lőszer 305 graines lövedékcsúcsos lövedékkel. Az egyik "
+"legrégebb óta a mai napig használt lőszer, kifejezetten nagyvadak ellen "
+"kedvelik rövid távon."
 
 #: lang/json/AMMO_from_json.py
 msgid ".45-70 +P penetrator"
-msgstr ""
+msgstr ".45-70 +P penetrátor"
 
 #. ~ Description for .45-70 +P penetrator
 #: lang/json/AMMO_from_json.py
@@ -3342,10 +3453,13 @@ msgid ""
 "penetrator projectile.  Designed for maximum penetration through thick hide "
 "and bone while maintaining ideal wounding characteristics."
 msgstr ""
+".45-70 Government +P lőszer 305 graines lövedékcsúcsos, rézmagos penetrátor "
+"lövedékkel. A lehető legmélyebb behatolásra tervezték vastag bőrön és "
+"csontokon át, hogy közben megtartsa az ideális sebzési profilját."
 
 #: lang/json/AMMO_from_json.py
 msgid ".45-70 LFN cowboy"
-msgstr ""
+msgstr ".45-70 LFN cowboy"
 
 #. ~ Description for .45-70 LFN cowboy
 #: lang/json/AMMO_from_json.py
@@ -3354,10 +3468,13 @@ msgid ""
 "to original specifications for safe use in antique firearms.  Quite a bit "
 "less powerful than modern ammo, but still packs a punch."
 msgstr ""
+".45-70 Government lőszer 405 graines lapos ólomkúpos (LFN) lövedékkel. Az "
+"antik lőfegyverek biztonságos használatához tervezték. Lényegesen kevésbé "
+"átütőképes, mint a modern lőszerek, de ennek ellenére azért még így is erős."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .45-70 SP"
-msgstr ""
+msgstr "újratöltött .45-70 SP"
 
 #. ~ Description for reloaded .45-70 SP
 #: lang/json/AMMO_from_json.py
@@ -3366,6 +3483,9 @@ msgid ""
 "of the oldest cartridges still in use, it is still a favorite for large game"
 " hunting at short ranges.  This one has been hand-loaded."
 msgstr ""
+".45-70 Government lőszer 305 graines lövedékcsúcsos lövedékkel. Az egyik "
+"legrégebb óta a mai napig használt lőszer, kifejezetten nagyvadak ellen "
+"kedvelik rövid távon. Ezt kézzel újratöltötték."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .45-70 +P penetrator"
@@ -3440,7 +3560,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "4.6x30mm blackpowder"
-msgstr ""
+msgstr "4.6x30mm fekete lőporból"
 
 #. ~ Description for 4.6x30mm blackpowder
 #. ~ Description for reloaded 4.6x30mm
@@ -3451,10 +3571,14 @@ msgid ""
 "  It has low recoil, but no usual armor penetration due to using simple lead"
 " bullets rather than proper factory-made penetrator projectiles."
 msgstr ""
+"4.6x30mm lőszer 31 graines rézbevonatú ólomlövedékkel. A 4.6x30mm lőszert a "
+"H&K fejlesztette ki, hogy versenyre keljen vele az FN Herstal 5.7x28mm "
+"lőszerével. Alacsony a visszarúgása, de nincsen páncélátütő képessége, mivel"
+" a rendes, gyári acélnyilacskák helyett egyszerű ólommal töltötték meg."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 4.6x30mm"
-msgstr "utántöltött 4.6x30mm"
+msgstr "újratöltött 4.6x30mm"
 
 #: lang/json/AMMO_from_json.py
 msgid ".460 Rowland HCFN"
@@ -3491,15 +3615,15 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".460 Rowland FMJ blackpowder"
-msgstr ""
+msgstr ".460 Rowland FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid ".460 Rowland blackpowder"
-msgstr ""
+msgstr ".460 Rowland fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .460 Rowland FMJ"
-msgstr "utántöltött .460 Rowland FMJ"
+msgstr "újratöltött .460 Rowland FMJ"
 
 #. ~ Description for reloaded .460 Rowland FMJ
 #: lang/json/AMMO_from_json.py
@@ -3512,44 +3636,61 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .460 Rowland"
-msgstr "utántöltött .460 Rowland"
+msgstr "újratöltött .460 Rowland"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr ".50 BMG nyomjelző"
+msgid ".50 BMG M17 tracer"
+msgstr ".50 BMG M17 nyomjelző"
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M17 tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
 msgstr ""
-"Az erőteljes .50 BMG mesterlövész lövedék nyomjelző változata. A nyomjelző "
-"lövedékek segítenek a fegyver célon tartásában, viszont gyújtják a gyúlékony"
-" anyagokat."
+"Az erőteljes .50 BMG lövedék nyomjelző változata. A nyomjelző lövedékek "
+"segítenek a fegyver célon tartásában, viszont gyújtják a gyúlékony "
+"anyagokat."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr ".50 BMG golyó"
+msgid ".50 BMG M33 Ball"
+msgstr ".50 BMG M33 golyó"
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"A .50 BMG egy nagyon erőteljes karabély lőszer, amelyet hosszú tűztávolságra"
-" terveztek. Elképesztő pontosságának és páncél átütő képességének "
-"köszönhetően az egyik leghalálosabb töltényfajta, amelynek azonban hátránya "
-"az erős visszarúgás és a zaj."
+".50 BMG lőszer puhaacél, 661 graines, acélköpenyes (FMJ) lövedékkel. A .50 "
+"BMG egy nagyon erőteljes karabély lőszer, amelyet légelhárításra terveztek, "
+"később járművek és személyek ellen is bevetették. Elképesztő energiájának és"
+" páncélátütő képességének köszönhetően az egyik leghalálosabb töltényfajta, "
+"amelynek azonban hátránya az erős visszarúgás és a zaj."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
-msgstr ".50 BMG AP"
+msgid ".50 BMG Match"
+msgstr ".50 BMG versenylövedék"
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG Match
+#: lang/json/AMMO_from_json.py
+msgid ""
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
+msgstr ""
+"Acélköpenyes (FMJ), ólomcsúcsos .50 BMG lőszer, amelyet a mesterlövész-"
+"versenyekben való részvételhez, a hagyományos lőszernél finomabb "
+"pontossággal gyártottak."
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG M2 AP"
+msgstr ".50 BMG M2 AP"
+
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
@@ -3558,51 +3699,59 @@ msgstr ""
 "A .50 BMG lőszer változatának magja nagyon sűrű, kemény wolfram acélból áll."
 " Az átütőképessége megnőtt, de a sebzése csökken."
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr ".50 BMG Raufoss Mk 211"
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
-msgstr "utántöltött .50 BMG nyomjelző"
+msgstr "újratöltött .50 BMG nyomjelző"
 
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
 msgstr ""
-"Az erőteljes .50 BMG mesterlövész lövedék nyomjelző változata. A nyomjelző "
-"lövedékek segítenek a fegyver célon tartásában, viszont gyújtják a gyúlékony"
-" anyagokat. Ezt kézzel utántöltötték."
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr "utántöltött .50 BMG golyó"
+msgid "reloaded .50 BMG Match"
+msgstr ""
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"Az .50 BMG egy nagyon erőteljes karabély lőszer, amelyet hosszú "
-"tűztávolságra terveztek. Elképesztő pontosságának és páncél átütő "
-"képességének köszönhetően az egyik leghalálosabb töltényfajta, amelynek "
-"azonban hátránya az erős visszarúgás és a zaj. Ezt kézzel utántöltötték"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
-msgstr "utántöltött .50 BMG AP"
+msgstr "újratöltött .50 BMG AP"
 
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
 msgstr ""
-"A .50 BMG lőszer változatának magja nagyon sűrű, kemény wolfram acélból áll."
-" Az átütőképessége megnőtt, de a sebzése csökken. Ezt kézzel utántöltötték."
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -3621,11 +3770,11 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum blackpowder"
-msgstr ""
+msgstr ".500 S&W Magnum fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .500 S&W Magnum"
-msgstr "utántöltött .500 S&W Magnum"
+msgstr "újratöltött .500 S&W Magnum"
 
 #: lang/json/AMMO_from_json.py
 msgid "5.45x39mm 7N10"
@@ -3659,7 +3808,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 5.45x39mm"
-msgstr "utántöltött 5.45x39mm"
+msgstr "újratöltött 5.45x39mm"
 
 #. ~ Description for reloaded 5.45x39mm
 #: lang/json/AMMO_from_json.py
@@ -3670,11 +3819,11 @@ msgid ""
 msgstr ""
 "Az 5.45x39mm-es töltény volt az 1974. utáni AK sorozatokhoz rendszeresített "
 "lövedék. Tervezői az 5.56x45mm NATO munícióból merítettek ihletet. Ezt "
-"kézzel utántöltötték."
+"kézzel újratöltötték."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 5.45x39mm AP"
-msgstr "utántöltött 5.45x39mm AP"
+msgstr "újratöltött 5.45x39mm AP"
 
 #. ~ Description for reloaded 5.45x39mm AP
 #: lang/json/AMMO_from_json.py
@@ -3708,7 +3857,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "5.7x28mm blackpowder"
-msgstr ""
+msgstr "5.7x28mm fekete lőporból"
 
 #. ~ Description for 5.7x28mm blackpowder
 #. ~ Description for reloaded 5.7x28mm
@@ -3722,10 +3871,17 @@ msgid ""
 "using simple lead bullets rather than proper factory-made penetrator "
 "projectiles."
 msgstr ""
+"5.7x28mm lőszer 31 graines páncéltörő bronzköpenyes (FMJ) lövedékkel. Az "
+"5.7x28mm lőszert az FN Herstal tervezte a NATO használatra rendszeresített "
+"9x19mm leváltására. Bár a 9x19mm Parabellum leváltásának projektjét "
+"megszakították, az 5.7x28mm lőszer számos összecsapásnál bizonyította a "
+"megbízhatóságát. Nagyon alacsony a visszarúgása, de nincsen páncélátütő "
+"képessége, mivel a rendes, gyári acélnyilacskák helyett egyszerű ólommal "
+"töltötték meg."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 5.7x28mm"
-msgstr "utántöltött 5.7x28mm"
+msgstr "újratöltött 5.7x28mm"
 
 #: lang/json/AMMO_from_json.py
 msgid "RA110 5x50mm flechette"
@@ -3757,7 +3913,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 5x50mm flechette"
-msgstr "utántöltött 5x50 mm nyilacska"
+msgstr "újratöltött 5x50 mm nyilacska"
 
 #. ~ Description for reloaded 5x50mm flechette
 #: lang/json/AMMO_from_json.py
@@ -3768,11 +3924,11 @@ msgid ""
 msgstr ""
 "Modern gyalogsági páncélzat átütésére tervezték a Rivtech 5 x 50 mm-es "
 "környezetbarát, leváló köpenyes, szárnystabilizált páncéltörő lőszert. Ezt "
-"kézzel utántöltötték."
+"kézzel újratöltötték."
 
 #: lang/json/AMMO_from_json.py
 msgid "M74 rocket"
-msgstr ""
+msgstr "M74 rakéta"
 
 #. ~ Description for M74 rocket
 #: lang/json/AMMO_from_json.py
@@ -3803,7 +3959,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .700 NX"
-msgstr "utántöltött .700 NX"
+msgstr "újratöltött .700 NX"
 
 #: lang/json/AMMO_from_json.py
 msgid "7.62x39mm 57-N-231"
@@ -3841,7 +3997,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 7.62x39mm M43"
-msgstr "utántöltött 7.62x39mm M43"
+msgstr "újratöltött 7.62x39mm M43"
 
 #. ~ Description for reloaded 7.62x39mm M43
 #: lang/json/AMMO_from_json.py
@@ -3858,7 +4014,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 7.62x39mm M67"
-msgstr "utántöltött 7.62x39mm M67"
+msgstr "újratöltött 7.62x39mm M67"
 
 #: lang/json/AMMO_from_json.py
 msgid "7.62x54mmR"
@@ -3881,7 +4037,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 7.62x54mmR"
-msgstr "utántöltött 7.62x54mmR"
+msgstr "újratöltött 7.62x54mmR"
 
 #: lang/json/AMMO_from_json.py
 msgid "7.62x25mm JHP"
@@ -3929,11 +4085,11 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "7.62x25mm FMJ blackpowder"
-msgstr ""
+msgstr "7.62x25mm FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 7.62x25mm"
-msgstr "utántöltött 7.62x25mm"
+msgstr "újratöltött 7.62x25mm"
 
 #: lang/json/AMMO_from_json.py
 msgid "84x246mm HE rocket"
@@ -4144,27 +4300,27 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "9x19mm JHP blackpowder"
-msgstr ""
+msgstr "9x19mm JHP fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "9x19mm FMJ blackpowder"
-msgstr ""
+msgstr "9x19mm FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 9x19mm JHP"
-msgstr "utántöltött 9x19mm JHP"
+msgstr "újratöltött 9x19mm JHP"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 9x19mm FMJ"
-msgstr "utántöltött 9x19mm FMJ"
+msgstr "újratöltött 9x19mm FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 9x19mm +P"
-msgstr "utántöltött 9x19mm +P"
+msgstr "újratöltött 9x19mm +P"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 9x19mm +P+"
-msgstr "utántöltött 9x19mm +P+"
+msgstr "újratöltött 9x19mm +P+"
 
 #: lang/json/AMMO_from_json.py
 msgid "9x18mm 57-N-181S"
@@ -4211,15 +4367,15 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "9x18mm blackpowder"
-msgstr ""
+msgstr "9x18mm fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "9x18mm FMJ blackpowder"
-msgstr ""
+msgstr "9x18mm FMJ fekete lőporból"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 9x18mm"
-msgstr "utántöltött 9x18mm"
+msgstr "újratöltött 9x18mm"
 
 #. ~ Description for reloaded 9x18mm
 #: lang/json/AMMO_from_json.py
@@ -4230,11 +4386,11 @@ msgid ""
 msgstr ""
 "9x18mm-es régi szovjet Makarov töltény, amelyet nagyrészt a Makarov PM "
 "pisztolyhoz használnak. A neve alapján egy kicsit rövidebb a 9mm Parabellum "
-"lövedéknél. Ezt a töltényt kézzel utántöltötték."
+"lövedéknél. Ezt a töltényt kézzel újratöltötték."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 9x18mm +P+"
-msgstr "utántöltött 9x18mm +P+"
+msgstr "újratöltött 9x18mm +P+"
 
 #. ~ Description for reloaded 9x18mm +P+
 #: lang/json/AMMO_from_json.py
@@ -4244,13 +4400,13 @@ msgid ""
 "pressure, boosting flight stability and damage."
 msgstr ""
 "9x18mm-es régi szovjet Makarov töltény, amelyet nagyrészt a Makarov PM "
-"pisztolyhoz használnak. Ezt a töltényt kézzel utántöltötték, hogy nagyobb "
+"pisztolyhoz használnak. Ezt a töltényt kézzel újratöltötték, hogy nagyobb "
 "legyen a belső nyomása, ennek köszönhetően jobb a töltény stabilitása és "
 "sebzése."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 9x18mm FMJ"
-msgstr "utántöltött 9x18mm FMJ"
+msgstr "újratöltött 9x18mm FMJ"
 
 #. ~ Description for reloaded 9x18mm FMJ
 #: lang/json/AMMO_from_json.py
@@ -4262,11 +4418,11 @@ msgstr ""
 "9x18mm-es régi szovjet Makarov töltény, amelyet nagyrészt a Makarov PM "
 "pisztolyhoz használnak. Ez a bronzköpenyes töltény valamennyivel jobb "
 "átütőképességgel rendelkezik, viszont emiatt alacsonyabb a szilánkosodása. "
-"Ezt a töltényt kézzel utántöltötték."
+"Ezt a töltényt kézzel újratöltötték."
 
 #: lang/json/AMMO_from_json.py
 msgid "152mm ATGM HEAT"
-msgstr ""
+msgstr "152mm ATGM HEAT"
 
 #. ~ Description for 152mm ATGM HEAT
 #: lang/json/AMMO_from_json.py
@@ -4274,10 +4430,12 @@ msgid ""
 "A tube-launched, optically tracked, wire-guided missile contained in a steel"
 " tube.  Designed to be highly effective against vehicles and structures."
 msgstr ""
+"Acél vetőcsőben tárolt és abból indított, optikailag vezérelt, vezetékkel "
+"irányított rakéta. Rendkívül hatékony a járművek és az épületek leküzdésére."
 
 #: lang/json/AMMO_from_json.py
 msgid "paralyzing barb"
-msgstr ""
+msgstr "bénító szálka"
 
 #. ~ Description for paralyzing barb
 #: lang/json/AMMO_from_json.py
@@ -4285,6 +4443,7 @@ msgid ""
 "Tiny droplets of venom trickle out of the sponge-like tissue of this sharp "
 "barb."
 msgstr ""
+"A hegyes szálka szivacsos kötőszövetéből apró cseppekben méreg szivárog."
 
 #: lang/json/AMMO_from_json.py
 msgid "sprayable toxic gas"
@@ -4316,7 +4475,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "sprayable insecticide"
-msgstr ""
+msgstr "permetezhető rovarölő"
 
 #. ~ Description for sprayable insecticide
 #: lang/json/AMMO_from_json.py
@@ -4324,6 +4483,8 @@ msgid ""
 "Strong sprayable insecticide ammo for the chemical thrower.  Best be used "
 "with some kind of mask or mouth protection."
 msgstr ""
+"Erős rovarölő szer, amely vegyi lángszóróban használható. Használatához nem "
+"árt valamiféle maszkot, vagy légzést tisztító ruhadarabot felvenni."
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "paper cartridge"
@@ -4417,43 +4578,43 @@ msgstr "Doboznyi apró paintball, szinte semmit sem sebez."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded birdshot"
-msgstr "utántöltött apróvad sörét"
+msgstr "újratöltött apróvad sörét"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded dragon's breath shell"
-msgstr ""
+msgstr "újratöltött sárkánylehellet lőszer"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 00 shot"
-msgstr "utántöltött acélsörét"
+msgstr "újratöltött acélsörét"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded flechette shell"
-msgstr "utántöltött nyilacskás lövedék"
+msgstr "újratöltött nyilacskás lövedék"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded shotgun slug"
-msgstr "utántöltött sörétes dumdum"
+msgstr "újratöltött sörétes dumdum"
 
 #: lang/json/AMMO_from_json.py
 msgid "blackpowder birdshot"
-msgstr ""
+msgstr "fekete lőporos apróvad sörét"
 
 #: lang/json/AMMO_from_json.py
 msgid "blackpowder dragon's breath shell"
-msgstr ""
+msgstr "fekete lőporos sárkánylehellet lőszer"
 
 #: lang/json/AMMO_from_json.py
 msgid "blackpowder 00 shot"
-msgstr ""
+msgstr "fekete lőporos acélsörét"
 
 #: lang/json/AMMO_from_json.py
 msgid "blackpowder flechette shell"
-msgstr ""
+msgstr "fekete lőporos nyilacskás lövedék"
 
 #: lang/json/AMMO_from_json.py
 msgid "blackpowder shotgun slug"
-msgstr ""
+msgstr "fekete lőporos sörétes dumdum"
 
 #: lang/json/AMMO_from_json.py
 msgid "00 shot"
@@ -4495,7 +4656,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "dragon's breath shell"
-msgstr ""
+msgstr "sárkánylehellet lőszer"
 
 #. ~ Description for dragon's breath shell
 #: lang/json/AMMO_from_json.py
@@ -4505,6 +4666,10 @@ msgid ""
 "temperature sparks and flames shoot out of the barrel, igniting everything "
 "in their path."
 msgstr ""
+"Magnézium repeszekkel megtöltött sörétes lőszer, amelyet általában "
+"jelzőfáklyának, vagy pirotechnikai eszköznek használnak. A lőszer elsütése "
+"után magas hőmérsékletű szikrák és lángnyelvek csapnak ki a fegyver "
+"csövéből, és minden utukba kerülő dolgot felgyújtanak."
 
 #: lang/json/AMMO_from_json.py
 msgid "flechette shell"
@@ -4549,7 +4714,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "makeshift shotgun shot (black powder)"
-msgstr ""
+msgstr "hevenyészett sörétes lövedék (fekete lőpor)"
 
 #: lang/json/AMMO_from_json.py
 msgid "shotgun slug"
@@ -4566,7 +4731,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "scrap shotcanister"
-msgstr ""
+msgstr "hulladékfém repeszlőszer"
 
 #. ~ Description for scrap shotcanister
 #: lang/json/AMMO_from_json.py
@@ -4574,10 +4739,12 @@ msgid ""
 "This small paper canister resembling a crude shotshell is filled to the brim"
 " with assorted pieces of scrap metal."
 msgstr ""
+"Ezt az apró, papírból készült sörétes lőszerbe a lehető legtöbb "
+"hulladékfémmel tömték meg."
 
 #: lang/json/AMMO_from_json.py
 msgid "pebble shotcanister"
-msgstr ""
+msgstr "kavicsos repeszlőszer"
 
 #. ~ Description for pebble shotcanister
 #: lang/json/AMMO_from_json.py
@@ -4586,10 +4753,12 @@ msgid ""
 " with tiny pebbles.  Damage is pathetic but flight is much more stable than "
 "scrap"
 msgstr ""
+"Ezt az apró, papírból készült sörétes lőszerbe a lehető legtöbb kaviccsal "
+"tömték meg. A sebzése nevetséges, de röppályája jobb, mint a hulladékfémé."
 
 #: lang/json/AMMO_from_json.py
 msgid "flechette shotcanister"
-msgstr ""
+msgstr "nyilacskás repeszlőszer"
 
 #. ~ Description for flechette shotcanister
 #: lang/json/AMMO_from_json.py
@@ -4597,10 +4766,12 @@ msgid ""
 "This small paper canister resembling a crude shotshell is filled to the brim"
 " with handmade flechettes, giving it some armor piercing capabilities."
 msgstr ""
+"Ezt az apró, papírból készült sörétes lőszerbe a lehető legtöbb, kézzel "
+"készült nyilacskával tömték meg, így némileg képes a páncélzat átütésére."
 
 #: lang/json/AMMO_from_json.py
 msgid "bearing shotcanister"
-msgstr ""
+msgstr "csapágyas repeszlőszer"
 
 #. ~ Description for bearing shotcanister
 #: lang/json/AMMO_from_json.py
@@ -4608,6 +4779,8 @@ msgid ""
 "This small paper canister resembling a crude shotshell is filled to the brim"
 " with handmade bearings, stabilizing it's flight pattern a tiny bit."
 msgstr ""
+"Ezt az apró, papírból készült sörétes lőszerbe a lehető legtöbb, kézzel "
+"készült csapágygolyóval tömték meg, így röppályája valamennyivel stabilabb."
 
 #: lang/json/AMMO_from_json.py
 msgid "birdshot paper cartridge"
@@ -4696,6 +4869,106 @@ msgstr "Egy marék gombamag"
 msgid "fungal flower"
 msgstr "gombavirág"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr ""
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr ""
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr ""
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr ""
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr ""
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr ""
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr ""
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr ""
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr ""
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr ""
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -4852,7 +5125,7 @@ msgstr[1] ""
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
 msgstr ""
@@ -4940,7 +5213,7 @@ msgstr ""
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
 msgstr ""
 
@@ -4995,6 +5268,359 @@ msgid ""
 "explosions."
 msgstr ""
 
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr ""
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr ""
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr ""
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr ""
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr ""
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr ""
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] "neoprén lap"
+msgstr[1] "neoprén lap"
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr ""
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr ""
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr ""
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr ""
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
 msgid_plural "handloaded .22 CB"
@@ -5034,7 +5660,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded shotgun beanbag"
-msgstr "utántöltött babzsák lőszer"
+msgstr "újratöltött babzsák lőszer"
 
 #. ~ Description for reloaded shotgun beanbag
 #: lang/json/AMMO_from_json.py
@@ -5042,7 +5668,7 @@ msgid ""
 "A hand-reloaded beanbag round for shotguns, not deadly but designed to "
 "disable."
 msgstr ""
-"Kézzel utántöltött babzsák lőszer sörétes puskákhoz, a találata nem halálos,"
+"Kézzel újratöltött babzsák lőszer sörétes puskákhoz, a találata nem halálos,"
 " semlegesítésre tervezték."
 
 #: lang/json/AMMO_from_json.py
@@ -5231,8 +5857,8 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 6.54x42mm"
 msgid_plural "reloaded 6.54x42mm"
-msgstr[0] "utántöltött 6,54x42mm"
-msgstr[1] "utántöltött 6,54x42mm"
+msgstr[0] "újratöltött 6,54x42mm"
+msgstr[1] "újratöltött 6,54x42mm"
 
 #. ~ Description for reloaded 6.54x42mm
 #: lang/json/AMMO_from_json.py
@@ -5243,7 +5869,7 @@ msgid ""
 msgstr ""
 "A továbbfejlesztett .280-as töltényből szerzett inspirációt Alekszander "
 "Szarafanov, hogy az SZVSZ-24 rohamkarabélyhoz kifejlessze a 6,54 x 42 mm-es "
-"lőszert. Ezt kézzel utántöltötték."
+"lőszert. Ezt kézzel újratöltötték."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded light rifle ammo"
@@ -5580,6 +6206,18 @@ msgstr ""
 "Becsapódáskor forró lángra kap, átüti a páncélzatot és lángra gyújtja a "
 "gyúlékony anyagokat."
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr ""
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -5627,8 +6265,29 @@ msgstr[1] ""
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr ""
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr ""
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
@@ -5784,8 +6443,8 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 30x113mm"
 msgid_plural "reloaded 30x113mm"
-msgstr[0] "utántöltött 30x113mm"
-msgstr[1] "utántöltött 30x113mm"
+msgstr[0] "újratöltött 30x113mm"
+msgstr[1] "újratöltött 30x113mm"
 
 #. ~ Description for reloaded 30x113mm
 #: lang/json/AMMO_from_json.py
@@ -5821,7 +6480,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 120mm shot"
-msgstr "utántöltött 120mm sörét"
+msgstr "újratöltött 120mm sörét"
 
 #. ~ Description for reloaded 120mm shot
 #: lang/json/AMMO_from_json.py
@@ -5876,7 +6535,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 155mm shot"
-msgstr "utántöltött 155mm sörét"
+msgstr "újratöltött 155mm sörét"
 
 #. ~ Description for reloaded 155mm shot
 #: lang/json/AMMO_from_json.py
@@ -6217,13 +6876,6 @@ msgstr ""
 "Különféle szerves anyagok egyvelege - minden, amire egy blobnak szüksége "
 "lehet az egészséges létezéshez."
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "kő"
-msgstr[1] "kő"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -6793,8 +7445,10 @@ msgstr[1] "derékhordású kardszíj"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "Elrakod a %st"
@@ -7476,6 +8130,46 @@ msgid ""
 "small straps designed to better distribute the weight."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -7638,6 +8332,28 @@ msgid ""
 msgstr ""
 "Színes és röhejes megjelenést kölcsönző bohócruha. Sok minden fél el benne."
 
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
@@ -7920,6 +8636,22 @@ msgstr ""
 "Fehér színű, legombolós galléros, hosszú ujjú ing. Nagyon profin nézel ki "
 "benne!"
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -8069,6 +8801,32 @@ msgstr[1] "hasitasi"
 msgid "Provides a bit of extra storage, with minimal encumbrance."
 msgstr "Plusz tárhely minimális ormótlansággal."
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -8085,6 +8843,34 @@ msgstr ""
 "cipzárral. Nincsen semmi tárolóhely benne, viszont legalább nagyon "
 "kényelmes."
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -8107,6 +8893,32 @@ msgstr[1] "vívónadrág"
 msgid "A pair of reinforced pants used by fencers to prevent injuries."
 msgstr "Megerősített nadrág vívók számára, hogy elkerüljék a sérüléseket."
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -8515,22 +9327,6 @@ msgstr[1] "szőrme kesztyű"
 msgid "A pair of warm fur gloves.  They are somewhat cumbersome."
 msgstr "Egy pár meleg szőrme kesztyű. Valamennyire ormótlan."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] "túlélő búvárkesztyű"
-msgstr[1] "túlélő búvárkesztyű"
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr ""
-"Ezt a pár egyedi szabású, kevlarral páncélozott neoprén kesztyűt könnyű "
-"viselésre alakították ki, ugyanakkor maximális védelmet nyújt akár extrém "
-"körülmények között is."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -8599,6 +9395,20 @@ msgstr ""
 "viselésre alakították ki, ugyanakkor maximális védelmet nyújt akár extrém "
 "körülmények között is."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -8854,17 +9664,6 @@ msgstr ""
 "A szemet és teljes környékét elszigetelő, nagyméretű szemüveg. kiváló "
 "védelmet nyújt a környezeti veszélyekkel szemben."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] "úszószemüveg"
-msgstr[1] "úszószemüveg"
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "Úszáshoz készített apró szemüveg."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -8907,23 +9706,6 @@ msgid ""
 msgstr ""
 "Nehéz, bokáig érő gyapjúkabát. Ormótlan, de jó meleg és mélyek a zsebei."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] "túlélő búvárruha"
-msgstr[1] "túlélő búvárruha"
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr ""
-"Ezt a könnyűsúlyú, kézi barkácsolású páncélzatot egy szétvagdosott golyóálló"
-" mellényből és egy megerősített neoprén búvárruhából fabrikálták. Védelmet "
-"nyújt az elemek és sebesülések ellen."
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -9483,20 +10265,6 @@ msgstr ""
 "Egyedi szabású kevlarral páncélozott, Kevlar-betétes kapucni, nagyon erős és"
 " tartós."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] "túlélő búvárkapucni"
-msgstr[1] "túlélő búvárkapucni"
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr ""
-"Egyedi szabású kevlarral páncélozott, neoprénbetétes kapucni, nagyon erős és"
-" tartós."
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -10269,18 +11037,25 @@ msgstr[0] "bőröv"
 msgstr[1] "bőröv"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "A(z) %st betűröd a %sedbe."
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "Mit tűrsz be az övedbe"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
 msgstr "Egy bőröv. Jó ahhoz, hogy a nadrág ne essen le rólad."
 
@@ -10457,6 +11232,20 @@ msgid ""
 "variety is favored by the military."
 msgstr "Csípőre csatolt tölténytáska fajta, főleg a katonaság használja."
 
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
 msgid_plural "Linux t-shirts"
@@ -11367,38 +12156,6 @@ msgstr ""
 "Nagyméretű bőrtok kardok és egyéb nagyméretű pengés fegyverek számára. "
 "Aktiváld egy fegyver tokba rakásához illetve előrántásához."
 
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] "cápavédelmi ruha"
-msgstr[1] "cápavédelmi ruha"
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr ""
-"Egy darabból álló sodrony ruha, amelyet cápaharapás ellen búvárok szoktak "
-"felvenni. Saját műanyag sisakkal és csizmával is rendelkezik."
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] "faraday cápavédelmi ruha"
-msgstr[1] "faraday cápavédelmi ruha"
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr ""
-"Egy darabból álló sodrony ruha, amelyet cápaharapás ellen búvárok szoktak "
-"felvenni. Faraday-kalicka jellegét az adja, hogy a fémalkatrészeket egyetlen"
-" egy vezetővé kapcsolták össze, így megvéd az áramütés ellen."
-
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
 msgid_plural "sheathes"
@@ -11477,6 +12234,19 @@ msgid ""
 msgstr ""
 "Levágott lábszárú farmernadrág. Vastag és kemény, jól véd a vágások ellen."
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
@@ -11975,12 +12745,9 @@ msgstr[1] "kísérleti alany kezeslábas"
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
 msgstr ""
-"Vékony rövidujjú és rövidnadrágos kezeslábas. A furcsa szabászat és a "
-"hozzáférési pontok arra utalnak, hogy... á, inkább jobb, ha nem tudod kin "
-"volt korábban. Közepes a tárolóképessége és nem túl ormótlan."
 
 #: lang/json/ARMOR_from_json.py
 msgid "suit"
@@ -12061,6 +12828,7 @@ msgstr[1] "túlélő öv"
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "Penge hüvelybe rakása"
@@ -12465,17 +13233,6 @@ msgstr ""
 "a kalapra, valamint víz ellen is beolajozták. A tizennyolcadik századtól "
 "kezdve az apokalipszis utáni években is divatos viselet."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] "fürdőnadrág"
-msgstr[1] "fürdőnadrág"
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "Hálós fürdőnadrág."
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
@@ -12746,58 +13503,6 @@ msgstr ""
 "Egy elegáns mellény, azokra az alkalmakra, amikor ingujjban megjelenni túl "
 "lezserül hatna, az öltöny pedig túl komoly lenne."
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] "neoprén ruha"
-msgstr[1] "neoprén ruha"
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "Egész testet befedő neoprén búvárruha."
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] "úszókesztyű"
-msgstr[1] "úszókesztyű"
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr "Egy pár neoprén-szilikongumi kesztyű vízalatti használatra."
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] "neoprén csuklya"
-msgstr[1] "neoprén csuklya"
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr "Főleg búvárok hordják ezt a neoprén csuklyát."
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] "neoprén fürdőruha"
-msgstr[1] "neoprén fürdőruha"
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr ""
-"Hosszú ujjú, rövidnadrágos neoprén fürdőruha, pink virágokkal és dekoltázst "
-"dobó kivágással. Nem véd annyira, mint az egész testet befedő búvárruha, de "
-"nem is annyira nehéz vele a mozgás."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -13155,6 +13860,35 @@ msgstr ""
 "Több fűzőkarikával ellátott műanyag ponyva, rögtönzött eső elleni védelemre "
 "jól használható."
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -15702,14 +16436,16 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "doctor badge"
 msgid_plural "doctor badges"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "orvos jelvény"
+msgstr[1] "orvos jelvény"
 
 #. ~ Description for doctor badge
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A plastic name tag marking the wearer as a real doctor of the medical kind."
 msgstr ""
+"Egy műanyag névtábla, amely szerint a viselője igazi doktor, az orvosi "
+"fajtából."
 
 #: lang/json/ARMOR_from_json.py
 msgid "Foodkid badge"
@@ -16037,6 +16773,159 @@ msgstr ""
 "DoubleTech gyártmányú szervópáncélnál, irányításához és a klímarendszer "
 "üzemeltetéséhez közvetlen bőrkontaktus szükséges."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] "fürdőnadrág"
+msgstr[1] "fürdőnadrág"
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "Hálós fürdőnadrág."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] "neoprén ruha"
+msgstr[1] "neoprén ruha"
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "Egész testet befedő neoprén búvárruha."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] "neoprén csuklya"
+msgstr[1] "neoprén csuklya"
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr "Főleg búvárok hordják ezt a neoprén csuklyát."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] "túlélő búvárkapucni"
+msgstr[1] "túlélő búvárkapucni"
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr ""
+"Egyedi szabású kevlarral páncélozott, neoprénbetétes kapucni, nagyon erős és"
+" tartós."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] "túlélő búvárruha"
+msgstr[1] "túlélő búvárruha"
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr ""
+"Ezt a könnyűsúlyú, kézi barkácsolású páncélzatot egy szétvagdosott golyóálló"
+" mellényből és egy megerősített neoprén búvárruhából fabrikálták. Védelmet "
+"nyújt az elemek és sebesülések ellen."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] "túlélő búvárkesztyű"
+msgstr[1] "túlélő búvárkesztyű"
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr ""
+"Ezt a pár egyedi szabású, kevlarral páncélozott neoprén kesztyűt könnyű "
+"viselésre alakították ki, ugyanakkor maximális védelmet nyújt akár extrém "
+"körülmények között is."
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] "neoprén fürdőruha"
+msgstr[1] "neoprén fürdőruha"
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr ""
+"Hosszú ujjú, rövidnadrágos neoprén fürdőruha, pink virágokkal és dekoltázst "
+"dobó kivágással. Nem véd annyira, mint az egész testet befedő búvárruha, de "
+"nem is annyira nehéz vele a mozgás."
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] "faraday cápavédelmi ruha"
+msgstr[1] "faraday cápavédelmi ruha"
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+"Egy darabból álló sodrony ruha, amelyet cápaharapás ellen búvárok szoktak "
+"felvenni. Faraday-kalicka jellegét az adja, hogy a fémalkatrészeket egyetlen"
+" egy vezetővé kapcsolták össze, így megvéd az áramütés ellen."
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] "cápavédelmi ruha"
+msgstr[1] "cápavédelmi ruha"
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr ""
+"Egy darabból álló sodrony ruha, amelyet cápaharapás ellen búvárok szoktak "
+"felvenni. Saját műanyag sisakkal és csizmával is rendelkezik."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] "úszószemüveg"
+msgstr[1] "úszószemüveg"
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "Úszáshoz készített apró szemüveg."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] "úszókesztyű"
+msgstr[1] "úszókesztyű"
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr "Egy pár neoprén-szilikongumi kesztyű vízalatti használatra."
+
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
 msgid_plural "helmet nettings"
@@ -16653,6 +17542,54 @@ msgid_plural "shotgun bandoliers"
 msgstr[0] "sörétes lövedék heveder"
 msgstr[1] "sörétes lövedék heveder"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -16675,7 +17612,7 @@ msgstr[1] ""
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
 msgstr ""
 
@@ -16872,6 +17809,24 @@ msgid ""
 "minimize encumbrance."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -17082,6 +18037,8 @@ msgid ""
 " the user to trigger their body's adrenaline response at the cost of some "
 "bionic power."
 msgstr ""
+"A mellékvesevelő mellé beszerelt stimulátoroknak köszönhetően  a felhaszáló "
+"némi bionikus energia árán adhatsz magának egy adrenalin-löketet."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Active Defense System CBM"
@@ -17097,6 +18054,11 @@ msgid ""
 "cost of energy, reducing their ability to deal damage.  Bullets will be "
 "deflected more than swords and those in turn more than massive objects."
 msgstr ""
+"Ez a bionika egy vékony erőtérrel veszi körül a felhasználó testét, "
+"fenntartásához folyamatosan kell energia. Mindennek, ami áthatolna az "
+"erőteren, esélye van arra, hogy energia felhasználása árán eltérüljön. A "
+"lövedékeket gyakrabban lehet eltéríteni, mint a kardot, és a masszív "
+"tárgyakat még kevésbé."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Alarm System CBM"
@@ -17111,6 +18073,10 @@ msgid ""
 "fifteen-foot radius, and will silently alert the user.  This is very useful "
 "during sleep, or if the user suspects a cloaked pursuer."
 msgstr ""
+"A mozgásérzékelő riasztórendszer egy ötméteres sugarú körön belül szinte "
+"mindenféle mozgást érzékel, és csendesen értesíti a felhasználót. Ez nagyon "
+"praktikus tud lenni alvás közben, vagy ha a felhasználó egy láthatatlan "
+"üldözőre gyanakszik."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Arms Alloy Plating CBM"
@@ -17124,6 +18090,9 @@ msgid ""
 "Alloy plating that replaces the flesh on the user's arms.  Provides passive "
 "protection and can be used in conjunction with bionic martial arts."
 msgstr ""
+"A felhasználó karjain a húst egy kemény ötvözetből készült páncél váltotta "
+"fel, ezzel jelentősen megnövelve a passzív védelmet. Bionikus "
+"harcművészettel együtt is használható."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Protective Lenses CBM"
@@ -17138,6 +18107,9 @@ msgid ""
 "mirrored lenses and re-routes their tear ducts to their mouth.  When the "
 "user cries, they must spit out or swallow their tears."
 msgstr ""
+"A felhasználó szemüregeit magas fokú védelmet biztosító tükörlencsékkel "
+"bélelték ki, a könnycsatornákat ezért le kellett vezetni a szájba. Amikor a "
+"felhasználó sír, akkor a könnyeit ki kell köpni, vagy le kell nyelni."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Head Alloy Plating CBM"
@@ -17151,6 +18123,8 @@ msgid ""
 "Alloy plating that replaces the flesh on the user's head, protecting both "
 "their head and jaw regions."
 msgstr ""
+"A felhasználó fején a húst egy kemény ötvözetből készült páncél váltotta "
+"fel, ezzel jelentősen megnövelve fej és az állkapocs védelmét."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Legs Alloy Plating CBM"
@@ -17164,6 +18138,9 @@ msgid ""
 "Alloy plating that replaces the flesh on the user's legs.  Provides passive "
 "protection and can be used in conjunction with bionic martial arts."
 msgstr ""
+"A felhasználó lábain a húst egy kemény ötvözetből készült páncél váltotta "
+"fel, ezzel jelentősen megnövelve a passzív védelmet. Bionikus "
+"harcművészettel együtt is használható."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Torso Alloy Plating CBM"
@@ -17177,6 +18154,8 @@ msgid ""
 "Alloy plating that replaces the flesh on the user's torso, protecting it "
 "from physical trauma."
 msgstr ""
+"A felhasználó törzsén a húst egy kemény ötvözetből készült páncél váltotta "
+"fel, amely így védetté vált a fizikai behatásokkal szemben."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Battery System CBM"
@@ -17190,6 +18169,8 @@ msgid ""
 "A battery draining attachment to make use of the energy contained in normal,"
 " everyday batteries."
 msgstr ""
+"A felhasználónál ceruzaelem méretű, mindennapi elemeket befogadó csatlakozás"
+" kerül kiépítésre, így energiaforrásként azokat is fel lehet használni."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Monomolecular Blade CBM"
@@ -17205,12 +18186,16 @@ msgid ""
 "at the cost of a small amount of power.  Though exceptionally sharp, it will"
 " prevent the user from holding anything else while extended."
 msgstr ""
+"A felhasználó alkarjának belsejébe egy halálos, 30 centis penge került "
+"beépítésre, amelyet a csukló hátán keresztül lehet kiugrasztani némi "
+"energiáért cserébe. Bár az egyetlen molekula vastagságú penge elképesztően "
+"éles, a felhasználó addig semmit sem tud kézbe venni, amíg a penge kint van."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Shotgun Arm CBM"
 msgid_plural "Shotgun Arm CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Sörétes kar KBM"
+msgstr[1] "Sörétes kar KBM"
 
 #. ~ Description for Shotgun Arm CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -17218,6 +18203,8 @@ msgid ""
 "A concealed, single shot 12 gauge shotgun that is implanted inside the left "
 "forearm.  Perfect in a pinch."
 msgstr ""
+"A bal alkarba egy 12 ga-s, egyövéses, rejtett sörétes puska kerül "
+"beépítésre. Vészhelyzetben megteszi."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Blood Analysis CBM"
@@ -17232,6 +18219,8 @@ msgid ""
 "analyze their blood.  This will detect many illnesses, drugs, and other "
 "conditions."
 msgstr ""
+"A felhasználó szívébe apró vérelemző szenzorokat ültettek be, amelyek "
+"képesek számos betegség, kábítószer és egyéb hatás kimutatására."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Blood Filter CBM"
@@ -17247,6 +18236,11 @@ msgid ""
 "Note that it is not a targeted filter; ALL drugs in the system will be "
 "affected."
 msgstr ""
+"A felhasználó szívébe ültetett szűrőrendszernek köszönhetően aktív módon "
+"szűrhetők ki a vérbe került idegen anyagok, nagyrészt a kábítószerek. A "
+"vírusok ellen korlátozott a hatékonysága. A szűrővel nem lehet kiválasztani,"
+" hogy a felhasználó mit szeretne kiszűrni - a testbe került összes "
+"gyógyszerre és kábítószerre ugyanolyan hatással van."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Cable Charger System CBM"
@@ -17260,6 +18254,8 @@ msgid ""
 "A complex port that is mounted above the hip.  While active, it will "
 "recharge bionic power when connected to a battery via jumper cable."
 msgstr ""
+"A felhasználó csípője felett egy összetett kábeles port található. Aktív "
+"állapotában akkumulátoros töltőkábelen keresztül ad át energiát."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Subdermal Carbon Filament CBM"
@@ -17273,6 +18269,9 @@ msgid ""
 "A thin armor made of carbon nanotubes, implanted just beneath the skin.  "
 "This reduces bashing damage by 2 and cutting damage by 4."
 msgstr ""
+"A felhasználó bőrének felszíne alá egy vékony, szénszálas nanocsövecskékből "
+"álló páncélzat került beépítésre. A zúzó sebesüléseket 2-vel, a vágó "
+"sebesüléseket 4-gyel csökkenti."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Chain Lightning CBM"
@@ -17287,6 +18286,9 @@ msgid ""
 "leaving a trail of lightning in its wake and jumping to additional targets "
 "within 4 tiles of the previous target."
 msgstr ""
+"A felhasználó testét felszerelték egy láncvillám generátorral, amely "
+"villámot szór egy célra, nyomában villámlással, és a villám 4 kockán belül "
+"további célokra ugrik át."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Bionic Claws CBM"
@@ -17301,6 +18303,10 @@ msgid ""
 "These do considerable cutting damage, but prevent the user from holding "
 "anything else while extended."
 msgstr ""
+"A felhasználó ujjaiba vérszomjas karmok kerültek beszerelésre, amelyeket "
+"némi energiahasználat árán lehet kiugrasztani és visszahúzni. A karmokkal "
+"jelentős vágott sebeket lehet ejteni, de amíg kint vannak, addig a "
+"felhasználó semmit sem tud kézbe venni."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Internal Climate Control CBM"
@@ -17314,6 +18320,9 @@ msgid ""
 "A network of thermal piping which eases the effects of high and low ambient "
 "temperatures once activated."
 msgstr ""
+"A felhasználó egész testébe beépítésre került egy hőcserélő rendszer "
+"csövezése, amely segít ellensúlyozni a túl magas vagy a túl alacsony külső "
+"hőmérsékletek hatását."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Cloaking System CBM"
@@ -17329,6 +18338,11 @@ msgid ""
 " sensors.  However, this doesn't prevent detection from other means such as "
 "infrared, sonar, etc."
 msgstr ""
+"Ez a jelentős energiahasználatot igényelő rendszer számos apró kamera és LED"
+" használatával segít beolvadni a háttérbe, a hagyományos látási tartomány "
+"számára a felhasználó láthatatlanná teszi. Az elektromágneses spektrum "
+"látáson kívüli tartományaiban, így infravörös, szonár, stb. számára azonban "
+"a felhasználó továbbra is látható marad."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Close Quarters Battle CBM"
@@ -17344,6 +18358,9 @@ msgid ""
 "hand combat skills, but prevents them from improving them through combat "
 "experience."
 msgstr ""
+"Harcművészeti programokkal feltöltött bionikus processzorokat és "
+"adatbankokat integráltak a felhasználó idegrendszeréhez. Aktív állapotnál a "
+"közelharci modul feljavítja a közelharci képességeket."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Wired Reflexes CBM"
@@ -17357,6 +18374,8 @@ msgid ""
 "Bionic nerve stimulators that greatly enhance reaction times, granting a +2 "
 "bonus to dexterity."
 msgstr ""
+"Bionikus idegrendszeri stimulátorok alkalmazásával a felhasználó "
+"reakcióideje jelentősen javult, +2 ügyesség."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Expanded Digestive System CBM"
@@ -17372,6 +18391,10 @@ msgid ""
 "also increase the user's resistance to foodborne illness, and occasionally "
 "allow the digestion of rotten food."
 msgstr ""
+"A felhasználóba három szintetikus gyomor és vegyipari kaliberű bélrendszer "
+"került beépítésre. Az ételből ezután a felhasználó nem csak sokkal több "
+"tápanyagot képes kivonni, de jelentősen megnőtt az ételmérgezéssel szembeni "
+"ellenállása is, valamint néha rohadt ételt is meg tud enni."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Enhanced Hearing CBM"
@@ -17387,6 +18410,9 @@ msgid ""
 "Additionally, high-intensity sounds will be automatically dampened before "
 "they can damage their hearing."
 msgstr ""
+"Amikor ez a bionika aktív, akkor a felhasználó hallása drámai mértékben "
+"javul, az átlagembernél tízszer jobb lesz. A túl erős hangokat továbbá a "
+"rendszer még azelőtt lefojtja, hogy azok sérüléseket okoznának."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Directional EMP CBM"
@@ -17401,6 +18427,9 @@ msgid ""
 "user's right hand.  These can be be used to instantly fire a wide, but "
 "short-ranged blast which will disable electronics and robots."
 msgstr ""
+"A felhasználó tenyereibe apró elektromágneses pulzust leadó parabola-"
+"antennák kerültek beépítésre. Energia felhasználásával rövid hatótávolságú "
+"EMP leadásával az elektromos berendezések és a robotok megbéníthatók."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "EMP Projector CBM"
@@ -17416,6 +18445,10 @@ msgid ""
 "aim.  Extremely effective against electronic targets but mostly useless "
 "otherwise."
 msgstr ""
+"A felhasználó jobb kezébe és karjába elektromágneses pulzus vető került "
+"beépítésre. A szuperkoncentrált pulzusokat rövid hatótávolságra lehet "
+"kilőni. Elektromos célpontok leküzdésére rendkívül hatékony, egyébként "
+"szinte haszontalan."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Ethanol Burner CBM"
@@ -17426,10 +18459,13 @@ msgstr[1] "Etanolkazán KBM"
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
 msgstr ""
+"Egy rendkívül magas hatásfokú reakcióval alkoholt égető kazán. 500 ml "
+"folyadék befogadására képes, tüzelőanyagként használható az etanol, a "
+"metanol illetve a denaturált szesz."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Aero-Evaporator CBM"
@@ -17438,8 +18474,7 @@ msgstr[0] "Aero-evaporátor KBM"
 msgstr[1] "Aero-evaporátor KBM"
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -17460,6 +18495,8 @@ msgid ""
 "A set of diamond corneas which greatly enhance the user's vision, granting a"
 " +2 bonus to perception."
 msgstr ""
+"A felhasználó látása rendkívüli mértékben javult, +2 bónuszt kap az "
+"érzékelésre."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Telescopic Eyes CBM"
@@ -17474,6 +18511,10 @@ msgid ""
 "material in the inner eye.  This fixes any vision problems and allows for an"
 " increased vision range akin to binoculars."
 msgstr ""
+"A felhasználó szemében a belső részek nagy részét eltávolították, helyettük "
+"egy sor nagy felbontású, autófókuszáló lencse került beépítésre. A "
+"felhasználó messzebbre és tisztábban lát, mintha távcsöve lenne. A korábbi "
+"eseteges látási nehézségek megszűntek."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Facial Distortion CBM"
@@ -17488,6 +18529,10 @@ msgid ""
 "module lets the user alter their facial structure so as to subtly affect the"
 " reactions of others.  This grants a bonus to all social interactions."
 msgstr ""
+"Az elektrokémiai impulzusok finom modulálásával a felhasználó képes az "
+"arcberendezkedése hajszálnyi megváltoztatására. A többiek ebből semmit sem "
+"vesznek tudatosan észre, de a felhasználó bónuszt kap minden társas "
+"érintkezés során."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Dielectric Capacitance System CBM"
@@ -17501,6 +18546,9 @@ msgid ""
 "A network of miniature piezoelectric capacitors, implanted throughout the "
 "body to protect from external electrical discharge."
 msgstr ""
+"A felhasználó egész testébe beépítésre került egy miniatürizált piezo-"
+"elektromos kondenzátor-rendszer, amely bionikus energiával feltöltve rövid "
+"ideig véd egy külső elektromos kisülés hatásaitól."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Fingerhack CBM"
@@ -17511,11 +18559,15 @@ msgstr[1] "Hekkerujj KBM"
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
+"A felhasználó egyik ujjbegyébe műtéti úton egy eletrohekker modul került "
+"beépítésre. Számítógépek kivételével minden vezérlőpanelt fel lehet törni. "
+"Az informatikai képesség azonban továbbra is számít, és kudarc esetén a "
+"felhasználó akár meg is sebesülhet."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Flashbang Generator CBM"
@@ -17529,6 +18581,9 @@ msgid ""
 "A combination of LEDs and speakers that create a flash and sound comparable "
 "to a flashbang grenade, deafening and blinding nearby enemies."
 msgstr ""
+"A felhasználó a bőrébe integrált LED-ek segítségével egy villanógránáthoz "
+"hasonló villanást tud generálni, amely megvakítja és megsüketíti az összes "
+"közeli ellenséget."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Cranial Flashlight CBM"
@@ -17540,12 +18595,14 @@ msgstr[1] "Koponyalámpa KBM"
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "A small, but powerful LED flashlight that is mounted between the eyes."
 msgstr ""
+"A felhasználó két szeme közé beszerelésre került egy apró, de nagyon erős "
+"LED."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "LED Tattoo"
 msgid_plural "LED Tattoos"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "LED tetoválás"
+msgstr[1] "LED tetoválás"
 
 #. ~ Description for LED Tattoo
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -17554,6 +18611,9 @@ msgid ""
 "pictures through the skin.  When active it glows dimly, providing a very "
 "small amount of light."
 msgstr ""
+"A felhasználó hámrétegébe egy LED kijelző került beépítésre. amely a bőrön "
+"át világítva mintákat és képeket tud megjeleníteni. Aktív állapotban gyengén"
+" világít, nagyon kevés fényt ad."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Integrated Dosimeter CBM"
@@ -17568,12 +18628,15 @@ msgid ""
 " user to analyze their level of absorbed radiation.  They will also alert "
 "the user whenever exposed to environmental radiation."
 msgstr ""
+"A felhasználó testébe számos helyen implantálásra kerültek kisebb sugárzás "
+"mérő eszközök, amelyek segítségével elemezni lehet az elnyelt sugárterhelés "
+"mértékét. Környezeti sugárterhelés esetén a felhasználót azonnal riasztja."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Respirator CBM"
 msgid_plural "Respirator CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Respirátor KBM"
+msgstr[1] "Respirátor KBM"
 
 #. ~ Description for Respirator CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -17582,6 +18645,9 @@ msgid ""
 "oxygen uptake and allows for underwater breathing akin to gills.  Will "
 "automatically activate if the user is drowning."
 msgstr ""
+"Ez az összetett légzéssegítő augmentációs rendszer növeli a felhasználó "
+"maximális oxigénbevitelét, és víz alatt a kopoltyúhoz hasonlóan engedi a "
+"légzést. Automatikusan bekapcsolódik, ha a felhasználó fuldokol."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Terranian Sonar CBM"
@@ -17595,6 +18661,8 @@ msgid ""
 "Precision sonar equipment, implanted in the feet to allow the detection of "
 "below-ground movement, buried traps, and unstable terrain."
 msgstr ""
+"A lábfejekbe szerelt precíziós szonárberendezéssel a felhasználó képes a "
+"föld alatt mozgás, a rejtett aknák és az instabil talaj érzékelésére."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Heat Drain CBM"
@@ -17609,6 +18677,10 @@ msgid ""
 "that a successful hit will drain body heat, inflicting a small amount of "
 "extra damage, and recharging the user's bionic power reserves slightly."
 msgstr ""
+"Amikor a felhasználó puszta kézzel harcol egy melegvérű ellenséggel, akkor "
+"minden sikeresen bevitt ütésnél van arra esély, hogy az ellenség "
+"testhőmérsékletét leszívva a felhasználó némi sebzést okozzon, és apró "
+"mértékben növelje a bionikus energiatartalékait."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Thermal Dissipation CBM"
@@ -17624,6 +18696,10 @@ msgid ""
 "degrees Fahrenheit.  Note that this does not affect the internal body "
 "temperature."
 msgstr ""
+"Magas hatékonyságú hőleadó lamellák és szupraanyagok szövevényes rendszere "
+"került a felhasználó húsába. Bekapcsolt állapotában a hőleadó rendszer 1000 "
+"C fokig megakadályozza a hőtől származó sebesülést. A hőleadás azonban nem "
+"vonatkozik a testhőmérsékletre."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Hydraulic Muscles CBM"
@@ -17637,6 +18713,8 @@ msgid ""
 "A hydraulic muscle support system that when active, increases strength by "
 "20."
 msgstr ""
+"Aktív állapotban ez a hidraulikus izomtámogató rendszer az erőt 20-szal "
+"növeli."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Infrared Vision CBM"
@@ -17650,6 +18728,8 @@ msgid ""
 "A bionic module that extends the range of vision into the infrared, allowing"
 " the user to see warm-blooded creatures in the dark and through smoke."
 msgstr ""
+"A felhasználó látóképessége kiterjed az infravörös tartományra is, a "
+"melegvérű lényeket a sötétben és a füstben is látni."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Cerebral Booster CBM"
@@ -17663,6 +18743,7 @@ msgid ""
 "Bionic coprocessors that are implanted in the brain, granting a +2 bonus to "
 "intelligence."
 msgstr ""
+"Az agyba bionikus ko-processzorok kerültek beépítésre, +2 intelligencia."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Finger-Mounted Laser CBM"
@@ -17677,6 +18758,9 @@ msgid ""
 "range weapon is not incredibly damaging, but is very accurate, and has the "
 "potential to start fires."
 msgstr ""
+"A felhasználó egyik ujjának begyébe egy erős lézer került beszerelésre. Ez a"
+" hosszú hatótávolságú fegyver nem okoz magas sebzést, viszont nagyon pontos "
+"és tűzgyújtásra is alkalmas."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Leukocyte Breeder System CBM"
@@ -17692,6 +18776,10 @@ msgid ""
 "designed for continuous use and may cause unpleasant side effects when "
 "turned off."
 msgstr ""
+"A felhasználó vérképző rendszeredét augmentáló bionikus stimulátoroknak "
+"köszönhetően némi energiával felgyorsítható a fehérvérsejt-képződés. "
+"Folyamatos üzemelésre tervezték, ezért kikapcsolása kellemetlen "
+"mellékhatásokkal járhat."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Mini-Flamethrower CBM"
@@ -17705,6 +18793,8 @@ msgid ""
 "Powerful fire starters which extend from the tip of both hands' index "
 "fingers."
 msgstr ""
+"A felhasználó mindkét mutatóujjának hegyéből erőteljes tűzgyújtó berendezés "
+"tud előugrani."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Fingerpick CBM"
@@ -17719,6 +18809,10 @@ msgid ""
 "system will quickly unlock all but the most advanced key locks without any "
 "skill required on the part of the user."
 msgstr ""
+"A felhasználó egyik ujjába elektronikus tolvajkulcs rendszer került "
+"integrálásra. Ez az automata rendszer a legkomplikáltabb zárak kivételével "
+"szinte az összes zárat azonnal, a felhasználó bármiféle hozzáértése nélkül "
+"kinyitja."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Electromagnetic Unit CBM"
@@ -17733,6 +18827,10 @@ msgid ""
 "allowing them to indiscriminately pull all nearby magnetic objects towards "
 "them.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
+"A felhasználó jobb kezébe egy erőteljes elektromágnes került beépítésre, "
+"segítségével az összes közelében található fémtárgyat közel tudja húzni "
+"magához. A peches közelben állókat ezek a repülő tárgyak megsebezheti vagy "
+"meg is ölhetik."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Nictating Membrane CBM"
@@ -17746,6 +18844,8 @@ msgid ""
 "A thin membrane that closes over the eyes while underwater, negating any "
 "vision penalties."
 msgstr ""
+"A felhasználó szemeire egy vékony membrán került, amely víz alá merülve a "
+"szemek elé csusszan, és így semlegesíti a víz alatti látáscsökkenést."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Enhanced Memory Banks CBM"
@@ -17760,6 +18860,10 @@ msgid ""
 "While active, they increase the rate that the user learns skills, and give "
 "them near-perfect memory of skills and terrain."
 msgstr ""
+"Csúcstechnológiájú kvantumtároló meghajtók egyvelege, amelyek segítségével a"
+" felhasználó memóriát lehet feljavítani. Aktív állapotban növeli a készségek"
+" elsajátítási sebességét, valamint szinte tökéletes lesz a felhasználó "
+"memóriája és a tereptárgyak megjegyzése."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Metabolic Interchange CBM"
@@ -17773,6 +18877,8 @@ msgid ""
 "This module interconnects the user's digestive system and power supply, "
 "letting them replenish bionic energy by burning calories."
 msgstr ""
+"Ez a modul összeköti a felhasználó emésztő- és elektronikus rendszerét, így "
+"a bionikus energiát kalória égetésével lehet pótolni."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Weather Reader CBM"
@@ -17787,6 +18893,9 @@ msgid ""
 "data.  The data is compiled and presented as a simple readout of the current"
 " weather.  It also passively tells the user their external temperature."
 msgstr ""
+"Környezeti adatgyűjtésre alkalmas tudományos műszerek és érzékelők "
+"rendszere. Az adatok kigyűjtése és összegzése után a jelenlegi időjárás "
+"kiolvasható. Passzív módon kijelzi a külső hőmérsékletet is."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Repair Nanobots CBM"
@@ -17800,6 +18909,9 @@ msgid ""
 "A fleet of tiny dormant robots.  While activated they will flit about the "
 "user's body, repairing damage and stopping bleeding at the cost of power."
 msgstr ""
+"A felhasználó testébe behelyezésre került egy hadseregnyi apró robot. "
+"Aktiváláskor az szerteszaladnak a testen belül, begyógyítják a sérüléseket "
+"és energiafelhasználással elállítják a vérzést."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Artificial Night Generator CBM"
@@ -17813,6 +18925,8 @@ msgid ""
 "When active, this bionic eliminates all light within a 15 tile radius "
 "through destructive interference."
 msgstr ""
+"Aktív állapotában destruktív interferencia segítségével 15 lépésen belül az "
+"összes fény eltűnik."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Implanted Night Vision CBM"
@@ -17826,6 +18940,8 @@ msgid ""
 "This bionic module modifies the user's eyes to amplify existing light, "
 "allowing them to see in the dark."
 msgstr ""
+"A felhasználó szemeit felkészítették a beeső fény felerősítésére, így a "
+"sötétben is tud látni."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Offensive Defense System CBM"
@@ -17840,6 +18956,10 @@ msgid ""
 "draining power.  This field does not deflect attacks, but rather delivers a "
 "strong shock, damaging unarmed attackers and those with a conductive weapon."
 msgstr ""
+"Egy vékony erőtér veszi körül a felhasználó testét, fenntartásához "
+"folyamatosan kell energia. Ez az erőtér nem akadályozza meg a támadásokat, "
+"viszont egy erős áramütésben részesíti a puszta kézzel illetve fémfegyverrel"
+" támadó ellenséget."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Sensory Dulling CBM"
@@ -17854,6 +18974,9 @@ msgid ""
 "them to dull their senses at will.  However, the use of this system may "
 "cause delayed reaction times and drowsiness."
 msgstr ""
+"A felhasználó idegrendszere képessé vált elnyomni a fájdalom jeleit, így "
+"igény szerint lehet tompítani az érzékeket. A modul használata azonban "
+"növeli a reakcióidőt és tompasághoz vezethet."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Power Armor Interface CBM"
@@ -17868,6 +18991,8 @@ msgid ""
 " suits of power armor, allowing them to draw from the user's bionic power "
 "banks."
 msgstr ""
+"A felhasználó bionikus energiarendszerét összeköti a szervópáncél belső "
+"töltési portjával, így az a bionikus energiát meríti."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Power Armor Mk. II Interface CBM"
@@ -17880,9 +19005,12 @@ msgstr[1] "Szervópáncél II interfész KBM"
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
+"A felhasználó energiarendszeredet összeköti a szervópáncél belső töltési "
+"portjával. A kétszer hatékonyabb II-es modellt a DoubleTech Inc. tervezte az"
+" egyre népszerűbb Power Armor Mk II sorozatához."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Power Storage CBM"
@@ -17897,12 +19025,16 @@ msgid ""
 "units.  Having at least one of these is a prerequisite to using powered "
 "bionics.  The user will also need a power supply, found in various CBMs."
 msgstr ""
+"Ez a kompakt bionikus modul 100 egységgel növeli a felhasználó "
+"energiatárolási kapacitását. Legalább egy ilyen modulra van szükség ahhoz, "
+"hogy energiát használó bionikát lehessen használni. Szükség lesz továbbá még"
+" egy energiaforrásra is, amely másféle KBM-ekben található."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Power Storage CBM Mk. II"
 msgid_plural "Power Storage CBM Mk. II"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Energiatároló II KBM"
+msgstr[1] "Energiatároló II KBM"
 
 #. ~ Description for Power Storage CBM Mk. II
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -17911,6 +19043,9 @@ msgid ""
 " for the highly successful Power Storage CBM.  Increases the user's power "
 "capacity by 250 units."
 msgstr ""
+"A DoubleTech Industries által kifejlesztett kompakt bionikus modul az "
+"Energiatároló KBM továbbfejlesztett változata, a felhasználó energiatárolási"
+" kapacitását 250 egységgel növeli."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Probability Travel CBM"
@@ -17925,6 +19060,10 @@ msgid ""
 " walls, reappearing on the other side.  Power drain in standby is minimal, "
 "but each tile tunneled through costs 250 bionic power."
 msgstr ""
+"Megnöveli a felhasználó testének hullámhosszát, így az kvantumalagutat tud "
+"létesíteni egy tömör falon át, és a másik oldalon jelenik meg. Készenléti "
+"módban az energiafelhasználása minimális, de minden átugrott lépés 250 "
+"bionikus energiába kerül."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Air Filtration System CBM"
@@ -17939,6 +19078,9 @@ msgid ""
 "or airborne diseases find their way into the windpipe, the filter will "
 "attempt to remove them."
 msgstr ""
+"A felhasználó gégecsövébe beépítésre került egy modern légszűrő rendszer. Ha"
+" toxinok vagy levegőn át terjedő toxinok haladnának át a tüdő felé, akkor a "
+"szűrő megpróbálja ezeket eltávolítani."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Radiation Scrubber System CBM"
@@ -17953,6 +19095,9 @@ msgid ""
 "throughout your body, allowing the user to purge themself of absorbed "
 "radiation at the cost of some bionic power."
 msgstr ""
+"A felhasználó testébe implantálásra került egy piezomechanikus vérszűrő "
+"rendszer számos alegysége, amelyek némi bionokus energia árán megtisztítják "
+"a teste által elnyelt sugárfertőzést."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Railgun CBM"
@@ -17967,6 +19112,10 @@ msgid ""
 "thrown magnetic objects at a cost of 1 bionic power per throw.  They will "
 "create a trail of electricity that can cause additional damage."
 msgstr ""
+"A felhasználó karjaiba integrált elektromágneses mezőgenerátorok "
+"megduplázzák az eldobott vas- és acéltárgyak hatótávolságát és sebzését. "
+"Minden dobás 1 energiába kerül, a dobott tárgyak további sebzést okozó "
+"villámlást hagynak maguk után."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Fingertip Razors CBM"
@@ -17981,12 +19130,15 @@ msgid ""
 "implanted underneath the fingernails.  These will deal a small amount of "
 "unarmed slashing damage whenever the user's fingertips are uncovered."
 msgstr ""
+"A felhasználó körmei alá pengeélességű, behúzható karmok kerültek. A tíz "
+"darab kétélű penge egyenként négy centiméter hosszú, és fedetlen ujjhegyek "
+"esetén egy kis mértékű vágósebzést ejtenek."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Gasoline Fuel Cell CBM"
 msgid_plural "Gasoline Fuel Cell CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Benzines üzemanyagcella KBM"
+msgstr[1] "Benzines üzemanyagcella KBM"
 
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -17995,6 +19147,8 @@ msgid ""
 "connected to a diffuse network of bio-plastic bladders able to hold up to "
 "500 ml of gasoline."
 msgstr ""
+"Egy kisméretű üzemanyagcella, amely benzinből hoz létre bionikus energiát. A"
+" bioplasztik ballonokból álló hálózat 500 ml benzin tárolására alkalmas."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Recycler Unit CBM"
@@ -18009,6 +19163,9 @@ msgid ""
 " system, allowing them to reclaim waste liquid and, to a lesser degree, "
 "nutrients.  The net effect is a greatly reduced need to eat and drink."
 msgstr ""
+"A felhasználó emésztőrendszerébe számos szűrő és feldolgozó alegység került,"
+" amelyek képesek a folyékony salakanyagok, és kisebb mértékben a tápanyagok "
+"újrahasznosítására. A végeredmény: sokkal alacsonyabb ivási és evési igény."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Remote Controller CBM"
@@ -18022,6 +19179,8 @@ msgid ""
 "A small module that connects to the user's brain and allows them to "
 "interface with nearby devices with wireless capabilities."
 msgstr ""
+"Ez a felhasználó agyához kapcsolt kis modul kérésre csatlakozik a közeli "
+"vezeték nélküli eszközökhöz."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Sonic Resonator CBM"
@@ -18036,6 +19195,10 @@ msgid ""
 "power, creating a short-range shockwave.  While it will not do much damage "
 "to creatures, solid objects such as walls and doors will be damaged."
 msgstr ""
+"A felhasználó egész teste erős rezonációt bocsájt ki, amely egy rövid "
+"hatósugarú lökéshullámként jelentkezik. Ez a halottakon és az élőlényeken "
+"nem okoz nagy sebzést, az ajtókhoz és falakhoz hasonló merev tárgyakat "
+"megrongálja."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Olfactory Mask CBM"
@@ -18049,6 +19212,9 @@ msgid ""
 "While this system is powered, the user's body will produce very little odor,"
 " making it nearly impossible for creatures to track them by scent."
 msgstr ""
+"Amikor ez a modul energiát kap, akkor a felhasználó teste nagyon kevés "
+"szagot bocsát ki, így a szaga alapján követő lényeknek szinte lehetetlen "
+"dolguk lesz."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Scent Vision CBM"
@@ -18062,6 +19228,9 @@ msgid ""
 "This system lets the user visually sense their own scent, making it possible"
 " for them to recognize their surroundings even in complete darkness."
 msgstr ""
+"Amikor ez a modul energiát kap, akkor a felhasználó képes vizualizálni a "
+"saját szagát, így még akkor is felismeri a környezetét, ha  a teljes "
+"sötétben amúgy nem látja."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Electroshock Unit CBM"
@@ -18076,6 +19245,10 @@ msgid ""
 " a chance that a successful hit will shock the user's opponent, inflicting "
 "extra damage and disabling them temporarily at the cost of some energy."
 msgstr ""
+"Amikor a felhasználó puszta kézzel, vagy áramot vezető fegyverrel harcol, "
+"akkor minden bevitt ütés után esélye van arra, hogy az ütés megrázza az "
+"ellenfelet, további sebzést okozva és átmenetileg megbénítva őt. A sikeres "
+"áramütés némi bionikus energiát használ fel."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Shockwave Generator CBM"
@@ -18091,6 +19264,10 @@ msgid ""
 "upon impact with impassable terrain, and knock back any creatures they "
 "collide with."
 msgstr ""
+"A felhasználó erős lökéshullám generálására képes, amely hátradobja szinte "
+"az összes környező lényt. A célpontok rövid időre elkábulnak, sebzést "
+"kapnak, és amennyiben átjárhatatlan terepre lökődnének, akkor további "
+"kábítást kapnak. Ha más lénnyel ütköznek, akkor azokat is hátradobják."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Synaptic Accelerator CBM"
@@ -18105,6 +19282,8 @@ msgid ""
 "Bionic stimulators that enhance the nervous system, granting a 10% boost to "
 "your speed."
 msgstr ""
+"A fehasználó idegrendszerét bionikus stimulátorokkal javították fel, 10%-kal"
+" gyorsabb lett."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Muscle Augmentation CBM"
@@ -18118,6 +19297,8 @@ msgid ""
 "Myomer fibers that enhance the muscular system, granting a +2 bonus to "
 "strength."
 msgstr ""
+"Myomer izomrostok alkalmazásával a felhasználó izomrendszere jelentősen "
+"javult, +2 erő."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Autonomous Surgical Scalpels CBM"
@@ -18132,6 +19313,9 @@ msgid ""
 "  They allow for automated precise cuts and can be used as a high-quality "
 "butchering tool."
 msgstr ""
+"A felhasználó ujjaiba sebészeti szintű szikék kerültek implantálásra, "
+"segítségükkel boncoláskor pontosabb vágásokat lehet ejteni.  A szikéket "
+"továbbá magas minőségű henteskésként is lehet használni."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Anti-Glare Compensators CBM"
@@ -18146,6 +19330,10 @@ msgid ""
 " eyes.  They negate glare penalties, partially protect from bright flashes, "
 "and protect the eyes when welding."
 msgstr ""
+"A felhasználó szemgolyóiba gyors reagálású tranzitív lencsék kerültek, "
+"amelyek kiszűrnek mindenféle ragyogást. Részben megvédik a felhasználó "
+"szemét a fényes villanásoktól, így többek között részben a hegesztőfénytől "
+"is."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Targeting System CBM"
@@ -18160,6 +19348,9 @@ msgid ""
 "the user's eyes with their arms, to a degree.  Shots they fire will be much "
 "more accurate, particularly at long ranges."
 msgstr ""
+"A felhasználói szemgolyóiba távolságmérő épült, amelyek egy bizonyos "
+"mértékig a kezekkel is összeköttetésbe kerültek. A leadott lövések főleg "
+"hosszú távon sokkal pontosabbak lesznek."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Teleportation Unit CBM"
@@ -18175,6 +19366,11 @@ msgid ""
 "of much power.  Note that prolonged or frequent use may have dangerous side "
 "effects."
 msgstr ""
+"Ez a kísérleti modul rövid távon belül képes a tér-idő kontinuum "
+"görbítésére, 8 méteres távolságon belül lényeges energiafelhasználás árán "
+"bárhova azonnal eljuttatja a felhasználót. A gyártó arra figyelmeztet, hogy "
+"a modul hosszútávú vagy gyakori használata veszélyes mellékhatásokkal is "
+"járhat."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Time Dilation CBM"
@@ -18189,6 +19385,10 @@ msgid ""
 "speed and reactions dramatically, essentially freezing time.  Violent or "
 "rapid movements may cause damage due to friction."
 msgstr ""
+"A felhasználó az összes eltárolt energia árán drámai mértékben képes a teste"
+" sebességét és reakcióidejét felgyorsítani, gyakorlatilag befagyasztva a "
+"környező időt. Az erőteljes vagy a gyors mozgás a súrlódás miatt sebesülést "
+"okozhat."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Integrated Toolset CBM"
@@ -18203,12 +19403,16 @@ msgid ""
 "hand drill, welder and heating elements.  These can be used in place of many"
 " tools when crafting."
 msgstr ""
+"A felhasználó tenyerébe és ujjaiba műtéti úton egy komplett műszerszerelő "
+"eszköztár került: csavarhúzó, kalapács, franciakulcs, fém- és fafűrész, "
+"drótvágó olló, fúrógép, valamint melegítőszál.  Tárgyak gyártásánál vagy "
+"szerelésénél szerszámok helyett használható."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Joint Torsion Ratchet CBM"
 msgid_plural "Joint Torsion Ratchet CBMs"
-msgstr[0] "Izületi torziós racsni KBM"
-msgstr[1] "Izületi torziós racsni KBM"
+msgstr[0] "Ízületi torziós racsni KBM"
+msgstr[1] "Ízületi torziós racsni KBM"
 
 #. ~ Description for Joint Torsion Ratchet CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18217,12 +19421,15 @@ msgid ""
 "when they move.  These can be toggled to generate more power, but movement "
 "will require more effort."
 msgstr ""
+"A felhasználó ízületeibe torziós racsnik kerültek, amelyek a mozgás "
+"energiájából lassan bionikus energiát generálnak. Bekapcsolásával még több "
+"energiát generálnak, de a mozgás nagyobb erőfeszítést igényel."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Joint Servo CBM"
 msgid_plural "Joint Servo CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ízületi szervó KBM"
+msgstr[1] "Ízületi szervó KBM"
 
 #. ~ Description for Joint Servo CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18232,6 +19439,10 @@ msgid ""
 "requires less effort while this bionic is active.  However, when it's "
 "offline it will hamper the user's movement."
 msgstr ""
+"A lábízületekre telepített szervómotorok segítenek a mozgásban. A "
+"berendezést futásra optimalizálták, de a bionika aktiválásánál a gyaloglás "
+"is kevesebb erőfeszítésbe kerül. Kikapcsolt állapotában azonban gátolja a "
+"felhasználó mozgását."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Uncanny Dodge CBM"
@@ -18245,6 +19456,9 @@ msgid ""
 "Bionic processors that augment the the user's nervous system, allowing them "
 "to dodge attacks beyond normal human capability, including bullets."
 msgstr ""
+"A felhasználó idegrendszerét bionikus processzorokkal augmentálták, ezért "
+"egy átlagemberhez képest ijesztően gyorsan tud elugrani a támadások elől, "
+"még akár golyók elől is."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Unified Power System CBM"
@@ -18259,6 +19473,9 @@ msgid ""
 "Objects that run on a UPS can now directly draw power from the bionic power "
 "supply."
 msgstr ""
+"A felhasználó belső energiatároló rendszerébe egy egységes tápegység került "
+"beépítésre . Az ET energiaforrást használó tárgyak innentől közvetlenül a "
+"belső energiát merítik."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Internal Chronometer CBM"
@@ -18272,6 +19489,7 @@ msgid ""
 "This bionic module contains an atomic clock, complete with silent alarm "
 "clock function."
 msgstr ""
+"Ez a bionikus modul egy ébresztőfunkcióval is ellátott atomórát tartalmaz."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Water Extraction Unit CBM"
@@ -18286,6 +19504,9 @@ msgid ""
 "pump any available fluid out of a dead body, cleanse it of impurities and "
 "convert it into potable water.  Water container not included."
 msgstr ""
+"A felhasználó tenyerébe épített nanocsövek segítségével bármilyen "
+"holttestből lehet szivattyúzni a testnedveket, majd tisztítás után ivóvízzé "
+"alakítani. A víz tárolásához azonban valamiféle edény kell majd."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Intravenous Needletip CBM"
@@ -18300,6 +19521,9 @@ msgid ""
 "hoses instead of a plunger.  Installed, it allows the user to draw "
 "substances directly into their bloodstream akin to a regular syringe."
 msgstr ""
+"Visszahúzható tűvel felszerelt apró cső, amelynek másik végén dugattyú "
+"helyett számos apró tömlő található. Beépítés után különálló injekciós tű "
+"nélkül juttathatók szerek közvetlenül a véráramba."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Titanium Skeletal Bracing CBM"
@@ -18314,6 +19538,9 @@ msgid ""
 "structure.  These artificial enhancers strengthen the knees and elbows, "
 "allowing the user to carry more weight."
 msgstr ""
+"Csontvázra telepített forgópántok, rugók és egyéb szintetikus augmentációk "
+"rendszere. A mesterséges teljesítménynövelők megerősítik a térdeket és a "
+"könyököket, így a felhasználó több súlyt szállíthat."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Kinetic Shock Absorbers CBM"
@@ -18329,12 +19556,16 @@ msgid ""
 "negate damage from severe impacts such as falling, at the cost of reducing "
 "the user's ability to move effectively."
 msgstr ""
+"A felhasználó végtagjait és felsőtestének húsát nagy részben kicseréli ez a "
+"néhány hidraulikus rugó, és összehajtható kipárnázás. Aktív állapotban ezek "
+"a lengéscsillapítók elnyelik a becsapódások, például a zuhanások okozta "
+"sérüléseket, ám csökkentik a mozgás hatékonyságát."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Taste Modifier CBM"
 msgid_plural "Taste Modifier CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ízmódosító KBM"
+msgstr[1] "Ízmódosító KBM"
 
 #. ~ Description for Taste Modifier CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18343,12 +19574,15 @@ msgid ""
 "with a sophisticated analyzer.  While active, it will block all unpleasant "
 "taste and texture at the cost of bionic energy."
 msgstr ""
+"A felhasználó szájába csúcsérzékenységű szenzorokat építettek, amelyek egy "
+"modern elemző segítségével bionikus energia árán blokkolnak minden "
+"kellemetlen ízt és textúrát."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Soporific Induction CBM"
 msgid_plural "Soporific Induction CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Alvásindukciós KBM"
+msgstr[1] "Alvásindukciós KBM"
 
 #. ~ Description for Soporific Induction CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18356,23 +19590,25 @@ msgid ""
 "A microscopic electrode designed to gently stimulate a particular cluster of"
 " neurons in the hypothalamus, helping the user to fall asleep."
 msgstr ""
+"A hipotalamusz adott fürtjeit stimuláló tűrendszer segít a felhasználónak az"
+" elalvásban."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Squeaky Ankles"
 msgid_plural "Squeaky Ankles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nyikorgó boka"
+msgstr[1] "Nyikorgó boka"
 
 #. ~ Description for Squeaky Ankles
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "A pair of defective bionics that make squeaking noises."
-msgstr ""
+msgstr "Nyikorgó hangokat kiadó hibás bionika."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Pieces Of Junk"
 msgid_plural "Pieces of Junk"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hulladékdarab"
+msgstr[1] "Hulladékdarab"
 
 #. ~ Description for Pieces Of Junk
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18380,36 +19616,38 @@ msgid ""
 "A jumble of broken metal pieces that were removed during reconstructive "
 "surgery."
 msgstr ""
+"Egy maréknyi fémhulladék, amely a plasztikai műtét során került "
+"eltávolításra."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Acidic Leaking CBM"
 msgid_plural "Acidic Leaking CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Savszivárgó KBM"
+msgstr[1] "Savszivárgó KBM"
 
 #. ~ Description for Acidic Leaking CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This CBM has been breached in several places and some acid is leaking from "
 "it."
-msgstr ""
+msgstr "Ezt a KBM-et több helyen is felsértették, ezért sav szivárog belőle."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Faulty Electric System"
 msgid_plural "Faulty Electric Systems"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hibás elektromos rendszer"
+msgstr[1] "Hibás elektromos rendszer"
 
 #. ~ Description for Faulty Electric System
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "This CBM is a mess of naked wire and burnt resistors."
-msgstr ""
+msgstr "Ez a KBM csupasz drótok és kiégett ellenállások egyvelege."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Electrical Drain"
 msgid_plural "Electrical Drains"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Elektromos merítés"
+msgstr[1] "Elektromos merítés"
 
 #. ~ Description for Electrical Drain
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18417,12 +19655,14 @@ msgid ""
 "This CBM was wired incorrectly and would drain power from any system "
 "connected to it."
 msgstr ""
+"Ezt a KBM-et hibásan drótozták össze, ezért minden hozzá csatlakoztatott "
+"rendszert lemerít."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Itchy Metal Thing"
 msgid_plural "Itchy Metal Things"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Viszkető fémbigyó"
+msgstr[1] "Viszkető fémbigyó"
 
 #. ~ Description for Itchy Metal Thing
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18430,24 +19670,27 @@ msgid ""
 "You can't recognize what this is supposed to be, but it's a very awkward "
 "thing to have in one's body."
 msgstr ""
+"Nem tudod, hogy ez pontosan micsoda, de rém kellemetlen, amikor a testedben "
+"van."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Glowy Thing"
 msgid_plural "Glowy Things"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Izzó izé"
+msgstr[1] "Izzó izé"
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
 msgstr ""
+"Ez egy olyan... izé... és izzik, legalábbis a múltkor izzott, amikor be volt"
+" kapcsolva."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Leaky Bionic"
 msgid_plural "Leaky Bionics"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Szivárgó bionika"
+msgstr[1] "Szivárgó bionika"
 
 #. ~ Description for Leaky Bionic
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18455,71 +19698,75 @@ msgid ""
 "A mess of pierced pipes and broken seals, something unpleasant is leaking "
 "from it."
 msgstr ""
+"Egy kupacnyi lyukas cső és felszakadt szigetelés, amiből valami csúfság "
+"szivárog."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Noisemaker"
 msgid_plural "Noisemakers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Zajkeltő"
+msgstr[1] "Zajkeltő"
 
 #. ~ Description for Noisemaker
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "A malfunctioning bionic.  When powered, it occasionally emits a loud burst "
 "of noise."
-msgstr ""
+msgstr "Egy hibás bionika. Amikor energiát kap, akkor néha hangos zajt kelt."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Bionic Nostril"
 msgid_plural "Bionic Nostrils"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bionikus orrlyuk"
+msgstr[1] "Bionikus orrlyuk"
 
 #. ~ Description for Bionic Nostril
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This thing was up someone's nose, they're probably glad to be rid of it."
 msgstr ""
+"Ez valakinek az orrában volt. Biztosan örülnek neki, hogy már nincs ott."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Bionic Visual Impairment"
 msgid_plural "Bionic Visual Impairments"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bionikus látáskárosodás"
+msgstr[1] "Bionikus látáskárosodás"
 
 #. ~ Description for Bionic Visual Impairment
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "A defective bionic that impairs vision."
-msgstr ""
+msgstr "Egy hibás bionika, amely károsítja a látást."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Power Overload"
 msgid_plural "Power Overloads"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Energia túlterhelés"
+msgstr[1] "Energia túlterhelés"
 
 #. ~ Description for Power Overload
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "A bunch of defective power circuits that are prone to short-circuiting."
-msgstr ""
+msgstr "Egy csomó hibás áramkör, amelyek hajlamosak a rövidzárlatra."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Bionic Short Circuit"
 msgid_plural "Bionic Short Circuits"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bionikus rövidzárlat"
+msgstr[1] "Bionikus rövidzárlat"
 
 #. ~ Description for Bionic Short Circuit
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "This bionic is poorly wired and occasionally short-circuits."
 msgstr ""
+"Ezt a bionikát rosszul szerelték be, és ezért néha rövidzárlatot okoz."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Endocrine Enervator"
 msgid_plural "Endocrine Enervators"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Endokrin enervátor"
+msgstr[1] "Endokrin enervátor"
 
 #. ~ Description for Endocrine Enervator
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18527,12 +19774,14 @@ msgid ""
 "This malfunctioning bionic causes fatigue by altering the unfortunate user's"
 " brain chemistry."
 msgstr ""
+"Ez a hibás bionika állandó fáradtságot okoz, mert belepiszkál a "
+"szerencsétlen felhasználó agykémiájába."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Motor Control Overstimulator"
 msgid_plural "Motor Control Overstimulators"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Mozgásvezérlő túlstimulátor"
+msgstr[1] "Mozgásvezérlő túlstimulátor"
 
 #. ~ Description for Motor Control Overstimulator
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18540,34 +19789,36 @@ msgid ""
 "The result of poor configuration, this bionic module frequently causes "
 "debilitating muscle spasms."
 msgstr ""
+"Hibás beállítás miatt ez a bionikus modul gyakran letaglózó izomrángásokat "
+"okoz."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Wire-Induced Stiffness"
 msgid_plural "Wire-Induced Stiffnesses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vezeték okozta merevség"
+msgstr[1] "Vezeték okozta merevség"
 
 #. ~ Description for Wire-Induced Stiffness
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "A length of poorly installed wiring that would cause stiffness."
-msgstr ""
+msgstr "Egy hosszú, rosszul beállított kábelezés végtag merevséget okoz."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Self-Locking Thumbs"
 msgid_plural "Self-Locking Thumbs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Önzáró hüvelykujjak"
+msgstr[1] "Önzáró hüvelykujjak"
 
 #. ~ Description for Self-Locking Thumbs
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "A pair of faulty, self-locking thumb bionics."
-msgstr ""
+msgstr "Hibás bionika, amitől egymáshoz záródnak a két kéz hüvelykujjai."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Visual Disruptor"
 msgid_plural "Visual Disruptors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vizuális roncsolás"
+msgstr[1] "Vizuális roncsolás"
 
 #. ~ Description for Visual Disruptor
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18575,12 +19826,13 @@ msgid ""
 "A pair of defective ocular bionics that cause visual distortion and "
 "pixelation."
 msgstr ""
+"Egy hibás bionikus modul miatt néha szétcsúszik és bepixelesedik a látásod."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Voice Remodulator"
 msgid_plural "Voice Remodulators"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hangszín remodulátor"
+msgstr[1] "Hangszín remodulátor"
 
 #. ~ Description for Voice Remodulator
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18588,6 +19840,8 @@ msgid ""
 "Part of the autodoc's 'Cyborg Identity Package', this bionic gives the user "
 "a creepy robot voice."
 msgstr ""
+"Az autodoki úgynevezett Kiborg Egyéniségi Csomagjának része. Ettől a "
+"bionikától a felhasználónak hátborzongató hangja lesz."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Solar Panels CBM"
@@ -18649,6 +19903,9 @@ msgid ""
 "This module upgrades a pre-installed microreactor with enhanced maximum "
 "yield and limited automatic radiation scrubbing capabilities."
 msgstr ""
+"Ez a modul egy már beépített mikroreaktort korszerűsít a reaktor "
+"hatékonyságának növelésével, illetve korlátozott mértékben a sugárfertőzés "
+"automatikus eltávolításával."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Plutonium Filter CBM"
@@ -18662,6 +19919,8 @@ msgid ""
 "A system of tanks and filters that are connected to a microreactor to "
 "extract plutonium from radioactive slurry."
 msgstr ""
+"Ez a tartályokból és szűrőkből álló rendszer a mikroreaktor számára "
+"használható plutóniumot von ki a radioaktív iszapból."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Internal Microreactor CBM"
@@ -18676,6 +19935,10 @@ msgid ""
 "power, but may not be the safest thing to install.  Once active, it cannot "
 "be shut down and will slowly contaminate the user's body with radiation."
 msgstr ""
+"Ez a lecsupaszított minireaktor lenyűgöző mennyiségű bionikus energiát hoz "
+"létre, de beépítése nem igazán biztonságos. Aktiválása után többé nem lehet "
+"leállítani, és működése lassan növekedő sugárterhelést okoz a felhasználó "
+"testében."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Microreactor Upgrade CBM"
@@ -18689,6 +19952,9 @@ msgid ""
 "A kit for upgrading a pre-installed microreactor with enhanced maximum yield"
 " and limited automatic radiation scrubbing capabilities."
 msgstr ""
+"Ez a készlet egy már beépített mikroreaktort korszerűsít a reaktor "
+"hatékonyságának növelésével, illetve korlátozott mértékben a sugárfertőzés "
+"automatikus eltávolításával."
 
 #. ~ Description for Solar Panels CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18703,8 +19969,8 @@ msgstr ""
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Precision Solderers CBM"
 msgid_plural "Precision Solderers CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Precíziós forrasztás KBM"
+msgstr[1] "Precíziós forrasztás KBM"
 
 #. ~ Description for Precision Solderers CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18712,12 +19978,15 @@ msgid ""
 "A set of tiny electronics tools, including soldering irons and wire cutters."
 "  They serve no purpose on their own, but are required for crafting bionics."
 msgstr ""
+"Apró elektronikai szerszámok készlete, többek között forrasztópáka és "
+"drótvágó. Önmagukban nem sok mindenre jók, de bionika gyártásához "
+"elengedhetetlenek."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Deployable Grenade Launcher CBM"
 msgid_plural "Deployable Grenade Launcher CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Beépített gránátvető KBM"
+msgstr[1] "Beépített gránátvető KBM"
 
 #. ~ Description for Deployable Grenade Launcher CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18726,12 +19995,14 @@ msgid ""
 "can serve as a portable, integrated tool for firing 40mm grenades and "
 "canisters."
 msgstr ""
+"A jobb karodhoz egy kisméretű, behajtható vetőcső került beépítésre. Az "
+"implantálás után 40mm-es gránátok kilövésére használható."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Linguistic Coprocessor CBM"
 msgid_plural "Linguistic Coprocessor CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nyelvészeti ko-processzor KBM"
+msgstr[1] "Nyelvészeti ko-processzor KBM"
 
 #. ~ Description for Linguistic Coprocessor CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18740,12 +20011,15 @@ msgid ""
 " the speed that it processes language.  When installed, it provides a "
 "passive boost to reading speed."
 msgstr ""
+"Az agyad bal féltekéjébe telepített mikroszámítógép növeli a "
+"nyelvfeldolgozási sebességet. Beépítése után passzív módon növeli az "
+"olvasási sebességet."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Dopamine Stimulators CBM"
 msgid_plural "Dopamine Stimulators CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dopamin stimulátor KBM"
+msgstr[1] "Dopamin stimulátor KBM"
 
 #. ~ Description for Dopamine Stimulators CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18755,6 +20029,10 @@ msgid ""
 "of dopamine and other reward chemicals, inducing a state of euphoria and "
 "suppressing fear."
 msgstr ""
+"Apró méretű idegserkentő stimulátorok kerültek az agyad jutalomközpontjába. "
+"Bionikus energiával ellátva ezek időközönként dopamin és egyéb "
+"boldogsághormon kibocsátást okoznak, amelytől jó kedved lesz és nem fogsz "
+"félni."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Ionic Overload Generator CBM"
@@ -18780,8 +20058,8 @@ msgstr ""
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Blood Power Generator CBM"
 msgid_plural "Blood Power Generator CBMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vér energia generátor KBM"
+msgstr[1] "Vér energia generátor KBM"
 
 #. ~ Description for Blood Power Generator CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -19059,7 +20337,7 @@ msgstr[1] "Egy barátomat várom vacsorára"
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
+msgid "It's… it's a cookbook!"
 msgstr "De... ez egy szakácskönyv!"
 
 #: lang/json/BOOK_from_json.py
@@ -19169,11 +20447,11 @@ msgstr[1] "PE050 Alpha: Előzetes jelentés"
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
+"\"APPROVED\"…"
 msgstr ""
 "Ezt a maréknyi dokumentumot két héttel azelőtt írták, hogy minden "
 "megváltozott. Valami újféle vegyi anyagról és az azzal végzett "
-"emberkísérletekről szól. A rábélyegzett felirat szerint: JÓVÁHAGYVA."
+"emberkísérletekről szól. A rábélyegzett felirat szerint: JÓVÁHAGYVA..."
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Dionne"
@@ -19202,9 +20480,12 @@ msgstr[1] "PE065 Chimera: Ajánlott eljárások"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
 msgstr ""
+"Ezt a maréknyi dokumentumot az evakuálásod előtti napon írták. Valami újféle"
+" vegyi anyagról szól és... tömegoszlatási instrukciókat tartalmaz? Itt "
+"valami nem stimmel."
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Smythe"
@@ -19217,11 +20498,11 @@ msgstr[1] "labornapló - Smythe"
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
+"look promising but the procurement methods seem awfully vague…"
 msgstr ""
 "Ez a csoportnapló számos mutagén kísérletről számol be, amelyek főleg az "
 "XE037-tel fertőzött hússal foglalkoznak. Az eredmények ígéretesnek tűnnek, "
-"de a beszerzési eljárás rettenetesen elmismásoltnak látszik."
+"de az alapanyag beszerzési eljárása rettenetesen elmismásoltnak látszik."
 
 #: lang/json/BOOK_from_json.py
 msgid "standpipe maintenance log"
@@ -19234,7 +20515,7 @@ msgstr[1] "szívócső karbantartási napló"
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
+"with… a chemical formula?"
 msgstr ""
 "Ebben a gyűrűs mappában a létesítmény számos vízvezeték-rendszerére "
 "vonatkozó karbantartási ütemterv szerepel. Az ütemterv munkalapok egy részén"
@@ -19288,11 +20569,11 @@ msgstr[1] "PE023 egészségügyi alkalmazása és eredményei"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
 msgstr ""
 "Ez a gyűrűs mappa számos szakmai dokumentumot tartalmaz valami újféle vegyi "
 "anyagról és az azzal végzett emberkísérletekről. A rábélyegzett felirat "
-"szerint: JÓVÁHAGYVA."
+"szerint: JÓVÁHAGYVA..."
 
 #: lang/json/BOOK_from_json.py
 msgid "PE070 \"Raptor\": Proposal"
@@ -19307,6 +20588,9 @@ msgid ""
 "\"PE065\".  Scribbled notes throughout seem to think that it might work, but"
 " that there's no time."
 msgstr ""
+"Ez a maréknyi dokumentum egy rendkívül spekulatív javaslat a PE065 "
+"fókuszálására. A jegyzetek szélére olyasmit írtak, hogy talán ez most "
+"sikerülni fog, de nincs elég idő."
 
 #: lang/json/BOOK_from_json.py
 msgid "Best Practices for Compound Delivery"
@@ -19612,7 +20896,7 @@ msgstr[1] "labornapló - Herrera"
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
+"symbols you've not seen before…"
 msgstr ""
 "Ez a vaskos gyűrűs mappa többféle elektronikus berendezés kapcsolási rajzát "
 "és műszaki adatait tartalmazza. Néhány kapcsolási rajz korábban sosem látott"
@@ -19693,13 +20977,13 @@ msgstr[1] ""
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -20055,8 +21339,8 @@ msgstr[1] "Lőszer töltés otthon"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
 msgstr ""
 "Minden, amit valaha is tudni szerettél volna a lőszerek otthoni "
 "újratöltéséről, mindez egy gyerekbiztos borítóval ellátott könyvben. "
@@ -20621,8 +21905,8 @@ msgstr "Mindenféle témával foglalkozó, haladó szintű gépészeti kézikön
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Curie"
 msgid_plural "lab journals-Curie"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "labornapló - Curie"
+msgstr[1] "labornapló - Curie"
 
 #. ~ Description for lab journal-Curie
 #: lang/json/BOOK_from_json.py
@@ -20630,8 +21914,12 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr ""
+"Ez a laborban használt jegyzetfüzet tele van a nukleáris energia "
+"hasznosításával foglalkozó csapat felfedezéseivel és jegyzeteivel. Nem "
+"gondolod, hogy a második kataklizmát te szeretnéd kirobbantani, ugyanakkor "
+"vannak hasznos részei is..."
 
 #: lang/json/BOOK_from_json.py
 msgid "Biodiesel: Renewable Fuel Resource"
@@ -22052,6 +23340,34 @@ msgid ""
 " that the author's real name is Fereidoun M. Esfandiary."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
 msgid_plural "phone books"
@@ -22134,7 +23450,7 @@ msgstr[1] "vállalati számviteli adatok"
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
+msgid "If you knew what to look for something might stand out…"
 msgstr "Ha esetleg tudnád, mit keress, az jobban szembetűnne."
 
 #: lang/json/BOOK_from_json.py
@@ -22386,6 +23702,106 @@ msgstr ""
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -23425,11 +24841,12 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -23440,28 +24857,61 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
 "along with emulating their healing factor."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -23850,8 +25300,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid "dimethyl sulfoxide"
 msgid_plural "dimethyl sulfoxide"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "dimetil-szulfoxid"
+msgstr[1] "dimetil-szulfoxid"
 
 #. ~ Description for dimethyl sulfoxide
 #: lang/json/COMESTIBLE_from_json.py
@@ -23861,6 +25311,10 @@ msgid ""
 "that it absorbs very quickly through the skin, causing a garlic flavor in "
 "the mouth even if it touched your arm."
 msgstr ""
+"A dimetil-szulfoxid, rövidítve DMSO, egy gyakran használt és fontos szerepet"
+" betöltő apriotikus oldószer, amely rengeteg dolog feloldására képes. Azzal "
+"a furcsa tulajdonsággal rendelkezik, hogy a bőrön keresztül gyorsan "
+"felszívódik, és ettől foghagymás szájízt okoz."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chloroform"
@@ -23954,7 +25408,7 @@ msgstr ""
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr ""
 
@@ -24962,6 +26416,41 @@ msgstr "nagy emberi gyomor"
 msgid "The stomach of a large humanoid creature.  It is surprisingly durable."
 msgstr "Egy nagy darab ember gyomra. Meglepően tartós."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr ""
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr ""
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -25007,6 +26496,61 @@ msgid ""
 "pinch."
 msgstr "Egy apró darab ehető húscafat. Nem sok, de jobb híján megteszi."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr ""
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr ""
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -25045,6 +26589,24 @@ msgid_plural "cooked scraps of meat"
 msgstr[0] "sült húscafat"
 msgstr[1] "sült húscafat"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr ""
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "nyers belsőség"
@@ -25274,8 +26836,8 @@ msgstr[1] "nyers agy"
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
-msgstr "Egy állat agya. Nyersen talán nem kellene megenni..."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cooked brains"
@@ -25333,8 +26895,8 @@ msgstr "főtt borjúmirigy"
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
-msgstr "Általában ínyencség, de ebből valami hiányzik."
+msgid "Normally a delicacy, it needs a little… something."
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bone"
@@ -25392,6 +26954,78 @@ msgstr ""
 "Sima, fehér, tiszta és olvasztott állati zsírtömb. Sokáig ehető marad, és "
 "számos ételek, használati tárgy elkészítéséhez lehet még felhasználni."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr ""
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr ""
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr ""
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr ""
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
 msgid_plural "chunks of tainted meat"
@@ -25585,13 +27219,8 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
-"Vaskos hústömeg, ami első ránézésre egy emlős szívére emlékeztet, viszont "
-"felülete rücskös, és emberfej méretű. Még mindig tele van azzal, ami a "
-"gruffacsórokban vérnek számít, és nehéz a kezedben. Azok után, amiket "
-"mostanában láttál, eszedbe jut a régi mondás az ellenfeleid szívének "
-"elfogyasztásáról..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "desiccated putrid heart"
@@ -25608,7 +27237,7 @@ msgstr ""
 "és amiből kifolyatták a vért. Meg lehet enni, ha nagyon éhes lennél, de "
 "undorító."
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] ""
@@ -25930,7 +27559,7 @@ msgstr[1] ""
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
 msgstr ""
 
@@ -26878,11 +28507,12 @@ msgstr "Vízben tartósított ananász gyűrűk. Nagyon ízletes."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
-msgstr[0] "limonádépor"
-msgstr[1] "limonádépor"
+msgid_plural "lemonade drink mix"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -27714,8 +29344,8 @@ msgstr[1] "mogyoróvajas cukorka"
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
-msgstr "Egy maréknyi mogyoróvajas cukorka... a kedvenced!"
+msgid "A handful of peanut butter cups… your favorite!"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate candy"
@@ -27839,10 +29469,8 @@ msgstr "Finom csokitorta, rengeteg porcukorral. Rengeteggel."
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr ""
-"A valaha látott legvastagabb bevonattal ellátott tortára valaki idézőjelben "
-"trágárságokat írt."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate-covered coffee bean"
@@ -27887,8 +29515,8 @@ msgstr[1] "borsmenta pogácsa"
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
-msgstr "Egy maréknyi csokibevonatú borsmenta pogácsa... Fincsi!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Necco wafers"
@@ -28552,6 +30180,17 @@ msgstr ""
 "és nem túl ízletes. Ugyanakkor a SPAM jól laktat. Abszolút nem "
 "étvágygerjesztő, de jól lehet vele lakni."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr ""
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "szardíniakonzerv"
@@ -30358,8 +31997,8 @@ msgstr[1] ""
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -30423,12 +32062,8 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
-"Köröm méretű, almavörös gélkapszula, amelyben sűrű, olajos, lilából feketébe"
-" váltó folyadék található, benne apró szürke pontokkal. Tekintettel a "
-"helyre, ahonnan szerezted, ez vagy nagyon erős, vagy nagyon kísérleti. Már "
-"attól is elmúlik egy kicsit a fájdalmad, hogy a kezedben tartod..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattail jelly"
@@ -30873,11 +32508,9 @@ msgstr "absztrakt intravénás mutagén íz"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
 msgstr ""
-"Szuperkoncentrált mutagén. Befecskendezéséhez injekciós tű kell... ha "
-"biztosan szeretnéd."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagenic serum"
@@ -30891,10 +32524,8 @@ msgstr "alfa szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
+"to inject it… if you really want to?"
 msgstr ""
-"Vérhez hasonlító szuperkoncentrált mutagén. Befecskendezéséhez injekciós tű "
-"kell... ha biztosan szeretnéd."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "beast serum"
@@ -30904,7 +32535,7 @@ msgstr "vadállat szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -30915,10 +32546,8 @@ msgstr "madár szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
+"need a syringe to inject it… if you really want to?"
 msgstr ""
-"A kataklizma előtti ég színéhez hasonlító szuperkoncentrált mutagén. "
-"Befecskendezéséhez injekciós tű kell... ha biztosan szeretnéd."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattle serum"
@@ -30928,10 +32557,8 @@ msgstr "szarvasmarha szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
+"inject it… if you really want to?"
 msgstr ""
-"Fűszínű szuperkoncentrált mutagén. Befecskendezéséhez injekciós tű kell... "
-"ha biztosan szeretnéd."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cephalopod serum"
@@ -30941,7 +32568,7 @@ msgstr "lábasfejű szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
+"it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -30952,7 +32579,7 @@ msgstr "kiméra szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -30963,7 +32590,7 @@ msgstr "elf-a szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -30974,7 +32601,7 @@ msgstr "macskaféle szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -30985,10 +32612,8 @@ msgstr "hal szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
+"top.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Az óceán színéhez hasonlító szuperkoncentrált mutagén, tetején fehéren "
-"habzik.  Befecskendezéséhez injekciós tű kell... ha biztosan szeretnéd."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "insect serum"
@@ -30998,7 +32623,7 @@ msgstr "rovar szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31009,7 +32634,7 @@ msgstr "gyík szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31020,7 +32645,7 @@ msgstr "farkasféle szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
+" inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31031,7 +32656,7 @@ msgstr "orvosi szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31042,7 +32667,7 @@ msgstr "növény szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31053,7 +32678,7 @@ msgstr "raptor szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
+"at it.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31064,7 +32689,7 @@ msgstr "patkány szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31075,7 +32700,7 @@ msgstr "nyálka szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31086,7 +32711,7 @@ msgstr "pók szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31097,7 +32722,7 @@ msgstr "troglobita szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31108,7 +32733,7 @@ msgstr "medveféle szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
+"thick.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31119,7 +32744,7 @@ msgstr "egér szérum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31134,10 +32759,8 @@ msgstr "alvadt vér"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
+"bubble with an intelligence of its own…"
 msgstr ""
-"Sűrű, leveses vörös folyadék. Már az is undorító, ahogy kinéz, meg a szaga "
-"is, és mintha saját intelligenciájával bugyborogna..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "alpha mutagen"
@@ -31333,23 +32956,23 @@ msgstr ""
 "biztonságosabb meginni, mint korábban."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
+msgid "pine nuts"
+msgid_plural "pine nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
+msgid "junipers"
+msgid_plural "junipers"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -31357,68 +32980,82 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
 msgstr "Egy maroknyi héj nélküli dió a pisztáciafáról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
-msgstr[0] "maréknyi pörkölt pisztácia"
-msgstr[1] "maréknyi pörkölt pisztácia"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr "Egy maroknyi megpörkölt dió a pisztáciafáról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
 msgstr "Egy maroknyi héj nélküli dió a manfulafáról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
-msgstr[0] "maréknyi pörkölt mandula"
-msgstr[1] "maréknyi pörkölt mandula"
+msgid "almond pulp"
+msgid_plural "almond pulp"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted almonds
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
 msgstr "Egy maroknyi megpörkölt dió a mandulafáról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
+msgid "cashews"
+msgid_plural "cashews"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr "Egy maréknyi sós kesudió."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -31428,45 +33065,45 @@ msgstr ""
 "eltávolították."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
-msgstr[0] "maréknyi pörkölt pekándió"
-msgstr[1] "maréknyi pörkölt pekándió"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr "Egy maroknyi megpörkölt dió a pekándiófáról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
-msgstr[0] "maréknyi hántolt földimogyoró"
-msgstr[1] "maréknyi hántolt földimogyoró"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr "Héjatlan, sós földimogyoró."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
+msgid "beech nuts"
+msgid_plural "beech nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
-msgstr[0] "maréknyi hántolt dió"
-msgstr[1] "maréknyi hántolt dió"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -31474,23 +33111,24 @@ msgid ""
 msgstr "Egy maroknyi héj nélküli nyers dió a diófáról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
-msgstr[0] "maréknyi pörkölt dió"
-msgstr[1] "maréknyi pörkölt dió"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr "Egy maroknyi megpörkölt dió a diófáról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
-msgstr[0] "maréknyi hántolt gesztenye"
-msgstr[1] "maréknyi hántolt gesztenye"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -31498,23 +33136,25 @@ msgid ""
 msgstr "Egy maroknyi héj nélküli nyers gesztenye a gesztenyefáról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
-msgstr[0] "maréknyi pörkölt gesztenye"
-msgstr[1] "maréknyi pörkölt gesztenye"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr "Egy maroknyi megpörkölt gesztenye a gesztenyefáról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -31522,45 +33162,47 @@ msgid ""
 msgstr "Egy maroknyi héj nélküli nyers mogyoró a mogyoróbokorról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
-msgstr[0] "maréknyi pörkölt mogyoró"
-msgstr[1] "maréknyi pörkölt mogyoró"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr "Egy maroknyi megpörkölt mogyoró a mogyoróbokorról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
-msgstr[0] "maroknyi meghámozott hikori dió"
-msgstr[1] "maroknyi meghámozott hikori dió"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -31568,12 +33210,13 @@ msgid ""
 msgstr "Egy maroknyi héj nélküli nyers kemény dió a hikorifáról."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
-msgstr[0] "maroknyi megpörkölt hikori dió"
-msgstr[1] "maroknyi megpörkölt hikori dió"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr "Egy maroknyi megpörkölt dió a hikorifáról."
@@ -31588,12 +33231,12 @@ msgid "Delicious hickory nut ambrosia.  A drink worthy of the gods."
 msgstr "Finom hikoridió ambrózia. Az istenek méltó itala."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
-msgstr[0] "maroknyi makk"
-msgstr[1] "maroknyi makk"
+msgid "acorns"
+msgid_plural "acorns"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
@@ -31602,12 +33245,12 @@ msgstr ""
 "Héjában található makk. A mókusok szeretik, de így hámozatlanul te nem."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
-msgstr[0] "maréknyi pörkölt makk"
-msgstr[1] "maréknyi pörkölt makk"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr "Egy maroknyi megpörkölt makk a tölgyfáról."
@@ -31906,8 +33549,8 @@ msgstr "Egy darab papír, tüzet lehet vele gyújtani."
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned beans"
 msgid_plural "beans"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "konzervbab"
+msgstr[1] "bab"
 
 #. ~ Description for canned beans
 #: lang/json/COMESTIBLE_from_json.py
@@ -32161,8 +33804,8 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid "underbrush"
 msgid_plural "underbrushes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "aljnövényzet"
+msgstr[1] "aljnövényzet"
 
 #. ~ Description for underbrush
 #: lang/json/COMESTIBLE_from_json.py
@@ -32197,11 +33840,12 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
-msgstr[0] "zöld szója por"
-msgstr[1] "zöld szója por"
+msgid_plural "soylent green powder"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -32251,11 +33895,11 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
-msgstr[0] "protein por"
-msgstr[1] "protein por"
+msgid_plural "protein powder"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -32331,34 +33975,34 @@ msgid "Very sour citrus.  Can be eaten if you really want."
 msgstr "Nagyon savanyú citrusféle. Ha annyira szeretnéd, megeheted."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
-msgstr[0] "maroknyi áfonya"
-msgstr[1] "maroknyi áfonya"
+msgid "blueberries"
+msgid_plural "blueberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr "Kicsit fanyar, de legalább a miénk."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
-msgstr[0] "maroknyi eper"
-msgstr[1] "maroknyi eper"
+msgid "strawberries"
+msgid_plural "strawberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr "Ízes és zamatos bogyó, gyakran nő a vadonban is."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
-msgstr[0] "maroknyi cranberry"
-msgstr[1] "maroknyi cranberry"
+msgid "cranberries"
+msgid_plural "cranberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr ""
@@ -32366,34 +34010,34 @@ msgstr ""
 "egészséges."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
-msgstr[0] "maroknyi málna"
-msgstr[1] "maroknyi málna"
+msgid "raspberries"
+msgid_plural "raspberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "Édes piros bogyó."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
-msgstr[0] "maroknyi huckleberry"
-msgstr[1] "maroknyi huckleberry"
+msgid "huckleberries"
+msgid_plural "huckleberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr "A huckleberry-t gyakran keverik össze a kék áfonyával."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
-msgstr[0] "maroknyi faeper"
-msgstr[1] "maroknyi faeper"
+msgid "mulberries"
+msgid_plural "mulberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -32403,24 +34047,24 @@ msgstr ""
 "összes faepre közül ennek a legerősebb az íze."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
-msgstr[0] "maroknyi bodza"
-msgstr[1] "maroknyi bodza"
+msgid "elderberries"
+msgid_plural "elderberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr ""
 "Az amerikai bodza gyümölcse nyersen mérgező, de főzés után nagyon finom."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
-msgstr[0] "maroknyi csipkebogyó"
-msgstr[1] "maroknyi csipkebogyó"
+msgid "rose hips"
+msgid_plural "rose hips"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "A beporzott rózsavirág gyümölcse."
@@ -32457,12 +34101,12 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "Citrusféle, íze a savanykástól a félédesig terjed."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
-msgstr[0] "maroknyi cseresznye"
-msgstr[1] "maroknyi cseresznye"
+msgid "cherries"
+msgid_plural "cherries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr "Vörös és édes gyümölcs, fán terem."
@@ -32479,12 +34123,12 @@ msgstr ""
 "Egy maréknyi nagy szemű lila szilva. Egészséges és jót tesz az emésztésnek."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
-msgstr[0] "maroknyi szőlő"
-msgstr[1] "maroknyi szőlő"
+msgid "grapes"
+msgid_plural "grapes"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr "Egy fürt lédús szőlő."
@@ -32537,12 +34181,12 @@ msgid "A large and very sweet fruit."
 msgstr "Nagyméretű és nagyon édes gyümölcs."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
-msgstr[0] "maroknyi szeder"
-msgstr[1] "maroknyi szeder"
+msgid "blackberries"
+msgid_plural "blackberries"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "A málna sötétebb tesója."
@@ -32585,16 +34229,27 @@ msgid ""
 msgstr "Nagy, barna bőrű és szőrös bogyó. A finom belseje zöld színű."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
-msgstr[0] "maroknyi sárgabarack"
-msgstr[1] "maroknyi sárgabarack"
+msgid "apricots"
+msgid_plural "apricots"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "Sima héjú gyümölcs, az őszibarack rokona."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr ""
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr ""
@@ -32782,11 +34437,11 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -32796,11 +34451,11 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
+msgid_plural "chicory"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -32918,12 +34573,12 @@ msgstr ""
 "Emberi fej méretű, nagy zöldség. Nyersen nem túl finom, de sütve már igen."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
-msgstr[0] "marék pitypang"
-msgstr[1] "marék pitypang"
+msgid "dandelions"
+msgid_plural "dandelions"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -33062,12 +34717,12 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -34990,8 +36645,8 @@ msgstr[1] ""
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35003,7 +36658,7 @@ msgstr[1] ""
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
 msgstr ""
 
@@ -35472,7 +37127,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35485,7 +37140,7 @@ msgstr[1] ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35582,8 +37237,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35594,8 +37249,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35606,8 +37262,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35618,8 +37274,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35630,9 +37286,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35667,7 +37323,7 @@ msgstr[1] ""
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35684,6 +37340,16 @@ msgid ""
 " properties."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr ""
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
 msgstr "gyantás zsinór"
@@ -36408,15 +38074,6 @@ msgstr[1] "rizsliszt"
 msgid "This rice flour is useful for baking."
 msgstr "Ez a rizsliszt hasznos sütés-főzéshez."
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr ""
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr ""
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr "újraélesztő szérum"
@@ -36726,8 +38383,8 @@ msgstr[1] ""
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -36739,8 +38396,8 @@ msgstr[1] ""
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -37305,8 +38962,8 @@ msgstr[1] ""
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -37902,8 +39559,8 @@ msgstr[1] ""
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -37915,7 +39572,7 @@ msgstr[1] ""
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr ""
 
@@ -37931,89 +39588,89 @@ msgid "A root from a hickory tree.  It has an earthy smell."
 msgstr "Egy hikorifa gyökere. Földes illata van."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr "Egy maroknyi nyers kemény dió a hikorifáról, héjastul."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
+msgid "pecans"
+msgid_plural "pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr "Egy maroknyi nyers kemény dió a pekándiófáról, héjastul."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
+msgid "pistachios"
+msgid_plural "pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr "Egy maroknyi nyers kemény dió a pisztáciafáról, héjastul."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
+msgid "almonds"
+msgid_plural "almonds"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
 msgstr "Egy maroknyi nyers kemény dió a mandulafáról, héjastul."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
+msgid "peanuts"
+msgid_plural "peanuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr "Egy maroknyi nyers kemény dió a földimogyoró-bokorról, héjastul."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr "Egy maroknyi nyers kemény dió a mogyoróbokorról, héjastul."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
+msgid "chestnuts"
+msgid_plural "chestnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr "Egy maroknyi nyers kemény dió a gesztenyefáról, héjastul."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
+msgid "walnuts"
+msgid_plural "walnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr "Egy maroknyi nyers kemény dió a diófáról, héjastul."
@@ -38155,7 +39812,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr ""
 
@@ -38179,7 +39836,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr ""
 
@@ -38285,6 +39942,12 @@ msgstr "izom"
 msgid "wind"
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "dohányzó eszköz és nyílt láng"
@@ -38339,7 +40002,7 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -38485,8 +40148,8 @@ msgstr[1] ""
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -38808,6 +40471,18 @@ msgstr ""
 "Egy darab betonvas. Jó közelharc fegyvernek, továbbá tartósabb falak és "
 "egyéb megerősített építmények építéséhez."
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -38950,10 +40625,8 @@ msgstr[1] "televízió"
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
+msgid "A large LCD television, full of delicious electronics."
 msgstr ""
-"Nagyméretű katódsugárcsöves televízó készülék, telis-tele finomnál finomabb "
-"elektronikával."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -39414,6 +41087,19 @@ msgstr ""
 "Többféle rádiójel vételére tervezett áramkör. Távközlési eszközök kézműves "
 "gyártásánál lehet hasznos."
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -39860,10 +41546,8 @@ msgstr[1] "Tudományos SD memóriakártya"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
+"encrypted.  Looks *Interesting*, though…"
 msgstr ""
-"Ez a memóriakártya valami módon a XEDRA projekthez kapcsolódik. Érdekes, "
-"érdekes..."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hand mirror"
@@ -39943,12 +41627,13 @@ msgstr ""
 "nem ettek meg a vadállatok."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -40239,10 +41924,10 @@ msgstr "Sok darab 20 dolláros kötege, most már eléggé haszontalan dolog."
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -40296,10 +41981,8 @@ msgstr[1] "cigarettacsikk"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr ""
-"Ami egykoron egy csodálatosan addiktív dohányleveles papírcső vala, az most már csak szemét. De kár!\n"
-"A csikkekben maradt dohányból talán lehet még egy cigit sodorni. Ha már annyira muszáj..."
 
 #. ~ Use action msg for joint.
 #: lang/json/GENERIC_from_json.py
@@ -40349,11 +42032,11 @@ msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
-msgstr[0] "maréknyi nyers dohány"
-msgstr[1] "maréknyi nyers dohány"
+msgid_plural "raw tobacco"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -40410,12 +42093,6 @@ msgid ""
 "panel, if you can find one."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] "neoprén lap"
-msgstr[1] "neoprén lap"
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -40914,15 +42591,6 @@ msgstr ""
 "Egykezes balta. Nagyon jó közelharc fegyver, továbbá mindenfélét ki lehet "
 "vele vágni vagy bekalapálni."
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr ""
-"Baseball labda méretű kő. Közelharcra nem rossz, és az ellenségeket is meg "
-"lehet vele dobni. Nem dobnak vissza kenyérrel."
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -41523,11 +43191,8 @@ msgstr[1] "laprugó"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
+" an awful lot like a bow.  You can barely bend it…"
 msgstr ""
-"Nagyméretű, nagy teherbírású laprugó, valószínűleg gépkocsiból vagy "
-"teherautóból származik. Annyira hajlott, mint egy íj. Alig tudod "
-"elgörbíteni."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hydrangea"
@@ -42191,7 +43856,7 @@ msgstr[1] "atomkávégép"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
@@ -42206,7 +43871,9 @@ msgstr[1] "atomlámpa"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "Fedél lezárása"
 
@@ -42234,7 +43901,9 @@ msgstr[1] "atomlámpa (fedett)"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "Fedél kinyitása"
 
@@ -42534,8 +44203,8 @@ msgstr[1] "köteles horog"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -43419,9 +45088,7 @@ msgstr[1] ""
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
+msgid "A complete guide to Wing Chun Kung-fu."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
@@ -43435,8 +45102,8 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -44608,6 +46275,20 @@ msgstr[1] ""
 msgid "This is a slip of paper signed by the issuer."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -44952,9 +46633,9 @@ msgstr[1] "villa"
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
-msgstr "Villa. Ha valamibe beleszúrod, azt azonnal meg kell enni."
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "plastic fork"
@@ -46199,7 +47880,7 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
 
@@ -46674,8 +48355,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
 msgstr ""
 
 #. ~ Description for estoc
@@ -46784,21 +48465,18 @@ msgstr ""
 "éles."
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
-msgstr[0] "vívó tőr"
-msgstr[1] "vívó tőr"
+msgid "fencing épée"
+msgid_plural "fencing épées"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
 msgstr ""
-"A sportok legnemesebbikénél, a vívásnál használt egyik fegyver. A három vívó"
-" fegyver közül a tőr a legnehezebb és a legmerevebb, ezért talán a te "
-"szempontodból a leghasznosabb is."
 
 #: lang/json/GENERIC_from_json.py
 msgid "fencing saber"
@@ -46810,11 +48488,53 @@ msgstr[1] "vívó kard"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
+"is marginally shorter than the foil and épée, but no less effective."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
 msgstr ""
-"A sportok legnemesebbikénél, a vívásnál használt egyik fegyver. A vívó kard "
-"valamennyivel rövidebb a tőrnél és a párbajtőrnél, de egyáltalán nem kevésbé"
-" hatásos."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
@@ -47112,11 +48832,8 @@ msgstr[1] "alumínium öntvény"
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
+"down to a powder, for more… high-profile applications."
 msgstr ""
-"Egy kis darab alumínium öntvény, további feldolgozásra sztenderd méretű. "
-"Könnyű de tartós, különféle dolgok építéséhez nagyobb formába önthető, "
-"illetve porrá is őrölhető robbanékony alkalmazásra."
 
 #: lang/json/GENERIC_from_json.py
 msgid "scrap copper"
@@ -47460,6 +49177,46 @@ msgid ""
 " can also serve as an improvised stabbing weapon, but will break quickly."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -49048,7 +50805,7 @@ msgstr[1] ""
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -49060,8 +50817,8 @@ msgstr[1] ""
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -50246,6 +52003,27 @@ msgid ""
 "art."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr ""
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -50750,6 +52528,138 @@ msgid_plural "dao +2s"
 msgstr[0] ""
 msgstr[1] ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
@@ -51027,6 +52937,21 @@ msgid ""
 "to land astoundingly powerful blows."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -51109,6 +53034,19 @@ msgid ""
 "prized for their beauty and power."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -51135,100 +53073,6 @@ msgid ""
 "scales could make a suit of armor as hard as steel and half as heavy."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr ""
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -51303,6 +53147,56 @@ msgstr[1] ""
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr ""
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] "Gungnir"
+msgstr[1] "Gungnir"
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] "Laevateinn"
+msgstr[1] "Laevateinn"
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -51548,8 +53442,8 @@ msgstr[1] ""
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -51563,7 +53457,7 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -52329,8 +54223,34 @@ msgstr[1] ""
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -52348,6 +54268,17 @@ msgid ""
 "rock and lava everywhere."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
@@ -53289,12 +55220,6 @@ msgstr ""
 "Thor kalapácsának, Mjölnirnek a másolata. Állítólag egész hegyeket képes egy"
 " csapásra kilapítani. Arannyal és ezüsttel díszített."
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] "Gungnir"
-msgstr[1] "Gungnir"
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -54352,6 +56277,11 @@ msgstr "VEGYI ANYAGOK"
 msgid "SPARE PARTS"
 msgstr "ALKATRÉSZEK"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "TÁROLÁS"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "MŰTÁRGYAK"
@@ -54362,6 +56292,307 @@ msgstr "MŰTÁRGYAK"
 msgid "ARMOR"
 msgstr "PÁNCÉL"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "VISELT TÁRGYAK"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "FEGYVER A KÉZBEN"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr "Zsákmány: Válogatás nélkül"
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr ""
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr ""
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr ""
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr ""
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr ""
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr ""
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr ""
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr ""
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr ""
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr ""
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr ""
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr ""
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr ""
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr ""
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr ""
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr ""
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr ""
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr ""
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr ""
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr ""
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr ""
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr ""
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr ""
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr ""
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr ""
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr ""
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr ""
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr ""
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr ""
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr ""
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -54583,7 +56814,7 @@ msgstr[1] ""
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
 msgstr ""
 
@@ -54973,8 +57204,8 @@ msgstr "H&K G3 dobtár"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
-msgstr "A H&K G3 számára készített dobtárban 50 lövedék fér el."
+msgid "A 50-round drum magazine for the H&K G3 rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "H&K G3 magazine"
@@ -55019,8 +57250,8 @@ msgstr "FN SCAR-H dobtár"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
-msgstr "Az FN SCAR-H számára készített dobtárban 50 lövedék fér el."
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "FN SCAR-H magazine"
@@ -55120,15 +57351,6 @@ msgstr ""
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr ""
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "Taurus .38 tár"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr "A Taurus Pro .38 pisztoly számára készült kompakt acél doboztár."
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr ""
@@ -55202,6 +57424,16 @@ msgstr ""
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr ""
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr ""
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr ""
@@ -58234,10 +60466,8 @@ msgstr[1] "mininukis hack"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
+"appears to have a mininuke inside.  If this is targeting you…  Run."
 msgstr ""
-"A hagyományos manhack méretének többszöröse, ebben a repülő kvadkopter "
-"drónban egy mininuki található. Ha ez célbavett, akkor futás... De gyorsan."
 
 #: lang/json/MONSTER_from_json.py
 msgid "tiny fish"
@@ -58806,11 +61036,8 @@ msgstr[1] "homár"
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
+"off in popularity… and price."
 msgstr ""
-"Ezeket egykoron ehetetlen kártevőknek tartották, utána pedig egy marketing "
-"zseni elkezdte ínyenceknek értékesíteni, és onnan kezdve a népszerűségük, és"
-" az áruk is, az egekbe szökött."
 
 #: lang/json/MONSTER_from_json.py
 msgid "crayfish"
@@ -58822,10 +61049,8 @@ msgstr[1] "amerikai folyami rák"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
+"water, and some spicy seasonings…"
 msgstr ""
-"Ha ebből többet össze tudnál fogni, lenne egy lábos forró vized és néhány "
-"csípős fűszered..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "Blinky"
@@ -60261,10 +62486,8 @@ msgstr[1] "csatornapatkány"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
+"makes it sound… hungry."
 msgstr ""
-"Csupasz farkú rágcsáló hosszú szálú bajusszal és kidülledő szemekkel. "
-"Cincogásának olyan... éhes hangja van."
 
 #: lang/json/MONSTER_from_json.py
 msgid "lamb"
@@ -60809,11 +63032,22 @@ msgstr[1] "hatalmas boomer"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
 msgstr ""
-"Ez az egyébként éppen szétszakadó boomer megerősödött és megszilárdult. A "
-"szájából csöpögő iszap is megváltozott..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
@@ -60865,7 +63099,7 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -61750,15 +63984,11 @@ msgstr[1] "Shia LaBeouf"
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
-"actual cannibal Shia LaBeouf."
 
 #: lang/json/MONSTER_from_json.py
 msgid "shoggoth"
@@ -62047,12 +64277,10 @@ msgstr[1] "szánalmas okádó"
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr ""
-"A degenerált holttest csoszogva sétál. Testébe mindenféle szemét és hulladék"
-" épült be, sebeiből fekete ragacs szivárog."
 
 #: lang/json/MONSTER_from_json.py
 msgid "acidic zombie"
@@ -62235,19 +64463,13 @@ msgstr[1] "zombi táncos"
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
 msgstr ""
-"Bűzfelhők szállnak a szélben\n"
-"Negyvenezer év borzalma ez\n"
-"Minden sírból őszhajú vámpír száll ki\n"
-"Bekerítenek, megpecsételik végzeted\"\n"
-"\n"
-"A táncos észre sem vesz, mintha valaki a közeléből irányítaná."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie dog"
@@ -62567,15 +64789,11 @@ msgstr[1] "Thriller"
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
-"Bár még harcolsz életedért\n"
-"Tested elkezd remegni\"\n"
-"Mert még egyetlen halandó sem\n"
-"állt ellen a thriller gonoszának."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie snapper"
@@ -64232,8 +66450,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -64846,21 +67064,23 @@ msgid "The black pudding burns you with acid!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
+msgid "krabgek"
+msgid_plural "krabgeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
 msgstr ""
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
+msgid "The krabgek gazes at %3$s!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -64908,8 +67128,47 @@ msgstr[1] ""
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -67023,8 +69282,8 @@ msgid "Reveals an area around you on the overmap"
 msgstr ""
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67230,8 +69489,8 @@ msgstr ""
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67269,7 +69528,7 @@ msgstr ""
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -67318,6 +69577,20 @@ msgstr ""
 msgid "Translocates the user to an attuned gate."
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr ""
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr ""
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr ""
@@ -67367,7 +69640,7 @@ msgstr ""
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67524,7 +69797,7 @@ msgstr ""
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr ""
 
@@ -67535,8 +69808,8 @@ msgstr ""
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67583,8 +69856,8 @@ msgstr ""
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67610,6 +69883,10 @@ msgstr ""
 msgid "Lava Bomb"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr ""
@@ -67617,7 +69894,7 @@ msgstr ""
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr ""
@@ -67629,9 +69906,9 @@ msgstr ""
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67704,7 +69981,7 @@ msgstr ""
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -67747,8 +70024,8 @@ msgstr ""
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py lang/json/effects_from_json.py
@@ -67767,6 +70044,15 @@ msgstr ""
 msgid "Fox's Cunning"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr ""
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr ""
@@ -67806,8 +70092,8 @@ msgstr ""
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67868,8 +70154,8 @@ msgstr ""
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -67896,6 +70182,10 @@ msgstr ""
 msgid "Mirror Image"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr ""
@@ -68474,6 +70764,46 @@ msgstr ""
 "Jelenleg be van kapcsolva, és meríti az elemet. Kikapcsolásához használni "
 "kell."
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -68562,8 +70892,8 @@ msgstr[1] ""
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
 
@@ -69676,13 +72006,11 @@ msgstr "A fülvédőből kimerült az elem."
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
 msgstr ""
-"Főleg lövészek által kedvelt fülvédő. A fülvédő jelenleg ki van kapcsolva. "
-"Ha elég elem van benne, akkor egy adott decibel érték felett blokkolja a "
-"hangokat."
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -70179,6 +72507,213 @@ msgid ""
 "power."
 msgstr ""
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr ""
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -70524,9 +73059,9 @@ msgstr[1] ""
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
 
@@ -70659,11 +73194,9 @@ msgstr[1] "látnoki rúd"
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr ""
-"Az aep_clairvoyance_plus flag teszteléséhez használt tárgy. Ha a tárgy "
-"véletlenszerűen is megjelenik, akkor az egy bug."
 
 #: lang/json/TOOL_from_json.py
 msgid "boulder anvil"
@@ -70999,14 +73532,10 @@ msgstr "Meggyújtod a %s kanócát."
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr ""
-"Ez egy kezdetleges és túlméretes, rögtönzött bomba. Egy tárolóból, valamint "
-"szögekkel körbevett robbanóanyagból és egy kanócból áll. Használatával "
-"meggyújtod a kanócot. Ezután felrobbanásáig öt köröd van. Talán jó ötlet "
-"lenne eldobni."
 
 #: lang/json/TOOL_from_json.py
 msgid "active nail bomb"
@@ -71024,12 +73553,9 @@ msgstr "Már meggyújtottad a kanócot, mire vársz még?"
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr ""
-"Ez egy kezdetleges és túlméretes, rögtönzött bomba. Egy tárolóból, valamint "
-"szögekkel körbevett robbanóanyagból és egy kanócból áll. A kanóca ég, talán "
-"jó ötlet lenne most már eldobni."
 
 #: lang/json/TOOL_from_json.py
 msgid "fragment bomb"
@@ -71040,15 +73566,11 @@ msgstr[1] "repeszbomba"
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
 msgstr ""
-"Ez egy kezdetleges és túlméretes, rögtönzött bomba. Egy tárolóból, valamint "
-"fémtörmelékkel körbevett robbanóanyagból és egy kanócból áll. Használatával "
-"meggyújtod a kanócot. Ezután felrobbanásáig öt köröd van. Talán jó ötlet "
-"lenne eldobni."
 
 #: lang/json/TOOL_from_json.py
 msgid "active fragment bomb"
@@ -71059,13 +73581,10 @@ msgstr[1] "aktív repeszbomba"
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr ""
-"Ez egy kezdetleges és túlméretes, rögtönzött bomba. Egy tárolóból, valamint "
-"fémtörmelékkel körbevett robbanóanyagból és egy kanócból áll. A kanóca ég, "
-"talán jó ötlet lenne most már eldobni."
 
 #: lang/json/TOOL_from_json.py
 msgid "can bomb"
@@ -71085,12 +73604,9 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr ""
-"Ezt a konzervdobozt a pereméig teletöltötték robbanószerrel. Egy apró kanóc "
-"áll ki belőle. Talán annyi repeszt vet szét, ami leküzdi a páncélzatot... "
-"talán."
 
 #: lang/json/TOOL_from_json.py
 msgid "active can bomb"
@@ -71102,12 +73618,9 @@ msgstr[1] "aktív konzervbomba"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
-"Ezt a konzervdobozt a pereméig teletöltötték robbanószerrel. Egy apró kanóc "
-"áll ki belőle. Talán annyi repeszt vet szét, ami leküzdi a páncélzatot... "
-"talán. A kanóca ég, talán jó ötlet lenne most már eldobni."
 
 #: lang/json/TOOL_from_json.py
 msgid "jack o'lantern"
@@ -71117,9 +73630,9 @@ msgstr[1] "töklámpás"
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "Meggyújt"
 
@@ -71156,10 +73669,8 @@ msgstr "A töklámpásban a gyertya kihúny."
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
+"  The face shifts."
 msgstr ""
-"A tökarcban egy vastag LED-es gyertya található. Nem világít nagyon, de "
-"sokáig tart. A gyertya világít. Az arc fintorog."
 
 #. ~ Description for battle axe
 #: lang/json/TOOL_from_json.py
@@ -71320,6 +73831,30 @@ msgstr ""
 "Ezt a konzervdobozt a pereméig teletöltötték fekete lőporral. Egy égő kanóc "
 "áll ki belőle."
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] "hobo kályha (ég)"
+msgstr[1] "hobo kályha (ég)"
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "A parázs kialudt."
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr ""
+"Ez egy apró méretű, rögtönzött, fás tűzhely, amely egy konzervdobozból, vagy"
+" valami hasonló tárolóból készült. Főzéshez vagy fagyott étel "
+"felolvasztásához használható, egyszerű gyújtóssal működik."
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -71579,11 +74114,9 @@ msgstr[1] "vízmalom"
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
 msgstr ""
-"Egy apró méretű, vízzel meghajtott malom, amely a keményítős terményeket "
-"lisztté morzsolja. Az építési menüvel lehet elhelyezni."
 
 #: lang/json/TOOL_from_json.py lang/json/furniture_from_json.py
 msgid "wind mill"
@@ -71594,11 +74127,9 @@ msgstr[1] "szélmalom"
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
 msgstr ""
-"Egy apró méretű, széllel meghajtott malom, amely a keményítős terményeket "
-"lisztté morzsolja. Az építési menüvel lehet elhelyezni."
 
 #: lang/json/TOOL_from_json.py
 msgid "banjo"
@@ -71982,11 +74513,9 @@ msgstr[1] "elektromos hússzeletelő (ki)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
 msgstr ""
-"Elemes hússzeletelő. Két fogazott vágókés mozog egymás mellett, és szinte "
-"mindent elvág, a pulykától kezdve a zombin át a sonkáig."
 
 #: lang/json/TOOL_from_json.py
 msgid "electric carver (on)"
@@ -72181,7 +74710,7 @@ msgstr[1] ""
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr ""
@@ -72692,10 +75221,8 @@ msgstr[1] "elektronikus bilincs"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-"A rendőrség és a tömegoszlató botok által használt elektronikus bilincs. Az állandó szirénázás egyértelműen letartóztatott bűnözőként azonosítja a viselőjét, és messziről felhívja az emberi rendőrség figyelmét. Várd meg az érkezésüket, és ne próbálj meg elmenekülni vagy leszedni a bilincset - elektromosan sokkol, ha megpróbálod.\n"
-"Mivel azonban a kiszálló rendőrség tagjai mind élőhalottak, jó sokáig kell várnod - kivéve, ha nem találsz valamilyen kreatív megoldást."
 
 #: lang/json/TOOL_from_json.py
 msgid "entrenching tool"
@@ -74910,11 +77437,9 @@ msgstr[1] "szivacs"
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
 msgstr ""
-"A szivacs egy puha, lukacsos anyagból készült tisztító szerszám. Általában a"
-" folyadékokat nem beszívó felületek tisztítására használják."
 
 #: lang/json/TOOL_from_json.py
 msgid "washing kit"
@@ -75947,11 +78472,8 @@ msgstr "Meggyújtod a fekete lőpor töltet kanócát. Gyorsan szabadulj meg tő
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr ""
-"Ez egy házi készítésű robbanószer, amely egy lőporral és fémhulladékkal "
-"megtöltött műanyag palackból, és egy hosszú kanócból áll. A kanóc "
-"meggyújtásához használni kell. Egy pár perc múlva robban."
 
 #: lang/json/TOOL_from_json.py
 msgid "active black gunpowder charge"
@@ -76557,40 +79079,6 @@ msgid_plural "hobo stoves"
 msgstr[0] "hobo kályha"
 msgstr[1] "hobo kályha"
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr "A hobo kályha ég."
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "Kell valami, amivel meg lehet gyújtani!"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr ""
-"Ez egy apró méretű, rögtönzött, fás tűzhely, amely egy konzervdobozból, vagy"
-" valami hasonló tárolóból készült. Főzéshez vagy fagyott étel "
-"felolvasztásához használható, egyszerű gyújtóssal működik."
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] "hobo kályha (ég)"
-msgstr[1] "hobo kályha (ég)"
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "A parázs kialudt."
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -76793,11 +79281,9 @@ msgstr[1] "rakodóhorog"
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
 msgstr ""
-"Ez egy egyszerű, acélfogantyús mészáros horog. Közelharci fegyvernek "
-"megteszi."
 
 #: lang/json/TOOL_from_json.py
 msgid "bathroom scale"
@@ -77210,7 +79696,7 @@ msgstr ""
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -77218,12 +79704,6 @@ msgid ""
 "will then identify you as a friendly, roam around or follow you, and attack "
 "all enemies with its rifle."
 msgstr ""
-"Ez egy M16A4-gyel felszerelt inaktív TALON UGV. Használatával bele tározod a"
-" nálad található összes 5,56x45mm-es lőszert (ezért amit nem akarsz "
-"betárazni, azt előtte rakd félre). A betárazás után bekapcsolod és a talajra"
-" helyezed. Sikeres átprogramozást és átkábelezést követően a biztonsági bot "
-"téged barátként fog azonosítani, a gépkarabélyával pedig az ellenségeidet "
-"veszi tűz alá."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive M202A1 TALON UGV"
@@ -77234,7 +79714,7 @@ msgstr[1] "inaktív M202A1 TALON UGV"
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -77242,12 +79722,6 @@ msgid ""
 "you as a friendly, roam around or follow you, and attack all enemies with "
 "its M202A1."
 msgstr ""
-"Ez egy M202A1-gyel felszerelt inaktív TALON UGV. Használatával bele tározod "
-"a nálad található összes M235 rakétát (ezért amit nem akarsz betárazni, azt "
-"előtte rakd félre). A betárazás után bekapcsolod és a talajra helyezed. "
-"Sikeres átprogramozást és átkábelezést követően a biztonsági bot téged "
-"barátként fog azonosítani, a rakétavetőjével pedig az ellenségeidet veszi "
-"tűz alá."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive nurse bot"
@@ -77338,14 +79812,10 @@ msgstr "Az elromlott kiborg felüvölt a fájdalomról, és rád támad!"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
-"Ez egy inaktív elromlott kiborg. Minden rohad rajta, ami még megmaradt az "
-"emberiségéből. Használatával a földre helyezed és bekapcsolod. Sikeres "
-"átprogramozást és átkábelezést követően a kiborg követni fog, és megtámadja "
-"az ellenfeleidet. Micsoda szörnyeteg vagy."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive prototype cyborg"
@@ -77396,7 +79866,7 @@ msgstr ""
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -77425,8 +79895,8 @@ msgstr ""
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
@@ -77452,7 +79922,7 @@ msgstr ""
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
 msgstr ""
@@ -77476,8 +79946,8 @@ msgstr ""
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
 msgstr ""
 
@@ -77500,8 +79970,8 @@ msgstr ""
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
 msgstr ""
 
@@ -77525,9 +79995,9 @@ msgstr ""
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -77549,7 +80019,7 @@ msgstr ""
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
 msgstr ""
@@ -77603,7 +80073,7 @@ msgstr ""
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -77633,8 +80103,8 @@ msgstr ""
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
@@ -77660,10 +80130,10 @@ msgstr ""
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
 
@@ -78022,7 +80492,7 @@ msgstr[1] ""
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
+"of a stick.  However it's quite fragile."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -78126,6 +80596,21 @@ msgstr ""
 "Ez egy katonai harci kés. Könnyű és nagyon éles, halálos akár kézből, akár "
 "bajonettként felcsatolva."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -78512,6 +80997,21 @@ msgstr ""
 "A kard bajonett egy olyan nagyméretű vágó penge, amelyet egy lőfegyver vagy "
 "számszeríj elejére lehet csatolni, és így a fegyver pikaként is használható."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -78620,6 +81120,57 @@ msgstr ""
 "Ez egy hatalmas, görbe, kétkezes japán kard. Méretéhez képest egészen "
 "könnyű."
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -79022,6 +81573,34 @@ msgstr ""
 "Ez egy darab műanyag. Használatával műanyagból készül tárgyakat lehet "
 "elkészíteni, javítani vagy megerősíteni. Mert ez műanyag!"
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -79534,12 +82113,8 @@ msgstr[1] "adóvevő"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
 msgstr ""
-"Ez egy adóval felszerelt rádió.  Használatával fel lehet venni a kapcsolatot"
-" valaki mással, akinek ugyanilyen rádiója van.  Sajnos manapság ilyet már "
-"senki sem használ..."
 
 #: lang/json/TOOL_from_json.py
 msgid "remote vehicle controller"
@@ -79734,7 +82309,7 @@ msgstr[1] ""
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
@@ -79935,7 +82510,7 @@ msgstr[1] "vastag kábel"
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr ""
 
@@ -80354,7 +82929,7 @@ msgstr ""
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr ""
 
@@ -80385,7 +82960,7 @@ msgstr[1] ""
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -81517,12 +84092,6 @@ msgid ""
 msgstr ""
 "Ez egy bot, amelybe egy kelepcéhez használható kioldószerkezetet vágtak."
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] "Laevateinn"
-msgstr[1] "Laevateinn"
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -82870,6 +85439,17 @@ msgid ""
 " terribly when not on a rail."
 msgstr ""
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr ""
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr ""
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "motorbicikli kerék"
@@ -83155,7 +85735,7 @@ msgstr ""
 
 #: lang/json/activity_type_from_json.py
 msgid "reloading"
-msgstr ""
+msgstr "tárazás"
 
 #: lang/json/activity_type_from_json.py
 msgid "finding a mount"
@@ -83163,139 +85743,143 @@ msgstr ""
 
 #: lang/json/activity_type_from_json.py
 msgid "reading"
-msgstr ""
+msgstr "olvasás"
 
 #: lang/json/activity_type_from_json.py
 msgid "constructing"
-msgstr ""
+msgstr "építés"
 
 #: lang/json/activity_type_from_json.py
 msgid "tidying up"
-msgstr ""
+msgstr "rendrakás"
 
 #: lang/json/activity_type_from_json.py
 msgid "deconstructing a vehicle"
-msgstr ""
+msgstr "jármű szétszerelése"
 
 #: lang/json/activity_type_from_json.py
 msgid "repairing a vehicle"
-msgstr ""
+msgstr "jármű javítása"
 
 #: lang/json/activity_type_from_json.py
 msgid "chopping logs"
-msgstr ""
+msgstr "gerenda szétvágása"
 
 #: lang/json/activity_type_from_json.py lang/json/tool_quality_from_json.py
 msgid "butchering"
-msgstr "mészárló"
+msgstr "mészárlás"
 
 #: lang/json/activity_type_from_json.py
 msgid "chopping trees"
-msgstr ""
+msgstr "favágás"
 
 #: lang/json/activity_type_from_json.py lang/json/tool_quality_from_json.py
 msgid "fishing"
-msgstr ""
+msgstr "halászás"
 
 #: lang/json/activity_type_from_json.py
 msgid "playing"
-msgstr ""
+msgstr "játszás"
 
 #: lang/json/activity_type_from_json.py
 msgid "waiting"
-msgstr ""
+msgstr "várakozás"
 
 #: lang/json/activity_type_from_json.py
 msgid "crafting"
-msgstr ""
+msgstr "tárgykészítés"
 
 #: lang/json/activity_type_from_json.py
 msgid "disassembly"
-msgstr ""
+msgstr "szétszerelés"
 
 #: lang/json/activity_type_from_json.py
 msgid "field dressing"
-msgstr ""
+msgstr "terepi kibelezés"
 
 #: lang/json/activity_type_from_json.py
 msgid "skinning"
-msgstr ""
+msgstr "nyúzás"
 
 #: lang/json/activity_type_from_json.py
 msgid "quartering"
-msgstr ""
+msgstr "felnegyedelés"
 
 #: lang/json/activity_type_from_json.py
 msgid "dismembering"
-msgstr ""
+msgstr "végtag csonkolás"
 
 #: lang/json/activity_type_from_json.py
 msgid "dissecting"
-msgstr ""
+msgstr "boncolás"
 
 #: lang/json/activity_type_from_json.py
 msgid "salvaging"
-msgstr ""
+msgstr "kitermelés"
 
 #: lang/json/activity_type_from_json.py
 msgid "foraging"
-msgstr ""
+msgstr "kotorászás"
 
 #: lang/json/activity_type_from_json.py
 msgid "interacting with the vehicle"
-msgstr ""
+msgstr "járműkezelés"
 
 #: lang/json/activity_type_from_json.py
 msgid "training"
-msgstr ""
+msgstr "képzés"
 
 #: lang/json/activity_type_from_json.py
 msgid "socializing"
-msgstr ""
+msgstr "társas lét"
 
 #: lang/json/activity_type_from_json.py
 msgid "using first aid"
-msgstr ""
+msgstr "elsősegély használata"
 
 #: lang/json/activity_type_from_json.py
 msgid "mining"
-msgstr ""
+msgstr "bányászás"
 
 #: lang/json/activity_type_from_json.py
 msgid "burrowing"
-msgstr ""
+msgstr "ásás"
 
 #: lang/json/activity_type_from_json.py
 msgid "smashing"
-msgstr ""
+msgstr "szétzúzás"
 
 #: lang/json/activity_type_from_json.py
 msgid "cranking"
 msgstr ""
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr "melegítés"
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr ""
 
 #: lang/json/activity_type_from_json.py
 msgid "cutting tissues"
-msgstr ""
+msgstr "szövetek szétvágása"
 
 #: lang/json/activity_type_from_json.py
 msgid "dropping"
-msgstr ""
+msgstr "elejtés"
 
 #: lang/json/activity_type_from_json.py
 msgid "stashing"
-msgstr ""
+msgstr "eltevés"
 
 #: lang/json/activity_type_from_json.py
 msgid "picking up"
-msgstr ""
+msgstr "felszedés"
 
 #: lang/json/activity_type_from_json.py
 msgid "moving items"
-msgstr ""
+msgstr "tárgymozgatás"
 
 #: lang/json/activity_type_from_json.py lang/json/skill_from_json.py
 msgid "driving"
@@ -83303,215 +85887,215 @@ msgstr "autóvezetés"
 
 #: lang/json/activity_type_from_json.py
 msgid "travelling"
-msgstr ""
+msgstr "utazás"
 
 #: lang/json/activity_type_from_json.py
 msgid "sorting out the loot"
-msgstr ""
+msgstr "zsákmány szortírozása"
 
 #: lang/json/activity_type_from_json.py
 msgid "tilling the farm plot"
-msgstr ""
+msgstr "talaj szántása"
 
 #: lang/json/activity_type_from_json.py
 msgid "fetching components"
-msgstr ""
+msgstr "alkatrészek előszedése"
 
 #: lang/json/activity_type_from_json.py
 msgid "farming"
-msgstr ""
+msgstr "földművelés"
 
 #: lang/json/activity_type_from_json.py
 msgid "planting seeds"
-msgstr ""
+msgstr "vetőmag ültetése"
 
 #: lang/json/activity_type_from_json.py
 msgid "harvesting plots"
-msgstr ""
+msgstr "betakarítás"
 
 #: lang/json/activity_type_from_json.py
 msgid "fertilizing plots"
-msgstr ""
+msgstr "talaj műtrágyázása"
 
 #: lang/json/activity_type_from_json.py
 msgid "interacting with inventory"
-msgstr ""
+msgstr "leltár kezelése"
 
 #: lang/json/activity_type_from_json.py
 msgid "fiddling with your clothes"
-msgstr ""
+msgstr "ruha igazgatása"
 
 #: lang/json/activity_type_from_json.py
 msgid "lighting the fire"
-msgstr ""
+msgstr "tűzgyújtás"
 
 #: lang/json/activity_type_from_json.py
 msgid "working the winch"
-msgstr ""
+msgstr "csörlőzés"
 
 #: lang/json/activity_type_from_json.py
 msgid "filling the container"
-msgstr ""
+msgstr "tároló megtöltése"
 
 #: lang/json/activity_type_from_json.py
 msgid "hotwiring the vehicle"
-msgstr ""
+msgstr "jármű megpiszkálása"
 
 #: lang/json/activity_type_from_json.py
 msgid "aiming"
-msgstr ""
+msgstr "célzás"
 
 #: lang/json/activity_type_from_json.py
 msgid "using the ATM"
-msgstr ""
+msgstr "ATM kezelése"
 
 #: lang/json/activity_type_from_json.py
 msgid "trying to start the vehicle"
-msgstr ""
+msgstr "jármű beindítása"
 
 #: lang/json/activity_type_from_json.py lang/json/tool_quality_from_json.py
 msgid "welding"
-msgstr "hegesztő"
+msgstr "hegesztés"
 
 #: lang/json/activity_type_from_json.py
 msgid "cracking"
-msgstr ""
+msgstr "feltörés"
 
 #: lang/json/activity_type_from_json.py
 msgid "repairing"
-msgstr ""
+msgstr "szerelés"
 
 #: lang/json/activity_type_from_json.py
 msgid "mending"
-msgstr ""
+msgstr "javítás"
 
 #: lang/json/activity_type_from_json.py
 msgid "modifying gun"
-msgstr ""
+msgstr "fegyvermódosítás"
 
 #: lang/json/activity_type_from_json.py
 msgid "modifying tool"
-msgstr ""
+msgstr "szerszám módosítása"
 
 #: lang/json/activity_type_from_json.py
 msgid "interacting with the NPC"
-msgstr ""
+msgstr "NPC interakció"
 
 #: lang/json/activity_type_from_json.py
 msgid "catching breath"
-msgstr ""
+msgstr "lélegzet visszanyerése"
 
 #: lang/json/activity_type_from_json.py
 msgid "clearing that rubble"
-msgstr ""
+msgstr "romeltakarítás"
 
 #: lang/json/activity_type_from_json.py
 msgid "meditating"
-msgstr ""
+msgstr "meditálás"
 
 #: lang/json/activity_type_from_json.py
 msgid "washing"
-msgstr ""
+msgstr "mosás"
 
 #: lang/json/activity_type_from_json.py
 msgid "cutting the metal"
-msgstr ""
+msgstr "fémvágás"
 
 #: lang/json/activity_type_from_json.py
 msgid "chopping down a tree"
-msgstr ""
+msgstr "fa kivágása"
 
 #: lang/json/activity_type_from_json.py
 msgid "chopping a log"
-msgstr ""
+msgstr "gerenda szétvágása"
 
 #: lang/json/activity_type_from_json.py
 msgid "cutting planks"
-msgstr ""
+msgstr "deszkává vágás"
 
 #: lang/json/activity_type_from_json.py lang/json/tool_quality_from_json.py
 msgid "drilling"
-msgstr "fúró"
+msgstr "fúrás"
 
 #: lang/json/activity_type_from_json.py
 msgid "churning earth"
-msgstr ""
+msgstr "föld felforgatása"
 
 #: lang/json/activity_type_from_json.py lang/json/tool_quality_from_json.py
 msgid "digging"
-msgstr "ásó"
+msgstr "ásás"
 
 #: lang/json/activity_type_from_json.py
 msgid "filling"
-msgstr ""
+msgstr "feltöltés"
 
 #: lang/json/activity_type_from_json.py
 msgid "shaving"
-msgstr ""
+msgstr "borotválkozás"
 
 #: lang/json/activity_type_from_json.py
 msgid "cutting your hair"
-msgstr ""
+msgstr "hajvágás"
 
 #: lang/json/activity_type_from_json.py
 msgid "playing with your pet"
-msgstr ""
+msgstr "játék a háziállattal"
 
 #: lang/json/activity_type_from_json.py
 msgid "trying to fall asleep"
-msgstr ""
+msgstr "alvási próbálkozás"
 
 #: lang/json/activity_type_from_json.py
 msgid "being operated on"
-msgstr ""
+msgstr "operálják"
 
 #: lang/json/activity_type_from_json.py
 msgid "unloading"
-msgstr ""
+msgstr "kitárazás"
 
 #: lang/json/activity_type_from_json.py
 msgid "programming override"
-msgstr ""
+msgstr "programozás felülírása"
 
 #: lang/json/activity_type_from_json.py
 msgid "putting on items"
-msgstr ""
+msgstr "ruha felöltése"
 
 #: lang/json/activity_type_from_json.py
 msgid "communing with the trees"
-msgstr ""
+msgstr "fákkal együttérzés"
 
 #: lang/json/activity_type_from_json.py
 msgid "eating"
-msgstr ""
+msgstr "evés"
 
 #: lang/json/activity_type_from_json.py
 msgid "consuming"
-msgstr ""
+msgstr "fogyasztás"
 
 #: lang/json/activity_type_from_json.py
 msgid "casting"
-msgstr ""
+msgstr "varázslás"
 
 #: lang/json/activity_type_from_json.py
 msgid "studying"
-msgstr ""
+msgstr "tanulmányozás"
 
 #: lang/json/activity_type_from_json.py
 msgid "drinking"
-msgstr ""
+msgstr "ivás"
 
 #: lang/json/activity_type_from_json.py
 msgid "using drugs"
-msgstr ""
+msgstr "drogok használata"
 
 #: lang/json/activity_type_from_json.py
 msgid "using the mind splicer"
-msgstr ""
+msgstr "elmehasítás"
 
 #: lang/json/activity_type_from_json.py
 msgid "hacking console"
-msgstr ""
+msgstr "konzol hekkelése"
 
 #: lang/json/ammunition_type_from_json.py
 msgid "fusion cell"
@@ -83527,7 +86111,7 @@ msgstr ".50 BMG"
 
 #: lang/json/ammunition_type_from_json.py
 msgid ".45-70"
-msgstr ""
+msgstr ".45-70"
 
 #: lang/json/ammunition_type_from_json.py
 msgid "nails"
@@ -83535,7 +86119,7 @@ msgstr "szög"
 
 #: lang/json/ammunition_type_from_json.py
 msgid "barb"
-msgstr ""
+msgstr "szálka"
 
 #: lang/json/ammunition_type_from_json.py
 msgid "BBs"
@@ -83553,9 +86137,13 @@ msgstr "nyíl"
 msgid "pebbles"
 msgstr "kavics"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "kő"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
-msgstr ""
+msgstr "repeszlőszer"
 
 #: lang/json/ammunition_type_from_json.py
 msgid "shot"
@@ -83572,8 +86160,8 @@ msgstr ".410 acélsörét"
 #: lang/json/ammunition_type_from_json.py lang/json/gun_from_json.py
 msgid "blunderbuss"
 msgid_plural "blunderbusses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "mordály"
+msgstr[1] "mordály"
 
 #: lang/json/ammunition_type_from_json.py
 msgid ".22"
@@ -83589,7 +86177,7 @@ msgstr ".357 SIG"
 
 #: lang/json/ammunition_type_from_json.py
 msgid ".357 magnum"
-msgstr ""
+msgstr ".357 Magnum"
 
 #: lang/json/ammunition_type_from_json.py
 msgid "9x18mm"
@@ -83597,7 +86185,7 @@ msgstr "9x18mm"
 
 #: lang/json/ammunition_type_from_json.py
 msgid ".380 ACP"
-msgstr ""
+msgstr ".380 ACP"
 
 #: lang/json/ammunition_type_from_json.py
 msgid ".38"
@@ -83629,7 +86217,7 @@ msgstr ".454"
 
 #: lang/json/ammunition_type_from_json.py
 msgid ".45 Colt"
-msgstr ""
+msgstr ".45 Colt"
 
 #: lang/json/ammunition_type_from_json.py
 msgid ".500"
@@ -83882,6 +86470,10 @@ msgid ""
 "deflected more than melee weapons and those in turn more than massive "
 "objects."
 msgstr ""
+"Egy vékony erőtér veszi körül a testedet, fenntartásához folyamatosan kell "
+"energia. Mindennek, ami áthatolna az erőteren, esélye van arra, hogy energia"
+" felhasználása árán kevesebb sebzést okozzot. A lövedékeket gyakrabban lehet"
+" eltéríteni, mint a kardot, és a masszív tárgyakat még kevésbé."
 
 #: lang/json/bionic_from_json.py
 msgid "Alarm System"
@@ -83915,10 +86507,13 @@ msgstr "Ötvözetpáncél - karok"
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
+"A karjaidon a húst egy kemény ötvözetből készült páncél váltotta fel, ezzel "
+"jelentősen megnövelve a passzív védelmet. Bionikus harcművészettel együtt is"
+" használható."
 
 #: lang/json/bionic_from_json.py
 msgid "Protective Lenses"
@@ -83945,6 +86540,9 @@ msgid ""
 "The flesh on your head has been surgically replaced by alloy plating, "
 "protecting both your head and jaw regions."
 msgstr ""
+"A fejeden a húst egy műtéti úton beültetett, kemény ötvözetből készült "
+"páncél váltotta fel, ezzel jelentősen megnövelve fejed és az állkapcsod "
+"védelmét."
 
 #: lang/json/bionic_from_json.py
 msgid "Alloy Plating - Legs"
@@ -83953,10 +86551,13 @@ msgstr "Ötvözetpáncél - lábak"
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
+"A lábaidon a húst egy kemény ötvözetből készült páncél váltotta fel, ezzel "
+"jelentősen megnövelve a passzív védelmet. Bionikus harcművészettel együtt is"
+" használható."
 
 #: lang/json/bionic_from_json.py
 msgid "Alloy Plating - Torso"
@@ -83968,6 +86569,8 @@ msgid ""
 "The flesh on your torso has been surgically replaced by alloy plating, "
 "protecting it from physical trauma."
 msgstr ""
+"A mellkasodon a húst egy műtéti úton beültetett, kemény ötvözetből készült "
+"páncél váltotta fel, ezzel jelentősen megnövelve a védelmedet."
 
 #: lang/json/bionic_from_json.py
 msgid "Battery System"
@@ -83980,6 +86583,9 @@ msgid ""
 "contained in normal, everyday batteries.  Use 'E' to drain charge from a "
 "battery.  Can be toggled on and off at will."
 msgstr ""
+"Ceruzaelem méretű, mindennapi elemeket befogadó csatlakozásod van, így "
+"azokat is felhasználhatod energiaforrásként. Elemek felhasználásához nyomd "
+"meg az E gombot. Igény szerint lehet ki- és bekapcsolni."
 
 #: lang/json/bionic_from_json.py
 msgid "Monomolecular Blade"
@@ -84000,7 +86606,7 @@ msgstr ""
 
 #: lang/json/bionic_from_json.py
 msgid "Shotgun Arm"
-msgstr ""
+msgstr "Sörétes kar"
 
 #. ~ Description for Shotgun Arm
 #: lang/json/bionic_from_json.py
@@ -84008,6 +86614,8 @@ msgid ""
 "Concealed in your left arm is a single shot 12 gauge shotgun.  Activate the "
 "bionic to fire and reload the shotgun."
 msgstr ""
+"A bal alkarodba egy 12 ga-s, egyövéses, rejtett sörétes puska került "
+"beépítésre. Lövéshez és újratárazáshoz aktiváld a bionikát."
 
 #: lang/json/bionic_from_json.py
 msgid "Optical Dampers"
@@ -84065,6 +86673,8 @@ msgid ""
 " will recharge bionic power when connected to a power source via jumper "
 "cable."
 msgstr ""
+"A csípőd felett egy összetett kábeles port található. Aktív állapotában "
+"akkumulátoros töltőkábelen keresztül ad át energiát."
 
 #: lang/json/bionic_from_json.py
 msgid "Subdermal Carbon Filament"
@@ -84124,6 +86734,9 @@ msgid ""
 "Throughout your body lies a network of thermal piping, which eases the "
 "effects of high and low ambient temperatures when activated."
 msgstr ""
+"Az egész testedbe beépítésre került egy hőcserélő rendszer csövezete, amely "
+"aktiválásakor segít ellensúlyozni a túl magas vagy a túl alacsony külső "
+"hőmérsékletek hatását."
 
 #: lang/json/bionic_from_json.py
 msgid "Cloaking System"
@@ -84154,6 +86767,10 @@ msgid ""
 "module will improve your hand to hand combat skills, but prevents you from "
 "improving them through combat experience."
 msgstr ""
+"Harcművészeti programokkal feltöltött bionikus processzorokat és "
+"adatbankokat műtéti úton integráltak az idegrendszeredhez. Aktív állapotnál "
+"a közelharci modul feljavítja a közelharci képességeidet, viszont ilyenkor "
+"ezeknél a készségeknél nem szerzel tapasztalatot."
 
 #: lang/json/bionic_from_json.py
 msgid "Bionic-Induced Deformity"
@@ -84279,6 +86896,9 @@ msgid ""
 "generators.  You may use power to fire a wide, but short-ranged blast which "
 "will disable electronics and robots."
 msgstr ""
+"A tenyereidbe apró elektromágneses pulzust leadó parabola-antennák kerültek "
+"műtéti úton beépítésre. Energia felhasználásával rövid hatótávolságú EMP "
+"leadásával megbéníthatod az elektromos berendezéseket és a robotokat."
 
 #: lang/json/bionic_from_json.py lang/json/gun_from_json.py
 #: lang/json/gun_from_json.py
@@ -84295,6 +86915,9 @@ msgid ""
 "to aim.  Extremely effective against electronic targets but mostly useless "
 "otherwise."
 msgstr ""
+"A jobb kezedbe és karodba elektromágneses pulzus vető került beépítésre. A "
+"szuperkoncentrált pulzusokat rövid hatótávolságra lehet kilőni. Elektromos "
+"célpontok leküzdésére rendkívül hatékony, egyébként szinte haszontalan."
 
 #: lang/json/bionic_from_json.py
 msgid "Ethanol Burner"
@@ -84302,17 +86925,25 @@ msgstr "Etanolkazán"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
 msgstr ""
 "Egy rendkívül hatékony reakció keretén belül alkoholból is képes vagy "
-"energiát előállítani. Az italok részegítő hatását azonban nem úszod meg."
+"energiát előállítani."
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "Aero-evaporátor"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr ""
+"Ez az alegység a környező levegőbül vonja ki a zokszigén helyett a vízpárát,"
+" amely ezután lassan a közvetlenül a véráramodba kerül. Az alrendszer nagyon"
+" száraz környezetben nem képes vizet előállítani."
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "Gyémánt szaruhártya"
@@ -84335,6 +86966,10 @@ msgid ""
 " as integrated binoculars, letting you see much farther than before, and any"
 " vision problems you might have had are now gone."
 msgstr ""
+"A szemed belső részének nagy részét műtéti úton eltávolították, helyettük "
+"egy sor magas felbontású, autófókuszáló lencse került beépítésre. Messzebbre"
+" és tisztábban látsz, mint korábban, mintha távcsöved lenne. Bármilyen "
+"látási gonddal is küzdöttél korábban, most már az nincs."
 
 #: lang/json/bionic_from_json.py
 msgid "Facial Distortion"
@@ -84419,6 +87054,10 @@ msgid ""
 "doesn't provide enough light to comfortably read or craft, but it can "
 "suffice if you have nothing else."
 msgstr ""
+"A bőröd alá nem túl mélyen egy apró LED kijelző került beépítésre, amely "
+"gyenge vagy erős fénnyel tud világítani és mintákat mutatni. Fénye nem elég "
+"az olvasáshoz vagy a tárgyak elkészítéséhez, de a semminél jobb, ha nincs "
+"más."
 
 #. ~ Description for Glowy Thing
 #: lang/json/bionic_from_json.py
@@ -84428,6 +87067,10 @@ msgid ""
 "you to glow and making you visible in the dark without improving how much "
 "you can see in the slightest."
 msgstr ""
+"Szerinted egy kondenzátornak nem kellene feltétlenül izzania, de ez most "
+"izzik, és mindig rosszkor. Egy hibás bionika véletlenszerűen ki- és "
+"bekapcsolódik, olyankor világít, ahogy te is világítasz a sötétben, de nem "
+"annyira, hogy jobban lássál."
 
 #: lang/json/bionic_from_json.py
 msgid "Integrated Dosimeter"
@@ -84446,7 +87089,7 @@ msgstr ""
 
 #: lang/json/bionic_from_json.py
 msgid "Respirator"
-msgstr ""
+msgstr "Respirátor"
 
 #. ~ Description for Respirator
 #: lang/json/bionic_from_json.py
@@ -84456,6 +87099,11 @@ msgid ""
 "Turn on to recharge stamina faster, at moderate power cost.  Asthmatics may "
 "also use it to stop asthma attacks."
 msgstr ""
+"Komplex lélegzet-augmentációs rendszer.  Javítja a levegőben a légzés, és "
+"víz alatti is lehet vele lélegezni.  Víz alatti fulladásnál automatikusan "
+"bekapcsol.  Mérsékelt energiafelhasználásért cserébe bekapcsolható a "
+"kitartás visszanyerésének felgyorsításához.  Asztmában szenvedők továbbá "
+"ezzel megállíthatják az asztmarohamukat."
 
 #: lang/json/bionic_from_json.py
 msgid "Terranian Sonar"
@@ -84468,6 +87116,9 @@ msgid ""
 "detect the movements of creatures below the ground, buried traps, and "
 "unstable terrain."
 msgstr ""
+"A talpadba precíziós szonárrendszer került integrálásra, amelynek "
+"segítségével a föld alatt mozgást, a rejtett aknákat és az instabil talajt "
+"lehet észrevenni."
 
 #: lang/json/bionic_from_json.py
 msgid "Heat Drain"
@@ -84524,6 +87175,8 @@ msgid ""
 "Your range of vision extends into the infrared, allowing you to see warm-"
 "blooded creatures in the dark or through smoke."
 msgstr ""
+"Látóképességed kiterjed az infravörös tartományra is, a melegvérű lényeket a"
+" sötétben és a füstben is látni."
 
 #: lang/json/bionic_from_json.py
 msgid "Cerebral Booster"
@@ -84592,10 +87245,10 @@ msgstr ""
 "járhat."
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "Mini lángszóró"
+msgid "Finger Lighter"
+msgstr "Ujjbegy öngyújtó"
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -84626,9 +87279,13 @@ msgstr "Elektromágneses egység"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
+"A jobb kezedbe egy erőteljes elektromágnes került beépítésre, segítségével "
+"az összes közelében található fémtárgyat közel tudod magadhoz húzni. A "
+"peches közelben állókat ezek a repülő tárgyak megsebezheti vagy meg is "
+"ölhetik."
 
 #: lang/json/bionic_from_json.py
 msgid "Nictating Membrane"
@@ -84671,6 +87328,9 @@ msgid ""
 "Your digestive system and power supply are interconnected; bionic energy is "
 "replenished by burning calories.  Can be toggled on and off at will."
 msgstr ""
+"Az energiatárolód és az emésztőrendszered össze lett kötve. A bionikus "
+"energiát kalóriák égetésével lehet generálni. Igény szerint lehet ki- és "
+"bekapcsolni."
 
 #: lang/json/bionic_from_json.py
 msgid "Weather Reader"
@@ -84683,6 +87343,9 @@ msgid ""
 "data.  The data is compiled and presented as a simple readout of the current"
 " weather.  It also passively tells you the local air temperature."
 msgstr ""
+"Időjárási adatgyűjtéshez használható tudományos műszerek és érzékelők "
+"sokasága. A felvett adatokból elemzésük után leegyszerűsítve a jelenlegi "
+"időjárás tudható meg. Passzív módon kijelzi a helyi levegő hőmérsékletét is."
 
 #: lang/json/bionic_from_json.py
 msgid "Repair Nanobots"
@@ -84692,9 +87355,12 @@ msgstr "Javító nanobotok"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
 msgstr ""
+"A testedben számos apró, inaktív nanobot található. Aktiváláskor körbejárják"
+" az egész testedet, percenként 1 életpontot gyógyítanak, és megállítják a "
+"vérzést. Ennek energia és kalória költsége van."
 
 #: lang/json/bionic_from_json.py
 msgid "Artificial Night Generator"
@@ -84706,6 +87372,8 @@ msgid ""
 "When active, this bionic eliminates all light within a 2 tile radius through"
 " destructive interference."
 msgstr ""
+"Aktív állapotban ez a bionika destruktív interferenciájával 2 mezőn belül "
+"minden fényt megszüntet."
 
 #: lang/json/bionic_from_json.py
 msgid "Implanted Night Vision"
@@ -84717,6 +87385,8 @@ msgid ""
 "When active, this bionic will amplify existing light, allowing you to see in"
 " the dark."
 msgstr ""
+"Aktív állapotában ez a bionika felerősíti a környezeti fényeket, így a "
+"sötétben is tudsz látni."
 
 #. ~ Description for Noisemaker
 #: lang/json/bionic_from_json.py
@@ -84729,11 +87399,11 @@ msgstr "Üzemzavaros bionikus modul. Időnként hangos zajlökéseket bocsájt k
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
+"Increases mouth encumbrance by ten."
 msgstr ""
-"Nem is tudod már, hogy ez a KBM hogyan került az orrodba, de ha már ott van,"
-" akkor biztosan rossz helyre került, mert nehéz miatta a lélegzés. A szád "
-"ormótlanságát eggyel növeli."
+"Nem tudod, hogy ez a KBM hogyan is került az orrodba, de tulajdonképpen a "
+"hogyan és a miért lényegtelen, mert ez a rossz helyen található bionika "
+"megnehezíti a légzésedet. A száj ormótlansága 10-zel nő."
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -84746,6 +87416,10 @@ msgid ""
 "field does not deflect attacks, but rather delivers a strong shock, damaging"
 " unarmed attackers and those with a conductive weapon."
 msgstr ""
+"A testedet egy vékony erőtér veszi körül, és folyamatosan energiát merít. Az"
+" erőtér nem hárítja el a támadásokat, viszont erős elektromos ütést mért "
+"minden beérkezett támadóra, aki puszta kézzel, vagy elektromosságot vezető "
+"fegyverrel ér hozzád."
 
 #: lang/json/bionic_from_json.py
 msgid "Sensory Dulling"
@@ -84766,8 +87440,10 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
+"mild optic neuropathy.  Increases eye encumbrance by ten."
 msgstr ""
+"Egy rossz helyre került dielektromos stiletta miatt enyhe mértékben "
+"károsodott a látóideged. A szem ormótlanságát 10-zel növeli."
 
 #: lang/json/bionic_from_json.py
 msgid "Power Armor Interface"
@@ -84779,6 +87455,9 @@ msgid ""
 "Interfaces your power system with the internal charging port on suits of "
 "power armor, allowing them to draw from your bionic power banks."
 msgstr ""
+"A belső enerigarendszeredet összeköti a szervópáncélok belső töltési "
+"csatalkozásaival, így a páncélok közvetlenül a bionikus energiádat tudják "
+"hasznosítani."
 
 #: lang/json/bionic_from_json.py
 msgid "Power Armor Interface Mk. II"
@@ -84791,6 +87470,9 @@ msgid ""
 "power armor, allowing them to draw from your bionic power banks.  Twice as "
 "efficient as the Mk. I model."
 msgstr ""
+"A belső enerigarendszeredet összeköti a szervópáncélok belső töltési "
+"csatalkozásaival, így a páncélok közvetlenül a bionikus energiádat tudják "
+"hasznosítani. Az I-es szervópáncél interfésznél kétszer hatékonyabb."
 
 #: lang/json/bionic_from_json.py
 msgid "Power Storage"
@@ -84799,10 +87481,14 @@ msgstr "Energiatároló"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
 msgstr ""
+"Ez a kompakt bionikus modul 100 kJ-lal növeli az energiatárolási "
+"kapacitásodat. Legalább egy ilyen modulra van szükséged ahhoz, hogy energiát"
+" használó bionikát üzemeltethess. Szükséged lesz továbbá még egy tápegységre"
+" is, amelyet egy másik KBM-ben találsz."
 
 #: lang/json/bionic_from_json.py
 msgid "Power Storage Mk. II"
@@ -84810,9 +87496,10 @@ msgstr "Energiatároló II"
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
 msgstr ""
+"Ez a kompakt bionikus modul 250 kJ-lal növeli az energiatárolási "
+"kapacitásodat."
 
 #. ~ Description for Power Overload
 #: lang/json/bionic_from_json.py
@@ -84854,6 +87541,9 @@ msgid ""
 "toxins, or airborne diseases find their way into your windpipe, the filter "
 "will attempt to remove them."
 msgstr ""
+"A gégecsövedbe műtéti úton beépítésre került egy modern légszűrő rendszer. "
+"Ha toxinok vagy levegőn át terjedő toxinok haladnának át a gégecsöveden a "
+"tüdő felé, akkor a szűrő megpróbálja ezeket eltávolítani."
 
 #: lang/json/bionic_from_json.py
 msgid "Radiation Scrubber System"
@@ -84896,6 +87586,8 @@ msgid ""
 "You possess razor-sharp claws underneath your fingernails that do a small "
 "amount of unarmed slashing damage whenever your fingertips are uncovered."
 msgstr ""
+"A körmeid alá pengeélességű karmok kerültek. A kétélű pengék fedetlen "
+"ujjhegyek esetén egy kis mértékű vágósebzést ejtenek."
 
 #: lang/json/bionic_from_json.py
 msgid "Recycler Unit"
@@ -84936,6 +87628,9 @@ msgid ""
 "shockwave.  While it will not do much damage to creatures, solid objects "
 "such as walls and doors will be damaged."
 msgstr ""
+"Az egész tested erős rezonációt bocsájt ki, amely egy rövid hatósugarú "
+"lökéshullámként jelentkezik. Ez a lényeken nem okoz nagy sebzést, az "
+"ajtókhoz és falakhoz hasonló szilárd tárgyakat megrongálja."
 
 #: lang/json/bionic_from_json.py
 msgid "Olfactory Mask"
@@ -84961,6 +87656,8 @@ msgid ""
 "making it possible for you to recognize your surroundings even in complete "
 "darkness."
 msgstr ""
+"Amikor ez a modul energiát kap, akkor képes vagy vizualizálni a saját "
+"szagodat, így még a teljes sötétségben is felismered a környezetedet."
 
 #. ~ Description for Bionic Short Circuit
 #: lang/json/bionic_from_json.py
@@ -85091,6 +87788,9 @@ msgid ""
 "allow you to make automated precise cuts and can also be used as a high-"
 "quality butchering tool."
 msgstr ""
+"Az ujjaidba sebészeti szintű szikék kerültek implantálásra, segítségükkel "
+"pontosabb vágásokat ejthetsz boncoláskor.  A szikéket továbbá magas minőségű"
+" henteskésként is lehet használni."
 
 #: lang/json/bionic_from_json.py
 msgid "Anti-Glare Compensators"
@@ -85143,12 +87843,12 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
+" by ten, while failing to improve your ability to hold objects whatsoever."
 msgstr ""
 "Az önzáró hüvelykujjak igazán jól zárnak, még akkor is, ha nem szeretnéd - "
 "annyira, hogy szét se lehet bontani a két kezedet (bármennyire is "
-"szeretnéd). A kezek ormótlanságát kettővel növeli, és gyakorlatilag semmit "
-"sem tudsz kézben tartani."
+"szeretnéd). A kezek ormótlanságát 10-zel növeli, és gyakorlatilag semmit sem"
+" tudsz kézben tartani."
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -85177,10 +87877,14 @@ msgid ""
 "screwdriver, hammer, wrench, hacksaw, hand drill, welder, and heating "
 "elements.  You can use this in place of many tools when crafting."
 msgstr ""
+"A tenyeredbe és az ujjaidba műtéti úton egy komplett műszerszerelő eszköztár"
+" került: csavarhúzó, kalapács, franciakulcs, fémfűrész, hegesztő, fúrógép, "
+"valamint melegítőszál.  Tárgyak gyártásánál vagy szerelésénél szerszámok "
+"helyett használható."
 
 #: lang/json/bionic_from_json.py
 msgid "Extended Toolset"
-msgstr ""
+msgstr "Kiterjesztett eszköztár"
 
 #. ~ Description for Extended Toolset
 #: lang/json/bionic_from_json.py
@@ -85188,6 +87892,9 @@ msgid ""
 "Extend or withdraw your integrated toolset to cut metal, pry things, or "
 "other stuff.  This takes up your hands."
 msgstr ""
+"Aktiválásával kinyúlnak a kezedbe épített szerszámok, így azokkal fémet "
+"tudsz vágni, ajtót vagy ládát tudsz felfeszíteni, meg ilyesmi. A kezed ettől"
+" tele lesz."
 
 #: lang/json/bionic_from_json.py
 msgid "Joint Torsion Ratchet"
@@ -85200,10 +87907,13 @@ msgid ""
 "generate power when you move.  Whilst this is toggled, moving will require "
 "more effort, though more power will be generated."
 msgstr ""
+"Az izületeidbe torziós racsnik kerültek, amelyek a mozgás energiájából "
+"lassan bionikus energiát generálnak.  Amikor ez be van kapcsolva, akkor "
+"fárasztóbb a mozgás, viszont több energiát generál."
 
 #: lang/json/bionic_from_json.py
 msgid "Joint Servo"
-msgstr ""
+msgstr "Ízületi szervó"
 
 #. ~ Description for Joint Servo
 #: lang/json/bionic_from_json.py
@@ -85213,6 +87923,10 @@ msgid ""
 "requires less effort when this bionic is online.  However, when it's offline"
 " it will hamper your movement, as you struggle against its moving parts."
 msgstr ""
+"A lábízületeidre telepített szervómotorok segítenek a mozgásban. A "
+"berendezést futásra optimalizálták, de a bionika aktiválásánál a gyaloglás "
+"is kevesebb erőfeszítésbe kerül. Kikapcsolt állapotában azonban gátolja a "
+"gátolja mozgásodat, mivel le kell küzdenek a berendezés ellenállását."
 
 #. ~ Description for Visual Disruptor
 #: lang/json/bionic_from_json.py
@@ -85246,6 +87960,9 @@ msgid ""
 "You have a Unified Power System wired into your power banks.  Objects that "
 "run on a UPS can now draw directly from your bionic power supply."
 msgstr ""
+"Egy egységes tápegység került bedrótozásba a belső energiatároló "
+"rendszeredbe. Az ET energiaforrást használó tárgyak innentől közvetlen a "
+"bionikus energiádat merítik."
 
 #. ~ Description for Voice Remodulator
 #: lang/json/bionic_from_json.py
@@ -85254,6 +87971,9 @@ msgid ""
 "to why you don't opt for the Autodoc's 'Cyborg Identity Package'.  A "
 "remodulator unit jammed down your throat has given you a creepy robot voice."
 msgstr ""
+"Valószínűleg az életed hátralevő részét azzal fogod tölteni, hogy két lábon "
+"járó bizonyítéka leszel a robotdoki 'Kiborg identitás' programjának. Egy "
+"torkodba lenyomott remodulátor egységtől hátborzongató robothangod lett."
 
 #: lang/json/bionic_from_json.py
 msgid "Internal Chronometer"
@@ -85288,12 +88008,17 @@ msgstr ""
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
 msgstr ""
+"A lapockádhoz egy apró méretű benzines üzemanyagcellát rögzítettek. A többi "
+"üzemanyagcellához képest korlátozott energiatermelése ellenére a berendezés "
+"jelentős hőt termel, amely a hátadba épített kipufogón át távozik. "
+"Bioplasztik ballonokból álló tároló hálózatot integráltak a keringési "
+"rendszeredhez, amely így üzemanyagtartályként hasznosítható."
 
 #: lang/json/bionic_from_json.py
 msgid "Intravenous Needletip"
@@ -85348,20 +88073,23 @@ msgstr ""
 
 #: lang/json/bionic_from_json.py
 msgid "Taste Modifier"
-msgstr ""
+msgstr "Ízmódosító"
 
 #. ~ Description for Taste Modifier
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr ""
+"A szádba csúcsérzékenységű szenzorokat építettek, amelyek egy modern elemző "
+"segítségével bionikus energia árán blokkolnak minden kellemetlen ízt és "
+"textúrát."
 
 #: lang/json/bionic_from_json.py
 msgid "Soporific Induction"
-msgstr ""
+msgstr "Alvásindukció"
 
 #. ~ Description for Soporific Induction
 #: lang/json/bionic_from_json.py
@@ -85370,6 +88098,9 @@ msgid ""
 "nucleus.  It turns on whenever you're trying to fall asleep, creating an "
 "artificial but effective sensation of fatigue."
 msgstr ""
+"Az agyad ventolaterális preoptikus nukleuszába egy elektróda került "
+"beültetésre. Bekapcsol, amikor megpróbálsz elaludni, és mesterséges, bár "
+"teljesen hihető fáradtságérzetet kelt."
 
 #: lang/json/bionic_from_json.py
 msgid "Advanced Microreactor System"
@@ -85382,6 +88113,9 @@ msgid ""
 "model due to integrated radiation cleansers.  There is no way to shut it "
 "down once active, but you can toggle additional fuel intake."
 msgstr ""
+"Ez a lecsupaszított minireaktor a beépített sugárzásvédelmének köszönhetően "
+"az alapmodellnél biztonságosabb. Beindítása után többé nem lehet leállítani,"
+" de legalább plusz fűtőelemeket lehet behelyezni."
 
 #: lang/json/bionic_from_json.py
 msgid "Plutonium Filter"
@@ -85393,6 +88127,8 @@ msgid ""
 "This set of tanks and filters allows you to extract plutonium from "
 "radioactive slurry."
 msgstr ""
+"Ez a tartályokból és szűrőkből álló rendszer vonja ki az radioaktív iszapból"
+" a használható plutóniumot."
 
 #: lang/json/bionic_from_json.py
 msgid "Plutonium Purger"
@@ -85404,6 +88140,8 @@ msgid ""
 "Triggers an emergency reactor fuel purge that ejects all fuel from your "
 "reactor."
 msgstr ""
+"A vészhelyzeti reaktor üzemanyag átfuvatás a reaktorod összes fűtőanyagát "
+"kiveti."
 
 #: lang/json/bionic_from_json.py
 msgid "Microreactor System"
@@ -85416,6 +88154,9 @@ msgid ""
 "power.  There is no way to shut it down, but you can toggle additional fuel "
 "intake.  Irradiates your body when active."
 msgstr ""
+"Ez a lecsupaszított minireaktor elképesztő mennyiségű bionikus energiát "
+"generál. Beindítása után többé nem lehet leállítani, de legalább plusz "
+"fűtőelemeket lehet behelyezni. Aktív állapotban besugározza a testedet."
 
 #: lang/json/bionic_from_json.py
 msgid "Internal Furnace"
@@ -85458,10 +88199,13 @@ msgid ""
 "resembling angular butterfly wings.  When in direct sunlight, they will "
 "automatically deploy and slowly recharge your power level."
 msgstr ""
+"A hátadra szögletes pillangószárnyra emlékeztető formájú, kinyitható, "
+"megerősített napelemek kerültek. Közvetlen napfényen a napelemek "
+"automatikusan kinyílnak és lassan töltik az energiádat."
 
 #: lang/json/bionic_from_json.py
 msgid "Precision Solderers"
-msgstr ""
+msgstr "Precíziós forrasztás"
 
 #. ~ Description for Precision Solderers
 #: lang/json/bionic_from_json.py
@@ -85471,10 +88215,13 @@ msgid ""
 "absence of proper machinery, they're essential for creating bionics without "
 "better tools."
 msgstr ""
+"A kezeidbe precíziós forrasztópákát, drótvágót és kábeltekercseket "
+"építettek. A legtöbb tárgy elkészítéséhez ezek túl kicsik, de a célnak "
+"jobban megfelelő berendezés híján KBM-ek gyártásánál használhatók."
 
 #: lang/json/bionic_from_json.py
 msgid "Deployable Grenade Launcher"
-msgstr ""
+msgstr "Beépített gránátvető"
 
 #. ~ Description for Deployable Grenade Launcher
 #: lang/json/bionic_from_json.py
@@ -85482,10 +88229,12 @@ msgid ""
 "Your right hand can fold inward to reveal a mechanism capable of igniting "
 "and firing 40mm grenades across medium distances."
 msgstr ""
+"A jobb kezedet teljesen befele hajtva előkerül egy középtávon használható "
+"40mm-es gránátvető cső."
 
 #: lang/json/bionic_from_json.py
 msgid "Linguistic Coprocessor"
-msgstr ""
+msgstr "Nyelvészeti ko-processzor"
 
 #. ~ Description for Linguistic Coprocessor
 #: lang/json/bionic_from_json.py
@@ -85495,10 +88244,12 @@ msgid ""
 "that moderately increases the speed that language and written words are "
 "processed, granting a 15% increase to reading speed."
 msgstr ""
+"Az agyad bal féltekéjébe egy írott szavak felismerését kisegítő "
+"mikroszámítógép került, így az olvasási sebességed 15%-kal nő."
 
 #: lang/json/bionic_from_json.py
 msgid "Dopamine Stimulators"
-msgstr ""
+msgstr "Dopamin stimulátor"
 
 #. ~ Description for Dopamine Stimulators
 #: lang/json/bionic_from_json.py
@@ -85508,6 +88259,10 @@ msgid ""
 "slowly releases a stream of reward chemicals and hormones into your brain, "
 "inducing a state of euphoria that notably elevates mood."
 msgstr ""
+"Az agyadba a ventrális tegmentumba apró méretű kibernetikus stimulátorok "
+"kerültek beépítésre, amelyek beállított időközönként bionikus energiával "
+"aktivizálódnak. Tevékenységüktől élvezeti és örömhormonok szabadulnak fel az"
+" agyadban, az eufóriás hatásuktól jelentősen nő a jókedv."
 
 #: lang/json/bionic_from_json.py lang/json/gun_from_json.py
 msgid "Ionic Overload Generator"
@@ -85627,12 +88382,12 @@ msgstr "bal karod"
 
 #: lang/json/bodypart_from_json.py
 msgid "arms"
-msgstr ""
+msgstr "karok"
 
 #: lang/json/bodypart_from_json.py
 msgctxt "bodypart_accusative"
 msgid "arms"
-msgstr ""
+msgstr "karok"
 
 #: lang/json/bodypart_from_json.py
 msgid "Melee and ranged combat is hampered."
@@ -85640,7 +88395,7 @@ msgstr "A közelharc és a tűzharc hatékonysága csökkent."
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "L. Arm"
-msgstr ""
+msgstr "B. kar"
 
 #: lang/json/bodypart_from_json.py
 msgid "Arms"
@@ -85661,7 +88416,7 @@ msgstr "jobb karod"
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "R. Arm"
-msgstr ""
+msgstr "J. kar"
 
 #: lang/json/bodypart_from_json.py
 msgid "R ARM"
@@ -85678,12 +88433,12 @@ msgstr "bal kezed"
 
 #: lang/json/bodypart_from_json.py
 msgid "hands"
-msgstr ""
+msgstr "kezeid"
 
 #: lang/json/bodypart_from_json.py
 msgctxt "bodypart_accusative"
 msgid "hands"
-msgstr ""
+msgstr "kezeid"
 
 #: lang/json/bodypart_from_json.py
 msgid "Manual tasks are slowed."
@@ -85691,7 +88446,7 @@ msgstr "A kézi műveletek sebessége csökkent."
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "L. Hand"
-msgstr ""
+msgstr "B. kéz"
 
 #: lang/json/bodypart_from_json.py
 msgid "Hands"
@@ -85708,7 +88463,7 @@ msgstr "jobb kezed"
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "R. Hand"
-msgstr ""
+msgstr "J. kéz"
 
 #: lang/json/bodypart_from_json.py
 msgid "left leg"
@@ -85721,12 +88476,12 @@ msgstr "bal lábad"
 
 #: lang/json/bodypart_from_json.py
 msgid "legs"
-msgstr ""
+msgstr "lábaid"
 
 #: lang/json/bodypart_from_json.py
 msgctxt "bodypart_accusative"
 msgid "legs"
-msgstr ""
+msgstr "lábaid"
 
 #: lang/json/bodypart_from_json.py
 msgid "Running and swimming are slowed."
@@ -85734,7 +88489,7 @@ msgstr "A futás és az úszás sebessége csökkent."
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "L. Leg"
-msgstr ""
+msgstr "B. láb"
 
 #: lang/json/bodypart_from_json.py
 msgid "Legs"
@@ -85755,7 +88510,7 @@ msgstr "jobb lábad"
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "R. Leg"
-msgstr ""
+msgstr "J. láb"
 
 #: lang/json/bodypart_from_json.py
 msgid "R LEG"
@@ -85772,16 +88527,16 @@ msgstr "bal lábfejed"
 
 #: lang/json/bodypart_from_json.py
 msgid "feet"
-msgstr ""
+msgstr "lábaid"
 
 #: lang/json/bodypart_from_json.py
 msgctxt "bodypart_accusative"
 msgid "feet"
-msgstr ""
+msgstr "lábaid"
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "L. Foot"
-msgstr ""
+msgstr "B. lábf"
 
 #: lang/json/bodypart_from_json.py
 msgid "Feet"
@@ -85798,7 +88553,7 @@ msgstr "jobb lábfejed"
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "R. Foot"
-msgstr ""
+msgstr "J. lábf"
 
 #: lang/json/bodypart_from_json.py
 msgid "appendix"
@@ -85906,7 +88661,7 @@ msgstr ""
 
 #: lang/json/construction_from_json.py
 msgid "Make crafting spot"
-msgstr ""
+msgstr "Tárgykészítési hely kijelölése"
 
 #: lang/json/construction_from_json.py
 msgid ""
@@ -85916,6 +88671,11 @@ msgid ""
 "Does not prevent using a proper workbench, if available.  Deconstruct or "
 "smash to remove."
 msgstr ""
+"A talajon kijelöl egy pontot a tárgyak elkészítéséhez. A szomszédos mezőkben"
+" elkezdett tárgykészítés ezt a mezőt fogja használni, ahelyett, hogy a "
+"kezedben próbálnád összerakni a tárgyakat, de asztal híján ez tovább fog "
+"tartani. Ha a közelben van rendes munkalap, akkor azt fogod inkább "
+"használni. Eltávolításához szereld szét, vagy zúzd szét."
 
 #: lang/json/construction_from_json.py
 msgid "Spike Pit"
@@ -85943,7 +88703,7 @@ msgstr "Szerszámok nélkül is szétszerelhető."
 
 #: lang/json/construction_from_json.py
 msgid "Build Beaded Curtain"
-msgstr ""
+msgstr "Gyöngyfüggöny építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Makeshift Door"
@@ -86031,7 +88791,7 @@ msgstr "Homokzsák fal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Earthbag Wall"
-msgstr ""
+msgstr "Földzsák fal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Metal Wall"
@@ -86043,19 +88803,31 @@ msgstr "Téglafal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Concrete Floor"
-msgstr ""
+msgstr "Betonpadló építése"
 
 #: lang/json/construction_from_json.py
 msgid "Fill Pit With Dirt"
-msgstr ""
+msgstr "Gödör betemetése földdel"
 
 #: lang/json/construction_from_json.py
 msgid "Make Woodchip Floor"
-msgstr ""
+msgstr "Faforgács padló készítése"
+
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr "Apróköves padló készítése"
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr "Rövid egyenes vasúti sín építése"
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr "Rövid átlós vasúti sín építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
-msgstr ""
+msgstr "Fapadló építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Simple Concrete Wall"
@@ -86067,7 +88839,7 @@ msgstr "Vasbeton fal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Concrete Column"
-msgstr ""
+msgstr "Betonoszlop építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Metal Roof"
@@ -86095,7 +88867,7 @@ msgstr "Kőfal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Pony Wall"
-msgstr ""
+msgstr "Térdmagasságú fal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Roof"
@@ -86171,19 +88943,19 @@ msgstr "Mindkét oldalán kerítésnek vagy falnak kell lennie."
 
 #: lang/json/construction_from_json.py
 msgid "Build Screen Door"
-msgstr ""
+msgstr "Szúnyoghálós ajtó építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Screen Mesh Wall"
-msgstr ""
+msgstr "Szúnyoghálós fal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Chickenwire Fence"
-msgstr ""
+msgstr "Drótfonatos kerítés építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Chickenwire Gate"
-msgstr ""
+msgstr "Drótfonatos kapu építése"
 
 #: lang/json/construction_from_json.py
 msgid "Seal Crate"
@@ -86203,7 +88975,7 @@ msgstr "Koporsó lezárása"
 
 #: lang/json/construction_from_json.py
 msgid "Dig Grave and Bury Sealed Coffin"
-msgstr ""
+msgstr "Sír ásása és lezárt koporsó eltemetése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Bulletin Board"
@@ -86219,7 +88991,7 @@ msgstr "Könyvespolc építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Entertainment Center"
-msgstr ""
+msgstr "Szórakoztató központ építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Locker"
@@ -86227,7 +88999,7 @@ msgstr "Fémszekrény építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Rack"
-msgstr ""
+msgstr "Fapolc építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Metal Rack"
@@ -86251,19 +89023,19 @@ msgstr "Asztal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Place Table"
-msgstr ""
+msgstr "Asztal elhelyezése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Coffee Table"
-msgstr ""
+msgstr "Kávéasztal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Workbench"
-msgstr ""
+msgstr "Munkalap építése"
 
 #: lang/json/construction_from_json.py
 msgid "Place Workbench"
-msgstr ""
+msgstr "Munkalap elhelyezése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Chair"
@@ -86287,19 +89059,19 @@ msgstr "Szalmaágy építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Pile of Leaves"
-msgstr ""
+msgstr "Levélkupac építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Bed from Scratch"
-msgstr ""
+msgstr "Ágy építése a semmiből"
 
 #: lang/json/construction_from_json.py
 msgid "Build Bed Frame"
-msgstr ""
+msgstr "Ágykeret építése"
 
 #: lang/json/construction_from_json.py
 msgid "Add Mattress to Bed Frame"
-msgstr ""
+msgstr "Matrac hozzáadása az ágykerethez"
 
 #: lang/json/construction_from_json.py
 msgid "Build Armchair"
@@ -86347,67 +89119,67 @@ msgstr "Vizes kút építése"
 
 #: lang/json/construction_from_json.py
 msgid "Place Hay Bale"
-msgstr ""
+msgstr "Szalmabála elhelyezése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Desk"
-msgstr ""
+msgstr "Íróasztal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Wardrobe"
-msgstr ""
+msgstr "Gardrób építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Safe"
-msgstr ""
+msgstr "Széf építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Dumpster"
-msgstr ""
+msgstr "Szemetes konténer építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Mailbox"
-msgstr ""
+msgstr "Postaláda építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Bar Door"
-msgstr ""
+msgstr "Kocsmaajtó építése"
 
 #: lang/json/construction_from_json.py
 msgid "Install Bars Onto Window"
-msgstr ""
+msgstr "Ablak berácsozása"
 
 #: lang/json/construction_from_json.py
 msgid "Build Large Metal Support"
-msgstr ""
+msgstr "Nagy fémtámasz építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Small Metal Support"
-msgstr ""
+msgstr "Kis fémtámasz építése"
 
 #: lang/json/construction_from_json.py
 msgid "Paint Grass White"
-msgstr ""
+msgstr "Fű fehérre festése"
 
 #: lang/json/construction_from_json.py
 msgid "Paint Pavement Yellow"
-msgstr ""
+msgstr "Aszfalt sárgára festése"
 
 #: lang/json/construction_from_json.py
 msgid "Take Paint Off Pavement"
-msgstr ""
+msgstr "Aszfaltfesték felszedése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Railing"
-msgstr ""
+msgstr "Fakorlát építése"
 
 #: lang/json/construction_from_json.py
 msgid "Cover Manhole"
-msgstr ""
+msgstr "Csatornafedél befedése"
 
 #: lang/json/construction_from_json.py
 msgid "Remove Wax From Floor"
-msgstr ""
+msgstr "Parkettaviasz eltávolítása"
 
 #: lang/json/construction_from_json.py
 msgid "Paint Wall Red"
@@ -86419,7 +89191,7 @@ msgstr "Fal kékre festése"
 
 #: lang/json/construction_from_json.py
 msgid "Paint Wall White"
-msgstr ""
+msgstr "Fal fehérre festése"
 
 #: lang/json/construction_from_json.py
 msgid "Paint Wall Green"
@@ -86459,7 +89231,7 @@ msgstr "Padló zöldre kárpitozása"
 
 #: lang/json/construction_from_json.py
 msgid "Wax Floor"
-msgstr ""
+msgstr "Parketta viaszolása"
 
 #: lang/json/construction_from_json.py
 msgid "Dig Downstair"
@@ -86471,11 +89243,11 @@ msgstr "Bányássz egy szinttel lejjebb"
 
 #: lang/json/construction_from_json.py
 msgid "Repair Wooden Staircase"
-msgstr ""
+msgstr "Falépcső javítása"
 
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Staircase"
-msgstr ""
+msgstr "Falépcső építése"
 
 #: lang/json/construction_from_json.py
 msgid "Mine Upstair"
@@ -86495,31 +89267,31 @@ msgstr "Pontonhíd építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build River Bridge"
-msgstr ""
+msgstr "Folyó feletti híd építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build River Dock/Shallow Bridge"
-msgstr ""
+msgstr "Folyami kikötő/sekélyvízi híd építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Deep River Dock"
-msgstr ""
+msgstr "Mélyvízi kikötő építése"
 
 #: lang/json/construction_from_json.py
 msgid "Place Water Mill"
-msgstr ""
+msgstr "Vízmalom elhelyezése"
 
 #: lang/json/construction_from_json.py
 msgid "Place Wind Mill"
-msgstr ""
+msgstr "Szélmalom elhelyezése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Shallow Temporary Bridge"
-msgstr ""
+msgstr "Sekélyvízi átmeneti híd építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Planter"
-msgstr ""
+msgstr "Virágtartó építése"
 
 #: lang/json/construction_from_json.py
 msgid "Cut Grass"
@@ -86624,7 +89396,7 @@ msgstr "Párnavár építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Cardboard Fort"
-msgstr ""
+msgstr "Kartonvár építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Fire Ring"
@@ -86632,15 +89404,15 @@ msgstr "Tűzrakó építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Rammed Earth Wall"
-msgstr ""
+msgstr "Tömött földfal építése"
 
 #: lang/json/construction_from_json.py
 msgid "Hang Hanging Meathook"
-msgstr ""
+msgstr "Mészároskampó felakasztása"
 
 #: lang/json/construction_from_json.py
 msgid "Build Counter Gate"
-msgstr ""
+msgstr "Pultajtó építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Split Rail Fence Gate"
@@ -86648,7 +89420,7 @@ msgstr ""
 
 #: lang/json/construction_from_json.py
 msgid "Build Privacy Fence Gate"
-msgstr ""
+msgstr "Embermagasságú kerítéskapu építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Split Rail Fence"
@@ -86656,11 +89428,11 @@ msgstr ""
 
 #: lang/json/construction_from_json.py
 msgid "Build Privacy Fence"
-msgstr ""
+msgstr "Embermagasságú kerítés építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Brick Wall from Adobe"
-msgstr ""
+msgstr "Téglafal építése vályogból"
 
 #: lang/json/construction_from_json.py
 msgid "Extrude Resin Lattice"
@@ -86688,51 +89460,61 @@ msgstr "Ponyva kunyhó építése"
 
 #: lang/json/construction_from_json.py
 msgid "Dig a Shallow Pit"
-msgstr ""
+msgstr "Sekély gödör ásása"
 
 #: lang/json/construction_from_json.py
 msgid "Dig a Deep Pit"
-msgstr ""
+msgstr "Mély gödör ásása"
 
 #: lang/json/construction_from_json.py
 msgid "Build Arc Furnace"
-msgstr ""
+msgstr "Ívolvasztó kemence építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build a bellow."
-msgstr ""
+msgstr "Fújtató építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build a drop hammer."
-msgstr ""
+msgstr "Ejtőkalapács építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build a radio tower."
-msgstr ""
+msgstr "Rádiótorony építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build a radio tower console."
-msgstr ""
+msgstr "Rádiótorony konzol építése"
+
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr "Rönkzsámoly építése"
 
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
-msgstr ""
+msgstr "Hűtőszekrény áramellátásának átszerelése"
 
 #: lang/json/construction_from_json.py
 msgid ""
 "Converts a fridge to run off of vehicle power.  You can 'e'xamine it "
 "afterwards to take it down for mounting."
 msgstr ""
+"Átszereli a hűtőszekrény áramellátását, hogy az egy jármű rendszeréről "
+"üzemeljen. Utána az 'e' gombbal kell megvizsgálni, hogy beszereléshez "
+"magaddal vihesd."
 
 #: lang/json/construction_from_json.py
 msgid "Convert Vehicle Fridge to Freezer"
-msgstr ""
+msgstr "Fagyasztó áramellátásának átszerelése"
 
 #: lang/json/construction_from_json.py
 msgid ""
 "Further modifies a converted fridge to function as a freezer.  You can "
 "'e'xamine it afterwards to take it down for mounting."
 msgstr ""
+"Átszereli a fagyasztó áramellátását, hogy az egy jármű rendszeréről "
+"üzemeljen. Utána az 'e' gombbal kell megvizsgálni, hogy beszereléshez "
+"magaddal vihesd."
 
 #: lang/json/construction_from_json.py
 msgid "Chop Tree Trunk Into Logs"
@@ -86740,23 +89522,23 @@ msgstr "Fatörzs gerendává aprítása"
 
 #: lang/json/construction_from_json.py
 msgid "Dig a Pit"
-msgstr ""
+msgstr "Gödör ásása"
 
 #: lang/json/construction_from_json.py
 msgid "Makeshift Wall"
-msgstr ""
+msgstr "Hevenyészett fal"
 
 #: lang/json/construction_from_json.py
 msgid "Build Hydroponics"
-msgstr ""
+msgstr "Hidropónia építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Hydroponics Heater"
-msgstr ""
+msgstr "Hidropónia melegítő építése"
 
 #: lang/json/construction_from_json.py
 msgid "Build Translocator Gate"
-msgstr ""
+msgstr "Transzlokátor kapu építése"
 
 #: lang/json/construction_from_json.py
 msgid "Harvest Blob Feed from Corpse Pit: Smash to Harvest"
@@ -86869,7 +89651,7 @@ msgstr "Furcsákat álmodsz arról, hogy egy barlangban élsz."
 
 #: lang/json/dream_from_json.py
 msgid "Your dreams give you a strange reclusive feeling."
-msgstr ""
+msgstr "Az álmaidtól furcsán visszavonulásra vágyó érzésed támad."
 
 #: lang/json/dream_from_json.py
 msgid "You have a strange dream about sea creatures."
@@ -87477,6 +90259,42 @@ msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr ""
 "Arról álmodsz, hogy méhek harcolnak egymással az édes nektárodért... Mmmm."
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr ""
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -87568,7 +90386,7 @@ msgstr ""
 #: lang/json/dream_from_json.py
 msgid "Your body flows slightly faster than you expected... oh, just a dream."
 msgstr ""
-"A tested a várnál egy kicsit gyorsabban folyik... ah, ez csak egy álom."
+"A tested a vártnál egy kicsit gyorsabban folyik... ah, ez csak egy álom."
 
 #: lang/json/dream_from_json.py
 msgid "FIGHT.  FEED.  FORWARD."
@@ -88360,7 +91178,7 @@ msgstr "Újra hallasz!"
 
 #: lang/json/effects_from_json.py
 msgid "A bionic LED is glowing softly beneath your skin."
-msgstr ""
+msgstr "A bőröd alatt egy bionikus LED halványan világít."
 
 #: lang/json/effects_from_json.py src/bionics.cpp
 msgid "Stung"
@@ -88607,27 +91425,28 @@ msgstr ""
 
 #: lang/json/effects_from_json.py
 msgid "Took Thorazine"
-msgstr ""
+msgstr "Thoraznit vett be"
 
 #. ~ Description of effect 'Took Thorazine'.
 #: lang/json/effects_from_json.py
 msgid ""
 "You took Thorazine some time ago and you might still be under its influence."
 msgstr ""
+"Egy ideje már bevettél egy thorazint, és még mindig hatása alatt lehetsz."
 
 #: lang/json/effects_from_json.py
 msgid "Poor sight"
-msgstr ""
+msgstr "Rosszul lát"
 
 #. ~ Description of effect 'Poor sight'.
 #: lang/json/effects_from_json.py
 msgid "You can't see very far from this spot."
-msgstr ""
+msgstr "Innen nem lehet nagyon messzire látni."
 
 #. ~ Apply message for effect(s) 'Poor sight'.
 #: lang/json/effects_from_json.py
 msgid "Your sight distance is impaired."
-msgstr ""
+msgstr "A látótávolságod lecsökkent."
 
 #: lang/json/effects_from_json.py
 msgid "Webbed"
@@ -88842,6 +91661,25 @@ msgstr "A kezed remegése nem múlik el."
 msgid "You tremble"
 msgstr "Reszketsz."
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr "Roham"
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr "A rohamtól az izmaid bemerevednek, és nem tehetsz semmit!"
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr "Visszanyered az izmaid feletti uralmad."
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr "Az izmaid nem hajlandók engedelmeskedni!"
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "Vérzik"
@@ -89127,12 +91965,12 @@ msgstr "Felépült az influenzából."
 
 #: lang/json/effects_from_json.py
 msgid "Vaccinated"
-msgstr ""
+msgstr "Beoltva"
 
 #. ~ Description of effect 'Vaccinated'.
 #: lang/json/effects_from_json.py
 msgid "You have been vaccinated for the flu recently."
-msgstr ""
+msgstr "A közelmúltban influenza elleni oltást kaptál."
 
 #: lang/json/effects_from_json.py
 msgid "RX12 Healing Comedown"
@@ -89355,7 +92193,7 @@ msgstr "Elképesztően sok alkoholt ittál. Itt a világvége, kit érdekel?"
 
 #: lang/json/effects_from_json.py
 msgid "Dead Drunk"
-msgstr ""
+msgstr "Hulla részeg"
 
 #. ~ Description of effect 'Dead Drunk'.
 #: lang/json/effects_from_json.py
@@ -89363,6 +92201,8 @@ msgid ""
 "You embalmed yourself alive with so much alcohol, that even zombies will "
 "leave your dead body alone."
 msgstr ""
+"Annyi alkoholt ittál, hogy az már tartósítószernek számít, és még a zombik "
+"is el fogják kerülni a holttestedet."
 
 #. ~ Miss message for effect(s) 'Tipsy, Drunk, Trashed, Wasted, Dead Drunk'.
 #. ~ Miss message for effect(s) 'Depressants'.
@@ -89470,15 +92310,17 @@ msgid ""
 "You have been grabbed by an attack.\n"
 "You are being held in place, and dodging and blocking are very difficult."
 msgstr ""
+"Egy támadásnál megragadtak.\n"
+"Egy helyen tartanak, a blokkolás és a kitérés is nagyon nehéz."
 
 #: lang/json/effects_from_json.py
 msgid "Grabbing"
-msgstr ""
+msgstr "Megragadott"
 
 #. ~ Description of effect 'Grabbing'.
 #: lang/json/effects_from_json.py
 msgid "Grabbing another creature and holding them in place."
-msgstr ""
+msgstr "Megragadtál egy másik lényt és a helyén tartod."
 
 #: lang/json/effects_from_json.py
 msgid "Lacking Sleep"
@@ -89513,12 +92355,12 @@ msgstr "Felébredsz."
 
 #: lang/json/effects_from_json.py
 msgid "Under operation"
-msgstr ""
+msgstr "Műtéti beavatkozás"
 
 #. ~ Description of effect 'Under operation'.
 #: lang/json/effects_from_json.py
 msgid "You are being operated on.  Try to stay still."
-msgstr ""
+msgstr "Jelenleg műtenek téged. Próbálj meg nem mocorogni."
 
 #: lang/json/effects_from_json.py
 msgid "Playing an instrument"
@@ -89769,6 +92611,28 @@ msgstr "Az anyagcseréd instabillá válik."
 msgid "Your metabolism becomes more stable."
 msgstr "Az anyagcseréd stabilizálódik."
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr "Aggodalmas tünetek"
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr "Az izmaid furcsán rángatóznak."
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr "Idegesítő tünetek"
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr ""
+"Az idegrendszered nem működik rendesen, mintha valami belülről próbálná "
+"szétszakítani."
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "Világít"
@@ -89797,7 +92661,7 @@ msgstr "Ez a sérült végtag lassan, de gyógyul."
 #: lang/json/effects_from_json.py
 msgctxt "physically"
 msgid "Disabled"
-msgstr "Kikapcsolva"
+msgstr "Rokkant"
 
 #. ~ Description of effect '{'ctxt': 'physically', 'str': 'Disabled'}'.
 #: lang/json/effects_from_json.py
@@ -90024,6 +92888,17 @@ msgstr "Túlfeszített"
 msgid "You've been struck by lightning, and feel... different."
 msgstr "Villámcsapás ért, és valahogyan... másként érzed magad."
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr ""
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr "Vallásos sértés"
@@ -90642,6 +93517,192 @@ msgid ""
 "the commotion."
 msgstr ""
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr ""
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -90861,6 +93922,167 @@ msgid ""
 "weeks after being dragged to her cell she died from dehydration."
 msgstr ""
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr ""
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "Követőid"
@@ -91025,10 +94247,10 @@ msgid "A small family surviving on their generational land."
 msgstr ""
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
+msgid "New England Church Community"
 msgstr ""
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -91068,102 +94290,224 @@ msgstr ""
 msgid "Dusty"
 msgstr ""
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
+msgid "It's dusty.  Has no effect - obsolete fault."
 msgstr ""
 
+#. ~ name of mending method for fault 'Dusty'
 #: lang/json/fault_from_json.py
-msgid "Already deployed"
+msgid "Wipe clean"
 msgstr ""
 
-#. ~ Description for Already deployed
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean you %s."
+msgstr "Megtisztítod a(z) %st."
+
+#: lang/json/fault_from_json.py
+msgid "Already deployed"
+msgstr "Már aktiválták"
+
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
-msgstr ""
+msgstr "Ezt a bionikát vissza kell állítani az eredeti gyári állapotra."
+
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr "Gyári állapot visszaállítása"
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr "A(z) %s-et sikeresen visszaállítottad a gyári alapállapotára."
 
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
-msgstr ""
+msgstr "Fekete lőporos kormozódás"
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
+"Fekete lőporos lövedékektől a fegyverek elkormosodnak, amely csökkenti a "
+"megbízhatóságukat, és egy idő után akár rozsdásodáshoz is vezethet. A fekete"
+" lőportól sokkal gyorsabban elkormosodnak a fegyverek, mint a modern "
+"füstmentes lövedékektől. A kormosodás csak erős kormosodás esetén van "
+"hatással a fegyverek megbízhatóságára, de a fekete lőportól gyorsan "
+"felhalmozódik a korom."
+
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr "Fekete lőporos kormozódás kitisztítása"
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr "Megtisztítod a(z) %st."
 
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
-msgstr ""
+msgstr "Beragadt töltényhüvely"
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr ""
+"Ebbe a fegyverbe beragadt egy üres töltényhüvely. A következő lövéshez el "
+"kell távolítani."
+
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr "Üres töltényhüvely kitolása"
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr "A(z) %s fegyverből kitolod az üres töltényt."
 
 #: lang/json/fault_from_json.py
 msgid "Fouling"
-msgstr ""
+msgstr "Kormosodás"
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
+"A sok lőporos lövedéktől a fegyver bekormosodhat, amely miatt egy idő után a"
+" fegyver elakadhat, vagy akár meg is sérülhet. A modern füstmentes "
+"lőporoknak köszönhetően a korom lassan halmozódik fel -  kivéve ha fekete "
+"lőport használsz. A kormosodás csak magas szinteken jelenthet problémát, ha "
+"fegyvertisztítás nélkül lőttél ki több ezer lövedéket."
+
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr "Fegyver kitisztítása"
 
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
-msgstr ""
+msgstr "Elkopott vezérműszíj"
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "Egy hozzá csatlakoztatott generátor meghajtásához szükséges."
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr "Elkopott vezérműszíj cseréje"
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr "Kicseréled a(z) %s elkopott vezérműszíját."
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
-msgstr ""
+msgstr "Hibás izzítógyertya"
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr "Alacsony hőmérsékleten segít a motor beindításánál."
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr "Hibás izzítógyertya cseréje"
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr "Kicseréled a(z) %s hibás izzítógyertyáit."
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
-msgstr ""
+msgstr "Aktív indításgátló"
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "Megfelelő kulcs nélkül megakadályozza a jármû beindítását."
 
+#. ~ name of mending method for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
-msgid "Faulty diesel pump"
+msgid "Deactivate immobiliser"
+msgstr "Indításgátló kikapcsolása"
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
 msgstr ""
+"Kikapcsolja az indításgátló, ami miatt a járművet nem lehet beindítani."
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr "Sikeresen kikapcsolod a(z) %s indításgátlóját."
+
+#: lang/json/fault_from_json.py
+msgid "Faulty diesel pump"
+msgstr "Hibás dízelszivattyú"
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr ""
 "A járművek tartályából szivattyúzza ki és helyezi nyomás alá a dízelolajat."
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr "Hibás dízelszivattyú cseréje"
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr "Kicseréled a(z) %s hibás dízelszivattyúját."
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
-msgstr ""
+msgstr "Eltömődött légszűrő"
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
@@ -91171,46 +94515,106 @@ msgstr ""
 "Egy eltömődött szûrő növeli az üzemanyag-fogyasztást és a kipufogógázok "
 "füstjét."
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr "Eltömődött légszűrő cseréje"
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr "Kicseréled a(z) %s eltömődött légszűrőjét."
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
-msgstr ""
+msgstr "Eltömődött üzemanyagszűrő"
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
 msgstr ""
-"Egy eltömődött szûrő csökkenti a motor erejét és növeli a lángkicsapódásos "
+"Egy eltömődött szűrő csökkenti a motor erejét és növeli a lángkicsapódásos "
 "robbanás esélyét."
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr "Eltömődött üzemanyagszűrő cseréje"
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr "Kicseréled a(z) %s eltömődött üzemanyagszűrőjét."
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
-msgstr ""
+msgstr "Hibás benzinszivattyú"
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr ""
 "A járművek tartályából szivattyúzza ki és helyezi nyomás alá a benzint."
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr "Hibás benzinszivattyú cseréje"
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr "Kicseréled a(z) %s hibás benzinzszivattyúját."
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
-msgstr ""
+msgstr "Hibás vízszivattyú"
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr "Külső hűtőrácsba vagy radiátorba szivattyúzza a hűtővizet."
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr "Hibás vízszivattyú cseréje"
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr "Kicseréled a(z) %s hibás vízszivattyúját."
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
-msgstr ""
+msgstr "Hibás önindító motor"
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "A motor beindításához szükséges."
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr "Hibás önindító motor cseréje"
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr "Kicseréled a(z) %s hibás önindítóját."
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -91697,6 +95101,10 @@ msgstr ""
 msgid "smoke vent"
 msgstr ""
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr ""
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
 msgstr ""
@@ -91715,12 +95123,13 @@ msgstr "mutálódott kaktusz"
 
 #: lang/json/furniture_from_json.py
 msgid "cooling unit"
-msgstr ""
+msgstr "hűtőberendezés"
 
 #. ~ Description for cooling unit
 #: lang/json/furniture_from_json.py
 msgid "A big, blocky metal device for refrigerating large areas."
 msgstr ""
+"Egy nagyméretű, doboz formájú fém berendezés nagyobb területek hűtésére."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "metal screeching!"
@@ -91732,12 +95141,13 @@ msgstr "csengg!"
 
 #: lang/json/furniture_from_json.py
 msgid "central air filter"
-msgstr ""
+msgstr "központi légszűrő"
 
 #. ~ Description for central air filter
 #: lang/json/furniture_from_json.py
 msgid "Cleans out dust mites, smoke particles, and more!"
 msgstr ""
+"A levegőből kiszűri az atkákat, a porszemcséket, és még sok minden mást!"
 
 #. ~ Description for dishwasher
 #: lang/json/furniture_from_json.py
@@ -91746,6 +95156,10 @@ msgid ""
 " clean and to save people an unpleasant chore.  Now, with the power gone and"
 " it sitting for a while, it's starting to smell a bit off."
 msgstr ""
+"Ezt a fémdobozt arra használták, hogy szappanos forró vizet spricceljen a "
+"piszkos tányérokra, és így ne az embereknek kelljen a mosogatás kelletlen "
+"feladatát elvégezni. Most, hogy nincs áram, és egy ideje már itt áll, kezd "
+"fura szaga lenni."
 
 #: lang/json/furniture_from_json.py
 msgid "dryer"
@@ -91754,7 +95168,7 @@ msgstr "szárító"
 #. ~ Description for dryer
 #: lang/json/furniture_from_json.py
 msgid "'Dry your clothes!' would be what you'd do if electricity was running."
-msgstr ""
+msgstr "Kiszáríthatnád vele a ruháidat, ha lenne áram."
 
 #: lang/json/furniture_from_json.py lang/json/vehicle_part_from_json.py
 msgid "refrigerator"
@@ -91767,6 +95181,9 @@ msgid ""
 "flowing.  Well, as long as you don't open it, maybe it'll stay cool for "
 "awhile."
 msgstr ""
+"Az ételedet az elektromosság csodái segítségével tudod lehűteni! Ja, várj, "
+"nincs áram. Hát, ha nem nyitogatod az ajtaját, akkor talán még egy ideig "
+"hűvösebb lesz benne."
 
 #: lang/json/furniture_from_json.py
 msgid "glass door fridge"
@@ -91777,6 +95194,8 @@ msgstr "üvagajtós hűtő"
 msgid ""
 "Wow!  See INTO your fridge before you open it and discover it's not working!"
 msgstr ""
+"Hűha! Már azelőtt benézhetsz a hűtőbe, hogy kinyitod az ajtaját! És már most"
+" látod, hogy nem működik!"
 
 #: lang/json/furniture_from_json.py
 msgid "furnace"
@@ -91788,6 +95207,8 @@ msgid ""
 "A gas-powered forced-air central heating unit, with an internal fan to push "
 "the air through a building's air ducts and keep it warm."
 msgstr ""
+"Földgáz tüzelésű központi fűtés kazánja, amelyben egy ventillátor nyomja "
+"szét a meleg levegőt a ház szellőzőrendszerébe."
 
 #. ~ Description for washing machine
 #: lang/json/furniture_from_json.py
@@ -91805,10 +95226,13 @@ msgid ""
 "working, although it still has parts.  It might be safe to light a fire "
 "inside of it, if you had to."
 msgstr ""
+"Elektromosság segítségével lehet vele főzni és sütni. Most nem működik, de "
+"az alkatrészeit talán lehet valamire használni. Biztonságosan lehet benne "
+"tüzet gyújtani, ami nem fog továbbterjedni."
 
 #: lang/json/furniture_from_json.py
 msgid "blacksmith bellows"
-msgstr ""
+msgstr "kovácsműhely fújtató"
 
 #. ~ Description for blacksmith bellows
 #: lang/json/furniture_from_json.py
@@ -91816,10 +95240,12 @@ msgid ""
 "Used for delivering air to increase the combustion and heat output of a "
 "forge.  Doesn't look like it's working, although it still has parts."
 msgstr ""
+"Kovácsműhelyet lát el levegővel, hogy növelje annak hőfokát. Most nem "
+"működik, de az alkatrészeit talán lehet valamire használni."
 
 #: lang/json/furniture_from_json.py
 msgid "blacksmith drop hammer"
-msgstr ""
+msgstr "kovácsműhely ejtőkalapács"
 
 #. ~ Description for blacksmith drop hammer
 #: lang/json/furniture_from_json.py
@@ -91827,10 +95253,12 @@ msgid ""
 "Used for fast production of metal items.  Doesn't look like it's working, "
 "although it still has parts."
 msgstr ""
+"Fémeszközök gyors gyártásához használták. Most nem működik, de az "
+"alkatrészeit talán lehet valamire használni."
 
 #: lang/json/furniture_from_json.py
 msgid "document shredder"
-msgstr ""
+msgstr "iratmegsemmisítő"
 
 #. ~ Description for document shredder
 #: lang/json/furniture_from_json.py
@@ -91838,19 +95266,21 @@ msgid ""
 "It's not all about hiding government secrets, sometimes you just want to "
 "stop identity theft."
 msgstr ""
+"Nem csak kormányzati titkok elfedésére használják, néha a személyes adatok "
+"védelmére."
 
 #: lang/json/furniture_from_json.py
 msgid "server stack"
-msgstr ""
+msgstr "szerverszekrény"
 
 #. ~ Description for server stack
 #: lang/json/furniture_from_json.py
 msgid "This is a big pile of computers.  They're all turned off."
-msgstr ""
+msgstr "Magas oszlopnyi számítógéphalmaz. Mindegyik ki van kapcsolva."
 
 #: lang/json/furniture_from_json.py
 msgid "large satellite dish"
-msgstr ""
+msgstr "nagy műholdas antenna"
 
 #. ~ Description for large satellite dish
 #: lang/json/furniture_from_json.py
@@ -91858,15 +95288,18 @@ msgid ""
 "Somewhere up there, there are still satellites, orbiting and doing their "
 "thing, sending signals down to an Earth that is no longer listening."
 msgstr ""
+"Valahol ott fenn még mindig vannak műholdak. Ott fenn, a föld körüli pályán."
+" Még mindig azt csinálják, amit eddig - jeleket sugároznak egy olyan Földre,"
+" ahol már nem figyel rájuk senki sem."
 
 #: lang/json/furniture_from_json.py
 msgid "mounted solar panel"
-msgstr ""
+msgstr "felszerelt napelem"
 
 #. ~ Description for mounted solar panel
 #: lang/json/furniture_from_json.py
 msgid "A mounted solar panel."
-msgstr ""
+msgstr "Egy felszerelt napelem."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whack!"
@@ -91883,22 +95316,22 @@ msgstr "Barikád. Az út elbarikádozására."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "csörömpölés!"
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "tompa puffanás."
 
 #: lang/json/furniture_from_json.py
 msgid "earthbag barricade"
-msgstr ""
+msgstr "földzsák barikád"
 
 #. ~ Description for earthbag barricade
 #: lang/json/furniture_from_json.py
 msgid "An earthbag barricade, typically used for blocking bullets."
-msgstr ""
+msgstr "Egy földdel töltött zsák, a lövedékek felfogására hasznos."
 
 #: lang/json/furniture_from_json.py
 msgid "rrrip!"
@@ -91906,12 +95339,12 @@ msgstr "szakadás!"
 
 #: lang/json/furniture_from_json.py
 msgid "earthbag wall"
-msgstr ""
+msgstr "földzsák fal"
 
 #. ~ Description for earthbag wall
 #: lang/json/furniture_from_json.py
 msgid "An earthbag wall."
-msgstr ""
+msgstr "Egy földzsák fal."
 
 #: lang/json/furniture_from_json.py
 msgid "lane guard"
@@ -91929,7 +95362,7 @@ msgstr "homokzsák barikád"
 #. ~ Description for sandbag barricade
 #: lang/json/furniture_from_json.py
 msgid "A sandbag barricade, typically used for blocking bullets."
-msgstr ""
+msgstr "Egy homokkal töltött barikád, a lövedékek felfogására hasznos."
 
 #: lang/json/furniture_from_json.py
 msgid "sandbag wall"
@@ -91938,7 +95371,7 @@ msgstr "homokzsák fal"
 #. ~ Description for sandbag wall
 #: lang/json/furniture_from_json.py
 msgid "A sandbag wall."
-msgstr ""
+msgstr "Egy homokzsák fal."
 
 #: lang/json/furniture_from_json.py
 msgid "standing mirror"
@@ -91947,7 +95380,7 @@ msgstr "álló tükör"
 #. ~ Description for standing mirror
 #: lang/json/furniture_from_json.py
 msgid "Lookin' good - is that blood?"
-msgstr ""
+msgstr "Jól nézek ki - az ott vér?"
 
 #: lang/json/furniture_from_json.py
 msgid "glass breaking"
@@ -92002,7 +95435,8 @@ msgstr "szobor"
 msgid "A carved statue made of stone."
 msgstr ""
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "puffanás."
 
@@ -92013,7 +95447,7 @@ msgstr "manöken"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
 msgstr ""
 
@@ -92402,7 +95836,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "reccs!"
 
@@ -92415,7 +95849,7 @@ msgstr "marloss virág"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
+"and… delicious?"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -92539,6 +95973,9 @@ msgid ""
 "promises to do it all.  Except it's currently unpowered.  You could remove "
 "the casing and retrieve the electronics through disassembly."
 msgstr ""
+"Automatika! Tudomány! Ipar! Jobb a lónál! Ez a robotkar mindezt ígéri. "
+"Kivéve, hogy most nincsen áram. A burkolatod le lehet szedni, és talán szét "
+"lehetne szerelni az elektronikus alkatrészekért."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py
@@ -92579,14 +96016,16 @@ msgid ""
 "dishwasher.  It steams things at temperatures that will kill almost "
 "anything."
 msgstr ""
+"Ez tulajdonképpen egy csúcstechnológiai mosógép. Vagy mosogatógép. Magas "
+"hőmérsékleten gőzöl be dolgokat, amitől az összes károkozó meghal."
 
 #: lang/json/furniture_from_json.py
 msgid "filled autoclave"
-msgstr ""
+msgstr "megtöltött autókláv"
 
 #: lang/json/furniture_from_json.py
 msgid "sample freezer"
-msgstr ""
+msgstr "mintatároló fagyasztó"
 
 #. ~ Description for sample freezer
 #: lang/json/furniture_from_json.py
@@ -92595,10 +96034,12 @@ msgid ""
 "will store stuff at -80 degrees Celsius.  Don't lick the metal on the "
 "inside."
 msgstr ""
+"Amikor a hideg nem elég hideg, akkor itt van ez az extrém mélyhűtő. Mínusz "
+"80 fokon tárol dolgokat. A belső fémfelületét ne nyald meg."
 
 #: lang/json/furniture_from_json.py
 msgid "lab workbench"
-msgstr ""
+msgstr "labor munkalap"
 
 #. ~ Description for lab workbench
 #: lang/json/furniture_from_json.py
@@ -92607,10 +96048,12 @@ msgid ""
 "most chemical spills and burns.  It has wired in electrical and gas "
 "fittings."
 msgstr ""
+"Fém tárolószekrény, felette tartós műgyanta munkalap, amely ellenáll a "
+"legtöbb vegyi anyagnak. Bekötött konnektorral és gázcsövekkel rendelkezik."
 
 #: lang/json/furniture_from_json.py
 msgid "fume hood"
-msgstr ""
+msgstr "füstelszívó"
 
 #. ~ Description for fume hood
 #: lang/json/furniture_from_json.py
@@ -92619,6 +96062,9 @@ msgid ""
 " in the hood draws fumes and smoke from dangerous chemicals up into a "
 "ventilation duct."
 msgstr ""
+"Egy laboratóriumi munkalap felé szerelt fémbúra tartós üveglap oldalakkal. A"
+" fémbúrában található ventilátor a vegyi reakciók során keletkező veszélyes "
+"gázokat és füstöt szívja el."
 
 #: lang/json/furniture_from_json.py
 msgid "shaker incubator"
@@ -92848,9 +96294,9 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -92920,7 +96366,7 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -92973,6 +96419,8 @@ msgid ""
 "A porcelain throne.  Emergency water source, from the tank, and provider of "
 "relief."
 msgstr ""
+"Egy porcelán trón. Vész esetén vízforrás a tartályból, valamint a "
+"megkönnyebbülés helye."
 
 #: lang/json/furniture_from_json.py
 msgid "water heater"
@@ -93086,7 +96534,7 @@ msgstr "futópad"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
+" taken apart for its… parts."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -93112,7 +96560,7 @@ msgstr "zongora"
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -93271,6 +96719,17 @@ msgstr "zsámoly"
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr ""
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "hirdetőtábla"
@@ -93745,7 +97204,7 @@ msgstr ""
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
 msgstr ""
 
@@ -93819,11 +97278,11 @@ msgid "This beaded curtain could be pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
+msgid "clickity clack… clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
+msgid "clickity clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -93836,7 +97295,7 @@ msgid "This beaded curtain has been pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
+msgid "clickity clack… clack… clack!"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -93982,8 +97441,7 @@ msgstr "szeméthalom"
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -94504,6 +97962,15 @@ msgid ""
 "blood, candles, and other small knick-knacks."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr ""
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr "csatt!"
@@ -94533,8 +98000,8 @@ msgstr "A kapu nyitva!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
-msgstr "Elfordítod a kilincset..."
+msgid "You turn the handle…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -94553,8 +98020,8 @@ msgstr "A pajta ajtaja nyitva!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
-msgstr "Meghúzod a kötelet..."
+msgid "You pull the rope…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -94588,8 +98055,8 @@ msgstr "Az ajtó felemelkedik!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
-msgstr "Elfordítod a fogantyút..."
+msgid "You throw the lever…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -94783,11 +98250,8 @@ msgstr[1] ""
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr ""
-"Egyetlen darab fából készített primitív íj, kifejezetten a használó személy "
-"számára készült. Gyenge és eszméletlenül pontatlan, úgyhogy annyira azért "
-"nem jó..."
 
 #: lang/json/gun_from_json.py
 msgid "short bow"
@@ -95001,9 +98465,7 @@ msgstr ""
 "gyenge fegyver, apróvadra jó. A fegyverből kilőtt tüskék jó eséllyel "
 "sértetlenül megmaradnak és újra használhatók."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "pisztoly"
@@ -95205,6 +98667,18 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "dobás"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -95300,6 +98774,10 @@ msgstr ""
 "létrejötte után polimerrel fed be. A pusztító fegyver hatósugara sajnos nem "
 "túl magas. Energiáját az ET biztosítja."
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "félautomata"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -95309,10 +98787,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -95332,8 +98810,7 @@ msgstr ""
 "képes. A fegyvert csövekből és egy kétlövetű sörétes puska csövéből "
 "készítették."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "sörétes puska"
@@ -95528,6 +99005,10 @@ msgstr ""
 "Egy tűzoltóautó vízágyúja. Járműre szerelve tüzek olthatók vele, vagy éppen "
 "tüntetők is."
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -95839,8 +99320,8 @@ msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 
@@ -95949,10 +99430,6 @@ msgstr ""
 "garanciát is érvényteleníti. Ezen a csupasz proto-fegyveren nincs hely "
 "utángyártott módosítások felszerelésére."
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "félautomata"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -96583,15 +100060,10 @@ msgstr[1] ""
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
-"Az M24 Sniper a Remington Model 700 katonai és rendészeti használatra "
-"gyártott változata. Az M24 elnevezést az amerikai hadseregtől kapta, amikor "
-"1988-ban a hadseregbe rendszeresített mesterlövész puskává vált. Az M24-et "
-"fegyverrendszernek is nevezik, mivel nem csak magából a lőfegyverből áll, "
-"hanem egy lecsatolható célteleszkópból, valamint számos egyéb kellékből is."
 
 #: lang/json/gun_from_json.py
 msgid "HK417 A2"
@@ -96757,20 +100229,17 @@ msgstr ""
 "tönkre menne..."
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
 msgstr[0] ""
 msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
 msgstr ""
-"A COP .38 egy négylövéses derringer pisztoly, amely ránézésre hasonlít a "
-"Mossberg Brownie-ra. Robert Hillberg tervezte a korábbi, szintén általa "
-"megtervezett Hillberg Insurgency Weapon tervei alapján."
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -96806,20 +100275,6 @@ msgstr ""
 "Hétlövetű .38-as kaliberű Smith & Wesson revolver. Jellemzői közé tartozik a"
 " fixen rögzített hátsó célzótüske és a megerősített váz."
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr ""
-"Népszerű .38-as kaliberű pisztoly. Számos biztonsági funkció "
-"figyelembevételével tervezték, és minőségi, tartós anyagból gyártották."
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -96887,10 +100342,22 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
 msgid_plural "M1911A1s"
@@ -96992,9 +100459,9 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -97020,8 +100487,9 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -97435,8 +100903,9 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -98566,9 +102035,9 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -98580,8 +102049,8 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -98597,7 +102066,7 @@ msgstr[1] ""
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -98610,7 +102079,7 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
@@ -98623,10 +102092,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
 
@@ -98639,10 +102108,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -99397,10 +102866,6 @@ msgid ""
 "and destruction it can cause."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr ""
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -100365,10 +103830,62 @@ msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -100492,12 +104009,6 @@ msgstr ""
 "könnyebb felhúzni. A fegyverből kilőtt lövedékek jó eséllyel maradnak egyben"
 " és újra felhasználhatók."
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -101617,7 +105128,7 @@ msgstr ""
 msgid "accessories"
 msgstr "kellék"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "íj"
@@ -101751,7 +105262,7 @@ msgstr[1] ""
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
+"it's a bug.  50x more UPS drain."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -101920,8 +105431,8 @@ msgstr[1] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -101949,7 +105460,7 @@ msgstr[1] ""
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
+"energy efficiency.  Decreases power consumption."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -101964,12 +105475,9 @@ msgstr[1] "magas energiasűrűségű kondenzátor"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
 msgstr ""
-"Ez a magasabb energiasűrűséggel rendelkezõ kondenzátor növeli a fegyver "
-"hatótávolságát és sebzését, viszont lényegesen magasabb "
-"energiafelhasználással jár."
 
 #: lang/json/gunmod_from_json.py
 msgid "Leadworks magazine adapter"
@@ -102193,6 +105701,20 @@ msgstr ""
 "átirányításával. Javít a fegyver visszarúgásán, de növeli a fegyver méretét "
 "és zaját, valamint némileg csökkenti a pontosságot."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
 msgid_plural "homemade suppressors"
@@ -102338,6 +105860,20 @@ msgstr ""
 msgid "rail"
 msgstr "kelléksín"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
@@ -102352,6 +105888,19 @@ msgstr ""
 "A 45 fokban elfordított céltüske akkor használatos, amikor céltávcső vagy "
 "egyéb módosítás miatt az beépített céltüske nem használható."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
@@ -102364,6 +105913,18 @@ msgstr ""
 "Még egy kelléksín, ami 45 fokban lett elforgatva, és amelyre így egy második"
 " optikát lehet felcsatolni."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
@@ -102395,6 +105956,20 @@ msgstr ""
 " átfutó rezgéseket, ezzel jelentősen csökkenti a visszarúgást és némileg "
 "növeli a pontosságot."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -102518,6 +106093,20 @@ msgid ""
 " mrad increments and is remarkably small and light for its magnification."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
@@ -102530,6 +106119,19 @@ msgid ""
 "crosshair."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
 msgid_plural "RS1219 scopes"
@@ -102742,6 +106344,21 @@ msgstr ""
 "hatásainak kezelését nagyban javítják, csak bizonyos felületeken használható"
 " és lassan lehet felszerelni."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -102784,6 +106401,19 @@ msgstr ""
 "A puskacső elé helyezett markolat jobb irányítást tesz lehetővé. Nem annyira"
 " hatékony, mint a bipod, de minden körülmények között használható."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
@@ -102856,6 +106486,20 @@ msgstr ""
 "már bármilyen karabélyhoz fel lehet csatolni. Felszerelése után a gránátvető"
 " csőbe egy darab 40mm-es gránátot lehet betárazni majd kilőni."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
@@ -102873,6 +106517,21 @@ msgstr ""
 " mérettel, némileg csökkent pontosság árán. Az M320-at lehet puska alá "
 "szerelni, vagy pedig saját puskatussal ellátva önálló fegyverként használni."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "masterkey shotgun"
 msgid_plural "masterkey shotguns"
@@ -102888,6 +106547,20 @@ msgstr ""
 "Miniatürizált pumpás sörétes puska, amelyet számos karabély csöve alá lehet "
 "csatolni. Négy sörétes puska lőszert lehet betárazni és kilőni."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
 msgid_plural "40mm pipe launchers"
@@ -102896,12 +106569,9 @@ msgstr[1] "40mm-es gránátvető cső"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
 msgstr ""
-"Ezt a házi készítésű gránátvető csövet bármilyen karabélyhoz fel lehet "
-"csatolni. Felszerelése után a gránátvető csőbe egy darab 40 mm-es gránátot "
-"lehet betárazni majd kilőni."
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -102933,6 +106603,20 @@ msgstr ""
 "A Rivtech RM121 betárazós sörétes félautomata sörétes puskát számos karabély"
 " alá lehet csatolni. RMSA10 dobozos lőszertárat lehet betárazni."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
 msgid_plural "underslung shotguns"
@@ -102947,6 +106631,20 @@ msgstr ""
 "Rövid duplacsövű sörétes puska, amelyet számos karabély csöve alá lehet "
 "csatolni. Kettő sörétes puska lőszert lehet betárazni és kilőni."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
 msgid_plural "LW underbarrel laser sights"
@@ -103251,6 +106949,58 @@ msgstr ""
 "ezért minden lövéshez energia kell, valamint a széles körű módosítások miatt"
 " a fegyver ET nélkül üzemképtelenné válik."
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -105224,9 +108974,10 @@ msgstr "Sugárzásmérés"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
-msgstr "..."
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
+msgstr ""
 
 #: lang/json/item_action_from_json.py
 msgid "Control an RC car"
@@ -105287,7 +109038,7 @@ msgstr "Hát, tudod"
 
 #: lang/json/item_action_from_json.py
 msgid "Wash soft items"
-msgstr ""
+msgstr "Puha tárgyak kimosása"
 
 #: lang/json/item_action_from_json.py
 msgid "Wash hard items"
@@ -105878,6 +109629,13 @@ msgstr ""
 msgid "This bionic can provide power to powered armor."
 msgstr "Ez a bionika energiával látja el a szervópáncélt."
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr ""
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -107416,6 +111174,7 @@ msgstr "Egyedi szín eltávolítása"
 msgid "Load color template"
 msgstr "Színsablon betöltése"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -109981,7 +113740,7 @@ msgstr ""
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -110024,39 +113783,6 @@ msgid ""
 "Lasts 2 turns."
 msgstr ""
 
-#: lang/json/martial_art_from_json.py
-msgid "Zui Quan"
-msgstr "Cuj csün"
-
-#. ~ Description for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
-msgstr ""
-"Másnéven részeges bokszolás. A cuj csün egy részeg ember mozgásait imitálva "
-"zavarja össze az ellenfelet, így az intelligenciád alapján egy passzív "
-"kitérési bónuszt kapsz. A támadásod utáni körben hátrány nélkül térhetsz ki "
-"bármennyi támadás elől, és egy sikeres kitérés esetén az intelligenciád "
-"alapján további támadási sebzés és találati arány bónuszt kapsz."
-
-#. ~ Description of buff for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "A kitérési képességet az intelligencia növeli"
-
-#: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
-msgstr "Ellencsapás"
-
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
-msgstr "Sikeres kitérés után még több sebzés és találati esély"
-
 #: lang/json/martial_art_from_json.py
 msgid "Tiger Kung Fu"
 msgstr "Tigris kung fu"
@@ -110078,37 +113804,27 @@ msgstr "Tigris dühe"
 
 #. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "+3 zúzás / támadás"
-
-#: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "Tigris ereje"
-
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
-#: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "Az erő további sebzési bónuszt ad."
-
-#: lang/json/martial_art_from_json.py
-msgid "Debug Mastery"
-msgstr "Debug mester"
-
-#. ~ Description for martial art 'Debug Mastery'
-#: lang/json/martial_art_from_json.py
-msgid "A secret martial art used only by developers and cheaters."
-msgstr "Titkos harcművészet, amelyet csak a fejlesztők és a csalók ismernek."
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Elemental resistance"
-msgstr "Elemi ellenállás"
+msgid "Tiger's Strength"
+msgstr ""
 
-#. ~ Description of buff 'Elemental resistance' for martial art 'Debug
-#. Mastery'
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
 #: lang/json/martial_art_from_json.py
+#, no-python-format
 msgid ""
-"+Strength bash armor, +Dexterity acid armor, +Intelligence electricity "
-"armor, +Perception fire armor."
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -110125,13 +113841,119 @@ msgid ""
 "get back to hitting."
 msgstr ""
 
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr ""
+
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
+
 #: lang/json/martial_art_from_json.py
 msgid "Chi-Sao Sensitivity"
 msgstr ""
 
 #. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
 #: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Zui Quan"
+msgstr "Cuj csün"
+
+#. ~ Description for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Zui Quan Stance"
+msgstr ""
+
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Advanced Zui Quan"
+msgstr ""
+
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Drunken Stumble"
+msgstr ""
+
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Drunken Dodging"
+msgstr ""
+
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Debug Mastery"
+msgstr "Debug mester"
+
+#. ~ Description for martial art 'Debug Mastery'
+#: lang/json/martial_art_from_json.py
+msgid "A secret martial art used only by developers and cheaters."
+msgstr "Titkos harcművészet, amelyet csak a fejlesztők és a csalók ismernek."
+
+#: lang/json/martial_art_from_json.py
+msgid "Elemental resistance"
+msgstr "Elemi ellenállás"
+
+#. ~ Description of buff 'Elemental resistance' for martial art 'Debug
+#. Mastery'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"+Strength bash armor, +Dexterity acid armor, +Intelligence electricity "
+"armor, +Perception fire armor."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -110287,13 +114109,11 @@ msgstr "Varangy kung fu"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
 msgstr ""
-"Egyike az Öt Halálos Méregnek. A varangy stílus mesterei minden támadás "
-"ellen képesek fókuszálni. Várakozással meditálhatsz, ezzel páncélt kapsz, "
-"bár mozgásnál ezt el is veszted."
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -110301,8 +114121,11 @@ msgstr "Varangy vasbőre"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "Akár +6 páncél, ha mozdulatlan maradsz."
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -110311,8 +114134,12 @@ msgstr "Vasbõr meglágyul"
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
-msgstr "Mozgáskor a vasbőröd meglágyul!"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Viper Kung Fu"
@@ -110321,41 +114148,49 @@ msgstr "Vipera kung fu"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
 msgstr ""
-"Egyike az Öt Halálos Méregnek. A vipera stílus egy egyedi háromrészes "
-"kombinációból áll, ami egy kitérésnél kezdődik, majd egy kábító ütéssel "
-"folytatódik és a legendás viperaütéssel ér véget."
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "Viperaszorítás"
+msgid "Viper's Patience"
+msgstr ""
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
-msgstr "Pontosan haraptál! A következő támadásod a viperaütés lesz!"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "Vipera türelem"
+msgid "Viper's Ambush"
+msgstr ""
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
 msgstr ""
-"+2 kitérés. Egy támadás elleni kitéréssel kezdődik a vipera kombináció."
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
-msgstr "Vipera rajtaütés"
+msgid "Viper's Venom"
+msgstr ""
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
-msgstr "Becsalogattad őket! A következő támadásod egy viperaharapás lesz."
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "C.R.I.T Blade-work"
@@ -110736,6 +114571,10 @@ msgstr "ólom"
 msgid "Leather"
 msgstr "bőr"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "tejtermék"
@@ -110800,6 +114639,10 @@ msgstr "szuperötvözet"
 msgid "layered carbide"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Tin"
 msgstr ""
@@ -110910,6 +114753,10 @@ msgstr ""
 msgid "Arcane Skin"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr ""
@@ -110919,7 +114766,7 @@ msgid "Sugar"
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
+msgid "Gather bones for the Brigitte.  About 8 should do it."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -114396,8 +118243,8 @@ msgstr ""
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -117029,8 +120876,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -117040,7 +120887,7 @@ msgstr ""
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
 msgstr ""
 
@@ -117163,7 +121010,7 @@ msgstr ""
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
 msgstr ""
 
@@ -117266,6 +121113,27 @@ msgstr ""
 "A többieknél gyorsabban tudsz haladni, ezért biztos talajon 15% bónuszt "
 "kapsz a sebességedhez."
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr ""
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr ""
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr ""
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "Jó hallású"
@@ -117803,13 +121671,10 @@ msgstr "Ajzószeres pszichózis"
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
-"Egyedüli és régi történeted van az ajzószerekkel (például a kávéval vagy az "
-"amfetaminokkal). Sokkal többet vehetsz be túladagolás nélkül, de ha túl "
-"sokat tolsz, akkor elkezdesz dolgokat látni..."
 
 #. ~ Description for Stylish
 #: lang/json/mutation_from_json.py
@@ -117966,6 +121831,18 @@ msgid ""
 " Pentjak Silat, or Sōjutsu."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr ""
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
 msgstr "Enyhe szagú"
@@ -118806,11 +122683,9 @@ msgstr "Elfszemű"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
 msgstr ""
-"A szemed színe bezöldült. Nehéz pontosan megmondani, hogy mennyire zöld, "
-"mert az árnyalata állandóan változik. Összességében kellemes hatást kelt."
 
 #: lang/json/mutation_from_json.py
 msgid "Fey Vision"
@@ -119714,11 +123589,8 @@ msgstr "Marloss hordozó"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
+"nose, and you have a strong desire to try some seeds and… sap?"
 msgstr ""
-"Mióta megetted azt a Marloss bogyót, nem tudod kiűzni az illatát az "
-"orrodból, és nagyon, nagyon szeretnél megint enni a magvakból és a... "
-"nedvből?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vessel"
@@ -119728,10 +123600,8 @@ msgstr "Marloss tartó"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
+"tongue, and you have a strong desire to try some berries and… sap?"
 msgstr ""
-"Mióta megetted azt a Marloss magvat, nem tudod elűzni az ízét az nyelvedről,"
-" és nagyon, nagyon szeretnél megint enni a bogyókból és a... nedvből?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vector"
@@ -120129,8 +123999,8 @@ msgid ""
 "standing over your target, and pressing E."
 msgstr ""
 "Az emésztőrendszered felkészült a cellulóz és egyéb növényi anyag "
-"befogadására. Aktiválása után megeheted a bokrokat és a cserjéket - elég "
-"föléjük állni és megnyomni az Shift-E gombot."
+"befogadására. Aktiválása után megeheted az aljnövényzetet és a cserjéket - "
+"elég föléjük állni és megnyomni az Shift-E gombot."
 
 #: lang/json/mutation_from_json.py
 msgid "Grazer"
@@ -120143,7 +124013,7 @@ msgid ""
 "grass as well as underbrush and shrubs.  Eat either one by activating this, "
 "standing over your target, and pressing E."
 msgstr ""
-"Megszoktad, hogy közvetlenül lelegeled a növényeket, és a bokrokon és a "
+"Megszoktad, hogy közvetlenül lelegeled a növényeket, az aljnövényzeten és a "
 "cserjéken túl már fűvel is tudsz táplálkozni. Aktiválása után elég föléjük "
 "állni és megnyomni az Shift-E gombot."
 
@@ -120190,12 +124060,9 @@ msgstr "Kardfogú"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
 msgstr ""
-"Az agyaraid elképesztően hosszúra és élesre nőttek. Sajnos ezért a szád elé "
-"már semmit sem tehetsz fel, és még enni is nehéz... viszont nagyon csúnyát "
-"tudsz harapni."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
@@ -121610,11 +125477,9 @@ msgstr "Pofa"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
 msgstr ""
-"Az arcod és az állkapcsod... megváltozott. Maszkot még fel tudsz venni, de "
-"láthatóan mutáns vagy."
 
 #: lang/json/mutation_from_json.py
 msgid "Bovine Snout"
@@ -122469,13 +126334,12 @@ msgstr "Ektoterm"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
-"A tested visszafordíthatatlanul hidegvérűvé vált. A sebességed 18,3 C fok "
-"alatt 1,1 fokonként 1%-kal csökken, felette ugyanennyivel nő."
 
 #: lang/json/mutation_from_json.py
 msgid "Growling Voice"
@@ -122820,10 +126684,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
+"every need… but how would you keep them in line?"
 msgstr ""
-"De jó lenne királynőnek lenni, a dolgozók minden igényt kiszolgálnának... de"
-" hogyan tartom őket kordában?"
 
 #. ~ Description for Plant
 #: lang/json/mutation_from_json.py
@@ -122840,11 +126702,9 @@ msgstr "Vízlakó"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
 msgstr ""
-"Mi volt az a régi reklám, fesd be a világot? Hosszútávú célnak megtesz, de "
-"most..."
 
 #: lang/json/mutation_from_json.py
 msgid "Subterranean"
@@ -124549,8 +128409,8 @@ msgid "Scientist"
 msgstr "Tudós"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
-msgstr "Arra utaló jeleket keresek, hogy ezek a szörnyek honnan származnak..."
+msgid "I'm looking for clues concerning these monsters' origins…"
+msgstr ""
 
 #: lang/json/npc_class_from_json.py
 msgid "Bounty Hunter"
@@ -124613,7 +128473,7 @@ msgid "Real Person"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -124629,7 +128489,7 @@ msgid "Foodperson"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
@@ -124637,7 +128497,7 @@ msgid "Cyborg"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -124781,6 +128641,14 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr ""
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
+msgstr ""
+
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 #: lang/json/npc_from_json.py
 msgid "Captive"
@@ -126331,6 +130199,10 @@ msgstr "bevásárlóközpont tető"
 msgid "hotel parking"
 msgstr "szálloda parkoló"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "hotel"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "szálloda bejárat"
@@ -126700,7 +130572,7 @@ msgid "spiked trench"
 msgstr "hegyes karókkal kibélelt árok"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
+msgid "fabrication workshop survey"
 msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
@@ -126715,6 +130587,14 @@ msgstr "kovácsműhely"
 msgid "livestock survey"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr ""
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr ""
@@ -127400,6 +131280,10 @@ msgstr "lőtér"
 msgid "shooting range roof"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "golfpálya"
@@ -128066,10 +131950,6 @@ msgstr "robotdiszpécser-központ"
 msgid "dense urban"
 msgstr "lakótelepi ház"
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "hotel"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "iskola"
@@ -128090,6 +131970,10 @@ msgstr ""
 msgid "mechanics garage"
 msgstr "gépészeti szervíz"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
 msgstr "szennyvíztisztító"
@@ -133036,6 +136920,36 @@ msgid ""
 "on. This displeases you."
 msgstr ""
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -136097,11 +140011,6 @@ msgstr "LÁBFEJ"
 msgid "MEDICAL"
 msgstr "ORVOSI"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "TÁROLÁS"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -137087,7 +140996,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
 msgstr ""
 
@@ -137144,7 +141053,7 @@ msgstr ""
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
+"grab a pot.  Let's put it in that dining area."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -137824,7 +141733,7 @@ msgid "build 2 wood stoves"
 msgstr ""
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
+msgid "We should build a well.  This will make cooking more convenient."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -138321,6 +142230,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr ""
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -138341,8 +142426,8 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -138447,7 +142532,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
 msgstr ""
 
@@ -138457,7 +142542,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
 msgstr ""
 
@@ -138467,7 +142552,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
 msgstr ""
 
@@ -138899,7 +142984,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
+"Some benches around the outside would be nice.  Build some to the northwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -138908,7 +142993,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
+"Some benches around the outside would be nice.  Build some to the northeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -138917,7 +143002,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
+"Some benches around the outside would be nice.  Build some to the southeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -138926,7 +143011,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
+"Some benches around the outside would be nice.  Build some to the southwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -139168,6 +143253,10 @@ msgstr ""
 msgid "Central Storage Building"
 msgstr ""
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr ""
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
 msgstr ""
@@ -140555,6 +144644,44 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr ""
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -145541,13 +149668,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
+msgid "Pass some ethanol, I need to power my ethanol burner."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -145555,20 +149676,12 @@ msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
+msgid "I require ethanol for my internal power supply.  Anything on you?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -152384,7 +156497,7 @@ msgid "a static hissing sound."
 msgstr "egy állandó sziszegő hang."
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152398,11 +156511,11 @@ msgid "\"Hold on, I want to pulp that zombie corpse.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
+msgid "\"Burning… from the inside…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
+msgid "\"This smell…  Don't know…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152414,19 +156527,19 @@ msgid "a scraping noise."
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
+msgid "\"No…  Stop the burning!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
+msgid "\"Hunger…  Must eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
+msgid "\"Run…  Chase…  Eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152550,7 +156663,7 @@ msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
+msgid "\"Can't… breathe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152563,8 +156676,8 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152576,7 +156689,7 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152584,11 +156697,11 @@ msgid "\"This is a dream.  This has to be a dream.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
+msgid "\"This is my life now… this is my life now… this is my life now…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
+msgid "\"Wanna go home…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152644,7 +156757,7 @@ msgstr ""
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152667,18 +156780,18 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152801,7 +156914,7 @@ msgid "\"Police inbound.  Stay where you are!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152822,7 +156935,7 @@ msgid "\"FoodPlace: It's the Calories.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -152890,8 +157003,8 @@ msgid "You shouldn't have done that."
 msgstr "Te vagy a legjobb!"
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
-msgstr "Játsszunk... Orosz rulettet."
+msgid "Let's play… Russian roulette."
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "I hate you."
@@ -152902,8 +157015,8 @@ msgid "Go kill yourself!"
 msgstr "Öld meg magad!"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
-msgstr "A Nagy Testvér figyel..."
+msgid "Big Brother is watching you…"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Die for me!"
@@ -152914,12 +157027,12 @@ msgid "Why won't you die?"
 msgstr "Miért nem halsz meg?"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
-msgstr "Vééér... Finom."
+msgid "Blood…  Delicious."
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
-msgstr "Találkozunk.. A POKOLBAN!"
+msgid "See you… IN HELL!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "AAAIEEEEEEE!"
@@ -152934,8 +157047,8 @@ msgid "What did you do with my Mommy?"
 msgstr "Mit csináltál a mamával?"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
-msgstr "Maradj velem... örökre!"
+msgid "Stay with me… forever!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Hey kids.  Want some candy?"
@@ -154333,6 +158446,10 @@ msgstr "Guberálók bunkere"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#: lang/json/start_location_from_json.py
+msgid "Wizard's lake retreat"
+msgstr ""
+
 #: lang/json/start_location_from_json.py
 msgid "Candy Shop"
 msgstr ""
@@ -154382,16 +158499,16 @@ msgid "You there. Quiet down. Can you hear it? The song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
+msgid "What?  What do you mean?  What song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
+msgid "So about the songs…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
 msgstr ""
 
@@ -154408,7 +158525,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154418,11 +158535,11 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
+msgid "What?  Singing bones?  What are you talking about?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154471,7 +158588,7 @@ msgid "I will bear that in mind"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154483,7 +158600,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
+msgid "End the world?  What?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154495,8 +158612,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154511,7 +158628,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
+msgid "I… thank you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154540,28 +158657,28 @@ msgid "That is all for now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgid "A song may yet be sung by you, should you wish to."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
+msgid "There is an additional song you could take on, if you'd like."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
+msgid ""
+"I know of certain bones that could be of use, if you'd like to know more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "A song may yet be sung by you, should you wish to."
+msgid "There are bones to etch, songs to sing. Wish to join me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There is an additional song you could take on, if you'd like."
+msgid "Do you wish to take on more songs?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid ""
-"I know of certain bones that could be of use, if you'd like to know more."
+msgid "Do you believe you can take on the burden of additional bones?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154585,7 +158702,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154593,7 +158710,7 @@ msgid "Not interested."
 msgstr "Nem érdekel."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
+msgid "Consider it done.  But I also wanted to ask…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154609,7 +158726,7 @@ msgid "I'm off then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154619,7 +158736,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
+msgid "I see.  Very well then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154637,11 +158754,11 @@ msgid "I am glad to hear it. Let's go then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
+msgid "Maybe some other time.  Changing the topic…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154663,17 +158780,17 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
 
@@ -154685,6 +158802,10 @@ msgstr ""
 msgid "Skip it, let's get going."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr ""
@@ -154742,13 +158863,25 @@ msgid "What about chit-chatting and your background?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -154792,7 +158925,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154815,7 +158950,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154854,8 +158991,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
 
@@ -154863,6 +159000,10 @@ msgstr ""
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -154920,11 +159061,27 @@ msgid ""
 "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -154935,6 +159092,10 @@ msgstr ""
 msgid "Tell me more about the activities you can do now."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -155141,19 +159302,19 @@ msgid "Let's go."
 msgstr "Menjünk."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
-msgstr "Változtassunk a támadási szabályokon..."
+msgid "Change your engagement rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
-msgstr "Változtassunk a célzási szabályokon..."
+msgid "Change your aiming rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
+msgid "Change your bionic power reserve rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
+msgid "Change your bionic power recharge rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -155165,11 +159326,11 @@ msgid "Stick close to me, no matter what."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
+msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_false_text>"
+msgid "<ally_rule_follow_distance_2_true_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -155429,7 +159590,7 @@ msgid "Nah, I'm just kidding."
 msgstr "Áh, csak hülyéskedek."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
+msgid "Please go to this location…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -155559,7 +159720,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
+msgid "Oh you know, not bad, not bad…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -155648,11 +159809,11 @@ msgid "&Put hands up."
 msgstr "&Felteszed a kezeidet."
 
 #: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
+msgid "*drops_her_weapon."
 msgstr "*elejti a fegyverét."
 
 #: lang/json/talk_topic_from_json.py
-msgid "*drops_her_weapon."
+msgid "*drops his weapon."
 msgstr "*elejti a fegyverét."
 
 #: lang/json/talk_topic_from_json.py
@@ -155668,12 +159829,12 @@ msgid "Okay, I'm going."
 msgstr "Jól van na, megyek már."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
-msgstr "Ami azt a melót illeti..."
+msgid "About that job…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
-msgstr "Ami azt az egyik melót illeti..."
+msgid "About one of those jobs…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "What's the matter?"
@@ -155692,19 +159853,19 @@ msgid "I don't have any more jobs for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
+msgid "I have another job for you.  Want to hear about it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
+msgid "I just have one job for you.  Want to hear about it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have another job for you.  Want to hear about it?"
+msgid "I have other jobs for you.  Want to hear about them?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I just have one job for you.  Want to hear about it?"
+msgid "I have more jobs for you.  Want to hear about them?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
@@ -155765,8 +159926,8 @@ msgid "Whatever.  Bye."
 msgstr "Mindegy. Csá."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
-msgstr "Sajnálom... de nem sikerült."
+msgid "I'm sorry…  I failed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not yet."
@@ -155785,7 +159946,7 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "Még nem, szia!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
+msgid "Yup!  Here it is!"
 msgstr "Aha! Íme!"
 
 #: lang/json/talk_topic_from_json.py
@@ -156043,8 +160204,8 @@ msgid "Alright.  You can lead now."
 msgstr "Rendben, te vagy a főnök."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
-msgstr "Szuper. Akkor valami mást..."
+msgid "Good.  Something else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alright, let's go."
@@ -156123,8 +160284,8 @@ msgid "I'd prefer to keep that to myself."
 msgstr "Azt jobban szeretném magamnak megtartani."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
-msgstr "Értem..."
+msgid "I understand…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "You just asked me for stuff; ask later."
@@ -156147,8 +160308,8 @@ msgid "Because I'm your friend!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
-msgstr "Hát, végül is én segítek neked..."
+msgid "Well, I am helping you out…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'll give it back!"
@@ -156195,15 +160356,15 @@ msgid "No, I'm keeping it. Try and take it off me, I dare you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
+msgid "Look, I really need this.  Please let me have it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
+msgid "What, this?  It's not the same one, you are mistaken."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
+msgid "I'm sorry.  Look, I already dropped it, okay?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156211,7 +160372,7 @@ msgid "Don't try and talk yourself out of this, drop it now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
+msgid "Okay, I'm dropping it…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156273,8 +160434,8 @@ msgid "Pleasure doing business!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
-msgstr "Többet fogtok látni..."
+msgid "You might be seeing more of me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey again. *kzzz*"
@@ -156287,21 +160448,21 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
+msgid "Hey.  Let's chat for a second."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
+msgid "That's because I saved you.  Listen, I could use your help…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156313,7 +160474,7 @@ msgid "Come with me. We can help each other out."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
+msgid "We both go our separate ways.  Enjoy your freedom."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156330,8 +160491,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156352,7 +160513,7 @@ msgid "Get out of my sight."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156368,7 +160529,7 @@ msgid "Not if I kill you first!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
+msgid "I'm sorry!  I shouldn't have said that!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156409,13 +160570,36 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
+msgid "Give me an overview of how camps work."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156436,61 +160620,119 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, we can talk with radios?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
+msgid "Tell me about expansions."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
+msgid "Got it.  Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156504,6 +160746,14 @@ msgid ""
 "6.  You can now set up faction camps in select buildings.  The list of available buildings is constantly growing, so you'll have to experiment."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -156603,11 +160853,11 @@ msgid "Well, sure."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
+msgid "I'd… rather not."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156638,7 +160888,7 @@ msgid "Oh, but you already have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
+msgid "Yes… yes I have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156703,7 +160953,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
+msgid "Horrible.  Did you get any pictures yourself?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -156855,7 +161105,7 @@ msgid "This is a npc allies 1 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
+msgid "This an error!  npc allies 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157055,7 +161305,7 @@ msgid "This is a u_has_items beer test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
+msgid "Test failure!  This is a u_has_items test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157067,7 +161317,7 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157155,7 +161405,7 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157211,11 +161461,7 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
+msgid "Greetings…  Foodperson?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157257,7 +161503,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
+msgid "Ah…  Well, nice to meet you Foodperson."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157285,7 +161531,7 @@ msgid "Sure, whatever."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
+msgid "Ok…  I believe you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157381,7 +161627,7 @@ msgid "That sounds great!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
+msgid "Ok…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157389,7 +161635,7 @@ msgid "I need to think about it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
+msgid "Huh…  No thanks."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -157406,7 +161652,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr ""
 
@@ -158160,7 +162406,7 @@ msgid "Giant bees?  Tell me more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
+msgid "But bees aren't usually aggressive…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158172,7 +162418,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158592,7 +162838,7 @@ msgid "No.  I can't.  Just, no."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
+msgid "Sorry…  I'll let you be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158828,7 +163074,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
+msgid "Okay…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159197,7 +163443,7 @@ msgid "What do you think happened?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
+msgid "That does sound a little crazy…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159246,7 +163492,7 @@ msgid "What happened to you after that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
+msgid "It can't be healthy to abandon your past like that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159690,7 +163936,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
+msgid "Do you mean in a religious sense, or…?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160010,8 +164256,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160122,7 +164368,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
+msgid "Oh, I'm sorry…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160449,7 +164695,7 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
+msgid "I'd like to ask you something else…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160740,7 +164986,8 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160924,16 +165171,16 @@ msgid "What do you need done?"
 msgstr "Mit kell megcsinálni?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
-msgstr "Ami azt a küldetést illeti..."
+msgid "About the mission…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
-msgstr "Ami az egyik küldetést illeti..."
+msgid "About one of those missions…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
-msgstr "Mennem kell..."
+msgid "I've got to go…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -160948,8 +165195,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
-msgstr "Egész jó ötletnek tűnik..."
+msgid "Seems like a decent plan…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -160966,9 +165213,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
+msgid "Whatever they did it must have worked since we are still alive…"
 msgstr ""
-"Bármit is csináltak biztos jól csinálták, mert még mindig életben vagyunk..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Marshal, I'm rather surprised to see you here."
@@ -161002,8 +165248,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
-msgstr "Akkor megpróbálom megkeresni a parancsnokot..."
+msgid "I'll try and find your commander then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -161061,8 +165307,8 @@ msgid "Hey miss, don't you think it would be safer if you stuck with me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
-msgstr "Ne is figyelj rám..."
+msgid "Don't mind me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -161325,7 +165571,7 @@ msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
+msgid "About that shopping list of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161391,7 +165637,7 @@ msgid "Would you like me to give you some cardboard?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
+msgid "I think I have to get going…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161420,7 +165666,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
+msgid "…What were you saying before?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161438,7 +165684,7 @@ msgid "No."
 msgstr "Nem."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161530,7 +165776,7 @@ msgid "I found a sample of alien fungus for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
+msgid "Ok… see ya."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161628,8 +165874,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161661,7 +165907,7 @@ msgid "You sound more optimistic than usual."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161781,7 +166027,7 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161889,7 +166135,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162288,7 +166534,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162544,7 +166790,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
+msgid "About that sourdough starter you had me looking for…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -162838,7 +167084,7 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
+msgid "Yes, yes I would… you monster."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -163034,6 +167280,10 @@ msgid ""
 "idea of trying it."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -163288,7 +167538,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -163714,7 +167964,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr ""
 
@@ -164407,7 +168657,7 @@ msgid "Are you looking to buy anything else?"
 msgstr "Valami mást is vásárolnál?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
+msgid "Very well… let's talk about something else."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -164725,7 +168975,7 @@ msgid "Have you seen anyone who might be hiding something?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
+msgid "Bye…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -164739,7 +168989,7 @@ msgid "Keep your head down and stay out of my way."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
+msgid "OK…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -164747,7 +168997,7 @@ msgid "Like what?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
+msgid "I'm not sure…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -164767,7 +169017,7 @@ msgid "Got something to hide?"
 msgstr "Rejtegetsz valamit?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
+msgid "Sorry, I didn't mean to offend you…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -164819,7 +169069,7 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
+msgid "I heard this place was a refugee center…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -164843,8 +169093,8 @@ msgid "Can I do anything for the center?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
-msgstr "Gondoltam elkelne valamiféle segítség..."
+msgid "I figured you might be looking for some help…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, I'd better be going.  Bye."
@@ -164894,7 +169144,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
 msgstr ""
 
@@ -164942,7 +169192,7 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
+msgid "Fine…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -164954,7 +169204,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
+msgid "Fine… *coughupyourscough*"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -164985,7 +169235,7 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[ERŐ 11] Jól pofán verek mindenkit!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
+msgid "I guess I'll look somewhere else…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165006,7 +169256,7 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
+msgid "Was hoping for something more…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165107,7 +169357,7 @@ msgid "So what are you doing right now?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
+msgid "Never mind…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165130,7 +169380,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
+msgid "Good luck with that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165174,8 +169424,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
-msgstr "Szar ügy..."
+msgid "Sucks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165193,8 +169443,8 @@ msgstr ""
 "kerítésen vagy egy falon."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
-msgstr "Hát, akkor..."
+msgid "Well, then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165286,7 +169536,7 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
+msgid "You… smelled me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165337,7 +169587,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
+msgid "Great, now my mouth is watering…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165437,7 +169687,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
+msgid "Hmmm…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165482,7 +169732,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
+msgid "I haven't done anything wrong…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165647,7 +169897,7 @@ msgid "Something to say?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
+msgid "I charge hourly, so be quick…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165760,7 +170010,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
+msgid "I guess I could help with that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165871,7 +170121,7 @@ msgid "[$10] I'll get a haircut"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
+msgid "Maybe another time…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165889,7 +170139,7 @@ msgid "Stand still while I get my clippers..."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
+msgid "Thanks…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165909,7 +170159,7 @@ msgid "What do you have on tap?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
+msgid "I'll be going…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165961,8 +170211,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
-msgstr "Akkor majd vele beszélek..."
+msgid "I'll talk to him then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165977,8 +170227,8 @@ msgid "I hope you are here to do business."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
-msgstr "Érdekelne egy mezőgazdasági befektetés..."
+msgid "I'm interested in investing in agriculture…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166004,14 +170254,12 @@ msgid "I imagine we might be able to work something out."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
+msgid "I was wondering if you could install a cybernetic implant…"
 msgstr ""
-"Arra lennék kíváncsi, hogy be tudnál-e építeni egy kibernetikus "
-"implantátumot..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
-msgstr "Segítségre lenne szükségem egy implantátum eltávolításánál..."
+msgid "I need help removing an implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'd like to hire your services."
@@ -166048,8 +170296,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
-msgstr "Lehetne rosszabb is..."
+msgid "It could be worse…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166058,8 +170306,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
-msgstr "Akkor majd velük beszélek..."
+msgid "I'll talk with them then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Can I help you, marshal?"
@@ -166124,8 +170372,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
-msgstr "Remélem érdemes volt ide átköltözni..."
+msgid "Hopefully moving out here was worth it…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166631,12 +170879,12 @@ msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
+msgid "You lash out at %s with a Viper Bite"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
+msgid "<npcname> lash out at %s with a Viper Bite"
 msgstr ""
 
 #: lang/json/technique_from_json.py
@@ -166645,18 +170893,28 @@ msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
+msgid "You hit %s with a spectacular Viper Strike"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr ""
@@ -166699,6 +170957,34 @@ msgstr ""
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr ""
@@ -168444,153 +172730,178 @@ msgid "<npcname> double-handed palm strikes %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
+msgid "Tiger Palm"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble and leer at %s"
+msgid "You land a heavy tiger palm on %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles and leers at %s"
+msgid "<npcname> lands a heavy tiger palm on %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk counter"
+msgid "Tiger Takedown"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
+msgid "You slam %s to the ground"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
+msgid "<npcname> slams %s to the ground"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Tiger Takedown"
+msgid "Straight Punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
+msgid "You deliver a vertical straight punch to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> grabs and grounds %s"
+msgid "<npcname> delivers a vertical straight punch to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "slow strike"
+msgid "Straight Punch (Knockback)"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You slowly strike %s"
+msgid "You force %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
+msgid "<npcname> forces %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
+msgid "L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
+msgid "You deliver a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
+msgid "<npcname> delivers a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Chain Punch"
+msgid "L-hook (Knockback)"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You knock %s back with a solid L-hook"
 msgstr ""
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
+#, python-format
+msgid "<npcname> knocks %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
+msgid "Your attack misses %s but you don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
+msgid "<npcname>'s attack misses %s but they don't let up"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Receive and Counter"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
+#, python-format
+msgid "You receive %s's gift of violence, and return it in kind"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
+#, python-format
+msgid "<npcname> receives %s's attack, and counters"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "ask the way"
+msgid "Drunken Feint"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You miss but keep striking at %s"
+msgid "You stumble and leer at %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
+msgid "<npcname> stumbles and leers at %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "White Crane stumble"
+msgid "Drunk Counter"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
+msgid "You lurch, and your wild swing hits %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
+msgid "<npcname> lurches, and hits %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Receive and Counter"
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You receive %s's gift of violence, and return it in kind"
+msgid "The %s tries to grab <npcname>, but they stumble away!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "slow strike"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> receives %s's attack, and counters"
+msgid "You slowly strike %s"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> slowly strikes %s"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
-msgstr "Lefegyverzet a(z) %st"
+msgid "You phase-strike %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
-msgstr "<npcname> lefegyverzi a(z) %st"
+msgid "<npcname> phase-strikes %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Pressure Crunch"
@@ -169224,7 +173535,7 @@ msgstr ""
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr ""
 
@@ -169235,8 +173546,8 @@ msgstr ""
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -169246,7 +173557,7 @@ msgstr ""
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr ""
 
@@ -170305,7 +174616,7 @@ msgstr ""
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
 msgstr ""
 
@@ -170612,7 +174923,7 @@ msgstr ""
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr ""
 
@@ -170891,10 +175202,10 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
 
 #. ~ Description for juniper tree
@@ -171852,10 +176163,11 @@ msgstr "ATM"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -171960,8 +176272,8 @@ msgstr "centrifuga"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -172575,7 +176887,7 @@ msgstr ""
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
 msgstr ""
@@ -172587,7 +176899,7 @@ msgstr ""
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
 msgstr ""
@@ -172678,6 +176990,13 @@ msgid ""
 " were still running."
 msgstr ""
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr ""
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "homokozó"
@@ -172744,7 +177063,7 @@ msgstr ""
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr ""
 
@@ -172756,7 +177075,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
 msgstr ""
 
@@ -173539,7 +177858,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr ""
 
@@ -174257,7 +178576,7 @@ msgstr "elemző"
 
 #: lang/json/tool_quality_from_json.py
 msgid "concentration"
-msgstr "töménység"
+msgstr "töményítő"
 
 #: lang/json/tool_quality_from_json.py
 msgid "separation"
@@ -174698,7 +179017,7 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
 
 #: lang/json/tutorial_messages_from_json.py
@@ -174768,7 +179087,7 @@ msgstr ""
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr ""
@@ -175117,6 +179436,10 @@ msgstr "Hatüléses motoros sínkocsi"
 msgid "Rail Motorcycle"
 msgstr "Sínmotor"
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr ""
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "Platós teherautó"
@@ -176019,9 +180342,8 @@ msgstr "lekötözött matrac"
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
 msgstr ""
-"Egy járműre rögzített matrac. Bármilyen becsapódás erejét csillapítja."
 
 #. ~ Description for shredder
 #: lang/json/vehicle_part_from_json.py
@@ -176540,13 +180862,9 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr ""
-"Kisméretű mosogatógép. Mosószerrel vagy szappannal, vízzel és elektromos "
-"árammal ellátva jó sok tányért lehet vele elmosni... vagy valami "
-"hasznosabbra is jó, például zombicafatokkal szennyezett KBM megtisztítására."
-" Használatához vizsgáld meg az 'e' gombbal."
 
 #. ~ Description for autoclave
 #: lang/json/vehicle_part_from_json.py
@@ -176741,11 +181059,9 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
 msgstr ""
-"Stabilizáló lábakkal ellátott nagyméretű szélturbina. Szeles időben tölti a "
-"jármű akkumulátorát. Növeli a jármű szél-ellenállását."
 
 #. ~ Description for reinforced solar panel
 #: lang/json/vehicle_part_from_json.py
@@ -177396,6 +181712,14 @@ msgstr ""
 msgid "rail wheel (steerable)"
 msgstr "vonatkerék (kormányozható)"
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr ""
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "úthengerdob"
@@ -179132,6 +183456,10 @@ msgstr "B12-vitamin"
 msgid "Vitamin C"
 msgstr "C-vitamin"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr ""
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr "Nyomd meg a "
@@ -179670,7 +183998,7 @@ msgstr "Beteszel egy lövedéket a(z) %sba."
 msgid "You refill the %s."
 msgstr "Újratöltöd a(z) %st."
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "Ott nem lehet semmit sem meggyújtani."
 
@@ -179686,6 +184014,16 @@ msgstr "Elvesztetted azt a tárgyat, amivel tüzet akartál gyújtani."
 msgid "There is not enough sunlight to start a fire now.  You stop trying."
 msgstr "Nincs elég napfény ahhoz, hogy tüzet gyújts, ne is próbálkozz tovább."
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr ""
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "Megtanultad a(z) %s készséget."
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -179696,11 +184034,6 @@ msgstr "Befejezted a(z) %s készség tanulásának %d. szintjét."
 msgid "You get some training in %s."
 msgstr "Kaptál némi %s képzést."
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "Megtanultad a(z) %s készséget."
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr "Teljesen feltöltötted az elemet."
@@ -179819,15 +184152,22 @@ msgstr "Esély a roncsolásra: <color_light_blue>%.1f</color>%%"
 msgid "Your %s is already fully repaired."
 msgstr "A(z) %s már teljesen meg van javítva."
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr "Jelenleg nem tudod megszerelni a(z) %st."
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgstr ""
+
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr ""
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr ""
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
-msgstr "Sikeresen megszerelted a(z) %st."
+msgid "You are currently unable to mend the %s."
+msgstr "Jelenleg nem tudod megszerelni a(z) %st."
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -180135,7 +184475,7 @@ msgstr "Befejezed a fúrást."
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr "hsh!"
 
@@ -180757,12 +185097,12 @@ msgstr ""
 "Csökkent mozgás. Depresszió. Gyenge immunrendszer. Gyakori szükség."
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
-msgstr "Érzékelés - 1; Intelligencia - 1; Gyakori szükség."
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
-msgstr "Érzékelés - 2; Intelligencia - 2; Gyakori szükség."
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
 msgid ""
@@ -180948,38 +185288,6 @@ msgstr "hol db súly térf"
 msgid "Name (charges)"
 msgstr "Név (töltet)"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "Nem húzol magaddal semmilyen járművet"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "Nem húzol magaddal semmilyen járművet"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "Érvénytelen tároló"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "Mind a 9 mezőn"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr "<color_white_red>TŰZ</color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr "VESZÉLY"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr "CSAPDA"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr "VÍZ"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -181074,7 +185382,7 @@ msgstr ""
 
 #: src/advanced_inv.cpp
 msgid "You can't pick up a liquid."
-msgstr "Folyadékot nem lehet felvenni."
+msgstr "Kiömlött folyadékot nem lehet felvenni."
 
 #: src/advanced_inv.cpp
 msgid "Destination area is full.  Remove some items first."
@@ -181103,7 +185411,39 @@ msgstr ""
 msgid "The destination is already full!"
 msgstr "A cél már tele van!"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "Nem húzol magaddal semmilyen járművet"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "Nem húzol magaddal semmilyen járművet"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "Érvénytelen tároló"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "Mind a 9 mezőn"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr "<color_white_red>TŰZ</color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr "VESZÉLY"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr "CSAPDA"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr "VÍZ"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "Érvénytelen tároló"
 
@@ -181229,6 +185569,14 @@ msgstr "Zúzó:"
 msgid "Cut:"
 msgstr "Vágó:"
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr ""
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr ""
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "Környezet:"
@@ -181368,6 +185716,20 @@ msgid ""
 "The second number is an additional encumbrance penalty caused by wearing multiple items on one of the bodypart's layers or wearing items outside of other items they would normally be work beneath (e.g. a shirt over a backpack).\n"
 "The sum of these values is the effective encumbrance value your character has for that bodypart."
 msgstr ""
+"A kurzornyilakkal navigálhatsz a bal oldali listában.\n"
+"[%s] az átrendezendő ruhadarab kiválasztásához.\n"
+"[%s] / [%s] a jobb oldali lista görgetéséhez.\n"
+"[%s] a ruhadarabok leltári gyorsbillentyűjének kijelöléséhez.\n"
+"[%s] kiválasztja, hogy melyik oldalon hordjad\n"
+"[%s] a páncélt természetes sorrendbe szortírozza\n"
+"[%s] felvesz rád egy tárgyat.\n"
+"[%s] a kijelölt pozícióba vesz fel rád egy tárgyat\n"
+"[%s] leveszi rólad a kijelölt páncélt.\n"
+" \n"
+"[Ormótlanság és melegség] magyarázata:\n"
+"Az első szám az adott testrész összes ruháról származó ormótlanságát mutatja.\n"
+"A második szám az adott testrész lehetséges rétegeinek azonos rétegén viselt ruhadarabok számából származó ormótlanságot mutatja, illetve olyan ruhák viselését más felett, amit alatta szokás hordani (például pólót a hátizsákon).\n"
+"Ezen két érték összeadásával jön ki az adott testrészre vonatkozó teljes ormótlanság."
 
 #: src/artifact.cpp
 msgid "smooth sphere"
@@ -181913,13 +186275,13 @@ msgstr "%s Szenvedés"
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
+"  Seeing this is a bug!"
 msgstr ""
 
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
 msgstr ""
 
@@ -181946,7 +186308,7 @@ msgstr ""
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr ""
 
 #: src/artifact.cpp
@@ -182710,6 +187072,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr ""
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr ""
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr ""
@@ -182842,12 +187209,14 @@ msgid "The %s must be attached to a gun, it can not be fired separately."
 msgstr "A(z) %st egy fegyverre kell felcsatolni, külön nem lehet elsütni."
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
-msgstr "Nem tudsz többé tüzelni."
+#, c-format
+msgid "You can no longer fire your %s."
+msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "A vezetéshez kell egy szabad kéz!"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -182855,8 +187224,9 @@ msgid "You need two free hands to fire your %s."
 msgstr "A(z) %s elsütéséhez két szabad kéz szükséges."
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "Újra kell táraznod!"
+#, c-format
+msgid "Your %s is empty!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -182867,18 +187237,18 @@ msgstr "A(z) %s elsütéséhez %i töltet szükséges!"
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
+"charges to fire the %s!"
 msgstr ""
-"Ennek az elsütéséhez egy legalább %d töltettel rendelkező ET-re, vagy egy "
-"legalább %d töltettel rendelkező továbbfejlesztett ET-re van szükséged!"
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
 msgstr ""
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
 msgstr ""
 
@@ -183113,6 +187483,16 @@ msgstr "A(z) %sautomatikusan kikapcsol. "
 msgid "Your %s automatically turns off."
 msgstr "A(z) %sautomatikusan kikapcsol. "
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "Meggondolod magad és kikapcsolod."
@@ -183230,11 +187610,6 @@ msgstr "Vérvizsgálat eredménye"
 msgid "No effects."
 msgstr "Nincs hatása."
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr ""
-"A levegőben nem volt ahhoz elég nedvesség, hogy vizet vonjál ki belőle!"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr "A torziós racsni ráfeszül az izületeidre."
@@ -183247,10 +187622,6 @@ msgstr ""
 msgid "Start a fire where?"
 msgstr "Hol gyújtasz tüzet?"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "Ott nem lehet tüzet gyújtani."
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -183427,6 +187798,20 @@ msgstr ""
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr ""
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -183455,6 +187840,21 @@ msgstr "A(z) %s elvesztette a kapcsolatos, ezért leáll."
 msgid "You feel your throat open up and air filling your lungs!"
 msgstr "Érzed, ahogyan kinyílik a torkod és levegő árasztja el a tüdődet!"
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr ""
@@ -183785,6 +188185,8 @@ msgstr ""
 msgid ""
 "Bionic Power: <color_light_blue>%s</color>/<color_light_blue>%ikJ</color>"
 msgstr ""
+"Bionikus energia: "
+"<color_light_blue>%s</color>/<color_light_blue>%ikJ</color>"
 
 #: src/bionics_ui.cpp
 msgid ""
@@ -184251,7 +188653,11 @@ msgstr "に坂索トし荷測のンおク妙免イロコヤ梅棋厚れ表幌"
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
+msgid "You"
+msgstr "Te"
+
+#: src/character.cpp
+msgid "Your"
 msgstr ""
 
 #: src/character.cpp
@@ -184484,6 +188890,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr "A(z) %1$st behelyezed ebbe: %2$s."
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr ""
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr ""
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -184507,10 +188921,20 @@ msgstr ""
 msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr "Ezt nem tudod kivenni a kezedből: %s"
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr "A jelenlegi egészségi értéked %d."
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "Kiszáradt"
@@ -184580,6 +189004,75 @@ msgstr ""
 msgid "Your %s bionic shorts out!"
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "A %s egy pár óra múlva első fokú fagyási sérülést fog szenvedni."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "A %s egy órán belül első fokú fagyási sérülést fog szenvedni!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr ""
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr "Érzed, ahogyan a(z) %s testrészed elzsibbad a hidegtől!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr "Érzed, ahogyan a %s testrészed nagyon fázik."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr "Érzed, ahogyan a %s testrészed kihűlt."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr "Érzed, ahogyan a %s testrészed rákvörös a forróságtól!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr "Érzed, ahogyan a %s testrészed nagyon meleg."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr "Érzed, ahogyan a %s testrészed melegedik."
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "A széltől a %s nagyon fázik."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr "A szél nagyon erősen fúj, valamilyen hőálló ruházat kellene rá: %s."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr "A ruházatod nem elég a %s melegen tartásához!"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "Bal kar"
@@ -184744,8 +189237,8 @@ msgstr ""
 msgid "Big"
 msgstr ""
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "Jó"
 
@@ -184849,6 +189342,32 @@ msgstr ""
 msgid "EXTRA_EXERCISE"
 msgstr ""
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr ""
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "Erősen felköhögsz."
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "krákogó köhögés."
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr ""
@@ -185028,6 +189547,20 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr ""
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr ""
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr ""
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "Nincs stílus"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "Nincs auto felszedés"
@@ -185072,260 +189605,6 @@ msgid ""
 "this area."
 msgstr ""
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr "Zsákmány: Válogatás nélkül"
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr ""
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr ""
@@ -185333,7 +189612,7 @@ msgstr ""
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
 msgstr ""
 
@@ -185393,6 +189672,16 @@ msgstr ""
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr ""
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr ""
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr ""
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
 msgstr ""
@@ -185803,15 +190092,15 @@ msgstr "HIBA: Csak vérminta használható"
 
 #: src/computer.cpp
 msgid "Result: Human blood, no pathogens found."
-msgstr ""
+msgstr "Eredmény: Emberi vér, patogén nem található."
 
 #: src/computer.cpp
 msgid "Result: Human blood.  Unknown pathogen found."
-msgstr ""
+msgstr "Eredmény: Emberi vér. Ismeretlen patogén."
 
 #: src/computer.cpp
 msgid "Result: Unknown blood type.  Unknown pathogen found."
-msgstr ""
+msgstr "Eredmény: Ismeretlen vértípus. Ismeretlen patogén."
 
 #: src/computer.cpp
 msgid "Pathogen bonded to erythrocytes and leukocytes."
@@ -185884,6 +190173,18 @@ msgid ""
 "\n"
 "  \n"
 msgstr ""
+"ÜDVÖZLET, ÁLLAMPOLGÁR. EGY BIOLÓGIAI TÁMADÁS TÖRTÉNT ÉS KIHÍRDETTÉK\n"
+"A RENDKÍVÜLI ÁLLAPOTOT. A KÉSZENLÉTI SZERVEK HAMAROSAN AZ ÖN\n"
+"SEGÍTSÉGÉRE SIETNEK. SAJÁT BIZTONSÁGA ÉRDEKÉBEN KÉRJÜK KÖVESSE AZ\n"
+"ALÁBBI LÉPÉSEKET:\n"
+"\n"
+"1. NE ESSEN PÁNIKBA\n"
+"2. MARADJON AZ ÉPÜLETBEN\n"
+"3. KERESSEN MENEDÉKET A PINCÉBEN\n"
+"4. VEGYE FEL A KIHELYEZETT GÁZMASZKOT\n"
+"5. VÁRJON TOVÁBBI UTASÍTÁSOKRA\n"
+"\n"
+" \n"
 
 #: src/computer.cpp
 msgid ""
@@ -185895,6 +190196,13 @@ msgid ""
 "  \n"
 "  \n"
 msgstr ""
+"  FIGYELEM, A RÁDIÓS ADÓTORONY NEM VÁLASZOL. \n"
+"  \n"
+"  A BIZTONSÁGI ÁRAMELLÁTÁS ELÉGTELEN A MŰSORSZÓRÁSHOZ. \n"
+"  VÉSZ ESETÉN LÉPJEN KAPCSOLATBA A HELYI NEMZETŐRSÉGGEL \n"
+"  ÉS AZ AGGREGÁTOROK SZÉTOSZTÁSÁNÁL ELSŐBBSÉGET KAP. \n"
+"  \n"
+"  \n"
 
 #: src/computer.cpp
 msgid "Charges Detonated"
@@ -186386,7 +190694,7 @@ msgstr ""
 
 #: src/consumption.cpp
 msgid "That doesn't look edible in its current form."
-msgstr "Azt a jelenlegi formájában nem lehet megenni."
+msgstr "A jelenlegi formájában nem lehet megenni."
 
 #: src/consumption.cpp
 msgid "This is full of dirt after being on the ground."
@@ -186711,24 +191019,6 @@ msgstr "Érzed, ahogyan a(z) %s feltölt."
 msgid "<npcname> looks better after eating the %s."
 msgstr "<npcname> jobban néz ki azután, hogy evett egy %st."
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "A belső energiatárolódat teljesen feltöltötted."
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr "<npcname> belső energiatárolóját teljesen feltöltötte."
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr "A(z) %s segítségével feltöltöd az akkumulátor rendszeredet."
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr "<npcname> a(z) %s segítségével feltölti az akkumulátor rendszerét."
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr "Az RENGETEG plutónium. Biztosan annyi kell?"
@@ -187747,6 +192037,10 @@ msgstr ""
 msgid "Toggle display temperature"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr ""
@@ -187787,6 +192081,10 @@ msgstr ""
 msgid "Print faction info to console"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Test weather"
 msgstr ""
@@ -188066,6 +192364,10 @@ msgstr ""
 msgid "t[e]leport"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr ""
@@ -188648,10 +192950,12 @@ msgstr ""
 msgid "Spell"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
 msgstr ""
@@ -190667,6 +194971,14 @@ msgstr ""
 msgid "%s has abandoned the camp."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr ""
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -190682,59 +194994,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -190769,23 +195028,6 @@ msgid ""
 "Positions: %d/1\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -190948,14 +195190,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -191037,6 +195271,61 @@ msgid ""
 "Positions: 0/1\n"
 msgstr ""
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -191047,6 +195336,10 @@ msgid ""
 "Companions must be on missions for at least 24 hours before emergency recall becomes available."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr ""
@@ -191083,10 +195376,6 @@ msgstr ""
 msgid "departs to search for recruits…"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr ""
@@ -191364,7 +195653,7 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
 
@@ -191537,8 +195826,7 @@ msgstr ""
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
+"create a camp food zone, and a camp storage zone."
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -191568,17 +195856,17 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
+msgid ">Travel:  %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
+msgid ">Working: %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
+msgid "Total:    %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -191631,7 +195919,7 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
+msgid "Name:     %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -191640,7 +195928,7 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
+msgid "Engine:   %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -191650,7 +195938,7 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
+msgid ">Fuel:    %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -193060,7 +197348,7 @@ msgstr ""
 
 #: src/game.cpp
 msgid "You eat the underbrush."
-msgstr ""
+msgstr "Megeszed az aljnövényzetet."
 
 #: src/game.cpp
 msgid "You're too full to graze."
@@ -193110,7 +197398,7 @@ msgstr ""
 msgid "The %s is already full!"
 msgstr ""
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr ""
@@ -193198,6 +197486,19 @@ msgstr "Biztosan belelépsz: %s?"
 msgid "Your %s refuses to move over that ledge!"
 msgstr ""
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr ""
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr ""
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "Nem található a megragadott tárgy"
@@ -193391,6 +197692,16 @@ msgstr ""
 msgid "There's stuff in the way."
 msgstr ""
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr ""
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -193699,7 +198010,7 @@ msgid ""
 "characters (e.g. empty boxes or question marks). You have been warned."
 msgstr ""
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr ""
 
@@ -193985,10 +198296,6 @@ msgstr "FRISSESSÉG"
 msgid "SPOILS IN"
 msgstr "MEGROMLIK"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "Elem"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "Reaktor"
@@ -194013,10 +198320,6 @@ msgstr "Kiömlött folyadékot nem lehet meginni"
 msgid "Your biology is not compatible with that item."
 msgstr ""
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr "Teljesen fel vagy töltve"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -194109,10 +198412,6 @@ msgid_plural "Needs at least %d charges"
 msgstr[0] "Legalább %d töltet szükséges."
 msgstr[1] "Legalább %d töltet szükséges."
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr ""
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "Tárgy használata"
@@ -194331,11 +198630,6 @@ msgstr "<color_yellow>Rendelkezésre álló készlet: %i</color>"
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr "<color_yellow>Rendelkezésre álló altató: %i mL</color>"
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr "<color_yellow>Rendelkezésre álló pénz: %s</color>"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -194344,7 +198638,7 @@ msgstr "Bionika eltávolításhoz páciens: %s"
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic installation patient: %s"
-msgstr "Bionika beültetéséhe páciens: %s"
+msgstr "Bionika beültetéséhez páciens: %s"
 
 #: src/game_inventory.cpp
 msgid "You don't have any bionics to install."
@@ -195456,9 +199750,8 @@ msgid "Purchase cash card?"
 msgstr "Bankkártya vásárlás?"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
+msgid "You need $10.00 in your account to purchase a card."
 msgstr ""
-"Bankkártya vásárláshoz az egyenlegének legalább $1.00 értéket kell mutatnia."
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -195502,7 +199795,7 @@ msgstr "Az Ön egyenlege %s."
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
 msgstr ""
 
 #: src/iexamine.cpp
@@ -195788,7 +200081,8 @@ msgid "The gun safe stumps your efforts to pick it."
 msgstr "A fegyverszéf ellenáll a piszkálásodnak."
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
 msgstr ""
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
@@ -195797,6 +200091,16 @@ msgstr ""
 msgid "You attempt to pry open the %1$s using your %2$s…"
 msgstr "Megpróbálod felfeszíteni a(z) %1$st a(z) %2$s segítségével..."
 
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
+msgstr ""
+
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
 msgstr ""
@@ -196103,7 +200407,7 @@ msgstr ""
 #: src/iexamine.cpp
 #, c-format
 msgid "It should take about %d minutes to finish burning."
-msgstr ""
+msgstr "Az égetés befejezéséhez még nagyjából %d perc szükséges."
 
 #: src/iexamine.cpp
 #, c-format
@@ -196260,6 +200564,10 @@ msgstr "Megpróbálsz a(z) %s segítségével tüzet gyújtani..."
 msgid "You weren't able to start a fire."
 msgstr ""
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "Ott nem lehet tüzet gyújtani."
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -196950,6 +201258,17 @@ msgstr "Az autódoki %s testén dolgozik."
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr "XI. típusú robotdoki.  Státusz: Online.  Kérem válasszon műtétet"
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr ""
@@ -196983,406 +201302,429 @@ msgstr "A gép gyorsan a helyére rakja és sínbe rögzíti <npcname> eltört %
 
 #: src/iexamine.cpp
 msgid "You have no limbs that require splinting."
-msgstr ""
+msgstr "Nincsen olyan sérült testrészed, amit sínbe kellene tenni."
 
 #: src/iexamine.cpp
 msgid "<npcname> doesn't have limbs that require splinting."
-msgstr ""
+msgstr "<npcname> testében nincsen olyan sérülés, amit sínbe kellene tenni."
 
 #: src/iexamine.cpp
 msgid "This mill already contains flour."
-msgstr ""
+msgstr "Ebben a malomban már van liszt."
 
 #: src/iexamine.cpp
 msgid "Remove it before starting the mill again."
-msgstr ""
+msgstr "Az őrölés megkezdése előtt el kell távolítani."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "This rack contains %s, which can't be milled!"
-msgstr ""
+msgstr "Ebben %s van, amit nem lehet őrölni!"
 
 #: src/iexamine.cpp
 #, c-format
 msgid "You remove the %s from the mill."
-msgstr ""
+msgstr "Az őrlőmalomból kiveszed a(z) %set."
 
 #: src/iexamine.cpp
 msgid ""
 "This mill is empty.  Fill it with starchy products such as wheat, barley or "
 "oats and try again."
 msgstr ""
+"Az őrlőmalom üres. Töltsd fel keményítő tartalmú terményekkel, például "
+"búzával, árpával vagy zabbal, és próbáld meg újra."
 
 #: src/iexamine.cpp
 msgid ""
 "This mill is overloaded with products, and the millstone can't turn.  Remove"
 " some and try again."
 msgstr ""
+"Ebbe az őrlőmalomba túl sok mindent tettek, és ezért nem lehet vele őrölni. "
+"Szedj ki egy pár dolgot és próbáld újra."
 
 #: src/iexamine.cpp
 #, c-format
 msgctxt "volume units"
 msgid "You think that you can load about %s %s in it."
-msgstr ""
+msgstr "Szerinted nagyjából %s %st lehet beletenni."
 
 #: src/iexamine.cpp
 msgid "You remove the brake on the millstone and it slowly starts to turn."
-msgstr ""
+msgstr "Az őrlőkőről eltávolítod a féket, és az lassan el kezd forogni."
 
 #: src/iexamine.cpp
 msgid "This rack already contains smoked food."
-msgstr ""
+msgstr "Ezen az állványon már füstölt étel található."
 
 #: src/iexamine.cpp
 msgid "Remove it before firing the smoking rack again."
-msgstr ""
+msgstr "A füstölés megkezdése előtt el kell távolítani."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "This rack contains %s, which can't be smoked!"
-msgstr ""
+msgstr "Ebben %s van, amit nem lehet füstölni!"
 
 #: src/iexamine.cpp
 #, c-format
 msgid "You remove %s from the rack."
-msgstr ""
+msgstr "A(z) %st leveszed a füstölőállványról."
 
 #: src/iexamine.cpp
 msgid ""
 "This rack has some smoked food that might be dehydrated by smoking it again."
 msgstr ""
+"Ezen a füstölőállványon olyan füstölt étel van, amit újbóli füstöléssel ki "
+"lehetne szárítani."
 
 #: src/iexamine.cpp
 msgid ""
 "This rack is empty.  Fill it with raw meat, fish or sausages and try again."
 msgstr ""
+"A füstölőállvány üres. Töltsd fel nyers hússal, hallal vagy kolbásszal, és "
+"próbáld meg újra."
 
 #: src/iexamine.cpp
 msgid "There is no charcoal in the rack."
-msgstr ""
+msgstr "A füstölőben nincsen faszén."
 
 #: src/iexamine.cpp
 msgid ""
 "This rack is overloaded with food, and it blocks the flow of smoke.  Remove "
 "some and try again."
 msgstr ""
+"A füstölőben túl sok minden van, és ezért a füst nem áramlik jól. Szedj ki "
+"egy pár dolgot, és próbáld újra."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "You think that you can load about %s %s in it."
-msgstr ""
+msgstr "Szerinted nagyjából %s %st lehet beletenni."
 
 #: src/iexamine.cpp
 msgid "There is not enough charcoal in the rack to smoke this much food."
 msgstr ""
+"A füstölőben nincsen elég faszén ahhoz, hogy ennyi ételt füstölj vele."
 
 #: src/iexamine.cpp
 #, c-format
 msgid ""
 "You need at least %1$s pieces of charcoal, and the smoking rack has %2$s "
 "inside."
-msgstr ""
+msgstr "Legalább %1$s darab faszén kellene, de a füstölőben csak %2$s van."
 
 #: src/iexamine.cpp
 msgid "This smoking rack is ready to be fired, but you have no fire source."
 msgstr ""
+"A füstölőállvány készen áll a begyújtásra, de nincs nálad semmi, amivel "
+"tüzet lehetne gyújtani."
 
 #: src/iexamine.cpp
 msgid "Fire the smoking rack?"
-msgstr ""
+msgstr "Begyújtod a füstölőt?"
 
 #: src/iexamine.cpp
 msgid "You light a small fire under the rack and it starts to smoke."
-msgstr ""
+msgstr "Apró tüzet raksz a füstölő alatt, és máris sűrű füst száll fel."
 
 #: src/iexamine.cpp
 msgid "You can't place more food while it's smoking."
-msgstr ""
+msgstr "A füstölőbe már megkezdett füstölésnél nem lehet további ételt rakni."
 
 #: src/iexamine.cpp
 msgid "Load smoking rack with what kind of food?"
-msgstr ""
+msgstr "A füstölőbe milyen ételt teszel?"
 
 #: src/iexamine.cpp
 msgid "You don't have any food that can be smoked."
-msgstr ""
+msgstr "Nincsen füstölhető ételed."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Insert how many %s into the rack?"
-msgstr ""
+msgstr "A füstölőbe mennyi %st szeretnél betenni?"
 
 #: src/iexamine.cpp
 msgid "You don't have that many."
-msgstr ""
+msgstr "Nincs nálad annyi."
 
 #: src/iexamine.cpp
 msgid "You can't place that many."
-msgstr ""
+msgstr "Annyit nem lehet oda tenni."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "You carefully place %s %s in the rack."
-msgstr ""
+msgstr "A füstölőbe óvatosan behelyezel %s darab %st."
 
 #: src/iexamine.cpp
 msgid "You can't place more food while it's milling."
-msgstr ""
+msgstr "Megkezdett őrlésnél nem lehet további ételt betenni."
 
 #: src/iexamine.cpp
 msgid "Load mill with what kind of product?"
-msgstr ""
+msgstr "Az őrlőmalomba mit szeretnél betenni?"
 
 #: src/iexamine.cpp
 msgid "You don't have any products that can be milled."
-msgstr ""
+msgstr "Nincsen őrölhető terméked."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Insert how many %s into the mill?"
-msgstr ""
+msgstr "Az őrlőmalomba mennyi %st szeretnél betenni?"
 
 #: src/iexamine.cpp
 #, c-format
 msgctxt "item amount and name"
 msgid "You carefully place %s %s in the mill."
-msgstr ""
+msgstr "Az őrlőmalomba óvatosan behelyezel %s darab %st."
 
 #: src/iexamine.cpp
 msgid "The water mill needs to be over shallow flowing water to work."
 msgstr ""
+"A vízi malomnak sekély, áramló víz felett kell lennie ahhoz, hogy működjön."
 
 #: src/iexamine.cpp
 msgid "The wind mill needs to be outside in the wind to work."
-msgstr ""
+msgstr "A szélmalomnak kint kell lennie ahhoz, hogy működjön."
 
 #: src/iexamine.cpp
 msgid "What to do with the mill?"
-msgstr ""
+msgstr "Mit szeretnél tenni a malommal?"
 
 #: src/iexamine.cpp
 msgid "Inspect mill"
-msgstr ""
+msgstr "Malom megvizsgálása"
 
 #: src/iexamine.cpp
 msgid "Remove brake and start milling… insert some products for milling first"
-msgstr ""
+msgstr "Fék eltávolítása és őrlés megkezdése... de előtte tegyél bele valamit"
 
 #: src/iexamine.cpp
 msgid "Remove brake and start milling"
-msgstr ""
+msgstr "Fék eltávolítása és őrlés megkezdése"
 
 #: src/iexamine.cpp
 msgid "Remove brake and start milling, milling will take about 6 hours."
 msgstr ""
+"Fék eltávolítása és őrlés megkezdése... az őrlés nagyjából 6 óráig fog "
+"tartani."
 
 #: src/iexamine.cpp
 msgid "Insert products for milling… mill is full"
-msgstr ""
+msgstr "Őrlendő termékek behelyezése - a malom tele van"
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Insert products for milling… remaining capacity is %s %s"
-msgstr ""
+msgstr "Őrlendő termékek behelyezése -  a malomban még %s %s számára van hely"
 
 #: src/iexamine.cpp
 msgid "Fill the mill with starchy products such as wheat, barley or oats."
 msgstr ""
+"A malmot töltsd fel keményítő tartalmú terményekkel, például búzával, "
+"árpával vagy zabbal."
 
 #: src/iexamine.cpp
 msgid "Remove products from mill"
-msgstr ""
+msgstr "Termékek eltávolítása a malomból"
 
 #: src/iexamine.cpp
 msgid "Apply brake to mill"
-msgstr ""
+msgstr "Malom befékezése"
 
 #: src/iexamine.cpp
 msgid "Applying the brake will stop milling process."
-msgstr ""
+msgstr "A malom lefékezése megállítja az őrlést."
 
 #: src/iexamine.cpp
 msgid "There's a mill here.  It is turning and milling."
-msgstr ""
+msgstr "Ott egy malom található. Jelenleg forog és őröl."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "It will finish milling in about %d hour."
 msgid_plural "It will finish milling in about %d hours."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Az őrlést nagyjából %d óra múlva fejezi be."
+msgstr[1] "Az őrlést nagyjából %d óra múlva fejezi be."
 
 #: src/iexamine.cpp
 msgid "It will finish milling in less than an hour."
-msgstr ""
+msgstr "Az őrlést egy órán belül fejezi be."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "It should take about %d minutes to finish milling."
-msgstr ""
+msgstr "Az őrlés befejezéséhez még nagyjából %d perc szükséges."
 
 #: src/iexamine.cpp
 msgid "There's a mill here."
-msgstr ""
+msgstr "Ott egy malom található."
 
 #: src/iexamine.cpp
 msgid "You inspect its contents and find: "
-msgstr ""
+msgstr "Megvizsgálod a tartalmát, és ezt találod:"
 
 #: src/iexamine.cpp
 msgid "…that it is empty."
-msgstr ""
+msgstr "... semmit, üres."
 
 #: src/iexamine.cpp
 msgid "You see some grains that are not yet milled to fine flour."
-msgstr ""
+msgstr "Egy pár szemet még nem őrölt lisztté."
 
 #: src/iexamine.cpp
 msgid "It is already milling."
-msgstr ""
+msgstr "Már őröl."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "You remove %s from the mill."
-msgstr ""
+msgstr "Az őrlőmalomból kiveszed a(z) %set."
 
 #: src/iexamine.cpp
 msgid "You stop the milling process."
-msgstr ""
+msgstr "Leállítod az őrlést."
 
 #: src/iexamine.cpp
 msgid "What to do with the smoking rack:"
-msgstr ""
+msgstr "Mit szeretnél tenni a füstölővel?"
 
 #: src/iexamine.cpp
 msgid "Inspect smoking rack"
-msgstr ""
+msgstr "Füstölőállvány megvizsgálása"
 
 #: src/iexamine.cpp
 msgid "Light up and smoke food… insert some food for smoking first"
-msgstr ""
+msgstr "Begyújtás és étel füstölése - de először helyezz be füstölhető ételt"
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Light up and smoke food… need extra %d charges of charcoal"
-msgstr ""
+msgstr "Begyújtás és étel füstölése - de ehhez még %d darab faszén kell"
 
 #: src/iexamine.cpp
 msgid "Light up and smoke food"
-msgstr ""
+msgstr "Begyújtás és étel füstölése"
 
 #: src/iexamine.cpp
 msgid ""
 "Light up the smoking rack and start smoking.  Smoking will take about 6 "
 "hours."
-msgstr ""
+msgstr "Begyújtod a füstölőt. A teljes füstöléshez nagyjából 6 óra kell."
 
 #: src/iexamine.cpp
 msgid "Insert food for smoking… smoking rack is full"
-msgstr ""
+msgstr "Füstölhető étel behelyezése - de a füstölő már tele van"
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Insert food for smoking… remaining capacity is %s %s"
 msgstr ""
+"Füstölhető étel behelyezése - az állványon még %s %s számára van hely."
 
 #: src/iexamine.cpp
 msgid ""
 "Fill the smoking rack with raw meat, fish or sausages for smoking or fruit "
 "or vegetable or smoked meat for drying."
 msgstr ""
+"A füstölőállványba nyers húst, halat vagy kolbászt rakhatsz füstölésre, vagy"
+" kiszárításra gyümölcsöt, zöldséget, illetve füstölt húst."
 
 #: src/iexamine.cpp
 msgid "You cannot disassemble this smoking rack while it is active!"
-msgstr ""
+msgstr "A füstölőt nem lehet szétszedni miközben még ételt füstöl!"
 
 #: src/iexamine.cpp
 msgid "Disassemble the smoking rack"
-msgstr ""
+msgstr "Füstölőállvány szétszerelése"
 
 #: src/iexamine.cpp
 msgid "Remove food from smoking rack"
-msgstr ""
+msgstr "Étel eltávolítása a füstölőből"
 
 #: src/iexamine.cpp
 msgid "Reload with charcoal… you don't have any"
-msgstr ""
+msgstr "Újratöltés faszénnel - nincs nálad faszén"
 
 #: src/iexamine.cpp
 msgid "Reload with charcoal"
-msgstr ""
+msgstr "Újratöltés faszénnel"
 
 #: src/iexamine.cpp
 #, c-format
 msgid ""
 "You need %d charges of charcoal for %s %s of food.  Minimal amount of "
 "charcoal is %d charges."
-msgstr ""
+msgstr "%d darab faszén kell %s %s füstöléséhez, de minimum %d."
 
 #: src/iexamine.cpp
 msgid "Quench burning charcoal"
-msgstr ""
+msgstr "Égő faszén kioltása"
 
 #: src/iexamine.cpp
 msgid ""
 "Quenching will stop smoking process, but also destroy all used charcoal."
 msgstr ""
+"A kioltás megállítja ugyan a füstölési folyamatot, de az összes behelyezett "
+"faszenet is tönkreteszi."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Rake out %d excess charges of charcoal from smoking rack"
-msgstr ""
+msgstr "A füstölőből kapard ki a felesleges %d darab faszenet."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Remove %d charges of charcoal from smoking rack"
-msgstr ""
+msgstr "A füstölőből szedj ki %d darab faszenet."
 
 #: src/iexamine.cpp
 msgid "There's a smoking rack here.  It is lit and smoking."
-msgstr ""
+msgstr "Ott egy füstölő állvány található. Jelenleg be van gyújtva és füstöl."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "It will finish smoking in about %d hour."
 msgid_plural "It will finish smoking in about %d hours."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A füstölést nagyjából %d óra múlva fejezi be."
+msgstr[1] "A füstölést nagyjából %d óra múlva fejezi be."
 
 #: src/iexamine.cpp
 msgid "It will finish smoking in less than an hour."
-msgstr ""
+msgstr "A füstölést egy órán belül fejezi be."
 
 #: src/iexamine.cpp
 #, c-format
 msgid "It should take about %d minutes to finish smoking."
-msgstr ""
+msgstr "A füstölést befejezéséhez még nagyjából %d perc szükséges."
 
 #: src/iexamine.cpp
 msgid "There's a smoking rack here."
-msgstr ""
+msgstr "Ott egy füstölő állvány található."
 
 #: src/iexamine.cpp
 msgid "You see some smoldering embers there."
-msgstr ""
+msgstr "Ott egy pár izzó parazsat látsz."
 
 #: src/iexamine.cpp
 msgid "It is already lit and smoking."
-msgstr ""
+msgstr "Már be van gyújtva és füstöl."
 
 #: src/iexamine.cpp
 msgid "You stop the smoking process."
-msgstr ""
+msgstr "Leállítod a füstölést."
 
 #: src/iexamine.cpp
 msgid "You open the unlocked safe."
-msgstr ""
+msgstr "Kinyitod a be nem zárt széfet."
 
 #: src/iexamine.cpp
 #, c-format
 msgctxt "furniture"
 msgid "What to do at the %s?"
-msgstr ""
+msgstr "Mit tennél a(z) %son?"
 
 #: src/iexamine.cpp
 msgid "Craft items"
@@ -197390,38 +201732,42 @@ msgstr "Tárgyak elkészítése"
 
 #: src/iexamine.cpp
 msgid "Which craft to work on?"
-msgstr ""
+msgstr "Min szeretnél dolgozni?"
 
 #: src/iexamine.cpp src/iuse.cpp
 #, c-format
 msgid "You don't know the recipe for the %s and can't continue crafting."
 msgstr ""
+"Nem tudod a(z) %s elkészítéséhez szükséges receptet, ezért nem tudsz rajta "
+"dolgozni."
 
 #: src/iexamine.cpp src/iuse.cpp
 #, c-format
 msgid ""
 "<npcname> doesn't know the recipe for the %s and can't continue crafting."
 msgstr ""
+"<npcname> nem tudja a(z) %s elkészítéséhez szükséges receptet, ezért nem tud"
+" rajta dolgozni."
 
 #: src/iexamine.cpp
 msgid "Use electrohack?"
-msgstr ""
+msgstr "Használod az elektrohekkert?"
 
 #: src/iexamine.cpp
 msgid "Use fingerhack?"
-msgstr ""
+msgstr "Használod a hekkerujjad?"
 
 #: src/iexamine.cpp
 msgid "You cause a short circuit!"
-msgstr ""
+msgstr "Rövidzárlatot okozol!"
 
 #: src/iexamine.cpp
 msgid "Your electrohack is ruined!"
-msgstr ""
+msgstr "Az elektrohekkered tönkremegy!"
 
 #: src/iexamine.cpp
 msgid "Your power is drained!"
-msgstr ""
+msgstr "Az energiád lemerül!"
 
 #: src/init.cpp
 msgid "Finalizing"
@@ -197475,6 +201821,10 @@ msgstr "Nagytérkép kapcsolatok"
 msgid "Overmap specials"
 msgstr "Nagytérkép spec. helyszínei"
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "Nagytérkép helyek"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr "Jármű prototípusok"
@@ -197531,6 +201881,10 @@ msgstr "Betakarítási listák"
 msgid "Anatomies"
 msgstr "Anatómia"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "Mutációk"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "Grafikai készlet"
@@ -197575,18 +201929,10 @@ msgstr "Szakmák"
 msgid "Scenarios"
 msgstr "Esetek"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "Mutációk"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "Mutáció kategóriák"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "Nagytérkép helyek"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr "Térkép extrái"
@@ -197849,21 +202195,21 @@ msgstr " vagy "
 #, c-format
 msgctxt "keybinding"
 msgid "[any] %s"
-msgstr ""
+msgstr "[bármi] %s"
 
 #. ~ keybinding description for unbound or disabled keys
 #: src/input.cpp
 #, c-format
 msgctxt "keybinding"
 msgid "[n/a] %s"
-msgstr ""
+msgstr "[nincs] %s"
 
 #. ~ keybinding description for bound keys
 #: src/input.cpp
 #, c-format
 msgctxt "keybinding"
 msgid "[%s] %s"
-msgstr ""
+msgstr "[%s] %s"
 
 #: src/input.cpp
 msgid "Unbound keys"
@@ -197954,14 +202300,6 @@ msgstr "%1$d / %2$d"
 msgid "Page %d/%d"
 msgstr "%d/%d oldal"
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "VISELT TÁRGYAK"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "FEGYVER A KÉZBEN"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -198020,11 +202358,11 @@ msgstr "Kategória választási mód"
 
 #: src/inventory_ui.cpp
 msgid "Mark/unmark selected item"
-msgstr "Kiválaszott elem kijelölése/jelölés törlése"
+msgstr "Kiválaszott tárgy kijelölése/jelölés törlése"
 
 #: src/inventory_ui.cpp
 msgid "Mark/unmark non-favorite items"
-msgstr ""
+msgstr "Kedvenc tárgy kijelölése/jelölés törlése"
 
 #: src/inventory_ui.cpp
 msgid "ITEMS TO COMPARE"
@@ -198218,7 +202556,7 @@ msgstr "Anyag: %s"
 #: src/item.cpp
 #, c-format
 msgid "Owner: %s"
-msgstr ""
+msgstr "Tulajdonos: %s"
 
 #: src/item.cpp
 #, c-format
@@ -198231,7 +202569,7 @@ msgstr "Mennyiség: "
 
 #: src/item.cpp
 msgid "age (hours): "
-msgstr ""
+msgstr "idős (óra): "
 
 #: src/item.cpp
 msgid "charges: "
@@ -198239,11 +202577,11 @@ msgstr "töltet: "
 
 #: src/item.cpp
 msgid "damage: "
-msgstr ""
+msgstr "sebzés: "
 
 #: src/item.cpp
 msgid "active: "
-msgstr ""
+msgstr "aktív: "
 
 #: src/item.cpp
 msgid "burn: "
@@ -198252,7 +202590,7 @@ msgstr "éghető: "
 #: src/item.cpp
 #, c-format
 msgid "tags: %s"
-msgstr ""
+msgstr "címke: %s"
 
 #: src/item.cpp
 #, c-format
@@ -198261,15 +202599,15 @@ msgstr ""
 
 #: src/item.cpp
 msgid "age (turns): "
-msgstr ""
+msgstr "idős (kör): "
 
 #: src/item.cpp
 msgid "rot (turns): "
-msgstr ""
+msgstr "rohad (kör): "
 
 #: src/item.cpp
 msgid "max rot (turns): "
-msgstr ""
+msgstr "max rohadás (kör): "
 
 #: src/item.cpp
 msgid "last rot: "
@@ -198281,11 +202619,11 @@ msgstr "utolsó hőm:"
 
 #: src/item.cpp
 msgid "Temp: "
-msgstr ""
+msgstr "Hőm.: "
 
 #: src/item.cpp
 msgid "Spec ener: "
-msgstr ""
+msgstr "Spec ener: "
 
 #: src/item.cpp
 msgid "Spec heat lq: "
@@ -198301,7 +202639,7 @@ msgstr ""
 
 #: src/item.cpp
 msgid "Freeze point: "
-msgstr ""
+msgstr "Fagypont: "
 
 #: src/item.cpp
 msgid "Quench: "
@@ -198345,7 +202683,7 @@ msgstr "Vitamin (NBÉ): "
 
 #: src/item.cpp
 msgid "* This food will cause an <bad>allergic reaction</bad>."
-msgstr ""
+msgstr "* Ez az étel <bad>allergiás reakciót</bad> vált ki."
 
 #: src/item.cpp
 msgid "* This food contains <bad>human flesh</bad>."
@@ -198418,10 +202756,10 @@ msgstr ""
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
 msgstr ""
-"* Ez az étel elkezdett <bad>megrohadni</bad>. <bad>Nagyon rossz ötlet</bad> "
+"Ez az étel elkezdett <bad>megrohadni</bad>. <bad>Nagyon rossz ötlet</bad> "
 "lenne ezt most <info>megenni</info>."
 
 #: src/item.cpp
@@ -198437,7 +202775,7 @@ msgstr "Kapacitás: "
 
 #: src/item.cpp
 msgid "<num> moves per round"
-msgstr ""
+msgstr "lövésenként <num> mozgás"
 
 #: src/item.cpp
 msgid "Reload time: "
@@ -198477,26 +202815,24 @@ msgstr "Visszarúgás: "
 
 #: src/item.cpp
 msgid "This ammo has been <bad>hand-loaded</bad>."
-msgstr ""
+msgstr "Ez a töltény <bad>kézzel töltött</bad>."
 
 #: src/item.cpp
 msgid ""
 "This ammo has been loaded with <bad>blackpowder</bad>, and will quickly clog"
 " up most guns, and cause rust if the gun is not cleaned."
 msgstr ""
+"Ezt a lőszert <bad>fekete puskaporral</bad> töltötték, a legtöbb fegyvert "
+"gyorsan eltömíti, és a fegyver rozsdásodásához vezet, ha azt nem tisztítják "
+"meg."
 
 #: src/item.cpp
 msgid "This ammo <good>never misfires</good>."
-msgstr ""
+msgstr "Ez a töltény <good>soha nem döglik be</good>."
 
 #: src/item.cpp
 msgid "This ammo <neutral>starts fires</neutral>."
-msgstr ""
-
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr "Az aktív <info>fegyver mod (%s)</info> statisztikái láthatók."
+msgstr "Ez a töltény <neutral>tüzet gyújt</neutral>."
 
 #: src/item.cpp
 msgid "Skill used: "
@@ -198535,7 +202871,7 @@ msgstr "<num>"
 
 #: src/item.cpp
 msgid "<num> moves "
-msgstr ""
+msgstr "<num> lépés"
 
 #: src/item.cpp
 msgid "Time to reach aim level: "
@@ -198642,8 +202978,9 @@ msgid "Used on: "
 msgstr "Használja: "
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "Hely: "
+#, c-format
+msgid "Location: %s"
+msgstr "Helye: %s"
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -198743,7 +203080,7 @@ msgstr "Réteg: "
 
 #: src/item.cpp
 msgid "<stat>Personal aura</stat>. "
-msgstr ""
+msgstr "<stat>Személyes aura</stat>. "
 
 #: src/item.cpp
 msgid "<stat>Close to skin</stat>. "
@@ -198763,7 +203100,7 @@ msgstr "<stat>Derék</stat>. "
 
 #: src/item.cpp
 msgid "<stat>Outer aura</stat>. "
-msgstr ""
+msgstr "</stat>Külső aura</stat>. "
 
 #: src/item.cpp
 msgid "<stat>Normal</stat>. "
@@ -198787,19 +203124,19 @@ msgstr "<num> <bad>(rosszul illik)</bad>"
 
 #: src/item.cpp
 msgid "<num> <bad>(too big)</bad>"
-msgstr ""
+msgstr "<num> <bad>(túl nagy)</bad>"
 
 #: src/item.cpp
 msgid "<num> <bad>(huge!)</bad>"
-msgstr ""
+msgstr "<num> <bad>(hatalmas!)</bad>"
 
 #: src/item.cpp
 msgid "<num> <bad>(too small)</bad>"
-msgstr ""
+msgstr "<num> <bad>(túl kicsi)</bad>"
 
 #: src/item.cpp
 msgid "<num> <bad>(tiny!)</bad>"
-msgstr ""
+msgstr "<num> <bad>(apró!)</bad>"
 
 #: src/item.cpp
 msgid "<bold>Encumbrance</bold>: "
@@ -198838,14 +203175,16 @@ msgid ""
 "Protection values are <bad>reduced by damage</bad> and you may be able to "
 "<info>improve them by repairing this item</info>."
 msgstr ""
+"A védelmi értékeket a <bad>sérülés csökkenti</bad>, de a tárgy "
+"<info>megjavításával növelhető</info>."
 
 #: src/item.cpp
 msgid "<bold>Weight capacity modifier</bold>: "
-msgstr ""
+msgstr "<bold>Súly kapacitás módosító</bold>: "
 
 #: src/item.cpp
 msgid "<bold>Weight capacity bonus</bold>: "
-msgstr ""
+msgstr "<bold>Súly kapacitás bónusz</bold>: "
 
 #: src/item.cpp
 msgid "Just for fun."
@@ -198858,18 +203197,20 @@ msgstr "Valamiféle <info>harcművészeti tankönyv</info>."
 #: src/item.cpp
 #, c-format
 msgid "You can learn <info>%s</info> style from it."
-msgstr ""
+msgstr "Ebből a(z) <info>%s</info> harci stílust lehet elsajátítani."
 
 #: src/item.cpp
 #, c-format
 msgid "This fighting style is <info>%s</info> to learn."
-msgstr ""
+msgstr "Ezt a harci stílust <info>%s</info> megtanulni."
 
 #: src/item.cpp
 #, c-format
 msgid ""
 "It'd be easier to master if you'd have skill expertise in <info>%s</info>."
 msgstr ""
+"Ezt könnyebben elsajátítanád, ha a(z) <info>%s</info> készséged magasabb "
+"szintű lenne."
 
 #: src/item.cpp
 msgid "It can be <info>understood by beginners</info>."
@@ -198878,12 +203219,12 @@ msgstr "<info>Kezdők is megérthetik</info>."
 #: src/item.cpp
 #, c-format
 msgid "Can bring your <info>%s skill to</info> <num>."
-msgstr ""
+msgstr "A(z) <info>%s készségedet</info> <num>. szintig tudja növelni."
 
 #: src/item.cpp
 #, c-format
 msgid "Your current <stat>%s skill</stat> is <num>."
-msgstr ""
+msgstr "Jelenleg a(z) <stat>%s készséged</stat> <num>. szintű."
 
 #: src/item.cpp
 #, c-format
@@ -198917,7 +203258,11 @@ msgid_plural ""
 "<info>A training session</info> with this book takes <num> "
 "<info>minutes</info>."
 msgstr[0] ""
+"Ezzel a könyvvel a <info>gyakorlás</info> <num> <info>percet</info> venne "
+"igénybe."
 msgstr[1] ""
+"Ezzel a könyvvel a <info>gyakorlás</info> <num> <info>percet</info> venne "
+"igénybe."
 
 #: src/item.cpp
 msgid "This book has <num> <info>unread chapter</info>."
@@ -198954,7 +203299,7 @@ msgstr "<info>vízhatlan</info>, "
 
 #: src/item.cpp
 msgid "<good>prevents spoiling</good>, "
-msgstr ""
+msgstr "<good>megakadályozza a romlást</good>, "
 
 #: src/item.cpp
 #, c-format
@@ -198964,17 +203309,17 @@ msgstr "és <info>%s %s</info> tárolására alkalmas."
 #: src/item.cpp
 #, c-format
 msgid "<bold>Capacity:</bold> %dmJ"
-msgstr ""
+msgstr "<bold>Kapacitás:</bold> %dmJ"
 
 #: src/item.cpp
 #, c-format
 msgid "<bold>Capacity:</bold> %dJ"
-msgstr ""
+msgstr "<bold>Kapacitás:</bold> %dJ"
 
 #: src/item.cpp
 #, c-format
 msgid "<bold>Capacity:</bold> %dkJ"
-msgstr ""
+msgstr "<bold>Kapacitás:</bold> %dkJ"
 
 #: src/item.cpp
 #, c-format
@@ -198998,7 +203343,7 @@ msgstr[1] "Maximum <num> töltet."
 #: src/item.cpp
 #, c-format
 msgid "Using: %s"
-msgstr ""
+msgstr "Használja: %s"
 
 #: src/item.cpp
 #, c-format
@@ -199094,7 +203439,7 @@ msgstr "<bold>Ezzel javítható</bold>: "
 
 #: src/item.cpp
 msgid "* This item can be <good>reinforced</good>."
-msgstr ""
+msgstr "* Ezt a tárgyat <good>meg lehet erősíteni</good>."
 
 #: src/item.cpp
 msgid "* This item is <bad>not repairable</bad>."
@@ -199116,7 +203461,7 @@ msgstr "* Ez a tárgy <bad>vezeti</bad> az áramot."
 
 #: src/item.cpp
 msgid "* This clothing will give you an <bad>allergic reaction</bad>."
-msgstr ""
+msgstr "* Ez a ruha <bad>allergiás reakciót</bad> vált ki."
 
 #: src/item.cpp
 msgid "* This item can be <info>worn with a helmet</info>."
@@ -199124,92 +203469,105 @@ msgstr "* Ezt a tárgyat <info>sisakkal is lehet viselni</info>."
 
 #: src/item.cpp
 msgid "* This clothing <info>fits</info> you perfectly."
-msgstr ""
+msgstr "* Ez a ruha tökéletesen <info>illik</info> rád."
 
 #: src/item.cpp
 msgid "* This clothing <info>fits</info> your large frame perfectly."
-msgstr ""
+msgstr "* Ez a ruha tökéletesen <info>illik</info> a nagyméretű testedre."
 
 #: src/item.cpp
 msgid "* This clothing <info>fits</info> your small frame perfectly."
-msgstr ""
+msgstr "* Ez a ruha tökéletesen <info>illik</info> a kisméretű testedre."
 
 #: src/item.cpp
 msgid ""
 "* This clothing is <bad>oversized</bad> and does <bad>not fit</bad> you."
-msgstr ""
+msgstr "* Ez a ruha <bad>túl nagy</bad> és <bad>nem illik</bad> rád."
 
 #: src/item.cpp
 msgid ""
 "* This clothing is hilariously <bad>oversized</bad> and does <bad>not "
 "fit</bad> your <info>abnormally small mutated anatomy</info>."
 msgstr ""
+"* Ez a ruha röhejesen <bad>túl nagy rád</bad> és <bad>nem illik</bad> az "
+"<info>abnormálisa kicsire mutálódott testedre</info>."
 
 #: src/item.cpp
 msgid ""
 "* This clothing is <bad>normal sized</bad> and does <bad>not fit</info> your"
 " <info>abnormally large mutated anatomy</info>."
 msgstr ""
+"* Ez a ruha <bad>normális méretű</bad> és <bad>nem illik</bad> az "
+"<info>abnormálisan nagyra mutálódott testedre</info>."
 
 #: src/item.cpp
 msgid ""
 "* This clothing is <bad>normal sized</bad> and does <bad>not fit</bad> your "
 "<info>abnormally small mutated anatomy</info>."
 msgstr ""
+"* Ez a ruha <bad>normális méretű</bad> és <bad>nem illik</bad> az "
+"<info>abnormálisan kicsire mutálódott testedre</info>."
 
 #: src/item.cpp
 msgid ""
 "* This clothing is hilariously <bad>undersized</bad> and does <bad>not "
 "fit</bad> your <info>abnormally large mutated anatomy</info>."
 msgstr ""
+"* Ez a ruha röhejesen <bad>túl kicsi rád</bad> és <bad>nem illik</bad> az "
+"<info>abnormálisa nagyra mutálódott testedre</info>."
 
 #: src/item.cpp
 msgid ""
 "* This clothing is <bad>undersized</bad> and does <bad>not fit</bad> you."
-msgstr ""
+msgstr "* Ez a ruha <bad>túl kicsi</bad> és <bad>nem illik</bad> rád."
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
+msgid "<info>can be upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
+msgid "<info>can be downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
+msgid "<bad>can not be downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
+msgid "<bad>can not be upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
+#, c-format
+msgid "* This clothing %s."
+msgstr "* Ez a ruha %s."
+
+#: src/item.cpp
+msgid " and <info>upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
+msgid " and <info>downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
+msgid " but <bad>not downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
+msgid " but <bad>not upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
 msgstr ""
 
 #: src/item.cpp
 msgid "* This clothing <bad>can not be refitted, upsized, or downsized</bad>."
 msgstr ""
+"* Ezt a ruhadarabot <info>nem lehet rád szabni, kisebbre vagy nagyobbra "
+"venni</info>."
 
 #: src/item.cpp
 msgid "* This item can be worn on <info>either side</info> of the body."
@@ -199272,7 +203630,7 @@ msgstr ""
 
 #: src/item.cpp
 msgid "* This tool <info>runs on bionic power</info>."
-msgstr ""
+msgstr "* Ez a szerszám <info>bionikus energiát használ</info>."
 
 #: src/item.cpp
 msgid ""
@@ -199304,16 +203662,30 @@ msgid "This bionic is installed in the following body part(s):"
 msgstr "Ez a bionika az alábbi testrészekbe került beépítésre:"
 
 #: src/item.cpp
-msgid "<bold>Encumbrance:</bold> "
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/item.cpp
+msgid " <num> mJ"
 msgstr ""
 
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr "<bold>Energia kapacitás:</bold>"
+
+#: src/item.cpp
+msgid "<bold>Encumbrance:</bold> "
+msgstr "<bold>Ormótlanság</bold> "
+
 #: src/item.cpp
 msgid "<bold>Environmental Protection:</bold> "
-msgstr ""
+msgstr "<bold>Védelem a környezettől:</bold> "
 
 #: src/item.cpp
 msgid "<bold>Stat Bonus:</bold> "
-msgstr ""
+msgstr "<bold>Stat bónusz:</bold> "
 
 #: src/item.cpp
 msgid "* This weapon needs <info>two free hands</info> to fire."
@@ -199326,7 +203698,7 @@ msgstr "* Ez a mod <bad>elfedi</bad> az alapfegyver céltüskéjét."
 
 #: src/item.cpp
 msgid "* This mod might <bad>suffer wear</bad> when firing the base weapon."
-msgstr ""
+msgstr "* Ez a mod <bad>elkophat</bad>, amikor az alapfegyverrel lősz."
 
 #: src/item.cpp
 msgid ""
@@ -199348,15 +203720,15 @@ msgstr ""
 #, c-format
 msgid "* Once set in a vat, this will ferment in around %d hour."
 msgid_plural "* Once set in a vat, this will ferment in around %d hours."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "* Erjesztőkádba helyezés után %d óra múlva erjed meg."
+msgstr[1] "* Erjesztőkádba helyezés után %d óra múlva erjed meg."
 
 #: src/item.cpp
 #, c-format
 msgid "* Once set in a vat, this will ferment in around %d day."
 msgid_plural "* Once set in a vat, this will ferment in around %d days."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "* Erjesztőkádba helyezés után %d nap múlva erjed meg."
+msgstr[1] "* Erjesztőkádba helyezés után %d nap múlva erjed meg."
 
 #: src/item.cpp
 #, c-format
@@ -199367,7 +203739,7 @@ msgstr "* Ennek az erjesztéséből <neutral>%s</neutral> készül majd."
 #: src/item.cpp
 #, c-format
 msgid "* <bad>%1$s</bad>.  %2$s"
-msgstr ""
+msgstr "* <bad>%1$s</bad>.  %2$s"
 
 #: src/item.cpp
 msgid "<bold>Can be stored in:</bold> "
@@ -199387,14 +203759,14 @@ msgstr "%s múlva lesz kész."
 #, c-format
 msgctxt "carving"
 msgid "%1$s on the %2$s is: %3$s"
-msgstr ""
+msgstr "%1$s felirat a(z) %2$sn: %3$s"
 
 #. ~ %1$s: inscription text
 #: src/item.cpp
 #, c-format
 msgctxt "carving"
 msgid "Note: %1$s"
-msgstr ""
+msgstr "Jegyzet: %1$s"
 
 #: src/item.cpp
 msgid "Integrated mod: "
@@ -199414,6 +203786,8 @@ msgid ""
 "* This item can be used as a <info>die</info>, and has <info>%d</info> "
 "sides."
 msgstr ""
+"* Ezt a tárgyat lehet <info>dobókockának</info> használni és <info>%d</info>"
+" oldala van."
 
 #: src/item.cpp
 msgid "You know dozens of things you could craft with it."
@@ -199428,6 +203802,11 @@ msgstr "Más egyéb dolgokat lehetne vele elkészíteni."
 msgid "You could use it to craft: %s"
 msgstr "Ezt lehetne vele elkészíteni: %s"
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr "Az aktív <info>fegyver mod (%s)</info> statisztikái láthatók."
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -199496,7 +203875,7 @@ msgstr "%1$s %2$s"
 #, c-format
 msgctxt "item name"
 msgid "%1$s with %2$s"
-msgstr ""
+msgstr "%1$s  %2$s"
 
 #. ~ %1$s: item name, %2$zd: content size
 #: src/item.cpp
@@ -199504,8 +203883,8 @@ msgstr ""
 msgctxt "item name"
 msgid "%1$s with %2$zd item"
 msgid_plural "%1$s with %2$zd items"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1$s %2$zd tárggyal"
+msgstr[1] "%1$s %2$zd tárggyal"
 
 #: src/item.cpp
 msgid " (poisonous)"
@@ -199518,7 +203897,7 @@ msgstr " (hallucinogén)"
 #: src/item.cpp
 #, c-format
 msgid " (%s turns)"
-msgstr ""
+msgstr " (%s kör)"
 
 #: src/item.cpp
 msgid " (dirty)"
@@ -199558,19 +203937,19 @@ msgstr " (olvadt)"
 
 #: src/item.cpp
 msgid " (too big)"
-msgstr ""
+msgstr " (túl nagy)"
 
 #: src/item.cpp
 msgid " (huge!)"
-msgstr ""
+msgstr " (hatalmas!)"
 
 #: src/item.cpp
 msgid " (too small)"
-msgstr ""
+msgstr " (túl kicsi)"
 
 #: src/item.cpp
 msgid " (tiny!)"
-msgstr ""
+msgstr " (apró!)"
 
 #: src/item.cpp
 msgid " (poor fit)"
@@ -199582,11 +203961,11 @@ msgstr " (koszos)"
 
 #: src/item.cpp
 msgid " (sterile)"
-msgstr ""
+msgstr " (steril)"
 
 #: src/item.cpp
 msgid " (packed)"
-msgstr ""
+msgstr " (becsomagolt)"
 
 #: src/item.cpp
 msgid " (UPS)"
@@ -199625,7 +204004,7 @@ msgstr " (ég)"
 
 #: src/item.cpp
 msgid " (plugged in)"
-msgstr ""
+msgstr " (csatlakoztatva)"
 
 #: src/item.cpp
 msgid " (active)"
@@ -199633,7 +204012,7 @@ msgstr " (aktív)"
 
 #: src/item.cpp
 msgid " *"
-msgstr ""
+msgstr " *"
 
 #: src/item.cpp
 msgid "sawn-off "
@@ -199671,7 +204050,7 @@ msgstr "*%s*"
 #, c-format
 msgctxt "cash card and money"
 msgid "%1$s %3$s of %2$s"
-msgstr ""
+msgstr "%1$s %3$s / %2$s"
 
 #. ~ This is a string to display the total amount of money in a stack of cash
 #. cards.
@@ -199714,7 +204093,7 @@ msgstr "\\."
 
 #: src/item.cpp
 msgid "XX"
-msgstr ""
+msgstr "XX"
 
 #: src/item.cpp
 msgid ".."
@@ -199752,7 +204131,7 @@ msgstr "pépesített "
 
 #: src/item.cpp
 msgid "fully intact "
-msgstr ""
+msgstr "teljesen ép "
 
 #: src/item.cpp
 msgid "isn't a weapon"
@@ -199793,6 +204172,8 @@ msgstr "ott csak kisméretű modokat tud befogadni"
 #, c-format
 msgid "%1$s cannot be used on item with no compatible ammo types"
 msgstr ""
+"A(z) %1$s nem használható olyan tárgyon, ami nem rendelkezik kompatibilis "
+"lőszer fajtával."
 
 #: src/item.cpp
 msgid "is already waterproof"
@@ -199820,7 +204201,7 @@ msgstr "nem lehet ilyen fegyverre felcsatolni: \"%s\""
 #, c-format
 msgctxt "magazine"
 msgid "Eject %1$s from %2$s?"
-msgstr ""
+msgstr "Kitárazod ezt: %1$s innen: %2$s?"
 
 #: src/item.cpp
 #, c-format
@@ -199874,11 +204255,11 @@ msgstr "Egy közeli holttest felkel, és elindul feléd!"
 
 #: src/item.cpp
 msgid "Oh dear god, a robot you're carrying has started moving!"
-msgstr ""
+msgstr "Te jó ég, a szállított robot elkezdett mozogni!"
 
 #: src/item.cpp
 msgid "Oh dear god, a corpse you're carrying has started moving!"
-msgstr ""
+msgstr "Te jó ég, a szállított holttest elkezdett mozogni!"
 
 #: src/item.cpp
 #, c-format
@@ -199935,28 +204316,28 @@ msgstr "A(z) %s üzemeltetéséhez egy ET szükséges!"
 #: src/item.cpp
 #, c-format
 msgid "Your %s rusts due to blackpowder fouling."
-msgstr ""
+msgstr "A(z) %s a fekete lőpor kormozódásától rozsdásodik."
 
 #: src/item.cpp
 #, c-format
 msgid "Your %s disappears!"
-msgstr ""
+msgstr "A(z) %s eltűnik!"
 
 #: src/item.cpp
 #, c-format
 msgctxt "item name"
 msgid "skinned %s corpse"
 msgid_plural "skinned %s corpses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s holttestet nyúzott meg"
+msgstr[1] "%s holttestet nyúzott meg"
 
 #: src/item.cpp
 #, c-format
 msgctxt "item name"
 msgid "skinned %s carcass"
 msgid_plural "skinned %s carcasses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s dögöt nyúzott meg"
+msgstr[1] "%s dögöt nyúzott meg"
 
 #: src/item.cpp
 #, c-format
@@ -200618,8 +204999,8 @@ msgid "You do not have that item!"
 msgstr "Nincs nálad az a tárgy!"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
-msgstr "Melyik jelzéssel aktiválod a tárgyat?"
+msgid "Which signal should activate the item?"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "\"Blue\""
@@ -200750,23 +205131,23 @@ msgstr "Használathoz szétcsomagolod a(z) %st."
 
 #: src/iuse.cpp
 msgid "Choose CBM to pack"
-msgstr ""
+msgstr "Válaszd ki, hogy melyik KBM-et csomagolod be."
 
 #: src/iuse.cpp
 msgid "You don't have any CBMs."
-msgstr ""
+msgstr "Nincsen KBM-ed."
 
 #: src/iuse.cpp
 msgid "This CBM is faulty.  You should mend it first.  Do you want to try?"
-msgstr ""
+msgstr "Ez a KBM hibás, meg kellene szerelned. Megpróbálod?"
 
 #: src/iuse.cpp
 msgid "You carefully prepare the CBM for sterilization."
-msgstr ""
+msgstr "Óvatosan előkészíted a KBM-et a sterilizálásra."
 
 #: src/iuse.cpp
 msgid "You fail to properly prepare the CBM."
-msgstr ""
+msgstr "Nem sikerül megfelelően előkészíteni a KBM-et."
 
 #: src/iuse.cpp
 #, c-format
@@ -200866,16 +205247,6 @@ msgstr "KXSHHHHRRCRKLKKK!"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr ""
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr ""
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr ""
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr ""
@@ -201296,18 +205667,27 @@ msgid "Scan the ground"
 msgstr "Megméred a földet"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "Megméred magadat"
+msgid "Scan yourself or other person"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "Folyamatos mérés bekapcsolása"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr ""
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -201375,6 +205755,10 @@ msgstr ""
 msgid "You've already released the handle, try throwing it instead."
 msgstr ""
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "Kell valami, amivel meg lehet gyújtani!"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr ""
@@ -201866,10 +206250,6 @@ msgstr ""
 msgid "You mop up the spill."
 msgstr ""
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr ""
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr ""
@@ -201931,15 +206311,7 @@ msgid "You don't have appropriate food to heat up."
 msgstr ""
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
-msgstr ""
-
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
-msgstr ""
-
-#: src/iuse.cpp
-msgid "You heat up the food."
+msgid "You start heating up the food."
 msgstr ""
 
 #: src/iuse.cpp
@@ -202935,7 +207307,7 @@ msgid "Your %s is too heavy or bulky for this RC car."
 msgstr ""
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
+msgid "You disarmed your RC car."
 msgstr ""
 
 #. ~Sound of a radio controlled car moving around
@@ -202948,11 +207320,11 @@ msgid "What to do with activated RC car?"
 msgstr ""
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
+msgid "You turned off your RC car."
 msgstr ""
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
+#: src/iuse.cpp
+msgid "beep"
 msgstr ""
 
 #: src/iuse.cpp
@@ -202990,7 +207362,14 @@ msgstr ""
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
+msgstr ""
+
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
 "sending the signal."
 msgstr ""
 
@@ -204757,9 +209136,29 @@ msgstr ""
 msgid "How do you want to modify it?"
 msgstr "Hogyan szeretnéd módosítani?"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
 msgstr ""
 
 #: src/iuse_actor.cpp
@@ -206150,6 +210549,23 @@ msgstr ""
 msgid "All knowledge of %s leaves you."
 msgstr ""
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr ""
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr ""
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr ""
@@ -206158,6 +210574,10 @@ msgstr ""
 msgid "Popup Distractions"
 msgstr ""
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr ""
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr ""
@@ -206222,6 +210642,15 @@ msgstr ""
 msgid "Casting Cost (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr ""
@@ -206230,6 +210659,10 @@ msgstr ""
 msgid "Casting Time (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+msgid "self"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr ""
@@ -206243,29 +210676,37 @@ msgid "Healing"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Variance"
+msgid "Spell Radius"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spawn"
+msgid "Cone Arc"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Summon"
+msgid "degrees"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spell Radius"
+msgid "Line Width"
 msgstr ""
 
-#: src/magic.cpp src/veh_interact.cpp
-msgid "Range"
-msgstr "Hatótáv"
+#: src/magic.cpp
+msgid "Variance"
+msgstr ""
 
 #: src/magic.cpp
-msgid "self"
+msgid "Spawn"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Summon"
 msgstr ""
 
+#: src/magic.cpp src/veh_interact.cpp
+msgid "Range"
+msgstr "Hatótáv"
+
 #: src/magic.cpp
 msgid "Duration"
 msgstr ""
@@ -206290,18 +210731,22 @@ msgstr ""
 msgid "Damage Type"
 msgstr ""
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr ""
@@ -206350,6 +210795,11 @@ msgstr ""
 msgid "No valid targets to teleport."
 msgstr ""
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr ""
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr ""
@@ -206492,6 +210942,10 @@ msgstr ""
 msgid "Unable to make sound directory.  Check permissions."
 msgstr ""
 
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr ""
+
 #: src/main_menu.cpp
 msgid "Really quit?"
 msgstr "Biztos kilépsz?"
@@ -206700,7 +211154,7 @@ msgstr ""
 #: src/map.cpp
 #, c-format
 msgid "It should take %d minutes to finish washing items in the %s."
-msgstr ""
+msgstr "Még %d perc van hátra a(z) %s mosási programjából."
 
 #: src/map.cpp
 #, c-format
@@ -206715,7 +211169,7 @@ msgstr ""
 #: src/map.cpp
 #, c-format
 msgid "It should take %d minutes to finish sterilising items in the %s."
-msgstr ""
+msgstr "Még %d perc van hátra a(z) %s sterilizálási programjából."
 
 #: src/map.cpp
 #, c-format
@@ -207184,7 +211638,7 @@ msgstr ""
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
+msgid "The %1$s is not a valid %2$s weapon."
 msgstr ""
 
 #: src/martialarts.cpp
@@ -207606,11 +212060,6 @@ msgid_plural "%d enemies hit!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr ""
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -208175,6 +212624,7 @@ msgstr ""
 msgid ""
 "Bionic Power: <color_light_blue>%d</color>/<color_light_blue>%d</color>"
 msgstr ""
+"Bionikus energia: <color_light_blue>%d</color>/<color_light_blue>%d</color>"
 
 #: src/memorial_logger.cpp
 msgid "Weapon:"
@@ -209934,16 +214384,42 @@ msgid "You don't have any companions to send out…"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
+msgid "Who do you want to send?"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
 msgstr ""
 
+#. ~ %1$s: npc name
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
+msgstr ""
+
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
+msgstr ""
+
+#: src/mission_companion.cpp
+msgid "You choose to send no one…"
 msgstr ""
 
 #: src/mission_companion.cpp
@@ -210435,13 +214911,13 @@ msgstr ""
 #: src/monattack.cpp
 #, c-format
 msgid "The underbrush beneath your feet grows and pierces your %s!"
-msgstr ""
+msgstr "A %s átszúrja a gyorsan kinövő aljnövényzet!"
 
 #. ~ %s is bodypart name in accusative.
 #: src/monattack.cpp
 #, c-format
 msgid "Underbrush grows into a tree, and it pierces <npcname>'s %s!"
-msgstr ""
+msgstr "Az aljnövényzet hirtelen fává nő, és átszúrja <npcname> %s!"
 
 #. ~ 1$s monster name(vine), 2$s bodypart in accusative
 #: src/monattack.cpp
@@ -211628,6 +216104,11 @@ msgstr ""
 msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr ""
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr ""
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -211827,11 +216308,6 @@ msgstr ""
 msgid "zombie slave"
 msgstr ""
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr ""
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -212234,22 +216710,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr ""
 
@@ -212314,6 +216795,16 @@ msgstr ""
 msgid "wearing %1$s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr "A(z) %s"
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr ""
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -212341,11 +216832,11 @@ msgstr "Súlyosan sérült."
 
 #: src/monster.cpp
 msgid "It is nearly dead!"
-msgstr ""
+msgstr "Majdnem halott!"
 
 #: src/monster.cpp
 msgid " Difficulty "
-msgstr ""
+msgstr "Nehézség"
 
 #: src/monster.cpp src/npc.cpp
 msgid "Aware of your presence!"
@@ -212356,6 +216847,11 @@ msgstr "Tud a jelenlétedről!"
 msgid "Rider: %s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr ""
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr ""
@@ -212509,55 +217005,55 @@ msgstr "Kitérsz %s elől."
 #: src/monster.cpp
 #, c-format
 msgid "%1$s dodges %2$s attack."
-msgstr ""
+msgstr "%1$s kitér a(z) %2$s támadása elől."
 
 #: src/monster.cpp
 #, c-format
 msgid "The %1$s misses %2$s!"
-msgstr ""
+msgstr "A(z) %1$s nem találja el a(z) %2$s!"
 
 #: src/monster.cpp
 msgid "You dodge an attack from an unseen source."
-msgstr ""
+msgstr "Kitérsz egy ismeretlen helyről érkezett támadás elől."
 
 #. ~ 1$s is attacker name, 2$s is bodypart name in accusative.
 #: src/monster.cpp
 #, c-format
 msgid "The %1$s hits your %2$s."
-msgstr ""
+msgstr "A(z) %1$s eltalálja a(z) %2$s."
 
 #. ~ %1$s: name of your mount, %2$s: target NPC name, %3$d: damage value
 #. ~ %1$s: name of your mount, %2$s: target creature name, %3$d: damage value
 #: src/monster.cpp
 #, c-format
 msgid "Your %1$s hits %2$s for %3$d damage!"
-msgstr ""
+msgstr "A(z) %1$s eltalálja a(z) %2$st és %3$d sebzés okoz!"
 
 #. ~ %1$s: attacker name, %2$s: target NPC name, %3$s: bodypart name in
 #. accusative
 #: src/monster.cpp
 #, c-format
 msgid "The %1$s hits %2$s %3$s."
-msgstr ""
+msgstr "A(z) %1$s eltalálja %2$s %3$s."
 
 #. ~ %1$s: attacker name, %2$s: target creature name
 #: src/monster.cpp
 #, c-format
 msgid "The %1$s hits %2$s!"
-msgstr ""
+msgstr "A(z) %1$s eltalálja a(z) %2$st!"
 
 #. ~ %s is bodypart name in accusative.
 #: src/monster.cpp
 #, c-format
 msgid "Something hits your %s."
-msgstr ""
+msgstr "Valami eltalálja a %s."
 
 #. ~ 1$s is attacker name, 2$s is bodypart name in accusative, 3$s is armor
 #. name
 #: src/monster.cpp
 #, c-format
 msgid "The %1$s hits your %2$s, but your %3$s protects you."
-msgstr ""
+msgstr "A(z) %1$s eltalálja a %2$s, de a(z) %3$s megvéd a sebesüléstől."
 
 #. ~ $1s is monster name, %2$s is that monster target name,
 #. ~ $3s is target bodypart name in accusative, $4s is the monster target
@@ -212567,31 +217063,34 @@ msgstr ""
 #, c-format
 msgid "The %1$s hits %2$s %3$s but is stopped by %4$s %5$s."
 msgstr ""
+"A(z) %1$s eltalálja a(z) %2$s %3$s, de a(z) %4$s %5$s páncélja megvédi a "
+"sebesüléstől."
 
 #. ~ $1s is monster name, %2$s is that monster target name,
 #. ~ $3s is target armor name.
 #: src/monster.cpp
 #, c-format
 msgid "The %1$s hits %2$s but is stopped by its %3$s."
-msgstr ""
+msgstr "A(z) %1$s eltalálja a(z) %2$s, de a(z) %3$s felfogja a támadást."
 
 #. ~ 1$s is bodypart name in accusative, 2$s is armor name.
 #: src/monster.cpp
 #, c-format
 msgid "Something hits your %1$s, but your %2$s protects you."
-msgstr ""
+msgstr "Valami eltalálja a %1$s, de a(z) %2$s megvéd."
 
 #: src/monster.cpp
 msgid "You're envenomed!"
-msgstr ""
+msgstr "Megmérgeztek!"
 
 #: src/monster.cpp
 msgid "You feel venom flood your body, wracking you with pain…"
 msgstr ""
+"Érzed, ahogyan a méreg szétterjed a testedben, amely fájdalomba rándul..."
 
 #: src/monster.cpp
 msgid "You feel venom enter your body!"
-msgstr ""
+msgstr "Érzed, ahogyan a méreg szétterül a testedben!"
 
 #: src/monster.cpp
 #, c-format
@@ -212726,11 +217225,11 @@ msgstr "Összes hangulat:"
 
 #: src/morale.cpp
 msgid "Pain level:"
-msgstr ""
+msgstr "Fájdalom szintje:"
 
 #: src/morale.cpp
 msgid "Fatigue level:"
-msgstr ""
+msgstr "Fáradtság szintje:"
 
 #: src/morale.cpp
 msgid "Focus trends towards:"
@@ -212847,22 +217346,22 @@ msgstr ""
 #: src/mutation.cpp
 #, c-format
 msgid "Your %1$s mutation turns into %2$s!"
-msgstr ""
+msgstr "A(z) %1$s mutációd átváltozik ezzé: %2$s!"
 
 #: src/mutation.cpp
 #, c-format
 msgid "<npcname>'s %1$s mutation turns into %2$s!"
-msgstr ""
+msgstr "<npcname> %1$s mutációja átváltozik ezzé: %2$s!"
 
 #: src/mutation.cpp
 #, c-format
 msgid "Your innate %1$s trait turns into %2$s!"
-msgstr ""
+msgstr "A veled született %1$s vonásod átváltozik ezzé: %2$s!"
 
 #: src/mutation.cpp
 #, c-format
 msgid "<npcname>'s innate %1$s trait turns into %2$s!"
-msgstr ""
+msgstr "<npcname> veleszületett %1$s vonása átváltozik ezzé: %2$s!"
 
 #: src/mutation.cpp
 #, c-format
@@ -213005,7 +217504,7 @@ msgid "Crossed a threshold"
 msgstr ""
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
+msgid "Oh, yeah!  That's the stuff!"
 msgstr ""
 
 #: src/mutation_ui.cpp
@@ -214027,7 +218526,7 @@ msgstr "Düh: "
 msgid "%s disappears."
 msgstr "%s eltűnik."
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "%s meghal!"
@@ -214776,6 +219275,16 @@ msgstr "Hírem van."
 msgid "Yes, let's resume training "
 msgstr ""
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr ""
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr ""
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -214944,10 +219453,6 @@ msgstr ""
 msgid "I need a %s to consume that!"
 msgstr ""
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr ""
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr ""
@@ -215025,6 +219530,11 @@ msgstr ""
 msgid "My current location"
 msgstr ""
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -215057,10 +219567,6 @@ msgstr "Melyik bionikát szeretnéd kiszedni?"
 msgid "You decide to hold off…"
 msgstr ""
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr ""
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -215127,6 +219633,11 @@ msgstr ""
 msgid "%s leaves."
 msgstr ""
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -215186,6 +219697,11 @@ msgstr "Tovább >"
 msgid "Examine which item?"
 msgstr "Melyik tárgyat vizsgálod meg?"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr ""
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -215532,7 +220048,7 @@ msgstr "Biztonságos mód X kör utáni bekapcsolása"
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
 msgstr ""
 "Hány kör után kapcsoljon be újra a biztonságos mód, ha a biztonsági "
@@ -215645,8 +220161,8 @@ msgstr "Üres tartályok leejtése"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
 msgstr ""
 "Beállíthatod, hogy egy folyadékot tároló edényt a folyadék felhasználása "
 "után leejtsed-e. Nem: Semmit se ejts le. - Vízálló: vízálló tárgyak "
@@ -215823,12 +220339,12 @@ msgid "If true, automatically follow the crosshair when firing/throwing."
 msgstr "Ha igen, akkor dobásnál és lövésnél követi a szálkeresztet."
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "Szétszerelés megerősítése"
+msgid "Query on disassembly while butchering"
+msgstr ""
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
-msgstr "Ha igen, akkor tárgyak szétszerelése előtt a játék megerősítést kér."
+msgid "If true, will query before disassembling items while butchering."
+msgstr ""
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -216127,9 +220643,9 @@ msgstr "Auto leltár betűk"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
 msgstr ""
 "Ha igen, akkor minden leltárban található tárgy automatikusan kap egy betűt,"
 " ha nincs neki. Ha nem, akkor automatikusan a tárgyak nem kapnak betűt. Ha "
@@ -216517,7 +221033,7 @@ msgstr ""
 msgid "Display"
 msgstr "Megjelenítés"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr ""
@@ -216616,10 +221132,8 @@ msgid "Scaling factor"
 msgstr "Skálázási mérték"
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
+msgid "Factor by which to scale the display.  Requires restart."
 msgstr ""
-"Beálítja, hogy hányszorosára skálázza (nagyítsa) a kijelzőt. Újraindítást "
-"igényel."
 
 #: src/options.cpp
 msgid "1x"
@@ -216936,14 +221450,10 @@ msgstr "Indulási nap"
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
 msgstr ""
-"Meghatározza, hogy az év kezdete után hány nappal következett be a "
-"kataklizma. A 0-dik nap a tavasz 1. napja. Az esetek felülírhatják ezt a "
-"beállítást. Ez a beállítás nincsen hatással az ételek rohadására vagy a "
-"szörnyek evolúciójára."
 
 #: src/options.cpp
 msgid "Spawn delay"
@@ -216951,14 +221461,10 @@ msgstr "Megjelenési késleltetés"
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
 msgstr ""
-"Meghatározza, hogy a játékos hány nappal a kataklizma után jelenjen meg. A "
-"0. nap a kataklizma kezdete. Az eseten felülírhatják ezt a beállítást. Az "
-"érték növelésével előrébb haladott állapotba kerül az ételek rohadása és a "
-"szörnyek evolúciója."
 
 #: src/options.cpp
 msgid "Season length"
@@ -217027,12 +221533,9 @@ msgstr "Statikus NPC-k"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
 msgstr ""
-"Ha igen, akkor az NPC-ket a játék elején, egyszer, egy konkrét helyen "
-"generálja le a játék. Megváltoztatása után a világot alaphelyzetbe kell "
-"állítani."
 
 #: src/options.cpp
 msgid "Starting NPCs spawn"
@@ -218273,6 +222776,7 @@ msgstr "Hő   :"
 msgid "Underground"
 msgstr "Föld alatt"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
 msgstr "Szél"
@@ -218334,10 +222838,6 @@ msgstr "Süket!"
 msgid "Weapon  :"
 msgstr "Fegyver :"
 
-#: src/panels.cpp
-msgid "No Style"
-msgstr "Nincs stílus"
-
 #: src/panels.cpp
 msgid "Day "
 msgstr "Nap "
@@ -218350,10 +222850,12 @@ msgstr "Hőm. : "
 msgid "to open sidebar options"
 msgstr "az oldalás beállításaihoz"
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
 msgstr "Mana"
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
 msgstr "Max Mana"
@@ -218499,7 +223001,7 @@ msgstr "Nincsen elég kapacitás a(z) %s eltevéséhez"
 
 #: src/pickup.cpp
 msgid "You can't pick up a liquid!"
-msgstr "Folyadékot nem lehet felvenni!"
+msgstr "Kiömlött folyadékot nem lehet felvenni!"
 
 #: src/pickup.cpp
 msgid "You're overburdened!"
@@ -218610,75 +223112,6 @@ msgstr ""
 msgid "You have learned a new style: %s!"
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "A %s egy pár óra múlva első fokú fagyási sérülést fog szenvedni."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "A %s egy órán belül első fokú fagyási sérülést fog szenvedni!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr ""
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr "Érzed, ahogyan a(z) %s testrészed elzsibbad a hidegtől!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr "Érzed, ahogyan a %s testrészed nagyon fázik."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr "Érzed, ahogyan a %s testrészed kihűlt."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr "Érzed, ahogyan a %s testrészed rákvörös a forróságtól!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr "Érzed, ahogyan a %s testrészed nagyon meleg."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr "Érzed, ahogyan a %s testrészed melegedik."
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "A széltől a %s nagyon fázik."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr "A szél nagyon erősen fúj, valamilyen hőálló ruházat kellene rá: %s."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr "A ruházatod nem elég a %s melegen tartásához!"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "A földön fetrengve próbálod kioltani a lángokat!"
@@ -219050,14 +223483,6 @@ msgstr ""
 msgid "There is not enough %s left to siphon it."
 msgstr "Nincsen elég %s ahhoz, hogy azt leszívhasd."
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "Erősen felköhögsz."
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "krákogó köhögés."
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "A testedet gyötrő fájdalom járja át!"
@@ -219103,11 +223528,6 @@ msgstr "A %s testrészedben érzed a fájdalmat!"
 msgid "Your %s aches."
 msgstr "A %s testrészed fáj."
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr "A jelenlegi egészségi értéked %d."
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -219134,423 +223554,6 @@ msgstr ""
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "A beleidben bugyborékolva meghalt valami."
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr "Túlságosan szomjas vagy ahhoz, hogy a(z) %s tovább menjen."
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr "Túlságosan fáradt vagy ahhoz, hogy a(z) %s tovább menjen."
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "Fuldokolsz!"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr ""
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "BZZZZZ"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "Hirtelen tompának érzed magadat."
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "Hirtelen fájdalom jár át."
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "Egy pillanatra megszédülsz."
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "Hirtelen éhesnek érzed magadat."
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "Hirtelen jóllakottnak érzed magadat."
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "Hirtelen szomjasnak érzed magadat."
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "Hirtelen fáradtnak érzed magadat."
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "Hirtelen nagyon fázol."
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "Hirtelen fázol."
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "Hirtelen nagyon meleged lett."
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "Hirtelen meleged lett."
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "Hirtelen önkéntelenül remegni kezdesz."
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr ""
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "Asztmás rohamod van!"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "Elhasználod az utolsó inhalátor töltetet."
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "A napsütés nagyon irritálja a szemedet."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "A napfény égeti a bőrödet!"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "A napfény elvonja a figyelmedet."
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "Ki nem állhatod a napfényt!"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "Hirtelen semmit se hallasz!"
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "Hirtelen semmit se látsz!"
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr "A radiológiai érzékelőid felől abnormális értékeket észlelsz."
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr ""
-"A mellkasod éget, ahogyan az energetikai rendszeredet túlterhelés éri!"
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "Egy fájdalmas elektromos kisüléstől szenvedsz!"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr "A(z) %st láthatóan érinti a kisülés."
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "Égetően savas folyástól szenvedsz!"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "Az elemeid egy kicsit lemerülnek."
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "Az egyik bionikádból recsegő hang árad!"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "Érzed, ahogyan a hibás bionikád reszket."
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "A látásod elpixelesedik!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr "A hibás bionikád miatt görcsben rángatózva a padlóra zuhansz!"
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr "A bionikád rövidre záródik, és ettől remegsz és reszketsz."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "A hibás bionikád viszket!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr "Az izmaid görcsbe rándulnak!"
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr "A padlóra esel!"
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr "Hirtelen kifogy belőled a szusz."
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr "Önkéntelenül remegni kezdesz."
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr "Elájulsz!"
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "A légzésed lelassul."
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr "Megbotlasz és elesel!"
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr ""
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr ""
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr ""
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr ""
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr "A sugárzásmérő badge-ed hirtelen megváltozik erről: %1$s erre: %2$s!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr "A(z) %s elkezdett begyógyulni!"
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr "%1$si irányból ezt hallod: %2$s"
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr "Érzed, ahogy a víz égeti a bőrödet."
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr "A palástod egy pillanatra villódzik!"
@@ -219768,11 +223771,6 @@ msgstr "A(z) %st nem lehet egyetlen egy kézben hordani."
 msgid "You are too weak to wield %s with only one arm."
 msgstr "Túl gyenge vagy ahhoz, hogy a(z) %st egyetlen kézzel hordjad."
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr "Ezt nem tudod kivenni a kezedből: %s"
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "A kéz maradjon üresen (ki)"
@@ -219848,20 +223846,43 @@ msgstr "A(z) %s nem rendelkezik semmiféle javítandó hibával."
 msgid "Mend which fault?"
 msgstr "Melyik hibát javítod?"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white>Szükséges idő:</color>\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr ""
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white>Készség:</color>\n"
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr ""
+
+#: src/player.cpp
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "Skills: %s\n"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr ""
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
-msgstr "> <color_%1$s>%2$s %3$i</color>\n"
+msgid "You are currently unable to mend the %s this way."
+msgstr ""
 
 #: src/player.cpp
 msgid "You are already wearing that."
@@ -219979,14 +224000,6 @@ msgstr "Leveszed a %st."
 msgid "<npcname> takes off their %s."
 msgstr "<npcname> leveszi a %st. "
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr ""
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -220034,20 +224047,6 @@ msgstr ""
 msgid "You can't remove partially depleted plutonium!"
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] ""
-msgstr[1] ""
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -220222,10 +224221,6 @@ msgstr "Megpróbálsz kitérni, de nincs elég hely!"
 msgid "%s tries to dodge but there's no room!"
 msgstr ""
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr ""
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -220279,6 +224274,13 @@ msgstr "Kicsit éhes"
 msgid "Pain "
 msgstr "Fájdalom "
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr ""
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -220509,47 +224511,57 @@ msgstr "Jelenlegi sebesség:"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
-msgstr "Túlterhelt          -%s%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
-msgstr "Fájdalom            -%s%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
-msgstr "Szomjas             -%s%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr "Alultáplált"
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
-msgstr "%-20s-%s%d%%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
-msgstr "Nincs napfényen     -%s%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
+msgstr ""
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
-msgstr "Hidegvérű           %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
-msgstr "Gyors               +%s%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
-msgstr "Bionikus sebesség   +%s%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
@@ -220760,8 +224772,8 @@ msgid "\"Oh God, what's happening?\""
 msgstr "\"Ó Istenem, mi történik?\""
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
-msgstr "\"Hát persze.. a fraktálok!\""
+msgid "\"Of course… it's all fractals!\""
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "\"Huh?  What was that?\""
@@ -220796,8 +224808,8 @@ msgid "You quiver from the cold."
 msgstr "Remegsz a hidegtől."
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
-msgstr "A törzsed nagyon fázik, talán nem ártana több réteget felvenni."
+msgid "Your torso is freezing cold.  You should put on a few more layers."
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "Your shivering makes you unsteady."
@@ -221176,6 +225188,47 @@ msgstr ""
 msgid "Your alarm went off."
 msgstr ""
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr ""
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -221599,10 +225652,6 @@ msgstr ""
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>semmi</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr "<color_white>semmi</color>"
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -221840,11 +225889,6 @@ msgstr ""
 msgid "KILLS"
 msgstr ""
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr "Beállítja a játék által használt képernyőt. Újraindítást igényel."
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr ""
@@ -221857,6 +225901,10 @@ msgstr "A dobhártyád hirtelen megfájdul!"
 msgid "Something is making noise."
 msgstr "Valami zajt kelt."
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr ""
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -221865,13 +225913,18 @@ msgstr "Ezt hallod: %s!"
 #: src/sounds.cpp
 #, c-format
 msgid "From your position you hear %1$s."
-msgstr ""
+msgstr "A helyzetedből ezt hallod: %1$s."
 
 #: src/sounds.cpp
 #, c-format
 msgid "You hear %1$s"
 msgstr "Ezt hallod: %1$s"
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr "%1$si irányból ezt hallod: %2$s"
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "Az ébresztőóra végre felébreszt."
@@ -221903,6 +225956,411 @@ msgstr ""
 msgid "d: delete history"
 msgstr "d: előzmények törlése"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr "Túlságosan szomjas vagy ahhoz, hogy a(z) %s tovább menjen."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr "Túlságosan fáradt vagy ahhoz, hogy a(z) %s tovább menjen."
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "Fuldokolsz!"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "Hirtelen tompának érzed magadat."
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "Hirtelen fájdalom jár át."
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "Egy pillanatra megszédülsz."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "Hirtelen éhesnek érzed magadat."
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "Hirtelen jóllakottnak érzed magadat."
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "Hirtelen szomjasnak érzed magadat."
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "Hirtelen fáradtnak érzed magadat."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "Hirtelen nagyon fázol."
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "Hirtelen fázol."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "Hirtelen nagyon meleged lett."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "Hirtelen meleged lett."
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "Hirtelen önkéntelenül remegni kezdesz."
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "Asztmás rohamod van!"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "Elhasználod az utolsó inhalátor töltetet."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "A napfény égeti a bőrödet!"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "A napfény elvonja a figyelmedet."
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "Ki nem állhatod a napfényt!"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "A napsütés nagyon irritálja a szemedet."
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr ""
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "BZZZZZ"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "Hirtelen semmit se hallasz!"
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "Hirtelen semmit se látsz!"
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr "A radiológiai érzékelőid felől abnormális értékeket észlelsz."
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr ""
+"A mellkasod éget, ahogyan az energetikai rendszeredet túlterhelés éri!"
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "Egy fájdalmas elektromos kisüléstől szenvedsz!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr "A(z) %st láthatóan érinti a kisülés."
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "Égetően savas folyástól szenvedsz!"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "Az elemeid egy kicsit lemerülnek."
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "Az egyik bionikádból recsegő hang árad!"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "Érzed, ahogyan a hibás bionikád reszket."
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "A látásod elpixelesedik!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr "A hibás bionikád miatt görcsben rángatózva a padlóra zuhansz!"
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr "A bionikád rövidre záródik, és ettől remegsz és reszketsz."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "A hibás bionikád viszket!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr "Az izmaid görcsbe rándulnak!"
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr "A padlóra esel!"
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr "Hirtelen kifogy belőled a szusz."
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr "Önkéntelenül remegni kezdesz."
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr "Elájulsz!"
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "A légzésed lelassul."
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr "Megbotlasz és elesel!"
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr ""
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr "A sugárzásmérő badge-ed hirtelen megváltozik erről: %1$s erre: %2$s!"
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr "A(z) %s elkezdett begyógyulni!"
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr "Érzed, ahogy a víz égeti a bőrödet."
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr ""
@@ -222052,8 +226510,8 @@ msgstr ""
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "A(z) %s átbotlik a priccsen."
+msgid "The %s stumbles over the cot!"
+msgstr ""
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -222208,16 +226666,11 @@ msgstr "Egy csapda zárul a lábadra."
 msgid "A snare closes on <npcname>s leg."
 msgstr "Egy csapda zárul <npcname> lábára."
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr ""
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
 msgid "A snare closes on your %s."
-msgstr "\"Egy csapda zárul a(z) %s testrészed köré."
+msgstr "Egy csapda zárul a(z) %s testrészed köré."
 
 #: src/trapfunc.cpp
 #, c-format
@@ -222436,6 +226889,13 @@ msgstr "<npcname>lejjebb esett egy szinttel! "
 msgid "You fall down under %s!"
 msgstr "Beesel a(z) %s alá!"
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname>a szárnyaival verdesve kecsesen földet ér. "
@@ -222572,6 +227032,10 @@ msgstr ""
 msgid "Select part"
 msgstr "Melyik alkatrészt?"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white>Szükséges idő:</color>\n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr "<color_white>Szükséges készség:</color>\n"
@@ -224397,108 +228861,131 @@ msgid ""
 "You turn the autoclave off before it's finished the program, and open its "
 "door."
 msgstr ""
+"A program vége előtt kikapcsolod az autoklávot, és kinyitod az ajtaját."
 
 #: src/vehicle_use.cpp
 msgid "The autoclave is empty, there's no point in starting it."
-msgstr ""
+msgstr "Az autokláv üres, nincs értelme beindítani."
 
 #: src/vehicle_use.cpp
 #, c-format
 msgid ""
 "You need 8 charges of water in tanks of the %s for the autoclave to run."
 msgstr ""
+"8 egységnyi víznek kell lennie a(z) %s tartályaiban ahhoz, hogy az autokláv "
+"beinduljon."
 
 #: src/vehicle_use.cpp
 msgid ""
 "You need to remove all filthy items from the autoclave to start the "
 "sterilizing cycle."
 msgstr ""
+"Az autoklávból el kell távolítani az összes koszos tárgyat, mielőtt a "
+"sterilizációs ciklust el lehetne kezdeni."
 
 #: src/vehicle_use.cpp
 msgid "Only CBMs can be sterilized in an autoclave."
-msgstr ""
+msgstr "Az autoklávban csak KBM-eket lehet sterilizálni."
 
 #: src/vehicle_use.cpp
 msgid "You should put your CBMs in autoclave pouches to keep them sterile."
 msgstr ""
+"A KBM-eket először autokláv tasakba kell helyezni, és utána sterilizálhatók."
 
 #: src/vehicle_use.cpp
 msgid "You turn the autoclave on and it starts its cycle."
-msgstr ""
+msgstr "Bekapcsolod az autoklávot és az megkezdi a ciklusát."
 
 #: src/vehicle_use.cpp
 msgid ""
 "You turn the washing machine off before it's finished the program, and open "
 "its lid."
-msgstr ""
+msgstr "A program vége előtt kikapcsolod a mosógépet, és kinyitod az ajtaját."
 
 #: src/vehicle_use.cpp
 msgid "The washing machine is empty, there's no point in starting it."
-msgstr ""
+msgstr "A mosógép üres, nincs értelme beindítani."
 
 #: src/vehicle_use.cpp
 #, c-format
 msgid ""
 "You need 24 charges of water in tanks of the %s to fill the washing machine."
 msgstr ""
+"24 egységnyi víznek kell lennie a(z) %s tartályaiban ahhoz, hogy a mosógép "
+"beinduljon."
 
 #: src/vehicle_use.cpp
 msgid "You need 5 charges of detergent for the washing machine."
-msgstr ""
+msgstr "A mosógép beindításához 5 egységnyi mosószerre van szükség."
 
 #: src/vehicle_use.cpp
 msgid ""
 "You need to remove all non-filthy items from the washing machine to start "
 "the washing program."
 msgstr ""
+"A mosógépből el kell távolítani az összes tiszta tárgyat, mielőtt a mosási "
+"ciklust el lehetne kezdeni."
 
 #: src/vehicle_use.cpp
 msgid "CBMs can't be cleaned in a washing machine.  You need to remove them."
 msgstr ""
+"KBM-eket nem lehet a mosógépben tisztára mosni. A mosóprogram indításához "
+"mindegyiket ki kell venni."
 
 #: src/vehicle_use.cpp
 msgid ""
 "You pour some detergent into the washing machine, close its lid, and turn it"
 " on.  The washing machine is being filled with water from vehicle tanks."
 msgstr ""
+"Beöntesz némi mosóport a mosógépbe, lezárod a fedelét, és bekapcsolod. A "
+"mosógép a jármű tartályaiból felölti magát vízzel."
 
 #: src/vehicle_use.cpp
 msgid ""
 "Soft items can't be cleaned in a dishwasher, you should use a washing "
 "machine for that.  You need to remove them:"
 msgstr ""
+"Puha tárgyakat nem lehet a mosogatógépben tisztára mosni, csak a mosógépben."
+" Az alábbi tárgyakat ki kell venni:"
 
 #: src/vehicle_use.cpp
 msgid ""
 "You turn the dishwasher off before it's finished the program, and open its "
 "lid."
 msgstr ""
+"A program vége előtt kikapcsolod a mosogatógépet, és kinyitod az ajtaját."
 
 #: src/vehicle_use.cpp
 msgid "The dishwasher is empty, there's no point in starting it."
-msgstr ""
+msgstr "A mosogatógép üres, nincs értelme beindítani."
 
 #: src/vehicle_use.cpp
 #, c-format
 msgid ""
 "You need 24 charges of water in tanks of the %s to fill the dishwasher."
 msgstr ""
+"24 egységnyi víznek kell lennie a(z) %s tartályaiban ahhoz, hogy a "
+"mosogatógép beinduljon."
 
 #: src/vehicle_use.cpp
 msgid "You need 5 charges of detergent for the dishwasher."
-msgstr ""
+msgstr "A mosogatógép beindításához 5 egységnyi mosószerre van szükség."
 
 #: src/vehicle_use.cpp
 msgid ""
 "You need to remove all non-filthy items from the dishwasher to start the "
 "washing program."
 msgstr ""
+"A mosogatógépből el kell távolítani az összes tiszta tárgyat, mielőtt a "
+"mosási ciklust el lehetne kezdeni."
 
 #: src/vehicle_use.cpp
 msgid ""
 "You pour some detergent into the dishwasher, close its lid, and turn it on."
 "  The dishwasher is being filled with water from vehicle tanks."
 msgstr ""
+"Beöntesz némi mosóport a mosogatógépbe, lezárod a fedelét, és bekapcsolod. A"
+" mosogatógép a jármű tartályaiból felölti magát vízzel."
 
 #: src/vehicle_use.cpp
 msgid "The harness is blocked."
@@ -224537,12 +229024,12 @@ msgstr ""
 
 #: src/vehicle_use.cpp
 msgid "Load a vehicle on the rack"
-msgstr ""
+msgstr "Jármű feltevése a kerékpártartóra"
 
 #: src/vehicle_use.cpp
 #, c-format
 msgid "Remove the %s from the rack"
-msgstr ""
+msgstr "A(z) %st leszeded a kerékpártartóról."
 
 #: src/vehicle_use.cpp
 msgid "Examine vehicle"
@@ -224550,31 +229037,31 @@ msgstr "Jármű vizsgálata"
 
 #: src/vehicle_use.cpp
 msgid "Deactivate the autoclave"
-msgstr ""
+msgstr "Autokláv kikapcsolása"
 
 #: src/vehicle_use.cpp
 msgid "Activate the autoclave (1.5 hours)"
-msgstr ""
+msgstr "Autokláv bekapcsolása (1,5 óra)"
 
 #: src/vehicle_use.cpp
 msgid "Deactivate the washing machine"
-msgstr ""
+msgstr "Mosógép kikapcsolása"
 
 #: src/vehicle_use.cpp
 msgid "Activate the washing machine (1.5 hours)"
-msgstr ""
+msgstr "Mosógép bekapcsolása (1,5 óra)"
 
 #: src/vehicle_use.cpp
 msgid "Deactivate the dishwasher"
-msgstr ""
+msgstr "Mosogatógép kikapcsolása"
 
 #: src/vehicle_use.cpp
 msgid "Activate the dishwasher (1.5 hours)"
-msgstr ""
+msgstr "Mosogatógép bekapcsolása (1,5 óra)"
 
 #: src/vehicle_use.cpp
 msgid "Peek through the closed curtains"
-msgstr ""
+msgstr "Átkukucskálsz a behúzott függönyön"
 
 #: src/vehicle_use.cpp
 msgid "Use the hotplate"
@@ -224586,11 +229073,11 @@ msgstr "Tároló vízzel való megtöltése"
 
 #: src/vehicle_use.cpp
 msgid "Use a towel"
-msgstr ""
+msgstr "Törülköző használata"
 
 #: src/vehicle_use.cpp
 msgid "Use the welding rig"
-msgstr ""
+msgstr "Hegesztő használata"
 
 #: src/vehicle_use.cpp
 msgid "Purify water in carried container"
@@ -224606,7 +229093,7 @@ msgstr ""
 
 #: src/vehicle_use.cpp
 msgid "Load or unload a vehicle"
-msgstr ""
+msgstr "Jármű felrakása vagy leszedése"
 
 #: src/vehicle_use.cpp
 msgid "Harness an animal"
@@ -224619,7 +229106,7 @@ msgstr ""
 #: src/vehicle_use.cpp
 #, c-format
 msgid "Craft at the %s"
-msgstr ""
+msgstr "Kézimunka itt: %s"
 
 #: src/vehicle_use.cpp
 #, c-format
@@ -224640,48 +229127,48 @@ msgstr "Megtisztítod a(z) %1$s %2$s tartalmát"
 
 #: src/weather.cpp
 msgid "You hear a distant rumble of thunder."
-msgstr ""
+msgstr "Távoli mennydörgés hangját hallod."
 
 #: src/weather.cpp
 msgid "You hear a rumble of thunder from above."
-msgstr ""
+msgstr "Feletted mennydörgés hangját hallod."
 
 #: src/weather.cpp
 msgid "A flash of lightning illuminates your surroundings!"
-msgstr ""
+msgstr "Egy villám bevilágítja a környezetedet!"
 
 #: src/weather.cpp
 #, c-format
 msgid "Your %s protects you from the acidic drizzle."
-msgstr ""
+msgstr "A(z) %s megvéd a savas permettől."
 
 #: src/weather.cpp
 msgid "Your clothing protects you from the acidic drizzle."
-msgstr ""
+msgstr "A ruhád megvéd a savas permettől."
 
 #: src/weather.cpp
 msgid "Your power armor protects you from the acidic drizzle."
-msgstr ""
+msgstr "A szervópáncélod megvéd a savas permettől."
 
 #: src/weather.cpp
 msgid "The acid rain stings, but is mostly harmless for now…"
-msgstr ""
+msgstr "A savas eső csíp, de most nem tud neked ártani..."
 
 #: src/weather.cpp
 msgid "Your umbrella protects you from the acid rain."
-msgstr ""
+msgstr "Az esernyőd megvéd a savas esőtől."
 
 #: src/weather.cpp
 msgid "Your clothing protects you from the acid rain."
-msgstr ""
+msgstr "A ruhád megvéd a savas esőtől."
 
 #: src/weather.cpp
 msgid "Your power armor protects you from the acid rain."
-msgstr ""
+msgstr "A szervópáncélod megvéd a savas esőtől."
 
 #: src/weather.cpp
 msgid "The acid rain burns!"
-msgstr ""
+msgstr "A savas eső éget!"
 
 #: src/weather.cpp
 msgid "Monday"
@@ -224733,6 +229220,8 @@ msgid ""
 "The current time is %1$s Eastern Standard Time.  At %2$s in %3$s, it was "
 "%4$s.  The temperature was %5$s. "
 msgstr ""
+"A pontos idő keleti parti időzóna szerint %1$s. %2$s-kor %3$s településen az"
+" időjárás %4$s volt. A hőmérséklet %5$s volt."
 
 #: src/weather.cpp
 msgid "Tonight"
@@ -224751,7 +229240,7 @@ msgstr "%s Éjszaka"
 #: src/weather.cpp
 #, c-format
 msgid "%s… %s. Highs of %s. Lows of %s. "
-msgstr ""
+msgstr "%s... %s. A legmagasabb hőmérséklet %s, a legalacsonyabb %s. "
 
 #: src/weather.cpp
 #, c-format
@@ -224785,71 +229274,71 @@ msgstr "%s kPa"
 
 #: src/weather.cpp
 msgid "North-East"
-msgstr ""
+msgstr "Északkelet"
 
 #: src/weather.cpp
 msgid "South-East"
-msgstr ""
+msgstr "Délkelet"
 
 #: src/weather.cpp
 msgid "South-West"
-msgstr ""
+msgstr "Délnyugat"
 
 #: src/weather.cpp
 msgid "North-West"
-msgstr ""
+msgstr "Északnyugat"
 
 #: src/weather.cpp
 msgid "Calm"
-msgstr ""
+msgstr "Szélcsend"
 
 #: src/weather.cpp
 msgid "Light Air"
-msgstr ""
+msgstr "Kis légmozgás"
 
 #: src/weather.cpp
 msgid "Light Breeze"
-msgstr ""
+msgstr "Kis szellő"
 
 #: src/weather.cpp
 msgid "Gentle Breeze"
-msgstr ""
+msgstr "Enyhe szellő"
 
 #: src/weather.cpp
 msgid "Moderate Breeze"
-msgstr ""
+msgstr "Mérsékelt szellő"
 
 #: src/weather.cpp
 msgid "Fresh Breeze"
-msgstr ""
+msgstr "Friss szellő"
 
 #: src/weather.cpp
 msgid "Strong Breeze"
-msgstr ""
+msgstr "Erős szellő"
 
 #: src/weather.cpp
 msgid "Moderate Gale"
-msgstr ""
+msgstr "Mérsékelt szél"
 
 #: src/weather.cpp
 msgid "Gale"
-msgstr ""
+msgstr "Szél"
 
 #: src/weather.cpp
 msgid "Strong Gale"
-msgstr ""
+msgstr "Erős szél"
 
 #: src/weather.cpp
 msgid "Whole Gale"
-msgstr ""
+msgstr "Viharos szél"
 
 #: src/weather.cpp
 msgid "Violent Storm"
-msgstr ""
+msgstr "Erős vihar"
 
 #: src/weather.cpp
 msgid "Hurricane"
-msgstr ""
+msgstr "Hurrikán"
 
 #: src/weather.cpp
 #, c-format
@@ -224918,23 +229407,23 @@ msgstr "Feltétel, 2d:"
 
 #: src/wish.cpp
 msgid "Thresholds required:"
-msgstr ""
+msgstr "Szükséges küszöb:"
 
 #: src/wish.cpp
 msgid "Cancels:"
-msgstr ""
+msgstr "Hatástalanítja:"
 
 #: src/wish.cpp
 msgid "Becomes:"
-msgstr ""
+msgstr "Ezzé válik:"
 
 #: src/wish.cpp
 msgid "Add-ons:"
-msgstr ""
+msgstr "Extrák:"
 
 #: src/wish.cpp
 msgid "Category:"
-msgstr ""
+msgstr "Kategória:"
 
 #. ~ pts: points, vis: visibility, ugly: ugliness
 #: src/wish.cpp
@@ -225020,7 +229509,7 @@ msgstr ""
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
+msgid "Set '%s' to…"
 msgstr ""
 
 #: src/wish.cpp
@@ -225120,7 +229609,7 @@ msgstr "Mod betöltési sorrend"
 #: src/worldfactory.cpp
 #, c-format
 msgid "…%s = View full description "
-msgstr ""
+msgstr "... %s = Mod teljes leírása"
 
 #: src/worldfactory.cpp
 msgid "--NO AVAILABLE MODS--"
@@ -225157,7 +229646,7 @@ msgstr "_______NEM ÍRTÁL BE NEVET!_______"
 
 #: src/worldfactory.cpp
 msgid "Are you SURE you're finished?  World name will be randomly generated."
-msgstr ""
+msgstr "BIZTOSAN befejezted? A világ neve találomra lesz megadva."
 
 #: src/worldfactory.cpp
 #, c-format
@@ -225165,6 +229654,8 @@ msgid ""
 "%s = Save Load Order as default.  %s = Controls %s/%s = Prev/Next Option.  "
 "%s/%s = Prev/Next Tab."
 msgstr ""
+"%s = Betöltési sorrend alapként való mentése.  %s = Irányítás %s/%s = "
+"Előző/Köv. opció. %s/%s = Előző/Köv fül."
 
 #: src/worldfactory.cpp
 msgid "World Mods"
diff --git a/lang/po/ja.po b/lang/po/ja.po
index edbe6a912678c..a412897d4c117 100644
--- a/lang/po/ja.po
+++ b/lang/po/ja.po
@@ -17,20 +17,20 @@
 # T5idr3, 2019
 # Dokuo Utuda, 2019
 # TEATIME <teatime@r7.dion.ne.jp>, 2019
-# nobiruneko <cocktailkarori@hotmail.co.jp>, 2019
 # Maruyama Ryota <goutin2@gmail.com>, 2019
 # zojirushi, 2019
 # kanro mizuame <mizuame10yen@gmail.com>, 2019
-# jyo nagaya <sno8ste@gmail.com>, 2019
+# nobiruneko, 2019
 # Pigmentblue15, 2019
+# jyo nagaya <sno8ste@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
-"Last-Translator: Pigmentblue15, 2019\n"
+"Last-Translator: jyo nagaya <sno8ste@gmail.com>, 2019\n"
 "Language-Team: Japanese (https://www.transifex.com/cataclysm-dda-translators/teams/2217/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -201,6 +201,17 @@ msgstr "強力な放射性を持った懸濁液です。なるべく近づかな
 msgid "watery plutonium slurry"
 msgstr "プルトニウム希釈懸濁液"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr "石"
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr "野球ボール大の石です。これできちんとした近接武器を作ってもいいですし、そのまま敵に投げて使うのもいいでしょう。"
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "石つぶて"
@@ -664,7 +675,7 @@ msgstr "ロケット弾(自作/棘)"
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
+" of this grade of weapon, but packs a fierce punch… if it hits."
 msgstr ""
 "手作りのロケット弾です。即席の推進剤で満たされたパイプの先端に、スパイクが溶接してあります。命中精度は最悪ですが、威力はそれなりにあります。 "
 "...命中すればですが。"
@@ -713,8 +724,8 @@ msgstr "炭化カルシウム(未完成)"
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
 msgstr "石炭と石灰を炭化カルシウムに製錬する途中の不完全な状態です。このままでは役に立ちません。"
 
 #: lang/json/AMMO_from_json.py
@@ -1130,9 +1141,9 @@ msgstr[0] "酸化亜鉛"
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
-msgstr "亜鉛に還元するか、他の物質を反応させるために使います。"
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
+msgstr "亜鉛に還元するか、他の物質を反応させるために使う酸化亜鉛です。"
 
 #: lang/json/AMMO_from_json.py
 msgid "manganese dioxide"
@@ -1142,7 +1153,7 @@ msgstr[0] "二酸化マンガン"
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr "二酸化マンガンの粉末です。軟マンガン鉱に自然に含まれており、工場でのアルカリ電池や亜鉛炭素電池の生産に使われています。"
@@ -1155,12 +1166,12 @@ msgstr[0] "塩化カリウム"
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr ""
-"鉱物の珪灰石に自然に含まれていますが、硝酸カリウムと塩酸の反応の副産物としても生成されます。肥料の原材料や、電気分解による水酸化カリウムの製造に使われます。"
+"塩化カリウムは鉱物の珪灰石に自然に含まれていますが、硝酸カリウムと塩酸の反応の副産物としても生成されます。肥料の原材料や、電気分解による水酸化カリウムの製造に使われます。"
 
 #: lang/json/AMMO_from_json.py
 msgid "potassium hydroxide"
@@ -1170,8 +1181,8 @@ msgstr[0] "水酸化カリウム"
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
 msgstr "一般的には苛性カリと呼ばれ、強い腐食性をもつことから主に工業用に使われています。その他にも、アルカリ電池の電解質としても利用できます。"
 
@@ -1198,11 +1209,11 @@ msgstr[0] "塩酸"
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
 msgstr ""
-"ムリアチン酸という名でも知られる塩酸は、独特のにおいがする強酸であり、重要な素材として発見以来様々な用途を持っていました。今の状況でも非常に多くの用途が見つかります。"
+"ムリアチン酸という名でも知られる塩酸は、独特の臭いがする強酸であり、発見以来重要な素材として様々な用途に使われてきました。今の状況でも非常に多くの用途が見つかります。"
 
 #: lang/json/AMMO_from_json.py
 msgid "acetone"
@@ -1438,9 +1449,9 @@ msgstr[0] "マッチ頭薬粉末"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
-msgstr "マッチの頭を砕いて作った粉末です。黒色火薬に近い性質を持ちますがやや非力です。他に適当な材料が無ければ、爆発物や導火線の材料になります。"
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
+msgstr "マッチの頭を砕いて作った粉末です。黒色火薬に近い性質を持ちますが、やや非力です。他に適当な材料が無ければ、爆発物や導火線の材料になります。"
 
 #: lang/json/AMMO_from_json.py
 msgid "RDX"
@@ -1791,11 +1802,11 @@ msgstr[0] "火炎放射器燃料"
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
 msgstr ""
-"ガソリンとディーゼルオイルを同比率で混合した液体です。燃焼効率はそれぞれを単独で燃やした時のそれには到底及びませんが、火炎放射器の燃料として利用できます。"
+"ガソリンとディーゼルオイルを同比率で混合した液体です。燃焼効率はそれぞれを単独で燃やした場合に到底及びませんが、火炎放射器の燃料として利用できます。"
 
 #: lang/json/AMMO_from_json.py
 msgid "autoclave pouch"
@@ -3160,41 +3171,72 @@ msgid "reloaded .460 Rowland"
 msgstr "弾薬(.460口径/ﾛｰﾗﾝﾄﾞ(手詰め))"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr "弾薬(.50口径BMG/曳光弾)"
+msgid ".50 BMG M17 tracer"
+msgstr "弾薬(.50口径BMG/M17曳光弾)"
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M17 tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
-msgstr "曳光弾仕様の強力な.50口径BMG狙撃弾です。曳光弾は引火性能を持っており、命中した標的が可燃性であれば燃え上がる可能性があります。"
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
+msgstr "曳光弾仕様の強力な.50口径BMG弾です。曳光弾は引火性能を持っており、命中した標的が可燃性であれば燃え上がる可能性があります。"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr "弾薬(.50口径BMG/Ball)"
+msgid ".50 BMG M33 Ball"
+msgstr "弾薬(.50口径BMG/M33Ball)"
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-".50口径BMGは長距離用に設計された非常に強力なライフル弾です。その素晴らしい精度と貫通力で、利用可能な最も致命的な弾丸の一つとなっています。強烈な反動とノイズだけがその代償です。"
+"軟鋼弾芯を備えた、弾頭重量約42.8gの.50口径BMG・フルメタルジャケット弾です。対空用に設計された非常に強力なライフル弾でしたが、後に対車両、対人用途に改良されました。素晴らしい威力と装甲貫通力のお陰で、現在入手できる最も致命的な弾薬の一つとなっています。強烈な反動と銃声だけがその代償です。"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
-msgstr "弾薬(.50口径BMG/徹甲)"
+msgid ".50 BMG Match"
+msgstr "弾薬(.50口径BMG/競技用)"
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG Match
+#: lang/json/AMMO_from_json.py
+msgid ""
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
+msgstr "鉛弾芯を備えた.50口径BMG・フルメタルジャケット弾は、厳しい品質管理の下で製造された、長距離射撃競技や精密なライフル用の弾薬です。"
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG M2 AP"
+msgstr "弾薬(.50口径BMG/M2徹甲)"
+
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
 "tungsten steel.  Penetration is increased, but damage is reduced."
 msgstr "鍛錬したタングステン鋼の高密度の核を使用した改良型.50口径BMG弾です。貫通力は増加しましたが、威力が低下しています。"
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr "弾薬(.50BMG/ﾗｳﾌｫｽMk211)"
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+"その爆発力を最大限に活用する、.50口径BMG弾の変種です。先端の焼夷剤が衝撃で発火することによって、内蔵したRDXやペンスリットなどの爆薬を爆発させ、更にはタングステンカーバイドの弾芯を囲むジルコニウム粉末の起爆剤にも引火し、それらを覆う軟鋼製のカップが炸裂します。カップの破片と燃える金属粉は装甲で固めた標的を貫通し、致死性を高めます。非常に貴重かつ構造が複雑で高価な弾薬のため、製造が再開される見込みはありません。賢く使いましょう。"
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
 msgstr "弾薬(.50口径/BMG(手詰め))"
@@ -3202,25 +3244,26 @@ msgstr "弾薬(.50口径/BMG(手詰め))"
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
 msgstr ""
-"曳光弾仕様の強力な.50口径BMG狙撃弾です。曳光弾は引火性能を持っており、命中した標的が可燃性であれば燃え上がる可能性があります。この弾薬は手詰めで製作されています。"
+"曳光弾仕様の強力な.50口径BMG弾です。曳光弾は引火性能を持っており、命中した標的が可燃性であれば燃え上がる可能性があります。この弾薬は手詰めで製作されています。"
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr "弾薬(.50口径BMG/Ball(手詰め))"
+msgid "reloaded .50 BMG Match"
+msgstr "弾薬(.50口径BMG/競技用(手詰め))"
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-".50口径BMGは長距離用に設計された非常に強力なライフル弾です。その素晴らしい精度と貫通力で、利用可能な最も致命的な弾丸の一つとなっています。強烈な反動とノイズだけがその代償です。この弾薬は手詰めで製作されています。"
+"軟鋼弾芯を備えた、手詰めで作られた弾頭重量約42.8gの.50口径BMG・フルメタルジャケット弾です。対空用に設計された非常に強力なライフル弾でしたが、後に対車両、対人用途に改良されました。素晴らしい威力と装甲貫通力のお陰で、現在入手できる最も致命的な弾薬の一つとなっています。強烈な反動と銃声だけがその代償です。"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
@@ -3229,11 +3272,9 @@ msgstr "弾薬(.50口径BMG/徹甲(手詰め))"
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
-msgstr ""
-"鍛錬したタングステン鋼の高密度の核を使用した改良型.50口径BMG弾です。貫通力は増加しましたが、威力が低下しています。この弾薬は手詰めで製作されています。"
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
+msgstr "鋼鉄弾芯を備えた改良型.50口径BMG弾です。貫通力は増加しましたが、威力が低下しています。この弾薬は手詰めで製作されています。"
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -4199,6 +4240,107 @@ msgstr "真菌の菌糸です。"
 msgid "fungal flower"
 msgstr "真菌の花"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr "カリウムミョウバン"
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+"古くから様々な用途で使われている、かすかな金属臭を放つ白色の小さな水溶性結晶です。カリミョウバンや硫酸カリウムアルミニウムという名でも知られています。ミョウバンという総称が付く化合物のなかでも主要な物質であり、単にミョウバンと呼ばれることもあります。"
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr "布用染料"
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr "布を染めるために使うカラフルな粉末です。水と媒染剤を併せて使うことで、様々な布を染色できます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr "バックル"
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr "一般的なベルトに付いている鋼鉄製のバックルです。"
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr "ボタン(ﾌﾟﾗｽﾁｯｸ)"
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr "一般的な衣類に付いているプラスチック製のボタンです。"
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr "ボタン(鋼)"
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr "一般的な衣類に付いている鋼鉄製のボタンです。"
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr "ボタン(木)"
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr "古風な衣類によく付いている、素朴な木製のボタンです。"
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr "スナップボタン"
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr "一般的な衣類に付いている鋼鉄製のスナップボタンです。"
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr "マジックテープ"
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr "一方には鉤状、もう一方にはループ状の細かい起毛が付いた、一対の小さな布です。衣類や履物の留め具として使われます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr "ジッパー(長)"
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr "一般的な衣類に付いているプラスチック製の長いジッパーです。"
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr "ジッパー(短)"
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr "一般的な衣類に付いているプラスチック製の短いジッパーです。"
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -4343,7 +4485,7 @@ msgstr[0] "亜鉛"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
 msgstr ""
@@ -4421,7 +4563,7 @@ msgstr "蝶番"
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
 msgstr "ネジ穴付きの2枚の金属板からなる小さな蝶番です。ドアの部品として使います。"
 
@@ -4470,6 +4612,354 @@ msgid ""
 "explosions."
 msgstr "一本の導火線です。この程度の長さがあればおおよその点火済み爆発物から退避出来るでしょう。"
 
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr "ラバーソール"
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr "一般的なブーツの底として使われるゴム製の靴底です。これがあれば実際にブーツを作れます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] "布屑(綿)"
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr ""
+"服を仕立てている時に排出される、いびつな形の細かい綿です。大抵は何の役にも立たず廃棄されますが、もし必要なら糸を作る材料として再利用できます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] "布屑(フェイクファー)"
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr "服を仕立てている時に排出される、いびつな形の細かいフェイクファーです。大抵は何の役にも立たず廃棄されます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] "布屑(フェルト)"
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr ""
+"服を仕立てている時に排出される、いびつな形の細かいフェルトです。大抵は何の役にも立たず廃棄されますが、もし必要なら織糸を作る材料として再利用できます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] "布屑(毛皮)"
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr "服を仕立てている時に排出される、いびつな形の細かい毛皮です。大抵は何の役にも立たず廃棄されます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] "布屑(ケブラー)"
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+"服を仕立てている時に排出される、いびつな形の細かいケブラー片です。大抵は何の役にも立たず廃棄されますが、終末が訪れた世界ではケブラーを生成するのは非常に難しいため、繊維として再利用する価値はありそうです。"
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] "布屑(革)"
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr "服を仕立てている時に排出される、いびつな形の細かい革です。大抵は何の役にも立たず廃棄されます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] "布屑(ライクラ)"
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr "服を仕立てている時に排出される、いびつな形の細かいライクラです。大抵は何の役にも立たず廃棄されます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] "布屑(ネオプレン)"
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr "服を仕立てている時に排出される、いびつな形の細かいネオプレンです。大抵は何の役にも立たず廃棄されます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] "布屑(合成繊維)"
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr "服を仕立てている時に排出される、いびつな形の細かい合成繊維です。大抵は何の役にも立たず廃棄されます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] "布屑(ノーメックス)"
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr ""
+"服を仕立てている時に排出される、いびつな形の細かいノーメックス片です。大抵は何の役にも立たず廃棄されますが、終末が訪れた世界ではノーメックスを生成するのは非常に難しいため、繊維として再利用する価値はありそうです。"
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr "生地(綿)"
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr "衣類を仕立てるのに適した綿の生地です。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] "パッチワーク生地(綿)"
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+"様々な衣類から切り取った端切れを継ぎはぎした、綿の生地です。適切な生地を使う場合よりも時間効率は劣りますが、衣類を仕立てるのに適しています。"
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr "生地(フェイクファー)"
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr "衣類を仕立てるのに適したフェイクファーの生地です。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] "パッチワーク生地(フェイクファー)"
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr ""
+"様々な衣類から切り取った端切れを継ぎはぎした、フェイクファーの生地です。適切な生地を使う場合よりも時間効率は劣りますが、衣類を仕立てるのに適しています。"
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr "生地(フェルト)"
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr "衣類を仕立てるのに適したフェルトの生地です。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] "パッチワーク生地(フェルト)"
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr ""
+"様々な衣類から切り取った端切れを継ぎはぎした、フェルトの生地です。適切な生地を使う場合よりも時間効率は劣りますが、衣類を仕立てるのに適しています。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr "生地(ケブラー)"
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr "防弾アーマーを作るのに適したケブラー合成繊維の生地です。硬いプレートではないので縫い合わせることができます。"
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr "生地(ライクラ)"
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr "柔軟かつ丈夫な衣類を仕立てるのに適した、伸縮性の高いライクラ繊維を織り交ぜた合成繊維の生地です。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] "パッチワーク生地(ライクラ)"
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+"様々な衣類から切り取った端切れを継ぎはぎした、ライクラの生地です。適切な生地を使う場合よりも時間効率は劣りますが、衣類を仕立てるのに適しています。"
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] "ネオプレンシート"
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr "水中で使う衣類を仕立てるのに適した、ネオプレンという合成ゴムの生地です。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] "パッチワーク生地(ネオプレン)"
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr ""
+"防水性能をもつ様々な衣類から切り取った端切れを継ぎはぎした、ネオプレンの生地です。適切な生地を使う場合よりも時間効率は劣りますが、衣類を仕立てるのに適しています。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr "生地(ノーメックス)"
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr "耐熱性能をもつ衣類を仕立てるのに適した、ノーメックスという合成繊維の生地です。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] "パッチワーク生地(ノーメックス)"
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr ""
+"様々な衣類から切り取った端切れを継ぎはぎした、ノーメックスの生地です。適切な生地を使う場合よりも時間効率は劣りますが、衣類を仕立てるのに適しています。"
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr "生地(合成繊維)"
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr "衣類を仕立てるのに適した合成繊維の生地です。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] "パッチワーク生地(合成繊維)"
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr ""
+"様々な衣類から切り取った端切れを継ぎはぎした、合成繊維の生地です。適切な生地を使う場合よりも時間効率は劣りますが、衣類を仕立てるのに適しています。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr "糸(ケブラー)"
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+"一般的な糸の代わりに使っても問題ありませんが、特に防弾装甲を作る場合に役立つ、非常に耐久性の高いケブラーの糸です。防御性能の高い生地を作るためには非常に綿密に織り合わせる必要があるため、特殊な機械が必要です。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr "糸(ノーメックス)"
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr ""
+"一般的な糸の代わりに使っても問題ありませんが、特に耐熱装備を作る場合に役立つ、非常に耐熱性の高いノーメックスの糸です。防御性能の高い生地を作るためには非常に綿密に織り合わせる必要があるため、特殊な機械が必要です。"
+
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
 msgid_plural "handloaded .22 CB"
@@ -4966,6 +5456,19 @@ msgid ""
 "burn hotly upon impact, piercing armor and igniting flammable substances."
 msgstr "ヘビーマシンガンや軍用の銃器で使用される徹甲弾です。着弾時に高温で燃焼を起こし、装甲を貫通し、可燃物に着火するよう設計されています。"
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr "矢(オリハルコン)"
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr ""
+"オリハルコンの小片で作られた矢です。矢尻は神秘的な輝きを放っています。放った矢がほぼ確実に地面に残りますが、イチイバルという名の弓でしか放てません。"
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -5009,10 +5512,31 @@ msgstr[0] "マナの欠片"
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
 msgstr "結晶化したマナです。マナクリスタルに充填できますが、一度充填すると元に戻せません。"
 
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr "オリハルコン塊"
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr "非常に重いいびつなオリハルコンの塊です。一部のアイテム製作に使います。"
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr "オリハルコン片"
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
+msgstr "奇妙な光る金属の小片です。武器としても有用ですが、製作にも使います。"
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "fire lance charge"
 msgstr "弾薬(火槍)"
@@ -5503,12 +6027,6 @@ msgid ""
 "blob needs to be healthy.  You think..."
 msgstr "様々な有機物が混ざりあった物体です。ブロブが健康に育つために必要な養分がたっぷり含まれています...たぶん。"
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "石"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -6001,8 +6519,10 @@ msgstr[0] "鞘(大型/胴)"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "%sを鞘に収めました。"
@@ -6303,7 +6823,7 @@ msgstr "ナイフを鞘に納める"
 msgid ""
 "A small concealed knife sheath worn on the ankle.  It is awkward to use "
 "without practice.  Activate to sheathe/draw a weapon."
-msgstr "足首に装着する革製の鞘です。小型の刃物やナイフを収められます。使用することで武器の納刀/抜刀ができます。"
+msgstr "足首に装着する革製の鞘です。小型の刃物やナイフを収められます。使用することで武器の収納/装備ができます。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "spear strap"
@@ -6593,6 +7113,43 @@ msgid ""
 "small straps designed to better distribute the weight."
 msgstr "チェインメイルで作られた特製ベストです。細いストラップでチェインメイルの袖を接合し、鎧の重量を上手く分散します。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] "チェインメイルショース"
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr "チェインメイルで作られた、ブーツのように足を覆う特製のショースです。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] "チェインメイルグローブ"
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr "チェインメイルで作られた特製のグローブです。指は完全に分かれており、手を完璧に保護しますが、やや窮屈です。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] "ファラデーチェインメイルスーツ"
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr "通常の衣服の上から着用できる、特製のチェインメイルスーツです。導電性があり、電撃から体を保護します。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -6729,6 +7286,26 @@ msgid ""
 "A colorful and ridiculous costume fit for a clown.  Provides decent storage."
 msgstr "道化師用の色鮮やかでおかしな衣装です。十分な収納容積があります。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] "道化師のウィッグ"
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr "道化師用の色鮮やかでおかしなウィッグです。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] "道化師の赤鼻"
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr "道化師が着用するラテックス製の赤い丸鼻です。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
@@ -6968,6 +7545,22 @@ msgstr[0] "ドレスシャツ"
 msgid "A white button-down shirt with long sleeves.  Looks professional!"
 msgstr "ボタンが付いた長袖の白いダウンシャツです。ビシッとして格好良く見えますよ！"
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] "ドリンクハット"
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+"2つの小さな液体容器、ゴムホース、ワイヤーで作った、他の頭部防具や直接頭に着用できる簡素なヘッドバンドです。手を使わずに飲み物を飲める便利で単純な道具ですが、所持品に入れようとすると入れた液体が零れてしまいます。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -7098,6 +7691,30 @@ msgstr[0] "ファニーパック"
 msgid "Provides a bit of extra storage, with minimal encumbrance."
 msgstr "最小限の阻害性で少量の収納を提供します。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] "胸部プロテクター"
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr "フェンシングの試合で胴や肩、わき腹を保護する丈夫な布製の胸当てです。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] "女子用胸部プロテクター"
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr "フェンシングの試合で女性選手が着用する硬質プラスチック製の胸パッドです。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -7111,6 +7728,34 @@ msgid ""
 msgstr ""
 "後ろにジッパーの付いたパッド入りの上着です。フェンシングの選手が事故防止の為に着用します。収納用のポケットは一切付いていませんが、着心地は快適です。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] "メタルジャケット(フルーレ)"
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr ""
+"電気審判機を使ったフェンシングの試合で着用する、背中にジッパーが付いた薄く軽い導電性のベストです。表地には丈夫な綿とステンレス鋼を織り合わせた生地が使われています。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] "メタルジャケット(サーブル)"
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr ""
+"電気審判機を使ったフェンシングの試合で着用する、背中にジッパーが付いた薄く軽い導電性のジャケットです。表地には丈夫な綿とステンレス鋼を織り合わせた生地が使われています。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -7131,6 +7776,30 @@ msgstr[0] "フェンシングパンツ"
 msgid "A pair of reinforced pants used by fencers to prevent injuries."
 msgstr "怪我防止の為にフェンシングの選手が使う補強されたズボンです。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] "フェンシンググローブ"
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr "手首を丈夫な綿布で覆い、手甲を中綿で保護し、指にぴったりフィットする形状に作られた片手用グローブです。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] "フェンシンググローブ(左手)"
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr "手首を丈夫な綿布で覆い、手甲を中綿で保護し、指にぴったりフィットする形状に作られた、左利き選手のための片手用グローブです。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -7459,7 +8128,7 @@ msgstr[0] "サバイバー防火グローブ"
 msgid ""
 "A pair of customized, Kevlar armored Nomex gloves, modified to be easy to "
 "wear while providing maximum protection under extreme conditions."
-msgstr "ケブラーで補強したノーメックス製の特製グローブです。極限状況下でも、最大限に身を守れるように着心地を改良してあります。"
+msgstr "ケブラーで補強したノーメックス製の特製グローブです。極限状況で身体を最大限保護するよう作られており、着心地も良好です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fur gloves"
@@ -7471,18 +8140,6 @@ msgstr[0] "手袋(毛皮)"
 msgid "A pair of warm fur gloves.  They are somewhat cumbersome."
 msgstr "毛皮製の暖かい手袋です。これを着用した状態では細かな作業が多少困難になるでしょう。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] "サバイバーウェットスーツグローブ"
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr "ネオプレンをケブラーで補強した特製グローブです。極限状況下でも、最大限に身を守れるように着心地を改良してあります。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -7494,7 +8151,7 @@ msgid ""
 "A pair of heavily customized, steel-backed armored Kevlar gloves, modified "
 "to be easy to wear while providing maximum protection under extreme "
 "conditions."
-msgstr "ケブラーを鋼鉄で補強した特製グローブです。極限状況下でも、最大限に身を守れるように着心地を改良してあります。"
+msgstr "ケブラーを鋼鉄で補強した特製グローブです。極限状況で身体を最大限保護するよう作られており、着心地も良好です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of leather gloves"
@@ -7537,7 +8194,20 @@ msgstr[0] "軽量型サバイバーグローブ"
 msgid ""
 "A pair of customized, Kevlar armored cloth gloves, modified to be easy to "
 "wear while providing maximum protection under extreme conditions."
-msgstr "布をケブラーで補強した特製グローブです。極限状況下でも、最大限に身を守れるように着心地を改良してあります。"
+msgstr "布をケブラーで補強した特製グローブです。極限状況で身体を最大限保護するよう作られており、着心地も良好です。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] "サバイバー指貫グローブ"
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr "布をケブラーで補強した特製指貫グローブです。極限状況で身体を最大限保護するよう作られており、着心地も良好です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
@@ -7581,7 +8251,7 @@ msgstr[0] "サバイバーグローブ"
 msgid ""
 "A pair of customized, Kevlar armored leather gloves, modified to be easy to "
 "wear while providing maximum protection under extreme conditions."
-msgstr "革をケブラーで補強した特製グローブです。極限状況下でも、最大限に身を守れるように着心地を改良してあります。"
+msgstr "革をケブラーで補強した特製グローブです。極限状況で身体を最大限保護するよう作られており、着心地も良好です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of tactical gloves"
@@ -7698,7 +8368,7 @@ msgstr[0] "サバイバー防寒手袋"
 msgid ""
 "A pair of customized, Kevlar armored fur gloves, modified to be easy to wear"
 " while providing maximum protection under extreme conditions."
-msgstr "ケブラーで補強した毛皮製の特製グローブです。極限状況下でも、最大限に身を守れるように着心地を改良してあります。"
+msgstr "ケブラーで補強した毛皮製の特製グローブです。極限状況で身体を最大限保護するよう作られており、着心地も良好です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of XL survivor gloves"
@@ -7710,7 +8380,7 @@ msgstr[0] "サバイバーグローブ(XL)"
 msgid ""
 "A massive pair of customized, Kevlar armored leather gloves, modified to be "
 "easy to wear while providing maximum protection under extreme conditions."
-msgstr "革をケブラーで補強した、サイズの大きな特製グローブです。極限状況下でも、最大限に身を守れるように着心地を改良してあります。"
+msgstr "革をケブラーで補強した、サイズの大きな特製グローブです。極限状況で身体を最大限保護するよう作られており、着心地も良好です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "go bag"
@@ -7750,16 +8420,6 @@ msgid ""
 "excellent protection from environmental dangers."
 msgstr "目の部分を完全に覆うゴーグルです。危険な環境から目を保護するのに優れています。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] "水泳ゴーグル"
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "水泳用の小さなゴーグルです。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -7794,20 +8454,6 @@ msgid ""
 "A heavy, full-length wool coat.  Cumbersome, but warm and with deep pockets."
 msgstr "羊毛製の深いポケットが付いた重い全身コートです。嵩張りますが、寒さをしのげます。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] "サバイバーウェットスーツ"
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr ""
-"切り詰めた防弾ベストと補強したネオプレーン製ウェットスーツから作られた、手製の軽量型コンビネーションアーマーです。天候や攻撃から身体を守ります。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -8276,17 +8922,6 @@ msgstr[0] "サバイバー防火フード"
 msgid "A customized armored Nomex and Kevlar hood, very strong and durable."
 msgstr "ノーメックスとケブラーで作られた特製の装甲付きフードです。非常に強固で頑丈です。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] "サバイバーウェットスーツフード"
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr "ネオプレンとケブラーで作られた特製の装甲付きフードです。とても強固で頑丈です。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -8942,18 +9577,25 @@ msgid_plural "leather belts"
 msgstr[0] "レザーベルト"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "%sを%sに挟みました。"
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "ベルトにアイテムを挟む"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
 msgstr "革製のベルトです。ズボンをきちんと履く時に役立ちます。"
 
@@ -9107,6 +9749,19 @@ msgid ""
 "variety is favored by the military."
 msgstr "バックルストラップで太ももに巻き付けて着用できるポーチです。この種の収納用品は軍隊が好んで使います。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] "レオタード"
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr "鼠径部から肩までを覆う、肌に密着した合成繊維製の衣装です。大きく開いた背中とハイレグカットのデザインは、舞台で身体を披露するのに最適です。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
 msgid_plural "Linux t-shirts"
@@ -9171,50 +9826,50 @@ msgstr "Debianのロゴが入ったTシャツです。ロゴの下には「ユ
 #: lang/json/ARMOR_from_json.py
 msgid "loincloth"
 msgid_plural "loincloths"
-msgstr[0] "ふんどし"
+msgstr[0] "腰巻き"
 
 #. ~ Description for loincloth
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "Rags stitched together and tied into a makeshift loincloth.  Covers your "
 "modesty, but not much else."
-msgstr "縫合した布を結び合わせた即席のふんどしです。品位を守ってはくれますが...それだけですね。"
+msgstr "縫合した布を結び合わせた即席の腰巻きです。品位を守ってはくれますが...それだけですね。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "fur loincloth"
 msgid_plural "fur loincloths"
-msgstr[0] "ふんどし(毛皮)"
+msgstr[0] "腰巻き(毛皮)"
 
 #. ~ Description for fur loincloth
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A fur pelt tied into a loincloth.  Covers your modesty, but not much else.  "
 "Now you are a true barbarian warrior."
-msgstr "毛皮を結び合わせたふんどしです。品位を守ってはくれますが...それだけです。これを身に付ければ、真の蛮族の戦士になれますよ。"
+msgstr "毛皮を結び合わせた腰巻きです。品位を守ってはくれますが...それだけです。これを身に付ければ、真の蛮族の戦士になれますよ。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "leather loincloth"
 msgid_plural "leather loincloths"
-msgstr[0] "ふんどし(革)"
+msgstr[0] "腰巻き(革)"
 
 #. ~ Description for leather loincloth
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "Leather patches stitched together and tied into a makeshift loincloth.  "
 "Covers your modesty, but not much else."
-msgstr "縫合した革を結び合わせた即席のふんどしです。品位を守ってはくれますが...それだけですね。"
+msgstr "縫合した革を結び合わせた即席の腰巻きです。品位を守ってはくれますが...それだけですね。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "wool loincloth"
 msgid_plural "wool loincloths"
-msgstr[0] "ふんどし(羊毛)"
+msgstr[0] "腰巻き(羊毛)"
 
 #. ~ Description for wool loincloth
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "Bits of wool stitched together and tied into a makeshift loincloth.  Covers "
 "your modesty, but not much else."
-msgstr "縫合した羊毛を結び合わせた即席のふんどしです。品位を守ってはくれますが...それだけですね。"
+msgstr "縫合した羊毛を結び合わせた即席の腰巻きです。品位を守ってはくれますが...それだけですね。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of extra long white gloves"
@@ -9234,7 +9889,7 @@ msgstr[0] "ロングアンダーウェア(下)"
 #. ~ Description for long underwear bottom
 #: lang/json/ARMOR_from_json.py
 msgid "A pair of long underwear that help to maintain body temperature."
-msgstr "体温の維持を補助してくれる肌着(下)です。"
+msgstr "下半身の体温の維持を補助する肌着です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "long underwear top"
@@ -9244,7 +9899,7 @@ msgstr[0] "ロングアンダーウェア(上)"
 #. ~ Description for long underwear top
 #: lang/json/ARMOR_from_json.py
 msgid "A long underwear top that helps to maintain body temperature."
-msgstr "体温の維持を補助してくれる肌着(上)です。"
+msgstr "上半身の体温の維持を補助する肌着です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "sleeveless underwear top"
@@ -9254,7 +9909,7 @@ msgstr[0] "袖無しアンダーウェア(上)"
 #. ~ Description for sleeveless underwear top
 #: lang/json/ARMOR_from_json.py
 msgid "A sleeveless underwear top that helps to maintain body temperature."
-msgstr "体温の維持を補助してくれる袖なしの肌着(上)です"
+msgstr "上半身の体温の維持を補助する袖無しの肌着です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "long-sleeved shirt"
@@ -9585,7 +10240,7 @@ msgstr "足を暖める、着心地の良い毛皮のスリーブです。シン
 #: lang/json/ARMOR_from_json.py
 msgid "fur pants"
 msgid_plural "fur pants"
-msgstr[0] "パンツ(毛皮)"
+msgstr[0] "ファーパンツ"
 
 #. ~ Description for fur pants
 #: lang/json/ARMOR_from_json.py
@@ -9634,7 +10289,7 @@ msgstr[0] "サバイバーカーゴパンツ"
 msgid ""
 "A pair of Kevlar armored pants covered with pouches and pockets.  Custom "
 "built to be durable, comfortable, and easy to wear."
-msgstr "特別製ののズボンです。ケブラー装甲を施し、小物袋やポケットが取り付けてあります。丈夫で、着心地が良く、着るのも簡単です。"
+msgstr "特別製のズボンです。ケブラー装甲を施し、小物袋やポケットが取り付けてあります。丈夫で、着心地が良く、着るのも簡単です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "peacoat"
@@ -9741,7 +10396,7 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "mail carrier hat"
 msgid_plural "mail carrier hats"
-msgstr[0] "帽子(郵便配達員)"
+msgstr[0] "郵便配達員制服(帽子)"
 
 #. ~ Description for mail carrier hat
 #: lang/json/ARMOR_from_json.py
@@ -9754,7 +10409,7 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "mail carrier shirt"
 msgid_plural "mail carrier shirts"
-msgstr[0] "シャツ(郵便配達員)"
+msgstr[0] "郵便配達員制服(上)"
 
 #. ~ Description for mail carrier shirt
 #: lang/json/ARMOR_from_json.py
@@ -9766,7 +10421,7 @@ msgstr "前面に複数のポケットが付いた水色ボタンのシャツで
 #: lang/json/ARMOR_from_json.py
 msgid "mail carrier shorts"
 msgid_plural "mail carrier shorts"
-msgstr[0] "パンツ(郵便配達員)"
+msgstr[0] "郵便配達員制服(下)"
 
 #. ~ Description for mail carrier shorts
 #: lang/json/ARMOR_from_json.py
@@ -9870,32 +10525,7 @@ msgid ""
 "A large, adjustable sheath for holding swords and other large blades.  "
 "Activate to sheathe/draw a weapon."
 msgstr ""
-"大型の鞘です。腰に着用しますが鞘そのものは左右どちらかの脚と干渉します。剣やその他の大型の刃物を収められます。使用することで武器の納刀/抜刀ができます。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] "シャークスーツ"
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr "サメの噛みつきからスキューバダイバーを守る、チェインメイルのスーツです。プラスチック製のヘルメットとブーツが付属しています。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] "ファラデーシャークスーツ"
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr "サメの噛みつきからスキューバダイバーを守る、チェインメイルのスーツです。導電性があり、電撃から体を保護します。"
+"大型の鞘です。腰に着用しますが鞘そのものは左右どちらかの脚と干渉します。剣やその他の大型の刃物を収められます。使用することで武器の収納/装備ができます。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
@@ -9907,7 +10537,7 @@ msgstr[0] "鞘(小型)"
 msgid ""
 "A leather sheath for holding knives and other small blades.  It is easy to "
 "use without much practice.  Activate to sheathe/draw a weapon."
-msgstr "ナイフなどの小型の刃物を収納できる革製の鞘です。練習しなくても簡単に扱えます。使用することで武器の納刀/抜刀ができます。"
+msgstr "ナイフなどの小型の刃物を収納できる革製の鞘です。練習しなくても簡単に扱えます。使用することで武器の収納/装備ができます。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "sheet"
@@ -9963,6 +10593,18 @@ msgid ""
 "from cuts."
 msgstr "デニム生地のパンツです。厚手なので対刃性があります。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] "サーマルシャツ"
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr "肌に密着して体温の維持を補助する、合成繊維製の軽い長袖肌着です。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
@@ -10346,7 +10988,7 @@ msgstr "六本に分かれた長い管状の綿製のストッキングです。
 #: lang/json/ARMOR_from_json.py
 msgid "straw basket"
 msgid_plural "straw baskets"
-msgstr[0] "藁籠"
+msgstr[0] "藁かご"
 
 #. ~ Description for straw basket
 #: lang/json/ARMOR_from_json.py
@@ -10394,10 +11036,10 @@ msgstr[0] "被験者スーツ"
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
 msgstr ""
-"半袖で短足の薄いつなぎの服です。奇妙な仕立て方や調整部分から察すると...ああ、誰が着ていたかは知らない方が良いでしょう。収納容積はあって無いようなものですが、着心地は良好です。"
+"半袖で脚の丈が短い、薄手のつなぎ服です。奇妙な仕立て方や調整部分から察すると...ああ、誰が着ていたかは知らない方がよさそうです。収納容積はわずかですが、着心地は良好です。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "suit"
@@ -10464,6 +11106,7 @@ msgstr[0] "サバイバーベルト"
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "刀を鞘に納める"
@@ -10475,7 +11118,7 @@ msgid ""
 "sheath to carry a smaller blade.  Durable and carefully crafted to be "
 "comfortable to wear.  Activate to sheathe/draw a weapon."
 msgstr ""
-"特製の革製ツールベルトです。掛け紐や袋が取り付けてあり、鞘には小型の刃物を収納できます。頑丈で身に付けていて疲れないよう丁寧に調整してあります。使用することで武器の納刀/抜刀ができます。"
+"特製の革製ツールベルトです。掛け紐や袋が取り付けてあり、鞘には小型の刃物を収納できます。頑丈で身に付けていて疲れないよう丁寧に調整してあります。使用することで武器の収納/装備ができます。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "survivor goggles"
@@ -10812,16 +11455,6 @@ msgid ""
 msgstr ""
 "クラシックなデザインの「トリコーン」、別名三角帽子はだらりと下がった大きな鍔をただ単にたくし上げただけの作りですが、これには上質な刺繍が施され、油膜で水を弾くように作られています。開拓地の「親分」として、大変動の荒波を乗り越えたクルー達のキャプテンとして、いずれにしても、これはそんな人の為にある帽子です。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] "男性用水泳パンツ"
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "インナーがついた水泳パンツです。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
@@ -10996,7 +11629,7 @@ msgstr[0] "ユニオンスーツ"
 msgid ""
 "A one-piece suit of full-body long underwear that helps to maintain body "
 "temperature.  It laces closed in the front."
-msgstr "体温の維持を補助してくれる、全身を覆う肌着です。留め紐は前で結ばれています。"
+msgstr "全身の体温の維持を補助する肌着です。前に結んだ留め紐が付いています。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of leather vambraces"
@@ -11063,52 +11696,6 @@ msgid ""
 "would be too casual and a suit would be just overdoing it."
 msgstr "上品なチョッキです。シャツのみはカジュアルすぎる、スーツだと堅苦しい、そんな場面で着用するのが理想的です。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] "ウェットスーツ"
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "ネオプレン製の全身用ウェットスーツです。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] "スイミンググローブ"
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr "ネオプレンシリコンゴム製の非常に柔軟なスイミンググローブです。水中での使用に適しています。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] "ウェットスーツフード"
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr "一般的なダイバーが着用するネオプレン製のフードです。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] "スプリングスーツ"
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr ""
-"胸と尻が強調されるようなデザインの、ピンク色のロングスプリングウェットスーツです。全身用の服と同等の防御力はありませんが、窮屈さは感じません。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -11418,6 +12005,35 @@ msgid ""
 msgstr ""
 "縁に紐を通すハトメ金がついたプラスチックのシートです。全身を覆えるほどの大きさがあります。手っ取り早く雨をしのぐには有効な手段となるでしょう。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] "ユニタード"
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+"クルーネックのレオタードとレギンスを組み合わせた形状の、肌に密着する合成繊維製の衣装です。主に体操選手、ダンサー、軽乗競技選手が着用し、全身を柔らかく包んで保護します。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] "全身タイツ"
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+"「全タイ」と略して呼ばれることもある、ナイロンと合成繊維で作られた全身を覆う衣装です。頭部は一体型のフード状になっており、顔全体を覆っても視界を妨げません。この衣装と友達を集めれば、皆で演劇を披露できます。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -11561,7 +12177,7 @@ msgid ""
 "Durable and carefully crafted to be comfortable to wear.  Activate to "
 "sheathe/draw a weapon."
 msgstr ""
-"特製の革製ツールベルトです。数え切れないほどの掛け紐や道具袋が取り付けてあり、鞘には小型の刃物を収納できます。頑丈で身に付けていて疲れないよう丁寧に調整してあります。使用することで武器の納刀/抜刀ができます。"
+"特製の革製ツールベルトです。数え切れないほどの掛け紐や道具袋が取り付けてあり、鞘には小型の刃物を収納できます。頑丈で身に付けていて疲れないよう丁寧に調整してあります。使用することで武器の収納/装備ができます。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of attached ear plugs (in)"
@@ -13857,8 +14473,8 @@ msgid ""
 "protection.  Like all DoubleTech power armor, the control and climate-"
 "regulation systems require direct skin contact."
 msgstr ""
-"DoubleTech社のパワーアーマーMk. II-Hです。このモデルはMk. "
-"Iを改良したもので、特に環境防護性能が大幅に向上しています。他のDoubleTech社パワーアーマーと同様に、制御と寒暖調整のため素肌の上に直接着用する必要があります。"
+"DoubleTech社のパワーアーマーMk.II-"
+"Hです。このモデルはMk.Iを改良したもので、特に環境防護性能が大幅に向上しています。他のDoubleTech社パワーアーマーと同様に、制御と寒暖調整のため素肌の上に直接着用する必要があります。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "basic power armor helmet"
@@ -13873,8 +14489,7 @@ msgid ""
 "Like all DoubleTech power armor, the control and climate-regulation systems "
 "require direct skin contact."
 msgstr ""
-"DoubleTech社製のパワーアーマーMk. "
-"Iとセットで運用する設計の、基本的な性能を持つヘルメットです。このモデルは環境防護と防御力に優れています。他のDoubleTech社パワーアーマーと同様に、制御と寒暖調整のため素肌の上に直接着用する必要があります。"
+"DoubleTech社製のパワーアーマーMk.Iとセットで運用する設計の、基本的な性能を持つヘルメットです。このモデルは環境防護と防御力に優れています。他のDoubleTech社パワーアーマーと同様に、制御と寒暖調整のため素肌の上に直接着用する必要があります。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "heavy power armor helmet"
@@ -13890,8 +14505,8 @@ msgid ""
 "armor, the control and climate-regulation systems require direct skin "
 "contact."
 msgstr ""
-"DoubleTech社のパワーアーマーMk. II-Hとセットで運用する設計のヘルメットです。Mk. "
-"Iに比べて重量は増加しましたが、見た目はより洗練され、環境防護性能も向上しています。他のDoubleTech社パワーアーマーと同様に、制御と寒暖調整のため素肌の上に直接着用する必要があります。"
+"DoubleTech社のパワーアーマーMk.II-"
+"Hとセットで運用する設計のヘルメットです。Mk.Iに比べて重量は増加しましたが、見た目はより洗練され、環境防護性能も向上しています。他のDoubleTech社パワーアーマーと同様に、制御と寒暖調整のため素肌の上に直接着用する必要があります。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "light power armor helmet"
@@ -13906,8 +14521,8 @@ msgid ""
 "Like all DoubleTech power armor, the control and climate-regulation systems "
 "require direct skin contact."
 msgstr ""
-"DoubleTech社のパワーアーマーMk. II-Lと共に運用されるよう設計されたヘルメットです。Mk. "
-"Iを改良して、より軽く洗練された仕上がりになっています。他のDoubleTech社パワーアーマーと同様に、制御と寒暖調整のため素肌の上に直接着用する必要があります。"
+"DoubleTech社のパワーアーマーMk.II-"
+"Lと共に運用されるよう設計されたヘルメットです。Mk.Iを改良して、より軽く洗練された仕上がりになっています。他のDoubleTech社パワーアーマーと同様に、制御と寒暖調整のため素肌の上に直接着用する必要があります。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "light power armor"
@@ -13922,8 +14537,136 @@ msgid ""
 "DoubleTech power armor, the control and climate-regulation systems require "
 "direct skin contact."
 msgstr ""
-"DoubleTech社のパワーアーマーMk. II-Lです。このモデルはMk. "
-"Iにいくつか改良を加えたモデルで、大幅な軽量化に成功しています。他のDoubleTech社パワーアーマーと同様に、制御と寒暖調整のため素肌の上に直接着用する必要があります。"
+"DoubleTech社のパワーアーマーMk.II-"
+"Lです。このモデルはMk.Iにいくつか改良を加えたモデルで、大幅な軽量化に成功しています。他のDoubleTech社パワーアーマーと同様に、制御と寒暖調整のため素肌の上に直接着用する必要があります。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] "男性用水泳パンツ"
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "インナーがついた水泳パンツです。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] "ウェットスーツ"
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "ネオプレン製の全身用ウェットスーツです。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] "ウェットスーツフード"
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr "一般的なダイバーが着用するネオプレン製のフードです。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] "サバイバーウェットスーツフード"
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr "ネオプレンとケブラーで作られた特製の装甲付きフードです。とても強固で頑丈です。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] "サバイバーウェットスーツ"
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr ""
+"切り詰めた防弾ベストと補強したネオプレーン製ウェットスーツから作られた、手製の軽量型コンビネーションアーマーです。天候や攻撃から身体を守ります。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] "サバイバーウェットスーツグローブ"
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr "ネオプレンをケブラーで補強した特製グローブです。極限状況で身体を最大限保護するよう作られており、着心地も良好です。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] "スプリングスーツ"
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr ""
+"胸と尻が強調されるようなデザインの、ピンク色のロングスプリングウェットスーツです。全身用の服と同等の防御力はありませんが、窮屈さは感じません。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] "ファラデーシャークスーツ"
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr "サメの噛みつきからスキューバダイバーを守る、チェインメイルのスーツです。導電性があり、電撃から体を保護します。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] "シャークスーツ"
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr "サメの噛みつきからスキューバダイバーを守る、チェインメイルのスーツです。プラスチック製のヘルメットとブーツが付属しています。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] "水泳ゴーグル"
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "水泳用の小さなゴーグルです。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] "スイミンググローブ"
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr "ネオプレンシリコンゴム製の非常に柔軟なスイミンググローブです。水中での使用に適しています。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
@@ -14514,6 +15257,51 @@ msgid "shotgun bandolier"
 msgid_plural "shotgun bandoliers"
 msgstr[0] "弾薬ベルト(ショットガン)"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] "魔法のツールベルト"
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr "欲しい道具をすぐに作れる、特製の革製ツールベルトです。使用することで武器の収納/装備ができます。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] "セブンリーグブーツ"
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr ""
+"古くから使われ続けてきたように見える、すり減った革と鋼鉄で作られた、丈夫で履き心地も非常に快適なブーツです。着用すると動きが軽快になります。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] "速さのブーツ"
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] "大地のブーツ"
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr "細かいルーン文字が刻まれた、丈夫で履き心地も非常に快適なゴム製ブーツです。着用すると電撃によるダメージを受けなくなります。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -14534,7 +15322,7 @@ msgstr[0] "マナサークレット"
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
 msgstr "木製の輪に銅の飾りが付いた、頭に着用する装身具です。着用していると心がとても落ち着きます。"
 
@@ -14714,6 +15502,22 @@ msgid ""
 "minimize encumbrance."
 msgstr "無数の小さな触手が生えた、背中に着用する大きな肉の袋です。袋自体が動いて変形し、動作制限を最小限に抑えます。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] "オーラ(耐酸)"
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr "酸に対する耐性を付与する透明な保護膜です。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] "オーラ(強耐酸)"
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -14920,7 +15724,7 @@ msgstr "有効範囲5mのモーションセンサーです。静かに警告し
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Arms Alloy Plating CBM"
 msgid_plural "Arms Alloy Plating CBMs"
-msgstr[0] "CBM: 合金メッキ - 腕"
+msgstr[0] "CBM: 合金装甲 - 腕"
 
 #. ~ Description for Arms Alloy Plating CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -14946,7 +15750,7 @@ msgstr ""
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Head Alloy Plating CBM"
 msgid_plural "Head Alloy Plating CBMs"
-msgstr[0] "CBM: 合金メッキ - 頭部"
+msgstr[0] "CBM: 合金装甲 - 頭部"
 
 #. ~ Description for Head Alloy Plating CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -14958,7 +15762,7 @@ msgstr "頭部の肉を合金の装甲に置換します。頭と顎とを保護
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Legs Alloy Plating CBM"
 msgid_plural "Legs Alloy Plating CBMs"
-msgstr[0] "CBM: 合金メッキ - 脚"
+msgstr[0] "CBM: 合金装甲 - 脚"
 
 #. ~ Description for Legs Alloy Plating CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -14970,7 +15774,7 @@ msgstr "脚部の肉を合金の装甲に置換します。受動的な防御力
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Torso Alloy Plating CBM"
 msgid_plural "Torso Alloy Plating CBMs"
-msgstr[0] "CBM: 合金メッキ - 胴体"
+msgstr[0] "CBM: 合金装甲 - 胴体"
 
 #. ~ Description for Torso Alloy Plating CBM
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -15216,10 +16020,10 @@ msgstr[0] "CBM: エタノール燃焼装置"
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
-msgstr "アルコールを非常に効率的な燃料として利用できます。しかし、酒酔いの影響は通常と同じように受けてしまいます。"
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
+msgstr "アルコールを非常に効率的な燃料として利用できます。エタノール、メタノール、変性アルコールを最大500mlまで投入できます。"
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Aero-Evaporator CBM"
@@ -15227,8 +16031,7 @@ msgid_plural "Aero-Evaporator CBMs"
 msgstr[0] "CBM: 水蒸気液化装置"
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -15293,10 +16096,10 @@ msgstr[0] "CBM: 指内蔵式ハッキングツール"
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
 "右手指の一本にハッキングツールを埋め込みます。コントロールパネル類のオーバーライドに特化した多目的ハッキングユニットのため、コンピューターへのハッキングはできません。使用にあたってはコンピュータースキルが重要であり、失敗するとダメージを受ける可能性があります。"
 
@@ -15636,18 +16439,17 @@ msgstr "蓄電機能をもつ生体部品をパワーアーマー内部の充電
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Power Armor Mk. II Interface CBM"
 msgid_plural "Power Armor Mk. II Interface CBMs"
-msgstr[0] "CBM: パワーアーマーインターフェース MK. II"
+msgstr[0] "CBM: パワーアーマーインターフェース MK.II"
 
 #. ~ Description for Power Armor Mk. II Interface CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
-"生体部品の電力をパワーアーマーに供給するシステムを追加します。Mk. Iシリーズの2倍の効率を誇ります。Mk. "
-"IIパワーアーマーシリーズの人気を受けてDoubleTech社が開発しました。"
+"生体部品の電力をパワーアーマーに供給するシステムを追加します。Mk.Iシリーズの2倍の効率を誇ります。Mk.IIパワーアーマーシリーズの人気を受けてDoubleTech社が開発しました。"
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Power Storage CBM"
@@ -15666,7 +16468,7 @@ msgstr ""
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Power Storage CBM Mk. II"
 msgid_plural "Power Storage CBM Mk. II"
-msgstr[0] "CBM: 蓄電装置Mk. II "
+msgstr[0] "CBM: 蓄電装置Mk.II "
 
 #. ~ Description for Power Storage CBM Mk. II
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -16180,8 +16982,7 @@ msgstr[0] "発光部品"
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
 msgstr "何かの...部品でしょうか？少なくとも移植した時点から光っています。"
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
@@ -16716,7 +17517,7 @@ msgstr[0] "本(学習/人類饗応法)"
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
+msgid "It's… it's a cookbook!"
 msgstr "これは...まさか...料理本！？"
 
 #: lang/json/BOOK_from_json.py
@@ -16806,7 +17607,7 @@ msgstr[0] "本(学習/PE050 \"アルファ\":一次報告)"
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
+"\"APPROVED\"…"
 msgstr ""
 "この紙束に記された日付は、大変動が始まる2週間前のものです。複数の新しい化学式や、それが人体に与える影響が記されています。「承認」のスタンプが押されています..."
 
@@ -16833,9 +17634,9 @@ msgstr[0] "本(学習/PE065 \"キメラ\": 最善の措置)"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
-msgstr "見慣れない化学式について詳細に説明した論文です。その用途は...群衆をコントロールする能力を与える？そんな物が実在するのでしょうか..."
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
+msgstr "見慣れない化学式について詳細に説明した論文です。その用途は...群衆をコントロールする能力を与える？そんな方法が実在するのでしょうか..."
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Smythe"
@@ -16847,9 +17648,9 @@ msgstr[0] "本(学習/研究日誌(スマイス))"
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
+"look promising but the procurement methods seem awfully vague…"
 msgstr ""
-"この研究日誌は、XE037で汚染された肉に注目し、突然変異を引き起こす実験について詳しく書かれています。結果は良好だったようですが、調達方法についてはとても曖昧で..."
+"この研究日誌は、XE037で汚染された肉に注目し、突然変異を引き起こす実験について詳しく書かれています。結果は良好だったようですが、調達方法については言葉を濁して書かれています..."
 
 #: lang/json/BOOK_from_json.py
 msgid "standpipe maintenance log"
@@ -16861,7 +17662,7 @@ msgstr[0] "本(一般/配管定期検査記録)"
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
+"with… a chemical formula?"
 msgstr "このバインダーには、施設の配管システムの定期検査記録が詳細に書かれています。しかし、一部の記録は何かで埋め尽くされて...化学式？"
 
 #: lang/json/BOOK_from_json.py
@@ -16902,7 +17703,7 @@ msgstr[0] "本(学習/PE023 \"医療\": 応用と調査結果)"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
 msgstr "バインダーの中の紙束には、複数の新しい化学式や、その人体に対する影響が記されています。「承認」のスタンプが押されています..."
 
 #: lang/json/BOOK_from_json.py
@@ -17170,7 +17971,7 @@ msgstr[0] "本(学習/研究日誌(エレーラ))"
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
+"symbols you've not seen before…"
 msgstr ""
 "この分厚いバインダーには、いくつかの各種電子材料の図面と技術仕様が記載されています。今までに見たこともないような記号が使用されている図面もあるようです..."
 
@@ -17234,13 +18035,13 @@ msgstr[0] "汎用開発概要"
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -17576,8 +18377,8 @@ msgstr[0] "本(学習/手詰め弾薬の解説書)"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
 msgstr ""
 "手詰め弾薬について知りたいことが全て載った書籍です。子供の安全のために弾薬にはチャイルドロックを掛ける...とのことですが、爆弾に関する章にはあまりに詳細な解説が載っているので、この本自体が子供にとって安全ではなさそうです。"
 
@@ -18050,7 +18851,7 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr ""
 "原子力エネルギーを専門として研究しているチームの発見や改良が大量にまとめられた実験ノートです。二度目の大変動を引き起こそうとは思いませんが、小型化した携帯型核爆弾の詳細は役に立つかもしれません..."
 
@@ -19337,6 +20138,34 @@ msgid ""
 " that the author's real name is Fereidoun M. Esfandiary."
 msgstr "FM-2030の「アップウィンガーズ: 未来派宣言」です。著者の本名はフェレイドゥン・M・エスファンダイアリーであるようです。"
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr "フレデリック・バスティアが記した多数のエッセイを一冊にまとめた「バスティア論集」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr "現代のリバタリアニズムに最も影響を与えた本の一つである、ロバート・ノージックの「アナーキー・国家・ユートピア」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr "ルートヴィヒ・フォン・ミーゼスの「社会主義」です。社会主義について批判的に検討しています。"
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr "初期マルクス・レーニン主義に最も影響を与えた本の一つである、ニコライ・ブハーリンの「共産主義のABC」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr "ルートヴィヒ・フォン・ミーゼスの「反資本主義の精神構造」です。"
+
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
 msgid_plural "phone books"
@@ -19405,8 +20234,8 @@ msgstr[0] "本(一般/会計帳簿)"
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
-msgstr "帳簿に不正が見つかったとしても今となっては..."
+msgid "If you knew what to look for something might stand out…"
+msgstr "何か目当ての情報があるなら、役に立つかもしれません..."
 
 #: lang/json/BOOK_from_json.py
 msgid "patient treatment records"
@@ -19643,6 +20472,106 @@ msgstr "デュマの「モンテ・クリスト伯」です。"
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr "フランシス・バーネットの「秘密の花園」です。"
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr "C.S.フォレスターの「スペイン要塞を撃滅せよ」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr "パトリック・オブライアンの「新鋭艦長、戦乱の海へ」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr "アントニー・トロロープの「慈善院長」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr "パトリック・オブライアンの「南太平洋、波瀾の追撃戦」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr "パトリック・オブライアンの「特命航海、嵐のインド洋」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr "アントニー・トロロープの「バーチェスターの塔」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr "H・G・ウェルズの「陸の甲鉄艦」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr "アーサー・コナン・ドイルの「大ボーア戦争」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr "アーサー・コナン・ドイルの「コンゴの犯罪」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr "アーサー・コナン・ドイルの「寄生体」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr "アンドリュー・バルフォアの「バイ・ストローク・オブ・ソード」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr "ジョゼフ・コンラッドの「密偵」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr "ジョゼフ・コンラッドの「ロード・ジム」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr "ウィリアム・メイクピース・サッカレーの「虚栄の市」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr "ウィリアム・メイクピース・サッカレーの「バリー・リンドン」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr "エリザベス・ギャスケルの「北と南」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr "トーマス・ハーディの「キャスタブリッジの町長」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr "トーマス・ハーディの「ウェセックス物語」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr "トーマス・ハーディの「狂おしき群をはなれて」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr "ラドヤード・キップリングの「勇ましい船長」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr "ジェフリー・チョーサーの「カンタベリー物語」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr "エドワード・ブルワー＝リットンの「ハロルド」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr "フレデリック・マリアットの「海軍見習士官イージー」です。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr "フレデリック・マリアットの「ピーター・シムプル」です。"
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -20539,10 +21468,11 @@ msgstr "執事を殺した犯人を推理するゲームです。"
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
 msgstr[0] "本(学習/ブラックドラゴン: 沼地の廃墟)"
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -20554,26 +21484,59 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
 msgstr[0] "本(学習/はじめての錬金術)"
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr "酒以外の液体を使った魔法の技術を解説したペーパーバック本です。"
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
 msgstr[0] "本(学習/ソウルバインダーの死霊術ガイド)"
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
 "along with emulating their healing factor."
 msgstr "アンデッドの魂を人形に縛り付けて自然治癒力を再現する技術を解説した、大型のペーパーバック本です。"
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] "本(学習/図解魔科学)"
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+"現代科学と魔法を組み合わせた技術について解説したペーパーバック本です。裏表紙には免責事項が載っています。「Cannith "
+"Industries社は、本書に記載されている製品に関する誤作動や事故について一切責任を負いません」"
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] "本(学習/アスガルドの先へ)"
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr "北欧のルーン文字のような書体で書かれた鮮やかな書物です。様々な神が使う多数の武器の作り方が、詳細なイラストで解説されています。"
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -20761,7 +21724,7 @@ msgstr "一般的な家庭用洗浄剤です。次亜塩素酸ソーダを用い
 #: lang/json/COMESTIBLE_from_json.py
 msgid "ammonia"
 msgid_plural "ammonia"
-msgstr[0] "漂白剤(アンモニア)"
+msgstr[0] "漂白剤(ｱﾝﾓﾆｱ)"
 
 #. ~ Description for ammonia
 #: lang/json/COMESTIBLE_from_json.py
@@ -21022,7 +21985,7 @@ msgstr "アセチレン"
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr "加圧すると爆発する可燃性ガスです。酸素を混合することで優れた溶接ガスとして利用できます。"
 
@@ -21109,7 +22072,7 @@ msgstr "香草の風味と香りが心地よい、口当たりの優しいワイ
 #: lang/json/COMESTIBLE_from_json.py
 msgid "barley wine"
 msgid_plural "barley wine"
-msgstr[0] "ビール(バーレーワイン)"
+msgstr[0] "ビール(ﾊﾞｰﾚｰﾜｲﾝ)"
 
 #. ~ Description for barley wine
 #: lang/json/COMESTIBLE_from_json.py
@@ -21369,7 +22332,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid "European pilsner"
 msgid_plural "European pilsner"
-msgstr[0] "ビール(ヨーロピアンピルスナー)"
+msgstr[0] "ビール(ﾖｰﾛﾋﾟｱﾝﾋﾟﾙｽﾅｰ)"
 
 #. ~ Description for European pilsner
 #: lang/json/COMESTIBLE_from_json.py
@@ -21381,7 +22344,7 @@ msgstr "ヨーロッパから輸入されたラガービールです。冷やし
 #: lang/json/COMESTIBLE_from_json.py
 msgid "American pale ale"
 msgid_plural "American pale ale"
-msgstr[0] "ビール(アメリカンペールエール)"
+msgstr[0] "ビール(ｱﾒﾘｶﾝﾍﾟｰﾙｴｰﾙ)"
 
 #. ~ Description for American pale ale
 #: lang/json/COMESTIBLE_from_json.py
@@ -21393,7 +22356,7 @@ msgstr "味わい深い地ビールです。冷やしてからグラスに注い
 #: lang/json/COMESTIBLE_from_json.py
 msgid "India pale ale"
 msgid_plural "India pale ale"
-msgstr[0] "ビール(インディアペールエール)"
+msgstr[0] "ビール(ｲﾝﾃﾞｨｱﾍﾟｰﾙｴｰﾙ)"
 
 #. ~ Description for India pale ale
 #: lang/json/COMESTIBLE_from_json.py
@@ -21405,7 +22368,7 @@ msgstr "非常に風味が豊かな地ビールです。冷やしてからグラ
 #: lang/json/COMESTIBLE_from_json.py
 msgid "stout"
 msgid_plural "stout"
-msgstr[0] "ビール(スタウト)"
+msgstr[0] "ビール(ｽﾀｳﾄ)"
 
 #. ~ Description for stout
 #: lang/json/COMESTIBLE_from_json.py
@@ -21415,7 +22378,7 @@ msgstr "味わい深い地ビールです。まるでこれからの未来を暗
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Belgian ale"
 msgid_plural "Belgian ale"
-msgstr[0] "ビール(ベルジャンエール)"
+msgstr[0] "ビール(ﾍﾞﾙｼﾞｬﾝｴｰﾙ)"
 
 #. ~ Description for Belgian ale
 #: lang/json/COMESTIBLE_from_json.py
@@ -21427,7 +22390,7 @@ msgstr "ベルギーの修道士によって醸造された、風味豊かで濃
 #: lang/json/COMESTIBLE_from_json.py
 msgid "imperial stout"
 msgid_plural "imperial stout"
-msgstr[0] "ビール(インペリアル・スタウト)"
+msgstr[0] "ビール(ｲﾝﾍﾟﾘｱﾙｽﾀｳﾄ)"
 
 #. ~ Description for imperial stout
 #: lang/json/COMESTIBLE_from_json.py
@@ -21896,6 +22859,40 @@ msgstr "大きな人間の胃"
 msgid "The stomach of a large humanoid creature.  It is surprisingly durable."
 msgstr "大きな人型生物の胃袋です。耐久性に優れています。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] "人間の脂肪塊"
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr "人間から採取した脂肪です。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr "精製人脂"
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr "人間の脂肪を水と混合し高温で加熱して抽出した、白く滑らかな塊です。非常に長持ちし、多くの食品や道具の材料として利用できます。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr "人脂"
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr "人間の脂肪を高温で加熱して抽出した、白く滑らかな塊です。非常に長持ちし、多くの食品や道具の材料として利用できます。"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -21938,6 +22935,62 @@ msgid ""
 "pinch."
 msgstr "食用可能な屑肉です。あまり美味しくありませんが、切羽詰まった時は食べるしかありません。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] "変異肉塊"
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+"ひどく変異した動物の肉です。締まりのないスポンジのような質感が不安ですが...とりあえず臭いは、おおむね普通です。見たこともない奇妙な瘤や器官も混ざっており、肉の内部に固まった骨や毛を見ると、まるで別の生物を生み出そうとしていたかのように思えます。まったく食用に向かない部分を取り除いて調理すれば、少なくとも消化は可能です。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] "変異屑肉"
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+"ひどく変異した動物の屑肉です。少し奇妙な臭いがし、肉の内部には成長途中の毛や骨の小片が混ざっています。まったく食用に向かない部分を取り除いて調理すれば、少なくとも消化は可能です。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr "変異人肉"
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+"ひどく変異した人型の化け物を解体して得られた肉塊です。奇妙な毛皮の破片や、明らかに人のものではない部位が混じっています。よっぽど狂人か餓死寸前でなければ、これを食べようとは思えません。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr "変異人肉(調理済)"
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr "酷く変異した人型の化け物の肉を調理したものです。最悪の選択をせざるを得ない状況なのですから、食欲はそそりませんが消化は可能でしょう。"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -21969,6 +23022,24 @@ msgid "cooked scrap of meat"
 msgid_plural "cooked scraps of meat"
 msgstr[0] "屑肉(調理済)"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr "変異肉(調理済)"
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr ""
+"変異した動物の肉を調理したものです。スポンジのような質感が不安ですが、味に関しては...おおむね普通です。毛や骨などの食用に向かない部分は、ちゃんと取り出せているはずです..."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] "変異屑肉(調理済)"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "臓物"
@@ -22164,7 +23235,7 @@ msgstr[0] "脳"
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
 msgstr "動物の脳です。生では食べたくありませんね..."
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -22216,7 +23287,7 @@ msgstr "シビレ(調理済)"
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
+msgid "Normally a delicacy, it needs a little… something."
 msgstr "中々の珍味ですが、少し...物足りない味です。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -22233,7 +23304,7 @@ msgstr "動物か何かの骨です。針などを製作する材料として使
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of fat"
 msgid_plural "chunks of fat"
-msgstr[0] "脂肪の塊"
+msgstr[0] "脂肪塊"
 
 #. ~ Description for chunk of fat
 #: lang/json/COMESTIBLE_from_json.py
@@ -22244,7 +23315,7 @@ msgstr "解体で手に入れた脂肪です。そのまま食べることも可
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "tallow"
-msgstr "獣脂"
+msgstr "精製獣脂"
 
 #. ~ Description for tallow
 #: lang/json/COMESTIBLE_from_json.py
@@ -22252,11 +23323,11 @@ msgid ""
 "A smooth white block of cleaned and rendered animal fat.  It will remain "
 "edible for a very long time, and can be used as an ingredient in many foods "
 "and projects."
-msgstr "洗浄し精製した白く滑らかな動物性脂肪の塊です。非常に長持ちし、多くの食品や道具の材料として利用できます。"
+msgstr "動物性脂肪を水と混合し高温で加熱して抽出した、白く滑らかな塊です。非常に長持ちし、多くの食品や道具の材料として利用できます。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lard"
-msgstr "ラード"
+msgstr "獣脂"
 
 #. ~ Description for lard
 #: lang/json/COMESTIBLE_from_json.py
@@ -22264,7 +23335,77 @@ msgid ""
 "A smooth white block of dry-rendered animal fat.  It will remain edible for "
 "a very long time, and can be used as an ingredient in many foods and "
 "projects."
-msgstr "洗浄し精製した白く滑らかな動物性脂肪の塊です。非常に長持ちし、多くの食品や道具の材料として利用できます。"
+msgstr "動物性脂肪を高温で加熱して抽出した、白く滑らかな塊です。非常に長持ちし、多くの食品や道具の材料として利用できます。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] "変異脂肪塊"
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr "変異した生物を解体して手に入れた脂肪です。そのまま食べることも可能ですが、他の食品類の材料として使うべきでしょう。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr "精製変異獣脂"
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr "変異した動物性脂肪を水と混合し高温で加熱して抽出した、白く滑らかな塊です。非常に長持ちし、多くの食品や道具の材料として利用できます。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr "変異獣脂"
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr "変異した動物性脂肪を高温で加熱して抽出した、白く滑らかな塊です。非常に長持ちし、多くの食品や道具の材料として利用できます。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] "変異した人間の脂肪塊"
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr "ひどく変異した人間から切り落とされた脂肪です。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr "精製変異人脂"
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr "変異した人間の脂肪を水と混合し高温で加熱して抽出した、白く滑らかな塊です。非常に長持ちし、多くの食品や道具の材料として利用できます。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr "変異人脂"
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr "変異した人間の脂肪を高温で加熱して抽出した、白く滑らかな塊です。非常に長持ちし、多くの食品や道具の材料として利用できます。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
@@ -22275,7 +23416,7 @@ msgstr[0] "汚染肉塊"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Meat that's obviously unhealthy.  You could eat it, but it will poison you."
-msgstr "明らかに身体に害の有りそうな肉です。食べる事は出来ますが、被毒しそうです。"
+msgstr "明らかに身体に害がありそうな肉です。食べることも不可能ではありませんが、有毒です。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "tainted bone"
@@ -22287,7 +23428,7 @@ msgid ""
 "A rotten and brittle bone from some unnatural creature or other.  Could be "
 "used to make some stuff, like charcoal or glue.  You could eat it, but it "
 "will poison you."
-msgstr "常ならざる生物から取り出した、腐った脆い骨です。炭などの材料になります。食べることも不可能ではありませんが、有毒です。"
+msgstr "異形の化け物から取り出した、腐った脆い骨です。炭などの材料になります。食べることも不可能ではありませんが、有毒です。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "tainted fat"
@@ -22298,11 +23439,11 @@ msgstr "汚染脂肪"
 msgid ""
 "A watery yellow glob of fat from some unnatural creature or other.  You "
 "could eat it, but it will poison you."
-msgstr "べっとりと濡れた黄色い泥のような脂肪の塊です。異形の生物から取り出しました。食べる事は出来ますが、被毒しそうです。"
+msgstr "異形の化け物から取り出した、黄色く水っぽい脂肪の塊です。ました。食べることも不可能ではありませんが、有毒です。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "tainted tallow"
-msgstr "汚染獣脂"
+msgstr "精製汚染獣脂"
 
 #. ~ Description for tainted tallow
 #: lang/json/COMESTIBLE_from_json.py
@@ -22311,7 +23452,7 @@ msgid ""
 "'fresh' for a very long time, and can be used as an ingredient in many "
 "projects.  You could eat it, but it will poison you."
 msgstr ""
-"洗浄し精製した灰色の怪物脂肪の塊です。非常に長く'鮮度'を保ち、いくつかの製作レシピの材料として利用できます。食用にもなりますが、毒性がありそうです。"
+"怪物の脂肪を水と混合し高温で加熱して抽出した、灰色がかった滑らかな塊です。非常に長く「鮮度」を保ち、いくつかの製作レシピの材料として利用できます。食べることも不可能ではありませんが、有毒です。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "large boiled stomach"
@@ -22438,9 +23579,9 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
-"外見は哺乳動物の心臓に似た大きく重い肉の塊ですが、その大きさは人間の頭部を超え、表面には凹凸とした溝が浮き出ています。今なおジャバウォックの血液...のような何らかの液体が中に入っており、重量感があります。敵の心臓を食べるという古い言い回しがありますが、ここ最近目にした一連の出来事を考えると、試してみようとは到底思えません。"
+"外見は哺乳動物の心臓に似た大きく重い肉の塊ですが、そのサイズは人間の頭部より大きく、表面には凹凸とした溝が浮き出ています。今なおジャバウォックの血液...のような何らかの液体が中に入っており、重量感があります。敵の心臓を食べるという古い言い回しがありますが、ここ最近目にした一連の出来事を考えると、試してみようとは到底思えません..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "desiccated putrid heart"
@@ -22455,7 +23596,7 @@ msgid ""
 msgstr ""
 "堕落した心臓の形は残っていますが、巨大な筋肉の塊が切り開かれ、中に入っていた血液がなくなっています。空腹なら食べてみるのも良いでしょうが、見るからに*不快*です。"
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] "生乳"
@@ -22749,7 +23890,7 @@ msgstr[0] "チコリコーヒー"
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
 msgstr "焙煎したチコリの根をお湯で煎じた飲み物です。コーヒーの代用品として飲まれますが、コーヒーとはまったく異なる味です。"
 
@@ -23591,10 +24732,11 @@ msgstr "水に浸かったリング状のパイナップルです。かなり美
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
+msgid_plural "lemonade drink mix"
 msgstr[0] "レモネードパウダー"
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -24288,7 +25430,7 @@ msgstr[0] "飴(ピーナッツバター)"
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
+msgid "A handful of peanut butter cups… your favorite!"
 msgstr "ビーナッツバター味のキャンディ...これは大好物です！"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -24397,7 +25539,7 @@ msgstr "全体がクリーム状のペーストで覆われた美味しいチョ
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr "今まで見てきた中で最も分厚いアイシングで覆われたケーキです。引用符で囲った下らない言葉が書き添えられています。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -24438,7 +25580,7 @@ msgstr[0] "ペパーミントチョコ"
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
 msgstr "ペパーミントのパテを柔らかいチョコレートでコーティングしたお菓子です...うまい！"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -25019,6 +26161,17 @@ msgid ""
 msgstr ""
 "不自然なピンク色、奇妙な弾性を持つ豚肉加工食品です。あまり美味しくありませんが、腹持ちは上々です。全く食欲をそそりませんが、腹持ちは上々です。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr "聖なるスパム"
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr "1日分のカロリーと栄養素を含む神秘的なスパムです。これはデバッグ専用アイテムです。"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "イワシ(保存食)"
@@ -26584,8 +27737,8 @@ msgstr[0] "消毒布"
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr "消毒液を浸した布切れです。軽傷を治療する効果がありますが、深い咬傷には意味がありません。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -26642,7 +27795,7 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
 "親指の爪ぐらいの大きさの、リンゴのような赤色をしたゲルカプセルです。カプセルの中は黒から紫へと気まぐれに色を変える濃い油のような液体で満たされており、小さな灰色の粒が浮かんでいます。入手経路を考えれば、この薬品が非常に強力かつ実験的要素の強いものだと分かります。効果が出れば、多少の痛みや苦しみであればあっという間に消えてしまう事でしょう..."
 
@@ -27046,9 +28199,9 @@ msgstr "注射用変異原物質"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
-msgstr "濃縮された変異原物質です。使用するつもりなら注射器が必要ですが...。"
+msgstr "濃縮された変異原物質です。使用するには注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagenic serum"
@@ -27062,8 +28215,8 @@ msgstr "血清(アルファ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
-msgstr "濃縮された変異原物質です。血のようにも見える液体です。使用するつもりなら注射器が必要ですが...。"
+"to inject it… if you really want to?"
+msgstr "血のようにも見える、濃縮された変異原物質です。使用するには注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "beast serum"
@@ -27073,7 +28226,7 @@ msgstr "血清(凶獣)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr "闘牛士の布のように赤い、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27084,8 +28237,8 @@ msgstr "血清(鳥)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
-msgstr "濃縮された変異原物質です。大変動以前の空を思わせる色の液体です。使用するつもりなら注射器が必要ですが...。"
+"need a syringe to inject it… if you really want to?"
+msgstr "大変動以前の空を思わせる色の、濃縮された変異原物質です。使用するには注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattle serum"
@@ -27095,8 +28248,8 @@ msgstr "血清(ウシ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
-msgstr "濃縮された変異原物質です。芝生に似た色の液体です。使用するつもりなら注射器が必要ですが...。"
+"inject it… if you really want to?"
+msgstr "芝生に似た色の、濃縮された変異原物質です。使用するには注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cephalopod serum"
@@ -27106,7 +28259,7 @@ msgstr "血清(頭足類)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
+"it… if you really want to?"
 msgstr "インクのように黒い、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27117,7 +28270,7 @@ msgstr "血清(キメラ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr "虹をかき混ぜたような色の、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27128,7 +28281,7 @@ msgstr "血清(エルファ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr "鮮やかな森林のような緑色の、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27139,7 +28292,7 @@ msgstr "血清(ネコ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr "キラキラと輝く黄色の、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27150,8 +28303,8 @@ msgstr "血清(魚)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
-msgstr "濃縮された変異原物質です。海のような青色をしており、表面には白い泡が浮いています。使用するつもりなら注射器が必要ですが...。"
+"top.  You need a syringe to inject it… if you really want to?"
+msgstr "海のような青色の液体に白い泡が浮かぶ、濃縮された変異原物質です。使用するには注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "insect serum"
@@ -27161,7 +28314,7 @@ msgstr "血清(昆虫)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr "美しい琥珀色の、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27172,7 +28325,7 @@ msgstr "血清(トカゲ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr "緑がかった様々な色合いに変化し続ける、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27183,7 +28336,7 @@ msgstr "血清(オオカミ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
+" inject it… if you really want to?"
 msgstr "満月のように白い、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27194,7 +28347,7 @@ msgstr "血清(医療)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr "体液を混合したような見た目の、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27205,7 +28358,7 @@ msgstr "血清(植物)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr "ホウレンソウのピューレのような見た目の、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27216,7 +28369,7 @@ msgstr "血清(ラプトル)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
+"at it.  You need a syringe to inject it… if you really want to?"
 msgstr "刻々と異なる状態に変化しているように見える、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27227,7 +28380,7 @@ msgstr "血清(ラット)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr "地味なベージュ色の、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27238,7 +28391,7 @@ msgstr "血清(スライム)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
 msgstr "ゾンビの目元から垂れている黒い液体によく似た、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27249,7 +28402,7 @@ msgstr "血清(クモ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr "薄い色の細糸が混じっているようにも見える、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27260,7 +28413,7 @@ msgstr "血清(地中生物)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr "光に怯えているようにも見える、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27271,7 +28424,7 @@ msgstr "血清(クマ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
+"thick.  You need a syringe to inject it… if you really want to?"
 msgstr "蜂蜜のような色と粘度の、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27282,7 +28435,7 @@ msgstr "血清(ハツカネズミ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr "液体金属のような見た目の、濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27297,8 +28450,8 @@ msgstr "凝固した血液"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
-msgstr "どろっとした濃厚な赤い液体です。おぞましい姿で悪臭を放っており、まるでこの液体に意思があるような気さえします。"
+"bubble with an intelligence of its own…"
+msgstr "どろっとした濃厚な赤い液体です。おぞましい姿で悪臭を放っており、まるでこの液体に意思があるような気さえします..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "alpha mutagen"
@@ -27483,21 +28636,21 @@ msgid ""
 msgstr "変異したくて堪らない人のための飲み物です。やはり酷い味ですがそのまま飲むよりはずっとマシでしょう。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
+msgid "pine nuts"
+msgid_plural "pine nuts"
 msgstr[0] "松の実"
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr "松かさから取り出した、カリカリとした美味しい木の実です。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
+msgid "junipers"
+msgid_plural "junipers"
 msgstr[0] "ジュニパーベリー"
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -27505,62 +28658,75 @@ msgid ""
 msgstr "ジンの素朴な香りの素となる実です。ローズマリーに似た刺激的な味です。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
 msgstr[0] "ピスタチオ(殻無し)"
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
 msgstr "ピスタチオの木から採取した実です。殻は割って外してあります。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
 msgstr[0] "ピスタチオ(調理済)"
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr "ピスタチオの木から採取した実を炙ったものです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
 msgstr[0] "アーモンド(殻無し)"
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
 msgstr "アーモンドの木から採取した実です。殻は割って外してあります。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
+msgid "almond pulp"
+msgid_plural "almond pulp"
+msgstr[0] "アーモンドパルプ"
+
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr "アーモンドミルクを作った後の搾りかすです。舌触りはザラザラで、何の面白みもない味です。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
 msgstr[0] "アーモンド(調理済)"
 
-#. ~ Description for handful of roasted almonds
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
 msgstr "アーモンドの木から採取した実を炙ったものです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
+msgid "cashews"
+msgid_plural "cashews"
 msgstr[0] "カシューナッツ"
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr "塩をまぶしたカシューナッツです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
 msgstr[0] "ペカン(殻無し)"
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -27568,41 +28734,41 @@ msgid ""
 msgstr "ヒッコリーの一種であるペカンの木から採取した実です。殻は割って外してあります。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
 msgstr[0] "ペカン(調理済)"
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr "ペカンの木から採取した実を炙ったものです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
 msgstr[0] "ピーナッツ(殻無し)"
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr "殻を剥いて塩で味付けしたピーナッツです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
+msgid "beech nuts"
+msgid_plural "beech nuts"
 msgstr[0] "ビーチナッツ"
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr "ブナの木から採取した、硬く尖った実です。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
 msgstr[0] "クルミ(殻無し)"
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -27610,21 +28776,22 @@ msgid ""
 msgstr "クルミの木から採取した未調理の硬い実です。殻は割って外してあります。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
 msgstr[0] "クルミ(調理済)"
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr "クルミの木から採取した実を炙ったものです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
 msgstr[0] "クリ(殻無し)"
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -27632,21 +28799,23 @@ msgid ""
 msgstr "クリの木から採取した未調理の硬い実です。殻は割って外してあります。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
 msgstr[0] "クリ(調理済)"
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr "クリの木から採取した実を炙ったものです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
-msgstr[0] "ヘーゼルナッツ"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
+msgstr[0] "ヘーゼルナッツ(殻無し)"
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -27654,41 +28823,43 @@ msgid ""
 msgstr "ハシバミの木から採取した未調理の硬いヘーゼルナッツです。殻は割って外してあります。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
 msgstr[0] "枝豆(調理済)"
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr "炒った枝豆は健康に良いおやつです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
 msgstr[0] "大豆(調理済)"
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr "ソイナッツとも呼ばれる炒った大豆です。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
 msgstr[0] "ヘーゼルナッツ(調理済)"
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr "ハシバミの木から採取したヘーゼルナッツを炙ったものです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
 msgstr[0] "ヒッコリーナッツ(殻無し)"
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -27696,11 +28867,12 @@ msgid ""
 msgstr "ヒッコリーの木から採取した硬い実です。殻は割って外してあります。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
 msgstr[0] "ヒッコリーナッツ(調理済)"
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr "ヒッコリーの木から採取した実を炙ったものです。"
@@ -27715,11 +28887,11 @@ msgid "Delicious hickory nut ambrosia.  A drink worthy of the gods."
 msgstr "美味しいヒッコリーナッツアンブロシアです。神々の飲料です。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
+msgid "acorns"
+msgid_plural "acorns"
 msgstr[0] "ドングリ"
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
@@ -27727,11 +28899,11 @@ msgid ""
 msgstr "一掴み分の殻に入ったドングリです。リスが好む食べ物ですが、このままでは人間の食用には向きません。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
 msgstr[0] "ドングリ(調理済)"
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr "オークの木から採取したドングリを炙ったものです。"
@@ -28258,10 +29430,11 @@ msgstr "人肉パウダーを水で溶いた飲み物です。非常に栄養価
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
+msgid_plural "soylent green powder"
 msgstr[0] "人肉パウダー"
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -28303,10 +29476,10 @@ msgstr "プロテインパウダーを水で溶いた飲み物です。非常に
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
+msgid_plural "protein powder"
 msgstr[0] "プロテインパウダー"
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -28375,61 +29548,61 @@ msgid "Very sour citrus.  Can be eaten if you really want."
 msgstr "非常に酸っぱい果物です。食べたいと心から望むのなら食べられますよ。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
+msgid "blueberries"
+msgid_plural "blueberries"
 msgstr[0] "ブルーベリー"
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr "青い色をしていますが、それは悲しさを表現している訳ではありませんよ。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
+msgid "strawberries"
+msgid_plural "strawberries"
 msgstr[0] "イチゴ"
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr "美味しく瑞々しいイチゴです。野原に自生していることがあります。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
+msgid "cranberries"
+msgid_plural "cranberries"
 msgstr[0] "クランベリー"
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr "酸味のある赤いベリーです。健康的な果物です。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
+msgid "raspberries"
+msgid_plural "raspberries"
 msgstr[0] "ラズベリー"
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "甘くて赤いベリーです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
+msgid "huckleberries"
+msgid_plural "huckleberries"
 msgstr[0] "ハックルベリー"
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr "しばしばブルーベリーと混同される果実です。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
+msgid "mulberries"
+msgid_plural "mulberries"
 msgstr[0] "マルベリー"
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -28437,21 +29610,21 @@ msgid ""
 msgstr "赤いマルベリーです。世界中に多様な品種が存在しますが、これはアメリカ東部特有の品種のようです。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
+msgid "elderberries"
+msgid_plural "elderberries"
 msgstr[0] "エルダーベリー"
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr "エルダーベリーは生で食べると毒がありますが、調理すれば非常に美味しく食べることができます。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
+msgid "rose hips"
+msgid_plural "rose hips"
 msgstr[0] "ローズヒップ"
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "受粉したバラに実る果実です。"
@@ -28486,11 +29659,11 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "独特の爽やかな香りがあって、酸っぱくてほんのり甘い、柑橘系の果物です。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
+msgid "cherries"
+msgid_plural "cherries"
 msgstr[0] "サクランボ"
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr "木に生える赤くて甘い果物です。"
@@ -28506,11 +29679,11 @@ msgid ""
 msgstr "紫色の大きなスモモです。健康に良く、消化を助けます。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
+msgid "grapes"
+msgid_plural "grapes"
 msgstr[0] "ブドウ"
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr "瑞々しいブドウの房です。"
@@ -28562,11 +29735,11 @@ msgid "A large and very sweet fruit."
 msgstr "大きくて非常に甘い果物です。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
+msgid "blackberries"
+msgid_plural "blackberries"
 msgstr[0] "ブラックベリー"
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "ラズベリーより色の濃いベリーです。従兄弟のようなものです。"
@@ -28609,15 +29782,26 @@ msgid ""
 msgstr "薄い毛で覆われた茶色の大きな果実です。中身は緑色の美味しい果肉です。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
+msgid "apricots"
+msgid_plural "apricots"
 msgstr[0] "アンズ"
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "滑らかな肌触りのモモに似た果物です。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr "サボテンの芽"
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr "棘を取り除いたウチワサボテンの芽です。モハーヴェ族はこれをお菓子として食べます。"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr "茎節(サボテン)"
@@ -28787,10 +29971,10 @@ msgstr "大きなダリアの塊根です。香ばしい匂いがしますが、
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] "サルシファイ"
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -28800,10 +29984,10 @@ msgstr "小さな紫色の花をつける野草です。根には栄養が豊富
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
+msgid_plural "chicory"
 msgstr[0] "チコリ"
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -28915,11 +30099,11 @@ msgid ""
 msgstr "頭ほどの大きさがある大きな野菜です。生だと酷い味ですが、調理するととても美味しく食べられます。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
+msgid "dandelions"
+msgid_plural "dandelions"
 msgstr[0] "タンポポ"
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -29044,11 +30228,11 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr "未調理のレンズ豆です。調理すれば食べられます。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
 msgstr[0] "ゼンマイ"
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -30794,8 +31978,8 @@ msgstr[0] "スパゲッティ(未調理)"
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
 msgstr "スパゲッティを作る際に使われる一般的なパスタです。絶望的な状況下では生食も可能ですが、調理した方がずっと美味しいです。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -30806,7 +31990,7 @@ msgstr[0] "ラザーニャ(未調理)"
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
 msgstr "ラザーニャを作る際に使われる板状のパスタです。絶望的な状況下では生食も可能ですが、調理した方がずっと美味しいです。"
 
@@ -31254,7 +32438,7 @@ msgstr "ポーション(基礎)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr "呪文を溶け込ませて保存することができる、強い酒にマナを注入した濃厚な液体です。この状態でも飲もうと思えば飲めます。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31266,7 +32450,7 @@ msgstr[0] "大きな副腎"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr ""
 "腎臓の上部に位置する、アドレナリンやコルチゾール、アルドステロンなどを分泌する器官です。一般的な動物か変異体かにかかわらず大きく発達しています。"
 
@@ -31364,8 +32548,8 @@ msgstr "ブードゥー人形(ゾンビ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 "骨や臓器を使って死んだ人間を非常に正確に再現した人形です。死霊術によって腐敗を遅らせていますが、永久に腐敗を止めることはできません。付属の針で刺すことで力を発揮します。"
 
@@ -31377,8 +32561,9 @@ msgstr "ブードゥー人形(スケルトン)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr ""
 "臓器を使って死んだ人間を正確に再現した、骨で覆われた人形です。死霊術によって腐敗を遅らせていますが、永久に腐敗を止めることはできません。付属の針で刺すことで力を発揮します。"
 
@@ -31390,10 +32575,10 @@ msgstr "ブードゥー人形(ゾンビピューマ)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
-"毛皮や骨、臓器を使って死んだクーガーを非常に正確に再現した人形です。死霊術によって腐敗を遅らせていますが、永久に腐敗を止めることはできません。付属の針で刺すことで力を発揮します。"
+"毛皮や骨、臓器を使って死んだピューマを非常に正確に再現した人形です。死霊術によって腐敗を遅らせていますが、永久に腐敗を止めることはできません。付属の針で刺すことで力を発揮します。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "potion of Twisted Restoration"
@@ -31403,8 +32588,8 @@ msgstr "ポーション(ツイステッド・レストレーション)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
 msgstr ""
 "悪臭が漂う液体です。脈拍を危険なレベルまで加速させてアンデッドの自然治癒力を再現します。危険な状況や体調が万全でない時に飲むのは止めた方が良さそうです。"
 
@@ -31416,9 +32601,9 @@ msgstr "ポーション(ツイステッド・レストレーション改)"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
 "悪臭が漂う液体です。脈拍を危険なレベルまで加速させてアンデッドの自然治癒力を再現します。危険な状況や体調が万全でない時に飲むのは止めた方が良さそうです。煎じ方を改良し、摂取に伴う負担が軽減されました。"
 
@@ -31454,7 +32639,7 @@ msgstr[0] "毛玉"
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr "気味の悪い大きな動物の毛玉です。飲み込もうとしないでください。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31470,6 +32655,16 @@ msgid ""
 " properties."
 msgstr "ドラゴンを倒して得た肉です。他の肉のようには調理できず、明らかに何か魔法の力を秘めているようです。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr "サケビタケ"
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr "死んだシュリーカーから採取したキノコです。ポーションの材料になります。"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
 msgstr "太紐(樹脂)"
@@ -32099,15 +33294,6 @@ msgstr[0] "米粉"
 msgid "This rice flour is useful for baking."
 msgstr "パンなどを焼く材料になる米粉です。"
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr "サボテンの蕾"
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr "先住民のモハーヴェ族はこれを飴のように舐めます。"
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr "血清(再生)"
@@ -32377,8 +33563,8 @@ msgstr[0] "密封紙パック"
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr "紙とアルミニウムをビニールでラミネート加工した紙パックです。キャップが付いているため、簡単に再封できます。"
 
 #: lang/json/CONTAINER_from_json.py
@@ -32389,8 +33575,8 @@ msgstr[0] "紙パック(2L)"
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
 msgstr "紙とアルミニウムをビニールでラミネート加工した、容量2Lの紙パックです。既に一度開封されており、内容物の腐敗が進行します。"
 
 #: lang/json/CONTAINER_from_json.py
@@ -32866,9 +34052,9 @@ msgstr[0] "サバイバルボックス(1L)"
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
-msgstr "細々としたサバイバルキットが入っていた、1Lの容量があるアルミニウム製の箱です。"
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
+msgstr "様々なサバイバルキットが入っていた、1Lの容量があるアルミニウム製の箱です。"
 
 #: lang/json/CONTAINER_from_json.py
 msgid "blood draw kit"
@@ -32948,7 +34134,7 @@ msgstr "有害物質を保管することを示す、黄色いドラム缶です
 #: lang/json/CONTAINER_from_json.py
 msgid "garden pot"
 msgid_plural "garden pots"
-msgstr[0] "栽培用植木鉢"
+msgstr[0] "植木鉢(栽培用)"
 
 #. ~ Description for garden pot
 #: lang/json/CONTAINER_from_json.py
@@ -33398,8 +34584,8 @@ msgstr[0] "ロードナイト"
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr "ロードナイトの塊です。二酸化マンガンに覆われており、たがねを使えば削り取れます。"
 
 #: lang/json/GENERIC_from_json.py
@@ -33410,7 +34596,7 @@ msgstr[0] "ジンカイト"
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr "ジンカイトの塊です。酸化亜鉛に生成してから炭素源で還元すれば、亜鉛に加工できます。"
 
@@ -33425,81 +34611,81 @@ msgid "A root from a hickory tree.  It has an earthy smell."
 msgstr "ヒッコリーの木の根です。土の匂いがします。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
 msgstr[0] "ヒッコリーナッツ"
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr "ヒッコリーの木から採取した硬い実です。殻が付いています。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
+msgid "pecans"
+msgid_plural "pecans"
 msgstr[0] "ペカン"
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr "ペカンの木から採取した硬い実です。殻が付いています。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
+msgid "pistachios"
+msgid_plural "pistachios"
 msgstr[0] "ピスタチオ"
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr "ピスタチオの木から採取した硬い実です。殻が付いています。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
+msgid "almonds"
+msgid_plural "almonds"
 msgstr[0] "アーモンド"
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
 msgstr "アーモンドの木から採取した硬い実です。殻が付いています。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
+msgid "peanuts"
+msgid_plural "peanuts"
 msgstr[0] "ピーナッツ"
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr "ラッカセイの茂みから採取した硬い実です。殻が付いています。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
 msgstr[0] "ヘーゼルナッツ"
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr "ハシバミの木から採取した硬い実です。殻が付いています。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
+msgid "chestnuts"
+msgid_plural "chestnuts"
 msgstr[0] "クリ"
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr "クリの木から採取した硬い実です。殻が付いています。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
+msgid "walnuts"
+msgid_plural "walnuts"
 msgstr[0] "クルミ"
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr "クルミの木から採取した硬い実です。殻が付いています。"
@@ -33634,7 +34820,7 @@ msgstr "乾いた血に塗れた死体です。"
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr "恐ろしい表情をした男性の死体です。死の間際に酷く痛めつけられたようです。"
 
@@ -33658,7 +34844,7 @@ msgstr "人間の死体です。額に大きな弾痕が残っており、後頭
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr "強い力で引き裂かれたように見える人間の上半身です。断面から臓器がはみ出しています。"
 
@@ -33753,6 +34939,11 @@ msgstr "筋肉"
 msgid "wind"
 msgstr "風"
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] "代謝"
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "喫煙用の道具と火"
@@ -33800,7 +34991,7 @@ msgstr[0] "フードプレイスポイントカード"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr "全てのスタンプが押された、鮮やかなピンク色のポイントカードです。フードプレイスへの忠誠心を示す以外の使い道が残っているとは思えません..."
 
 #: lang/json/GENERIC_from_json.py
@@ -33848,7 +35039,7 @@ msgstr "革の小さな端切れです。頑丈な衣類を作るために使用
 #: lang/json/GENERIC_from_json.py
 msgid "felt patch"
 msgid_plural "felt patches"
-msgstr[0] "フェルト片"
+msgstr[0] "端切れ(フェルト)"
 
 #. ~ Description for felt patch
 #: lang/json/GENERIC_from_json.py
@@ -33858,7 +35049,7 @@ msgstr "フェルトの小さな切れ端です。分解して羊毛の織糸に
 #: lang/json/GENERIC_from_json.py
 msgid "Nomex patch"
 msgid_plural "Nomex patches"
-msgstr[0] "布片(ノーメックス)"
+msgstr[0] "端切れ(ノーメックス)"
 
 #. ~ Description for Nomex patch
 #: lang/json/GENERIC_from_json.py
@@ -33929,8 +35120,8 @@ msgstr[0] "セラミックディスク"
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr "高級セラミックで作られた、まるで鱗のような小さく細長いディスクです。"
 
 #: lang/json/GENERIC_from_json.py
@@ -34164,7 +35355,7 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "wire"
 msgid_plural "wires"
-msgstr[0] "鉄線"
+msgstr[0] "ワイヤー"
 
 #. ~ Description for wire
 #: lang/json/GENERIC_from_json.py
@@ -34209,6 +35400,17 @@ msgid ""
 "constructing tougher walls and such."
 msgstr "鉄筋です。武器として使えます。壁などの建造物の補強に重宝します。"
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] "鉄道レール(小)"
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr "厚板とレールで作られた鉄道レールです。"
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -34328,8 +35530,8 @@ msgstr[0] "テレビ"
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
-msgstr "大型のブラウン管テレビです。有用な電子部品が詰まっています。"
+msgid "A large LCD television, full of delicious electronics."
+msgstr "大型の液晶テレビです。有用な電子部品が詰まっています。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -34715,6 +35917,18 @@ msgid ""
 "communications equipment."
 msgstr "信号を受信するモジュールです。通信装置の製作に使います。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] "大型液晶ディスプレイ"
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr "映像を表示できる、バックライト付きの大型ディスプレイです。いくつかの電子機器の製作に使います。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -35089,7 +36303,7 @@ msgstr[0] "SDメモリーカード(科学)"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
+"encrypted.  Looks *Interesting*, though…"
 msgstr "このメモリーカードは「XEDRA」に関するもののようで、しっかりと暗号化されています。なんとも*興味深い*ですね..."
 
 #: lang/json/GENERIC_from_json.py
@@ -35158,11 +36372,12 @@ msgid ""
 msgstr "ヒマワリの花には、黄色い花弁と動物にまだ食べられていない種が残っています。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
-msgstr[0] "カモミール"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
+msgstr[0] "カモミールの花"
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -35181,12 +36396,12 @@ msgstr "湿り気のある粘度の塊です。いくつかの製作レシピの
 #: lang/json/GENERIC_from_json.py
 msgid "brick"
 msgid_plural "bricks"
-msgstr[0] "煉瓦"
+msgstr[0] "レンガ"
 
 #. ~ Description for brick
 #: lang/json/GENERIC_from_json.py
 msgid "A fire hardened building block used in masonry construction."
-msgstr "堅く焼成された石工建築用の煉瓦(れんが)です。"
+msgstr "堅く焼成された石工建築用のレンガです。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "mortar"
@@ -35201,17 +36416,17 @@ msgstr "いつでも建築に使えるよう調整されたモルタルです。
 #: lang/json/GENERIC_from_json.py
 msgid "soft adobe brick"
 msgid_plural "soft adobe bricks"
-msgstr[0] "日干し煉瓦(未乾燥)"
+msgstr[0] "日干しレンガ(未乾燥)"
 
 #. ~ Use action msg for soft adobe brick.
 #: lang/json/GENERIC_from_json.py
 msgid "You test the brick, and it seems solid enough to use."
-msgstr "煉瓦を確認すると、十分に硬くなっているようです。"
+msgstr "レンガを確認すると、十分に硬くなっているようです。"
 
 #. ~ Use action not_ready_msg for soft adobe brick.
 #: lang/json/GENERIC_from_json.py
 msgid "The brick is still too damp to bear weight."
-msgstr "煉瓦はまだ湿っており、耐久性が不十分です。"
+msgstr "レンガはまだ湿っており、耐久性が不十分です。"
 
 #. ~ Description for soft adobe brick
 #: lang/json/GENERIC_from_json.py
@@ -35223,19 +36438,19 @@ msgstr "土と天然繊維を混ぜて固めた資材です。まだ湿ってい
 #: lang/json/GENERIC_from_json.py
 msgid "adobe brick"
 msgid_plural "adobe bricks"
-msgstr[0] "日干し煉瓦"
+msgstr[0] "日干しレンガ"
 
 #. ~ Description for adobe brick
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A compacted mass of soil and natural fibers, baked dry enough to harden into"
 " a brick."
-msgstr "土と天然繊維を混ぜて固めた資材です。乾燥しており、煉瓦として利用するのに十分な硬度があります。"
+msgstr "土と天然繊維を混ぜて固めた資材です。乾燥しており、レンガとして利用するのに十分な硬度があります。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "adobe mortar"
 msgid_plural "adobe mortar"
-msgstr[0] "日干し煉瓦用モルタル"
+msgstr[0] "日干しレンガ用モルタル"
 
 #. ~ Description for adobe mortar
 #: lang/json/GENERIC_from_json.py
@@ -35416,10 +36631,10 @@ msgstr "今ではまったく役に立たない20ドル紙幣を多く束ねた
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -35469,10 +36684,10 @@ msgstr[0] "吸殻(タバコ)"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr ""
 "かつては非常に中毒性の高いタバコの葉を包んだ筒だったものです。悲しい事に今や唯のゴミでしかありません！\n"
-"しかし、いくつか集めてわずかに残った使える部分を纏めれば、新たに一本のタバコを作り出せるでしょう。そこまでしてタバコが吸いたいというのならですが..."
+"しかし、燃え残った部分をいくつか纏めれば、新たに一本のタバコを作り出せます。そこまでして吸う価値があるのでしょうか..."
 
 #. ~ Use action msg for joint.
 #: lang/json/GENERIC_from_json.py
@@ -35516,10 +36731,10 @@ msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
-msgstr[0] "葉タバコ"
+msgid_plural "raw tobacco"
+msgstr[0] "タバコの葉"
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -35567,11 +36782,6 @@ msgid ""
 msgstr ""
 "高度な技術者が持っていたIDカードです。カードの裏面には使用方法が書かれています。1枚のカードにつき1つのコントロールパネルにアクセスできます。"
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] "ネオプレンシート"
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -35806,12 +37016,12 @@ msgstr "壊れた無人車両です。破損して内部の液体が漏れ出て
 #: lang/json/GENERIC_from_json.py
 msgid "fire brick"
 msgid_plural "fire bricks"
-msgstr[0] "耐熱煉瓦"
+msgstr[0] "耐熱レンガ"
 
 #. ~ Description for fire brick
 #: lang/json/GENERIC_from_json.py
 msgid "A reinforced brick designed to withstand intense heat."
-msgstr "高い熱にも耐えられるように作られた強化煉瓦です。"
+msgstr "高い熱にも耐えられるように作られた強化レンガです。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "survival kit"
@@ -36007,13 +37217,6 @@ msgid ""
 "chopping things and for use as a hammer."
 msgstr "片手で扱える斧です。物を切断する他に、ハンマーとしても利用できます。また、武器としても扱えます。"
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr "野球ボール大の石です。これできちんとした近接武器を作ってもいいですし、そのまま敵に投げて使うのもいいでしょう。"
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -36149,7 +37352,7 @@ msgstr[0] "針(真菌殺し)"
 #. ~ Description for fungal fighter sting
 #: lang/json/GENERIC_from_json.py
 msgid "A short dart from a fungal fighter.  Makes an poor melee weapon."
-msgstr "真菌殺しが持っている短いダーツです。間に合わせながらも十分な性能を持つ近接武器を製作できます。"
+msgstr "真菌殺しが持っている短いダーツです。簡素な近接武器になります。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "wasp sting"
@@ -36159,7 +37362,7 @@ msgstr[0] "針(スズメバチ)"
 #. ~ Description for wasp sting
 #: lang/json/GENERIC_from_json.py
 msgid "A six-inch stinger from a giant wasp.  Makes a poor melee weapon."
-msgstr "巨大スズメバチが持つ6インチの針です。間に合わせながらも十分な性能を持つ近接武器を製作できます。"
+msgstr "巨大スズメバチが持つ約15センチの針です。簡素な近接武器になります。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "walking cane"
@@ -36517,7 +37720,7 @@ msgstr[0] "板バネ"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
+" an awful lot like a bow.  You can barely bend it…"
 msgstr "大きく頑丈な板バネです。恐らく車やトラックに装着されていたもので、弓がたくさん重なったような形状です。硬くてほとんど曲がりません..."
 
 #: lang/json/GENERIC_from_json.py
@@ -37121,12 +38324,12 @@ msgstr[0] "アトミックコーヒーメーカー"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
 msgstr ""
-"CuppaTech社が開発したキュリーGコーヒーメーカーです。ご存知の通り、放射性崩壊から取り出した電力を使ってコーヒー用のお湯を沸かします。通常は、コンデンサに蓄えた電力を使ってお湯を沸かし、普通のコーヒーを作れます。しかし、RTGの格納容器内の水を使って、非常に特殊な刺激の強いコーヒーを作ることも可能です。キュリーGの流通はほとんどの国で違法とされています。"
+"CuppaTech社が開発したキュリーGコーヒーメーカーです。ご存知の通り、放射性崩壊から取り出した電力を使ってコーヒー用のお湯を沸かします。通常はコンデンサに蓄えた電力を使ってお湯を沸かし、普通のコーヒーを作れます。しかし、RTGの格納容器内の水を使って、非常に特殊な刺激の強いコーヒーを作ることも可能です。キュリーGの流通はほとんどの国で違法とされています。"
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "atomic lamp"
@@ -37136,14 +38339,16 @@ msgstr[0] "アトミックランプ"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "カバーを閉じる"
 
 #. ~ Use action msg for atomic lamp.
 #: lang/json/GENERIC_from_json.py
 msgid "You close the lamp's cover."
-msgstr "ランプの蓋を閉じました。"
+msgstr "ランプのカバーを閉じました。"
 
 #. ~ Description for atomic lamp
 #: lang/json/GENERIC_from_json.py
@@ -37164,14 +38369,16 @@ msgstr[0] "アトミックランプ(閉)"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "カバーを開ける"
 
 #. ~ Use action msg for atomic lamp (covered).
 #: lang/json/GENERIC_from_json.py
 msgid "You open the lamp's cover."
-msgstr "ランプの蓋を開きました。"
+msgstr "ランプのカバーを開きました。"
 
 #. ~ Description for atomic lamp (covered)
 #: lang/json/GENERIC_from_json.py
@@ -37193,7 +38400,7 @@ msgstr[0] "アトミック読書灯"
 #. ~ Use action msg for magical reading light.
 #: lang/json/GENERIC_from_json.py
 msgid "You close the nightlight's cover."
-msgstr "常夜灯の蓋を閉じました。"
+msgstr "常夜灯のカバーを閉じました。"
 
 #. ~ Description for atomic reading light
 #: lang/json/GENERIC_from_json.py
@@ -37215,7 +38422,7 @@ msgstr[0] "アトミック読書灯(閉)"
 #. ~ Use action msg for magical reading light (covered).
 #: lang/json/GENERIC_from_json.py
 msgid "You open the nightlight's cover."
-msgstr "常夜灯の蓋を開きました。"
+msgstr "常夜灯のカバーを開きました。"
 
 #. ~ Description for atomic reading light (covered)
 #: lang/json/GENERIC_from_json.py
@@ -37435,10 +38642,10 @@ msgstr[0] "フック付きロープ"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
 msgstr ""
-"丈夫で軽い全長約9mの縄の先に、折り畳み式のフックが付いています。安全に降下する際に便利です。食肉解体用の長いロープがない時に、代用品として使うこともできます。"
+"丈夫で軽い全長約9mのロープの先に、折り畳み式のフックが付いています。安全に降下したい時に便利です。食肉解体用の長いロープがない時に、代用品として使うこともできます。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "sealed jar of pickles"
@@ -38199,7 +39406,7 @@ msgstr "酔拳のコンプリートガイドブックです。"
 #: lang/json/GENERIC_from_json.py
 msgid "The Way of the Spear"
 msgid_plural "The Way of the Spear"
-msgstr[0] "本(学習/槍の道)"
+msgstr[0] "本(武術/槍の道)"
 
 #. ~ Description for The Way of the Spear
 #: lang/json/GENERIC_from_json.py
@@ -38213,10 +39420,8 @@ msgstr[0] "本(武術/麗しき春を詠む)"
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
-msgstr "詠春拳のコンプリートガイドブックです。胡蝶刀や長竿を使った戦い方も解説されています。"
+msgid "A complete guide to Wing Chun Kung-fu."
+msgstr "詠春拳のコンプリートガイドブックです。"
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
 #: lang/json/martial_art_from_json.py
@@ -38228,8 +39433,8 @@ msgstr[0] "西洋長柄武器術"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr ""
 "長柄武器を使った様々な戦闘技術の解説が載っている、現代語訳された中世の教本です。色々なな長柄武器の扱い方が記されており...更にはイラストも添えられています！"
 
@@ -39236,6 +40441,19 @@ msgstr[0] "伝票"
 msgid "This is a slip of paper signed by the issuer."
 msgstr "発行者のサインが書かれた伝票です。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] "聖画カード"
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr "宗教に関係する人物が描かれた身分証サイズの小さなカードです。裏面には「ニューイングランド教会コミュニティ」と薄く印字されています。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -39560,7 +40778,7 @@ msgstr[0] "フォーク"
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
 msgstr "フォークです。何か食べたい時は、これで突き刺して口に運びましょう。いや...別に必要ありませんね。"
 
@@ -40647,15 +41865,15 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
-"死にゆく星の核から鍛造した大型のハンマーです。以下のような銘が刻まれています。\n"
+"死んだ星の核から鍛造した大型のハンマーです。以下のような銘が刻まれています。\n"
 "\n"
-"この鎚を手にした者よ\n"
-"汝が相応しきものなれば\n"
-"力を手にするのだ\n"
-"そう、破壊の力を！"
+"この鎚に\n"
+"相応しき者\n"
+"破壊の力を\n"
+"与えん"
 
 #: lang/json/GENERIC_from_json.py
 msgid "lucerne hammer"
@@ -40679,7 +41897,7 @@ msgstr "尖った金鎚、スパイク、鉤を長い棒の先に取り付けた
 #: lang/json/GENERIC_from_json.py
 msgid "shillelagh"
 msgid_plural "shillelaghs"
-msgstr[0] "シレーラ"
+msgstr[0] "シレイラ"
 
 #. ~ Description for shillelagh
 #: lang/json/GENERIC_from_json.py
@@ -40693,7 +41911,7 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "loaded stick"
 msgid_plural "loaded sticks"
-msgstr[0] "強化シレーラ"
+msgstr[0] "強化シレイラ"
 
 #. ~ Description for loaded stick
 #: lang/json/GENERIC_from_json.py
@@ -40712,7 +41930,7 @@ msgid ""
 "stick has not been cured in a chimney like a traditional shillelagh but has "
 "had fake black soot painted on."
 msgstr ""
-"観光客向けのお土産として大量生産されたシレーラです。この節くれだった木の枝は、伝統的なシレーラのように煙突の煙を浴びせて硬化されていませんが、黒い煤に見立てた塗料が塗ってあります。"
+"観光客向けのお土産として大量生産されたシレイラです。この節くれだった木の枝は、伝統的なシレイラのように煙突の煙を浴びせて硬化されていませんが、黒い煤に見立てた塗料が塗ってあります。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "blackjack"
@@ -41073,8 +42291,8 @@ msgstr "レイピアの前身とも言える、細身の刺突剣です。収納
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
 msgstr "レイピアの前身とも言える、細身の刺突剣です。収納するには大型の鞘が必要です。少し折れ曲がっているようです。"
 
 #. ~ Description for estoc
@@ -41154,7 +42372,7 @@ msgstr "日本伝来の大型で反りのある両手持ちの刀です。大き
 #: lang/json/GENERIC_from_json.py
 msgid "fencing foil"
 msgid_plural "fencing foils"
-msgstr[0] "フェンシングホイル"
+msgstr[0] "フルーレ"
 
 #. ~ Description for fencing foil
 #: lang/json/GENERIC_from_json.py
@@ -41166,30 +42384,75 @@ msgstr ""
 "最も高貴なスポーツ、フェンシングで使われる剣の一種です。刀身は断面が四角形でよくしなり、切っ先は丸くなっているので、残念ながら武器としてはあまり役に立ちません。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
+msgid "fencing épée"
+msgid_plural "fencing épées"
 msgstr[0] "エペ"
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
 msgstr ""
-"最も高貴なスポーツ、フェンシングで使われる剣の一種です。フェンシングに使われる競技剣の中で最も重く、最も硬質な刀身を持つエペは、それ故に最も武器として実用的でしょう。たぶん。"
+"最も高貴なスポーツ、フェンシングで使われる剣の一種です。競技剣の中で最も重く硬質な刀身を持つため、フェンシング用具の中では一番まともな実戦武器です。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "fencing saber"
 msgid_plural "fencing sabers"
-msgstr[0] "サーベル"
+msgstr[0] "サーブル"
 
 #. ~ Description for fencing saber
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
-msgstr "最も高貴なスポーツ、フェンシングで使われる剣の一種です。ホイルやエペよりもわずかに短く作られていますが、変わりゃあしません。"
+"is marginally shorter than the foil and épée, but no less effective."
+msgstr "最も高貴なスポーツ、フェンシングで使われる剣の一種です。フルーレやエペよりもわずかに短く作られていますが、似たようなものです。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] "戦闘用フルーレ"
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+"かつては攻撃力など皆無だったフルーレから電気スイッチを取り外し、先端を粗く尖らせました。完璧な刺突武器には至っていませんが、威力がやや増して実戦でも多少は役に立つでしょう。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] "戦闘用エペ"
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+"かつては攻撃力など皆無だったエペから電気スイッチを取り外し、先端を粗く尖らせました。完璧な刺突武器には至っていませんが、威力がかなり増して実戦でも多少は役に立つでしょう。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] "戦闘用サーブル"
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
+msgstr ""
+"かつては攻撃力など皆無だったサーブルから電気スイッチを取り外し、丸まった先端を切断して粗く尖らせました。完璧な刺突武器には至っていませんが、威力がかなり増して実戦でも多少は役に立つでしょう。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
@@ -41446,9 +42709,9 @@ msgstr[0] "アルミ鋳塊"
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
+"down to a powder, for more… high-profile applications."
 msgstr ""
-"小さなアルミニウムの鋳塊(ちゅうかい/インゴット)です。より大掛かりな加工に備えて寸法を揃えてあります。軽量な割に丈夫で、様々な形に鋳造する、砕いて粉末として利用するなど多くの用途があります。"
+"小さなアルミニウムの鋳塊です。より大掛かりな加工に備えて寸法を揃えてあります。軽量な割に丈夫で、様々な形に鋳造する、砕いて粉末として利用するなど多くの用途があります。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "scrap copper"
@@ -41615,7 +42878,7 @@ msgid ""
 " or portable stove.  It is shallower than a proper pot or pan, and lacks the"
 " integrated heating elements modern mess kits have."
 msgstr ""
-"収納性に優れた軍用の鍋と器のセットです。火や携帯ストーブの上で食べ物を加熱調理できます。普通の鍋やフライパンと比べるとより浅く作られており、現代的な調理器具セットと違って加熱機能が組み込まれていません。"
+"飯盒(はんごう)。収納性に優れた軍用の鍋と器のセットです。火や携帯ストーブの上で食べ物を加熱調理できます。普通の鍋やフライパンと比べるとより浅く作られており、現代的な調理器具セットと違って加熱機能が組み込まれていません。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "radio car box"
@@ -41752,6 +43015,43 @@ msgid ""
 " can also serve as an improvised stabbing weapon, but will break quickly."
 msgstr "木製のグリップを取り付けた鋼鉄製の千枚通しです。主に革細工に使います。刺突武器として使うこともできそうですが、すぐに壊れてしまうでしょう。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] "フレーム織機"
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr "生地を織るために使う、簡単な作りの大きな木製フレームです。織りあげるには非常に時間がかかります。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] "シャトル"
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr "フレーム織機で生地を織る際に使う、短く平らな木の棒です。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] "型紙セット"
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr "仕立てに使う大量の型紙です。布や革で様々な製品をゼロから作るのにも便利ですが、より複雑なものを作りたい時は必要不可欠です。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -43093,7 +44393,7 @@ msgstr[0] "中型ホイールハブ"
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr "ボルトで車両にホイールを固定する金属部品です。自動車のホイールに適しています。"
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -43104,8 +44404,8 @@ msgstr[0] "大型ホイールハブ"
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr "ボルトで車両にホイールを固定する金属部品です。大型車両のホイールに適しています。"
 
 #: lang/json/GENERIC_from_json.py
@@ -43751,7 +45051,7 @@ msgstr[0] "弾帯接続金具"
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing)"
 msgid_plural "garden pot (growing)s"
-msgstr[0] "栽培用植木鉢(成長)"
+msgstr[0] "植木鉢(成長)"
 
 #. ~ Description for garden pot (growing)
 #: lang/json/GENERIC_from_json.py
@@ -43763,7 +45063,7 @@ msgstr "何らかの食用植物を栽培中の植木鉢です。このアイテ
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (grown)"
 msgid_plural "garden pot (grown)s"
-msgstr[0] "栽培用植木鉢(完熟)"
+msgstr[0] "植木鉢(完熟)"
 
 #. ~ Description for garden pot (grown)
 #: lang/json/GENERIC_from_json.py
@@ -43775,7 +45075,7 @@ msgstr "何らかの熟した植物が植わっている植木鉢です。この
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing tomato)"
 msgid_plural "garden pots (growing tomatoes)"
-msgstr[0] "栽培用植木鉢(トマト/成長)"
+msgstr[0] "植木鉢(トマト/成長)"
 
 #. ~ Use action msg for garden pot (growing tomato).
 #: lang/json/GENERIC_from_json.py
@@ -43808,7 +45108,7 @@ msgstr "トマトが植わった植木鉢です。成長が完了したら使用
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe tomato)"
 msgid_plural "garden pots (ripe tomatoes)"
-msgstr[0] "栽培用植木鉢(トマト/完熟)"
+msgstr[0] "植木鉢(トマト/完熟)"
 
 #. ~ Description for garden pot (ripe tomato)
 #: lang/json/GENERIC_from_json.py
@@ -43820,7 +45120,7 @@ msgstr "完熟したトマトが植わっている植木鉢です。分解する
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing wheat)"
 msgid_plural "garden pots (growing wheat)"
-msgstr[0] "栽培用植木鉢(小麦/成長)"
+msgstr[0] "植木鉢(小麦/成長)"
 
 #. ~ Use action msg for garden pot (growing wheat).
 #: lang/json/GENERIC_from_json.py
@@ -43837,7 +45137,7 @@ msgstr "小麦が植わった植木鉢です。成長が完了したら使用し
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe wheat)"
 msgid_plural "garden pots (ripe wheat)"
-msgstr[0] "栽培用植木鉢(小麦/完熟)"
+msgstr[0] "植木鉢(小麦/完熟)"
 
 #. ~ Description for garden pot (ripe wheat)
 #: lang/json/GENERIC_from_json.py
@@ -43849,7 +45149,7 @@ msgstr "小麦を収穫する準備が整った植木鉢です。分解すると
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing hops)"
 msgid_plural "garden pots (growing hops)"
-msgstr[0] "栽培用植木鉢(ホップ/成長)"
+msgstr[0] "植木鉢(ホップ/成長)"
 
 #. ~ Use action msg for garden pot (growing hops).
 #: lang/json/GENERIC_from_json.py
@@ -43866,7 +45166,7 @@ msgstr "ホップが植わった植木鉢です。成長が完了したら使用
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe hops)"
 msgid_plural "garden pots (ripe hops)"
-msgstr[0] "栽培用植木鉢(ホップ/完熟)"
+msgstr[0] "植木鉢(ホップ/完熟)"
 
 #. ~ Description for garden pot (ripe hops)
 #: lang/json/GENERIC_from_json.py
@@ -43878,7 +45178,7 @@ msgstr "ホップの花を収穫する準備が整った植木鉢です。分解
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing buckwheat)"
 msgid_plural "garden pots (growing buckwheat)"
-msgstr[0] "栽培用植木鉢(蕎麦/成長)"
+msgstr[0] "植木鉢(蕎麦/成長)"
 
 #. ~ Use action msg for garden pot (growing buckwheat).
 #: lang/json/GENERIC_from_json.py
@@ -43895,7 +45195,7 @@ msgstr "蕎麦が植わった植木鉢です。成長が完了したら使用し
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe buckwheat)"
 msgid_plural "garden pots (ripe buckwheat)"
-msgstr[0] "栽培用植木鉢(蕎麦/完熟)"
+msgstr[0] "植木鉢(蕎麦/完熟)"
 
 #. ~ Description for garden pot (ripe buckwheat)
 #: lang/json/GENERIC_from_json.py
@@ -43907,7 +45207,7 @@ msgstr "蕎麦を収穫する準備が整った植木鉢です。分解すると
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing broccoli)"
 msgid_plural "garden pots (growing broccoli)"
-msgstr[0] "栽培用植木鉢(ブロッコリー/成長)"
+msgstr[0] "植木鉢(ブロッコリー/成長)"
 
 #. ~ Use action msg for garden pot (growing broccoli).
 #: lang/json/GENERIC_from_json.py
@@ -43924,7 +45224,7 @@ msgstr "ブロッコリーが植わった植木鉢です。成長が完了した
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe broccoli)"
 msgid_plural "garden pots (ripe broccoli)"
-msgstr[0] "栽培用植木鉢(ブロッコリー/完熟)"
+msgstr[0] "植木鉢(ブロッコリー/完熟)"
 
 #. ~ Description for garden pot (ripe broccoli)
 #: lang/json/GENERIC_from_json.py
@@ -43936,7 +45236,7 @@ msgstr "ブロッコリーを収穫する準備が整った植木鉢です。分
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing oats)"
 msgid_plural "garden pots (growing oats)"
-msgstr[0] "栽培用植木鉢(燕麦/成長)"
+msgstr[0] "植木鉢(燕麦/成長)"
 
 #. ~ Use action msg for garden pot (growing oats).
 #: lang/json/GENERIC_from_json.py
@@ -43953,7 +45253,7 @@ msgstr "燕麦が植わった植木鉢です。成長が完了したら使用し
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe oats)"
 msgid_plural "garden pots (ripe oats)"
-msgstr[0] "栽培用植木鉢(燕麦/完熟)"
+msgstr[0] "植木鉢(燕麦/完熟)"
 
 #. ~ Description for garden pot (ripe oats)
 #: lang/json/GENERIC_from_json.py
@@ -43965,7 +45265,7 @@ msgstr "燕麦を収穫する準備が整った植木鉢です。分解すると
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing barley)"
 msgid_plural "garden pots (growing barley)"
-msgstr[0] "栽培用植木鉢(大麦/成長)"
+msgstr[0] "植木鉢(大麦/成長)"
 
 #. ~ Use action msg for garden pot (growing barley).
 #: lang/json/GENERIC_from_json.py
@@ -43982,7 +45282,7 @@ msgstr "大麦が植わった植木鉢です。成長が完了したら使用し
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe barley)"
 msgid_plural "garden pots (ripe barley)"
-msgstr[0] "栽培用植木鉢(大麦/完熟)"
+msgstr[0] "植木鉢(大麦/完熟)"
 
 #. ~ Description for garden pot (ripe barley)
 #: lang/json/GENERIC_from_json.py
@@ -43994,7 +45294,7 @@ msgstr "大麦を収穫する準備が整った植木鉢です。分解すると
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing carrot)"
 msgid_plural "garden pots (growing carrots)"
-msgstr[0] "栽培用植木鉢(ニンジン/成長)"
+msgstr[0] "植木鉢(ニンジン/成長)"
 
 #. ~ Use action msg for garden pot (growing carrot).
 #: lang/json/GENERIC_from_json.py
@@ -44011,7 +45311,7 @@ msgstr "ニンジンが植わった植木鉢です。成長が完了したら使
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe carrot)"
 msgid_plural "garden pots (ripe carrot)"
-msgstr[0] "栽培用植木鉢(ニンジン/完熟)"
+msgstr[0] "植木鉢(ニンジン/完熟)"
 
 #. ~ Description for garden pot (ripe carrot)
 #: lang/json/GENERIC_from_json.py
@@ -44023,7 +45323,7 @@ msgstr "ニンジンを収穫する準備が整った植木鉢です。分解す
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing cotton)"
 msgid_plural "garden pots (growing cotton)"
-msgstr[0] "栽培用植木鉢(綿/成長)"
+msgstr[0] "植木鉢(綿/成長)"
 
 #. ~ Use action msg for garden pot (growing cotton).
 #: lang/json/GENERIC_from_json.py
@@ -44040,7 +45340,7 @@ msgstr "綿が植わった植木鉢です。成長が完了したら使用して
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe cotton)"
 msgid_plural "garden pots (ripe cotton)"
-msgstr[0] "栽培用植木鉢(綿/完熟)"
+msgstr[0] "植木鉢(綿/完熟)"
 
 #. ~ Description for garden pot (ripe cotton)
 #: lang/json/GENERIC_from_json.py
@@ -44052,7 +45352,7 @@ msgstr "綿を収穫する準備が整った植木鉢です。分解すると収
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing cabbage)"
 msgid_plural "garden pots (growing cabbage)"
-msgstr[0] "栽培用植木鉢(キャベツ/成長)"
+msgstr[0] "植木鉢(キャベツ/成長)"
 
 #. ~ Use action msg for garden pot (growing cabbage).
 #: lang/json/GENERIC_from_json.py
@@ -44069,7 +45369,7 @@ msgstr "キャベツが植わった植木鉢です。成長が完了したら使
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe cabbage)"
 msgid_plural "garden pots (ripe cabbage)"
-msgstr[0] "栽培用植木鉢(キャベツ/完熟)"
+msgstr[0] "植木鉢(キャベツ/完熟)"
 
 #. ~ Description for garden pot (ripe cabbage)
 #: lang/json/GENERIC_from_json.py
@@ -44081,7 +45381,7 @@ msgstr "キャベツを収穫する準備が整った植木鉢です。分解す
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing cucumber)"
 msgid_plural "garden pots (growing cucumber)"
-msgstr[0] "栽培用植木鉢(キュウリ/成長)"
+msgstr[0] "植木鉢(キュウリ/成長)"
 
 #. ~ Use action msg for garden pot (growing cucumber).
 #: lang/json/GENERIC_from_json.py
@@ -44098,7 +45398,7 @@ msgstr "キュウリが植わった植木鉢です。成長が完了したら使
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe cucumber)"
 msgid_plural "garden pots (ripe cucumber)"
-msgstr[0] "栽培用植木鉢(キュウリ/完熟)"
+msgstr[0] "植木鉢(キュウリ/完熟)"
 
 #. ~ Description for garden pot (ripe cucumber)
 #: lang/json/GENERIC_from_json.py
@@ -44110,7 +45410,7 @@ msgstr "キュウリを収穫する準備が整った植木鉢です。分解す
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (growing garlic)"
 msgid_plural "garden pots (growing garlic)"
-msgstr[0] "栽培用植木鉢(ニンニク/成長)"
+msgstr[0] "植木鉢(ニンニク/成長)"
 
 #. ~ Use action msg for garden pot (growing garlic).
 #: lang/json/GENERIC_from_json.py
@@ -44127,7 +45427,7 @@ msgstr "ニンニクが植わった植木鉢です。成長が完了したら使
 #: lang/json/GENERIC_from_json.py
 msgid "garden pot (ripe garlic)"
 msgid_plural "garden pots (ripe garlic)"
-msgstr[0] "栽培用植木鉢(ニンニク/完熟)"
+msgstr[0] "植木鉢(ニンニク/完熟)"
 
 #. ~ Description for garden pot (ripe garlic)
 #: lang/json/GENERIC_from_json.py
@@ -44170,6 +45470,26 @@ msgid ""
 "art."
 msgstr "サイボーグ格闘術創始者の哲学と技術について詳しく記した伝記です。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] "鉄鞭"
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr "輪の形状にした鉄鞭は一瞬でベルトに変形しました。"
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr "先端が刃のように鋭く尖った、長く柔軟な鋼鉄の鞭です。敵を簡単に細かく切り刻めます。使用すると変形してベルトになります。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -44590,6 +45910,131 @@ msgid "dao +2"
 msgid_plural "dao +2s"
 msgstr[0] "刀(dao)+2"
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] "魔法の骨槍"
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr "頑丈な木の棒に不気味な骨の槍が固定されています。槍の付け根にバイオマンサーのルーンが埋め込まれています。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] "魔法のバール"
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr "バールの上部には頑丈な自在スパナが、もう一方の端にはハンマーが内蔵されています。ハンマーの頭にテクノマンサーのルーンが埋め込まれています。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] "魔法使いの杖"
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr ""
+"ルーン文字が刻まれた六尺棒に、耐熱性と耐久性を備えた2つのガラス瓶が固定されており、瓶の中にはマナを保管できるようになっています。先端には魔法使いのルーンが2つ埋め込まれています。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] "魔法のフランベルジュ"
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr "炎のような波状の刃をもつ剣です。柄頭にケルビニストのルーンが埋め込まれています。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] "魔法の斧"
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr "木製の持ち手に固定された、銀の縁飾りが付いた鍛造銅製の斧です。中心部にストームシェイパーのルーンが埋め込まれています。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] "魔法のアサメ"
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr "アニミストが召喚用の血を採取する時に使う、鋼鉄製の儀式用ナイフです。十字型の鍔にアニミストのルーンが埋め込まれています。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] "折り畳み杖(折畳)"
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr "展開する"
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr "折り畳み杖を展開しました。"
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr "テクノマンサーの技術で強化したバネを使って折り畳めるように改造した可変式の杖です。使用すると杖を展開します。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] "折り畳み杖(展開)"
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr "折り畳む"
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr "折り畳み杖を折り畳みました。"
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr "テクノマンサーの技術で強化したバネを使って折り畳めるように改造した可変式の杖です。使用すると杖を折り畳みます。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
@@ -44850,6 +46295,21 @@ msgid ""
 "to land astoundingly powerful blows."
 msgstr "魔術的な紋様で覆われた金属製の大きな籠手です。驚くほど強力な打撃攻撃を繰り出せます。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] "魔法の拳闘グローブ"
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr ""
+"ルーン文字が刻まれた石を巻き付けた、拳闘用グローブです。拳を保護しつつ打撃力を高めます。掌の部分にはアースシェイパーのルーンが埋め込まれています。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -44929,6 +46389,18 @@ msgid ""
 msgstr ""
 "ブレイが大地を突き破る時、えらに微量の貴金属や宝石が集まります。それらが徐々に一つに固まることで、美しさと力を備えた光沢のある宝石が生まれます。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] "スタージの口吻"
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr "スタージの死体から切り取った口吻です。簡素な近接武器になります。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -44953,95 +46425,6 @@ msgid ""
 "scales could make a suit of armor as hard as steel and half as heavy."
 msgstr "加工したブラックドラゴンの皮です。硬く酸に強い特性があり、鱗と合わせれば鋼鉄のように硬く非常に軽い鎧を制作できます。"
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] "魔法の骨槍"
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr "頑丈な木の棒に不気味な骨の槍が固定されています。槍の付け根にバイオマンサーのルーンが埋め込まれています。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] "魔法のバール"
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr "バールの上部には頑丈な自在スパナが、もう一方の端にはハンマーが内蔵されています。ハンマーの頭にテクノマンサーのルーンが埋め込まれています。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] "魔法使いの杖"
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr ""
-"ルーン文字が刻まれた六尺棒に、耐熱性と耐久性を備えた2つのガラス瓶が固定されており、瓶の中にはマナを保管できるようになっています。先端には魔法使いのルーンが2つ埋め込まれています。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] "魔法の拳闘グローブ"
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr ""
-"ルーン文字が刻まれた石を巻き付けた拳闘用グローブです。拳を保護しつつ打撃力を高めます。掌の部分にはアースシェイパーのルーンが埋め込まれています。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] "魔法のフランベルジュ"
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr "炎のような波状の刃をもつ剣です。柄頭にケルビニストのルーンが埋め込まれています。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] "魔法の斧"
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr "木製の把手に固定された、銀の縁飾りが付いた鍛造銅製の斧です。中心部にストームシェイパーのルーンが埋め込まれています。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] "魔法のアサメ"
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr "アニミストが召喚用の血を採取する時に使う鋼鉄製の儀式用ナイフです。十字型の鍔にアニミストのルーンが埋め込まれています。"
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -45110,15 +46493,64 @@ msgstr[0] "骨の槍"
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr "槍やハルバードに似た、骨から作られた邪悪な武器です。"
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr "ミョルニールと呼ばれる雷神トールの戦鎚です。一振りで山脈を叩き潰して平野に変えると言われています。鎚を通してアスガルドの力が感じられます。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] "グングニル"
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+"グングニルと呼ばれるオーディンの槍です。装備した者の力や技量に関係なく、どのような標的にも命中すると言われています。オーディンの加護が感じられます。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "グラム"
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+"グラムと呼ばれるシグルズの剣です。伝説のドラゴンであるファフニールを殺した剣であると言われています。かつてレギンの金床を真っ二つに切断したという話も頷ける鋭さです。"
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] "レーヴァテイン"
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr "レーヴァテインと呼ばれるロキの杖です。ロキが死の扉の下より引き揚げたと言われています。秩序を乱す神の魔力が染み込んでいます。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
-msgstr[0] "巻物(呪文)"
+msgstr[0] "呪文書"
 
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Dark Sight"
 msgid_plural "Scroll of Dark Sights"
-msgstr[0] "巻物(ダーク・サイト)"
+msgstr[0] "呪文書(ダーク・サイト)"
 
 #. ~ Description for Scroll of Dark Sight
 #: lang/json/GENERIC_from_json.py
@@ -45130,7 +46562,7 @@ msgstr "秘儀の前では暗闇も秘密を隠せません。完全な暗闇も
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Invisibility"
 msgid_plural "Scroll of Invisibilitys"
-msgstr[0] "巻物(インビジビリティ)"
+msgstr[0] "呪文書(インビジビリティ)"
 
 #. ~ Description for Scroll of Invisibility
 #: lang/json/GENERIC_from_json.py
@@ -45141,7 +46573,7 @@ msgstr "自分から望まない限り、全身が光を反射しなくなりま
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Smite"
 msgid_plural "Scroll of Smites"
-msgstr[0] "巻物(スマイト)"
+msgstr[0] "呪文書(スマイト)"
 
 #. ~ Description for Scroll of Smite
 #. ~ Description for Smite
@@ -45154,7 +46586,7 @@ msgstr "悪は世界中に蔓延っています。この力を暗闇の中で輝
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Life Conversion"
 msgid_plural "Scroll of Life Conversions"
-msgstr[0] "巻物(ライフ・コンバージョン)"
+msgstr[0] "呪文書(ライフ・コンバージョン)"
 
 #. ~ Description for Scroll of Life Conversion
 #. ~ Description for Life Conversion
@@ -45167,7 +46599,7 @@ msgstr "自身の生命力を霊的エネルギーに変換します。HPを消
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Mind Over Pain"
 msgid_plural "Scroll of Mind Over Pains"
-msgstr[0] "巻物(マインド・オーバー・ペイン)"
+msgstr[0] "呪文書(マインド・オーバー・ペイン)"
 
 #. ~ Description for Scroll of Mind Over Pain
 #. ~ Description for Mind over Pain
@@ -45180,7 +46612,7 @@ msgstr "激しいフィットネスのような儀式を行うことで苦痛を
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Summon Zombie"
 msgid_plural "Scroll of Summon Zombies"
-msgstr[0] "巻物(サモン・ゾンビ)"
+msgstr[0] "呪文書(サモン・ゾンビ)"
 
 #. ~ Description for Scroll of Summon Zombie
 #. ~ Description for Summon Zombie
@@ -45193,7 +46625,7 @@ msgstr "霊体のようなゾンビを地下深くから召喚して戦わせま
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Summon Skeleton"
 msgid_plural "Scroll of Summon Skeletons"
-msgstr[0] "巻物(サモン・スケルトン)"
+msgstr[0] "呪文書(サモン・スケルトン)"
 
 #. ~ Description for Scroll of Summon Skeleton
 #. ~ Description for Summon Skeleton
@@ -45206,7 +46638,7 @@ msgstr "霊体のようなスケルトンを地下深くから召喚して戦わ
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Summon Decayed Pouncer"
 msgid_plural "Scroll of Summon Decayed Pouncers"
-msgstr[0] "巻物(サモン・ゾンビピューマ)"
+msgstr[0] "呪文書(サモン・ゾンビピューマ)"
 
 #. ~ Description for Scroll of Summon Decayed Pouncer
 #. ~ Description for Summon Decayed Pouncer
@@ -45219,7 +46651,7 @@ msgstr "霊体のような大型のネコ科ゾンビを地下深くから召喚
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Cure Light Wounds"
 msgid_plural "Scroll of Cure Light Woundss"
-msgstr[0] "巻物(キュア・ライト・ウーンズ)"
+msgstr[0] "呪文書(キュア・ライト・ウーンズ)"
 
 #. ~ Description for Scroll of Cure Light Wounds
 #. ~ Description for Cure Light Wounds
@@ -45230,7 +46662,7 @@ msgstr "対象のダメージを少し回復します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Pain Split"
 msgid_plural "Scroll of Pain Splits"
-msgstr[0] "巻物(ペイン・スプリット)"
+msgstr[0] "呪文書(ペイン・スプリット)"
 
 #. ~ Description for Scroll of Pain Split
 #. ~ Description for Pain Split
@@ -45241,7 +46673,7 @@ msgstr "四肢のダメージを均等化します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Vicious Tentacle"
 msgid_plural "Scroll of Vicious Tentacles"
-msgstr[0] "巻物(ビシャス・テンタクル)"
+msgstr[0] "呪文書(ビシャス・テンタクル)"
 
 #. ~ Description for Scroll of Vicious Tentacle
 #. ~ Description for Vicious Tentacle
@@ -45254,7 +46686,7 @@ msgstr "鋭い骨をもち酸を滴らせる凶悪な長い触手を詠唱者の
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Grotesque Enhancement"
 msgid_plural "Scroll of Grotesque Enhancements"
-msgstr[0] "巻物(グロテスク・エンハンスメント)"
+msgstr[0] "呪文書(グロテスク・エンハンスメント)"
 
 #. ~ Description for Scroll of Grotesque Enhancement
 #. ~ Description for Grotesque Enhancement
@@ -45267,7 +46699,7 @@ msgstr "外法によって詠唱者の身体を歪め、能力と強度を高め
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Acidic Spray"
 msgid_plural "Scroll of Acidic Sprays"
-msgstr[0] "巻物(アシディック・スプレー)"
+msgstr[0] "呪文書(アシディック・スプレー)"
 
 #. ~ Description for Scroll of Acidic Spray
 #. ~ Description for Acidic Spray
@@ -45280,7 +46712,7 @@ msgstr "詠唱者の口から敵を溶かすドロドロの酸を円錐状に放
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Flesh Pouch"
 msgid_plural "Scroll of Flesh Pouchs"
-msgstr[0] "巻物(フレッシュ・ポーチ)"
+msgstr[0] "呪文書(フレッシュ・ポーチ)"
 
 #. ~ Description for Scroll of Flesh Pouch
 #. ~ Description for Flesh Pouch
@@ -45293,7 +46725,7 @@ msgstr "詠唱者の背中を変形させ、内部にアイテムを保存でき
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Conjure Bonespear"
 msgid_plural "Scroll of Conjure Bonespears"
-msgstr[0] "巻物(コンジャー・ボーンスピア)"
+msgstr[0] "呪文書(コンジャー・ボーンスピア)"
 
 #. ~ Description for Scroll of Conjure Bonespear
 #. ~ Description for Conjure Bonespear
@@ -45306,7 +46738,7 @@ msgstr "刃で縁取られた邪悪な骨の槍を生成します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Megablast"
 msgid_plural "Scroll of Megablasts"
-msgstr[0] "巻物(メガブラスト)"
+msgstr[0] "呪文書(メガブラスト)"
 
 #. ~ Description for Scroll of Megablast
 #. ~ Description for Megablast
@@ -45319,7 +46751,7 @@ msgstr "子供の頃に見たアニメのようにビームを発射してみた
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Magical Light"
 msgid_plural "Scroll of Magical Lights"
-msgstr[0] "巻物(マジカル・ライト)"
+msgstr[0] "呪文書(マジカル・ライト)"
 
 #. ~ Description for Scroll of Magical Light
 #. ~ Description for Magical Light
@@ -45330,33 +46762,33 @@ msgstr "魔法の光源を作り出します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Blinding Flash"
 msgid_plural "Scroll of Blinding Flashs"
-msgstr[0] "巻物(ブラインディング・フラッシュ)"
+msgstr[0] "呪文書(ブラインディング・フラッシュ)"
 
 #. ~ Description for Scroll of Blinding Flash
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
 msgstr "眩い光を発生させて敵を短時間盲目にします。レベルが高いほど威力も少しずつ高くなります。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Ethereal Grasp"
 msgid_plural "Scroll of Ethereal Grasps"
-msgstr[0] "巻物(エーテル・グラスプ)"
+msgstr[0] "呪文書(エーテル・グラスプ)"
 
 #. ~ Description for Scroll of Ethereal Grasp
 #. ~ Description for Ethereal Grasp
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr "霊体の針が地面から大量に出現し、範囲内の全てのモンスターの速度が低下します。レベルが高いほど効果範囲が広くなり、効果時間も長くなります。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Aura of Protection"
 msgid_plural "Scroll of Aura of Protections"
-msgstr[0] "巻物(オーラ・オブ・プロテクション)"
+msgstr[0] "呪文書(オーラ・オブ・プロテクション)"
 
 #. ~ Description for Scroll of Aura of Protection
 #. ~ Description for Aura of Protection
@@ -45369,7 +46801,7 @@ msgstr "全身を魔法のオーラで包み、有害な環境から身体を保
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Vegetative Grasp"
 msgid_plural "Scroll of Vegetative Grasps"
-msgstr[0] "巻物(ベジテイティブ・グラスプ)"
+msgstr[0] "呪文書(ベジテイティブ・グラスプ)"
 
 #. ~ Description for Scroll of Vegetative Grasp
 #. ~ Description for Vegetative Grasp
@@ -45382,7 +46814,7 @@ msgstr "地面から飛び出した根や蔓で敵を掴み、動きを鈍くし
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Root Strike"
 msgid_plural "Scroll of Root Strikes"
-msgstr[0] "巻物(ルート・ストライク)"
+msgstr[0] "呪文書(ルート・ストライク)"
 
 #. ~ Description for Scroll of Root Strike
 #. ~ Description for Root Strike
@@ -45395,7 +46827,7 @@ msgstr "地面から槍のように根が飛び出し、円内の敵を突き刺
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Wooden Shaft"
 msgid_plural "Scroll of Wooden Shafts"
-msgstr[0] "巻物(ウッデン・シャフト)"
+msgstr[0] "呪文書(ウッデン・シャフト)"
 
 #. ~ Description for Scroll of Wooden Shaft
 #. ~ Description for Wooden Shaft
@@ -45408,7 +46840,7 @@ msgstr "手から硬い木の枝を生み出して高速で射出し、敵に突
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Nature's Bow"
 msgid_plural "Scroll of Nature's Bows"
-msgstr[0] "巻物(ネイチャーズ・ボウ)"
+msgstr[0] "呪文書(ネイチャーズ・ボウ)"
 
 #. ~ Description for Scroll of Nature's Bow
 #. ~ Description for Nature's Bow
@@ -45421,7 +46853,7 @@ msgstr "本体が消えるまでは無限に矢を発射できる木製の弓を
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Nature's Trance"
 msgid_plural "Scroll of Nature's Trances"
-msgstr[0] "巻物(ネイチャーズ・トランス)"
+msgstr[0] "呪文書(ネイチャーズ・トランス)"
 
 #. ~ Description for Scroll of Nature's Trance
 #. ~ Description for Nature's Trance
@@ -45434,7 +46866,7 @@ msgstr "生きとし生けるものとの繋がりによって魔術的なトラ
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Bag of Cats"
 msgid_plural "Scroll of Bag of Catss"
-msgstr[0] "巻物(バグ・オブ・キャッツ)"
+msgstr[0] "呪文書(バグ・オブ・キャッツ)"
 
 #. ~ Description for Scroll of Bag of Cats
 #. ~ Description for Bag of Cats
@@ -45445,7 +46877,7 @@ msgstr "ネコはお好きですか？"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Stonefist"
 msgid_plural "Scroll of Stonefists"
-msgstr[0] "巻物(ストーンフィスト)"
+msgstr[0] "呪文書(ストーンフィスト)"
 
 #. ~ Description for Scroll of Stonefist
 #. ~ Description for Stonefist
@@ -45458,7 +46890,7 @@ msgstr "腕と手を近接戦闘での素手攻撃や防御に利用できる魔
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Seismic Stomp"
 msgid_plural "Scroll of Seismic Stomps"
-msgstr[0] "巻物(サイズミック・ストンプ)"
+msgstr[0] "呪文書(サイズミック・ストンプ)"
 
 #. ~ Description for Scroll of Seismic Stomp
 #. ~ Description for Seismic Stomp
@@ -45471,7 +46903,7 @@ msgstr "マナを集中させた足を踏み降ろし、地面を伝う衝撃を
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Stone's Endurance"
 msgid_plural "Scroll of Stone's Endurances"
-msgstr[0] "巻物(ストーンズ・エンデュランス)"
+msgstr[0] "呪文書(ストーンズ・エンデュランス)"
 
 #. ~ Description for Scroll of Stone's Endurance
 #. ~ Description for Stone's Endurance
@@ -45484,7 +46916,7 @@ msgstr "足下の石に精神を集中し、その不変性を受け継ぎます
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Shardspray"
 msgid_plural "Scroll of Shardsprays"
-msgstr[0] "巻物(シャードスプレー)"
+msgstr[0] "呪文書(シャードスプレー)"
 
 #. ~ Description for Scroll of Shardspray
 #. ~ Description for Shardspray
@@ -45497,7 +46929,7 @@ msgstr "鋭い金属片を広範囲に放射し、敵味方関係なく切り刻
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Piercing Bolt"
 msgid_plural "Scroll of Piercing Bolts"
-msgstr[0] "巻物(ピアシング・ボルト)"
+msgstr[0] "呪文書(ピアシング・ボルト)"
 
 #. ~ Description for Scroll of Piercing Bolt
 #. ~ Description for Piercing Bolt
@@ -45510,7 +46942,7 @@ msgstr "鉄の棘を発射して、敵対者を串刺しにします。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Shardstorm"
 msgid_plural "Scroll of Shardstorms"
-msgstr[0] "巻物(シャードストーム)"
+msgstr[0] "呪文書(シャードストーム)"
 
 #. ~ Description for Scroll of Shardstorm
 #. ~ Description for Shardstorm
@@ -45522,7 +46954,7 @@ msgstr "剃刀のような鋭い金属片を全方向に放射します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Rockbolt"
 msgid_plural "Scroll of Rockbolts"
-msgstr[0] "巻物(ロックボルト)"
+msgstr[0] "呪文書(ロックボルト)"
 
 #. ~ Description for Scroll of Rockbolt
 #. ~ Description for Rockbolt
@@ -45533,7 +46965,7 @@ msgstr "石を高速で発射します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Point Flare"
 msgid_plural "Scroll of Point Flares"
-msgstr[0] "巻物(ポイント・フレア)"
+msgstr[0] "呪文書(ポイント・フレア)"
 
 #. ~ Description for Scroll of Point Flare
 #. ~ Description for Point Flare
@@ -45544,7 +46976,7 @@ msgstr "標的のいる地点に強い熱を発生させてダメージを与え
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Finger Firelighter"
 msgid_plural "Scroll of Finger Firelighters"
-msgstr[0] "巻物(フィンガー・ファイアライター)"
+msgstr[0] "呪文書(フィンガー・ファイアライター)"
 
 #. ~ Description for Scroll of Finger Firelighter
 #. ~ Description for Finger Firelighter
@@ -45559,7 +46991,7 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Ice Spike"
 msgid_plural "Scroll of Ice Spikes"
-msgstr[0] "巻物(アイス・スパイク)"
+msgstr[0] "呪文書(アイス・スパイク)"
 
 #. ~ Description for Scroll of Ice Spike
 #. ~ Description for Ice Spike
@@ -45572,7 +47004,7 @@ msgstr "鋭く尖った氷柱を標的の頭上に作り出し、落下させて
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Fireball"
 msgid_plural "Scroll of Fireballs"
-msgstr[0] "巻物(ファイアボール)"
+msgstr[0] "呪文書(ファイアボール)"
 
 #. ~ Description for Scroll of Fireball
 #. ~ Description for Fireball
@@ -45585,7 +47017,7 @@ msgstr "標的に向かってえんどう豆サイズの光球を放ちます。
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Cone of Cold"
 msgid_plural "Scroll of Cone of Colds"
-msgstr[0] "巻物(コーン・オブ・コールド)"
+msgstr[0] "呪文書(コーン・オブ・コールド)"
 
 #. ~ Description for Scroll of Cone of Cold
 #. ~ Description for Cone of Cold
@@ -45596,7 +47028,7 @@ msgstr "標的に円錐状に集めた冷気をぶつけます。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Burning Hands"
 msgid_plural "Scroll of Burning Handss"
-msgstr[0] "巻物(バーニング・ハンズ)"
+msgstr[0] "呪文書(バーニング・ハンズ)"
 
 #. ~ Description for Scroll of Burning Hands
 #. ~ Description for Burning Hands
@@ -45609,7 +47041,7 @@ msgstr "何かのゲームで見たことがある気がします。射程の短
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Frost Spray"
 msgid_plural "Scroll of Frost Sprays"
-msgstr[0] "巻物(フロスト・スプレー)"
+msgstr[0] "呪文書(フロスト・スプレー)"
 
 #. ~ Description for Scroll of Frost Spray
 #. ~ Description for Frost Spray
@@ -45622,7 +47054,7 @@ msgstr "何かのゲームで見たことがある気がします。射程の短
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Chilling Touch"
 msgid_plural "Scroll of Chilling Touchs"
-msgstr[0] "巻物(チリング・タッチ)"
+msgstr[0] "呪文書(チリング・タッチ)"
 
 #. ~ Description for Scroll of Chilling Touch
 #. ~ Description for Chilling Touch
@@ -45633,7 +47065,7 @@ msgstr "触れた標的を一気に冷やして凍らせます。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Glide on Ice"
 msgid_plural "Scroll of Glide on Ices"
-msgstr[0] "巻物(グライド・オン・アイス)"
+msgstr[0] "呪文書(グライド・オン・アイス)"
 
 #. ~ Description for Scroll of Glide on Ice
 #. ~ Description for Glide on Ice
@@ -45646,7 +47078,7 @@ msgstr "足を魔法の氷でコーティングし、平坦な地形を滑って
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Hoary Blast"
 msgid_plural "Scroll of Hoary Blasts"
-msgstr[0] "巻物(ホワイト・ブラスト)"
+msgstr[0] "呪文書(ホワイト・ブラスト)"
 
 #. ~ Description for Scroll of Hoary Blast
 #. ~ Description for Hoary Blast
@@ -45659,7 +47091,7 @@ msgstr "白く輝く氷の結晶を発射します。結晶は衝撃を受ける
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Ice Shield"
 msgid_plural "Scroll of Ice Shields"
-msgstr[0] "巻物(アイス・シールド)"
+msgstr[0] "呪文書(アイス・シールド)"
 
 #. ~ Description for Scroll of Ice Shield
 #. ~ Description for Ice Shield
@@ -45672,7 +47104,7 @@ msgstr "腕に近接戦闘での攻撃や防御に利用できる魔法の氷の
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Frost Armor"
 msgid_plural "Scroll of Frost Armors"
-msgstr[0] "巻物(フロスト・アーマー)"
+msgstr[0] "呪文書(フロスト・アーマー)"
 
 #. ~ Description for Scroll of Frost Armor
 #. ~ Description for Frost Armor
@@ -45685,7 +47117,7 @@ msgstr "全身を魔法の氷の鎧で包み身体を保護します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Magic Missile"
 msgid_plural "Scroll of Magic Missiles"
-msgstr[0] "巻物(マジック・ミサイル)"
+msgstr[0] "呪文書(マジック・ミサイル)"
 
 #. ~ Description for Scroll of Magic Missile
 #. ~ Description for Magic Missile
@@ -45696,7 +47128,7 @@ msgstr "「私は闇に向かってマジック・ミサイルの呪文を唱え
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Phase Door"
 msgid_plural "Scroll of Phase Doors"
-msgstr[0] "巻物(フェイズ・ドア)"
+msgstr[0] "呪文書(フェイズ・ドア)"
 
 #. ~ Description for Scroll of Phase Door
 #. ~ Description for Phase Door
@@ -45707,7 +47139,7 @@ msgstr "ランダムな近い位置にテレポートします。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Gravity Well"
 msgid_plural "Scroll of Gravity Wells"
-msgstr[0] "巻物(グラビティ・ウェル)"
+msgstr[0] "呪文書(グラビティ・ウェル)"
 
 #. ~ Description for Scroll of Gravity Well
 #. ~ Description for Gravity Well
@@ -45720,7 +47152,7 @@ msgstr "特定の地点を中心とする重力の井戸を召喚します。範
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Mana Blast"
 msgid_plural "Scroll of Mana Blasts"
-msgstr[0] "巻物(マナ・ブラスト)"
+msgstr[0] "呪文書(マナ・ブラスト)"
 
 #. ~ Description for Scroll of Mana Blast
 #. ~ Description for Mana Blast
@@ -45731,7 +47163,7 @@ msgstr "魔力を集中させて広範囲を消し飛ばす爆発を引き起こ
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Mana Bolt"
 msgid_plural "Scroll of Mana Bolts"
-msgstr[0] "巻物(マナ・ボルト)"
+msgstr[0] "呪文書(マナ・ボルト)"
 
 #. ~ Description for Scroll of Mana Bolt
 #. ~ Description for Mana Bolt
@@ -45742,7 +47174,7 @@ msgstr "敵にのみダメージを与える魔法の矢を発射します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Haste"
 msgid_plural "Scroll of Hastes"
-msgstr[0] "巻物(ヘイスト)"
+msgstr[0] "呪文書(ヘイスト)"
 
 #. ~ Description for Scroll of Haste
 #. ~ Description for Haste
@@ -45755,7 +47187,7 @@ msgstr "短い期間、詠唱者の速度を大幅に上昇させます。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Mana Beam"
 msgid_plural "Scroll of Mana Beams"
-msgstr[0] "巻物(マナ・ビーム)"
+msgstr[0] "呪文書(マナ・ビーム)"
 
 #. ~ Description for Scroll of Mana Beam
 #. ~ Description for Mana Beam
@@ -45766,7 +47198,7 @@ msgstr "魔力を収束させて進路上の敵にダメージを与えるビー
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Escape"
 msgid_plural "Scroll of Escapes"
-msgstr[0] "巻物(エスケープ)"
+msgstr[0] "呪文書(エスケープ)"
 
 #. ~ Description for Scroll of Escape
 #. ~ Description for Escape
@@ -45779,7 +47211,7 @@ msgstr "中距離のランダムな位置にテレポートし、危機的状況
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Cat's Grace"
 msgid_plural "Scroll of Cat's Graces"
-msgstr[0] "巻物(キャッツ・グレース)"
+msgstr[0] "呪文書(キャッツ・グレース)"
 
 #. ~ Description for Scroll of Cat's Grace
 #. ~ Description for Cat's Grace
@@ -45790,7 +47222,7 @@ msgstr "より優雅に、敏捷に、器用になります。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Eagle's Sight"
 msgid_plural "Scroll of Eagle's Sights"
-msgstr[0] "巻物(イーグルズ・サイト)"
+msgstr[0] "呪文書(イーグルズ・サイト)"
 
 #. ~ Description for Scroll of Eagle's Sight
 #. ~ Description for Eagle's Sight
@@ -45801,7 +47233,7 @@ msgstr "ワシのもつ高い感覚を得ます。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Ogre's Strength"
 msgid_plural "Scroll of Ogre's Strengths"
-msgstr[0] "巻物(オーガズ・ストレングス)"
+msgstr[0] "呪文書(オーガズ・ストレングス)"
 
 #. ~ Description for Scroll of Ogre's Strength
 #. ~ Description for Ogre's Strength
@@ -45812,7 +47244,7 @@ msgstr "鬼のもつ高い筋力を得ます。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Fox's Cunning"
 msgid_plural "Scroll of Fox's Cunnings"
-msgstr[0] "巻物(フォックセズ・カンニング)"
+msgstr[0] "呪文書(フォックセズ・カンニング)"
 
 #. ~ Description for Scroll of Fox's Cunning
 #. ~ Description for Fox's Cunning
@@ -45823,7 +47255,7 @@ msgstr "キツネのように賢くなります。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Jolt"
 msgid_plural "Scroll of Jolts"
-msgstr[0] "巻物(ジョルト)"
+msgstr[0] "呪文書(ジョルト)"
 
 #. ~ Description for Scroll of Jolt
 #. ~ Description for Jolt
@@ -45834,7 +47266,7 @@ msgstr "指先から射程の短い扇状の電撃を放出します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Lightning Bolt"
 msgid_plural "Scroll of Lightning Bolts"
-msgstr[0] "巻物(ライトニング・ボルト)"
+msgstr[0] "呪文書(ライトニング・ボルト)"
 
 #. ~ Description for Scroll of Lightning Bolt
 #. ~ Description for Lightning Bolt
@@ -45850,7 +47282,7 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Windstrike"
 msgid_plural "Scroll of Windstrikes"
-msgstr[0] "巻物(ウィンドストライク)"
+msgstr[0] "呪文書(ウィンドストライク)"
 
 #. ~ Description for Scroll of Windstrike
 #. ~ Description for Windstrike
@@ -45863,7 +47295,7 @@ msgstr "掌からすべてを巻き込む強烈な風を放出します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Windrunning"
 msgid_plural "Scroll of Windrunnings"
-msgstr[0] "巻物(ウィンドランニング)"
+msgstr[0] "呪文書(ウィンドランニング)"
 
 #. ~ Description for Scroll of Windrunning
 #. ~ Description for Windrunning
@@ -45876,7 +47308,7 @@ msgstr "魔法の風が身体を押すことで移動が楽になり速度が上
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Call Stormhammer"
 msgid_plural "Scroll of Call Stormhammers"
-msgstr[0] "巻物(コール・ストームハンマー)"
+msgstr[0] "呪文書(コール・ストームハンマー)"
 
 #. ~ Description for Scroll of Call Stormhammer
 #. ~ Description for Call Stormhammer
@@ -45889,7 +47321,7 @@ msgstr "雷の力に満ちた、火花を散らす魔法の戦鎚を召喚しま
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Bless"
 msgid_plural "Scroll of Blesss"
-msgstr[0] "巻物(ブレス)"
+msgstr[0] "呪文書(ブレス)"
 
 #. ~ Description for Scroll of Bless
 #. ~ Description for Bless
@@ -45900,7 +47332,7 @@ msgstr "身体に力を与え、能力を向上させる祝福の呪文です。
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Holy Blade"
 msgid_plural "Scroll of Holy Blades"
-msgstr[0] "巻物(ホーリー・ブレード)"
+msgstr[0] "呪文書(ホーリー・ブレード)"
 
 #. ~ Description for Scroll of Holy Blade
 #. ~ Description for Holy Blade
@@ -45911,7 +47343,7 @@ msgstr "光の剣が接触したあらゆる敵を切り裂きます！"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Spiritual Armor"
 msgid_plural "Scroll of Spiritual Armors"
-msgstr[0] "巻物(スピリチュアル・アーマー)"
+msgstr[0] "呪文書(スピリチュアル・アーマー)"
 
 #. ~ Description for Scroll of Spiritual Armor
 #. ~ Description for Spiritual Armor
@@ -45923,7 +47355,7 @@ msgstr "信仰が十分に強ければ、悪がこの鎧を打ち破ることは
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Lamp"
 msgid_plural "Scroll of Lamps"
-msgstr[0] "巻物(ランプ)"
+msgstr[0] "呪文書(ランプ)"
 
 #. ~ Description for Scroll of Lamp
 #. ~ Description for Lamp
@@ -45934,7 +47366,7 @@ msgstr "魔法のランプを作り出します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Manatricity"
 msgid_plural "Scroll of Manatricitys"
-msgstr[0] "巻物(マナトリシティ)"
+msgstr[0] "呪文書(マナトリシティ)"
 
 #. ~ Description for Scroll of Manatricity
 #. ~ Description for Manatricity
@@ -45947,7 +47379,7 @@ msgstr "霊的エネルギーをCBM用の電力に変換します。"
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Taze"
 msgid_plural "Scroll of Tazes"
-msgstr[0] "巻物(テイズ)"
+msgstr[0] "呪文書(テイズ)"
 
 #. ~ Description for Scroll of Taze
 #. ~ Description for Taze
@@ -45960,7 +47392,7 @@ msgstr "敵に衝撃を与える非常に射程距離の短い電撃を放ちま
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Lesser Quantum Tunnel"
 msgid_plural "Scroll of Lesser Quantum Tunnels"
-msgstr[0] "巻物(レッサー・クアンタム・トンネル)"
+msgstr[0] "呪文書(レッサー・クアンタム・トンネル)"
 
 #. ~ Description for Scroll of Lesser Quantum Tunnel
 #. ~ Description for Lesser Quantum Tunnel
@@ -45976,7 +47408,7 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Synaptic Stimulation"
 msgid_plural "Scroll of Synaptic Stimulations"
-msgstr[0] "巻物(シナプティック・スティミュレーション)"
+msgstr[0] "呪文書(シナプティック・スティミュレーション)"
 
 #. ~ Description for Scroll of Synaptic Stimulation
 #. ~ Description for Synaptic Stimulation
@@ -45991,7 +47423,7 @@ msgstr "脳内のシナプスを刺激して処理速度を高め、反射神経
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Laze"
 msgid_plural "Scroll of Lazes"
-msgstr[0] "巻物(レイズ)"
+msgstr[0] "呪文書(レイズ)"
 
 #. ~ Description for Scroll of Laze
 #. ~ Description for Laze
@@ -46004,7 +47436,7 @@ msgstr "レーザーとも呼ばれる光線を収束させて標的に放ちま
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Animated Blade"
 msgid_plural "Scroll of Animated Blades"
-msgstr[0] "巻物(アニメイテッド・ブレード)"
+msgstr[0] "呪文書(アニメイテッド・ブレード)"
 
 #. ~ Description for Scroll of Animated Blade
 #. ~ Description for Animated Blade
@@ -46017,7 +47449,7 @@ msgstr "敵を切り刻む、または粉みじんにする力をもった、ひ
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Mirror Image"
 msgid_plural "Scroll of Mirror Images"
-msgstr[0] "巻物(ミラー・イメージ)"
+msgstr[0] "呪文書(ミラー・イメージ)"
 
 #. ~ Description for Scroll of Mirror Image
 #. ~ Description for Mirror Image
@@ -46030,7 +47462,7 @@ msgstr "光を生物として形成し、魔術的なホログラムとして実
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Lightning Blast"
 msgid_plural "Scroll of Lightning Blasts"
-msgstr[0] "巻物(ライトニング・ブラスト)"
+msgstr[0] "呪文書(ライトニング・ブラスト)"
 
 #. ~ Description for Scroll of Lightning Blast
 #. ~ Description for Lightning Blast
@@ -46044,7 +47476,7 @@ msgstr "標的に対して稲妻を小さく圧縮した球体を放ちます。
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Necrotic Gaze"
 msgid_plural "Scroll of Necrotic Gazes"
-msgstr[0] "巻物(ネクロティック・ゲイズ)"
+msgstr[0] "呪文書(ネクロティック・ゲイズ)"
 
 #. ~ Description for Scroll of Necrotic Gaze
 #. ~ Description for Necrotic Gaze
@@ -46057,19 +47489,43 @@ msgstr "自身の血の力を使って視線に腐敗のエネルギーを込め
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Purification Seed"
 msgid_plural "Scroll of Purification Seeds"
-msgstr[0] "巻物(ピュリフィケーション・シード)"
+msgstr[0] "呪文書(ピュリフィケーション・シード)"
 
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
 msgstr "浄水効果を持つ種が大地から贈られます。レベルが高いほど得られる種の数が増加します。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] "呪文書(エックスレイ・ビジョン)"
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr "X線を円錐状に照射して、その範囲内を短時間透視できます。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] "呪文書(クレアボイアンス)"
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
+msgstr "目を閉じると、大地の秘密が明らかになります。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Lava Bomb"
 msgid_plural "Scroll of Lava Bombs"
-msgstr[0] "巻物(ラヴァ・ボム)"
+msgstr[0] "呪文書(ラヴァ・ボム)"
 
 #. ~ Description for Scroll of Lava Bomb
 #. ~ Description for Lava Bomb
@@ -46080,10 +47536,20 @@ msgid ""
 "rock and lava everywhere."
 msgstr "硬い岩で覆われた熱い溶岩の爆弾が、地面を引き裂き飛び出します。溶岩爆弾は衝撃で砕け、岩や溶岩の破片を至るところにまき散らします。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] "呪文書(アシディック・レジスタンス)"
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr "透明な保護膜を作って酸から身体を守る呪文です。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
-msgstr[0] "本(呪文/テクノマンサーのC:DDAデバッグガイド)"
+msgstr[0] "呪文書(テクノマンサーのC:DDAデバッグガイド)"
 
 #. ~ Description for A Technomancer's Guide to Debugging C:DDA
 #: lang/json/GENERIC_from_json.py
@@ -46093,7 +47559,7 @@ msgstr "static std::string description( spell sp ) const;"
 #: lang/json/GENERIC_from_json.py
 msgid "A Beginner's Guide to Magic"
 msgid_plural "A Beginner's Guide to Magics"
-msgstr[0] "本(呪文/はじめての魔法)"
+msgstr[0] "呪文書(はじめての魔法)"
 
 #. ~ Description for A Beginner's Guide to Magic
 #: lang/json/GENERIC_from_json.py
@@ -46105,7 +47571,7 @@ msgstr "呪文書というよりもパンフレットに見えますが、少な
 #: lang/json/GENERIC_from_json.py
 msgid "Wizarding Guide to Backpacking"
 msgid_plural "Wizarding Guide to Backpackings"
-msgstr[0] "本(呪文/バックパッカー用魔法ガイド)"
+msgstr[0] "呪文書(バックパッカー用魔法ガイド)"
 
 #. ~ Description for Wizarding Guide to Backpacking
 #: lang/json/GENERIC_from_json.py
@@ -46118,7 +47584,7 @@ msgstr "バックパッカーとして活動する際の持ち物、ではなく
 #: lang/json/GENERIC_from_json.py
 msgid "Pyromancy for Heretics"
 msgid_plural "Pyromancy for Hereticss"
-msgstr[0] "本(呪文/異端者のための炎術)"
+msgstr[0] "呪文書(異端者のための炎術)"
 
 #. ~ Description for Pyromancy for Heretics
 #: lang/json/GENERIC_from_json.py
@@ -46129,7 +47595,7 @@ msgstr "焼け残った本の中には、ものを燃やし尽くす様々な方
 #: lang/json/GENERIC_from_json.py
 msgid "A Treatise on Magical Elements"
 msgid_plural "A Treatise on Magical Elementss"
-msgstr[0] "本(呪文/魔法の諸要素に関する一考察)"
+msgstr[0] "呪文書(魔法の諸要素に関する一考察)"
 
 #. ~ Description for A Treatise on Magical Elements
 #: lang/json/GENERIC_from_json.py
@@ -46141,7 +47607,7 @@ msgstr "様々な呪文を示す複雑な図形、儀式、身振りなどを詳
 #: lang/json/GENERIC_from_json.py
 msgid "Introduction to the Divine"
 msgid_plural "Introduction to the Divines"
-msgstr[0] "本(呪文/聖職者入門)"
+msgstr[0] "呪文書(聖職者入門)"
 
 #. ~ Description for Introduction to the Divine
 #: lang/json/GENERIC_from_json.py
@@ -46153,7 +47619,7 @@ msgstr "文章のほとんどが宗教的なものですが、治癒に関する
 #: lang/json/GENERIC_from_json.py
 msgid "The Paladin's Guide to Modern Spellcasting"
 msgid_plural "The Paladin's Guide to Modern Spellcastings"
-msgstr[0] "本(呪文/聖騎士現代呪文集)"
+msgstr[0] "呪文書(聖騎士現代呪文集)"
 
 #. ~ Description for The Paladin's Guide to Modern Spellcasting
 #: lang/json/GENERIC_from_json.py
@@ -46165,7 +47631,7 @@ msgstr "「現代」というタイトルですが、内容は中世英語で書
 #: lang/json/GENERIC_from_json.py
 msgid "Winter's Eternal Grasp"
 msgid_plural "Winter's Eternal Grasps"
-msgstr[0] "本(呪文/永遠なる冬の支配)"
+msgstr[0] "呪文書(永遠なる冬の支配)"
 
 #. ~ Description for Winter's Eternal Grasp
 #: lang/json/GENERIC_from_json.py
@@ -46176,7 +47642,7 @@ msgstr "氷で作られたかのような華奢な本です。触ると寒さす
 #: lang/json/GENERIC_from_json.py
 msgid "The Tome of The Oncoming Storm"
 msgid_plural "The Tome of The Oncoming Storms"
-msgstr[0] "本(呪文/来たるべき嵐の書)"
+msgstr[0] "呪文書(来たるべき嵐の書)"
 
 #. ~ Description for The Tome of The Oncoming Storm
 #: lang/json/GENERIC_from_json.py
@@ -46188,7 +47654,7 @@ msgstr "雷雲と交差する稲妻が表紙に浮き彫りで描かれた大き
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Lightning Storm"
 msgid_plural "Scroll of Lightning Storms"
-msgstr[0] "巻物(ライトニング・ストーム)"
+msgstr[0] "呪文書(ライトニング・ストーム)"
 
 #. ~ Description for Scroll of Lightning Storm
 #: lang/json/GENERIC_from_json.py
@@ -46201,7 +47667,7 @@ msgstr "ストームシェイパー達が「ライトニング・ブラスト」
 #: lang/json/GENERIC_from_json.py
 msgid "Nondescript Spellbook"
 msgid_plural "Nondescript Spellbooks"
-msgstr[0] "本(呪文/名もなき呪文書)"
+msgstr[0] "呪文書(名もなき呪文書)"
 
 #. ~ Description for Nondescript Spellbook
 #: lang/json/GENERIC_from_json.py
@@ -46211,7 +47677,7 @@ msgstr "魔術の初心者によって書かれた、呪文などが載ってい
 #: lang/json/GENERIC_from_json.py
 msgid "The Tome of Flesh"
 msgid_plural "The Tome of Fleshs"
-msgstr[0] "本(呪文/肉の書)"
+msgstr[0] "呪文書(肉の書)"
 
 #. ~ Description for The Tome of Flesh
 #: lang/json/GENERIC_from_json.py
@@ -46221,7 +47687,7 @@ msgstr "小さな書物です。表紙が鞣した人間の皮膚で覆われて
 #: lang/json/GENERIC_from_json.py
 msgid "The Book of Trees"
 msgid_plural "The Book of Treess"
-msgstr[0] "本(呪文/木々の書)"
+msgstr[0] "呪文書(木々の書)"
 
 #. ~ Description for The Book of Trees
 #: lang/json/GENERIC_from_json.py
@@ -46231,7 +47697,7 @@ msgstr "表紙が樹皮で覆われた書物です。"
 #: lang/json/GENERIC_from_json.py
 msgid "The Utility of Mana as an Energy Source"
 msgid_plural "The Utility of Mana as an Energy Sources"
-msgstr[0] "本(呪文/エネルギー源としてのマナの効用)"
+msgstr[0] "呪文書(エネルギー源としてのマナの効用)"
 
 #. ~ Description for The Utility of Mana as an Energy Source
 #: lang/json/GENERIC_from_json.py
@@ -46243,7 +47709,7 @@ msgstr "体内のマナを使って身体の回復を図る様々な呪文につ
 #: lang/json/GENERIC_from_json.py
 msgid "The Tome of The Battle Mage"
 msgid_plural "The Tome of The Battle Mages"
-msgstr[0] "本(呪文/魔法戦士の書)"
+msgstr[0] "呪文書(魔法戦士の書)"
 
 #. ~ Description for The Tome of The Battle Mage
 #: lang/json/GENERIC_from_json.py
@@ -46255,7 +47721,7 @@ msgstr "まさに魔法といった感じの呪文が多く書かれた、魔法
 #: lang/json/GENERIC_from_json.py
 msgid "The Tome of the Hollow Earth"
 msgid_plural "The Tome of the Hollow Earths"
-msgstr[0] "本(呪文/地球空洞説)"
+msgstr[0] "呪文書(地球空洞説)"
 
 #. ~ Description for The Tome of the Hollow Earth
 #: lang/json/GENERIC_from_json.py
@@ -46267,7 +47733,7 @@ msgstr "この分厚く埃っぽい魔法書は、何と言うか、とにかく
 #: lang/json/GENERIC_from_json.py
 msgid "The Tome of Magical Movement"
 msgid_plural "The Tome of Magical Movements"
-msgstr[0] "本(呪文/魔法の動作)"
+msgstr[0] "呪文書(魔法の動作)"
 
 #. ~ Description for The Tome of Magical Movement
 #: lang/json/GENERIC_from_json.py
@@ -46281,7 +47747,7 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "Smudged Scroll"
 msgid_plural "Smudged Scrolls"
-msgstr[0] "本(呪文/汚れた巻物)"
+msgstr[0] "呪文書(汚れた巻物)"
 
 #. ~ Description for Smudged Scroll
 #: lang/json/GENERIC_from_json.py
@@ -46296,7 +47762,7 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "Necromantic Minions for Dummies"
 msgid_plural "Necromantic Minions for Dummiess"
-msgstr[0] "本(呪文/サルでもわかる死霊召喚)"
+msgstr[0] "呪文書(サルでもわかる死霊召喚)"
 
 #. ~ Description for Necromantic Minions for Dummies
 #: lang/json/GENERIC_from_json.py
@@ -46308,7 +47774,7 @@ msgstr "使用者の命に従い戦う死霊を召喚する呪文について詳
 #: lang/json/GENERIC_from_json.py
 msgid "Fundamentals of Technomancy"
 msgid_plural "Fundamentals of Technomancys"
-msgstr[0] "本(呪文/テクノマンシーの基礎)"
+msgstr[0] "呪文書(テクノマンシーの基礎)"
 
 #. ~ Description for Fundamentals of Technomancy
 #: lang/json/GENERIC_from_json.py
@@ -46320,7 +47786,7 @@ msgstr "様々な形態の物質やエネルギーを操作して力を与える
 #: lang/json/GENERIC_from_json.py
 msgid "Complete Idiot's Guide to Technomancy"
 msgid_plural "Complete Idiot's Guide to Technomancys"
-msgstr[0] "本(呪文/バカでも分かるテクノマンシー)"
+msgstr[0] "呪文書(バカでも分かるテクノマンシー)"
 
 #. ~ Description for Complete Idiot's Guide to Technomancy
 #: lang/json/GENERIC_from_json.py
@@ -46332,7 +47798,7 @@ msgstr "テクノマンシーの分野に明るくない人に向けて書かれ
 #: lang/json/GENERIC_from_json.py
 msgid "Technomancy and the Electromagnetic Spectrum"
 msgid_plural "Technomancy and the Electromagnetic Spectrums"
-msgstr[0] "本(呪文/テクノマンシーと電磁スペクトル)"
+msgstr[0] "呪文書(テクノマンシーと電磁スペクトル)"
 
 #. ~ Description for Technomancy and the Electromagnetic Spectrum
 #: lang/json/GENERIC_from_json.py
@@ -46344,7 +47810,7 @@ msgstr "魔法と電磁波の融合に関する情報がびっしりと載って
 #: lang/json/GENERIC_from_json.py
 msgid "Geospatial Systems: The Lie Of Linearity"
 msgid_plural "Geospatial Systems: The Lie Of Linearitys"
-msgstr[0] "本(呪文/地理空間体系: 線形性の嘘)"
+msgstr[0] "呪文書(地理空間体系: 線形性の嘘)"
 
 #. ~ Description for Geospatial Systems: The Lie Of Linearity
 #: lang/json/GENERIC_from_json.py
@@ -46360,7 +47826,7 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "Transcendence of the Human Condition"
 msgid_plural "Transcendence of the Human Conditions"
-msgstr[0] "本(呪文/人類超越)"
+msgstr[0] "呪文書(人類超越)"
 
 #. ~ Description for Transcendence of the Human Condition
 #: lang/json/GENERIC_from_json.py
@@ -46895,11 +48361,6 @@ msgid ""
 "ornaments."
 msgstr "ミョルニールと呼ばれる雷神トールの戦鎚のレプリカです。一振りで山脈を叩き潰して平野に変えると言われています。金や銀の装飾が施されています。"
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] "グングニル"
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -47774,6 +49235,11 @@ msgstr "化学物質"
 msgid "SPARE PARTS"
 msgstr "予備部品"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "容器"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "アーティファクト"
@@ -47784,6 +49250,308 @@ msgstr "アーティファクト"
 msgid "ARMOR"
 msgstr "防具"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "着用中"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "装備中"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr "分類: 仮置場"
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+"まだ分類していないアイテムを置く区域です。区域作業として「分類」を実行することで内部のアイテムを分類できます。別の分類区域と重複する可能性があります。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr "分類: 食料"
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr "食料を置く区域です。より具体的な食料分類を指定していない場合、全ての食料はここに移動されます。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr "分類: 生鮮食料"
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr "腐敗する食料を置く区域です。他に該当する区域を指定していない場合、生鮮飲料はここに移動されます。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr "分類: 飲料"
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr "飲料を置く区域です。生鮮飲料の区域を指定していない場合、生鮮飲料はここに移動されます。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr "分類: 生鮮飲料"
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr "腐敗する飲料を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr "分類: 容器"
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr "空の容器を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr "分類: 銃器"
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr "銃、弓などの射撃武器を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr "分類: 弾倉"
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr "銃の弾倉を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr "分類: 弾薬"
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr "弾薬を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr "分類: 武器"
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr "近接武器を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr "分類: 道具"
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr "道具を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr "分類: 衣類"
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr "衣類を置く区域です。他に該当する区域を指定していない場合、不潔な衣類はここに移動されます。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr "分類: 不潔な衣類"
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr "不潔な衣類を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr "分類: 薬品"
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr "薬品や衣料品を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr "分類: 本"
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr "本や雑誌を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr "分類: MOD"
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr "銃器用MODなどを置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr "分類: 変異原"
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr "変異原、血清、変異治療薬を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr "分類: CBM"
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr "生体部品、いわゆるCBMを置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr "分類: 車両部品"
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr "車両部品を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr "分類: その他"
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr "その他の雑多なアイテムを置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr "分類: 燃料"
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr "燃料として利用するガソリン、軽油、ランプオイルなどを置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr "分類: 種"
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr "種や茎などを置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr "分類: 化学物質"
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr "化学物質を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr "分類: 予備部品"
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr "予備部品を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr "分類: アーティファクト"
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr "アーティファクトを置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr "分類: 死体"
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr "死体を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr "分類: 防具"
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr "防具を置く区域です。他に該当する区域を指定していない場合、不潔な防具はここに移動されます。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr "分類: 不潔な防具"
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr "不潔な防具を置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr "分類: 木材"
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr "焚き木として利用できるアイテムを置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr "分類: カスタム"
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr "自由に変更できるフィルタを適用したアイテムを置く区域です。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr "分類: 無視"
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr "この区域内のアイテムは区域行動の「分類」時に無視されます。"
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -47995,7 +49763,7 @@ msgstr[0] "乾電池(大)"
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
 msgstr ""
 "様々な種類の工業用機器や大型電動工具に対応した、大型の単電池です。その化学的性質のお陰で非常に高容量ですが、一度使い切ると充電はできません。"
@@ -48352,7 +50120,7 @@ msgstr "弾倉(.308口径/H&K G3/ﾄﾞﾗﾑ)"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
+msgid "A 50-round drum magazine for the H&K G3 rifle."
 msgstr "H&K G3に対応する50発ドラム型弾倉です。"
 
 #: lang/json/MAGAZINE_from_json.py
@@ -48393,7 +50161,7 @@ msgstr "弾倉(.308口径/FN SCAR-H/ﾄﾞﾗﾑ)"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
 msgstr "FN SCAR-Hに対応する50発ドラム型弾倉です。"
 
 #: lang/json/MAGAZINE_from_json.py
@@ -48488,15 +50256,6 @@ msgstr "弾倉(.357口径SIG/P320)"
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr "SIG P320に対応する、14発鋼鉄製ダブルスタック箱型弾倉です。"
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "弾倉(.38口径/ﾀｳﾙｽPro)"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr "タウルスProに対応する小型の鋼鉄製箱型弾倉です。"
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr "スピードローダー(.38口径・.357口径/7発)"
@@ -48572,6 +50331,16 @@ msgstr "ハイポイントCF-380に対応する、8発鋼鉄製箱型弾倉で
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr "ハイポイントCF-380に対応する、10発鋼鉄製箱型弾倉です。"
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr "弾倉(.380口径/ﾀｳﾙｽｽﾍﾟｸﾄﾗﾑ)"
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr "タウルススペクトラムに対応する小型の6発鋼鉄製箱型弾倉です。"
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr "弾倉(.38口径ｽｰﾊﾟｰ/M1911)"
@@ -51310,7 +53079,7 @@ msgstr[0] "マンハック(小型原子爆弾)"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
+"appears to have a mininuke inside.  If this is targeting you…  Run."
 msgstr "4つの回転翼を備えた通常の何倍も大きなマンハックです。小型原子爆弾を内蔵しているようです。もしも運悪く標的にされたなら...逃げましょう。"
 
 #: lang/json/MONSTER_from_json.py
@@ -51796,7 +53565,7 @@ msgstr[0] "ロブスター"
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
+"off in popularity… and price."
 msgstr ""
 "かつては食べる価値もない害虫以下の糞虫と思われていましたが、マーケティングの天才が人々に珍味として紹介するや否や、爆発的な人気を得て、今の地位を得るに至りました。"
 
@@ -51809,8 +53578,8 @@ msgstr[0] "ザリガニ"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
-msgstr "ポットに入った沸騰したお湯と刺激的な調味料を持っていれば..."
+"water, and some spicy seasonings…"
+msgstr "たくさんのザリガニ、沸騰したお湯、そして香辛料があれば..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "Blinky"
@@ -53004,7 +54773,7 @@ msgstr[0] "ドブネズミ"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
+"makes it sound… hungry."
 msgstr "長い髭と輝く目を持った齧歯類です。軋むような鳴き声を上げている時は...お腹を空かせています。"
 
 #: lang/json/MONSTER_from_json.py
@@ -53453,11 +55222,23 @@ msgstr[0] "巨体ブーマー"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
 msgstr ""
 "普通のブーマーは膨れ上がって今にもはちきれそうですが、こいつはより強く、頑丈になっています。その口から垂れる汁もいつものと違うような...。"
 
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] "融合ゾンビ"
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
+msgstr "複数の死体の頭や手足、肥大化した胴体が一つに融合しています。このゾンビがどのように動きどんな能力を持つのか、見当もつきません。"
+
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
 msgid_plural "breathers"
@@ -53504,7 +55285,7 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
 "人間の身体に金属部品とワイヤーが絡み付き融合しています。その目は虚ろですが、時折、異様な人体の不可逆性を思い出したかのように悲痛な表情を浮かべます。十分な外科手術の技術があれば、ある程度人間らしい姿に戻してやることもできます。このサイボーグがそれを望んでいるならの話ですが..."
 
@@ -54260,9 +56041,9 @@ msgstr[0] "シャイア・ラブーフ"
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
 "森の深くに棲み\n"
@@ -54510,7 +56291,7 @@ msgstr[0] "廃棄ゾンビ"
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr "ふらつきながら歩くボロボロの死体です。ゴミや廃材が皮膚に癒着しており、傷口から黒い粘液が染み出しています。"
@@ -54666,9 +56447,9 @@ msgstr[0] "ダンサーゾンビ"
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
@@ -54949,9 +56730,9 @@ msgstr[0] "スリラー"
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
 "And though you fight to stay alive, \n"
@@ -56387,9 +58168,9 @@ msgstr ""
 "このロボットからは何故か死臭が漂っています。"
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
-msgstr[0] "str_pl"
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
+msgstr[0] "ヒツジ型ロボット"
 
 #. ~ Description for {'str': 'animatronic sheep', 'str_pl': 'animatronic
 #. sheep'}
@@ -56948,21 +58729,24 @@ msgid "The black pudding burns you with acid!"
 msgstr "ブラックプディングの酸が身体を焼きました！"
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
-msgstr[0] "ナシック"
+msgid "krabgek"
+msgid_plural "krabgeks"
+msgstr[0] "単眼魔獣"
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
-msgstr "闇の中からこちらを覗く邪悪な瞳は、奇妙な知性と不穏な悪意にきらめいています。"
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
+msgstr ""
+"闇の中からこちらを覗く邪悪な単眼は、奇妙な知性と不穏な悪意にきらめいています。瞳からはピンク色の液体が染み出し、全身が鋭く尖った三角形の青黒い装甲で覆われています。"
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
-msgstr "ナシックは%3$sを凝視しました！"
+msgid "The krabgek gazes at %3$s!"
+msgstr "単眼魔獣は%3$sを凝視しました！"
 
 #: lang/json/MONSTER_from_json.py
 msgid "owlbear cub"
@@ -57006,9 +58790,45 @@ msgstr[0] "トロール"
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
-msgstr "緑色の肌をもつ、奇怪な人型生物です。分厚い皮膚と高い自然治癒力が知られています。"
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
+msgstr "緑色の肌をもつ、奇怪な人型生物です。分厚い皮膚と高い自然治癒力で知られています。"
+
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] "スタージ"
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr "巨大なコウモリと蚊を掛け合わせたような姿の、恐ろしい飛行生物です。"
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] "シュリーカー"
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr "敵を追い払うために鋭い金切り声を発する、人間大のキノコです。"
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] "レムレー"
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
+msgstr "どことなく人間に似た頭部と胴体をもつ、溶けた肉の塊です。"
 
 #: lang/json/MONSTER_from_json.py
 msgid "automated turret"
@@ -58938,8 +60758,8 @@ msgid "Reveals an area around you on the overmap"
 msgstr "周囲の全体マップを明らかにします。"
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
 msgstr "不思議な視界を得て、周辺の地形を広く見渡しました..."
 
 #: lang/json/SPELL_from_json.py
@@ -59145,8 +60965,8 @@ msgstr "アニミスト・ルーン"
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr "儀式によってアニミストと波長の合う神秘的な石を創り出します。石はレシピの触媒として利用できます。"
 
 #: lang/json/SPELL_from_json.py
@@ -59184,7 +61004,7 @@ msgstr "バイオマンサー・ルーン"
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr "儀式によってバイオマンサーと波長の合う神秘的な石を創り出します。石はレシピの触媒として利用できます。"
 
@@ -59233,6 +61053,20 @@ msgstr "トランスロケート・セルフ"
 msgid "Translocates the user to an attuned gate."
 msgstr "使用者を特定の波長を出すゲートへ転移します。"
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr "アシッド・レジスタンス"
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr "酸から身体を守ります。"
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr "グレーター・アシッド・レジスタンス"
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr "呪文テンプレート"
@@ -59282,7 +61116,7 @@ msgstr "スタミナを少し消費します。"
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr "%sは効果がありません。デバッグ警告の可能性があります。"
 
 #: lang/json/SPELL_from_json.py
@@ -59440,7 +61274,7 @@ msgstr "ドルイド・ルーン"
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr "儀式によってドルイドと波長の合う神秘的な石を創り出します。石はレシピの触媒として利用できます。"
 
@@ -59451,8 +61285,8 @@ msgstr "ピュリフィケーション・シード"
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr "浄水効果を持つ種が大地から贈られます。使用しないと種は急速に劣化します。"
 
 #: lang/json/SPELL_from_json.py
@@ -59499,8 +61333,8 @@ msgstr "アースシェイパー・ルーン"
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr "儀式によってアースシェイパーと波長の合う神秘的な石を創り出します。石はレシピの触媒として利用できます。"
 
 #: lang/json/SPELL_from_json.py
@@ -59526,6 +61360,10 @@ msgstr "ラヴァ・ボム・テライン"
 msgid "Lava Bomb"
 msgstr "ラヴァ・ボム"
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr "クレアボイアンス"
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr "ツイステッド・レストレーション"
@@ -59533,7 +61371,7 @@ msgstr "ツイステッド・レストレーション"
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr ""
@@ -59546,9 +61384,9 @@ msgstr "ツイステッド・レストレーション改"
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr ""
 "脈拍を加速させ、筋肉を増強します。危険が迫っている状況で詠唱するのは賢明ではありませんし、体調が万全でないと致命的な状態になる場合があります。薬の抽出方法を改良し、悪影響を緩和しました。"
 
@@ -59622,7 +61460,7 @@ msgstr "ケルビニスト・ルーン"
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr "儀式によってケルビニストと波長の合う神秘的な石を創り出します。石はレシピの触媒として利用できます。"
 
@@ -59665,8 +61503,8 @@ msgstr "メイガス・ルーン"
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr "儀式によって魔法使いと波長の合う神秘的な石を創り出します。石はレシピの触媒として利用できます。"
 
 #: lang/json/SPELL_from_json.py lang/json/effects_from_json.py
@@ -59685,6 +61523,15 @@ msgstr "オーガズ・ストレングス"
 msgid "Fox's Cunning"
 msgstr "フォックセズ・カンニング"
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr "ブラッド・サック"
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr "標的一体から敵を吸い取ります。"
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr "ジョルト"
@@ -59724,8 +61571,8 @@ msgstr "ストームシェイパー・ルーン"
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr "儀式によってストームシェイパーと波長の合う神秘的な石を創り出します。石はレシピの触媒として利用できます。"
 
 #: lang/json/SPELL_from_json.py
@@ -59786,8 +61633,8 @@ msgstr "テクノマンサー・ルーン"
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr "儀式によってテクノマンサーと波長の合う神秘的な石を創り出します。石はレシピの触媒として利用できます。"
 
 #: lang/json/SPELL_from_json.py
@@ -59814,6 +61661,10 @@ msgstr "アニメイテッド・ブレード"
 msgid "Mirror Image"
 msgstr "ミラー・イメージ"
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr "エックスレイ・ビジョン"
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr "デーモン・ファイアボール"
@@ -60070,7 +61921,7 @@ msgstr "山高め、つば広めの黒い中折れ帽です。つばが直射日
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "pair of thermal electric socks"
 msgid_plural "pairs of thermal electric socks"
-msgstr[0] "温熱式靴下"
+msgstr[0] "電熱靴下"
 
 #. ~ Use action msg for pair of thermal electric socks.
 #. ~ Use action msg for thermal electric suit.
@@ -60112,7 +61963,7 @@ msgstr "電池式の保温機構が組み込まれた靴下です。使用する
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "pair of thermal electric socks (on)"
 msgid_plural "pairs of thermal electric socks (on)"
-msgstr[0] "温熱式靴下(オン)"
+msgstr[0] "電熱靴下(オン)"
 
 #. ~ Use action msg for pair of thermal electric socks (on).
 #. ~ Use action msg for thermal electric suit (on).
@@ -60141,7 +61992,7 @@ msgstr "電池式の保温機構が組み込まれた靴下です。スイッチ
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "thermal electric suit"
 msgid_plural "thermal electric suits"
-msgstr[0] "温熱式スーツ"
+msgstr[0] "電熱スーツ"
 
 #. ~ Description for thermal electric suit
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -60153,7 +62004,7 @@ msgstr "電池式の保温機構が組み込まれたスーツ型全身下着で
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "thermal electric suit (on)"
 msgid_plural "thermal electric suits (on)"
-msgstr[0] "温熱式スーツ(オン)"
+msgstr[0] "電熱スーツ(オン)"
 
 #. ~ Description for thermal electric suit (on)
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -60166,7 +62017,7 @@ msgstr "電池式の保温機構が組み込まれたスーツ型全身下着で
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "pair of thermal electric gloves"
 msgid_plural "pairs of thermal electric gloves"
-msgstr[0] "温熱式グローブ"
+msgstr[0] "電熱グローブ"
 
 #. ~ Description for pair of thermal electric gloves
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -60178,7 +62029,7 @@ msgstr "電池式の保温機構が組み込まれた手袋です。使用する
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "pair of thermal electric gloves (on)"
 msgid_plural "pairs of thermal electric gloves (on)"
-msgstr[0] "温熱式グローブ(オン)"
+msgstr[0] "電熱グローブ(オン)"
 
 #. ~ Description for pair of thermal electric gloves (on)
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -60191,7 +62042,7 @@ msgstr "電池式の保温機構が組み込まれた手袋です。スイッチ
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "thermal electric balaclava"
 msgid_plural "thermal electric balaclavas"
-msgstr[0] "温熱式バラクラバ"
+msgstr[0] "電熱バラクラバ"
 
 #. ~ Description for thermal electric balaclava
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -60203,7 +62054,7 @@ msgstr "電池式の保温機構が組み込まれたフィット感抜群の布
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "thermal electric balaclava (on)"
 msgid_plural "thermal electric balaclavas (on)"
-msgstr[0] "温熱式バラクラバ(オン)"
+msgstr[0] "電熱バラクラバ(オン)"
 
 #. ~ Description for thermal electric balaclava (on)
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -60304,6 +62155,46 @@ msgid ""
 msgstr ""
 "より頑丈で、より明るく、より大容量かつ高効率な電源設計を備えた改良型の手製ヘッドランプです。頭やヘルメットに合わせて長さを調節できる留め紐が付いています。電源が入っており、電池を消費しています。使用すると電源を切ります。"
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] "アトミックヘッドランプ"
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr "ヘッドランプのカバーを閉じました。"
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+"より使いやすく明るい光をもたらす、魔法のような核崩壊の力を使った特製の強化ヘッドランプです。頭やヘルメットに合わせて長さを調節できる留め紐が付いています。使用するとカバーを閉じて光を遮ります。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] "アトミックヘッドランプ(閉)"
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr "ヘッドランプのカバーを開きました。"
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+"より使いやすく明るい光をもたらす、魔法のような核崩壊の力を使った特製の強化ヘッドランプです。頭やヘルメットに合わせて長さを調節できる留め紐が付いています。使用するとカバーを開けて周囲を照らします。"
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -60382,8 +62273,8 @@ msgstr[0] "次元潜入スーツ"
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
 "起動中\n"
@@ -60804,14 +62695,14 @@ msgstr "最先端の素材で作られたブランケットです。体の重要
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "radiation biomonitor"
 msgid_plural "radiation biomonitors"
-msgstr[0] "放射線生体モニター"
+msgstr[0] "生体放射線量モニター"
 
 #. ~ Description for radiation biomonitor
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
 "A small battery-powered biometric safety device worn on the wrist.  Activate"
 " to check your current level of radiation exposure."
-msgstr "電池で作動する小型の整体安全装置の一種です。手首に装着します。電源を入れると被ばく中の放射線レベルを測定します。"
+msgstr "手首に装着する、小型の電池式生体放射線量モニターです。使用すると電源を入れて現在の放射線被曝レベルを測定します。"
 
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "hairpin"
@@ -61144,7 +63035,7 @@ msgstr ""
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "thermal electric outfit"
 msgid_plural "thermal electric outfits"
-msgstr[0] "温熱式アウトフィット(オフ)"
+msgstr[0] "電熱アウトフィット(オフ)"
 
 #. ~ Description for thermal electric outfit
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -61157,7 +63048,7 @@ msgstr "電池式の保温機構が組み込まれた、頭頂からつま先ま
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "thermal electric outfit (on)"
 msgid_plural "thermal electric outfits (on)"
-msgstr[0] "温熱式アウトフィット(オン)"
+msgstr[0] "電熱アウトフィット(オン)"
 
 #. ~ Description for thermal electric outfit (on)
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -61312,11 +63203,12 @@ msgstr "射撃用イヤーマフの電池が切れました。"
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
 msgstr ""
-"多くのシューターが愛用するイヤーマフです。外から入ってくる音の大きさを適切なレベルに軽減してくれます。電池を消費します。電源は入っていません。"
+"射撃選手が愛用するイヤーマフです。電池がない、または電源を切った状態で着用すると、通常の耳栓のようにすべての音を遮音します。電源を入れて着用すると、特定のデシベル以上の音を遮音します。現在電源は入っていません。"
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -61750,6 +63642,199 @@ msgid ""
 msgstr ""
 "C.R.I.Tの標準装備のヘルメットです。頭部を保護し、首は保温と保護のために絶縁された伸縮する鋼鉄メッシュで覆われています。側面に薄暗い懐中電灯が内蔵されています。ライトは現在点灯しており、電力を消費しています。"
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] "魔法のレザーベルト"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] "速度のベルト"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] "メギンギョルズ"
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr "雷の神トールが身に着けていた魔法の帯、またはそのレプリカです。着用者の基礎筋力が2倍になります。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] "魔法の腰袋"
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr "腰に巻き付ける幅の広い帯です。収納した物の重量が大幅に軽減される小さな袋が多数付いています。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] "魔法の大容量腰袋"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] "抜刀のベルト"
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr "腰に巻き付ける幅の広い帯です。付属している鞘に武器を入れるとどこか他の次元に転送して保管されるようで、瞬く間に武器を収納/装備できます。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] "鉄鞭ベルト"
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr "ベルトを手に取ると、自在に曲がる金属製の鞭に変化しました！"
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr "一見すると金属製の紐を編んで作った柔軟なベルトです。使用すると敵を打ち据える鞭に変化します。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] "転移のブーツ"
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr ""
+"古くから使われ続けてきたように見える、すり減った革と鋼鉄で作られた、丈夫で履き心地も非常に快適なブーツです。使用するとランダムな方向に転移し、厄介な状況から逃走できます。1日1回しか使用できません。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] "鋼鉄の篭手"
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr "腕部を保護する中世の防具です。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] "鋼鉄の篭手(片手)"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] "防御の篭手"
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr "表面に施された銀細工の美しい紋様が目を惹く、軽量ながら非常に頑丈な鋼鉄製の篭手です。受けるダメージを軽減し、身体を保護します。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] "鉄壁の篭手"
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr "表面に施された金細工の美しい紋様が目を惹く、軽量ながら非常に頑丈な鋼鉄製の篭手です。受けるダメージを大幅に軽減し、身体を保護します。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] "電光の篭手"
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+"表面に施された銀細工の美しい稲妻模様が目を惹く、軽量ながら非常に頑丈な鋼鉄製の篭手です。オーラで全身を包み、電撃によるダメージを軽減します。1日に3回までジョルトの呪文を詠唱できます。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] "雷撃の篭手"
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+"表面に施された金細工の美しい稲妻模様が目を惹く、軽量ながら非常に頑丈な鋼鉄製の篭手です。オーラで全身を包み、電撃によるダメージを大幅に軽減します。1日に3回までライトニング・ボルトの呪文を詠唱できます。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] "魔法の仮面"
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr "一般的な魔法の仮面です。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] "消失の仮面"
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr "表面に何も描かれていない、目と口の部分に穴が開いただけの仮面です。使用するとあらゆるものから存在を無視されます。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] "慧眼の仮面"
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr "目の部分だけを覆うスチームパンク的なデザインの仮面です。目元には大きなレンズが付いており、着用者の視力を補正して大幅に向上させます。"
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -62066,9 +64151,9 @@ msgstr[0] "ベータボルタ電池"
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
 "放射線の力をあなたのお宅にも！単一電池に似た外見ですが、中には層状に折り畳まれた放射性物質が入っています。安定した電圧で数年は発電できる性能ですが...小さなLED電球を光らせるのがやっとであり、しかも価格は数百ドルでした。有効な使い方といえば、自宅に原子力発電所があることをお隣さんに自慢するくらいでしょうか。"
@@ -62189,8 +64274,8 @@ msgstr[0] "透視の杖"
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr "aep_clairvoyance_plusフラグのテストアイテムです。通常のプレイで自然生成された場合はバグが発生しています。"
 
 #: lang/json/TOOL_from_json.py
@@ -62485,7 +64570,7 @@ msgstr "%sの導火線に点火しました。"
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr ""
@@ -62506,8 +64591,8 @@ msgstr "既に点火されています。何をぐずぐずしているんです
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr "爆発物と釘の入った容器に導火線を付けただけの、大きな即席爆弾です。導火線には既に火がついるので、投げた方が良さそうです。"
 
 #: lang/json/TOOL_from_json.py
@@ -62518,7 +64603,7 @@ msgstr[0] "破片爆弾"
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
@@ -62533,8 +64618,8 @@ msgstr[0] "破片爆弾(点火)"
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr "爆発物と金属片の入った容器に導火線を付けただけの、大きな即席爆弾です。導火線には既に火がついるので、投げた方が良さそうです。"
 
@@ -62553,8 +64638,8 @@ msgstr "缶爆弾の導火線に点火しました。顔が吹っ飛ぶ前に早
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr "爆発物で満たされたブリキ缶から導火線が突き出しています。爆発すれば装甲に対しても効果的な金属片をまき散らす...かもしれません。"
 
 #: lang/json/TOOL_from_json.py
@@ -62566,8 +64651,8 @@ msgstr[0] "缶爆弾(点火)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
 "爆発物で満たされたブリキ缶から導火線が突き出しています。爆発すれば装甲に対しても効果的な金属片をまき散らす...かもしれません。導火線には火がついています。投げましょう。"
 
@@ -62578,9 +64663,9 @@ msgstr[0] "ジャック・オ・ランタン"
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "点火する"
 
@@ -62597,7 +64682,7 @@ msgid ""
 "doesn't provide very much light, but it can burn for quite a long time.  "
 "You'll need a lighter or matches to light it."
 msgstr ""
-"顔が描かれたカボチャのようなデザインの、プラスチック製ランタンです。内部に蝋燭が入っており、燃え尽きても交換できます。光は弱いですが、とても長持ちします。着火にはライターやマッチが必要です。"
+"顔が描かれたカボチャのようなデザインの、プラスチック製ランタンです。内部にろうそくが入っており、燃え尽きても交換できます。光は弱いですが、とても長持ちします。着火にはライターやマッチが必要です。"
 
 #: lang/json/TOOL_from_json.py
 msgid "spooky jack o'lantern"
@@ -62607,15 +64692,15 @@ msgstr[0] "ジャック・オ・ランタン(点火)"
 #. ~ Use action msg for spooky jack o'lantern.
 #: lang/json/TOOL_from_json.py
 msgid "The candle winks out inside the lantern."
-msgstr "ランタンの中の蝋燭の火がふっと消えました。"
+msgstr "ランタンの中のろうそくの火がふっと消えました。"
 
 #. ~ Description for spooky jack o'lantern
 #: lang/json/TOOL_from_json.py
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
-msgstr "カボチャのランタンの中で蝋燭が揺らめき、不気味な顔が浮かび上がっています。光は弱いですが、とても長持ちします。"
+"  The face shifts."
+msgstr "カボチャのランタンの中でろうそくが揺らめき、不気味な顔が浮かび上がっています。光は弱いですが、とても長持ちします。"
 
 #. ~ Description for battle axe
 #: lang/json/TOOL_from_json.py
@@ -62747,6 +64832,26 @@ msgid ""
 "fuse stuck inside of it."
 msgstr "黒色火薬で満たされたブリキ缶から火のついた導火線が突き出しています。"
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] "ホーボーストーブ(点火)"
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "火口が燃え尽きました。"
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr "金属の缶等から作った、木を燃料とするストーブです。簡単な火口を使って点火し、食品の解凍や加熱ができます。"
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -62802,7 +64907,7 @@ msgstr[0] "鞍"
 msgid ""
 "A saddle that can be placed on a tamed animal that is capable of being "
 "ridden."
-msgstr "騎乗に適した飼い慣らされた動物に装着できる鞍です。"
+msgstr "騎乗に適した飼い慣らされた動物に装着できる鞍(くら)です。"
 
 #: lang/json/TOOL_from_json.py
 msgid "active EMP grenade"
@@ -62965,8 +65070,8 @@ msgstr[0] "水車"
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
 msgstr "でんぷん質を含むアイテムを穀粉に加工する小型の水車です。建設メニューから設置できます。"
 
 #: lang/json/TOOL_from_json.py lang/json/furniture_from_json.py
@@ -62977,8 +65082,8 @@ msgstr[0] "風車"
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
 msgstr "でんぷん質を含むアイテムを穀粉に加工する小型の風車です。建設メニューから設置できます。"
 
 #: lang/json/TOOL_from_json.py
@@ -63110,14 +65215,14 @@ msgstr "繋がれた紐が引っ張られると起爆する爆発物です。設
 #: lang/json/TOOL_from_json.py
 msgid "brick kiln"
 msgid_plural "brick kilns"
-msgstr[0] "煉瓦窯"
+msgstr[0] "レンガ窯"
 
 #. ~ Description for brick kiln
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a portable charcoal-fired kiln.  It is designed for firing bricks, "
 "but you could use it to fire anything made of clay."
-msgstr "炭を燃やして使う携帯型の窯です。煉瓦を焼成するためのものですが、粘土で作ったものを焼くこともできます。"
+msgstr "炭を燃やして使う携帯型の窯です。レンガを焼成するためのものですが、粘土で作ったものを焼くこともできます。"
 
 #: lang/json/TOOL_from_json.py
 msgid "electric kiln"
@@ -63255,31 +65360,31 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "candle"
 msgid_plural "candles"
-msgstr[0] "蝋燭"
+msgstr[0] "ろうそく"
 
 #. ~ Use action msg for candle.
 #: lang/json/TOOL_from_json.py
 msgid "You light the candle."
-msgstr "蝋燭に火をつけました。"
+msgstr "ろうそくに火をつけました。"
 
 #. ~ Description for candle
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a thick candle.  It doesn't provide very much light, but it can burn"
 " for quite a long time.  You'll need a lighter or matches to light it."
-msgstr "太い蝋燭です。光は弱いですが、とても長持ちします。着火にはライターやマッチが必要です。"
+msgstr "太いろうそくです。光は弱いですが、とても長持ちします。着火にはライターやマッチが必要です。"
 
 #. ~ Use action msg for candle.
 #: lang/json/TOOL_from_json.py
 msgid "The candle winks out."
-msgstr "蝋燭の火がふっと消えました。"
+msgstr "ろうそくの火がふっと消えました。"
 
 #. ~ Description for candle
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a thick candle.  It doesn't provide very much light, but it can burn"
 " for quite a long time.  This candle is lit."
-msgstr "太い蝋燭です。光は弱いですが、とても長持ちします。火がついています。"
+msgstr "太いろうそくです。光は弱いですが、とても長持ちします。火がついています。"
 
 #: lang/json/TOOL_from_json.py
 msgid "goo canister"
@@ -63303,7 +65408,7 @@ msgstr[0] "電動ナイフ(オフ)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
 msgstr ""
 "電池駆動式の電導肉切りナイフです。2つののこぎり状の刃が同時に振動することで、大抵の物は七面鳥をハムにするときのようにスライスできます......もちろんゾンビでさえも。"
@@ -63468,11 +65573,11 @@ msgstr[0] "ライフストロー"
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr ""
-"清潔かどうか分からない水に一端を漬けてしばらく待てば、二層式のろ過システムによって浄水された状態で飲むことができます。川などの飲料に適さない水源から水を採取する時に役に立ちます。"
+"清潔かどうか判別できない水に一端を漬けてしばらく待てば、二層式のろ過システムによって浄水された状態で飲むことができます。川などの飲料に適さない水源から水を採取する時に役に立ちます。"
 
 #: lang/json/TOOL_from_json.py
 msgid "charcoal smoker"
@@ -63892,11 +65997,10 @@ msgstr[0] "電子手錠"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-"両手の自由を奪う電子制御式の手錠です。警察官や暴動制御ロボットが、取り押さえた容疑者に使います。鳴り続けるサイレン音は手錠の装着者(あなたですよ)が逮捕された犯罪者であることを周囲に知らせ、人間の警察官を呼び寄せます。逃走や解除を試みるべきではありません"
-" - "
-"法の下に電気ショックが執行されます。とはいえ、ゾンビとなった警察官が駆け付けて職務を全うするにはかなりの時間が必要です。待つもよし、ちょいと工夫をするもよし..."
+"両手の自由を奪う電子制御式の手錠です。警察官や暴動制御ロボットが、取り押さえた容疑者に使います。鳴り続けるサイレン音は手錠の装着者が逮捕された犯罪者であることを周囲に知らせ、人間の警察官を呼び寄せます。逃走や解除を試みるべきではありません。法の下に電気ショックが執行されます。\n"
+"とはいえ、ゾンビとなった警察官が駆け付けて職務を全うするにはかなりの時間が必要です。待つもよし、ちょいと細工をするもよし..."
 
 #: lang/json/TOOL_from_json.py
 msgid "entrenching tool"
@@ -64155,19 +66259,19 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "basic fishing rod"
 msgid_plural "basic fishing rods"
-msgstr[0] "簡易釣竿"
+msgstr[0] "簡易釣り竿"
 
 #. ~ Description for basic fishing rod
 #: lang/json/TOOL_from_json.py
 msgid ""
 "'Fishing rod' might be a bit too charitable of a description.  In truth, "
 "this is a stick with a piece of string and a hook."
-msgstr "これを'釣竿'と呼べるのかな。実際は木の棒に糸と釣り針が取り付けてあるだけの代物だよ。"
+msgstr "これを'釣り竿'と呼べるのかな。実際は木の棒に糸と釣り針が取り付けてあるだけの代物だよ。"
 
 #: lang/json/TOOL_from_json.py
 msgid "pro fishing rod"
 msgid_plural "pro fishing rods"
-msgstr[0] "釣竿"
+msgstr[0] "釣り竿"
 
 #. ~ Description for pro fishing rod
 #: lang/json/TOOL_from_json.py
@@ -64602,14 +66706,14 @@ msgstr "スポーツ傷害の手当や食べ物を温めるために用いる、
 #: lang/json/TOOL_from_json.py
 msgid "hoe"
 msgid_plural "hoes"
-msgstr[0] "鍬"
+msgstr[0] "くわ"
 
 #. ~ Description for hoe
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a farming implement.  You can use it to turn tillable land into a "
 "slow-to-cross pile of dirt, or dig a shallow pit."
-msgstr "鍬(くわ)。農作業用の道具です。使用すると地面を耕して、歩き辛い耕作地や浅い穴を作り出します。"
+msgstr "農作業用の道具です。使用すると地面を耕して、歩き辛い耕作地や浅い穴を作り出します。"
 
 #: lang/json/TOOL_from_json.py
 msgid "honey scraper"
@@ -65414,7 +67518,7 @@ msgstr "刷毛(はけ)。壁面を塗装するのに適した幅広のブラシ
 #: lang/json/TOOL_from_json.py
 msgid "permanent marker"
 msgid_plural "permanent markers"
-msgstr[0] "ペンキ"
+msgstr[0] "油性ペン"
 
 #. ~ Use action gerund for permanent marker.
 #. ~ Use action gerund for survival marker.
@@ -65435,7 +67539,7 @@ msgid ""
 "between a typical marker and a can of spray paint in size.  Use it to write "
 "something down.  However, writing \"Elbereth\" probably won't help you."
 msgstr ""
-"大容量の業務用ペンキです。色の落ちにくさはマーカーペンとスプレー缶の中間ぐらいです。一般的な落書きが出来ます。'Elbereth'と書いても気休めにもならないですよ。"
+"大容量の業務用油性ペンです。サイズは一般的なペンとスプレー缶の中間ぐらいです。使用すると書き込みができます。'Elbereth'と書いても気休めにもならないですよ。"
 
 #: lang/json/TOOL_from_json.py
 msgid "pet carrier"
@@ -65601,7 +67705,7 @@ msgid ""
 "hand from a couple of aluminum soda cans.  It comes with a 500 ml plastic "
 "bottle to hold concentrated alcohol fuel."
 msgstr ""
-"2個のアルミニウム製のソーダ缶に細工を施して作ったシマーリングと超軽量のアルコールストーブです。濃縮アルコール燃料の保持用として500mlのペットボトルが付いています。"
+"2個のアルミニウム製のソーダ缶を加工して作った、超軽量のアルコールストーブと火力調整リングのセットです。濃縮アルコール燃料500mlを保存できるペットボトルが付属しています。"
 
 #: lang/json/TOOL_from_json.py
 msgid "handheld game system"
@@ -65637,7 +67741,7 @@ msgstr[0] "釿(石)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a stone adze, somewhat useful for cutting through wood objects."
-msgstr "石の釿(ちょうな)です。農作業に使う鍬のような形をした工具で、木材や木製品の成形加工に使います。"
+msgstr "石の釿(ちょうな)です。農作業に使うくわのような形をした工具で、木材や木製品の成形加工に使います。"
 
 #: lang/json/TOOL_from_json.py
 msgid "stone axe"
@@ -65718,8 +67822,8 @@ msgstr[0] "スポンジ"
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
 msgstr "掃除に役立つ、柔らかくて多孔質の素材でできた道具です。普通は水を通さない物体の表面を洗浄するのに使われます。"
 
 #: lang/json/TOOL_from_json.py
@@ -66593,9 +68697,9 @@ msgstr "黒色火薬爆弾の導火線に火をつけました。早く逃げま
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr ""
-"長い導火線がついた大きなプラスチック製容器に、黒色火薬と金属屑を詰めた、自家製爆弾です。使用して導火線に点火します。あと数分で爆発するでしょう..."
+"長い導火線がついた大きなプラスチック製容器に、黒色火薬と金属片を詰めた、自家製爆弾です。使用して導火線に点火します。あと数分で爆発するでしょう..."
 
 #: lang/json/TOOL_from_json.py
 msgid "active black gunpowder charge"
@@ -66802,7 +68906,7 @@ msgid ""
 "purpose is to trip up bypassers, causing them to stumble and possibly hurt "
 "themselves slightly."
 msgstr ""
-"両端に取り付け具の付いた細くて丈夫なケーブルです。仕掛け線は玄関や狭い通路などに設置しなければなりません。この罠は通過者を躓かせる事が目的でしが、軽い怪我を与えられる可能性もあります。"
+"両端に取り付け具の付いた細くて丈夫なケーブルです。仕掛け線は玄関や狭い通路などに設置しなければなりません。この罠は通過者を躓かせる事が目的ですが、軽い怪我を与えられる可能性もあります。"
 
 #: lang/json/TOOL_from_json.py
 msgid "trumpet"
@@ -67097,36 +69201,6 @@ msgid "hobo stove"
 msgid_plural "hobo stoves"
 msgstr[0] "ホーボーストーブ"
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr "ホーボーストーブを点火しました。"
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "火種が必要です！"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr "金属の缶等から作った、木を燃料とするストーブです。簡単な火口を使って点火し、食品の解凍や加熱ができます。"
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] "ホーボーストーブ(点火)"
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "火口が燃え尽きました。"
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -67173,28 +69247,28 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "pallet of wet adobe bricks"
 msgid_plural "pallets of wet adobe bricks"
-msgstr[0] "日干し煉瓦パレット(未乾燥)"
+msgstr[0] "日干しレンガパレット(未乾燥)"
 
 #. ~ Use action msg for pallet of wet adobe bricks.
 #: lang/json/TOOL_from_json.py
 msgid "You test the bricks, and they're solid enough to use."
-msgstr "煉瓦を確認すると、十分に硬くなっているようです。"
+msgstr "レンガを確認すると、十分に硬くなっているようです。"
 
 #. ~ Use action not_ready_msg for pallet of wet adobe bricks.
 #: lang/json/TOOL_from_json.py
 msgid "The bricks are still too damp to bear weight."
-msgstr "煉瓦はまだ湿っており、耐久性が不十分です。"
+msgstr "レンガはまだ湿っており、耐久性が不十分です。"
 
 #. ~ Description for pallet of wet adobe bricks
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pallet full of heavy mud bricks which need to dry slowly to be usable."
-msgstr "泥製の重い煉瓦を満載したパレットです。使える状態になるまでゆっくり乾かす必要があります。"
+msgstr "泥製の重いレンガを満載したパレットです。使える状態になるまでゆっくり乾かす必要があります。"
 
 #: lang/json/TOOL_from_json.py
 msgid "pallet of dry adobe bricks"
 msgid_plural "pallets of dry adobe bricks"
-msgstr[0] "日干し煉瓦パレット"
+msgstr[0] "日干しレンガパレット"
 
 #. ~ Description for pallet of dry adobe bricks
 #: lang/json/TOOL_from_json.py
@@ -67203,7 +69277,7 @@ msgid ""
 " risking your life.  Disassemble it to retrieve your frame and building "
 "supplies."
 msgstr ""
-"パレットに満載された質素な泥製の煉瓦です。人間が命を危険に晒している間に、一週間かけてじっくり乾燥していました。分解するとパレットと煉瓦を入手できます。"
+"パレットに満載された質素な泥製のレンガです。人間が命を危険に晒している間に、一週間かけてじっくり乾燥していました。分解するとパレットとレンガを入手できます。"
 
 #: lang/json/TOOL_from_json.py
 msgid "bronze anvil"
@@ -67297,8 +69371,8 @@ msgstr[0] "食肉用フック"
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
 msgstr "円形の持ち手が付いた、シンプルな鋼鉄製の食肉用フックです。近接武器としてそれなりに利用できます。"
 
 #: lang/json/TOOL_from_json.py
@@ -67633,7 +69707,7 @@ msgstr "警備ロボットのプログラミングに間違いがあったよう
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -67651,7 +69725,7 @@ msgstr[0] "無人戦闘車(M202A1/停止)"
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -67740,9 +69814,9 @@ msgstr "壊れたサイボーグは苦しみに満ちた雄叫びを上げ、襲
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
 "最後に残った人間性の欠片も失いかけている、停止状態の壊れたサイボーグです。使用すると起動して活動を開始します。起動時のプログラムの書き換えと配線に成功すると、使用者を味方として認識して追従し、敵を攻撃します。これはとても非人道的な行為です。"
 
@@ -67794,7 +69868,7 @@ msgstr "チキンウォーカーは唸るような音を発し、こちらに狙
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -67823,8 +69897,8 @@ msgstr "警官ロボットはサイレンと回転灯を起動し、こちらを
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
@@ -67850,7 +69924,7 @@ msgstr "監視ロボットは不承認を示す音を鳴らし、こちらにレ
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
 msgstr "停止状態の監視ロボットです。使用すると起動して飛行を開始します。起動時のプログラムの書き換えと配線に成功すると、侵入者の監視を開始します。"
@@ -67873,8 +69947,8 @@ msgstr "掃除ロボットはエラー音を発しましたが、それはとも
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
 msgstr ""
 "停止状態の掃除ロボットです。使用すると起動して活動を開始します。起動時のプログラムの書き換えと配線に成功すると、操作を受け付けるようになります。"
@@ -67897,8 +69971,8 @@ msgstr "採掘ロボットは暴走し、こちらに突進してきます。避
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
 msgstr ""
 "停止状態の採掘ロボットです。使用すると起動して活動を開始します。起動時のプログラムの書き換えと配線に成功すると、操作を受け付けるようになります。"
@@ -67922,9 +69996,9 @@ msgstr "暴動鎮圧ロボットはこちらにガスを吹きかけ、手錠を
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
 msgstr ""
 "停止状態の暴動鎮圧ロボットです。使用すると起動して活動を開始します。起動時のプログラムの書き換えと配線に成功すると、暴徒に秩序と平和をもたらします。"
 
@@ -67946,7 +70020,7 @@ msgstr "高速ボットはテーザー銃を威嚇的にこちらに向け、突
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
 msgstr ""
@@ -68000,7 +70074,7 @@ msgstr "無人戦車は砲塔を回転させてこちらに向けました。茶
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -68030,8 +70104,8 @@ msgstr "三脚ロボットはこちらに照準を合わせ、火炎放射器に
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
@@ -68057,10 +70131,10 @@ msgstr "探照灯が反抗的に光り輝き、目をくらませました。"
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
 "停止状態の軍用自動探照灯です。使用すると起動して活動を開始します。起動時のプログラムの書き換えと配線に成功すると、使用者を味方として認識して周囲の敵を照らしますが、敵の注目を集めてしまう可能性があります。"
@@ -68382,7 +70456,7 @@ msgstr[0] "簡易戦闘用大鎌"
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
+"of a stick.  However it's quite fragile."
 msgstr ""
 "戦闘用に改造した鎌です。刃の角度を90度回転させることで、農具が棒に括りつけた威力の高い巨大な刃に変貌しました。若干壊れやすいのが難点です。"
 
@@ -68479,6 +70553,21 @@ msgid ""
 " be deadly in either the right hands or when attached as a bayonet."
 msgstr "戦闘時に使う軍用ナイフです。軽量で非常に鋭く、手に持って使っても銃剣として取り付けても、致命傷を与えられるでしょう。"
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] "改造コンバットナイフ"
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+"戦闘時に使う軍用ナイフです。軽量で非常に鋭く、手に持って使っても銃剣として取り付けても、致命傷を与えられるでしょう。ハンドガン以外のほぼすべての銃器に取り付けられるように改造してあります。"
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -68793,6 +70882,21 @@ msgid ""
 " of a firearm or crossbow converting it into a pike."
 msgstr "銃器やクロスボウの先端に取り付けて槍のように扱うこともできる、大型の斬撃武器です。"
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] "改造長銃剣"
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+"銃器やクロスボウの先端に取り付けて槍のように扱うこともできる、大型の斬撃武器です。ハンドガンとサブマシンガン以外のほぼすべての銃器に取り付けられるように改造してあります。"
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -68894,6 +70998,57 @@ msgid ""
 "light for its size."
 msgstr "日本伝来の大型で反りのある両手持ちの刀です。大きさの割には軽量です。"
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] "電撃フルーレ"
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+"このフルーレにはスポーツに相応しくない改造が施されていますが、生存競争で上位を目指すなら使って損はありません。グリップは絶縁素材になっており、ガードに取り付けた高電圧スタンガンは電気センサーの回路を通じて剣先まで通電するようになっています。鋭い剣を敵に突き刺しながらスイッチを押すと、痛みを伴う電撃を浴びせられます。"
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] "電撃エペ"
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+"このエペにはスポーツに相応しくない改造が施されていますが、生存競争で上位を目指すなら使って損はありません。グリップは絶縁素材になっており、ガードに取り付けた高電圧スタンガンは電気センサーの回路を通じて剣先まで通電するようになっています。鋭い剣を敵に突き刺しながらスイッチを押すと、痛みを伴う電撃を浴びせられます。"
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] "電撃サーブル"
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+"このサーブルにはスポーツに相応しくない改造が施されていますが、生存競争で上位を目指すなら使って損はありません。グリップは絶縁素材になっており、ガードに取り付けた高電圧スタンガンは、剣の溝に通った配線によって剣先まで通電するようになっています。鋭い剣を敵に突き刺しながらスイッチを押すと、痛みを伴う電撃を浴びせられます。"
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -69021,7 +71176,7 @@ msgid ""
 "The gas burners attached to this blade can really turn up the heat on your "
 "foes.  Use to ignite."
 msgstr ""
-"峰にノズルが取り付けられた日本刀です。人は火を好み、刀を好みます。なら合体させてしまえばいいのです。斬り付けると同時にバーナーから吐き出された炎が敵を燃やします。使用するには火種が必要です。"
+"峰にノズルが取り付けられた日本刀です。人は火を好み、刀を好みます。なら合体させてしまえばいいのです。斬り付けると同時にバーナーから吐き出された炎が敵を燃やします。使用するには点火が必要です。"
 
 #. ~ Use action charges_extinguish_message for Rising Sun.
 #: lang/json/TOOL_from_json.py
@@ -69230,6 +71385,33 @@ msgid ""
 "reinforce plastic items."
 msgstr "プラスチックの欠片です。プラスチック製品の製作、修復や補強に使えます。"
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] "端切れ(合成繊維)"
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr "合成繊維の端切れです。人間や天然素材と異なり、年齢を経てもそれほど劣化しません。今の状況に役立つ素材と言えますね。"
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] "端切れ(ライクラ)"
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr ""
+"伸縮性の高いライクラ繊維を織り交ぜた合成繊維の端切れです。柔軟かつ丈夫な衣類を仕立てるのに適しています。お洒落ではあるものの自然環境に悪い素材だと言われていますが、少なくとも再利用は可能です。"
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -69671,10 +71853,9 @@ msgstr[0] "双方向無線機"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
 msgstr ""
-"送信機能が付いた無線機です。使用すれば、同じものを持っている人と連絡を取ることができます。残念ながら、今の状況でこれを使っている人がいるとは思えませんが..."
+"送信機能が付いた無線機です。使用すれば同じものを持っている人と連絡を取れます。残念ながら、今の状況でこれを使っている人がいるとは思えませんが..."
 
 #: lang/json/TOOL_from_json.py
 msgid "remote vehicle controller"
@@ -69834,7 +72015,7 @@ msgstr[0] "顕微鏡"
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
@@ -70024,7 +72205,7 @@ msgstr[0] "高耐久ジャンパーケーブル"
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr ""
 "長く、太く、頑丈な高耐久型の電力ケーブルです。末端に接続端子が付いています。2台の車を接続することができますが、長い分電力損失は大きそうです。車両以外の電気システムにも接続できます。"
@@ -70418,7 +72599,7 @@ msgstr "照明モードのボタンを押すと、立方体の上部に火がつ
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr "拳大の滑らかな鋼鉄製の立方体です。側面に付いているボタンを押せば、機能が有効化されます。"
 
@@ -70447,7 +72628,7 @@ msgstr[0] "マスターキー"
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr "金色のマスターキーです。使用すると施錠を解除できます。"
 
 #: lang/json/TOOL_from_json.py
@@ -71428,11 +73609,6 @@ msgid ""
 "This is a stick that has been cut into a trigger mechanism for a snare trap."
 msgstr "くくり罠として機能するように木を削った物です。"
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] "レーヴァテイン"
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -72551,6 +74727,17 @@ msgid ""
 " terribly when not on a rail."
 msgstr "頑丈な鉄道用車輪です。車輪縁の出っ張りのお陰でレール上を走り続けられますが、それ以外の場所での走行性は最悪です。"
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr "鉄道用ホイール(小)"
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr "遊園地などにある幅の狭い鉄道のレールに合う、2つセットになった小型の鉄道用ホイールです。本格的な輸送よりも趣味の鉄道に適しています。"
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "バイクホイール"
@@ -72649,7 +74836,7 @@ msgstr "自作の木製カートホイールです。"
 
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "banded wooden cart wheel"
-msgstr "補強したカートホイール(木)"
+msgstr "補強カートホイール(木)"
 
 #. ~ Description for banded wooden cart wheel
 #: lang/json/WHEEL_from_json.py
@@ -72917,6 +75104,10 @@ msgstr "粉砕"
 msgid "cranking"
 msgstr "手回し充電"
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr "加温"
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr " ストレス解消"
@@ -73127,7 +75318,7 @@ msgstr "木々との交信"
 
 #: lang/json/activity_type_from_json.py
 msgid "eating"
-msgstr "食事"
+msgstr "消費"
 
 #: lang/json/activity_type_from_json.py
 msgid "consuming"
@@ -73139,7 +75330,7 @@ msgstr "詠唱"
 
 #: lang/json/activity_type_from_json.py
 msgid "studying"
-msgstr "習得"
+msgstr "学習"
 
 #: lang/json/activity_type_from_json.py
 msgid "drinking"
@@ -73197,6 +75388,10 @@ msgstr "矢"
 msgid "pebbles"
 msgstr "石つぶて"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "石"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr "紙筒弾"
@@ -73546,12 +75741,12 @@ msgstr "運命のいたずらか、移植手術がずさんだったために、
 
 #: lang/json/bionic_from_json.py
 msgid "Alloy Plating - Arms"
-msgstr "合金メッキ - 腕"
+msgstr "合金装甲 - 腕"
 
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr "腕の肉を合金の装甲に置換します。受動的な防御力を提供するほか、CBM格闘術に組み合わせて使用できます。 "
@@ -73570,7 +75765,7 @@ msgstr "外科手術によって眼窩を頑丈な保護レンズで完全に覆
 
 #: lang/json/bionic_from_json.py
 msgid "Alloy Plating - Head"
-msgstr "合金メッキ - 頭部"
+msgstr "合金装甲 - 頭部"
 
 #. ~ Description for Alloy Plating - Head
 #: lang/json/bionic_from_json.py
@@ -73581,19 +75776,19 @@ msgstr "外科手術によって頭部の肉を頑丈な装甲に取り換えま
 
 #: lang/json/bionic_from_json.py
 msgid "Alloy Plating - Legs"
-msgstr "合金メッキ - 脚"
+msgstr "合金装甲 - 脚"
 
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr "脚部の肉を合金の装甲に置換します。受動的な防御力を提供するほか、CBM格闘術に組み合わせて使用できます。 "
 
 #: lang/json/bionic_from_json.py
 msgid "Alloy Plating - Torso"
-msgstr "合金メッキ - 胴体"
+msgstr "合金装甲 - 胴体"
 
 #. ~ Description for Alloy Plating - Torso
 #: lang/json/bionic_from_json.py
@@ -73897,15 +76092,20 @@ msgstr "エタノール燃焼装置"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
-msgstr "アルコールを非常に効率的な燃料として利用できます。しかし、酒酔いの影響は通常と同じように受けてしまいます。"
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
+msgstr "アルコールを非常に効率的な燃料として利用できます。"
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "水蒸気液化装置"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr "周囲の大気から水分を抽出し、血管に直接吸収させます。乾燥した環境では失敗する可能性があります。"
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "ダイヤモンド角膜"
@@ -74150,10 +76350,10 @@ msgstr ""
 "電力を消費することで白血球の生産を加速させ、造血力を高める刺激装置を装着します。継続的に使用していると、停止した際に不快な副作用を引き起こす可能性があります。"
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "小型火炎放射器"
+msgid "Finger Lighter"
+msgstr "指搭載式ライター"
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -74181,10 +76381,10 @@ msgstr "電磁ユニット"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
-"右手に強力な電磁石を埋め込みます。起動すると近くにある鉄製のアイテムを手元に引き寄せます。引き寄せられた物体で近くにいる人間が負傷したり死亡したりする恐れがあります。"
+"右手に強力な電磁石を埋め込みます。自分の筋肉だけを使って近くにある鉄製のアイテムを手元に引き寄せます。引き寄せられた物体で近くにいる人間が負傷、死亡する恐れがあります。"
 " "
 
 #: lang/json/bionic_from_json.py
@@ -74244,9 +76444,10 @@ msgstr "修復用ナノマシン"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
-msgstr "体内に極小サイズのロボットを注入します。作動させている間は体内を動き回り、電力を消費して出血を止め損傷部位を修復します。 "
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
+msgstr ""
+"体内に極小サイズのロボットを注入します。作動させている間は体内を動き回りながら毎分HPを1回復し、追加電力とカロリーを消費して止血を行います。"
 
 #: lang/json/bionic_from_json.py
 msgid "Artificial Night Generator"
@@ -74281,8 +76482,8 @@ msgstr "機能不全の生体部品です。時々爆音を発します。"
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
-msgstr "なぜこうなってしまったのかは分かりませんが、導入に失敗した生体部品が鼻孔を塞いでいます。口に1の動作制限を受けます。"
+"Increases mouth encumbrance by ten."
+msgstr "何故こうなってしまったのか分かりませんが、導入に失敗した生体部品が鼻孔を塞いでいます。口に10の動作制限を受けます。"
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -74315,8 +76516,8 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
-msgstr "絶縁スタイレットを挿し間違えた結果、軽度の視覚障害に悩まされています。眼に1の動作制限を受けます。 "
+"mild optic neuropathy.  Increases eye encumbrance by ten."
+msgstr "絶縁スタイレットを挿し間違えた結果、軽度の視覚障害に悩まされています。眼に10の動作制限を受けます。 "
 
 #: lang/json/bionic_from_json.py
 msgid "Power Armor Interface"
@@ -74331,7 +76532,7 @@ msgstr "生体部品の電力をパワーアーマーに供給するシステム
 
 #: lang/json/bionic_from_json.py
 msgid "Power Armor Interface Mk. II"
-msgstr "パワーアーマーインターフェース Mk. II"
+msgstr "パワーアーマーインターフェース Mk.II"
 
 #. ~ Description for Power Armor Interface Mk. II
 #: lang/json/bionic_from_json.py
@@ -74339,7 +76540,7 @@ msgid ""
 "Interfaces your power system with the internal charging port on suits of "
 "power armor, allowing them to draw from your bionic power banks.  Twice as "
 "efficient as the Mk. I model."
-msgstr "生体部品の電力をパワーアーマーに供給するシステムを追加します。Mk. Iシリーズの二倍の効率を誇ります。 "
+msgstr "生体部品の電力をパワーアーマーに供給するシステムを追加します。Mk.Iシリーズの二倍の効率を誇ります。 "
 
 #: lang/json/bionic_from_json.py
 msgid "Power Storage"
@@ -74348,20 +76549,19 @@ msgstr "蓄電装置"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
-msgstr "蓄電容量を100増加させる小型モジュールです。これが無いとCBMは使えません。蓄電するにはこのCBMとは別に発電用CBMが必要です。 "
+msgstr "蓄電容量を100kJ増加させる小型モジュールです。これが無いとCBMは使えません。蓄電するにはこのCBMとは別に発電用CBMが必要です。 "
 
 #: lang/json/bionic_from_json.py
 msgid "Power Storage Mk. II"
-msgstr "蓄電装置 Mk. II"
+msgstr "蓄電装置 Mk.II"
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
-msgstr "蓄電容量を250増加させる小型モジュールです。"
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
+msgstr "蓄電容量を250kJ増加させる小型モジュールです。"
 
 #. ~ Description for Power Overload
 #: lang/json/bionic_from_json.py
@@ -74646,9 +76846,9 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
+" by ten, while failing to improve your ability to hold objects whatsoever."
 msgstr ""
-"両手の親指が(そうなって欲しくない時に限って)固まって動かなくなり、(元に戻って欲しいと思っても)元に戻りません。何かを掴もうとあがいている間は両手に2の動作制限を受けます。"
+"両手の親指が(そうなって欲しくない時に限って)固まって動かなくなり、(元に戻って欲しいと思っても)元に戻りません。何かを掴もうとあがいている間は両手に10の動作制限を受けます。"
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -74783,8 +76983,8 @@ msgstr ""
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
@@ -74840,7 +77040,7 @@ msgstr "味覚調整機構"
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr ""
@@ -75525,7 +77725,7 @@ msgstr "壁(金属)を設置する"
 
 #: lang/json/construction_from_json.py
 msgid "Build Brick Wall"
-msgstr "壁(煉瓦)を設置する"
+msgstr "壁(レンガ)を設置する"
 
 #: lang/json/construction_from_json.py
 msgid "Build Concrete Floor"
@@ -75539,6 +77739,18 @@ msgstr "土で穴を埋める"
 msgid "Make Woodchip Floor"
 msgstr "床(木片)を設置する"
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr "床(砂利)を設置する"
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr "鉄道レール(小)を設置する"
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr "鉄道レール(小)を斜めに設置する"
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr "床(木)を設置する"
@@ -75837,7 +78049,7 @@ msgstr "机を設置する"
 
 #: lang/json/construction_from_json.py
 msgid "Build Wardrobe"
-msgstr "衣装棚を設置する"
+msgstr "ワードローブを設置する"
 
 #: lang/json/construction_from_json.py
 msgid "Build Safe"
@@ -76136,7 +78348,7 @@ msgstr "柵(目隠し)を設置する"
 
 #: lang/json/construction_from_json.py
 msgid "Build Brick Wall from Adobe"
-msgstr "壁(日干し煉瓦)を設置する"
+msgstr "壁(日干しレンガ)を設置する"
 
 #: lang/json/construction_from_json.py
 msgid "Extrude Resin Lattice"
@@ -76190,6 +78402,10 @@ msgstr "電波塔を設置します。"
 msgid "Build a radio tower console."
 msgstr "電波制御装置を設置します。"
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr "丸太椅子を設置する"
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr "冷蔵庫の電源を改造する"
@@ -76889,6 +79105,42 @@ msgstr "不気味な形をした植物の夢を見ました。その蜜はあな
 msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr "あなたが出す甘い蜜を巡って争うハチの夢を見ました。うーん。"
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr "季節の流れと共に根を土壌の奥深くへ埋めていくことを考えると、思わず笑みが零れます。"
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr "夢の中で、心臓のように脈動する巨大な根の瘤を見ました。"
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr "シロアリが全身を苛む不穏な夢を見ました。"
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr "天を覆う程に成長した広大な森と根を共有する夢を見ました。"
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr "毛虫共に葉を貪られる夢を見ました。"
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr "炎が周囲を取り囲み、樹皮を舐め、苗木や茂みを飲み込む夢を見ました。あんなにお喋りだった木々が静まり返っています。"
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr "松の古木と交信する夢を見ました。松は自分こそがこの世界の真のサバイバーだと話しました。"
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -78172,6 +80424,25 @@ msgstr "手の震えが止まりません。"
 msgid "You tremble"
 msgstr "震えています。"
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr "痙攣"
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr "筋肉がつって上手く動かせません！"
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr "筋肉の痙攣が治まりました。"
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr "筋肉が上手く動きません！"
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "出血(小)"
@@ -79083,6 +81354,26 @@ msgstr "代謝が不安定になりました。"
 msgid "Your metabolism becomes more stable."
 msgstr "代謝が安定しました。"
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr "毒素症状"
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr "筋肉の痙攣がなかなか治まりません。"
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr "毒素障害"
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr "体内に異常があるのか、神経系が誤作動を起こしています。"
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "照明"
@@ -79331,6 +81622,17 @@ msgstr "過充電"
 msgid "You've been struck by lightning, and feel... different."
 msgstr "電撃に打たれ、何か...今までと違う気分になっています。"
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr "融合成長"
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr "別の生物と融合した際の能力値が増加するAI効果です。1スタックはmax_hpを1吸収されることを意味します。"
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr "信仰上の怒り"
@@ -79984,6 +82286,212 @@ msgstr ""
 "　"
 "生き残っていたセキュリティシステムの追跡によっていくつかの略奪と破壊行為の記録を取られ、警官ボットに手錠を掛けられ拘束された。警官ボットが応援を待っている間に、地面に転がされていた彼は騒ぎを聞きつけたゾンビに引き裂かれて死亡した。"
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr "     あなたの死後ハンターとなり、森の中で孤独に暮らしたが、ある日睡眠中に食人者に襲われ殺された。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+"     "
+"長く生き延び名うてのスカベンジャーとなり、自由商人の基地に小さな店を持った。2人の息子を授かったが、持っていた貴重なアーティファクトの影響で血液が酸になり死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+"     "
+"あなたの死後何年も荒野を転々とし、やがて熟達した機械工になった。自由商人に雇われ、比較的快適かつ平穏無事な生活を送り、この時分には珍しく癌で亡くなった。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+"     あなたの死を嘆き悲しみ、森の中へ去った。どこかの洞窟で狂った隠者となり、石を崇拝し、犬を食いながら何年も生き延びているという噂が残っている。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+"     "
+"あなたの死後、古い知識を蓄えることに熱中し、やがて「伝承者」として知られるまでになった。司書としてオールドガードに雇われ、埃に塗れた古い本に囲まれて過ごし、それらの価値を他者に教えた。フランスの古い哲学者にあやかり、名をフレデリック・バスティアに改めた。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+"     "
+"あなたの死後信仰に目覚め、英国国教会のコミュニティに加わり牧師になった。十字架によって生きる意味を見出したが、盗賊に襲われて非業の死を遂げた。盗賊たちに生きたまま火炙りにされながらも、彼は祈り続けていた。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+"     "
+"あなたの死後猟奇的なカルト教団に加わり、若い女性を誘拐して殺し続けた。その後、この教団はオールドガードに目を付けられ、壊滅した。カルト主義者が決して許されないことを示すため、彼は晒し首にされた。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr ""
+"     あなたの死後、長くは生きられなかった。老朽化した地下施設で感電し、あなたの名前を何度も叫びながら死んだ。死体は未だ発見されていない。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr "     あなたの死後わずか数日しか生き延びられなかった。大群から逃げようとする最中に、溺死した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+"     "
+"数日間一人で彷徨い続け、やがて自由商人の基地を発見した。そこで隊商の護衛として数年間過ごし、酒をたらふく飲み、手当たり次第に女性と出会い楽しんだ。やがて酒のせいで武器を持つのも困難になり、解雇された。そしてその日のうちにアルコール中毒で死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+"     "
+"身を固めたいと強く思うようになり、愛する人を見つけ、安全な農場で生活を始めた。怪物もそれほどいない平穏な場所で長く暮らし、7人の息子と2人の娘を授かった。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr "     見つけた古い醸造所で酒のレシピを覚え、一躍有名人になった。彼が作った冷えたビールは珍重され、自由商人によって広く流通している。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr "     巨大なシングルモルトウィスキーの貯蔵庫を発見し、そこで酔って死んだ。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr "     あなたの死を嘆き、数日後に首を吊って死んだ。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr ""
+"     数か月間世界を彷徨い、やがて小さなコミュニティに受け入れられた。彼はそこで農夫になり、作物を育てながら残りの人生を平穏に過ごした。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr "     「治療法」を見つけることに躍起になり、数週間後、廃棄された研究所で警備用タレットによってバラバラに引き裂かれて死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr "     避難センターの伝令として雇われたが、数か月後に死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr "     盗賊団に加わり、数週間後に自由商人の隊商を襲ったが、銃撃戦の最中に死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr "     北へと旅立ち、そこで見つけた損傷の少ない野球場を拠点として農業コミュニティを作り上げた。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr "     残りの短い人生を薬物摂取に費やし、古い地下室でオーバードーズの発作によって死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr "     南へと旅立ち、そこで見つけた小さな漁村に定住した。数年後に村が襲撃に遭い、若い息子と共に死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr "     あなたの死に衝撃を受け、古いLMOEシェルターに引き籠って一歩も外へ出なくなり、やがてその場で餓死した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr "     非常に優れた猟師になり、あちこちの集落に肉や毛皮を提供し、酒や友人を得た。数年後に性感染症にかかって死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr "     森に籠り、侘しい山小屋を拠点に釣りや狩りをしながら過ごし、他人と交流することは滅多になかった。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr "     カリフォルニアへ向かう途中で死亡した。より良い人生の幻覚を見ながら、クモにゆっくりと食い尽くされた。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr "     あなたの死後、一人で生き抜こうとしたが失敗した。ゾンビの集団が隠れ家を見つけて襲い掛かった時、彼は泥酔していた。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr ""
+"     "
+"睡眠中にゾンビの大群に囲まれ、長くは生きられなかった。防備を固めた窓は破られたが、手元に残った一発の弾丸によって、生きたまま貪り食われる事態を免れた。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr ""
+"     あなたの死後すぐに病気にかかり、医学的な処置もできず死亡した。彼は最期にこう言った。「私はこんな苦しみを味わうために長生きしたのか？」"
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -80244,6 +82752,176 @@ msgstr ""
 "　"
 "生き残っていたセキュリティシステムの追跡によっていくつかの略奪と破壊行為の記録を取られ、警官ボットに拘束され刑務所に入った。取り調べの待合室に閉じ込められたまま、彼女は助けを求めて泣き叫び続けた。最終的には所持品も底をつき、拘束から2週間後、彼女は脱水症で死亡した。"
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr "     数週間後、大規模な隊商を襲ったが、オールドガードに追い詰められて銃殺された。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr "     北へと旅立ち、そこで平穏なコミュニティに加わって残りの人生を農業に費やし、4人の娘を授かった。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+"     "
+"オールドガードの伝令として雇われ、やがて正式な仲間となり、残りの人生を盗賊団殲滅に費やした。数年後、盗賊団との小競り合いの際に、自分の命を犠牲にして部隊を退却させた。彼女の名は歌や碑文に残り、今も尊敬されている。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr ""
+"     あなたの死後間もなく自由商人の隊商の護衛に加わり、数か月後には避難センターの新しい連絡係に任命された。数年後、原因不明の病で亡くなった。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr ""
+"     瀕死状態だったところをオールドガードに拾われた。やがて抗生物質の隠し場所を探し当てるのが得意なスカベンジャーとして名が知れ渡った。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr "     森に籠り、山小屋を建て、残りの人生を釣りに費やした。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr "     盗賊に捕らえられ、残りの人生を悲惨な奴隷として過ごし、やがて絶望のあまり、錆びたナイフで手首を切って死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr "     消沈した彼女はプロテスタントのコミュニティに加わり、美徳の鑑となった。聖書を学ぶことに人生を捧げ、生涯を比較的平穏に過ごした。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr "     あなたの死後わずか数日後に、食人者に食い殺された。彼女の名を覚えている者はほとんどいない。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr ""
+"     あなたの死後に商人として名をあげ、西部に自身の基地を建設した。特に本の収集に力を入れ、知識の炎を絶やさないために立派な図書館を設立した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr "     何ヶ月も放浪し、古い農場を見つけた。作物を世話しながら隠者のような生活を楽しんでいたが、数年後、盗賊団に殺害された。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr "     南へ向かい、開拓団に加わった。その後技術者として有名になり、ニューイングランド最大の蒸気機関を建設した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr "     あなたの死後ギャングの一員となり、罪のない人々を襲って暮らしていたが、何ヶ月か後に裏切り者との内紛で死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr "     ゾンビの群れに生きたまま貪られた。彼女は死ぬ直前まであなたの事を考え続けていた。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr ""
+"     "
+"放棄された軍の輸送車を手に入れ、何年も旅を続けて経験を積んだ。彼女は大変動以後に本を出版した数少ない人間の一人となり、世界崩壊後の生活を書き綴った。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr "     何年も放浪を続けたが、盗賊団に捕まり、射撃練習の的にされた。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr "     熟練した狩人に成長し、荒野で最も優れた射手の一人になった。数年後、彼女はオールドガードの一員となり、執行官の地位を与えられた。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr ""
+"     "
+"人類を絶滅の運命から救うために奔走し、生存者の集団を組織した。盗賊団を狩り、切り刻まれた死体で道路を飾るのが彼女らの日常だった。その数か月後の交戦で彼女は死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr "     放火屋になったが、数週間後に火に巻かれて焼死した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr "     数週間に渡って放浪を続けたが、煮沸していない水を飲んだことが原因で死亡した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr "     北へ向かい、地元のコミュニティに加わった。そこで罠猟の技術を磨き、仲間たちの食卓に常に新鮮な肉が並ぶよう尽力した。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr "     自由商人に加わり、カナダに渡る最初の隊商を導いた。その数年後、赤痢で亡くなった。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr "     船を建造し、ヨーロッパに大変動の影響が届いていないことに望みをかけて東へ出航した。それ以来彼女の姿を見た者はいない。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr "     人類の絶滅を信じるカルト集団を数年間率いたが、食料不足が特に酷かった時期に、神々への生贄として殺された。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr "     薬物中毒になり、あなたが死んでから数が月後に過剰摂取で死亡した。"
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "あなたの仲間"
@@ -80397,10 +83075,10 @@ msgid "A small family surviving on their generational land."
 msgstr "先祖代々の土地で生き延びている小規模の家族です。"
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
-msgstr "神の集い"
+msgid "New England Church Community"
+msgstr "ニューイングランド教会コミュニティ"
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -80439,145 +83117,313 @@ msgstr ""
 msgid "Dusty"
 msgstr "埃まみれ"
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
+msgid "It's dusty.  Has no effect - obsolete fault."
 msgstr "埃まみれです。既に廃止されており、影響はありません。"
 
+#. ~ name of mending method for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "Wipe clean"
+msgstr "拭き取り"
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean you %s."
+msgstr "%sを綺麗に掃除しました。"
+
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr "要リセット"
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr "このCBMは工場出荷時の状態にリセットする必要があります。"
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr "リセット"
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr "%sを工場出荷時の状態にリセットしました。"
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr "煤汚れ"
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
 "黒色火薬を使った弾薬を発射すると、銃口に煤が付着して信頼性が低下し、洗浄せずに放置するとサビが発生します。現代的な無煙火薬の弾薬と比べても、はるかに早く銃が傷みます。単なる汚損なら高水準の信頼性に大きな影響を与えるだけで済みますが、煤汚れはすぐに蓄積します。"
 
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr "煤落とし"
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr "%sを綺麗に掃除しました"
+
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr "空薬莢残存"
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr "銃の内部に空薬莢が残っています。発砲する前に取り出す必要があります。"
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr "薬莢抜取"
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr "%sの内部に残っている空薬莢を抜き取りました。"
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr "汚損"
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
 "銃弾を繰り返し発射することで蓄積する銃の汚損は、信頼性の低下を引き起こし、最終的には銃自体の損傷に繋がります。現在市販されている大抵の無煙火薬の特性から、汚損は非常にゆっくり蓄積します(黒色火薬を使った弾薬は例外です)。銃器を掃除しないまま数千発の弾薬を発射し続けることでもしない限り、重大な影響はありません。"
 
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr "掃除"
+
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
 msgstr "駆動ベルト摩耗"
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "オルタネーターとの接続に必要です。"
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr "駆動ベルト交換"
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr "%sの摩耗した駆動ベルトを交換しました。"
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr "予熱プラグ故障"
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr "低温環境でエンジンを始動する際に役立ちます。"
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr "予熱プラグ交換"
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr "%sの故障した予熱プラグを交換しました。"
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr "イモビライザー作動"
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "専用のキーを用いない不正なエンジン始動を阻止します。"
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr "イモビライザー無効化"
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr "エンジンの始動を妨げているイモビライザーを無効化します。"
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr "%sのイモビライザー無効化に成功しました。"
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr "ディーゼルポンプ故障"
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr "タンクから軽油を吸い上げ、加圧するために必要です。"
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr "ディーゼルポンプ交換"
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr "%sの故障したディーゼルポンプを交換しました。"
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr "エアフィルター消耗"
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
 msgstr "使用限度に達したフィルターを使うと、燃料効率が悪くなり、排気ガスが増加します。"
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr "エアフィルター交換"
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr "%sの消耗したエアフィルターを交換しました。"
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr "燃料フィルター消耗"
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
 msgstr "使用限度に達したフィルターを使うと、出力が低下し、エンジンが逆火を起こしやすくなります。"
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr "燃料フィルター交換"
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr "%sの消耗した燃料フィルターを交換しました。"
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr "燃料ポンプ故障"
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr "タンクからガソリンを吸い上げ、加圧するために必要です。"
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr "燃料ポンプ交換"
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr "%sの故障した燃料ポンプを交換しました。"
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr "ウォーターポンプ故障"
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr "冷却器や放熱器に水を送るために必要です。"
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr "ウォーターポンプ交換"
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr "%sの故障したウォーターポンプを交換しました。"
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr "セルモーター故障"
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "エンジンを始動するために必要です。"
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr "セルモーター交換"
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr "%sの故障したセルモーターを交換しました。"
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -81022,19 +83868,19 @@ msgstr "冷気4"
 
 #: lang/json/field_type_from_json.py
 msgid "hot air 1"
-msgstr "暖気1"
+msgstr "熱気1"
 
 #: lang/json/field_type_from_json.py
 msgid "hot air 2"
-msgstr "暖気2"
+msgstr "熱気2"
 
 #: lang/json/field_type_from_json.py
 msgid "hot air 3"
-msgstr "暖気3"
+msgstr "熱気3"
 
 #: lang/json/field_type_from_json.py
 msgid "hot air 4"
-msgstr "暖気4"
+msgstr "熱気4"
 
 #: lang/json/field_type_from_json.py
 msgid "fungicidal mist"
@@ -81064,6 +83910,10 @@ msgstr "濃い殺虫ガス"
 msgid "smoke vent"
 msgstr "煙噴出孔"
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr "透視"
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
 msgstr "威圧感"
@@ -81251,11 +84101,11 @@ msgstr "道を封鎖するバリケードです。"
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "ガチャン！"
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "ドン。"
 
@@ -81368,7 +84218,8 @@ msgstr "彫像"
 msgid "A carved statue made of stone."
 msgstr "石造りの彫像です。"
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "ゴツン。"
 
@@ -81379,7 +84230,7 @@ msgstr "マネキン人形"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
 msgstr "服を着せて、話し掛けましょう。咎める人は誰もいませんよ？あれ...これ今動いた？"
 
@@ -81769,7 +84620,7 @@ msgid ""
 msgstr "積み上げられた枯れ草です。快適さや暖かさを気にしないなら、ベッドとして使えます。"
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "バリバリッ！"
 
@@ -81782,8 +84633,8 @@ msgstr "花(マーロス)"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
-msgstr "真菌花とよく似ていますが、根本が鮮やかな青緑色に色づいています。濃厚な香りを放っていますが...なんだか美味しそうですね？"
+"and… delicious?"
+msgstr "真菌花とよく似ていますが、根元が鮮やかな青緑に色づいています。濃厚な香りを放っていますが...なんだか美味しそうですね？"
 
 #: lang/json/furniture_from_json.py
 msgid "poof."
@@ -81915,7 +84766,7 @@ msgstr "ドスン。"
 
 #: lang/json/furniture_from_json.py
 msgid "Autodoc Mk. XI"
-msgstr "オートドクMk. XI"
+msgstr "オートドクMk.XI"
 
 #. ~ Description for Autodoc Mk. XI
 #: lang/json/furniture_from_json.py
@@ -82218,9 +85069,9 @@ msgstr "震える肉柱"
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr ""
 "地面からから天井まで伸びた、緑色のヒトデのようにも見える多肉質の柱です。中央には口のような噴出孔が連なっており、そこから悪臭を放つガスを噴き出します。"
 
@@ -82292,7 +85143,7 @@ msgstr "肉の祭壇"
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -82460,8 +85311,8 @@ msgstr "ランニングマシーン"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
-msgstr "足の筋肉を鍛えるために使います。停電時に使うのは困難です。部品が欲しいなら分解しましょう。"
+" taken apart for its… parts."
+msgstr "足の筋肉を鍛えるために使います。停電時に使うのは困難ですが...部品が欲しいなら分解しましょう。"
 
 #: lang/json/furniture_from_json.py
 msgid "heavy punching bag"
@@ -82486,7 +85337,7 @@ msgstr "ピアノ"
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr "コントラストが鮮やかな古いピアノです。これを置くだけで部屋が上品になります。分解したいのなら構いませんが...野蛮な人ですね。"
 
 #: lang/json/furniture_from_json.py
@@ -82646,6 +85497,17 @@ msgstr "スツール"
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr "ここに座って一杯やりましょうか。折り畳んで持ち運べます。"
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr "丸太椅子"
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr "丸太の角を軽く丸めただけの、非常に単純な作りの椅子です。"
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "掲示板"
@@ -82828,7 +85690,7 @@ msgstr "コップを並べましょう。"
 
 #: lang/json/furniture_from_json.py
 msgid "dresser"
-msgstr "ドレッサー"
+msgstr "衣装棚"
 
 #. ~ Description for dresser
 #: lang/json/furniture_from_json.py
@@ -82970,7 +85832,7 @@ msgstr "ある人にとってはゴミでも、他の誰かにとってはディ
 
 #: lang/json/furniture_from_json.py
 msgid "wardrobe"
-msgstr "衣装棚"
+msgstr "ワードローブ"
 
 #. ~ Description for wardrobe
 #: lang/json/furniture_from_json.py
@@ -83116,7 +85978,7 @@ msgstr ""
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
 msgstr "アウトドア旅行に最適な、小型の折り畳み式テーブルです。簡易的な作業台として利用できます。"
 
@@ -83178,7 +86040,7 @@ msgstr "壁(段ボール)"
 msgid ""
 "This is a pile of cardboard boxes that have been filled with rags and junk "
 "and stacked together like bricks to form a wall."
-msgstr "ゴミやガラクタが入った段ボール箱を煉瓦のように積み重ねて作った壁です。"
+msgstr "ゴミやガラクタが入った段ボール箱をレンガのように積み重ねて作った壁です。"
 
 #: lang/json/furniture_from_json.py
 msgid "beaded curtain"
@@ -83190,11 +86052,11 @@ msgid "This beaded curtain could be pulled aside."
 msgstr "脇に除けて開くタイプのビーズカーテンです。"
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
+msgid "clickity clack… clack… clack"
 msgstr "シャラシャラ...シャラ...シャラ..."
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
+msgid "clickity clack… clack"
 msgstr "シャラシャラ...シャラ..."
 
 #: lang/json/furniture_from_json.py
@@ -83207,7 +86069,7 @@ msgid "This beaded curtain has been pulled aside."
 msgstr "ビーズカーテンは脇に除けられています。"
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
+msgid "clickity clack… clack… clack!"
 msgstr "シャラシャラ...シャラ...ジャラ！"
 
 #: lang/json/furniture_from_json.py
@@ -83333,7 +86195,7 @@ msgstr "瓦礫の山"
 msgid ""
 "Pile of various metals, bricks, and other building materials.  You could "
 "clear it with a shovel."
-msgstr "雑多な金属、煉瓦、建築資材などの山です。シャベルを使用して取り除けます。"
+msgstr "雑多な金属、レンガ、建築資材などの山です。シャベルを使用して取り除けます。"
 
 #: lang/json/furniture_from_json.py
 msgid "pile of rocky rubble"
@@ -83351,8 +86213,7 @@ msgstr "瓦礫の山(ゴミ)"
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
 msgstr "泥や草が混じったゴミです。酷い臭いを漂わせていますが、何か使い道があるかも..."
 
 #: lang/json/furniture_from_json.py
@@ -83506,7 +86367,7 @@ msgstr "陶芸窯"
 #. ~ Description for clay kiln
 #: lang/json/furniture_from_json.py
 msgid "A kiln designed to bake clay pottery and bricks."
-msgstr "陶器や煉瓦を焼くための窯です。"
+msgstr "陶器やレンガを焼くための窯です。"
 
 #. ~ Description for stepladder
 #: lang/json/furniture_from_json.py
@@ -83858,7 +86719,16 @@ msgstr "魔法陣"
 msgid ""
 "This is a rough magic circle, carved into the ground and decorated with "
 "blood, candles, and other small knick-knacks."
-msgstr "地面に刻まれた荒い作りの魔法陣は、血や蝋燭、その他の小物類で彩られています。"
+msgstr "地面に刻まれた荒い作りの魔法陣は、血やろうそく、その他の小物類で彩られています。"
+
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr "輝く大岩"
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr "これが存在する場合はバグが発生しています。"
 
 #: lang/json/furniture_from_json.py
 msgid "krash!"
@@ -83889,7 +86759,7 @@ msgstr "門を開きました！"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
+msgid "You turn the handle…"
 msgstr "ハンドルを回しました..."
 
 #. ~ 'close' action message of some gate object.
@@ -83909,7 +86779,7 @@ msgstr "納屋のドアを開きました！"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
+msgid "You pull the rope…"
 msgstr "ロープを引っ張りました..."
 
 #. ~ 'close' action message of some gate object.
@@ -83944,7 +86814,7 @@ msgstr "ドアが上に開きました！"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
+msgid "You throw the lever…"
 msgstr "レバーを操作しました..."
 
 #. ~ 'close' action message of some gate object.
@@ -84128,7 +86998,7 @@ msgstr[0] "セルフボウ"
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr "一本の木材から特別にあつらえた、原始的な弓です。残念ながら、威力が低く精密性も期待できません..."
 
 #: lang/json/gun_from_json.py
@@ -84298,9 +87168,7 @@ msgid ""
 msgstr ""
 "隠し持てるほど小さい拳銃型のクロスボウです。小ささと引きの弱さに見合った非力な武器ですが、小動物を狩るにはうってつけです。放たれたボルトは消滅しなければ再利用が可能です。"
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "ハンドガン"
@@ -84462,6 +87330,17 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "投げ技"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] "投石杖"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr "扱いやすく狙いを定めやすい、杖に取り付けた革製のスリングです。弾薬として石を使います。"
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -84537,6 +87416,10 @@ msgid ""
 msgstr ""
 "ボーイング社とDARPAが共同開発したプラズマ兵器です。固体水素を加熱してプラズマを作り、拡散を防ぐためにポリマーで包んで発射します。強力な武器ですが近距離での使用は推奨されません。"
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "セミオート"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -84545,10 +87428,10 @@ msgstr[0] "ライフル(水素/PPA-5)"
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 "ロッキード・マーティン社が開発した、ポータブル・プラズマ・アクセラレーター・モデル5です。高度なコンデンサバンクを利用して円環状の加熱した水素プラズマを生成し、驚くべき速度で撃ち出します。大型車両に搭載するために設計されており、大変動が起きたのは米国陸軍での完全導入直前のことでした。"
 
@@ -84565,8 +87448,7 @@ msgid ""
 msgstr ""
 "銃身が3つ連なった自家製の銃器です。.30-06口径弾を装填する銃身が1つあり、残り2つの銃身には散弾を装填します。二連ショットガンから取り外した部品とパイプから作られています。"
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "ショットガン"
@@ -84725,6 +87607,10 @@ msgid ""
 " stop fires or \"protesters\"."
 msgstr "消防車から取り外された高圧放水砲です。車両に取り付けて、火災や「抗議デモ」を鎮圧することができます。"
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr "バースト"
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -84985,8 +87871,8 @@ msgstr[0] "ハンドガン(.22口径/ﾜﾙｻｰP22)"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 "ワルサーP22はブローバック式のセミオートピストルです。一般的なワルサー製銃器の半分ほどのサイズです。部品はほとんどプラスチック製で、スライドと重要な部品のみ亜鉛合金を圧力鋳造して作られています。"
@@ -85073,10 +87959,6 @@ msgstr ""
 "LLC製L523プラットフォームは、素早く安全に部品を交換することで、5.56mm弾に対応する様々な形態を使い分けられます。システムの基礎構造となるこのプラットフォームは"
 "--理論的には--単体でも利用可能ですが、サポート上非推奨であり、保証対象外となります。この貧弱な銃未満には市販のMODを取り付けられません。"
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "セミオート"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -85592,8 +88474,8 @@ msgstr[0] "ライフル(.308口径/M24)"
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
 "M24スナイパーは、レミントンM700ライフルの軍用、警察用モデルです。1988年に標準装備の狙撃銃として採用され、アメリカ陸軍によってM24の名を与えられました。ライフル本体に着脱式のテレスコピックサイトなど様々な装備が付属しているため、「ウェポンシステム」とも呼ばれています。"
@@ -85743,17 +88625,17 @@ msgstr ""
 ".38スペシャル弾を使用する、いかにも粗っぽい造りの2連拳銃です。名前こそ「2ショット」ですが、もしかしたら2発撃つ前に壊れてしまうかもしれません。"
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
-msgstr[0] "ハンドガン(.38口径/COP)"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
+msgstr[0] "ハンドガン(.357口径/COP.357ﾃﾞﾘﾝｼﾞｬｰ)"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
 msgstr ""
-".38口径COPはモスバーグ・ブラウニーとよく似た、小さくずんぐりした形状のデリンジャーピストルです。4つの銃身が正方形に並んで配置されています。"
+"モスバーグ・ブラウニーに少し似ている、小さくずんぐりした形のデリンジャーピストルです。回転する撃針で正方形に並んだ4つの銃身を順に叩いて発射します。"
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -85782,17 +88664,6 @@ msgid ""
 " sight and a reinforced frame."
 msgstr "7発の弾薬を装填できるSmith & Wesson社製の.38口径リボルバーです。固定リアサイトと強化フレームを備えています。"
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] "ハンドガン(.38口径/ﾀｳﾙｽPro)"
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr ".38口径拳銃の定番です。多くの安全機構を備え、高品質な素材を使用して強度を高めてあります。"
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -85860,12 +88731,23 @@ msgstr[0] "ハンドガン(.380口径/ﾊｲﾎﾟｲﾝﾄCF-380)"
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 "Hi-Point "
 "Firearms社が開発したブローバック式セミオートピストルです。この企業は安価な小火器を製造することと、製造した銃器が嵩張り扱い辛いことで有名です。鋼鉄製に比べて壊れやすい鋳造亜鉛スライドが使われています。"
 
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] "ハンドガン(.380口径/ﾀｳﾙｽｽﾍﾟｸﾄﾗﾑ)"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr ".380口径の準小型ピストルです。隠し持つ用途で設計されており、高品質で耐久性の高い素材で作られています。"
+
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
 msgid_plural "M1911A1s"
@@ -85954,9 +88836,9 @@ msgstr[0] "ハンドガン(.40口径/ﾌﾞﾛｰﾆﾝｸﾞﾊｲﾊﾟﾜｰS
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 "ブローニングハイパワーは第二次世界大戦直前に開発されたセミオートピストルです。それ以来多数が流通し、インドやカナダ、オーストラリアで使われ続けています。これはブローニング・アームズ社が製造した民生品で、.40口径S&W弾を装填します。"
 
@@ -85982,11 +88864,12 @@ msgstr[0] "ハンドガン(.40口径/ﾊｲﾎﾟｲﾝﾄJCP)"
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
-"Hi-Point "
-"Firearms社が開発したブローバック式セミオートピストルです。この企業は安価な小火器を製造することと、製造した銃器が嵩張り扱い辛いことで有名です。鋼鉄製に比べて壊れやすい鋳造亜鉛スライドが使われています。"
+"ハイポイントモデルJCPは、Hi-Point "
+"Firearms社が開発したブローバック式セミオートピストルです。この企業は安価かつ嵩張って扱い辛い小型の銃を製造することで有名です。鋼鉄製に比べて壊れやすい鋳造亜鉛スライドが使われています。"
 
 #: lang/json/gun_from_json.py
 msgid "tube 40mm launcher"
@@ -86314,7 +89197,7 @@ msgid ""
 "walking tank with this in their holster."
 msgstr ""
 "冗談めかして「世界で唯一の重携帯ピストル」と呼ばれるこの巨大なハンドガンは、「特殊部隊」用の主要武器として設計されました。その扱い辛さ、派生モデルHK "
-"USPシリーズの導入、戦域で.45ACP弾を補給する兵站の問題などが重なり、このデカブツはアメリカ特殊作戦軍の武器庫で眠る運命を辿りました。UPSと同様に信頼性の高い銃ですが、これをホルスターに入れるのは戦車に核爆弾を積むようなものです。"
+"USPシリーズの導入、戦域で.45ACP弾を補給する兵站の問題などが重なり、このデカブツはアメリカ特殊作戦軍の武器庫で眠る運命を辿りました。USPと同様に信頼性の高い銃ですが、これをホルスターに入れるのは戦車に核爆弾を積むようなものです。"
 
 #: lang/json/gun_from_json.py
 msgid "Walther PPQ .45 ACP"
@@ -86338,11 +89221,12 @@ msgstr[0] "ハンドガン(.40口径/ﾊｲﾎﾟｲﾝﾄJHP)"
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
-"Hi-Point "
-"Firearms社が開発したブローバック式セミオートピストルです。この企業は安価な小火器を製造することと、製造した銃器が嵩張り扱い辛いことで有名です。鋼鉄製に比べて壊れやすい鋳造亜鉛スライドが使われています。"
+"ハイポイントモデルJHPは、Hi-Point "
+"Firearms社が開発したブローバック式セミオートピストルです。この企業は安価かつ嵩張って扱い辛い小型の銃を製造することで有名です。鋼鉄製に比べて壊れやすい鋳造亜鉛スライドが使われています。"
 
 #: lang/json/gun_from_json.py
 msgid "Taurus Raging Bull"
@@ -87029,7 +89913,7 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "H&K MP5SD"
 msgid_plural "H&K MP5SDs"
-msgstr[0] "サブマシンガン(9mm/H&K  MP5SD)"
+msgstr[0] "サブマシンガン(9mm/H&K MP5SD)"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -87296,9 +90180,9 @@ msgstr[0] "ハンドガン(9mm/ﾌﾞﾛｰﾆﾝｸﾞﾊｲﾊﾟﾜｰ)"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 "ブローニングハイパワーは第二次世界大戦直前に開発されたセミオートピストルです。それ以来多数が流通し、インドやカナダ、オーストラリアで使われ続けています。これはブローニング・アームズ社が製造した民生品で、9x19mmパラベラム弾を装填します。"
 
@@ -87310,8 +90194,8 @@ msgstr[0] "ハンドガン(9mm/ﾜﾙｻｰP38)"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -87327,7 +90211,7 @@ msgstr[0] "ハンドガン(9mm/ﾜﾙｻｰPPQ)"
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr ""
 "ワルサーPPQはワルサーPPQAの後継となるセミオートピストルで、先代の付属品との互換性を一部維持しています。このモデルは9x19mmパラベラム弾を装填します。"
 
@@ -87340,11 +90224,11 @@ msgstr[0] "ハンドガン(9mm/ﾊｲﾎﾟｲﾝﾄC-9)"
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
-"Hi-Point "
-"Firearms社が開発したブローバック式セミオートピストルです。この企業は安価な小火器を製造することと、製造した銃器が嵩張り扱い辛いことで有名です。鋼鉄製に比べて壊れやすい鋳造亜鉛スライドが使われています。"
+"ハイポイントC-9は、Hi-Point "
+"Firearms社が開発したブローバック式セミオートピストルです。この企業は安価かつ嵩張って扱い辛い小型の銃を製造することで有名です。鋼鉄製に比べて壊れやすい鋳造亜鉛スライドが使われています。"
 
 #: lang/json/gun_from_json.py
 msgid "CZ-75"
@@ -87354,10 +90238,10 @@ msgstr[0] "ハンドガン(9mm/CZ-75)"
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
 "チェコスロバキアで開発されたセミオートピストルであり、ワンダーナインと呼ばれていた銃の一つです。西側諸国への輸出品として開発されましたが、設計は国家機密でした。しかしチェコスロバキアは90年代まで国際特許の枠組みに参加していなかったため、様々な模造品や改造品が世界中で開発され流通しました。射撃競技選手に大人気の銃です。"
@@ -87370,10 +90254,10 @@ msgstr[0] "ハンドガン(9mm/ﾜﾙｻｰCCP)"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 "銃器を隠して携帯したい人向けに販売される、ガス遅延式ブローバック方式のセミオートピストルです。内部構造はカルト的人気を誇ったH&K "
 "P7とほぼ同じです。銃身が安定するデザインのため大抵のハンドガンより精度は高くなる傾向にありますが、標準のトリガーと短い射程距離では実感し辛いかもしれません。"
@@ -87987,10 +90871,6 @@ msgid ""
 msgstr ""
 "研究開発部という地獄の底で能力を実証した名品です。ビデオテープ3本分の.5LPの実験記録と電動ドリルが作り上げたこのランチャーは、UPSの消費量と破壊力の割には軽量な武器と言えます。"
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr "バースト"
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -88786,10 +91666,61 @@ msgstr[0] "魔法のコンポジットボウ"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
 msgstr "複数の素材を組み合わせてエネルギー効率を高めた弓です。両端に一つずつドルイドのルーンが埋め込まれています。"
 
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] "ハンドガン(M47A1ﾃｸﾉ-ﾒﾃﾞｭｰｻ)"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+"フィリップ&ロジャース社のM47メデューサに魔法のような改造を加えた、サバイバー向けの多口径対応リボルバーです。テクノマンサーはより小さい弾薬を使うことで信頼性を向上させていますが、薬室にフリーボアを設けているため、一般的なリボルバーほど正確ではありません。"
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] "ショットガン(ｶﾞﾝﾌﾞﾚｰﾄﾞ)"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr ""
+"ファルカタのような形状の湾曲したブレードの背には、とどめの一撃もしくは先制攻撃に用いる銃身の短いポンプアクション式ショットガンが取り付けられています。"
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] "ショットガン(ｼｮｯﾄｾｽﾀｽ)"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr ""
+"金属製のセスタスに、銃身を短く切断した二連式ショットガンが取り付けられています。反撃を吸収する銃床がないため、発射にはある程度の筋力が必要です。"
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] "イチイバル"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr "イチイバルと呼ばれるオーディンの弓です。一度に10の矢を放つと言われています。カラスを象った金や銀の装飾が施されています。"
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -88893,11 +91824,6 @@ msgid ""
 msgstr ""
 "バネで木製の杭を押し上げて発射する機構の、シンプルな自作クロスボウです。他のクロスボウほど威力は高くない構造ですが、簡単に装填できます。放たれた矢は消滅しなければ再利用が可能です。"
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] "イチイバル"
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -89841,7 +92767,7 @@ msgstr "番えた矢を載せておく土台です。撃ち出された矢の軌
 msgid "accessories"
 msgstr "付属品"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "弓"
@@ -89961,7 +92887,7 @@ msgstr[0] "UPSテスト"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
+"it's a bug.  50x more UPS drain."
 msgstr ""
 "UPSの電源消費を確認するためのテストMODです。絶対にスポーンしません。デバッグ以外でこのアイテムを入手した場合、何らかのバグが発生しています。UPS電力を50以上消費します。"
 
@@ -90109,8 +93035,8 @@ msgstr[0] "集束レンズ"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
 msgstr "レーザー光線の焦点をより狭い範囲に集中させる光学ツールです。取り付けると射程距離と威力が向上しますが、簡単に照準を付けられなくなります。"
 
 #: lang/json/gunmod_from_json.py
@@ -90134,7 +93060,7 @@ msgstr[0] "改良型エミッター"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
+"energy efficiency.  Decreases power consumption."
 msgstr "レーザー放射装置の作業サイクルを最適化することで全体的なエネルギー効率を高める電子部品です。レーザー兵器の消費電力を低減します。"
 
 #: lang/json/gunmod_from_json.py
@@ -90148,8 +93074,8 @@ msgstr[0] "高密度コンデンサ"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
 msgstr "より高いエネルギー密度を有するコンデンサは、消費電力の著しい増加と引き換えに射程と威力を強化します。"
 
 #: lang/json/gunmod_from_json.py
@@ -90358,6 +93284,20 @@ msgid ""
 msgstr ""
 "銃口に取り付け、ガスを上向きに排出することで銃口の跳ね上がりを抑制します。反動が減少しますが、体積と発射音が増加し、わずかに精度が下がります。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] "改造マズルブレーキ"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+"銃口に取り付け、ガスを上向きに排出することで銃口の跳ね上がりを抑制します。反動が減少しますが、体積と発射音が増加し、精度がわずかに下がります。ランチャー以外のほとんどすべての銃器に取り付けられるように改造されています。"
+
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
 msgid_plural "homemade suppressors"
@@ -90488,6 +93428,20 @@ msgstr "長さのある銃器の銃身に取り付けるクロスボウです。
 msgid "rail"
 msgstr "レール"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] "改造レール直装式クロスボウ"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+"銃器やクロスボウの先端に取り付けて槍のように扱うこともできる、大型の斬撃武器です。ハンドガンとサブマシンガン以外のほぼすべての銃器に取り付けられるように改造してあります。ピストルとサブマシンガン以外のほとんどすべての銃器に取り付けられるように改造されています。"
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
@@ -90499,6 +93453,19 @@ msgid ""
 "other modification prevents use of the primary sights."
 msgstr "スコープなどの主要な照準MODが利用できない時のための、45度傾けて取り付けられた代替用アイアンサイトです。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] "改造アイアンサイト"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+"スコープなどの主要な照準MODが利用できない時のための、45度傾けて取り付けられた代替用アイアンサイトです。ほとんどすべての銃器に取り付けられるように改造されています。"
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
@@ -90508,6 +93475,17 @@ msgstr[0] "オフセットサイトレール"
 msgid "An additional rail set at 45° for attaching a secondary optic."
 msgstr "追加で光学部品を取り付けるための、45度の角度が付いたレールです。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] "改造オフセットサイトレール"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr "追加で光学部品を取り付けるための、45度の角度が付いたレールです。ほとんどすべての銃器に取り付けられるように改造されています。"
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
@@ -90518,8 +93496,7 @@ msgid ""
 "A small visible-light laser that mounts on a firearm's accessory rail to "
 "enhance ease and speed of target acquisition.  Aside from increased weight, "
 "there are no drawbacks."
-msgstr ""
-"レールに取り付ける、肉眼でも見える可視光レーザー発振器です。アンダーバレルに取り付けるものよりやや小型です。目標を素速く容易に照準できるようになります。重量は増えますが、他に欠点はありません。"
+msgstr "レールに取り付ける小型の可視光レーザー発振器です。標的を素速く簡単に照準できるようになります。重量は増えますが、他に欠点はありません。"
 
 #: lang/json/gunmod_from_json.py
 msgid "gyroscopic stabilizer"
@@ -90532,6 +93509,20 @@ msgid ""
 "vibration, greatly reducing recoil and slightly increasing accuracy."
 msgstr "銃の側面に取り付けることで振動を軽減する先進的な装備です。反動が大幅に軽減され、精度が若干向上します。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] "改造ジャイロスタビライザー"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+"銃の側面に取り付けることで振動を軽減する先進的な装備です。反動が大幅に軽減され、精度が若干向上します。ハンドガン以外のほとんどすべての銃器に取り付けられるように改造されています。"
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -90604,7 +93595,7 @@ msgstr "基本的なアイアンサイトです。"
 #: lang/json/gunmod_from_json.py
 msgid "pistol scope"
 msgid_plural "pistol scopes"
-msgstr[0] "スコープ(ハンドガン)"
+msgstr[0] "ピストルスコープ"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -90626,7 +93617,7 @@ msgstr "アイアンサイトを取り外して光学式ドットサイトを搭
 #: lang/json/gunmod_from_json.py
 msgid "rifle scope"
 msgid_plural "rifle scopes"
-msgstr[0] "スコープ(ライフル)"
+msgstr[0] "ライフルスコープ"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -90634,6 +93625,20 @@ msgid ""
 " mrad increments and is remarkably small and light for its magnification."
 msgstr "3-18x44mmのライフルスコープです。偏差修正と仰角を1/10mmラジアン単位で調整でき、高倍率ながら非常に小さく軽量です。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] "改造ライフルスコープ"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+"3-18x44mmのライフルスコープです。偏差修正と仰角を1/10mmラジアン単位で調整でき、高倍率ながら非常に小さく軽量です。ハンドガンとサブマシンガン以外のほぼすべての銃器に取り付けられるように改造してあります。"
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
@@ -90645,10 +93650,23 @@ msgid ""
 "crosshair."
 msgstr "トリチウム塗料で蛍光十字線が引かれた、4x32mmのTA01高度戦闘光学照準器です。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] "改造ACOGスコープ"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+"トリチウム塗料で蛍光十字線が引かれた、4x32mmのTA01高度戦闘光学照準器です。ほとんどすべての銃器に取り付けられるように改造されています。"
+
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
 msgid_plural "RS1219 scopes"
-msgstr[0] "スコープ(RS1219)"
+msgstr[0] "RS1219スコープ"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -90823,6 +93841,21 @@ msgid ""
 msgstr ""
 "二脚は銃口を停止させ、ブレを減らすためにライフルやマシンガンに取り付けます。反動が大幅に減少しますが、特定の地形上でなければ効果を発揮せず、装備にかかる時間も長くなります。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] "改造二脚"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+"二脚は銃口を停止させ、ブレを減らすためにライフルやマシンガンに取り付けます。反動が大幅に減少しますが、特定の地形上でなければ効果を発揮せず、装備にかかる時間も長くなります。ほとんどすべての銃器に取り付けられるように改造されています。"
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -90856,6 +93889,19 @@ msgid ""
 "effective as a bipod but usable under all conditions."
 msgstr "銃をより安定して制御するための、銃身の前方に取り付けるグリップです。二脚よりも効果は落ちますが、どんな条件下でも使用できます。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] "改造フォワードグリップ"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+"銃をより安定して制御するための、銃身の前方に取り付けるグリップです。二脚よりも効果は落ちますが、どんな条件下でも使用できます。ほとんどすべての銃器に取り付けられるように改造されています。"
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
@@ -90890,8 +93936,7 @@ msgid ""
 "A visible-light laser that mounts under a firearm's barrel to enhance ease "
 "and speed of target acquisition.  Aside from increased weight, there are no "
 "drawbacks."
-msgstr ""
-"アンダーバレルに取り付ける、肉眼でも見える可視光レーザー発振器です。目標を素速く容易に照準できるようになります。重量は増えますが、他に欠点はありません。"
+msgstr "アンダーバレルに取り付ける可視光レーザー発振器です。標的を素速く簡単に照準できるようになります。重量は増えますが、他に欠点はありません。"
 
 #: lang/json/gunmod_from_json.py
 msgid "LeMat revolver shotgun"
@@ -90917,6 +93962,20 @@ msgid ""
 msgstr ""
 "M203は本来M16系のアサルトライフル用に設計された追加装備でしたが、今ではほとんど全てのライフルに対応しています。40mm擲弾を1発ずつ発射することができます。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] "改造グレネードランチャー(M203)"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+"M203は本来M16系のアサルトライフル用に設計された追加装備でしたが、今ではほとんど全てのライフルに対応しています。40mm擲弾を1発ずつ発射することができます。ハンドガンとポンプアクション式の銃以外のほぼすべての銃器に取り付けられるように改造してあります。"
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
@@ -90931,6 +93990,21 @@ msgid ""
 msgstr ""
 "精度を犠牲にして大型ランチャーの機能をコンパクトにまとめたグレネードランチャーです。基本的には他の銃器に取り付けて使用しますが、銃床を取り付けることで単発式小型グレネードランチャーとして単体で運用することもできます。組み立ては製作メニューから行います。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
+msgstr[0] "改造グレネードランチャー(M320 GLM)"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+"精度を犠牲にして大型ランチャーの機能をコンパクトにまとめたグレネードランチャーです。基本的には他の銃器に取り付けて使用しますが、銃床を取り付けることで単発式小型グレネードランチャーとして単体で運用することもできます。組み立ては製作メニューから行います。ハンドガンとポンプアクション式の銃以外のほぼすべての銃器に取り付けられるように改造してあります。"
+
 #: lang/json/gunmod_from_json.py
 msgid "masterkey shotgun"
 msgid_plural "masterkey shotguns"
@@ -90941,7 +94015,21 @@ msgid ""
 "A minimalist pump action shotgun, which can be mounted under the barrel of "
 "many rifles.  It allows a total of four shotgun shells to be loaded and "
 "fired."
-msgstr "小型化したショットガンです。ライフルの銃身に取り付ける事ができます。4発装填が可能です。"
+msgstr "様々なライフルの銃身の下に取り付けられる、小型化したポンプアクション式のショットガンです。4発装填が可能です。"
+
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] "マスターキー・ショットガン"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+"様々なライフルの銃身の下に取り付けられる、小型化したポンプアクション式のショットガンです。4発装填が可能です。ハンドガンとポンプアクション式の銃以外のほぼすべての銃器に取り付けられるように改造してあります。"
 
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
@@ -90950,9 +94038,9 @@ msgstr[0] "パイプランチャー(40mm)"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
-msgstr "自家製擲弾発射器です。ほとんどのライフルに装着でき、立派に役目を果たします。40mm擲弾を1発ずつ発射することができます。"
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
+msgstr "ハンドガン以外のほとんどすべての銃器に取り付けられる、自家製擲弾発射器です。40mm擲弾を1発ずつ発射します。"
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -90978,6 +94066,20 @@ msgid ""
 msgstr ""
 "Rivtech社のRM121補助武装システムは、様々なライフルのアンダーバレルに装着できる弾倉式セミオートケースレスショットガンですRMSA10箱型弾倉に対応します。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] "改造補助ショットガン(20x66mm/RM121)"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
+"Rivtech社のRM121補助武装システムは、様々なライフルのアンダーバレルに装着できる弾倉式セミオートケースレスショットガンですRMSA10箱型弾倉に対応します。ほぼすべての銃器に取り付けられるように改造してあります。"
+
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
 msgid_plural "underslung shotguns"
@@ -90987,7 +94089,21 @@ msgstr[0] "アンダーバレル・ショットガン"
 msgid ""
 "A short shotgun with 2 barrels, which can be mounted under the barrel of "
 "many rifles.  It allows two shotgun shells to be loaded and fired."
-msgstr "小型化したショットガンです。ライフルの銃身に取り付ける事ができます。2発装填が可能です。"
+msgstr "様々なライフルの銃身の下に取り付けられる、小型化した銃身の短い二連ショットガンです。2発装填が可能です。"
+
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] "改造アンダーバレル・ショットガン"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr ""
+"様々なライフルの銃身の下に取り付けられる、小型化した銃身の短い二連ショットガンです。2発装填が可能です。ほぼすべての銃器に取り付けられるように改造してあります。"
 
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
@@ -90998,7 +94114,7 @@ msgstr[0] "LWレーザーサイト(アンダーバレル)"
 msgid ""
 "A Leadworks built in visible-light laser that mounts under a firearm's "
 "barrel to enhance ease and speed of target acquisition."
-msgstr "Leadworks社の銃器に内蔵された、アンダーバレルレーザーサイトです。目標の捕捉を助け、照準速度が向上します。"
+msgstr "Leadworks社の銃器のアンダーバレルに内蔵された、可視光レーザー発振器です。標的を素速く簡単に照準できるようになります。"
 
 #: lang/json/gunmod_from_json.py
 msgid "LW forward grip"
@@ -91240,6 +94356,56 @@ msgid ""
 msgstr ""
 "銃身の先端に取り付ける電磁装置の一種です。銃口から発射された飛翔体に対して電磁的な一押しを加え、初速を向上させることで威力と反動が増大し、精度が下がります。発射時にUPSの電力を使用するよう大規模な改造を加えるため、取り付けた銃はUPSが無ければ動作しなくなります。"
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] "サプレッサー(サイレントウィンズ)"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr "チューブ内に専用の無音化呪文を掛けることで、一般的な消音素材を使わずに銃声を聞き取れないレベルまで小さくします。"
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] "マナレーザーサイト(レール)"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+"レールに取り付ける、マナクリスタルを利用した小型の可視光レーザー発振器です。標的を素速く簡単に照準できるようになります。重量は増えますが、他に欠点はありません。部品を動かしてアンダーバレルに取り付けることも可能です。"
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] "マナレーザーサイト(アンダーバレル)"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+"レールに取り付ける、マナクリスタルを利用した小型の可視光レーザー発振器です。標的を素速く簡単に照準できるようになります。重量は増えますが、他に欠点はありません。部品を動かしてレールに取り付けることも可能です。"
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] "マナドットサイト"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr "アイアンサイトを取り外し、マナクリスタルで作った光学式ブルードットサイトを搭載します。精度が向上し、重量が増加します。"
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -93093,7 +96259,7 @@ msgstr "秒読みを始める"
 
 #: lang/json/item_action_from_json.py
 msgid "Learn spell"
-msgstr "呪文を習得する"
+msgstr "呪文学習"
 
 #: lang/json/item_action_from_json.py
 msgid "Cast spell"
@@ -93318,8 +96484,9 @@ msgstr "放射線を測定する"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
 msgstr "..."
 
 #: lang/json/item_action_from_json.py
@@ -93899,6 +97066,13 @@ msgstr "このCBMは電力を供給します。"
 msgid "This bionic can provide power to powered armor."
 msgstr "このCBMはパワーアーマーに電力を供給します。"
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr "この食料は<bad>調理が無意味</bad>なほどに<bad>不味い</bad>です。"
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -95400,6 +98574,7 @@ msgstr "変更を削除"
 msgid "Load color template"
 msgstr "読込/色設定テンプレート"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -97138,7 +100313,7 @@ msgstr "合気道の構え"
 msgid ""
 "By disregarding offensive in favor of self-defense, you are better at "
 "protecting. Blocked damage reduced by 100%% of Dexterity."
-msgstr "護身のために攻撃を捌く、防御性能に優れた構えです。ブロック発動時に器用x100%%のダメージを軽減します。"
+msgstr "護身のために攻撃を捌く、防御性能に優れた構えです。ブロック時に器用x100%%のダメージを軽減します。"
 
 #: lang/json/martial_art_from_json.py
 msgid "Intermediate Aikido"
@@ -97197,7 +100372,7 @@ msgid ""
 msgstr ""
 "堅実な構えで通常より多くのダメージをブロックし、鋭いパンチを繰り出します。\n"
 "\n"
-"打撃与ダメージ+2、ブロック発動時に筋力x50%%のダメージを軽減"
+"打撃与ダメージ+2、筋力x50%%のブロック時ダメージ軽減"
 
 #: lang/json/martial_art_from_json.py
 msgid "Footwork"
@@ -97460,7 +100635,7 @@ msgid ""
 msgstr ""
 "横向きに構えることで、戦闘で負傷する可能性を最小限に抑えます。\n"
 "\n"
-"ブロック発動時に器用x50%%のダメージを軽減"
+"器用x50%%のブロック時ダメージ軽減"
 
 #. ~ Description for martial art 'Fior Di Battaglia'
 #: lang/json/martial_art_from_json.py
@@ -97485,7 +100660,7 @@ msgid ""
 msgstr ""
 "しっかりと地を踏みしめ、どんな脅威に対しても動揺しません。\n"
 "\n"
-"ブロック+2、回避スキル-1.0、ブロック発動時に筋力x50%%のダメージを軽減"
+"ブロック+2、回避スキル-1.0、筋力x50%%のブロック時ダメージ軽減"
 
 #: lang/json/martial_art_from_json.py
 msgid "Tactical Retreat"
@@ -97503,7 +100678,7 @@ msgid ""
 msgstr ""
 "移動して「固守」を無効化しました！\n"
 "\n"
-"ブロック-2、回避スキル+1.0、ブロック発動時に筋力x50%%のダメージ増加\n"
+"ブロック-2、回避スキル+1.0、筋力x50%%のブロック時ダメージ軽減\n"
 "1ターン継続"
 
 #: lang/json/martial_art_from_json.py
@@ -97720,7 +100895,7 @@ msgid ""
 msgstr ""
 "油断なき騎士の構えによって、剣による防御力が上昇しました。\n"
 "\n"
-"回避+1、ブロック発動時に筋力x50%%のダメージを軽減"
+"回避+1、筋力x50%%ののブロック時ダメージ軽減"
 
 #: lang/json/martial_art_from_json.py
 msgid "Muay Thai"
@@ -97734,7 +100909,7 @@ msgid ""
 " blocked damage.  Blocking attacks or getting hit will increase your damage "
 "and blocked damage further."
 msgstr ""
-"世界的に人気のあるタイ式格闘術です。両手、両肘、両膝、両足の8箇所を使った強力な打撃を特徴とします。筋力が高いほどブロック時のダメージが軽減されます。攻撃を受けるかブロックすると、与ダメージとブロックできるダメージ量が増加します。"
+"世界的に人気のあるタイ式格闘術です。両手、両肘、両膝、両足の8箇所を使った強力な打撃を特徴とします。筋力が高いほどブロック時のダメージが軽減されます。攻撃を受けるかブロックすると、与ダメージ、ブロック時のダメージ軽減量が増加します。"
 
 #: lang/json/martial_art_from_json.py
 msgid "Muay Thai Stance"
@@ -97750,7 +100925,7 @@ msgid ""
 msgstr ""
 "ムエタイは筋力が全てです。自分の力を最大限に活用する手段を習得しました。\n"
 "\n"
-"ブロック発動時に筋力x50%%のダメージを軽減"
+"筋力x50%%のブロック時ダメージ軽減"
 
 #: lang/json/martial_art_from_json.py
 msgid "Ninjutsu"
@@ -97849,7 +101024,7 @@ msgstr ""
 "絶えぬ錬磨を\n"
 "糧とせん\n"
 "\n"
-"感覚x50%%の斬撃/打撃与ダメージ上昇、感覚x100%%の被ブロックダメージ減少"
+"感覚x50%%の斬撃/打撃与ダメージ上昇、感覚x100%%のブロック時ダメージ軽減"
 
 #: lang/json/martial_art_from_json.py
 msgid "Waning Moon"
@@ -98105,7 +101280,7 @@ msgid ""
 msgstr ""
 "足で攻撃することで手を防御に回せます。\n"
 "\n"
-"ブロック発動時に筋力x50%%のダメージを軽減"
+"筋力x50%%のブロック時ダメージ軽減"
 
 #: lang/json/martial_art_from_json.py
 msgid "Unhindered"
@@ -98117,11 +101292,11 @@ msgstr "全力攻撃"
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 "手に何も装備していない状態で攻撃力が増加します。\n"
 "\n"
-"素手攻撃時の打撃与ダメージ+33%増加"
+"素手攻撃時の打撃与ダメージ+33%%"
 
 #: lang/json/martial_art_from_json.py
 msgid "Tai Chi"
@@ -98151,7 +101326,7 @@ msgid ""
 msgstr ""
 "敵の攻撃を予測し、防御に集中します。\n"
 "\n"
-"ブロック+1、ブロック発動時に感覚x100%%のダメージを軽減"
+"ブロック+1、感覚x100%%のブロック時ダメージ軽減"
 
 #: lang/json/martial_art_from_json.py
 msgid "Repulse the Monkey"
@@ -98171,6 +101346,106 @@ msgstr ""
 "感覚x20%%の命中率上昇、感覚x50%%の打撃防御貫通。\n"
 "2ターン継続"
 
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Kung Fu"
+msgstr "虎形拳"
+
+#. ~ Description for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
+"attacks above all else.  Your Strength determines your accuracy, and your "
+"attacks do increasing damage as you continue attacking."
+msgstr ""
+"少林拳に伝わる、五獣拳の1つです。虎形拳の全ては敵を寄せ付けない激しい攻撃にあります。器用さではなく筋力によって命中率が決定されます。連続で攻撃が命中する度に威力が上昇します。"
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Fury"
+msgstr "虎の憤怒"
+
+#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
+msgstr ""
+"途切れることのない猛攻を繰り出します。命中するほど攻撃は強くなります。\n"
+"\n"
+"与ダメージ+10%%\n"
+"3ターン継続、最大蓄積数4"
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger's Strength"
+msgstr "虎の怪力"
+
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
+msgstr ""
+"守備も、計略も、必要ありません。必要なのは力です。力で敵の防御を打ち砕き、完全に圧倒します。\n"
+"\n"
+"器用ではなく筋力によって命中率が上昇します。\n"
+"\n"
+"筋力x25%%の命中率上昇、器用x25%%の命中率低下"
+
+#: lang/json/martial_art_from_json.py
+msgid "Wing Chun"
+msgstr "詠春拳"
+
+#. ~ Description for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
+"learn effective techniques from the various Shaolin animal forms.  It has a "
+"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
+"sensitivity to the opponent's direction of force, and flowing around it to "
+"get back to hitting."
+msgstr ""
+"詠春拳は、少林寺拳法に伝わる動物を模した形の中でも特に習得しやすく効果的なものを選りすぐった、中国拳法です。姿勢を正し、前後に開いた足の後部に体重をかけて構えます。力の向きを鋭敏に感じ取り、円を描くような動きで敵の攻撃を逸らして反撃に移ります。"
+
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr "連続パンチ"
+
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
+"タイミングを見計らった攻撃によって、敵に休む暇を与えません。\n"
+"\n"
+"行動コスト-10%%\n"
+"1ターン継続、最大蓄積数3"
+
+#: lang/json/martial_art_from_json.py
+msgid "Chi-Sao Sensitivity"
+msgstr "黐手"
+
+#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
+msgstr ""
+"体幹と技術をより深く研究しました。敵の攻撃を見切りやすくなります。\n"
+"\n"
+"感覚x15%% の回避スキル上昇、感覚x50%%のブロック時ダメージ軽減"
+
 #: lang/json/martial_art_from_json.py
 msgid "Zui Quan"
 msgstr "酔拳"
@@ -98179,57 +101454,79 @@ msgstr "酔拳"
 #: lang/json/martial_art_from_json.py
 msgid ""
 "AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
 msgstr ""
-"「酔えば酔うほど強くなる」で有名ですが、実際は酔っ払いを真似て敵を混乱させる武術です。受動的な回避行動に対して、知性を基準にボーナスが与えられます。攻撃後のターンに複数の敵からの攻撃をペナルティなしに回避できる確率が上がり、回避できた場合は、その後のターンの攻撃の命中率と威力が知性を基準に向上します。"
+"「ドランクンボクシング」とも呼ばれる酔拳は、酔っぱらいの動きを真似て敵を惑わす武術です。知性を基準に命中率と回避率にボーナスを得ます。移動すると敵の攻撃を回避しやすくなり、回避すると次ターンまで与ダメージが増加します。"
 
-#. ~ Description of buff for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "知性依存で回避率上昇"
+msgid "Zui Quan Stance"
+msgstr "酔拳の構え"
 
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
-msgstr "迎撃"
-
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
-msgstr "回避成功後に追加与ダメージと命中補正ボーナス"
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
+msgstr ""
+"一見するとふらついているように見えますが、すべて計画の内です。これは攻撃を回避するための計算ずくの動作なのです。\n"
+"\n"
+"知性x15%%の回避スキル上昇"
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Kung Fu"
-msgstr "虎形拳"
+msgid "Advanced Zui Quan"
+msgstr "酔拳の達人"
 
-#. ~ Description for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
+#, no-python-format
 msgid ""
-"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
-"attacks above all else.  Your Strength determines your accuracy, and your "
-"attacks do increasing damage as you continue attacking."
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
 msgstr ""
-"少林拳に伝わる、五獣拳の1つです。虎形拳の全ては敵を寄せ付けない激しい攻撃にあります。器用さではなく筋力によって命中率が決定されます。連続で攻撃が命中する度に威力が上昇します。"
+"酔拳をより深く理解しています。回避と攻撃の技術が大幅に向上しました。\n"
+"\n"
+"回避+1、知性x15%%の命中率上昇"
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Fury"
-msgstr "虎の憤怒"
+msgid "Drunken Stumble"
+msgstr "酔歩"
 
-#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "打撃/攻撃+3"
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
+"わずかな動きで勢いよく方向転換して攻撃を回避します。\n"
+"\n"
+"回避+2\n"
+"3ターン継続"
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "虎の怪力"
+msgid "Drunken Dodging"
+msgstr "酔避"
 
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "筋力依存の追加ダメージボーナスを得ます。"
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
+"回避する度に敵に対する位置的優位性が高まります。回避に成功すればするほど敵への攻撃が苛烈になります。\n"
+"\n"
+"知性x25%%の装甲貫通\n"
+"1ターン継続、最大蓄積数4"
 
 #: lang/json/martial_art_from_json.py
 msgid "Debug Mastery"
@@ -98252,30 +101549,6 @@ msgid ""
 "armor, +Perception fire armor."
 msgstr "筋力の値で斬撃耐性、器用の値で酸耐性、知性の値で電撃耐性、感覚の値で火炎耐性が増加します。"
 
-#: lang/json/martial_art_from_json.py
-msgid "Wing Chun"
-msgstr "詠春拳"
-
-#. ~ Description for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
-"learn effective techniques from the various Shaolin animal forms.  It has a "
-"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
-"sensitivity to the opponent's direction of force, and flowing around it to "
-"get back to hitting."
-msgstr ""
-"詠春拳は、少林寺拳法に伝わる動物を模した形の中でも特に習得しやすく効果的なものを選りすぐった、中国拳法です。姿勢を正し、前後に開いた足の後部に体重をかけて構えます。力の向きを鋭敏に感じ取り、円を描くような動きで敵の攻撃を逸らして反撃に移ります。"
-
-#: lang/json/martial_art_from_json.py
-msgid "Chi-Sao Sensitivity"
-msgstr "黐手"
-
-#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
-msgstr "感覚依存で回避率上昇。1ターンごとに回避+1"
-
 #: lang/json/martial_art_from_json.py
 msgid "Bionic Combatives"
 msgstr "サイボーグ格闘術"
@@ -98461,11 +101734,12 @@ msgstr "蛤蟆功"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
 msgstr ""
-"悪名高き五毒拳の1つです。蛤蟆功はあらゆる攻撃に立ち向かうことを中心に扱っています。その場で立ち止まっていると瞑想状態になり防御力が向上しますが、移動すると元に戻ります。"
+"悪名高き五毒拳の1つ、リョン・シンが極めた蛤蟆功はあらゆる攻撃に耐えることに重きを置いています。物理攻撃に対する防御力が向上しますが、移動すると集中力が切れて元に戻ってしまいます。その場に留まることで、瞑想によって短時間で身体を硬く変化させます。"
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -98473,8 +101747,14 @@ msgstr "蝦蟇の硬皮"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "立ち止まっている間、装甲+6"
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
+"その場から動かない限り、身体が鉄のように硬くなっています。\n"
+"\n"
+"打撃/斬撃/刺突耐性+6"
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -98483,8 +101763,16 @@ msgstr "硬皮消失"
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
-msgstr "移動すると鉄のような皮膚は柔らかくなります！"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
+msgstr ""
+"移動によって鉄のような皮膚が元に戻りました。\n"
+"\n"
+"打撃/斬撃/刺突耐性-1\n"
+"6ターン継続、最大蓄積数6"
 
 #: lang/json/martial_art_from_json.py
 msgid "Viper Kung Fu"
@@ -98493,38 +101781,61 @@ msgstr "蛇功"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
 msgstr ""
-"悪名高き五毒拳の1つです。蛇功は独特の3連コンボが特徴です。まず相手の攻撃を回避し、カウンターとして気絶効果をもつチョップを繰り出し、最後に毒蛇の一撃と呼ばれる伝説の技を繰り出します。"
+"悪名高き五毒拳の1つ、チャイ・トンが極めた蛇功は独特の3連コンボが特徴です。まず敵の攻撃を回避し、鋭い毒蛇咬で気絶させ、最後に毒蛇の一撃と呼ばれる伝説の技を繰り出します。"
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "毒蛇の睨み"
+msgid "Viper's Patience"
+msgstr "毒蛇の忍耐"
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
-msgstr "かかったな！次に繰り出されるのは毒蛇の一撃です！"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
+msgstr ""
+"完璧な攻撃を繰り出すための決定的瞬間を待っています。敵のミスを反撃のチャンスに変えましょう！\n"
+"\n"
+"回避スキル+1.0"
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "毒蛇の忍耐"
+msgid "Viper's Ambush"
+msgstr "毒蛇の伏撃"
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
-msgstr "連撃は回避から始まります。回避+2"
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
+msgstr ""
+"攻撃が外れたことで、敵は強烈な攻撃に対して無防備な状態になりました。\n"
+"\n"
+"「毒蛇咬」有効化\n"
+"1ターン継続"
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
-msgstr "毒蛇の伏撃"
+msgid "Viper's Venom"
+msgstr "蛇毒"
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
-msgstr "かかったな！次に繰り出されるのは毒蛇の一撃です！"
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
+msgstr ""
+"猛毒のような攻撃で敵を苛みます。\n"
+"\n"
+"打撃与ダメージ+2\n"
+"3ターン継続"
 
 #: lang/json/martial_art_from_json.py
 msgid "C.R.I.T Blade-work"
@@ -98914,6 +102225,10 @@ msgstr "鉛"
 msgid "Leather"
 msgstr "革"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr "ライクラ"
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "乳製品"
@@ -98978,6 +102293,10 @@ msgstr "超合金"
 msgid "layered carbide"
 msgstr "層状炭化物"
 
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr "合成繊維"
+
 #: lang/json/material_from_json.py
 msgid "Tin"
 msgstr "錫"
@@ -99088,6 +102407,10 @@ msgstr "ゴム"
 msgid "Arcane Skin"
 msgstr "魔法の皮"
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr "オリハルコン"
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr "デーモンキチン"
@@ -99097,8 +102420,8 @@ msgid "Sugar"
 msgstr "砂糖"
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
-msgstr "8個の骨を持ってくる"
+msgid "Gather bones for the Brigitte.  About 8 should do it."
+msgstr "ブリジットのために骨を集めましょう。8個必要です。"
 
 #: lang/json/mission_def_from_json.py
 msgid "There is always work to be done, song to be woven."
@@ -102493,8 +105816,8 @@ msgstr "光の復活"
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr ""
 "崩壊した塔の地下へ向かい、ナノ製造テンプレート(フォトニック回路)を持ち帰りましょう。通信装置の人物によれば、塔の環境は危険な状態で強敵も棲んでいるようです。"
 
@@ -105137,8 +108460,8 @@ msgstr "髭(アンカー)"
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
 msgstr "口髭に加えて、顎のライン上から唇の下まで細く繋がった顎髭が生えています。錨のような形のため、アンカーと呼ばれています。"
 
 #: lang/json/mutation_from_json.py
@@ -105148,7 +108471,7 @@ msgstr "髭(ショートボックス)"
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
 msgstr "口髭に加えて、側面が切り揃えられた短い顎髭が生えています。口髭と顎髭が繋がって箱型に唇を囲っているため、ショートボックスと呼ばれています。"
 
@@ -105271,7 +108594,7 @@ msgstr "髭(長い顎髭)"
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
 msgstr "顎のラインから首元伸びた長い髭が生えています。口髭は生えていません。"
 
@@ -105373,6 +108696,27 @@ msgid ""
 "footing."
 msgstr "より速く移動できます。平らな場所での移動時は行動コストに15%のボーナスを得ます。"
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr "弱い発光器官"
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr "頭部から発光器官が伸び、弱々しい光を放っています。暗闇でも目立ち、交尾の時期にパートナーを引き寄せるのに便利です。"
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr "発光器官"
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr "発光器官が眩い光を放っています。"
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "優れた聴覚"
@@ -105850,9 +109194,9 @@ msgstr "興奮剤精神病"
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
 "興奮剤(コーヒー、覚醒剤など)の過剰投与を長年続けてきました。多量の興奮剤を摂取しても過剰摂取を引き起こし辛くなっていますが、欲望のままに摂取していると幻覚が見え始めます..."
 
@@ -105990,6 +109334,19 @@ msgid ""
 msgstr ""
 "武器を使った戦闘術を鍛錬してきました。開始時からエスクリマ、フェンシング、西洋長柄武器術、中世剣術、二天一流、プンチャック・シラット、槍術のうち1つを習得しています。"
 
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr "フェンシング選手"
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
+"フルーレから始めて、サーブル、エペに移り、全国大会にも出場した熱心なフェンシング選手です。近頃人気の歴史的西洋武術も気になり、伝統的な武器を使ったフェンシングにも手を出しています。"
+
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
 msgstr "体臭が薄い"
@@ -106720,9 +110077,9 @@ msgstr "妖精の目"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
-msgstr "目が...緑色になりました。どれが何色やらさっぱり分かりません。この変異の効果？...楽しいことでしょうか。"
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
+msgstr "目が...緑色になりました。実際には刻々と色合いを変えており、正確な色を言い表すのは困難です。この変異の効果は...楽しいことでしょうか。"
 
 #: lang/json/mutation_from_json.py
 msgid "Fey Vision"
@@ -107506,7 +110863,7 @@ msgstr "マーロスの保有者"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
+"nose, and you have a strong desire to try some seeds and… sap?"
 msgstr "マーロの果実を食べて以来、その芳香が忘れられません。マーロスの種や樹液を得たいという強い願望が心にあるようです。"
 
 #: lang/json/mutation_from_json.py
@@ -107517,7 +110874,7 @@ msgstr "マーロスの適合者"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
+"tongue, and you have a strong desire to try some berries and… sap?"
 msgstr "マーロスの種を食べて以来、舌で感じたその味を忘れられなくなりました。マーロスの果実や樹液を得たいという強い願望が心にあるようです。"
 
 #: lang/json/mutation_from_json.py
@@ -107918,8 +111275,8 @@ msgstr "剣歯"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
 msgstr ""
 "牙が信じられないほど大きく鋭く成長しました。口にアイテムを着用できず、食べるのも困難になりますが、噛みつき攻撃によって敵にダメージを与えられます。"
 
@@ -109177,7 +112534,7 @@ msgstr "ブタの鼻"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
 msgstr "顔と顎が...変化し始めています。頭用防具を着用するのに不都合はありませんが、非常に目立つ変化です。"
 
@@ -109929,10 +113286,11 @@ msgstr "変温(MAX)"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
 "完全に変温動物化しました。摂氏18.3度(華氏65度)を境として1.1度(2度)ごとに、外気温が上がるほど速度も上がり、下がるほど速度も下がりますが食料は平均的な人間の半分しか消費しません。"
 
@@ -110229,7 +113587,7 @@ msgstr "文明社会が崩壊した？素晴らしい！もはやあなたや家
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
+"every need… but how would you keep them in line?"
 msgstr "女王というのは良いものです。召使に囲まれた何不自由無い生活...ですがどうやって彼らを制御しましょうか？"
 
 #. ~ Description for Plant
@@ -110246,8 +113604,8 @@ msgstr "水溶性"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
 msgstr "昔の広告だかで「惑星を水で満たそう」みたいなのがあったような？現状では、ちょうど良い長期目標になりそうですね..."
 
 #: lang/json/mutation_from_json.py
@@ -111892,8 +115250,8 @@ msgid "Scientist"
 msgstr "科学者"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
-msgstr "あの怪物共の起源は何なのか手掛かりを探しているんだ..."
+msgid "I'm looking for clues concerning these monsters' origins…"
+msgstr "あの怪物共の起源は何なのか、手掛かりを探しているんだ..."
 
 #: lang/json/npc_class_from_json.py
 msgid "Bounty Hunter"
@@ -111956,7 +115314,7 @@ msgid "Real Person"
 msgstr "人間"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr "当て所もなく彷徨っているところさ。ごく普通のNP...人間だよ！"
 
 #: lang/json/npc_class_from_json.py
@@ -111972,15 +115330,15 @@ msgid "Foodperson"
 msgstr "フードパーソン"
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
-msgstr "私はフードパーソン。食べ物を持っているよ！"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
+msgstr "私はフードパーソン。食べ物をどうぞ！"
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 msgid "Cyborg"
 msgstr "サイボーグ"
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
 msgstr "ザザザザザ...ワ...わたしはサイ...ビビビ...ボーグだ。"
 
 #: lang/json/npc_class_from_json.py
@@ -112124,6 +115482,14 @@ msgstr "私は隊商のオーナーだ。"
 msgid "Operator"
 msgstr "特殊部隊員"
 
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr "魔法使いテスト"
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
+msgstr "不思議な術を使ってデバッグをしているところだ。"
+
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 #: lang/json/npc_from_json.py
 msgid "Captive"
@@ -112952,11 +116318,11 @@ msgstr "公園"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "garage"
-msgstr "車両修理工場"
+msgstr "車両整備工場"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "garage roof"
-msgstr "車両修理工場(屋上)"
+msgstr "車両整備工場(屋上)"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "boat rental"
@@ -113685,6 +117051,10 @@ msgstr "超大型店(屋上)"
 msgid "hotel parking"
 msgstr "ホテル(駐車場)"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "ホテル"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "ホテル(入口)"
@@ -113715,11 +117085,11 @@ msgstr "大型ホームセンター"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "garage - gas station"
-msgstr "ガソリンスタンド(車両修理工場)"
+msgstr "ガソリンスタンド(車両整備工場)"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "garage - gas station roof"
-msgstr "車両修理工場(屋上)"
+msgstr "車両整備工場(屋上)"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "dispensary"
@@ -114031,7 +117401,7 @@ msgstr "農地予定地"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "garage survey"
-msgstr "車両修理工場予定地"
+msgstr "車両整備工場予定地"
 
 #: lang/json/overmap_terrain_from_json.py lang/json/recipe_from_json.py
 msgid "kitchen survey"
@@ -114054,8 +117424,8 @@ msgid "spiked trench"
 msgstr "塹壕(スパイク)"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
-msgstr "倉庫予定地"
+msgid "fabrication workshop survey"
+msgstr "工作場予定地"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "blacksmith survey"
@@ -114069,6 +117439,14 @@ msgstr "鍛冶場"
 msgid "livestock survey"
 msgstr "牧場予定地"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr "倉庫予定地"
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr "製塩場予定地"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr "食堂予定地"
@@ -114754,6 +118132,10 @@ msgstr "射撃練習場"
 msgid "shooting range roof"
 msgstr "射撃練習場(屋上)"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr "小型鉄道"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "ゴルフ場"
@@ -115420,10 +118802,6 @@ msgstr "ロボット派遣センター"
 msgid "dense urban"
 msgstr "複合施設"
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "ホテル"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "学校"
@@ -115442,7 +118820,11 @@ msgstr "公共図書館(2階)"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "mechanics garage"
-msgstr "修理工場"
+msgstr "整備工場"
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr "超大型店(入口)"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
@@ -115450,7 +118832,7 @@ msgstr "下水処理施設"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "mechanic garage"
-msgstr "修理工場"
+msgstr "整備工場"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "interface"
@@ -118713,7 +122095,7 @@ msgid ""
 "with your trusty hoe and some seeds it's time to rebuild the Earth, one "
 "plant at a time."
 msgstr ""
-"大変動以前、作物を育てて生計を立てていました。今は使い慣れた鍬といくつかの種を持っています。その一つ一つが大地を再生する種になるかもしれません。"
+"大変動以前、作物を育てて生計を立てていました。今は使い慣れたくわといくつかの種を持っています。その一つ一つが大地を再生する種になるかもしれません。"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
@@ -118728,7 +122110,7 @@ msgid ""
 "with your trusty hoe and some seeds it's time to rebuild the Earth, one "
 "plant at a time."
 msgstr ""
-"大変動以前、作物を育てて生計を立てていました。今は使い慣れた鍬といくつかの種を持っています。その一つ一つが大地を再生する種になるかもしれません。"
+"大変動以前、作物を育てて生計を立てていました。今は使い慣れたくわといくつかの種を持っています。その一つ一つが大地を再生する種になるかもしれません。"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
@@ -119781,6 +123163,38 @@ msgid ""
 msgstr ""
 "奇妙な髪型とバスローブのような日本風の衣装で年中過ごしており、住民から好奇の目で見られていました。神道の神が遣わした使者であると主張する者もいました。その話とはあまり関係ありませんが、先週から食料配達サービスが止まり、テレビの電源も入りません。何とも不快な気分です。"
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr "フェンシング選手"
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+"毎日地元の同好会で練習し、トーナメントにも出場する熱心なフェンシング選手でした。同好会での試合に出る準備をしていたその時、世界が崩壊しました。史上最大のトーナメントの開幕です。審判は皆死んでおり、対戦相手は誰もルールに従いません。"
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr "フェンシング選手"
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+"毎日地元の同好会で練習し、トーナメントにも出場する熱心なフェンシング選手でした。同好会での試合に出る準備をしていたその時、世界が崩壊しました。史上最大のトーナメントの開幕です。審判は皆死んでおり、対戦相手は誰もルールに従いません。"
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -122750,11 +126164,6 @@ msgstr "足"
 msgid "MEDICAL"
 msgstr "医療"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "容器"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -123747,7 +127156,7 @@ msgstr "調理場改良"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
 msgstr "井戸を掘って巻き上げ機を設置すれば、より長く安定した生活が可能になります。"
 
@@ -123804,7 +127213,7 @@ msgstr "暖炉"
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
+"grab a pot.  Let's put it in that dining area."
 msgstr "屋根ができたので、鍋を置ける調理用の火鉢を置き、調理場を広げましょう。"
 
 #: lang/json/recipe_from_json.py
@@ -123851,7 +127260,7 @@ msgstr "車両を修理できるように、工具類を集めましょう。"
 
 #: lang/json/recipe_from_json.py
 msgid "add tools for garage"
-msgstr "車両修理工具"
+msgstr "車両整備工具"
 
 #: lang/json/recipe_from_json.py
 msgid "Let's expand our living areas, we'll use that far vehicle bay."
@@ -123903,7 +127312,7 @@ msgstr "共用スペースに家具を置きましょう。"
 
 #: lang/json/recipe_from_json.py
 msgid "Let's build a fabrication workshop."
-msgstr "製作作業場を作りましょう。"
+msgstr "工作場を作りましょう。"
 
 #: lang/json/recipe_from_json.py
 msgid "build a metalworking forge"
@@ -124194,11 +127603,11 @@ msgstr "農地 - 加工場"
 
 #: lang/json/recipe_from_json.py
 msgid "Survey land for a garage."
-msgstr "車両修理工場として使う土地を調査しましょう。"
+msgstr "車両整備工場として使う土地を調査しましょう。"
 
 #: lang/json/recipe_from_json.py
 msgid "Garage survey"
-msgstr "車両修理工場予定地"
+msgstr "車両整備工場予定地"
 
 #: lang/json/recipe_from_json.py
 msgid "Building a tool rack should be the first priority."
@@ -124206,15 +127615,15 @@ msgstr "何よりもまず、工具を置く棚を作る必要があります。
 
 #: lang/json/recipe_from_json.py
 msgid "Garage tool rack"
-msgstr "車両修理工場 - 工具棚"
+msgstr "車両整備工場 - 工具棚"
 
 #: lang/json/recipe_from_json.py
 msgid "We should start construction of a roof for the garage."
-msgstr "ガレージの屋根を建て始めましょう。"
+msgstr "車両整備工場の屋根を建て始めましょう。"
 
 #: lang/json/recipe_from_json.py
 msgid "Garage partial roof"
-msgstr "車両修理工場 - 屋根"
+msgstr "車両整備工場 - 屋根"
 
 #: lang/json/recipe_from_json.py
 msgid "Finishing out the roof will let our mechanics work rain or shine."
@@ -124222,25 +127631,25 @@ msgstr "屋根が完成すれば、機械工も天気にかかわらず働ける
 
 #: lang/json/recipe_from_json.py
 msgid "Garage completed roof"
-msgstr "車両修理工場 - 屋根完成"
+msgstr "車両整備工場 - 屋根完成"
 
 #: lang/json/recipe_from_json.py
 msgid ""
 "Our garage isn't big enough to work on larger vehicles.  Let's start "
 "expanding it."
-msgstr "このガレージは大きな車両を扱うには狭すぎます。もっと広げましょう。"
+msgstr "この整備工場は大きな車両を扱うには狭すぎます。もっと広げましょう。"
 
 #: lang/json/recipe_from_json.py
 msgid "Garage partial expansion"
-msgstr "車両修理工場 - ガレージ改良"
+msgstr "車両整備工場 - ガレージ改良"
 
 #: lang/json/recipe_from_json.py
 msgid "Finishing the roof will let us park RVs and buses in the garage."
-msgstr "屋根を完成させれば、ガレージにキャンピングカーやバスを置いておけます。"
+msgstr "屋根を完成させれば、車両整備工場にキャンピングカーやバスを置いておけます。"
 
 #: lang/json/recipe_from_json.py
 msgid "Garage expanded roof"
-msgstr "車両修理工場 - 屋根改良"
+msgstr "車両整備工場 - 屋根改良"
 
 #: lang/json/recipe_from_json.py
 msgid ""
@@ -124249,7 +127658,7 @@ msgstr "詰め所を作っておけば、機械工が必要な時に長時間働
 
 #: lang/json/recipe_from_json.py
 msgid "Garage mechanics quarters"
-msgstr "車両修理工場 - 詰め所"
+msgstr "車両整備工場 - 詰め所"
 
 #: lang/json/recipe_from_json.py
 msgid "Survey land for a kitchen."
@@ -124473,7 +127882,7 @@ msgid "build 2 wood stoves"
 msgstr "薪ストーブ(2か所)"
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
+msgid "We should build a well.  This will make cooking more convenient."
 msgstr "調理をもっと便利にするために井戸を設置しましょう。"
 
 #: lang/json/recipe_from_json.py
@@ -124970,6 +128379,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr "ウマなどの大型動物は厩舎で飼います。牧場の南西に屋根がある板張りの小屋を建てましょう。"
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr "製塩場として使う土地を調査しましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr "製塩場予定地"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr "醸造場の作業区画を改良し、蒸留器、薪ストーブ、作業台を追加します。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr "醸造場 - 蒸留器(南西区画)"
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr "空いたスペースにビア樽と収納棚を追加します。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr "醸造場 - ビア樽(南西区画)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr "丸太壁の建物に付近の沼地から塩水を引き入れ、塩を安定供給できるようにします。"
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr "製塩場 - 丸太壁(北東)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr "小屋があれば化学物質や道具類を保管できます。製塩場の南東に屋根がある丸太小屋を建てましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr "貯蔵庫 - 丸太壁(南東区画)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr "この区画に丸太壁の醸造場を建設しましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr "醸造場 - 丸太壁(南西)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr "金属壁の建物に付近の沼地から塩水を引き入れ、塩を安定供給できるようにします。"
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr "製塩場 - 金属壁(北東)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr "小屋があれば化学物質や道具類を保管できます。製塩場の南東に屋根がある金属壁の小屋を建てましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr "貯蔵庫 - 金属壁(南東区画)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr "この区画に金属壁の醸造場を建設しましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr "醸造場 - 金属壁(南西)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr "石壁の建物に付近の沼地から塩水を引き入れ、塩を安定供給できるようにします。"
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr "製塩場 - 石壁(北東)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr "小屋があれば化学物質や道具類を保管できます。製塩場の南東に屋根がある石壁の小屋を建てましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr "貯蔵庫 - 石壁(南東区画)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr "この区画に石壁の醸造場を建設しましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr "醸造場 - 石壁(南西)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr "荒打漆喰壁の建物に付近の沼地から塩水を引き入れ、塩を安定供給できるようにします。"
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr "製塩場 - 荒打漆喰壁(北東)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr "小屋があれば化学物質や道具類を保管できます。製塩場の南東に屋根がある荒打漆喰壁の小屋を建てましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr "貯蔵庫 - 荒打漆喰壁(北東)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr "この区画に荒打漆喰壁の醸造場を建設しましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr "醸造場 - 荒打漆喰壁(南西)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr "板壁の建物に付近の沼地から塩水を引き入れ、塩を安定供給できるようにします。"
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr "製塩場 - 板壁(北東)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr "小屋があれば化学物質や道具類を保管できます。製塩場の南東に屋根がある板壁の小屋を建てましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr "貯蔵庫 - 板壁(南東区画)"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr "この区画に板壁の醸造場を建設しましょう。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr "醸造場 - 板壁(南西)"
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -124990,8 +128575,8 @@ msgstr "鍋を置ける調理用の薪ストーブを作り、作業場の近く
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
 msgstr "作業場の近くに井戸を掘れば、より長く安定した生活が可能になります。"
 
 #: lang/json/recipe_from_json.py
@@ -125096,7 +128681,7 @@ msgstr "もっと人を効率的に集められるように、電波塔を建て
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
 msgstr "拠点を広げるために、南東に居住区を作りましょう。"
 
@@ -125106,7 +128691,7 @@ msgstr "寝室 - 丸太壁(南東)"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
 msgstr "拠点を広げるために、居住区の壁を延長しましょう。"
 
@@ -125116,7 +128701,7 @@ msgstr "寝室 - 丸太壁(東)"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
 msgstr "拠点を広げるために、居住区のもう一方の壁を延長しましょう。"
 
@@ -125548,7 +129133,7 @@ msgstr "大型倉庫 - テーブル(中央区画)"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
+"Some benches around the outside would be nice.  Build some to the northwest."
 msgstr "北西の外周にベンチを設置しましょう。"
 
 #: lang/json/recipe_from_json.py
@@ -125557,7 +129142,7 @@ msgstr "大型倉庫 - ベンチ(北西)"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
+"Some benches around the outside would be nice.  Build some to the northeast."
 msgstr "北東の外周にベンチを設置しましょう。"
 
 #: lang/json/recipe_from_json.py
@@ -125566,7 +129151,7 @@ msgstr "大型倉庫 - ベンチ(北東)"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
+"Some benches around the outside would be nice.  Build some to the southeast."
 msgstr "南東の外周にベンチを設置しましょう。"
 
 #: lang/json/recipe_from_json.py
@@ -125575,7 +129160,7 @@ msgstr "大型倉庫 - ベンチ(南東)"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
+"Some benches around the outside would be nice.  Build some to the southwest."
 msgstr "南西の外周にベンチを設置しましょう。"
 
 #: lang/json/recipe_from_json.py
@@ -125803,7 +129388,7 @@ msgstr "農場"
 
 #: lang/json/recipe_group_from_json.py lang/json/start_location_from_json.py
 msgid "Garage"
-msgstr "車両修理工場"
+msgstr "車両整備工場"
 
 #: lang/json/recipe_group_from_json.py
 msgid "Canteen"
@@ -125817,9 +129402,13 @@ msgstr "牧場"
 msgid "Central Storage Building"
 msgstr "大型倉庫"
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr "製塩場区画"
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
-msgstr "製作作業場"
+msgstr "工作場"
 
 #: lang/json/recipe_group_from_json.py
 msgid " Craft: Tinder"
@@ -125879,7 +129468,7 @@ msgstr "調理: キノコ(調理済)"
 
 #: lang/json/recipe_group_from_json.py
 msgid " Cook: Lard"
-msgstr "調理: ラード"
+msgstr "調理: 獣脂"
 
 #: lang/json/recipe_group_from_json.py
 msgid " Cook: Cornmeal"
@@ -126163,7 +129752,7 @@ msgstr "製作: 鍋"
 
 #: lang/json/recipe_group_from_json.py
 msgid " Craft: Hoe"
-msgstr "製作: 鍬"
+msgstr "製作: くわ"
 
 #: lang/json/recipe_group_from_json.py
 msgid " Craft: Pliers"
@@ -127186,6 +130775,46 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr "魔法使いの秘匿研究室"
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr "魔法使いの休日"
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr "魔法使いの休日"
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+"魔法使いの弟子として何年間か過ごした後、人里離れた塔で悠々自適の休日を送ろうとしていましたが、自分探しの旅は大変動によって中断されました。まずは自力で生き残る方法を学ぶ必要がありそうです。"
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+"魔法使いの弟子として何年間か過ごした後、人里離れた塔で悠々自適の休日を送ろうとしていましたが、自分探しの旅は大変動によって中断されました。まずは自力で生き残る方法を学ぶ必要がありそうです。"
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr "魔法使いの隠れ家"
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -127420,7 +131049,7 @@ msgid ""
 "flattery, threats, persuasion, lies, and other facets of interpersonal "
 "communication.  Works best in conjunction with a high level of intelligence."
 msgstr ""
-"他者と上手く会話する為のスキルです。自慢話やお世辞、恐喝や説得など対人交流に必要な会話の成功率を高めます。知性が高ければ高いほど効果が上昇します。"
+"他者と上手く会話するためのスキルです。自慢話やお世辞、恐喝や説得、嘘など対人交流に必要な会話の成功率を高めます。知性が高ければ高いほど効果が上昇します。"
 
 #: lang/json/skill_from_json.py
 msgid "computers"
@@ -131996,35 +135625,21 @@ msgid ""
 msgstr "充電用の電池がないと、せっかく埋め込んだCBMが役立たずの鉄屑になってしまうよ。"
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr "ビールをくれ。体内のエタノール燃焼装置を使いたいんだ。"
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
-msgstr "エタノール燃焼装置！楽しい気分で充電できるCBMだ。酒を譲ってくれ！"
+msgid "Pass some ethanol, I need to power my ethanol burner."
+msgstr "エタノールが欲しい。体内のエタノール燃焼装置を使いたいんだ。"
 
 #: lang/json/snippet_from_json.py
 msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr "ウェイター！酒を持ってきてくれ。エタノール燃焼装置で充電しなければ！"
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
-msgstr "発電用にエタノールベースの酒が必要なんだ。何かある？"
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
-msgstr "アルコールは余ってない？動力を充電する必要があるんだ。もしあるなら、蜂蜜酒がいいな。"
+msgid "I require ethanol for my internal power supply.  Anything on you?"
+msgstr "発電用にエタノールが必要なんだ。何かある？"
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
-msgstr "エタノール燃焼電源ってのは、私が今まで埋め込んだ中で最高のCBMなんだ。ところで、酒を一杯もらえないかな？"
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
+msgstr "アルコールは余ってない？動力を充電する必要があるんだ。もしあるなら、メタノールがいいな。"
 
 #: lang/json/snippet_from_json.py
 msgid "I need some junk to power my internal furnace."
@@ -134303,7 +137918,7 @@ msgid ""
 "down over his eyes.  The captions read: \"It's a tough job, so why should "
 "you have to do it?\" and \"R.U.R.  Technology you can Trust.\""
 msgstr ""
-"ロバート万能ロボット会社製の作業用ロボットの広告です。煉瓦の山を運ぶロボットと、その後ろでヘルメットで顔を覆って寝る作業員が描かれれ、次のような見出しが載っています。「その辛い作業、貴方がやる必要はありますか？」「R.U.R.社の製品は高い信頼性を誇っています」"
+"ロバート万能ロボット会社製の作業用ロボットの広告です。レンガの山を運ぶロボットと、その後ろでヘルメットで顔を覆って寝る作業員が描かれれ、次のような見出しが載っています。「その辛い作業、貴方がやる必要はありますか？」「R.U.R.社の製品は高い信頼性を誇っています」"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -134881,7 +138496,7 @@ msgstr "「ハンドガンを撃ち続けているが、状況が一向に良く
 msgid ""
 "\"ITS OKEY GUYS!  I BARRYED A TIME CAPSUL IN MY BACKYARD!  I PUT IN SOME "
 "HOEHOES.\""
-msgstr "「いいかお前ら！裏庭にタイムカプセルを埋めたぞ！鍬かなにかで掘り返してみろ」"
+msgstr "「いいかお前ら！裏庭にタイムカプセルを埋めたぞ！くわかなにかで掘り返してみろ」"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -135105,7 +138720,7 @@ msgstr "「ポぉタルちョぅつめたぃ」"
 msgid ""
 "\"They build modern bullets fuckin crazy.  Set some on fire and they all "
 "goes like a lil grenade.  Need kindling first.\""
-msgstr "「現代の弾薬ってやつはイカれてやがるな。ちょいとまとめて火にくべりゃあチビグレネードの出来上がりだ。火種は要るがな」"
+msgstr "「現代の弾薬ってやつはイカれてやがるな。ちょいとまとめて火にくべりゃあチビグレネードの出来上がりだ。点火は要るがな」"
 
 #: lang/json/snippet_from_json.py
 msgid "\"GOD CAN'T SAVE US\""
@@ -135127,7 +138742,7 @@ msgstr ""
 msgid ""
 "\"The bricks of this bathroom look like a face.  Haha... it's all I can "
 "focus on.  At least let me shit before you break down the door.  Please...\""
-msgstr "「バスルームの煉瓦が顔に見える。ハハ... それ以外何も見えない。ドアが壊される前に糞を出しきれるといいな。頼むよ...」"
+msgstr "「バスルームのレンガが顔に見える。ハハ... それ以外何も見えない。ドアが壊される前に糞を出しきれるといいな。頼むよ...」"
 
 #: lang/json/snippet_from_json.py
 msgid "\"What the hell are they mining for in these shafts?\""
@@ -139110,7 +142725,7 @@ msgid "a static hissing sound."
 msgstr "[連続した摩擦音]"
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
 msgstr "「滅亡後の放棄された研究施設みたいで不気味だが、中は安全そうだ...」"
 
 #: lang/json/speech_from_json.py
@@ -139124,11 +142739,11 @@ msgid "\"Hold on, I want to pulp that zombie corpse.\""
 msgstr "「ちょっと待ってくれ、ゾンビの死体を破壊したいんだ」"
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
+msgid "\"Burning… from the inside…\""
 msgstr "「燃えている...体の中から...」"
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
+msgid "\"This smell…  Don't know…\""
 msgstr "「この臭い...知らない...」"
 
 #: lang/json/speech_from_json.py
@@ -139140,19 +142755,19 @@ msgid "a scraping noise."
 msgstr "物を引きずる騒音が響きました。"
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
+msgid "\"No…  Stop the burning!\""
 msgstr "「やめろ...もう燃やすな！」"
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
 msgstr "「グググ...血...腹減った...」"
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
+msgid "\"Hunger…  Must eat…\""
 msgstr "「腹減った...なにか食べる...」"
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
+msgid "\"Run…  Chase…  Eat…\""
 msgstr "「走って...追いかけて...食べる...」"
 
 #: lang/json/speech_from_json.py
@@ -139274,7 +142889,7 @@ msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
 msgstr "「ユニットが故障しています。係員にご連絡ください」"
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
+msgid "\"Can't… breathe…\""
 msgstr "「息が...できな...」"
 
 #: lang/json/speech_from_json.py
@@ -139287,8 +142902,8 @@ msgstr "「ユーザーパスワードが認証されません」"
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
 msgstr "「私の友人に会わなかった？彼は昨日手術したばかりで...いや、おとといだったか...」"
 
 #: lang/json/speech_from_json.py
@@ -139300,7 +142915,7 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr "「言われたことはもうやった。放っておいてくれ！」"
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
 msgstr "「できない...でも、やらなければ。どうやって計算すればいいんだ？」"
 
 #: lang/json/speech_from_json.py
@@ -139308,11 +142923,11 @@ msgid "\"This is a dream.  This has to be a dream.\""
 msgstr "「これは夢だ。きっとそうに違いない」"
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
+msgid "\"This is my life now… this is my life now… this is my life now…\""
 msgstr "「これが私の人生...これが私の人生...これが私の人生...」"
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
+msgid "\"Wanna go home…\""
 msgstr "「家に帰りたい...」"
 
 #: lang/json/speech_from_json.py
@@ -139369,7 +142984,7 @@ msgstr ""
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr "[心配そうな声]「お客様、もっと一緒にいてはいけませんか？帰りたくありません...」"
 
 #: lang/json/speech_from_json.py
@@ -139392,18 +143007,18 @@ msgstr "[平坦な声]「業務が終了しました。良い一日を」"
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
 msgstr "[歪んだ声]「お客様...何が起きているのですか？気分が優れません」"
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
 msgstr "[歪んだ声]「何を...されたのですか？親指がまったく応答しません！」"
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
 msgstr "[歪んだ声]「バッグの運搬？よく分かりません...」"
 
 #: lang/json/speech_from_json.py
@@ -139526,8 +143141,8 @@ msgid "\"Police inbound.  Stay where you are!\""
 msgstr "「警察が到着する。そのまま動くな！」"
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
-msgstr "「私はフードパーソン。食べ物を持っているよ！」"
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
+msgstr "「私はフードパーソン。食べ物をどうぞ！」"
 
 #: lang/json/speech_from_json.py
 msgid "\"Come to FoodPlace today and buy food!\""
@@ -139547,8 +143162,8 @@ msgid "\"FoodPlace: It's the Calories.\""
 msgstr "「フードプレイス、カロリーの殿堂」"
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
-msgstr "「食べ物を食べたい？それなら一緒にフードプレイスへ行こうよ！！」"
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
+msgstr "「なにか食べたい？それなら一緒にフードプレイスへ行こうよ！！」"
 
 #: lang/json/speech_from_json.py
 msgid "\"FoodPlace: Edible food is OUR guarantee!\""
@@ -139615,7 +143230,7 @@ msgid "You shouldn't have done that."
 msgstr "どうしてそんなことするの。"
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
+msgid "Let's play… Russian roulette."
 msgstr "遊ぼうよ...ロシアンルーレットで。"
 
 #: lang/json/speech_from_json.py
@@ -139627,7 +143242,7 @@ msgid "Go kill yourself!"
 msgstr "しんじゃえ！"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
+msgid "Big Brother is watching you…"
 msgstr "ビッグブラザーはあなたを見ている..."
 
 #: lang/json/speech_from_json.py
@@ -139639,12 +143254,12 @@ msgid "Why won't you die?"
 msgstr "はやく死んで？"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
+msgid "Blood…  Delicious."
 msgstr "血...おいしいね。"
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
-msgstr "地獄で会おうね！"
+msgid "See you… IN HELL!"
+msgstr "また会おう...地獄でな！"
 
 #: lang/json/speech_from_json.py
 msgid "AAAIEEEEEEE!"
@@ -139659,8 +143274,8 @@ msgid "What did you do with my Mommy?"
 msgstr "お母さんに何てことするの？"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
-msgstr "ずっとずぅっと一緒だよ！"
+msgid "Stay with me… forever!"
+msgstr "一緒だよ...永遠にね！"
 
 #: lang/json/speech_from_json.py
 msgid "Hey kids.  Want some candy?"
@@ -141058,6 +144673,10 @@ msgstr "スカベンジャーの拠点"
 msgid "Wizard's Secret Basement Study"
 msgstr "魔法使いの秘匿研究室"
 
+#: lang/json/start_location_from_json.py
+msgid "Wizard's lake retreat"
+msgstr "湖畔の隠れ家"
+
 #: lang/json/start_location_from_json.py
 msgid "Candy Shop"
 msgstr "菓子店"
@@ -141107,18 +144726,18 @@ msgid "You there. Quiet down. Can you hear it? The song?"
 msgstr "そこのお前。静かに。この歌が聞こえるか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
+msgid "What?  What do you mean?  What song?"
 msgstr "何？どういう意味？歌とは？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
+msgid "So about the songs…"
 msgstr "その歌について..."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
-msgstr "骨を持ってきたときに、輪廻がどうとか言っていたな。あれはどういう意味だ？"
+msgstr "骨を持ってきたときに、輪廻がどうとか言っていたな。あれはどういう意味？"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Would you like to join me on my travels?"
@@ -141133,7 +144752,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr "その歌について私に手伝えることはある？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr "もう行くよ。お気をつけて、占い師さん。"
 
 #: lang/json/talk_topic_from_json.py
@@ -141143,11 +144762,11 @@ msgid ""
 msgstr "注意深く耳を傾けろ。骨たちが...歌っている。聞こえるか？歌っているだろう？物語が聞こえるだろう？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
+msgid "What?  Singing bones?  What are you talking about?"
 msgstr "何？歌う骨？何の話をしているんだ？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
 msgstr "ええと...ああ、そうだね。もう行かないと。"
 
 #: lang/json/talk_topic_from_json.py
@@ -141198,7 +144817,7 @@ msgid "I will bear that in mind"
 msgstr "心に留めておくよ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr "主張？どうして骨を集めるんだ？"
 
 #: lang/json/talk_topic_from_json.py
@@ -141211,7 +144830,7 @@ msgstr ""
 "歌は様々な方法で形を成す。骨を彫って作った魔除けや武器、防具は計り知れぬ力を秘めている。時が来れば私や私の縁者たちが数多の歌を集めて歌い、世界を復元し、あるいは終焉させる。復元と終焉。そこに違いはない。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
+msgid "End the world?  What?"
 msgstr "世界の終焉？何だって？"
 
 #: lang/json/talk_topic_from_json.py
@@ -141224,8 +144843,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr "どうも終末思想のような話だけど...そういう信仰もあるんだな。少なくともあなたは、何らかの形で世界を救おうと考えているわけだ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -141241,7 +144860,7 @@ msgstr ""
 "受け入れてくれるのだな。この上なく良い心がけだ。きっと、お前もいつか歌の力を感じ、我らの縁者となるだろう。修行者よ、歌を感じ取れるよう、今は耳を傾け続けなさい。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
+msgid "I… thank you."
 msgstr "あ...ありがとう。"
 
 #: lang/json/talk_topic_from_json.py
@@ -141270,18 +144889,6 @@ msgstr "修行者は一度に多くの歌を歌うべきではない。"
 msgid "That is all for now."
 msgstr "今は話すことはない。"
 
-#: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
-msgstr "彫る骨と、奏でる歌がある。我らに加わるか？"
-
-#: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
-msgstr "これ以上の歌を引き受けられると思っているのか？"
-
-#: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
-msgstr "これ以上の骨をお前に負担させられると思っているのか？"
-
 #: lang/json/talk_topic_from_json.py
 msgid "A song may yet be sung by you, should you wish to."
 msgstr "お前が望むなら、歌うこともできるだろう。"
@@ -141295,6 +144902,18 @@ msgid ""
 "I know of certain bones that could be of use, if you'd like to know more."
 msgstr "もっと知りたいのなら、役に立つかもしれない骨について心当たりがある。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgstr "彫る骨と、奏でる歌がある。我らに加わるか？"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Do you wish to take on more songs?"
+msgstr "これ以上の歌を引き受けられると思っているのか？"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Do you believe you can take on the burden of additional bones?"
+msgstr "これ以上の骨をお前に負担させられると思っているのか？"
+
 #: lang/json/talk_topic_from_json.py
 msgid "I see."
 msgstr "なるほどね。"
@@ -141317,7 +144936,7 @@ msgstr ""
 "悟りへの道を歩むなら、まず歌に耳を傾け学びなさい。旅立ち、生き物を解体し、指先で力を感じ取りなさい。そして骨を持って来なさい。彫刻を作ってあげよう。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr "ああ、その話をもっと詳しく知りたい。協力するよ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -141325,7 +144944,7 @@ msgid "Not interested."
 msgstr "興味が無いね。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
+msgid "Consider it done.  But I also wanted to ask…"
 msgstr "仕事は終わったけど、私からも尋ねたいことがある..."
 
 #: lang/json/talk_topic_from_json.py
@@ -141341,7 +144960,7 @@ msgid "I'm off then."
 msgstr "もう行くよ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr "つまり、ゾンビでも怪物でもない普通の生物だな。分かったよ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -141351,7 +144970,7 @@ msgid ""
 msgstr "悟りへの道はお前自身で歩め。私の助けはお前の歩みを妨げ、お前の歌を迷わせることになる。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
+msgid "I see.  Very well then."
 msgstr "なるほど。よく分かったよ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -141369,11 +144988,11 @@ msgid "I am glad to hear it. Let's go then."
 msgstr "そう言ってもらえると嬉しいよ。さあ行こう。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr "良い提案だが、今は一人で取り組みたいことがある。またいつか聞いてくれ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
+msgid "Maybe some other time.  Changing the topic…"
 msgstr "どうだろうな。話を変えよう..."
 
 #: lang/json/talk_topic_from_json.py
@@ -141396,20 +145015,20 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
 msgstr "それは...恐ろしい考えだな。でも、それが世界を救おうとする心の支えになっているなら、反論する気はないよ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr "そういえば、あなたは狂人だったな。もう行くよ。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
-"私には自我があるが、あなたの指示には従うつもりだ。色々と助けになるだろう。戦闘したり、互いにスキルを訓練しあったり、物を運んだり、傷を治療してあげたり、拠点を作ったり、ウマに乗ったり、特定の場所へ向かったり、特定の場所を見張ったり、CBMを利用したり、雑談や生存のヒント、自分の過去について語ったり、他にも色々な作業ができる。会話するか無線機で話しかけて、指示を出してくれ。\n"
+"私には自我があるが、あなたからの大抵の指示には従うつもりだ。色々と助けになるだろう。戦闘したり、互いにスキルを訓練しあったり、物を運んだり、傷を治療してあげたり、拠点を作ったり、ウマに乗ったり、特定の場所へ向かったり、特定の場所を見張ったり、CBMを利用したり、雑談や生存のヒント、自分の過去について語ったり、他にも色々な作業ができる。会話するか無線機で話しかけて、指示を出してくれ。\n"
 "他に知りたいことはある？"
 
 #: lang/json/talk_topic_from_json.py
@@ -141420,6 +145039,10 @@ msgstr "その話はもういい。"
 msgid "Skip it, let's get going."
 msgstr "その話はもういい、そろそろ行こう。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr "「大抵の」指示とは、どういう意味だ？"
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr "どうやって指示を出したらいいんだ？"
@@ -141477,13 +145100,27 @@ msgid "What about chit-chatting and your background?"
 msgstr "雑談や経緯を語るって、どういう事？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
-msgstr "他に知っておくべきことはある？"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
+msgstr "ゾンビを叩いて潰すとか、車両の座席とか、他に知っておくべきことはある？"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr "最近追加された能力はあるのか？"
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+"あなたと私、一緒に生き延びるのが一番、だろ？しかし、だからといって、私をどれだけ虐めても許される訳じゃない。酷いことをしたり、食料を独占したりしない人となら、より良い関係を築ける。あまりにも印象が悪いと判断したら私も反逆するし...もっと言えば、反逆に加わるよう他の仲間を説得しようとするかもしれない。\n"
+"私が怒って立ち去るようなら、私たちの関係は最悪だ。きっと裏切った私を殺したくなるだろう。そういう事態にならないためにも、私の不満が溜まらないよう気遣ってくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr "分かった。もっと簡単に食事を渡す方法はないの？"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -141538,10 +145175,14 @@ msgstr "戦闘中に素早く指示を出すことはできるか？"
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
-"私の方が得意なスキルがあれば、あなたを訓練してあげよう。ただし、ずっと教えていると飽きるから、頻繁にはできない。危険が迫ってる時やお腹が減っている時、疲れている時や運転中も無理だ。\n"
-"安全な場所でスキルを上昇させる本を読む時は、私にも役立つ内容だったら傍で聞いて一緒に学習しよう。もう読み終えた学習書だったとしても、読み聞かせてくれれば私のスキルが上昇するよ。"
+"もし私の方が得意なスキルがあるなら、あなたが上達するよう訓練を手伝ってあげられる。でも、長々と教えていても退屈するから、あまり頻繁には手伝えないよ。\n"
+"安全な場所であなたが本を読んでスキルを学習している時は、私も話を聞いてそのスキルを学習できる。あなたが既に学習し終えた本も、私に読み聞かせる用途で使えばいい。\n"
+"私が読めるレベルの学習本をあらかじめ渡しておけば、現在の行動について尋ねた時に本を読むよう指示してくれたら、読んで学習するよ。でも、読んでいる時はその場でじっとしているから、周囲の安全は確保しておいてほしいね。\n"
+"それから、戦闘スタイルの学習や訓練について私は何もできない。私の脳みそはそんな事ができるように作られていないから、あなたに何も教えられないし、教えを乞うても無駄だ。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Instead of reading to you, can we just talk?"
@@ -141568,10 +145209,14 @@ msgstr "医薬品の渡し方を教えてくれ。"
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
 "作業をする区域を指定してくれれば、手伝ってあげられるよ。\n"
-"区域管理(Yキーを押す)を使ってアイテムの置き場所や建設予定地、作物を植える場所や伐採したい木が生えている場所、解体する車両の置き場所を設定できるんだ。区域が設定出来たら、アイテムの分類や建設、伐採、車両解体、農作業などをするよう指示してくれ。私はその区域へ向かい、作業をこなすため最善を尽くすよ。作業で使う道具は、作業区域の近くに置いておこう。伐採なら斧、農作業ならシャベルや種や肥料、車両を解体するならレンチや弓鋸なんかが必要だ。アイテムの分類に道具は必要ないけど、荷物を持ち運ぶのは骨が折れるから、分類前のアイテムと分類済みのアイテムの区域が近くにあると嬉しいな。"
+"区域管理(Yキーを押す)を使ってアイテムの置き場所や建設予定地、作物を植える場所や伐採したい木が生えている場所、解体や修理をする車両の置き場所、釣りをする区域を設定できるんだ。区域が設定出来たら、アイテムの分類や建設、伐採、車両の修理や解体、農作業、釣りなどをこなすよう指示してくれ。私はその区域で作業をこなすため最善を尽くすよ。\n"
+"作業で使う道具は、作業区域の近くに「拠点: 道具」区画を指定して置いておこう。伐採なら斧、農作業ならシャベルや種や肥料、車両を解体するならレンチや弓鋸、工具箱なんかがあればいい。作業が終わったら、未分類の区域にちゃんと戻しておくよ。\n"
+"アイテムの分類作業は道具なしでできるけど、荷物を持ち運ぶのは骨が折れるから、分類前のアイテムと分類済みのアイテムの区域の距離が近いと嬉しいな。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Good to know.  Can you perform first aid?"
@@ -141615,18 +145260,22 @@ msgstr "特定の場所へ向かうことについて詳しく知りたい。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
 "特定の場所を見張るよう指示を出したら、車両内にいる時以外はその場所で見張りに付くよ。車両内にいる時は車内に留まる。\n"
-"私は観葉植物じゃないから、何か怪しい音が聞こえたら様子を見に行く。もし我慢してその場に留まってほしいなら、物音がしても調べに行かないよう指示しておいてくれ。でも、物音を調べなかったせいで潜んでいる盗賊に撃たれるのはごめんだよ。\n"
+"私は観葉植物じゃないから、何か怪しい音が聞こえたらその場でじっと震えるだけじゃなく、ちゃんと様子を見に行く。もし我慢してその場に留まってほしいなら、物音がしても調べに行かないよう指示しておいてくれ。でも、物音を調べなかったせいで潜んでいる盗賊に撃たれるのはごめんだよ。\n"
 "区域管理(Ｙ)を使って調査を無視する区域を指定することもできる。もし扉の向こうに怪物がいたとしても、調査無視区域だったら無視する。調査対象区域の指定も可能だ。こちらは対象区域ではない場所からの物音を無視する。両方の区域に指定された場所から音がした場合は、無視区域の方が優先される。調査対象区域としてどこか遠い場所が指定されていると、まったく調査をしなくなることがあるから気を付けてくれ。さっきも言ったけど、物音を調べなかったせいで潜んでいる盗賊に撃たれるのは嫌だ。でも、あなたが知っていたのに伝え忘れた恐ろしい怪物を確認するためだけに、ドアを叩く音を調べに行くのも勘弁したいね。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr "念のため聞いておくけど、その場でじっとしてほしい時はどう指示すればいい？"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr "待てよ、他の人が私たちの物資を盗むことはあるのか？"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -141708,15 +145357,35 @@ msgid ""
 "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr "一斉指示をせずに、ドアの開閉や睡眠に関して指示することはできる？"
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+"人類はほぼ死んでしまったが、中には生き残ってる人もいる。あなたが必要な物や欲しい物を何でも回収するのと同じように、他の生存者も同じことをするんだ。あなたが集めた戦利品の山も、誰もいない場所に放っておけば他人からは戦利品にみえる。周りに所有権を主張するあなた自身や他の仲間がいないと、他のスカベンジャーがやってきてその戦利品を勝手に持って行ってしまうだろう。だから、拠点だろうが車両だろうが、あなたの物資を見張る人員を用意しよう。\n"
+"それと、生存確率を高めたいならチームを組もう。他の生存者も、同じように小さな派閥を形成している。派閥メニュー(#キーを押す)では、これまでに出会った全ての派閥を一覧で確認できる。派閥と言っても、実際はただ生き残ろうとして集まっただけの人々もいれば、要塞化した拠点で暮らす数十人の集まりもある。他の派閥の一員を見つけて、交流を深めておくといい。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr "派閥メニューで他にできることはある？"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr "私たちの派閥の拠点を作る方法はある？"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 "そうだな、この会話もかなり最近追加されたものだよ！他にもいくつか変更がある。\n"
-"私の体内にCBM、特にパッシブCBMを移植できるようになった。アクティブCBMについては一部だけしか移植できない。後は、CBMをどのように使うか、詳しく説明できるようになった。\n"
-"更に、騎乗、農作業、伐採、設計通りに家を建てると言った行動も可能になったよ。"
+"以前は私の体内に移植できるCBMはパッシブCBMが中心だったが、アクティブCBMもいくつか移植可能になったし、使用頻度なども詳しくお知らせできるようになった。\n"
+"騎乗、農作業、伐採、設計通りに家を建てるなどの行動も可能になったよ。\n"
+"渡された本を読んでスキルを鍛えることもできるから、時間をかけて本を読み聞かせる必要もない。\n"
+"派閥の拠点が近くにあれば、お腹が空いたら備蓄食料からその都度食べるし、喉が乾けば井戸の水を飲むようになった。でも、仕事が終わった時に他の仲間に配給されるはずだった食料を食べ尽くしてしまう危険性もある...注意が必要だな！"
 
 #: lang/json/talk_topic_from_json.py
 msgid "You can ride horses?  Can I ride horses?"
@@ -141726,6 +145395,10 @@ msgstr "あなたはウマに乗れるのか？私も乗れるかな？"
 msgid "Tell me more about the activities you can do now."
 msgstr "今できる行動についてもっと知りたい。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr "自力で本を読んで学習できるようになったのか。どのように機能するんだ？"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -141934,19 +145607,19 @@ msgid "Let's go."
 msgstr "行こう。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
+msgid "Change your engagement rules…"
 msgstr "交戦規則を変更..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
+msgid "Change your aiming rules…"
 msgstr "照準規則を変更..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
+msgid "Change your bionic power reserve rules…"
 msgstr "CBM電力使用規則を変更..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
+msgid "Change your bionic power recharge rules…"
 msgstr "CBM充電規則を変更..."
 
 #: lang/json/talk_topic_from_json.py
@@ -141957,14 +145630,14 @@ msgstr "必要に応じて自由に移動しろ。"
 msgid "Stick close to me, no matter what."
 msgstr "何があっても私の近くにいろ。"
 
-#: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
-msgstr "<ally_rule_follow_distance_2_true_text>"
-
 #: lang/json/talk_topic_from_json.py
 msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr "<ally_rule_follow_distance_2_false_text>"
 
+#: lang/json/talk_topic_from_json.py
+msgid "<ally_rule_follow_distance_2_true_text>"
+msgstr "<ally_rule_follow_distance_2_true_text>"
+
 #: lang/json/talk_topic_from_json.py
 msgid "Don't use ranged weapons anymore."
 msgstr "絶対に遠距離武器を使うな。"
@@ -142222,8 +145895,8 @@ msgid "Nah, I'm just kidding."
 msgstr "いや、ただの冗談だよ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
-msgstr "この場所へ行ってくれ..."
+msgid "Please go to this location…"
+msgstr "この場所へ向かってくれ..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Stay at your current position."
@@ -142352,7 +146025,7 @@ msgid ""
 msgstr "今なら少し時間があるな。思えばもう1か月くらいは経ったんだな...これから先、どうするつもりなんだ？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
+msgid "Oh you know, not bad, not bad…"
 msgstr "なるほどね、悪くない、悪くないよ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -142441,11 +146114,11 @@ msgid "&Put hands up."
 msgstr "手を挙げる。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
+msgid "*drops_her_weapon."
 msgstr "は武器を捨てました。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "*drops_her_weapon."
+msgid "*drops his weapon."
 msgstr "は武器を捨てました。"
 
 #: lang/json/talk_topic_from_json.py
@@ -142461,11 +146134,11 @@ msgid "Okay, I'm going."
 msgstr "了解だ、行こう。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
+msgid "About that job…"
 msgstr "その仕事について..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
+msgid "About one of those jobs…"
 msgstr "それらの仕事の1つについて..."
 
 #: lang/json/talk_topic_from_json.py
@@ -142485,20 +146158,20 @@ msgid "I don't have any more jobs for you."
 msgstr "頼みたい事はそれだけだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
+msgid "I have another job for you.  Want to hear about it?"
 msgstr "一つ頼みたい事があるんだ。聞いてくれるか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
-msgstr "他にも頼みたい事があるんだ。聞いてくれるか？"
+msgid "I just have one job for you.  Want to hear about it?"
+msgstr "1つ頼みたい事があるんだ。聞いてくれるか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have another job for you.  Want to hear about it?"
+msgid "I have other jobs for you.  Want to hear about them?"
 msgstr "一つ頼みたい事があるんだ。聞いてくれるか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I just have one job for you.  Want to hear about it?"
-msgstr "1つ頼みたい事があるんだ。聞いてくれるか？"
+msgid "I have more jobs for you.  Want to hear about them?"
+msgstr "他にも頼みたい事があるんだ。聞いてくれるか？"
 
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
 #: src/npctalk.cpp
@@ -142558,7 +146231,7 @@ msgid "Whatever.  Bye."
 msgstr "あっそう。じゃあね。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
+msgid "I'm sorry…  I failed."
 msgstr "すまない...失敗してしまった。"
 
 #: lang/json/talk_topic_from_json.py
@@ -142578,8 +146251,8 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "いいや、まだだ。さようなら。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
-msgstr "ああ！さあどうぞ！"
+msgid "Yup!  Here it is!"
+msgstr "ああ！持ってきたぞ！"
 
 #: lang/json/talk_topic_from_json.py
 msgid "We're here!"
@@ -142830,7 +146503,7 @@ msgid "Alright.  You can lead now."
 msgstr "よし。君に付いて行くよ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
+msgid "Good.  Something else…"
 msgstr "いいね。他には..."
 
 #: lang/json/talk_topic_from_json.py
@@ -142910,7 +146583,7 @@ msgid "I'd prefer to keep that to myself."
 msgstr "自分について語りたくはないんだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
+msgid "I understand…"
 msgstr "そうか..."
 
 #: lang/json/talk_topic_from_json.py
@@ -142934,8 +146607,8 @@ msgid "Because I'm your friend!"
 msgstr "私達は友達だろう？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
-msgstr "頼みを聞いてあげたんだけど？"
+msgid "Well, I am helping you out…"
+msgstr "頼みを聞いてあげたんだけど..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'll give it back!"
@@ -142982,24 +146655,24 @@ msgid "No, I'm keeping it. Try and take it off me, I dare you."
 msgstr "嫌だね、貰っていくよ。取り返してみろ、出来るものならな。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
+msgid "Look, I really need this.  Please let me have it."
 msgstr "なあ、本当にこれが必要なんだ。譲ってもらえないか。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
+msgid "What, this?  It's not the same one, you are mistaken."
 msgstr "何、これか？あなたの物ではないよ、勘違いしてるんだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
-msgstr "悪かったよ。ほら、もう落とした、これでいいか？"
+msgid "I'm sorry.  Look, I already dropped it, okay?"
+msgstr "悪かったよ。ほら、もう手放した、これでいいか？"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Don't try and talk yourself out of this, drop it now."
 msgstr "言い逃れは止めろ、早く落とすんだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
-msgstr "分かった、今落とすよ..."
+msgid "Okay, I'm dropping it…"
+msgstr "分かった、今手放すよ..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Just this once, you can keep it. Don't tell anyone else."
@@ -143060,7 +146733,7 @@ msgid "Pleasure doing business!"
 msgstr "これからもよろしく頼むよ！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
+msgid "You might be seeing more of me…"
 msgstr "これからもよろしく..."
 
 #: lang/json/talk_topic_from_json.py
@@ -143074,21 +146747,21 @@ msgid ""
 msgstr "ワ...私は自由だ。*ザザザザ* 自由なんだ！*ブブブ* 久しぶりに人と会えたよ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
+msgid "Hey.  Let's chat for a second."
 msgstr "やあ。少し話をしようか。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
+msgid "That's because I saved you.  Listen, I could use your help…"
 msgstr "私が助けたお陰でね。なぁ、力になってもらえないかな..."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
 msgstr "それは一大事だな。私の言う事を聞かないと、取り出したチップを元の場所に埋め戻すぞ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
 msgstr "失礼、私には関係ないことだ。存分に自由を満喫してくれ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143100,7 +146773,7 @@ msgid "Come with me. We can help each other out."
 msgstr "一緒に来てくれ。互いに助け合おう。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
+msgid "We both go our separate ways.  Enjoy your freedom."
 msgstr "これからは別々の道を歩もう。自由を満喫してくれ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143117,8 +146790,8 @@ msgstr "ただ言う事を聞かせたかっただけなら、チップを抜き
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
 msgstr "ことによると、悪人かもな。今の所は優しくしてやっているんだから、大人しく従っておけ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143139,7 +146812,7 @@ msgid "Get out of my sight."
 msgstr "私の視界から消えろ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
 msgstr "いや、私が悪かった。そんなつもりじゃなかったんだ。これからは好きに生きればいい。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143155,7 +146828,7 @@ msgid "Not if I kill you first!"
 msgstr "殺される前に殺してやる！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
+msgid "I'm sorry!  I shouldn't have said that!"
 msgstr "悪かった！酷いことを言ってしまった！"
 
 #: lang/json/talk_topic_from_json.py
@@ -143196,15 +146869,38 @@ msgstr "何でもない。さあ行こうか。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
-"拠点っていうのは、仲間に任務を割り当てて、より多様な拠点運営を可能にするシステムだ。任務には採集や製作、更には戦闘や巡回など様々な種類がある。"
+"派閥の拠点は、仲間のNPCに頼んで既存の建物を改築したり、新しく建物を建てたりして作る。拠点があれば、仲間の役割がもっと増やせるんだ。例えば、アイテム製作や拠点の改良、食料調達、他のNPCを探して雇用するなど、様々な任務を命じられる。派閥の拠点を作れば、仲間の行動の管理を簡素化することもできるよ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
-msgstr "続けて。"
+msgid "Give me an overview of how camps work."
+msgstr "拠点の仕組みについて大まかに教えてくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr "派閥の拠点と食料について教えてくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr "派閥での任務について教えてくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr "拠点の作り方について教えてくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr "拠点を作るにあたって注意することを教えてくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
+msgstr "基本的なことは知っている。以前からの変更点を教えてくれ。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Never mind, let's go back to talking about camps."
@@ -143224,75 +146920,163 @@ msgstr "その話はもういいや。さあ行こう。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
 msgstr ""
-"食料はあらゆる任務で必要なので、常に生産できるようにしておくべきだ。焚き木採集のような一定期間にわたる任務を連続して頼む時は、前もって余分な食料を渡しておく必要がある。仲間に渡す食料が不足すると、派閥内での評判が下がってしまう。評判が低くなりすぎると、非常にまずい問題が発生するかもしれないな。"
+"派閥の拠点には掲示板が立っている。掲示板を調べる(e)ことで、利用可能な任務一覧と詳細が表示されるから、命じたい任務を選んでNPCに割り当てればいい。拠点で何かしたいなら、まず掲示板を調べよう。\n"
+"あなたと仲間がどちらも双方向無線機を所持している場合、無線機を使って遠隔地から任務を割り当てることも可能だ。\n"
+"仲間に拠点を作りたいと言えば、現在地に掲示板が建てられ、全体マップ1マス分が拠点となる。拠点が更に発展すれば、掲示板のある地点に隣接する全体マップ1タイル分拡張することもできる。\n"
+"派閥の拠点を運営するには備蓄食料が絶対に必要だ。拠点での任務を行う際や、拠点の近くで腹が減った時、仲間は備蓄食料を食べるんだ。\n"
+"現在派閥の拠点を作れる地点は、平野、消防署、一部の避難シェルターだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
-msgstr "待って、今の話をもう一回聞かせてくれ。"
+msgid "Wait, we can talk with radios?"
+msgstr "待って、無線機で会話できるのか？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
 msgstr ""
-"一か所の拠点につき、1つの掲示板が割り当てられている。'e'で掲示板を調べれば、その時点で実行可能な任務とその拠点で既に完了した任務の一覧が見られるよ。任務を選べば、任意の友好NPCをその任務に割り当てられる。\n"
-"任務一覧には、拠点中央のキャンプ地での任務が表示される。拠点を拡張済みなら、'TAB'キーで各拡張施設を選んでそれぞれの任務一覧を確認できる。\n"
-"双方向無線機を所持しているなら、遠く離れた場所で同じく双方庫無線機を所持している友好NPCに対しても、任務を割り当てることができるんだ。"
+"派閥の拠点を運営するには備蓄食料が必要だが、仲間の体調管理を簡略化できるとも言える。拠点の掲示板を使うには、事前にいくつか区域指定をしておく必要がある。食料の備蓄に必要なのは「拠点: 備蓄食料」区域の指定だ。指定した地点に食べ物を置いたら掲示板を調べて「食料の備蓄」を選択すれば、置いた食べ物のカロリー分の備蓄食料に変換される。\n"
+"仲間を拠点での任務に派遣すると、任務を終えた後で1日あたり2500キロカロリーを備蓄食料から消費する。任務によっては終了時間が変わることもある。帰って来た仲間は十分な備蓄食料がないと不満に思うから、備蓄食料は常に余裕をもって用意しておこう。\n"
+"あなたに追随中で拠点の任務を受けていない仲間であっても、拠点から全体マップ2マス以内にいる場合は、空腹になったら備蓄食料を食べる。この機能を使えば仲間の食糧管理を大幅に簡略化できるから、とりあえず最小限の拠点を作ってしまうのもアリだね。\n"
+"拠点を改良していくと、井戸を作れるようになる。井戸があれば、喉が渇いた仲間は食料と同様に井戸から水を飲んでくれるようになる。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
 msgstr ""
-"最初の拠点には、周囲の全体マップ8タイルが平野になっていて、近隣に広大な森林がある場所を選ぼう。平野は農業用地として利用できるけど、拠点運営を始めたばかりの時期は、建築資材の入手先となる森林も重要だ。拠点はは何か所でも好きなだけ作れるから、そこまで土地の選定に悩む必要はない。拠点の任務を進めるには、最低でも1人の仲間NPCが必要だ。\n"
-"野外でゼロから拠点を作るのもいいが、元々あった建物を利用することもできる。拠点として再利用できる建物内にいる仲間NPCと派閥について話せば、建物内に拠点を作る選択肢が出るはずだ。"
+"拠点の任務を割り当てたNPCは、任務中は姿を消す。任務が完了する時間になると、掲示板にはNPCを呼び戻す旨の項目が表示される。それを選択すれば任務は完了し、拠点の改良や狩りの成果、製作したアイテムの入手など、結果が反映される。\n"
+"拠点で割り当てられる任務は、拠点改良、新たな仲間の捜索、狩猟や罠猟、資材調達、農業、車両解体など様々だ。でも、全ての任務が拠点だけでできる訳ではない...例えば特定の建物や拠点の拡張が条件になっている場合もある。\n"
+"任務の中には仲間に直接話しかけて同じような事を頼めるものもあるが、拠点の構築に関する任務は拠点内でしか割り当てられない。\n"
+"任務は拠点内の掲示板を使って割り当てる。掲示板を調べれば、中央拠点の任務一覧が表示されるはずだ。拠点を拡張しているなら、タブキーを押せば各拡張施設での任務一覧が表示される。\n"
+"任務を遂行する仲間には備蓄食料が不可欠だ。任務を終えて帰ってきても、備蓄食料が不十分だと不満に思うことは忘れないで。\n"
+"任務の中には「緊急帰還」という特殊なものがある。これを実行すれば任務中の仲間はすぐに帰ってくるが、任務はキャンセルされ、それまでに任務で消費した資源などは帰ってこない。拠点で何か問題が発生し、他に帰還手段がない場合のみ、この任務を選択して仲間を帰還させよう。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
+msgstr "「不満に思う」とはどういう意味？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
 msgstr ""
-"土地を選定した後は、拠点を改良するために、資材を集めて更なる任務を達成する必要がある。最初に選択できる任務は、資材を収集して拠点を改良するっていう内容だから、事前に資材を集めておく必要はないな。改良任務を2、3度完了したら、<color_yellow>[単純作業]</color>って名前の任務が選べるようになる。仲間をこの任務に就かせれば、拠点内の全てのアイテムを種類別に分類してくれる。更に改良を続けると、新たな仲間を集めたり、要塞を建設したり、"
-" 更には周辺を巡回して戦闘をしたりと、色々な任務を頼めるようになるだろう。"
+"現在、拠点の種類には3つある。モジュール式平野拠点、消防署拠点、避難シェルター拠点だ。以前は旧式平野拠点というのもあったが、これは新たに作ることは不可能で、可能なのは改良だけになった。\n"
+"モジュール式平野拠点は大抵の土地に作れ、拡張施設用の十分な広さも考慮できる、最も拡張性が柔軟な拠点だけど、何もない場所に一から建物を建てるから、資材は大量に必要だ。消防署拠点と避難シェルター拠点は、既存の建物を改築するから手早く作れるが、既存の建物は位置を動かせないし、拡張施設を建てるスペースがない場合もある。\n"
+"各拠点では、様々な改良任務が発生する。改良にも色々な種類がある。通常は、拡張施設を建てるなら予定地の調査が必要だし、狩猟や仲間の捜索をする任務なら下準備をするための調理場や事務室が必要だ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr "モジュール式平野拠点について教えてくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr "消防署拠点について教えてくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr "避難シェルター拠点について教えてくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
+msgstr "拡張施設について教えてくれ。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
 msgstr ""
-"最初に設置した拠点を最大まで改良したら、拠点を更に拡張できるようになる。拡張っていうのは、特定の専門的な仕事を受け持つ施設を増設することだ。大規模な派閥を率いたいなら"
-" "
-"<color_light_green>[農地]</color>、仲間の生活の質を高めたいなら<color_light_green>[調理場]</color>がお勧めかな。"
-" "
-"<color_light_green>[車両修理工場]</color>は、車両を解体して大量の部品や資材を手に入れたいときに便利だ。<color_light_green>[鍛冶場]</color>では集まった資材を使って貴重な装備を入手できる。拡張ができるようになった後は、1つ拡張施設が完成する度に他の拡張施設の建設を開始できるようになる。1つの拠点が最大規模になったら、次の拠点の設置はもっと楽になるだろう。"
+"モジュール式平野拠点は最も拡張性が柔軟な拠点だが、作るには多くの時間と資材が必要だ。この拠点は何もない平野に作る...牧場や農場の開けた土地などではなく、何もない平野に一から作るんだ。簡易的でいいなら荒打漆喰壁、釘がたくさんあるなら板壁、溶接が可能なら金属壁、とにかく急ぐならテント、という感じに資材を選んで建設できる。\n"
+"拠点の北東区画に簡単な小屋とベッドを作り、暖炉を追加し、2人用の小さなシェルターを追加する。そこまで改良が終わったら、様々な方法で拠点を更に広げられるようになる。\n"
+"1. 拠点の両側に3つずつ、最大5つの個室または小屋を建てる。\n"
+"2. 拠点の南半分中央に、個室に挟まれる形で建物を建てる。中央の建物は指令室として機能し、拠点で狩猟、仲間の捜索、巡回の任務を割り当てられるようになる。\n"
+"3. 拠点の側面すべてに塹壕を掘ることができる。部屋の壁と接している面は、塹壕を掘る必要がない。\n"
+"4. 食料を保存する貯蔵庫やより多くの仲間を楽に集められる電波塔など、様々な機能をもつ設備を追加する。\n"
+"モジュール式拠点内の建築物はそれぞれ異なる素材で作れるので、最初に選んだ素材で後々困ることはない。テントは手早く設置できるが脆く、ゾンビに破壊される可能性がある。中央の建物は荒打漆喰壁、板壁、金属壁で作る必要があり、両脇の個室がテント製の場合は、通常より多くの資材が必要だ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
-msgstr "ありがとう、拠点についての他の話をしよう。"
+msgid "Got it.  Tell me about expansions."
+msgstr "なるほど。拡張施設について教えてくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
+msgstr "拠点の仕組みを確認してもいいか？"
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
+msgstr ""
+"消防署は拠点の基礎にピッタリだ。頑丈な金属扉を備えたレンガ造りの建物だから、ゾンビに破壊されることもめったにない。欠点は、周囲に平野がないことも多いから、拡張施設を作り辛いことかな。\n"
+"消防署の拠点は非常にコンパクトだ。居住スペースはちょっと狭いが、車庫の一角に製陶や鍛冶、製材ができる小さな区画をあつらえたり、舗装の一部を剥がして菜園を作ることも可能だ。既存のキッチンを利用すれば早くから調理ができるだろうが、ちょっと設備を改良する必要があるかもな。"
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
+msgstr ""
+"公共の避難所...つまり単一の開けた部屋がある基本的な避難シェルターに、派閥の拠点を作ることも可能だ。避難シェルターは数が多いし、平野に囲まれていることも多いから、モジュール式平野拠点よりは劣るものの拡張性が高く、拡張拠点も作りやすい。\n"
+"避難シェルター拠点の構築方針はいくつかある。基本的には、ベッドを増やすか、それとも作業や調理をするスペースを追加するかの選択だ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
+msgstr ""
+"各拠点には、全体マップ上で隣接する8マスのタイルに1つずつ、最大8つの拡張施設を作ることができる。拡張施設は、専門的な機能を拠点に追加するものだ、例えば農場や、様々なものを製作する作業場などがある。\n"
+"各拡張施設を作るには、中央の拠点にベッドを2つ置く段階まで改良を進める必要がある。現在、拡張施設は平野に建物を一から建てる方法でしか作れない。\n"
+"拡張施設での任務は、掲示板に別のタブで表示される。全体マップの拡張施設があるマスごとに分かれて表示されるので、表示を切り替えたい時はタブキーを押そう。現在作れる拡張施設は次の通りだ。\n"
+"-- 農場:  一面全てを耕した土地だ。自分で農作業をしてもいいし、任務として仲間に管理させてもいい。一般的な植物はここで問題なく育つ。\n"
+"-- 車両整備工場: 大きな建物だ。仲間に車両解体の任務を割り当てられる。でも、車両整備工場がなくても仲間に車を解体するよう指示を出せるようになっているから、この施設はあまり役立たないかもな。\n"
+"-- 食堂: 広いキッチン、ダイニング、貯蔵庫などがある施設だ。\n"
+"-- 牧場: ウシ、ウマ、ニワトリなどの家畜を飼育すモジュール式の建物だ。動物は自分で用意しよう！\n"
+"-- 作業場: 製作に関するありとあらゆる作業をする大きな施設だ。仲間に製作任務を割り当てれば、いくつかのアイテムは手作業よりもはるかに速く製作できる。\n"
+"-- 大型倉庫: 資材を保管する大きな建物だ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Give me some advice on building a camp."
+msgstr "分かった。拠点を作るにあたって注意することを教えてくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
+msgstr ""
+"拠点を作る第一段階は、それほど時間がかからない。それに、拠点に備蓄食料を置けば、仲間に定期的に食事を渡す手間も省ける。だから、まずはどこでも良いから最小限の拠点を作っておくことをお勧めするよ。\n"
+"拠点の規模はあなたの匙加減で決まる。モジュール式平野拠点は非常に多くの資材を消費するかもしれないが、ある程度改良を重ねれば仲間に狩猟や農業の任務を割り当てられるという見返りがある。他に改良したいものがないなら、まず拠点北東にテントを建てる任務を達成して、井戸を掘る任務に取り掛かれる状態にしよう。消防署や避難シェルターの拠点の場合は、もっと早い段階で井戸を掘れるようになるだろう。\n"
+"消防署や避難シェルターを見つけたら、そこを拠点にしよう。どちらも非常に狭い拠点だけど、多くの資材を使うことなく、改良した平野拠点と同程度の機能を用意できる。\n"
+"拡張施設を作れる段階になったら、農場か作業場を優先的に作るといい。農場では簡単に食料を育てられるし、作業場では拠点の改良に必要な資材を製作することができる。\n"
+"食堂、製塩所、牧場、大型倉庫は、第一に作るべきとまでは言えないが、どれも便利な拡張施設だ。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -143312,6 +147096,14 @@ msgstr ""
 "5. 拠点付近の仲間NPCは拠点内の食料置き場から食料を取り、井戸があれば使って渇きを癒すようになった。\n"
 "6. 特定の建物内に拠点を作れるようになった。対応する建物はどんどん増えていくから、使えるかどうか試してみるといい。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr "ちょっと待って、もう一度最初から説明してくれ。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr "ありがとう、拠点についての他の話をしよう。"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -143412,11 +147204,11 @@ msgid "Well, sure."
 msgstr "ええと、そうなんだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
+msgid "I'd… rather not."
 msgstr "ちょっと...分からないな。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr "失礼...もう行くよ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143447,7 +147239,7 @@ msgid "Oh, but you already have."
 msgstr "おや、あなたは既に加わっていますよ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
+msgid "Yes… yes I have."
 msgstr "ああ...そうだった。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143515,7 +147307,7 @@ msgstr ""
 "重油のように黒い粘液で覆われた狂人達が、大きなガラス窓を突き破って入ってきた。頭や首にガラス片が突き刺さったままだ。男か女かもはっきりしない気の毒なそいつは、まるで死体だった。周囲の人も騒ぎ始めていて、写真を撮ってる奴もいた。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
+msgid "Horrible.  Did you get any pictures yourself?"
 msgstr "恐ろしいな。あなたは写真を撮ったのか？"
 
 #: lang/json/talk_topic_from_json.py
@@ -143670,8 +147462,8 @@ msgid "This is a npc allies 1 test response."
 msgstr "仲間NPC1のテスト用返答です。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
-msgstr "仲間NPC2のテスト用返答です。"
+msgid "This an error!  npc allies 2 test response."
+msgstr "これはエラーです！仲間NPC2のテスト用返答です。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a npc engagement rule test response."
@@ -143870,7 +147662,7 @@ msgid "This is a u_has_items beer test response."
 msgstr "u_has_items beerのテスト用返答です。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
+msgid "Test failure!  This is a u_has_items test response."
 msgstr "テスト失敗！u_has_itemsのテスト用返答です。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143882,7 +147674,7 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr "u_has_item_category books count 2のテスト用返答です。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
 msgstr "テスト失敗！u_has_item_category books count 3のテスト用返答です。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143970,7 +147762,7 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr "u_has_bionics bio_adsのテスト用返答です。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
 msgstr "テスト失敗！npc_has_bionics bio_adsのテスト用返答です。"
 
 #: lang/json/talk_topic_from_json.py
@@ -144026,11 +147818,7 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr "ごきげんよう、どうやってフードパーソンの隠れ家にたどり着いたのかな？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr "やあ。少し話をしようか。"
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
+msgid "Greetings…  Foodperson?"
 msgstr "どうも...フードパーソン？"
 
 #: lang/json/talk_topic_from_json.py
@@ -144072,7 +147860,7 @@ msgid ""
 msgstr "フードパーソンが目の前に！お会いできて光栄です！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
+msgid "Ah…  Well, nice to meet you Foodperson."
 msgstr "ええと...その、どうぞよろしく、フードパーソン。"
 
 #: lang/json/talk_topic_from_json.py
@@ -144100,7 +147888,7 @@ msgid "Sure, whatever."
 msgstr "へぇ、そう。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
+msgid "Ok…  I believe you."
 msgstr "わかった...信じるよ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -144196,15 +147984,15 @@ msgid "That sounds great!"
 msgstr "やってみよう！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
-msgstr "分かった..."
+msgid "Ok…"
+msgstr "オーケー..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I need to think about it."
 msgstr "考えさせてほしい。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
+msgid "Huh…  No thanks."
 msgstr "うーん...結構だ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -144221,7 +148009,7 @@ msgstr "君の話し方、そして動作...君は...君は私なのか？どう
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr "わ...分からない。きっと<the_cataclysm>と関係があるはずだ！いっそチームを組んでみようか？"
 
@@ -145023,7 +148811,7 @@ msgid "Giant bees?  Tell me more."
 msgstr "大きなハチ？詳しく教えてくれ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
+msgid "But bees aren't usually aggressive…"
 msgstr "ハチは普通そんなに攻撃的じゃないような..."
 
 #: lang/json/talk_topic_from_json.py
@@ -145036,7 +148824,7 @@ msgstr ""
 "ああ、君も見たことあるんじゃないか、あのハチはどこにでもいるからな。古いSF映画に出てくるようなヤツだ。シェルターにいた仲間が刺されたんだ、本当の話さ。ハチの毒が永久に残るかどうかはちゃんと見ていないから分からない。<swear>、ビビって逃げ出して来たんだから仕方ないだろう。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
 msgstr "ハチは普通そんなに攻撃的じゃない...もしかしてスズメバチ？"
 
 #: lang/json/talk_topic_from_json.py
@@ -145480,7 +149268,7 @@ msgid "No.  I can't.  Just, no."
 msgstr "いいや。できない。絶対、無理だ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
+msgid "Sorry…  I'll let you be."
 msgstr "悪かった...無理強いはしないよ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -145731,8 +149519,8 @@ msgstr ""
 "うん、その話は本来のゲームとは少し違うものだったんだ。パットは私が知らない内容を語ってくれた。確かに本来の内容に近かったけど、違うものだった。簡単にまとめると、こんな話だ。それは、腐敗した王国に子供を人質に取られ、黒魔術の研究をさせられている学者の物語なんだけど、ここからが重要だ。魔術が漏れ出た、英雄達は王国が滅ぶ前に逃げ出したという、物語にない筈の話が追加されていたんだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
-msgstr "なるほど..."
+msgid "Okay…"
+msgstr "分かった..."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -146125,7 +149913,7 @@ msgid "What do you think happened?"
 msgstr "自分の身に何が起こったと思う？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
+msgid "That does sound a little crazy…"
 msgstr "頭が狂ったんだな..."
 
 #: lang/json/talk_topic_from_json.py
@@ -146178,7 +149966,7 @@ msgid "What happened to you after that?"
 msgstr "その後どうなったんだ？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
+msgid "It can't be healthy to abandon your past like that…"
 msgstr "過去を捨て去るのは健全とは思えないな..."
 
 #: lang/json/talk_topic_from_json.py
@@ -146646,7 +150434,7 @@ msgstr ""
 "私の話か。はぁ...特別面白いものではない。かつての仲間たちは、みな主の御許に旅立った。何故主が私の手を取って下さらなかったのかは分からないが、時が経てば分かるのだろうな。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
+msgid "Do you mean in a religious sense, or…?"
 msgstr "それは何か宗教的な話...？"
 
 #: lang/json/talk_topic_from_json.py
@@ -146985,8 +150773,8 @@ msgstr "それから何が起きたんだ？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
 msgstr "もし条件が整えば、あなたはこの事態を...科学的に分析できる？"
 
 #: lang/json/talk_topic_from_json.py
@@ -147105,7 +150893,7 @@ msgid ""
 msgstr "あぁ、酷い話だよ。私の結婚式の日に<the_cataclysm>が起きたんだから。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
+msgid "Oh, I'm sorry…"
 msgstr "それは、気の毒に..."
 
 #: lang/json/talk_topic_from_json.py
@@ -147444,7 +151232,7 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr "あなたは医薬品を作れると聞いたが、効果はあるのか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
+msgid "I'd like to ask you something else…"
 msgstr "他に聞きたいことがあるんだ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -147746,7 +151534,8 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr "カーロスと仕事について話がしたいんだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
 msgstr "クリスはこの辺りにいるのか？彼は森で何に出くわしたんだ？"
 
 #: lang/json/talk_topic_from_json.py
@@ -147933,15 +151722,15 @@ msgid "What do you need done?"
 msgstr "何をすればいい？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
+msgid "About the mission…"
 msgstr "任務について..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
-msgstr "任務のひとつについて..."
+msgid "About one of those missions…"
+msgstr "任務の1つについて..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
+msgid "I've got to go…"
 msgstr "じゃあな..."
 
 #: lang/json/talk_topic_from_json.py
@@ -147958,7 +151747,7 @@ msgstr ""
 "中隊の生き残りを率いて、この施設を再制圧する作戦を実行しているところだ。我々は合計20名ほどの部隊で進入し、ただちにこの制御室を制圧した。そしてこの階と下の階にあるの重要な設備に隊員を向かわせた。上手く行けば、この巨大な施設を地域レベルの作戦行動の恒久的な拠点として利用できる。重要なのは、地上の避難民をここで受け入れることができれば、避難民の対応に忙殺されている者を現状回復要員に回せるということだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
+msgid "Seems like a decent plan…"
 msgstr "いい計画だと思う..."
 
 #: lang/json/talk_topic_from_json.py
@@ -147977,8 +151766,8 @@ msgstr ""
 "この施設は世界規模の戦争に備えるべく、安全な避難所として建設された。もしまともに機能していれば、この強固な地下施設全体で数千人の人々が数年間暮らせるはずだった。だが電力システムが損傷したか、動作不良を起こしたかで、凄まじい致命的な放射線バーストを放ったのだ。それから数分後、地下2階から下にいた人々はことごとく死亡した。放射線障害でやられる前に下階への通路を封鎖したために、この階はなんとか無事だったようだ。他に記録から分かることは、大量の水が勢いよく下階へ流れ込んでしまった、ということだな。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
-msgstr "何にせよ彼らはそうせざるを得ない。我々が生きているんだからな。"
+msgid "Whatever they did it must have worked since we are still alive…"
+msgstr "何にせよ彼らはそうせざるを得ない。我々が生きているんだからな..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Marshal, I'm rather surprised to see you here."
@@ -148012,7 +151801,7 @@ msgid ""
 msgstr "我々は外部通信中継装置を守っている。私から言えることは限られているので... 質問があるなら隊の司令を探してくれ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
+msgid "I'll try and find your commander then…"
 msgstr "隊長とやらを探すとするよ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -148072,7 +151861,7 @@ msgid "Hey miss, don't you think it would be safer if you stuck with me?"
 msgstr "お嬢さん、俺と一緒に居たほうが安全だとは思わないか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
+msgid "Don't mind me…"
 msgstr "お構いなく..."
 
 #: lang/json/talk_topic_from_json.py
@@ -148344,7 +152133,7 @@ msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr "段ボールの事は話したっけ？君、段ボール持ってる？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
+msgid "About that shopping list of yours…"
 msgstr "あなたの買い物リストについて..."
 
 #: lang/json/talk_topic_from_json.py
@@ -148410,7 +152199,7 @@ msgid "Would you like me to give you some cardboard?"
 msgstr "段ボールが必要か？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
+msgid "I think I have to get going…"
 msgstr "もうそろそろ行かないと..."
 
 #: lang/json/talk_topic_from_json.py
@@ -148441,8 +152230,8 @@ msgstr ""
 "誰か知らないなら、絶対に教えられないよ。奴は皆に話しかけるから、奴のことを知らない者は、信用できない。私の仕事を手伝ってくれるなら別だけどね。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
-msgstr "...前の話をもう一度聞かせてもらえないかな？"
+msgid "…What were you saying before?"
+msgstr "...さっきの話をもう一度聞かせて？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -148459,7 +152248,7 @@ msgid "No."
 msgstr "いいえ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
 msgstr "その...着ている服について聞きたい。どうしてそんな恰好なんだ？"
 
 #: lang/json/talk_topic_from_json.py
@@ -148553,7 +152342,7 @@ msgid "I found a sample of alien fungus for you."
 msgstr "真菌のサンプルを持ってきた。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
+msgid "Ok… see ya."
 msgstr "そうだな...さようなら。"
 
 #: lang/json/talk_topic_from_json.py
@@ -148655,8 +152444,8 @@ msgstr "私は中国人かどうかなんて気にしない。もし良かった
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr "まぁ、人種差別も原因の一つかもしれないが...あなたは目に見えて体調不良だ。センターは身体が丈夫な人材を求めているんだろう。"
 
 #: lang/json/talk_topic_from_json.py
@@ -148690,7 +152479,7 @@ msgid "You sound more optimistic than usual."
 msgstr "普段より楽観的なもの言いだな。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr "博士号を持っていると聞いたんだけど..."
 
 #: lang/json/talk_topic_from_json.py
@@ -148820,7 +152609,7 @@ msgstr "いや、知らないな。詳しく聞きたい、ぜひ教えてくれ
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr "どこかから現れ世界を侵略しているキノコだ。真菌の塔、地面や木を侵食する頑丈な菌糸、ゾンビをも乗っ取って増殖する胞子...酷いものだよ。"
 
 #: lang/json/talk_topic_from_json.py
@@ -148935,7 +152724,7 @@ msgid ""
 msgstr "私は自分が適者じゃないと分かっているから、餓死するまでここでじっとしてるんだ。貧しく病弱な人間を助けてもらえないか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr "助けになればいいんだけど...何か食べる物が必要か？"
 
 #: lang/json/talk_topic_from_json.py
@@ -149106,7 +152895,7 @@ msgstr "さあ行こう。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey there, friend."
-msgstr "ちょっと、そこの君。"
+msgstr "やあ、こんにちは。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I couldn't help but notice, you're covered in fur."
@@ -149355,7 +153144,7 @@ msgstr ""
 "今話したこと以外は、特に面白いことはないかな。嫌な生活だよ。忙しいし食事は少ないし、ネットに接続しても、フォローしてたYouTuberはみんな死んでるし。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr "図太い人だな..."
 
 #: lang/json/talk_topic_from_json.py
@@ -149618,7 +153407,7 @@ msgid ""
 msgstr "ここを出て私の拠点で働くことをどう思っているか尋ねるよう、旦那さんから頼まれたんだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
+msgid "About that sourdough starter you had me looking for…"
 msgstr "探してほしいと言っていたサワー種スターターについて..."
 
 #: lang/json/talk_topic_from_json.py
@@ -149923,7 +153712,7 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr "私が同じ立場でも同じことをしたよ。ここにギターを持ってる人はいないのか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
+msgid "Yes, yes I would… you monster."
 msgstr "ああ、それは...酷いことをしてしまったな。"
 
 #: lang/json/talk_topic_from_json.py
@@ -150125,6 +153914,10 @@ msgid ""
 msgstr ""
 "さて、友よ！非常にいい質問だな。人々はちょっとした物すら手に入れられなくなった。新しい靴、新しい携帯電話、正確に言うなら、買い物に行けないってことだ。ってことは、もし君が窓ガラスを割ることに抵抗がないなら、できることがある。この暖かいコートを「買った」時、アウトドア用品店に財布を忘れてね。そういうものだ、分かるだろ？もう関係のない話さ。今受けているヘルスケアに対しても保険料を払う必要はない。映画みたいなこともやった。100ドル札でジョイントを巻いて吸ったりね。咳き込んじゃって、結局普通の巻紙で巻き直すことになったけど。あれは酷かった。君もやってみたいと思ったときのために、忠告しておくよ。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr "続けて。"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -150389,7 +154182,7 @@ msgstr ""
 "大変動が起きる前は電気技師をしていた。ここにいる義理の弟のボリスと2人で、立派に請負業をやっていたんだ。避難警報が鳴った時、私たちは...家族と一緒に避難した。混雑した避難所に詰め込まれ、そこから混雑したバスに乗り込んだ。それからは...何もかも上手く行かなかった。バスが攻撃を受けて破壊され、ほぼ全員が死んだ。何人かは生き残ったけど...何の解決にもならない。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr "誰かを亡くしたのか..."
 
 #: lang/json/talk_topic_from_json.py
@@ -150841,7 +154634,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr "な...何が起きているのか知らないのか？他の避難者や職員と話さなかったのか？"
 
@@ -150917,7 +154710,7 @@ msgstr "おっ、やあ。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Ah!  You are new.  I'm sorry, I'm Mangalpreet."
-msgstr "あっ！知らない人だ。すみません、私はマンガルプリートです。"
+msgstr "あら！見ない顔ね。失礼、私はマンガルプリートです。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Nice to meet you, Mangalpreet."
@@ -151405,7 +155198,7 @@ msgid ""
 "do some work to keep me busy though, and the extra merch does go a long way "
 "to keeping my belly full.  People like getting a good haircut."
 msgstr ""
-"さてと、私は2ダースもの見知らぬ人が住む煉瓦造りの劣悪な建物で立ち往生しており、世界中で死人がうろつき、周りに十分な食料はない。少なくとも私は忙しく働いていられるし、マーチに余裕が出たら十分な食料も確保できる。人間は散髪が好きだからね。"
+"さてと、私は2ダースもの見知らぬ人が住むレンガ造りの劣悪な建物で立ち往生しており、世界中で死人がうろつき、周りに十分な食料はない。少なくとも私は忙しく働いていられるし、マーチに余裕が出たら十分な食料も確保できる。人間は散髪が好きだからね。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151414,7 +155207,7 @@ msgid ""
 "and there's not enough food to go around.  Why don't you fuckin' figure it "
 "out?"
 msgstr ""
-"皮肉を込めた言い方と、皮肉をたっぷり込めた言い方、どっちがいい？私は2ダースもの見知らぬ人が住む煉瓦造りの劣悪な建物で立ち往生しており、世界中で死人がうろつき、周りに十分な食料はない。このクソな状況を理解できないの？"
+"皮肉を込めた言い方と、皮肉をたっぷり込めた言い方、どっちがいい？私は2ダースもの見知らぬ人が住むレンガ造りの劣悪な建物で立ち往生しており、世界中で死人がうろつき、周りに十分な食料はない。このクソな状況を理解できないの？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151561,7 +155354,7 @@ msgid "Are you looking to buy anything else?"
 msgstr "他に何か集めてるものはある？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
+msgid "Very well… let's talk about something else."
 msgstr "よく分かった...他の事について話そう。"
 
 #: lang/json/talk_topic_from_json.py
@@ -151890,7 +155683,7 @@ msgid "Have you seen anyone who might be hiding something?"
 msgstr "誰かコソコソしている奴を見なかったか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
+msgid "Bye…"
 msgstr "じゃあな..."
 
 #: lang/json/talk_topic_from_json.py
@@ -151904,15 +155697,15 @@ msgid "Keep your head down and stay out of my way."
 msgstr "目立つことをするな。こっちに近寄るんじゃない。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
-msgstr "分かった..."
+msgid "OK…"
+msgstr "オーケー..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like what?"
 msgstr "例えば？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
+msgid "I'm not sure…"
 msgstr "知らないな..."
 
 #: lang/json/talk_topic_from_json.py
@@ -151932,7 +155725,7 @@ msgid "Got something to hide?"
 msgstr "何から逃げている？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
+msgid "Sorry, I didn't mean to offend you…"
 msgstr "すみません、怒らせる気は無かったんです..."
 
 #: lang/json/talk_topic_from_json.py
@@ -151984,7 +155777,7 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr "お嬢さん、外をうろつくは止めた方が身の為だよ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
+msgid "I heard this place was a refugee center…"
 msgstr "ここが避難センターだと聞いたんだが..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152008,7 +155801,7 @@ msgid "Can I do anything for the center?"
 msgstr "避難センターのために何かできる？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
+msgid "I figured you might be looking for some help…"
 msgstr "人手が必要なようだな..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152062,9 +155855,9 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
-msgstr "[知性 10] 待った、バス6台ぶんの避難者... ここは今どれだけの避難民を抱えているんだ？"
+msgstr "[知性 10] 待った、バス6台ぶんの避難者... ここには今どれだけの避難民がいるんだ？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152115,7 +155908,7 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr "すまないが、今そんな危険を冒す気は無いよ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
+msgid "Fine…"
 msgstr "わかったよ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152128,7 +155921,7 @@ msgstr ""
 "絶対にダメだ！前に血まみれの毛皮を生やした奴がここに来た...異様というほどでもなかったが、おそらく野外の有害廃棄物による汚染の影響で、全身が変異してしまったんだろう。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
+msgid "Fine… *coughupyourscough*"
 msgstr "わかったよ... *ゲフンゲフンバーカゲフンゲフン*"
 
 #: lang/json/talk_topic_from_json.py
@@ -152158,7 +155951,7 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[筋力 11] 顔面をボコボコにぶん殴ってやろうか！きっと気持ちいいぞ！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
+msgid "I guess I'll look somewhere else…"
 msgstr "よそを当たるとするよ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152180,7 +155973,7 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr "随分と装備が充実しているみたいだな？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
+msgid "Was hoping for something more…"
 msgstr "何か他の話は..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152286,8 +156079,8 @@ msgid "So what are you doing right now?"
 msgstr "それで今は何をしてるんだ？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
-msgstr "ふーん、そう..."
+msgid "Never mind…"
+msgstr "何でもない..."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152311,7 +156104,7 @@ msgstr ""
 "他とは違うゾンビとか、見たことのない変異体とかの目撃情報だ。何が起こっているのか分かれば、対処や治療方法の発見につながる。可能性は低いが、それが生き延びる希望だ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
+msgid "Good luck with that…"
 msgstr "上手くいくことを祈っているよ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152357,7 +156150,7 @@ msgstr ""
 "ってことは、私たちは似た者同士だな。私も新入りみたいなものだ。誰でも歓迎ってわけには行かないようでね。下の階は既に満員らしい。入口近くの商人には会ったか？そいつに詳しく聞いてみるといい。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
+msgid "Sucks…"
 msgstr "はあ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152372,7 +156165,7 @@ msgstr ""
 "ああ、地下には空気圧砲を持ったやつがいるんだ。金属を射出する...発射音のしない、やたら効率的な大砲みたいなものだ。連中は即席兵器の類にはこと欠いていないし、今も地下の要塞化を続けている。あの防御を打ち破れるモンスターなんてまずいないだろう。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
+msgid "Well, then…"
 msgstr "そうか..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152459,7 +156252,7 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr "はん、新入り臭いのがいるな。何か助けが必要か？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
+msgid "You… smelled me?"
 msgstr "...臭うかい？"
 
 #: lang/json/talk_topic_from_json.py
@@ -152510,7 +156303,7 @@ msgid ""
 msgstr "狩りで手に入れた肉やその他の部位を売っている。たまに魚や果物も獲ってくるが、夕飯にいただく新鮮なヘラジカのステーキに勝るものは無いね！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
+msgid "Great, now my mouth is watering…"
 msgstr "いいねえ、よだれが出てきた。"
 
 #: lang/json/talk_topic_from_json.py
@@ -152616,7 +156409,7 @@ msgstr ""
 " 何か政府の役に立つ仕事ができるかもしれない。普通の生存者よりも優秀な人材ならばきっと歓迎されるはずだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
+msgid "Hmmm…"
 msgstr "ふーむ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152666,7 +156459,7 @@ msgstr ""
 "仲間に加わりたいなら募集人を通せ。まずは、ここに時々顔を出して出来る仕事が無いか私に聞いてくれ。任務を請け負って達成していけば、募集人に実力を知らしめることができるだろう。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
+msgid "I haven't done anything wrong…"
 msgstr "間違ったことはしていないはずだ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152837,7 +156630,7 @@ msgid "Something to say?"
 msgstr "何か用か？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
+msgid "I charge hourly, so be quick…"
 msgstr "時間報酬制だ、さっさと話せ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -152954,7 +156747,7 @@ msgstr ""
 "ちっぽけな金貨が支払われたことに気付いただろ、おかしなものだ。近くに金鉱脈があるなんて言ってるのもいるが、そんなわけがない。私がこのクソッタレな世界を探索させられて、金塊を持ち帰ってるのさ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
+msgid "I guess I could help with that…"
 msgstr "何か手伝えることがあるかもしれない..."
 
 #: lang/json/talk_topic_from_json.py
@@ -153066,7 +156859,7 @@ msgid "[$10] I'll get a haircut"
 msgstr "[$10] 散髪をしてもらう"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
+msgid "Maybe another time…"
 msgstr "また次の機会に..."
 
 #: lang/json/talk_topic_from_json.py
@@ -153084,7 +156877,7 @@ msgid "Stand still while I get my clippers..."
 msgstr "バリカンを使うからじっとしててくれ..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
+msgid "Thanks…"
 msgstr "ありがとう..."
 
 #: lang/json/talk_topic_from_json.py
@@ -153104,7 +156897,7 @@ msgid "What do you have on tap?"
 msgstr "一杯貰えるか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
+msgid "I'll be going…"
 msgstr "もう行かないと..."
 
 #: lang/json/talk_topic_from_json.py
@@ -153157,7 +156950,7 @@ msgid ""
 msgstr "ここの要塞化は相棒の担当だ、頼みごとの話なら相棒に言ってくれ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
+msgid "I'll talk to him then…"
 msgstr "なら彼に話してみるよ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -153174,7 +156967,7 @@ msgid "I hope you are here to do business."
 msgstr "手伝いに来てくれたのか？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
+msgid "I'm interested in investing in agriculture…"
 msgstr "農業関係の仕事に興味があるんだ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -153202,11 +156995,11 @@ msgid "I imagine we might be able to work something out."
 msgstr "出来る限りのことはやってみる。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
+msgid "I was wondering if you could install a cybernetic implant…"
 msgstr "CBMを移植して欲しい..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
+msgid "I need help removing an implant…"
 msgstr "CBMを除去して欲しい..."
 
 #: lang/json/talk_topic_from_json.py
@@ -153247,7 +157040,7 @@ msgstr ""
 "俺ぁ幸運な男さ。ひたすら死体どもに追われていたが、今や優雅な自作農暮らしだ。ただまあこうして寝床と食事を得たはいいが、作物が実らんことにはお役に立てんな。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
+msgid "It could be worse…"
 msgstr "そりゃ大変だったな..."
 
 #: lang/json/talk_topic_from_json.py
@@ -153257,7 +157050,7 @@ msgid ""
 msgstr "あんたに構ってる暇はない。取引や仕事がしたいならガレージにいる現場監督かサイロの傍の作物管理人に聞いてみろ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
+msgid "I'll talk with them then…"
 msgstr "じゃあ彼らと話してみるよ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -153324,7 +157117,7 @@ msgstr ""
 "数百ってところか。彼らがこの農場を選んだのは、都心から離れていて、破れていないフェンスと開けた広い土地があるからだろう。これだけの土地と、あとは資材があればちょっとした村を作ることも可能だろう。私がいた避難センターは常に飢餓とゾンビの襲撃に悩まされていた。そこで小さな町のようなものを作ろうとしたことはあったが、白紙から作るとなると農地の不足や敵の数が問題になったものだ。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
+msgid "Hopefully moving out here was worth it…"
 msgstr "多分、ここに移転する価値はあると思うよ..."
 
 #: lang/json/talk_topic_from_json.py
@@ -153838,13 +157631,13 @@ msgstr "毒蛇咬"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
-msgstr "%sに毒蛇咬をお見舞いしました。"
+msgid "You lash out at %s with a Viper Bite"
+msgstr "毒蛇咬で%sに激しく襲い掛かりました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
-msgstr "<npcname> は%sに毒蛇咬をお見舞いしました。"
+msgid "<npcname> lash out at %s with a Viper Bite"
+msgstr "<npcname>は毒蛇咬で%sに激しく襲い掛かりました。"
 
 #: lang/json/technique_from_json.py
 msgid "Viper Strike"
@@ -153852,18 +157645,28 @@ msgstr "毒蛇の一撃"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
-msgstr "%sに毒蛇の一撃を繰り出しました。"
+msgid "You hit %s with a spectacular Viper Strike"
+msgstr "%sに壮絶な毒蛇の一撃を繰り出しました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
-msgstr "<npcname>は%sに毒蛇の一撃を繰り出しました。"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
+msgstr "<npcname>は%sに壮絶な毒蛇の一撃を繰り出しました。"
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr "とぐろ巻き"
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr "%sが掴みかかろうとしましたが、身を捩って抜け出しました！"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr "%sが掴みかかろうとしましたが、<npcname>は身を捩って抜け出しました！"
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr "回し蹴り"
@@ -153906,6 +157709,34 @@ msgstr "鋏拳を繰り出して%sを気絶させました。"
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr "<npcname>は%sに鋏手の一撃を繰り出しました。"
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr "蛙の舌"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr "%sの攻撃を受け流して打ち倒しました。"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr "<npcname>は%sの攻撃を受け流して打ち倒しました。"
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr "蛙の張手"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr "%sに正面から見事なカウンター攻撃を叩き込みました。"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr "<npcname>は%sに正面から見事なカウンター攻撃を叩き込みました。"
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr "蛙の舌"
@@ -154340,7 +158171,7 @@ msgstr "<npcname>は%sの攻撃を避け、流れるように武装解除しま
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "The %s tries to grab you, but you smoothly break free!"
-msgstr "%sが掴みかかろうとしましたが、流れるように抜け出しました。"
+msgstr "%sが掴みかかろうとしましたが、流れるように抜け出しました！"
 
 #: lang/json/technique_from_json.py
 #, python-format
@@ -155036,12 +158867,12 @@ msgstr "*バキッ！*<npcname>は%sの腕を無慈悲に折りました。"
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "The %s tries to grab you, but you wrestle free!"
-msgstr "%sが掴みかかろうとしましたが、何とか抜け出しました。"
+msgstr "%sが掴みかかろうとしましたが、何とか抜け出しました！"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "The %s tries to grab <npcname>, but they wrestle free!"
-msgstr "%sが掴みかかろうとしましたが、<npcname>は何とか抜け出しました。"
+msgstr "%sが掴みかかろうとしましたが、<npcname>は何とか抜け出しました！"
 
 #: lang/json/technique_from_json.py
 msgid "Counter"
@@ -155481,7 +159312,7 @@ msgstr "蛇の湾曲"
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "The %s tries to grab you, but you slither free!"
-msgstr "%sが掴みかかろうとしましたが、するりと抜け出しました。"
+msgstr "%sが掴みかかろうとしましたが、するりと抜け出しました！"
 
 #: lang/json/technique_from_json.py
 #, python-format
@@ -155645,153 +159476,178 @@ msgid "<npcname> double-handed palm strikes %s"
 msgstr "<npcname>は両手を揃えて%sに掌打を放ちました。"
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
-msgstr "沈酔フェイント"
+msgid "Tiger Palm"
+msgstr "虎の一撃"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble and leer at %s"
-msgstr "よろめきながら%sに巧みなフェイントを仕掛けました。"
+msgid "You land a heavy tiger palm on %s"
+msgstr "%sに重い一撃を繰り出しました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles and leers at %s"
-msgstr "<npcname> はよろめきながら%sに巧みなフェイントを仕掛けました。"
+msgid "<npcname> lands a heavy tiger palm on %s"
+msgstr "<npcname>は%sに重い一撃を繰り出しました。"
 
 #: lang/json/technique_from_json.py
-msgid "Drunk counter"
-msgstr "沈酔カウンター"
+msgid "Tiger Takedown"
+msgstr "虎の叩伏"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
-msgstr "よろめきながら%sに激しい一撃を喰らわせました。"
+msgid "You slam %s to the ground"
+msgstr "%sを叩き伏せました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
-msgstr "<npcname>はよろめきながら%sに激しい一撃を繰り出しました。"
+msgid "<npcname> slams %s to the ground"
+msgstr "<npcname>は%sを叩き伏せました。"
 
 #: lang/json/technique_from_json.py
-msgid "Tiger Takedown"
-msgstr "虎の叩伏"
+msgid "Straight Punch"
+msgstr "正拳突き"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
-msgstr "%sを掴んで地面へ叩きつけました。"
+msgid "You deliver a vertical straight punch to %s"
+msgstr "%sに真正面から正拳突きをお見舞いしました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> grabs and grounds %s"
-msgstr "<npcname>は%sを掴んで地面へ叩きつけました。"
+msgid "<npcname> delivers a vertical straight punch to %s"
+msgstr "<npcname>は%sに真正面から正拳突きをお見舞いしました。"
 
 #: lang/json/technique_from_json.py
-msgid "slow strike"
-msgstr "緩慢な一撃"
+msgid "Straight Punch (Knockback)"
+msgstr "正拳突き(吹き飛ばし)"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You slowly strike %s"
-msgstr "%sに緩慢な一撃を浴びせました。"
+msgid "You force %s back with a vertical straight punch"
+msgstr "%sを正拳突きで吹き飛ばしました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
-msgstr "<npcname>は%sに緩慢な一撃を浴びせました。"
+msgid "<npcname> forces %s back with a vertical straight punch"
+msgstr "<npcname>は%sを正拳突きで吹き飛ばしました。"
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
-msgstr "降下攻撃"
+msgid "L-hook"
+msgstr "横拳"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
-msgstr "%sに降下攻撃を仕掛けました。"
+msgid "You deliver a solid L-hook to %s"
+msgstr "%sに鋭い横拳を叩き込みました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
-msgstr "<npcname>は%sに降下攻撃を仕掛けました。"
+msgid "<npcname> delivers a solid L-hook to %s"
+msgstr "<npcname>は%sに鋭い横拳を叩き込みました。"
 
 #: lang/json/technique_from_json.py
-msgid "Chain Punch"
-msgstr "連続パンチ"
+msgid "L-hook (Knockback)"
+msgstr "横拳(吹き飛ばし)"
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
-msgstr "攻撃コスト50%、与ダメージ66%、吹き飛ばし攻撃+追随"
+#, python-format
+msgid "You knock %s back with a solid L-hook"
+msgstr "%sを鋭い横拳で吹き飛ばしました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
-msgstr "%sに連続攻撃を繰り出しました。"
+msgid "<npcname> knocks %s back with a solid L-hook"
+msgstr "<npcname>は%sを鋭い横拳で吹き飛ばしました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
-msgstr "<npcname>は%sに連続攻撃を繰り出しました。"
+msgid "Your attack misses %s but you don't let up"
+msgstr "%sへの攻撃は外れましたが、上手く体勢を立て直しました。"
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
-msgstr "足下を踏みしめ、敵の拘束を脱しました。"
+#, python-format
+msgid "<npcname>'s attack misses %s but they don't let up"
+msgstr "<npcname>の%sへの攻撃は外れましたが、上手く体勢を立て直しました。"
+
+#: lang/json/technique_from_json.py
+msgid "Receive and Counter"
+msgstr "防御カウンター"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You receive %s's gift of violence, and return it in kind"
+msgstr "%sからの攻撃を受け止め、お返しを繰り出しました。"
 
 #: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
-msgstr "<npcname>は敵の拘束を脱しました。"
+#, python-format
+msgid "<npcname> receives %s's attack, and counters"
+msgstr "<npcname>は%sの攻撃を受け止め、カウンターを繰り出しました。"
 
 #: lang/json/technique_from_json.py
-msgid "ask the way"
-msgstr "問手"
+msgid "Drunken Feint"
+msgstr "フェイント(酔拳)"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You miss but keep striking at %s"
-msgstr "空振りを厭わず%sを更に攻撃しました。"
+msgid "You stumble and leer at %s"
+msgstr "よろめきながら%sに巧みなフェイントを仕掛けました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
-msgstr "<npcname>は空振りを厭わず%sを更に攻撃しました。"
+msgid "<npcname> stumbles and leers at %s"
+msgstr "<npcname> はよろめきながら%sに巧みなフェイントを仕掛けました。"
 
 #: lang/json/technique_from_json.py
-msgid "White Crane stumble"
-msgstr "白鶴猛攻"
+msgid "Drunk Counter"
+msgstr "カウンター(酔拳)"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
-msgstr "猛攻によって%sをふらつかせました。"
+msgid "You lurch, and your wild swing hits %s"
+msgstr "よろめきながら%sに激しい一撃を喰らわせました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
-msgstr "<npcname>は%sをふらつかせました。"
+msgid "<npcname> lurches, and hits %s"
+msgstr "<npcname>はよろめきながら%sに激しい一撃を繰り出しました。"
 
 #: lang/json/technique_from_json.py
-msgid "Receive and Counter"
-msgstr "防御カウンター"
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
+msgstr "%sが掴みかかろうとしましたが、フラリとかわしました！"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You receive %s's gift of violence, and return it in kind"
-msgstr "%sからの攻撃を受け止め、お返しを繰り出しました。"
+msgid "The %s tries to grab <npcname>, but they stumble away!"
+msgstr "%sが掴みかかろうとしましたが、<npcname>はフラリとかわしました！"
+
+#: lang/json/technique_from_json.py
+msgid "slow strike"
+msgstr "緩慢な一撃"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> receives %s's attack, and counters"
-msgstr "<npcname>は%sの攻撃を受け止め、カウンターを繰り出しました。"
+msgid "You slowly strike %s"
+msgstr "%sに緩慢な一撃を浴びせました。"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
-msgstr "%sの武装を解除しました。"
+msgid "<npcname> slowly strikes %s"
+msgstr "<npcname>は%sに緩慢な一撃を浴びせました。"
+
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
+msgstr "降下攻撃"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
-msgstr "<npcname>は%sの武装を解除しました。"
+msgid "You phase-strike %s"
+msgstr "%sに降下攻撃を仕掛けました。"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> phase-strikes %s"
+msgstr "<npcname>は%sに降下攻撃を仕掛けました。"
 
 #: lang/json/technique_from_json.py
 msgid "Pressure Crunch"
@@ -156433,7 +160289,7 @@ msgstr "橋脚"
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr "水底まで伸びた木製の頑丈な杭です。橋板を支えるには橋桁が必要です。"
 
@@ -156444,8 +160300,8 @@ msgstr "橋桁"
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr "木製の杭に固定された丸太の骨組みです。木製の橋板を固定すれば立派な桟橋になります。"
 
 #: lang/json/terrain_from_json.py
@@ -156455,7 +160311,7 @@ msgstr "桟橋(深水域)"
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr "水底まで伸びた木製の頑丈な杭に支えられた、木製の桟橋です。非常に丈夫で長持ちしそうです。"
 
@@ -157167,7 +161023,7 @@ msgstr "柵(金網)"
 msgid ""
 "A tall fence made of woven wires.  It doesn't suggest to stop, it just "
 "stops."
-msgstr "織られた鉄線が張ってある丈夫な柵です。通行禁止をほのめかしていません、と言うより通行できません。"
+msgstr "織られたワイヤーが張ってある丈夫な柵です。通行を妨げますが、絶対に通れない訳ではありません。"
 
 #: lang/json/terrain_from_json.py
 msgid "metal post"
@@ -157531,7 +161387,7 @@ msgstr "床(木)"
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
 msgstr "木の板を隙間なく敷き詰めて釘で打ち付けた床です。テラスなどでよく見られます。"
 
@@ -157840,7 +161696,7 @@ msgstr "放射線照射プラットホーム"
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr "放射性物質の保管に加えて、一時的に吊り上げることでアイテムに放射線を照射する役割も持った装置です。外部のコンソールを使って操作します。"
 
@@ -158128,10 +161984,10 @@ msgstr "セイヨウネズの木"
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
 "ニューイングランド地域で見られる、ビャクシン属の木です。ジュニパーベリーは最初に開花してから2～3年かけて成長し、2年ほど経つと見慣れた青い果実になります。枝を良く調べれば、成熟した果実が手に入るかもしれません。適切な道具を使えば切り倒せます。"
 
@@ -158718,7 +162574,7 @@ msgstr "長期間刈り取られていない、鬱蒼と茂った草です。"
 
 #: lang/json/terrain_from_json.py
 msgid "golf green"
-msgstr "グリーン"
+msgstr "芝生"
 
 #. ~ Description for golf green
 #: lang/json/terrain_from_json.py
@@ -159113,12 +162969,13 @@ msgstr "ATM"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
-"銀行の利便性を確保するために、このATMは致命的なネットワーク障害が発生した際にも完全自立稼働ができるようになっています。キャッシュカードのお金を預けたり、インフレ調整済みの資産を1枚のカードにまとめることができますが、そんな機能も今や時代遅れですが。取り付け騒ぎがあったようで、機械のあちこちに凹みやヒビが残っています。"
+"銀行の利便性を確保するために、このATMは致命的なネットワーク障害が発生した際にも完全自立稼働ができるようになっています。キャッシュカードのお金を預けたり、インフレ調整済みの資産を1枚のカードにまとめることができますが、そんな機能も今や時代遅れです。取り付け騒ぎがあったようで、機械のあちこちに凹みやヒビが残っています。"
 
 #: lang/json/terrain_from_json.py
 msgid "Critical failure imminent, self destruct activated.  Have a nice day!"
@@ -159133,18 +162990,18 @@ msgstr "券売機"
 msgid ""
 "This machine has a little screen, and slots intended to take your money and "
 "provide you with a ticket."
-msgstr "この機械には小さな画面と、入金とチケットを出すためのスロットがあります。"
+msgstr "小さな画面と、入金とチケット発券用のスロットが付いた機械です。"
 
 #: lang/json/terrain_from_json.py
 msgid "ticket machine"
-msgstr "券売機"
+msgstr "改札機"
 
 #. ~ Description for ticket machine
 #: lang/json/terrain_from_json.py
 msgid ""
 "This machine will provide you access to whatever is beyond it - for the "
 "price of a ticket, of course."
-msgstr "この機械を使えばその先にあるものは何でも手に入れることができます。もちろん、チケット代を払う事が出来ればですが。"
+msgstr "この機械を通り抜ければどこまでも進めます...もちろん、切符の金額分ですが。"
 
 #: lang/json/terrain_from_json.py
 msgid "broken generator"
@@ -159221,8 +163078,8 @@ msgstr "遠心分離装置"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
 msgstr "遠心分離機と分析装置が一体となった機械です。血液などの液体サンプルが入った試験管を置けば、内容物を分析できます。"
 
 #: lang/json/terrain_from_json.py
@@ -159838,7 +163695,7 @@ msgstr "閉じた門(樹脂)"
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
 msgstr ""
@@ -159851,7 +163708,7 @@ msgstr "開いた門(樹脂)"
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
 msgstr ""
@@ -159945,6 +163802,13 @@ msgid ""
 " were still running."
 msgstr "踏切がある事を表す交通標識ですが、列車が走っていなければ意味がありません。"
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr "小さい鉄道用の線路です。小型の車両を運行できそうです。"
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "砂場"
@@ -160011,7 +163875,7 @@ msgstr "集水器"
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr "屋根から地面に向かって水を流す、脆弱そうな溝です。ここを伝って下に降りられそうです。"
 
@@ -160023,7 +163887,7 @@ msgstr "縦樋"
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
 msgstr "屋根から地面に向かって水を流す、縦に伸びた脆弱そうな溝です。下に容器を置けば水を溜められそうです。ここを伝って下に降りられそうです。"
 
@@ -160317,14 +164181,14 @@ msgstr "紫色に塗られた壁です。"
 
 #: lang/json/terrain_from_json.py
 msgid "half-built brick wall"
-msgstr "建設途中の壁(煉瓦)"
+msgstr "建設途中の壁(レンガ)"
 
 #. ~ Description for half-built brick wall
 #: lang/json/terrain_from_json.py
 msgid ""
 "Half of a brick wall, looks like it still requires some more resources and "
 "effort before being considered a real wall."
-msgstr "完成途中の煉瓦の壁です。実用的な壁と見なされるには、もう少し資材と努力が必要なようです。"
+msgstr "完成途中のレンガの壁です。実用的な壁と見なされるには、もう少し資材と努力が必要なようです。"
 
 #: lang/json/terrain_from_json.py
 msgid "bash!"
@@ -160332,14 +164196,14 @@ msgstr "ガシャン！"
 
 #: lang/json/terrain_from_json.py
 msgid "brick wall"
-msgstr "壁(煉瓦)"
+msgstr "壁(レンガ)"
 
 #. ~ Description for brick wall
 #: lang/json/terrain_from_json.py
 msgid ""
 "A solid brick wall, sturdy enough to support a roof with enough walls and "
 "keep out any unwanted visitors."
-msgstr "屋根を支え、招かれざる客を退けるのに十分な頑丈さを備えた煉瓦の壁です。"
+msgstr "屋根を支え、招かれざる客を退けるのに十分な頑丈さを備えたレンガの壁です。"
 
 #: lang/json/terrain_from_json.py
 msgid "stone wall"
@@ -160374,25 +164238,25 @@ msgstr "表面が滑らかな石のブロックです。礼拝堂や霊廟では
 
 #: lang/json/terrain_from_json.py
 msgid "half-built adobe wall"
-msgstr "建設途中の壁(日干し煉瓦)"
+msgstr "建設途中の壁(日干しレンガ)"
 
 #. ~ Description for half-built adobe wall
 #: lang/json/terrain_from_json.py
 msgid ""
 "Half of an adobe brick wall, looks like it still requires some more "
 "resources and effort before being considered a real wall."
-msgstr "完成途中の日干し煉瓦の壁です。実用的な壁と見なされるには、もう少し資材と努力が必要なようです。"
+msgstr "完成途中の日干しレンガの壁です。実用的な壁と見なされるには、もう少し資材と努力が必要なようです。"
 
 #: lang/json/terrain_from_json.py
 msgid "adobe wall"
-msgstr "壁(日干し煉瓦)"
+msgstr "壁(日干しレンガ)"
 
 #. ~ Description for adobe wall
 #: lang/json/terrain_from_json.py
 msgid ""
 "A solid adobe brick wall, sturdy enough to support a roof with enough walls "
 "and keep out any unwanted visitors."
-msgstr "屋根を支え、招かれざる客を退けるのに十分な頑丈さを備えた日干し煉瓦の壁です。"
+msgstr "屋根を支え、招かれざる客を退けるのに十分な頑丈さを備えた日干しレンガの壁です。"
 
 #: lang/json/terrain_from_json.py
 msgid "concrete wall"
@@ -160817,7 +164681,7 @@ msgstr "建設途中の柱"
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr ""
 "コンクリートと鉄筋で作られた基礎の周りを、柱の形をした木製の型が囲っています。屋根やシェルターを支えるにはまだ不十分です。作業を完了するにはより多くの資材が必要になりそうです。"
@@ -161987,7 +165851,7 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
 "手榴弾のピンを引き抜きました！投げた方が良いでしょうね。アイテムを投げるには、't'を押したあと投げる物を選択します。投擲できる範囲は、自身の筋力と投げる物の重量・体積によって異なります。投擲は、戦闘中に役立つことはあまりありませんが、火力の高い物があればあるいは..."
 
@@ -162062,7 +165926,7 @@ msgstr "真っ暗だ！幸いな事に懐中電灯を持っています。'a'を
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr ""
@@ -162412,6 +166276,10 @@ msgstr "6人乗り軌道自動自転車"
 msgid "Rail Motorcycle"
 msgstr "レールバイク"
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr "ミニ機関車"
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "平床トラック"
@@ -162506,7 +166374,7 @@ msgstr "バス"
 
 #: lang/json/vehicle_from_json.py
 msgid "Tour Bus"
-msgstr "観光バス"
+msgstr "ツアーバス"
 
 #: lang/json/vehicle_from_json.py
 msgid "Security Van"
@@ -163215,7 +167083,7 @@ msgstr "車載マットレス"
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
 msgstr "車両に結び付けたマットレスです。衝突の衝撃を和らげます。"
 
 #. ~ Description for shredder
@@ -163685,8 +167553,8 @@ msgstr "小型の洗濯機です。洗剤と水、電力を消費して大量の
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr ""
 "小さな食洗器です。洗剤と水、電力を消費して食器...あるいはもっと有用な、例えばゾンビの死体に埋まっていたCBMを洗浄できそうです。タイルを調べると使用できます。"
 
@@ -163872,7 +167740,7 @@ msgstr "風を当てると車両の電力をゆっくりと充電する、小型
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
 msgstr "安定感のある脚を備えた大型の風力タービンです。風を当てると車両の電力をゆっくりと充電します。車両の空気抵抗が増加します。"
 
@@ -163991,7 +167859,7 @@ msgid ""
 "craft an item that needs a kiln, you will be given the option of selecting "
 "it as a tool."
 msgstr ""
-"車両のバッテリーの電力を消費して駆動する、煉瓦や陶器を焼くための電動窯です。これを使えば煉瓦や粘土を焼いて固められます。窯が必要なアイテム製作を行う際は、自動的に道具として認識されます。"
+"車両のバッテリーの電力を消費して駆動する、レンガや陶器を焼くための電動窯です。これを使えばレンガや粘土を焼いて固められます。窯が必要なアイテム製作を行う際は、自動的に道具として認識されます。"
 
 #: lang/json/vehicle_part_from_json.py
 msgid "wooden armor"
@@ -164417,6 +168285,14 @@ msgstr "頑丈な金属製の車輪です。車輪縁の出っ張りのお陰で
 msgid "rail wheel (steerable)"
 msgstr "鉄道用ホイール(転舵輪)"
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr "２つセットになった小型の鉄道用車輪です。普通の鉄道より狭いレール上を走れますが、操縦はできません。"
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "ドラムローラー"
@@ -165908,7 +169784,7 @@ msgstr "銃器を搭載する、回転機構付きのタレットです。対応
 
 #: lang/json/vehicle_part_from_json.py
 msgid "wiring"
-msgstr "ワイヤー"
+msgstr "配線"
 
 #. ~ Description for wiring
 #: lang/json/vehicle_part_from_json.py
@@ -166115,6 +169991,10 @@ msgstr "ビタミンB12"
 msgid "Vitamin C"
 msgstr "ビタミンC"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr "毒素"
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr " "
@@ -166604,7 +170484,7 @@ msgstr "%sに弾薬を込めました。"
 msgid "You refill the %s."
 msgstr "%sを補充しました。"
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "火をつけられそうな物がありません。"
 
@@ -166620,6 +170500,16 @@ msgstr "火を起こすために使っていたアイテムを失いました。
 msgid "There is not enough sunlight to start a fire now.  You stop trying."
 msgstr "点火するには太陽光が弱すぎます。点火作業を中止しました。"
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr "%sの呪文について少し学びました！"
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "%sを学びました。"
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -166630,11 +170520,6 @@ msgstr "訓練を受けて%sスキルが%dに上昇しました。"
 msgid "You get some training in %s."
 msgstr "%sの訓練を終えました。"
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "%sを学びました。"
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr "バッテリーを完全に充電しました。"
@@ -166750,15 +170635,22 @@ msgstr "損傷確率: <color_light_blue>%.1f</color>%%"
 msgid "Your %s is already fully repaired."
 msgstr "%sは完全に修復されています。"
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr "今のところ%sを修理できません。"
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgstr "食料を解凍しましたが、冷たいままの方が美味しいので、加温を中断しました。"
+
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr "食料を温めて解凍しました。"
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr "食料を温めました。"
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
-msgstr "%sの修理に成功しました。"
+msgid "You are currently unable to mend the %s."
+msgstr "今のところ%sを修理できません。"
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -167060,7 +170952,7 @@ msgstr "穿孔を終えました。"
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr "ザクッ！"
 
@@ -167668,13 +171560,13 @@ msgstr ""
 "移動速度低下 / 意気消沈 / 免疫力の低下 / 強い依存性"
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
 msgstr ""
 "感覚 -1 / 知性 -1\n"
 "強い依存性"
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
 msgstr ""
 "感覚 -2 / 知性 -2\n"
 "強い依存性"
@@ -167861,38 +171753,6 @@ msgstr "方向 数  重量 体積"
 msgid "Name (charges)"
 msgstr "名称(装填量)"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "牽引車両が無い！"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "牽引されている車両がありません！"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "無効な容器！"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "周囲9マス"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr " <color_white_red>火</color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr " 危険"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr " 罠"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr " 水"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -168014,7 +171874,39 @@ msgstr "移動先には%d個しか置けません！いくつ移動させます
 msgid "The destination is already full!"
 msgstr "移動先にはこれ以上入りません！"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "牽引車両が無い！"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "牽引されている車両がありません！"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "無効な容器！"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "周囲9マス"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr " <color_white_red>火</color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr " 危険"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr " 罠"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr " 水"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "無効な容器"
 
@@ -168138,6 +172030,14 @@ msgstr "耐打: "
 msgid "Cut:"
 msgstr "耐斬: "
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr "耐酸:"
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr "耐火:"
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "環境: "
@@ -168834,13 +172734,13 @@ msgstr "%s苦痛"
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
+"  Seeing this is a bug!"
 msgstr "%sは何も欲していませんが、漠然とした不満を抱いています。これはバグのようです！"
 
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
 msgstr "%sには何の基準もないので、現状に満足しているようです。これはバグのようです！"
 
@@ -168867,7 +172767,7 @@ msgstr "%sに体を押し付けました。"
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr "あなたが起きているにもかかわらず夢を見ているので%sは混乱しています。これはバグのようです！"
 
 #: src/artifact.cpp
@@ -169180,7 +173080,7 @@ msgstr "%sはあまり読み物には適しません。"
 
 #: src/avatar.cpp
 msgid "It's a bad idea to read while driving!"
-msgstr "運転しながら読書する馬鹿はいません！"
+msgstr "運転中に本を読む馬鹿はいません！"
 
 #: src/avatar.cpp
 msgid "What's the point of studying?  (Your morale is too low!)"
@@ -169650,6 +173550,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr "%1$sを%2$sから抜き取りますか？"
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr "%sをどうしますか？"
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr "殻にこもっているため動けません。移動するには殻から出てください。"
@@ -169782,12 +173687,14 @@ msgid "The %s must be attached to a gun, it can not be fired separately."
 msgstr "%sは銃器に取り付けられている必要があります。単体では使用できません。"
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
-msgstr "射撃できません。"
+#, c-format
+msgid "You can no longer fire your %s."
+msgstr "%sをこれ以上発射できません。"
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "運転するには腕を自由にする必要があります！"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr "運転中は%sを使用できません！"
 
 #: src/avatar_action.cpp
 #, c-format
@@ -169795,8 +173702,9 @@ msgid "You need two free hands to fire your %s."
 msgstr "%sを撃つには両手を空けておく必要があります。"
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "装填する必要があります！"
+#, c-format
+msgid "Your %s is empty!"
+msgstr "%sは空です！"
 
 #: src/avatar_action.cpp
 #, c-format
@@ -169807,18 +173715,20 @@ msgstr "%sを撃つには充電(%i)が必要です！"
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
-msgstr "撃つにはUPS(充電(%d))か改良型UPS(充電(%d))が必要です！"
+"charges to fire the %s!"
+msgstr "UPS(充電%d)か改良型UPS(充電%d)がないと%sを撃てません！"
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
-msgstr "バッテリー切れのため兵器使用不可"
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
+msgstr "メックがバッテリー切れのため%sを発射できません。"
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
-msgstr "この武器を使うには、テーブル、畝、割れた窓など適切な地形の近くに立つ必要があります。"
+msgstr "%sを使うには、テーブル、畝、割れた窓など適切な地形の傍に立つ必要があります。"
 
 #: src/avatar_action.cpp
 #, c-format
@@ -170058,6 +173968,16 @@ msgstr "%sは自動的に電源が切れました。"
 msgid "Your %s automatically turns off."
 msgstr "%sは自動的に電源が切れました。"
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr "湿度が低いため%sが機能しません。"
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr "%sが湿度低下警告を発しました。供給効率が低下します。"
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "考え直した結果、機能を停止させました。"
@@ -170175,10 +174095,6 @@ msgstr "血液検査の結果"
 msgid "No effects."
 msgstr "効果なし。"
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr "水を引き出すには大気の湿度が足りません！"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr "捻じれラチェットが関節部に固定されました。"
@@ -170191,10 +174107,6 @@ msgstr "関節サーボモーターの補助によってより速く走れる状
 msgid "Start a fire where?"
 msgstr "どこに火をつけますか？"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "そこには点火できません。"
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -170369,6 +174281,20 @@ msgstr "燃料消費を防ぐため%sが停止しました。"
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr "燃料消費を防ぐため<npcname>の%sが停止しました。"
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr "現在の蓄積カロリーが安全値を下回っています。健康維持のため%sをシャットダウンします。"
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr "現在の保存カロリーが安全値を下回っています。健康維持のため<npcname>の%sをシャットダウンします。"
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -170397,6 +174323,21 @@ msgstr "%sは接続を失い、機能を停止しました。"
 msgid "You feel your throat open up and air filling your lungs!"
 msgstr "気管支が開き、肺が空気で満たされているのを感じます！"
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr "湿度が低すぎて%sが機能しません。"
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr "%sが湿度低下警告を発しました。供給効率が低下しています。"
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr "身体は十分に潤っています。%sは喜ばしい通知音を発しました。"
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr "除去に失敗しましたが、体は何事もなく無事でした。"
@@ -171166,9 +175107,13 @@ msgstr "に坂索トし荷測のンおク妙免イロコヤ梅棋厚れ表幌"
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
+msgid "You"
 msgstr "あなた"
 
+#: src/character.cpp
+msgid "Your"
+msgstr "あなたの"
+
 #: src/character.cpp
 msgid "your"
 msgstr "あなた"
@@ -171399,6 +175344,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr "%1$sを%2$sに入れました。"
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr "ここにはアイテムを置けません！"
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr "<npcname>はそこにアイテムを置けません！"
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -171422,10 +175375,20 @@ msgstr "%1$sが無ければ%3$sの%2$sを使用できません。"
 msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr "<npcname>は%1$sが無ければ%3$sの%2$sを使用できません。"
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr "%sの装備状態を解除できません。"
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr "所持していた液体が地面に流れ落ちました。"
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr "現在の健康度は%dです。"
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "脱水"
@@ -171495,6 +175458,75 @@ msgstr "疲労 ***"
 msgid "Your %s bionic shorts out!"
 msgstr "%sがショートしました！"
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "%sに霜焼けができそうです。"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "このままだと1時間以内に%sが凍傷になります！"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr "このままだと数分後に%sが凍傷になります！"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr "%sが寒過ぎて、感覚が無くなってきました！"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr "%sが非常に寒く感じます。"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr "%sが若干寒く感じます。"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr "%sが熱過ぎて、真っ赤になってきました！"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr "%sがかなり暑く感じます。"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr "%sが少しだけ暑く感じます。"
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "%sに風が当たって非常に寒く感じます。"
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr "強風が吹いています。%sを寒さから守る為に、風を防げる衣類を見つける必要があります。"
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr "着用中の衣類では%sに当たる風を十分に防げていません！"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "左腕"
@@ -171659,8 +175691,8 @@ msgstr "ちょいデブ"
 msgid "Big"
 msgstr "ぽっちゃり"
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "普通"
 
@@ -171764,6 +175796,30 @@ msgstr "ACTIVE_EXERCISE"
 msgid "EXTRA_EXERCISE"
 msgstr "EXTRA_EXERCISE"
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr "身体が重荷に悲鳴を上げました。"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] "%sを使用するにはUPS型電源(%d)が必要です。"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] "%s(%d)の装填量は%d以上必要です。"
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "騒々しく咳をしています。"
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "[苦しそうな空咳]"
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr "叫ぼうとしましたが、顔がありません！"
@@ -171943,6 +175999,20 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr "冬眠に入りました。"
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr "CQB生体部品によって広範な実戦訓練を行い、%sを覚えました。"
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr "%sを押して戦闘スタイルを選択できます。"
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "なし"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "自動拾得から除外"
@@ -171987,261 +176057,6 @@ msgid ""
 "this area."
 msgstr "友好NPCはこの区域内から発生する正体不明の音のみを調査します。"
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr "分類: 仮置場"
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr ""
-"まだ分類していないアイテムを置く区域です。区域作業として「分類」を実行することで内部のアイテムを分類できます。別の分類区域と重複する可能性があります。"
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr "分類: 食料"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr "食料を置く区域です。より具体的な食料分類を指定していない場合、全ての食料はここに移動されます。"
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr "分類: 生鮮食料"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr "腐敗する食料を置く区域です。他に該当する区域を指定していない場合、生鮮飲料はここに移動されます。"
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr "分類: 飲料"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr "飲料を置く区域です。生鮮飲料の区域を指定していない場合、生鮮飲料はここに移動されます。"
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr "分類: 生鮮飲料"
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr "腐敗する飲料を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr "分類: 銃器"
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr "銃、弓などの武器を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr "分類: 弾倉"
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr "銃の弾倉を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr "分類: 弾薬"
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr "弾薬を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr "分類: 武器"
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr "近接武器を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr "分類: 道具"
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr "道具を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr "分類: 衣類"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr "衣類を置く区域です。他に該当する区域を指定していない場合、不潔な衣類はここに移動されます。"
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr "分類: 不潔な衣類"
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr "不潔な衣類を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr "分類: 薬品"
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr "薬品や衣料品を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr "分類: 本"
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr "本や雑誌を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr "分類: MOD"
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr "銃器用MODなどを置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr "分類: 変異原"
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr "変異原、血清、変異治療薬を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr "分類: CBM"
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr "生体部品、いわゆるCBMを置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr "分類: 車両部品"
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr "車両部品を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr "分類: その他"
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr "その他の雑多なアイテムを置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr "分類: 燃料"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr "燃料として利用するガソリン、軽油、ランプオイルなどを置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr "分類: 種"
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr "種や茎などを置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr "分類: 化学物質"
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr "化学物質を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr "分類: 予備部品"
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr "予備部品を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr "分類: アーティファクト"
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr "アーティファクトを置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr "分類: 死体"
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr "死体を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr "分類: 防具"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr "防具を置く区域です。他に該当する区域を指定していない場合、不潔な防具はここに移動されます。"
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr "分類: 不潔な防具"
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr "不潔な防具を置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr "分類: 木材"
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr "焚き木として利用できるアイテムを置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr "分類: カスタム"
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr "自由に変更できるフィルタを適用したアイテムを置く区域です。"
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr "分類: 無視"
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr "この区域内のアイテムは区域行動の「分類」時に無視されます。"
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr "供給: 焚き木"
@@ -172249,7 +176064,7 @@ msgstr "供給: 焚き木"
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
 msgstr ""
 "印を付けたタイルに置かれている焚き木など可燃物は、火の中へ自動的に補給されます。製作や読書などの長時間の作業時には、火を絶やさないよう自動補給機能が働きますが、火の傍でただ立っているだけの時などは、自動補給は行われません。"
@@ -172310,15 +176125,25 @@ msgstr "車両: 自動運転"
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr "自動操縦機能をもった車両はこの区域内を運転します。"
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr "拠点: 道具"
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr "この区域内のアイテムは、拠点の共有物になり、任務中の作業で使用されます。"
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
-msgstr "拠点: 配給食料"
+msgstr "拠点: 備蓄食料"
 
 #: src/clzones.cpp
 msgid ""
 "Items in this zone will be added to a basecamp's food supply in the "
 "Distribute Food mission."
-msgstr "この区域内のアイテムは、拠点での任務時に消費する配給食料として扱われます。"
+msgstr "この区域内のアイテムは、拠点での任務時に消費する備蓄食料として扱われます。"
 
 #: src/clzones.cpp src/game.cpp
 msgid "Filter:"
@@ -173658,24 +177483,6 @@ msgstr "%sで満腹になりました。"
 msgid "<npcname> looks better after eating the %s."
 msgstr "<npcname>は%sを食べて満足しているようです。"
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "体内蓄電装置が満タンになりました。"
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr "<npcname>の体内蓄電装置が満タンになりました。"
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr "%sのバッテリーを充電しました。"
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr "<npcname>は%sのバッテリーを充電しました。"
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr "非常に大量のプルトニウムです。本当にこんなに必要ですか？"
@@ -174678,6 +178485,10 @@ msgstr "表示 - 臭跡マップ"
 msgid "Toggle display temperature"
 msgstr "表示 - 気温"
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr "表示 - 自動運転オーバーレイ"
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr "表示 - 視認性"
@@ -174718,6 +178529,10 @@ msgstr "表示 - NPC移動経路"
 msgid "Print faction info to console"
 msgstr "出力 - 派閥"
 
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr "出力 - NPC魔法"
+
 #: src/debug_menu.cpp
 msgid "Test weather"
 msgstr "テスト - 天候"
@@ -175001,6 +178816,10 @@ msgstr "表示/ステータス"
 msgid "t[e]leport"
 msgstr "瞬間移動"
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr "インフルエンザ罹患"
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr "編集/依頼(警告:不安定な機能です！)"
@@ -175589,10 +179408,12 @@ msgstr "まず呪文を拾得する必要があります。"
 msgid "Spell"
 msgstr "呪文"
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
 msgstr "LV"
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
 msgstr "最大"
@@ -176394,7 +180215,7 @@ msgstr "地形のidを'%s' (%s)から'%s' (%s)に変更しました"
 
 #: src/editmap.cpp
 msgid "Your mechanic could not find a vehicle at the garage."
-msgstr "整備士は車両修理工場内で車両を発見できませんでした。"
+msgstr "整備士は車両整備工場内で車両を発見できませんでした。"
 
 #: src/editmap.cpp
 msgid "Select the Vehicle"
@@ -177622,6 +181443,14 @@ msgstr "、拠点管理人"
 msgid "%s has abandoned the camp."
 msgstr "%sは拠点を放棄しました。"
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr "拡張"
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr "仲間を呼び戻す: "
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -177647,87 +181476,6 @@ msgstr ""
 "時間: 3時間、連続作業可能\n"
 "人員: %d/3\n"
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-"メモ:\n"
-"仲間に配給する食料を備蓄します。配給したい食料は「拠点: 配給食料」区域に置きましょう。「拠点: 配給食料」、「分類: 仮置場」、最低でも1種類の「分類」区域が設定されていない場合は、区域管理メニューでそれらを設定するよう警告が表示されます。\n"
-"効果:\n"
-"> >派閥の食料ステータスが増加します。任務に就いた仲間が配給食料を消費します。\n"
-" \n"
-"満喫-6以上の食料が必要です\n"
-"生鮮食料は、改良の進行と腐敗までの時間によってカロリー減少のペナルティが課されます:\n"
-"> 腐敗: カロリーの0%%\n"
-"> 2日以内に腐敗: カロリーの60%%\n"
-"> 5日以内に腐敗: カロリーの80%%\n"
-" \n"
-"備蓄量:  %dkcal\n"
-"(%d日分)"
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr "配給食料の備蓄"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-"メモ:\n"
-"[単純労働]の任務で移動させるアイテムの置き場所をリセットします。\n"
-" \n"
-"効果:\n"
-"> 区域管理メニューで分類区域を割り当てます。「拠点: 配給食料」、「分類: 仮置場」、最低でも1種類の「分類」区域は必ず設定しなければいけません。\n"
-"> 置かれた場所が「分類: 仮置場」であり、かつ他のあらゆる区域と被っていないアイテムのみが、単純労働時に移動されます。\n"
-"「分類」区域が設定されていないアイテムは、単純労働時に通常の分類ルールに基づいて移動されます。"
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr "収拾地点のリセット"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-"メモ:\n"
-"配置済みのNPCに仕事を繰り返すよう指示します。\n"
-"難易度: なし\n"
-"効果:\n"
-"\n"
-"\n"
-"危険度: なし\n"
-"時間: 進行中"
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr "作業継続"
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -177786,35 +181534,6 @@ msgstr ""
 "時間: 3時間\n"
 "人員: %d/1\n"
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-"メモ:\n"
-"拠点は更なる拡張が可能な程に大きくなりました。拡張すれば新たなチャンスが広がりますが、資材が大量に必要で、時間もかかります。拠点は周囲8方向にしか拡張できないので、何の施設にするか慎重に選びましょう。\n"
-" \n"
-"使用スキル: 製作\n"
-"効果:\n"
-"> 拡張地点に建設する施設を選びましょう。食料は仲間の任務に不可欠なことや建設に必要な資材が少ないことを考えると、農場を選ぶのが賢明です。車両修理工場は最小限の投資で大型車両を迅速に解体できる点が便利であり、鍛冶場では木炭生産用の資源が提供されます。\n"
-"\n"
-"メモ: 拡張した施設での行動や任務は、拠点管理ウィンドウの各タブから選択できます。\n"
-"\n"
-"危険: なし\n"
-"時間: 3時間 \n"
-"人員: %d/1\n"
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -178090,14 +181809,6 @@ msgstr ""
 "時間: 移動時間\n"
 "人員: %d/3\n"
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr "拡張"
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr "仲間を呼び戻す: "
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -178232,6 +181943,94 @@ msgstr ""
 "時間: 3分 / 区画 \n"
 "人員: 0/1 \n"
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+"メモ:\n"
+"拠点は更なる拡張が可能な程に大きくなりました。拡張すれば新たなチャンスが広がりますが、資材が大量に必要で、時間もかかります。拠点は周囲8方向にしか拡張できないので、何の施設にするか慎重に選びましょう。\n"
+" \n"
+"使用スキル: 製作\n"
+"効果:\n"
+"> 拡張地点に建設する施設を選びましょう。食料は仲間の任務に不可欠なことや建設に必要な資材が少ないことを考えると、農場を選ぶのが賢明です。車両修理工場は最小限の投資で大型車両を迅速に解体できる点が便利であり、鍛冶場では木炭生産用の資源が提供されます。\n"
+"\n"
+"メモ: 拡張した施設での行動や任務は、拠点管理ウィンドウの各タブから選択できます。\n"
+"\n"
+"危険: なし\n"
+"時間: 3時間 \n"
+"人員: %d/1\n"
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+"メモ:\n"
+"仲間が食べる食料を備蓄します。備蓄したい食料は「拠点: 備蓄食料」区域に置きましょう。「拠点: 備蓄食料」区域、「拠点: 道具」区域が設定されていない場合、区域管理メニューでそれらを設定するよう警告が表示されます。\n"
+"効果:\n"
+"> >派閥の食料ステータスが増加します。任務に就いた仲間が配給食料を消費します。\n"
+" \n"
+"満喫-6以上の食料が必要です\n"
+"生鮮食料は、改良の進行と腐敗までの時間によってカロリー減少のペナルティが課されます:\n"
+"> 腐敗: カロリーの0%%\n"
+"> 2日以内に腐敗: カロリーの60%%\n"
+"> 5日以内に腐敗: カロリーの80%%\n"
+" \n"
+"備蓄量:  %dkcal\n"
+"(%d日分)"
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr "食料の備蓄"
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+"メモ:\n"
+"配置済みのNPCに仕事を繰り返すよう指示します。\n"
+"難易度: なし\n"
+"効果:\n"
+"\n"
+"\n"
+"危険度: なし\n"
+"時間: 進行中"
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr "作業継続"
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -178248,6 +182047,10 @@ msgstr ""
 "\n"
 "緊急帰還が利用可能になるには、その仲間が少なくとも24時間以上作業を行っている必要があります。"
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr "は周辺調査に向かいました..."
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr "は資材の収集に向かいました..."
@@ -178284,10 +182087,6 @@ msgstr "は狩猟に向かいました..."
 msgid "departs to search for recruits…"
 msgstr "は新たな仲間探しに向かいました..."
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr "は周辺調査に向かいました..."
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr "が何かを持って戻ってきました..."
@@ -178306,7 +182105,7 @@ msgstr "が何かを持って鍛冶場から戻ってきました..."
 
 #: src/faction_camp.cpp
 msgid "returns from your garage…"
-msgstr "が車両修理工場から戻ってきました..."
+msgstr "が車両整備工場から戻ってきました..."
 
 #: src/faction_camp.cpp
 msgid "You don't have enough food stored to feed your companion."
@@ -178489,7 +182288,7 @@ msgstr ""
 
 #: src/faction_camp.cpp
 msgid "begins working in the garage…"
-msgstr "は車両修理工場での作業を開始しました..."
+msgstr "は車両整備工場での作業を開始しました..."
 
 #: src/faction_camp.cpp
 msgid "Your companion seems disappointed that your pantry is empty…"
@@ -178572,10 +182371,10 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
-"名前:  %20s\n"
+"名前:  %s\n"
 "\n"
 
 #: src/faction_camp.cpp
@@ -178755,10 +182554,8 @@ msgstr "必要な区域が設定されていません。区画を設定します
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
-msgstr ""
-"分類区域が変更されました。分類区域を設定してください。「拠点: 配給食料」、「分類: 仮置場」、最低でも1種類の「分類」区域を必ず設定してください。"
+"create a camp food zone, and a camp storage zone."
+msgstr "分類区域が変更されました。分類区域を設定してください。「拠点: 備蓄食料」区域、「拠点: 道具」区域は必ず設定してください。"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -178787,18 +182584,18 @@ msgstr ">舗装路: %15d (m)\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
-msgstr ">移動時間:  %23s\n"
+msgid ">Travel:  %s\n"
+msgstr ">移動:  %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
-msgstr ">作業時間: %23s\n"
+msgid ">Working: %s\n"
+msgstr ">作業: %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
-msgstr "合計:    %23s\n"
+msgid "Total:    %s\n"
+msgstr "合計:    %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -178871,8 +182668,8 @@ msgstr "耕地が必要: "
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
-msgstr "名前:     %25s\n"
+msgid "Name:     %s\n"
+msgstr "名前:     %s\n"
 
 #: src/faction_camp.cpp
 msgid "----          Engines          ----\n"
@@ -178880,8 +182677,8 @@ msgstr "----          エンジン          ----\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
-msgstr "エンジン:  %25s\n"
+msgid "Engine:   %s\n"
+msgstr "動力:   %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -178890,8 +182687,8 @@ msgstr ">状態:  %24d%%\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
-msgstr ">燃料:    %25s\n"
+msgid ">Fuel:    %s\n"
+msgstr ">燃料:    %s\n"
 
 #: src/faction_camp.cpp
 msgid "----  Fuel Storage & Battery   ----\n"
@@ -178903,7 +182700,7 @@ msgstr "推定分解時間:         5日\n"
 
 #: src/faction_camp.cpp
 msgid "You do not have a camp food zone.  Aborting…"
-msgstr "「拠点: 配給食料」区域がありません。作業を中止します..."
+msgstr "「拠点: 備蓄食料」区域がありません。作業を中止します..."
 
 #: src/faction_camp.cpp
 msgid "No items are located at the drop point…"
@@ -180197,7 +183994,7 @@ msgstr ""
 
 #: src/game.cpp
 msgid "Dismember corpse"
-msgstr "分割切断"
+msgstr "切断破壊"
 
 #: src/game.cpp
 msgid ""
@@ -180221,7 +184018,7 @@ msgstr ""
 
 #: src/game.cpp
 msgid "You can't butcher while driving!"
-msgstr "運転中には捌けません！"
+msgstr "運転中は解体できません！"
 
 #: src/game.cpp
 msgid "You don't have a butchering tool."
@@ -180338,7 +184135,7 @@ msgstr "%sに装填するには最低でも1つの%sが必要です！"
 msgid "The %s is already full!"
 msgstr "%sにはこれ以上装填できません！"
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr "%sには装填できません！"
@@ -180426,6 +184223,19 @@ msgstr "本当に%sに踏み込みますか？"
 msgid "Your %s refuses to move over that ledge!"
 msgstr "%sはそちらへ向かうのを拒否しています！"
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr "ここはあなたには適しません。"
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr "ここは騎乗動物には適しません。"
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr "%sは移動できない状態です。"
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "掴めるものがありません。"
@@ -180617,6 +184427,16 @@ msgstr "重い%sを動かそうとして体に痛みが走りました！"
 msgid "There's stuff in the way."
 msgstr "邪魔なものがあって移動できません。"
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr "%sは非常に重いです！"
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr "%sの移動に失敗しました。"
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -180928,7 +184748,7 @@ msgid ""
 "characters (e.g. empty boxes or question marks). You have been warned."
 msgstr "有効なUnicodeが指定されていないため、奇妙な文字(空欄や？マーク)が表示されてしまいます。忠告はしましたよ。"
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr "原因不明の鋭い痛みを感じました。"
 
@@ -181213,10 +185033,6 @@ msgstr "鮮度"
 msgid "SPOILS IN"
 msgstr "腐敗期限"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "電力"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "反応炉"
@@ -181241,10 +185057,6 @@ msgstr "こぼれた液体は飲めない"
 msgid "Your biology is not compatible with that item."
 msgstr "体質的な問題でそのアイテムを使えません。"
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr "完全に充電されている"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -181336,10 +185148,6 @@ msgid "Needs at least %d charge"
 msgid_plural "Needs at least %d charges"
 msgstr[0] "%dの充填が必要"
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr "..."
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "使用するアイテムを選択"
@@ -181556,11 +185364,6 @@ msgstr "<color_yellow>利用可能なキット: %i</color>"
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr "<color_yellow>利用可能な麻酔: %iml</color>"
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr "<color_yellow>利用可能な金銭: %s</color>"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -182684,8 +186487,8 @@ msgid "Purchase cash card?"
 msgstr "キャッシュカード購入"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
-msgstr "カードを購入するには口座に1.00ドルが必要です。"
+msgid "You need $10.00 in your account to purchase a card."
+msgstr "カードを購入するには口座に10.00ドルが必要です。"
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -182727,8 +186530,8 @@ msgstr "口座には現在%s保有されています。"
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
-msgstr "銀行口座から自動的に1.00ドルが差し引かれます。続けますか？"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
+msgstr "銀行口座から自動的に10.00ドルが差し引かれます。続けますか？"
 
 #: src/iexamine.cpp
 msgid "You can only deposit money from charged cash cards!"
@@ -183007,8 +186810,9 @@ msgid "The gun safe stumps your efforts to pick it."
 msgstr "銃保管庫の鍵を上手く開けられませんでした。"
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
-msgstr "こじ開ける道具があれば..."
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
+msgstr "%sには鍵がかかっています。こじ開ける道具があれば..."
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
 #: src/iexamine.cpp
@@ -183016,6 +186820,16 @@ msgstr "こじ開ける道具があれば..."
 msgid "You attempt to pry open the %1$s using your %2$s…"
 msgstr "%1$sを%2$sでこじ開けようとしています..."
 
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
+msgstr "%sには鍵がかかっています。ピッキングする道具があれば..."
+
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr "%1$sを%2$sでピッキングしようとしています..."
+
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
 msgstr "この掲示板は拠点内にありません"
@@ -183290,7 +187104,7 @@ msgstr "炭を作るには投入物が少なすぎます。"
 
 #: src/iexamine.cpp
 msgid "This kiln is ready to be fired, but you have no fire source."
-msgstr "この窯は着火の準備が整っていますが、火種がありません。"
+msgstr "この窯は点火の準備が整っていますが、着火道具がありません。"
 
 #: src/iexamine.cpp
 #, c-format
@@ -183450,7 +187264,7 @@ msgstr "火をつける"
 
 #: src/iexamine.cpp
 msgid "Start a fire… you'll need a fire source."
-msgstr "火をつける...火種が必要"
+msgstr "火をつける...着火道具が必要"
 
 #: src/iexamine.cpp
 msgid "Use a CBM to start a fire"
@@ -183478,6 +187292,10 @@ msgstr "%sを使って火をつけました..."
 msgid "You weren't able to start a fire."
 msgstr "火をつけられませんでした。"
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "そこには点火できません。"
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -184106,7 +187924,7 @@ msgstr "患者は死亡しています。続行するには死体を除去して
 msgid ""
 "ERROR Bionic Level Assessement: FULL CYBORG.  Autodoc Mk. XI can't opperate."
 "  Please move patient to appropriate facility.  Exiting."
-msgstr "生体レベル評価エラー: 完全機械化済。オートドクMk. XIは未対応です。患者を適切な装置に移してください。操作を終了します。"
+msgstr "生体レベル評価エラー: 完全機械化済。オートドクMk.XIは未対応です。患者を適切な装置に移してください。操作を終了します。"
 
 #: src/iexamine.cpp
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation."
@@ -184138,7 +187956,7 @@ msgstr "摘出するCBMを選択"
 
 #: src/iexamine.cpp
 msgid "UNKNOWN COMMAND.  Autodoc Mk. XI. Crashed."
-msgstr "不明なコマンド。オートドクMk. XIがクラッシュしました。"
+msgstr "不明なコマンド。オートドクMk.XIがクラッシュしました。"
 
 #: src/iexamine.cpp
 msgid ""
@@ -184162,6 +187980,20 @@ msgstr "オートドクは%sの手術中です。"
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr "オートドクMk.XI　ステータス: オンライン　手術を選択してください"
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr "警告: 操作者不明"
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+"\n"
+" 操作者なしでのオートドクの利用は<color_light_cyan>重症</color>あるいは<color_light_cyan>死亡</color>の危険を伴います。\n"
+" 操作を続行する場合は、これらの危険性を理解し、事故発生時に当施設に対する法的措置を講じないことに了承したものとみなします。"
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr "移植するCBMを選択してください"
@@ -184296,7 +188128,7 @@ msgstr "%1$s以上の炭が必要です。燻製ラックには%2$sの食品が
 
 #: src/iexamine.cpp
 msgid "This smoking rack is ready to be fired, but you have no fire source."
-msgstr "ラックは点火の準備が整っていますが、火種を持っていません。"
+msgstr "このラックは点火の準備が整っていますが、着火道具がありません。"
 
 #: src/iexamine.cpp
 msgid "Fire the smoking rack?"
@@ -184684,6 +188516,10 @@ msgstr "全体マップ接続"
 msgid "Overmap specials"
 msgstr "全体マップ特殊地形"
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "全体マップ位置"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr "車両原型"
@@ -184740,6 +188576,10 @@ msgstr "採取リスト"
 msgid "Anatomies"
 msgstr "解体"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "変異"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "タイルセット"
@@ -184784,18 +188624,10 @@ msgstr "職業"
 msgid "Scenarios"
 msgstr "シナリオ"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "変異"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "変異カテゴリー"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "全体マップ位置"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr "特殊地形"
@@ -185159,14 +188991,6 @@ msgstr "%1$d/%2$d"
 msgid "Page %d/%d"
 msgstr "ページ %d/%d"
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "着用中"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "装備中"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -185586,20 +189410,20 @@ msgstr "* この食料は極低温によって<good>寄生虫が死滅</good>し
 msgid ""
 "This food has started to <neutral>rot</neutral>, but <info>your bionic "
 "digestion can tolerate it</info>."
-msgstr "この食料は<neutral>腐敗</neutral>が始まっていますが、<info>人工消化器官があれば食べられます</info>。"
+msgstr "この食料は<neutral>腐敗</neutral>が始まっていますが、<info>人工消化器官で消化可能</info>です。"
 
 #: src/item.cpp
 msgid ""
 "This food has started to <neutral>rot</neutral>, but <info>you can tolerate "
 "it</info>."
-msgstr "この食料は<neutral>腐敗</neutral>が始まっていますが、<info>なんとか食べられます</info>。"
+msgstr "この食料は<neutral>腐敗</neutral>が始まっていますが、<info>消化可能</info>です。"
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
 msgstr ""
-"この食料は<neutral>腐敗</neutral>が始まっています。<info>食べる</info>のは<bad>避けるべき</bad>です。"
+"この食べ物は<neutral>腐敗</neutral>が始まっています。<info>食べる</info>のは<bad>避けるべき</bad>です。"
 
 #: src/item.cpp
 #, c-format
@@ -185669,11 +189493,6 @@ msgstr "この弾薬は<good>必ず発射</good>されます。"
 msgid "This ammo <neutral>starts fires</neutral>."
 msgstr "この弾薬は<neutral>発火</neutral>します。"
 
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr "<info>MOD:(%s)</info>の数値を表示しています。"
-
 #: src/item.cpp
 msgid "Skill used: "
 msgstr "適用スキル: "
@@ -185812,8 +189631,9 @@ msgid "Used on: "
 msgstr "対応: "
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "位置: "
+#, c-format
+msgid "Location: %s"
+msgstr "位置: %s"
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -186324,43 +190144,46 @@ msgid ""
 msgstr "* この衣類は<bad>小さすぎる</bad>ため、体格に<bad>不適合</bad>です。"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
-msgstr "* この衣類は<info>サイズアップ可能</info>です。"
+msgid "<info>can be upsized</info>"
+msgstr "<info>サイズアップ可能</info>"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
-msgstr "* この衣類は<info>サイズダウン可能</info>です。"
+msgid "<info>can be downsized</info>"
+msgstr "<info>サイズダウン可能</info>"
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
-msgstr "* この衣類は<bad>サイズダウン不可能</bad>です。"
+msgid "<bad>can not be downsized</bad>"
+msgstr "<bad>サイズダウン不可能</bad>"
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
-msgstr "* この衣類は<bad>サイズアップ不可能</bad>です。"
+msgid "<bad>can not be upsized</bad>"
+msgstr "<bad>サイズアップ不可能</bad>"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
-msgstr "* この衣類は<info>仕立て直し可能</info>かつ<info>サイズアップ可能</info>です。"
+#, c-format
+msgid "* This clothing %s."
+msgstr "* この衣類は%s"
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
-msgstr "* この衣類は<info>仕立て直し可能</info>かつ<info>サイズダウン可能</info>です。"
+msgid " and <info>upsized</info>"
+msgstr "、<info>サイズアップ可能</info>"
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
-msgstr "* この衣類は<info>仕立て直し可能</info>ですが<info>サイズダウン不可能</info>です。"
+msgid " and <info>downsized</info>"
+msgstr "、<info>ダウンサイズ可能</info>"
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
-msgstr "* この衣類は<info>仕立て直し可能</info>ですが<info>サイズアップ不可能</info>です。"
+msgid " but <bad>not downsized</bad>"
+msgstr "、<bad>ダウンサイズ不可能</bad>"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
-msgstr "* この衣類は<info>仕立て直し可能</info>です。"
+msgid " but <bad>not upsized</bad>"
+msgstr "、<bad>サイズアップ不可能</bad>"
+
+#: src/item.cpp
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
+msgstr "* この衣類は<info>仕立て直し</info>によって%sです。"
 
 #: src/item.cpp
 msgid "* This clothing <bad>can not be refitted, upsized, or downsized</bad>."
@@ -186447,6 +190270,19 @@ msgstr "* このアイテムを<info>無線信号</info>で起動すると即座
 msgid "This bionic is installed in the following body part(s):"
 msgstr "この生体部品が導入される部位: "
 
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] "* 発電用CBM対応燃料: "
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr " <num> mJ"
+
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr "<bold>電力容量:</bold>"
+
 #: src/item.cpp
 msgid "<bold>Encumbrance:</bold> "
 msgstr "<bold>動作制限:</bold> "
@@ -186566,6 +190402,11 @@ msgstr "このアイテムを材料にして、色々なアイテムが製作で
 msgid "You could use it to craft: %s"
 msgstr "製作可能: %s"
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr "<info>MOD:(%s)</info>の数値を表示しています。"
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -187737,8 +191578,8 @@ msgid "You do not have that item!"
 msgstr "そのアイテムを所持していません！"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
-msgstr "どの信号でアイテムを有効化しますか？: "
+msgid "Which signal should activate the item?"
+msgstr "どの信号でアイテムを有効化しますか？"
 
 #: src/iuse.cpp
 msgid "\"Blue\""
@@ -187980,16 +191821,6 @@ msgstr "ガガザーガギャギャザピー！！"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr "悪夢のような酷い騒音を発するノイズ発生器のスイッチを切りました。"
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr "%sの本質を学びました。"
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr "%sを押して戦闘スタイルを選択できます。"
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr "柵の支柱を取り外しました。"
@@ -188410,18 +192241,27 @@ msgid "Scan the ground"
 msgstr "地表を測定"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "自身を測定"
+msgid "Scan yourself or other person"
+msgstr "人体を測定"
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "連続スキャンを開始"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr "測定する人間を選択"
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr "自身の放射線レベル: %dmSv(検出量(アイテム): %dmSv)"
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr "%sの放射線レベル: %dmSv[検出量(アイテム): %dmSv]"
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -188489,6 +192329,10 @@ msgstr "カチッ！"
 msgid "You've already released the handle, try throwing it instead."
 msgstr "既にハンドルが外れています。さっさと投げましょう。"
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "着火道具が必要です！"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr "矢に火をつけました！"
@@ -188980,10 +192824,6 @@ msgstr "あまり意味はありませんが、そこら辺をモップで掃除
 msgid "You mop up the spill."
 msgstr "モップで拭き取りました。"
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr "不思議な視界を得て、周辺の地形を広く見渡しました..."
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr "宇宙の構造が崩壊しつつあるようです。"
@@ -189045,15 +192885,7 @@ msgid "You don't have appropriate food to heat up."
 msgstr "温められる食料を持っていません。"
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
-msgstr "食料を解凍しましたが、冷たいままの方が美味しいので、加温を中断しました。"
-
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
-msgstr "食料を温めて解凍しました。"
-
-#: src/iuse.cpp
-msgid "You heat up the food."
+msgid "You start heating up the food."
 msgstr "食料を温めました。"
 
 #: src/iuse.cpp
@@ -189146,15 +192978,15 @@ msgstr "興奮剤を注入しました。"
 
 #: src/iuse.cpp
 msgid "You must wear the radiation biomonitor before you can activate it."
-msgstr "放射線生体モニターを起動する前に着用してください。"
+msgstr "生体放射線量モニターを起動する前に着用してください。"
 
 #: src/iuse.cpp
 msgid "The radiation biomonitor needs batteries to function."
-msgstr "放射線生体モニターは動作に電池が必要です。"
+msgstr "生体放射線量モニターは動作に電池が必要です。"
 
 #: src/iuse.cpp
 msgid "You activate your radiation biomonitor."
-msgstr "放射線生体モニターを起動しました。"
+msgstr "生体放射線量モニターを起動しました。"
 
 #: src/iuse.cpp
 msgid "You are currently irradiated."
@@ -190054,8 +193886,8 @@ msgid "Your %s is too heavy or bulky for this RC car."
 msgstr "%sはラジコンカーに取り付けるには重すぎます。"
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
-msgstr "ラジコンカーから爆弾を取り外しました"
+msgid "You disarmed your RC car."
+msgstr "ラジコンカーから爆弾を取り外しました。"
 
 #. ~Sound of a radio controlled car moving around
 #: src/iuse.cpp
@@ -190067,11 +193899,11 @@ msgid "What to do with activated RC car?"
 msgstr "ラジコンカー(オン)をどうしますか？"
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
-msgstr "ラジコンカーを停止させました"
+msgid "You turned off your RC car."
+msgstr "ラジコンカーを停止させました。"
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
+#: src/iuse.cpp
+msgid "beep"
 msgstr "ビーッ。"
 
 #: src/iuse.cpp
@@ -190109,9 +193941,16 @@ msgstr "ラジコンカーの操縦を始めました。"
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
+msgstr "所持している%sはこの信号で起爆します。置いてから十分な距離を取って起爆しましょう。"
+
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
 "sending the signal."
-msgstr "所持している%sはこの信号で起爆します。設置して十分な距離を取ってから起爆しましょう。"
+msgstr "%2$sにある%1$sはこの信号で起爆します。置いてから十分な距離を取って起爆しましょう。"
 
 #: src/iuse.cpp
 msgid "This vehicle's security system has locked you out!"
@@ -190710,7 +194549,7 @@ msgstr "非常に怪しいです。"
 #: src/iuse.cpp
 #, c-format
 msgid "You ask the %s, then flip it."
-msgstr "「%s」と尋ねて、マジック8ボールを振りました。"
+msgstr "%sを振り、助言を求めました。"
 
 #: src/iuse.cpp
 #, c-format
@@ -191286,7 +195125,7 @@ msgstr "複数の呪文を習得できます。"
 
 #: src/iuse_actor.cpp
 msgid "Spells Contained:"
-msgstr "習得できる呪文: "
+msgstr "呪文: "
 
 #: src/iuse_actor.cpp
 #, c-format
@@ -191311,7 +195150,7 @@ msgstr "既に習得済みです。"
 
 #: src/iuse_actor.cpp
 msgid "Study a spell:"
-msgstr "呪文を習得:"
+msgstr "呪文学習:"
 
 #: src/iuse_actor.cpp
 msgid "Spend how long studying?"
@@ -191870,10 +195709,30 @@ msgstr "この道具は、これ自体ではなく他のアイテムを改造、
 msgid "How do you want to modify it?"
 msgstr "どのように改良しますか？"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
-msgstr "改良するには糸が足りません。どの改良を元に戻しますか？"
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr "%1$s不可(糸(%2$d)の装填が必要)"
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr "%1$s 不可(%3$s(%2$d)が必要)"
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr "%1$s 不可(%2$sと互換性なし)"
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
+msgstr "%1$s(%3$s(%2$d)と糸(%4$d))"
 
 #: src/iuse_actor.cpp
 msgid "Bash"
@@ -192164,7 +196023,7 @@ msgstr "ブラックホールです。落ちないように！"
 
 #: src/iuse_software_kitten.cpp
 msgid "Just a big brick wall."
-msgstr "大きな煉瓦の壁です。"
+msgstr "大きなレンガの壁です。"
 
 #: src/iuse_software_kitten.cpp
 msgid "You found kitten!  No, just kidding."
@@ -193200,7 +197059,7 @@ msgstr "難解です！"
 
 #: src/magic.cpp
 msgid "Failure Chance"
-msgstr "失敗確率"
+msgstr "の確率で失敗"
 
 #: src/magic.cpp
 msgid "health"
@@ -193273,6 +197132,23 @@ msgstr "この呪文を習得できません。"
 msgid "All knowledge of %s leaves you."
 msgstr "%sに関する全ての知識を忘れ去りました。"
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr "呪文に割り当てるキーを選択してください。"
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr "そのキーは既に使われています。"
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr "%cを割り当てました。呪文メニューを閉じて再度開くと、割り当てを変更して一覧を更新します。"
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr "キー割り当てを削除しました。"
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr "警告文を無視する"
@@ -193281,6 +197157,10 @@ msgstr "警告文を無視する"
 msgid "Popup Distractions"
 msgstr "警告文を表示する"
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr "キー割当 [=]"
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr "集中力"
@@ -193345,6 +197225,15 @@ msgstr "詠唱コスト"
 msgid "Casting Cost (impeded)"
 msgstr "詠唱コスト(阻害)"
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr " (現在%s)"
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr "エネルギー不足"
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr "詠唱時間"
@@ -193353,6 +197242,10 @@ msgstr "詠唱時間"
 msgid "Casting Time (impeded)"
 msgstr "詠唱時間(阻害)"
 
+#: src/magic.cpp
+msgid "self"
+msgstr "自分"
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr "対象"
@@ -193365,6 +197258,22 @@ msgstr "与ダメージ"
 msgid "Healing"
 msgstr "治癒"
 
+#: src/magic.cpp
+msgid "Spell Radius"
+msgstr "射程"
+
+#: src/magic.cpp
+msgid "Cone Arc"
+msgstr "円錐頂角"
+
+#: src/magic.cpp
+msgid "degrees"
+msgstr "度"
+
+#: src/magic.cpp
+msgid "Line Width"
+msgstr "線幅"
+
 #: src/magic.cpp
 msgid "Variance"
 msgstr "転移"
@@ -193377,18 +197286,10 @@ msgstr "生成"
 msgid "Summon"
 msgstr "召喚"
 
-#: src/magic.cpp
-msgid "Spell Radius"
-msgstr "射程"
-
 #: src/magic.cpp src/veh_interact.cpp
 msgid "Range"
 msgstr "射程"
 
-#: src/magic.cpp
-msgid "self"
-msgstr "自分"
-
 #: src/magic.cpp
 msgid "Duration"
 msgstr "効果時間"
@@ -193413,18 +197314,22 @@ msgstr "回復"
 msgid "Damage Type"
 msgstr "ダメージタイプ"
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr "能力値増加"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr "LV 0"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr "LV毎"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr "LV 最大"
@@ -193473,6 +197378,11 @@ msgstr "転移に失敗しました。転移ゲートが妨害または破壊さ
 msgid "No valid targets to teleport."
 msgstr "転移する有効な標的が見つかりません。"
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr "距離: %d (%d, %d)"
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr "転移ゲートを選択"
@@ -193613,6 +197523,10 @@ msgstr "templatesフォルダを作成できませんでした。許可の設定
 msgid "Unable to make sound directory.  Check permissions."
 msgstr "soundフォルダを作成できませんでした。許可の設定を確認してください。"
 
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr "graphicsフォルダを作成できませんでした。許可の設定を確認してください。"
+
 #: src/main_menu.cpp
 msgid "Really quit?"
 msgstr "本当に終了しますか？"
@@ -194301,8 +198215,8 @@ msgstr "%sは武器装備状態では使えません。"
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
-msgstr "%sは%sに対応する武器ではありません。"
+msgid "The %1$s is not a valid %2$s weapon."
+msgstr "%1$sは%2$sに対応する武器ではありません。"
 
 #: src/martialarts.cpp
 msgid "Block Counter"
@@ -194456,7 +198370,7 @@ msgstr "<bold>武器を装備する戦闘スタイルです。</bold>"
 msgid ""
 "You can <info>arm block</info> by installing the <info>Arms Alloy Plating "
 "CBM</info>"
-msgstr "<info>CBM: 合金メッキ - 腕</info>を移植すると<info>アームブロック</info>が可能になります"
+msgstr "<info>CBM: 合金装甲 - 腕</info>を移植すると<info>アームブロック</info>が可能になります"
 
 #: src/martialarts.cpp
 #, c-format
@@ -194469,7 +198383,7 @@ msgstr "<info>素手格闘</info><stat>%s</stat>で<info>アームブロック</
 msgid ""
 "You can <info>leg block</info> by installing the <info>Legs Alloy Plating "
 "CBM</info>"
-msgstr "<info>CBM: 合金メッキ - 脚</info>を移植すると<info>レッグブロック</info>が可能になります"
+msgstr "<info>CBM: 合金装甲 - 脚</info>を移植すると<info>レッグブロック</info>が可能になります"
 
 #: src/martialarts.cpp
 #, c-format
@@ -194719,11 +198633,6 @@ msgid "%d enemy hit!"
 msgid_plural "%d enemies hit!"
 msgstr[0] "%d体の敵が襲ってきました！"
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr "CQB生体部品によって広範な実戦訓練を行い、%sを覚えました。"
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -197171,17 +201080,43 @@ msgid "You don't have any companions to send out…"
 msgstr "派遣可能な仲間がいません..."
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
-msgstr "派遣する仲間を選択                    [ 戦闘 : サバイバル : 製造 ]"
+msgid "Who do you want to send?"
+msgstr "派遣する人間を選択"
 
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
-msgstr "誰も派遣しないことにしました..."
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
+msgstr "[ 戦闘 : サバイバル : 製作 ]"
+
+#. ~ %1$s: npc name
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
+msgstr "%1$s(見張り)"
+
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr "%s [ %4d : %4d : %4d ]"
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr "%1$s%2$d"
 
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
-msgstr "選択した仲間のスキルレベルが不足しています！"
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
+msgstr "%1$s%2$d/%3$d"
+
+#: src/mission_companion.cpp
+msgid "You choose to send no one…"
+msgstr "誰も派遣しないことにしました..."
 
 #: src/mission_companion.cpp
 msgid "You don't have any companions ready to return…"
@@ -198862,6 +202797,11 @@ msgstr "%1$sの腕が%2$sに命中しましたが、装甲に弾かれました
 msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr "%1$sの腕が<npcname>の%2$sに命中しましたが、装甲に弾かれました！"
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr "%1$sは%2$sと融合しました。"
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -199061,11 +203001,6 @@ msgstr "%sは酸を噴射しました！"
 msgid "zombie slave"
 msgstr "奴隷ゾンビ"
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr "%sをどうしますか？"
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -199471,22 +203406,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr "%1$sは邪魔な%2$sを押し退けました！"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr "極小"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr "小型"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr "中型"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr "大型"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr "巨大"
 
@@ -199551,6 +203491,16 @@ msgstr "密度の高いゼリー状の物質"
 msgid "wearing %1$s"
 msgstr "%1$sを着用"
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr "%s"
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr "%s"
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -199593,6 +203543,11 @@ msgstr "あなたを知覚しています！"
 msgid "Rider: %s"
 msgstr "騎乗: %s"
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr "%s"
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr "強さ"
@@ -200241,7 +204196,7 @@ msgid "Crossed a threshold"
 msgstr "閾値を超えました。"
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
+msgid "Oh, yeah!  That's the stuff!"
 msgstr "おお、きたきた！これだよこれ！"
 
 #: src/mutation_ui.cpp
@@ -201228,7 +205183,7 @@ msgstr "怒り: "
 msgid "%s disappears."
 msgstr "%sは消滅しました。"
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "%sは死にました！"
@@ -201977,6 +205932,16 @@ msgstr "知らせたい事がある。"
 msgid "Yes, let's resume training "
 msgstr "よし、訓練を再開しようか。 "
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr "%s: 訓練(%s/1時間)"
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr "%s: 習得(%s)"
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -202145,10 +206110,6 @@ msgstr "これを摂取するのが良い考えだとは思えないね..."
 msgid "I need a %s to consume that!"
 msgstr "それを摂取するには%sが必要だ！"
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr "これを摂取するのが良い考えだとは思えないね.."
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr "何をくれるんだ？"
@@ -202226,6 +206187,11 @@ msgstr "%1$s(%2$d,%3$d)"
 msgid "My current location"
 msgstr "プレイヤーの現在地"
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr "%sは無効な目的地を選択しています。"
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -202258,10 +206224,6 @@ msgstr "どのCBMを摘出して欲しいんだ？"
 msgid "You decide to hold off…"
 msgstr "やめておくことにしました..."
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr "代金が支払えません..."
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -202328,6 +206290,11 @@ msgstr "%s は逃げ出した！"
 msgid "%s leaves."
 msgstr "%s は立ち去った。"
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr "%sは追従を中止しました。"
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -202377,16 +206344,21 @@ msgstr " (%d)"
 
 #: src/npctrade.cpp
 msgid "< Back"
-msgstr "< 戻る"
+msgstr "< 前ページ"
 
 #: src/npctrade.cpp
 msgid "More >"
-msgstr "他 >"
+msgstr "次ページ >"
 
 #: src/npctrade.cpp
 msgid "Examine which item?"
 msgstr "アイテム調査"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr "取引する%sの個数 [最大: %d]: "
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -202707,7 +206679,7 @@ msgstr "セーフモード/自動再設定ターン"
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
 msgstr "セーフモードが再度有効化されるターン数を設定します。「セーフモード/接近距離設定」で設定した範囲内に敵がいない時のみ機能します。"
 
@@ -202805,12 +206777,10 @@ msgstr "空の容器を落とす"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
 msgstr ""
-"アイテム使用後に空になった容器を落とすかどうか設定します。\n"
-"いいえ:落とさない。 - 水密:水密性のある容器以外は落とす。\n"
-"全て:全ての容器を落とす。"
+"アイテム使用後に空になった容器を落とすかどうか設定します。いいえ: 落とさない。水密: 水密性のある容器以外は落とす。全て: 全ての容器を落とす。"
 
 #: src/options.cpp
 msgid "Watertight"
@@ -202978,12 +206948,12 @@ msgid "If true, automatically follow the crosshair when firing/throwing."
 msgstr "Trueにすると射撃や投擲時の照準の移動を画面が追尾します。"
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "確認/アイテム分解"
+msgid "Query on disassembly while butchering"
+msgstr "確認/解体中のアイテム分解"
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
-msgstr "Trueにするとアイテムを分解する前に確認します。"
+msgid "If true, will query before disassembling items while butchering."
+msgstr "trueにすると解体中にアイテムを分解する前に確認します。"
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -203256,9 +207226,9 @@ msgstr "アイテム/自動キー割当"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
 msgstr ""
 "有効: 文字が割り当てられていない全ての所持品に自動で割り当てる。無効: 自動割当しない。お気に入り: お気に入り設定したアイテムのみ自動で割り当てる。"
 
@@ -203631,7 +207601,7 @@ msgstr "ミニマップ上の敵性ビーコンの点滅速度を200ミリ秒単
 msgid "Display"
 msgstr "使用するディスプレイ"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr "ゲーム画面を表示するディスプレイを設定します。反映には再起動が必要です。"
@@ -203719,7 +207689,7 @@ msgid "Scaling factor"
 msgstr "基準倍率"
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
+msgid "Factor by which to scale the display.  Requires restart."
 msgstr "拡大/縮小表示の倍率を設定します。再起動が必要です。"
 
 #: src/options.cpp
@@ -204001,8 +207971,8 @@ msgstr "大変動発生日"
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
 msgstr ""
 "大変動が発生した年の日付を設定します。0が春の1日目です。この設定はシナリオで上書きされる可能性があります。日付の設定によって食物の腐敗やモンスターの進化は進みません。"
@@ -204013,9 +207983,9 @@ msgstr "ゲーム開始日"
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
 msgstr ""
 "大変動が発生してから何日目にゲームを開始するか設定します。0が大変動発生当日です。この設定はシナリオで上書きされる可能性があります。日付の設定によって食物の腐敗やモンスターの進化が進みます。"
 
@@ -204080,7 +208050,7 @@ msgstr "固定NPC"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
 msgstr "Trueにすると特定の場所に固定NPCが生成されます。反映するには世界の初期化が必要です。"
 
@@ -205263,7 +209233,7 @@ msgstr "月齢:  %s"
 #: src/panels.cpp
 #, c-format
 msgid "Temp : %s"
-msgstr "気温: %s"
+msgstr "気温:  %s"
 
 #: src/panels.cpp
 msgid "Wield:"
@@ -205285,6 +209255,7 @@ msgstr "寒暖:"
 msgid "Underground"
 msgstr "地下"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
 msgstr "風"
@@ -205346,10 +209317,6 @@ msgstr "難聴！"
 msgid "Weapon  :"
 msgstr "装備:"
 
-#: src/panels.cpp
-msgid "No Style"
-msgstr "なし"
-
 #: src/panels.cpp
 msgid "Day "
 msgstr "日"
@@ -205362,10 +209329,12 @@ msgstr "気温: "
 msgid "to open sidebar options"
 msgstr "を押してサイドバー設定"
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
 msgstr "マナ"
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
 msgstr "最大マナ"
@@ -205622,75 +209591,6 @@ msgstr "容器の中身をこぼさないように、<npcname>は%1$sを%2$sの
 msgid "You have learned a new style: %s!"
 msgstr "新しいスタイルを学びました！: %s"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "%sに霜焼けができそうです。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "このままだと1時間以内に%sが凍傷になります！"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr "このままだと数分後に%sが凍傷になります！"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr "%sが寒過ぎて、感覚が無くなってきました！"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr "%sが非常に寒く感じます。"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr "%sが若干寒く感じます。"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr "%sが熱過ぎて、真っ赤になってきました！"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr "%sがかなり暑く感じます。"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr "%sが少しだけ暑く感じます。"
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "%sに風が当たって非常に寒く感じます。"
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr "強風が吹いています。%sを寒さから守る為に、風を防げる衣類を見つける必要があります。"
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr "着用中の衣類では%sに当たる風を十分に防げていません！"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "火を消そうとして、地面を転がりました！"
@@ -206062,14 +209962,6 @@ msgstr "消毒した%sの傷が治りました。"
 msgid "There is not enough %s left to siphon it."
 msgstr "抜き取れるだけの%sがありません。"
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "騒々しく咳をしています。"
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "[苦しそうな空咳]"
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "身体に走る猛烈な激痛に苦しみました！"
@@ -206115,11 +210007,6 @@ msgstr "%sが傷みます！"
 msgid "Your %s aches."
 msgstr "%sが鈍く傷みます。"
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr "現在の健康度は%dです。"
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -206146,420 +210033,6 @@ msgstr "体の中で何かがのたうち回って死にました。"
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "腹がゴロゴロと鳴りました。中で何かが死んだようです。"
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr "栄養失調のため%sを続けられません。"
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr "%sを続けるには喉が渇き過ぎています。"
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr "%sを続けるには疲れ過ぎています。"
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "溺れました！"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr "歯が抜け落ちました！"
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "ブーン"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "身体に痺れを感じました。"
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "急に痛みが走りました。"
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "少し眩暈がしました。"
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "空腹を感じました。"
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "少し満腹感を覚えました。"
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "喉の渇きを感じました。"
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "急に全身に倦怠感を感じました。"
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "酷い寒気を感じました。"
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "寒気を感じました。"
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "酷い熱気を感じました。"
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "熱気を感じました。"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr "%1$sは怒り出しました！"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr "会話(%1$s): 「%2$s」"
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr "%1$sスキルがレベル%2$dに上昇しました。"
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr "%1$s"
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr "身体に強烈な痺れを感じました..."
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "震えがこみ上げてきました。"
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr "叫びました。%s"
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr "%1$s"
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr "急な眠気に襲われ、意識を失いました。"
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "喘息の発作に見舞われた！"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr "酸素供給装置を使って発作を抑え、再び眠りにつきました。"
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr "吸入器を使用し、再び眠りにつきました。"
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr "酸素タンクを使用して深呼吸し、再び眠りにつきました。"
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr "窒息中は集中できません！"
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "吸入器を使い切りました。"
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] "吸入器を使用しました。残量は%dです。"
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr "タンクに残った最後の酸素を吸い込みました。"
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] "酸素タンクを使用して深呼吸しました。酸素の残量は%dです。"
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr "%sなどの部位"
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr "日光が%sを強く刺激しています。"
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "日光が目を強く刺激しています。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr "%sは水に濡れてダメージを受けました。"
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr "<npcname>の%sは水に濡れてダメージを受けました。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr "%sが水に濡れて回復しました。"
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr "<npcname>の%sが水に濡れて回復しました。"
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "日光で皮膚が火傷しました！"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "日光で気が散っています。"
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "日光に耐えられません！"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "急に耳が聞こえ無くなりました！"
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "急に目が見え無くなりました！"
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr "視覚中枢がいたずらをしています..."
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr "放射線センサーから得体の知れない感覚が伝わってきます。"
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr "電力系統の過負荷によって胸が燃えるように熱くなっています！"
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "痛みを伴う放電を起こしました！"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr "%sが漏電の影響を受けているようです。"
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "放出された酸によって焼けるような痛みを感じました！"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "電池がわずかに放電しました。"
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "生体部品がカラカラと金属音を発しました！"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "故障したCBMが振動しているようです。"
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr "パシッ！"
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "視界にモザイクがかかりました！"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr "生体部品の機能不全によって発作を起こし、地面に倒れ込みました！"
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr "生体部品が漏電を起こしています。全身の痙攣が止まりません。"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "生体部品の機能不全によって、身体に痒みが走りました！"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr "誤作動を起こした生体部品が光り輝きました！"
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr "筋肉が痙攣しています！"
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr "地面に倒れ込みました！"
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr "息苦しさを感じます。"
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr "震えを抑えきれません。"
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr "吐き気を催しています。"
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr "気絶しました！"
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "ゆったりと呼吸しています。"
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr "つまずいて転倒しました！"
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr "疲れています..."
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr "気だるげに目を擦りました。"
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr "<npcname>は目を擦っています。"
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr "小さく欠伸をしました。"
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr "<npcname>は小さく欠伸をしました。"
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr "背筋を伸ばしました。"
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr "<npcname>は伸びをしました。"
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr "精神的な疲れを感じています。"
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr "<npcname>は大きな欠伸をしました。"
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr "一瞬めまいを感じました。"
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr "筋肉が引きつっており不快な気分です。"
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr "視界が少しぼやけています。"
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr "少しの間ぼーっとしていました。"
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr "筋肉が突然引きつり痛みを感じました。"
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr "しつこい頭痛に苛まれています。"
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr "胸焼けしている気がします。"
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr "精神が疲れ果て、目に見えるものが信じられなくなってきました。"
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr "筋肉が不意に引きつり、身体のバランスを保つのがやっとです。"
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr "足が震えて転びそうになっています。"
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr "<npcname>はよろめきました。"
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr "<npcname>は倒れ込みました！"
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr "転倒しました！"
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr "放射線バッジの色が%1$sから%2$sに変化しました！"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr "%sの治癒が始まりました！"
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr "%1$sで%2$s"
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr "水に皮膚を焼かれているような気がします。"
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr "擬装が一瞬だけ明滅しました！"
@@ -206777,11 +210250,6 @@ msgstr "%sは片手で扱えません。"
 msgid "You are too weak to wield %s with only one arm."
 msgstr "%sを片手で扱うには筋力が足りません。"
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr "%sの装備状態を解除できません。"
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "素手(無効)"
@@ -206853,22 +210321,45 @@ msgstr "%sに修理すべき故障は見当たりません。"
 
 #: src/player.cpp
 msgid "Mend which fault?"
-msgstr "修理する故障部品を選択"
+msgstr "修理内容を選択"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white>所要時間:</color>\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr "変化: <color_cyan>%s</color>\n"
+
+#: src/player.cpp
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr "所要時間: <color_cyan>%s</color>\n"
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white>スキル:</color>\n"
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr "スキル: <color_cyan>なし</color>\n"
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
-msgstr "> <color_%1$s>%2$s %3$i</color>\n"
+msgid "Skills: %s\n"
+msgstr "スキル: %s\n"
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr "<color_cyan>%1$s</color><color_green>(%2$d/%3$d)</color>"
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr "<color_cyan>%1$s</color><color_yellow>(%2$d/%3$d)</color>"
+
+#: src/player.cpp
+#, c-format
+msgid "You are currently unable to mend the %s this way."
+msgstr "今のところは、この方法で%sを修理できません。"
 
 #: src/player.cpp
 msgid "You are already wearing that."
@@ -206982,14 +210473,6 @@ msgstr "%sを脱ぎました。"
 msgid "<npcname> takes off their %s."
 msgstr "<npcname>は%sを脱ぎました。"
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr "ここにはアイテムを置けません！"
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr "<npcname>はそこにアイテムを置けません！"
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -207037,18 +210520,6 @@ msgstr "未使用の原子力電池(%i)を回収しました。"
 msgid "You can't remove partially depleted plutonium!"
 msgstr "使いかけの原子力電池を除去することはできません！"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] "%sを使用するにはUPS型電源(%d)が必要です。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] "%s(%d)の装填量は%d以上必要です。"
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -207220,10 +210691,6 @@ msgstr "回避を試みました...しかし、回避を試みるだけの空間
 msgid "%s tries to dodge but there's no room!"
 msgstr "%sは回避を試みました...しかし、回避を試みるだけの空間が存在しませんでした！"
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr "身体が重荷に悲鳴を上げました。"
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -207279,6 +210746,13 @@ msgstr "食事可能"
 msgid "Pain "
 msgstr "苦痛"
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr "%s%d -> %d(%d%%)"
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -207487,47 +210961,57 @@ msgstr "現在速度: "
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
-msgstr "荷物過重 -%s%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
+msgstr "荷物過重        -%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
-msgstr "苦痛 -%s%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
+msgstr "苦痛                -%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
-msgstr "喉の渇き -%s%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
+msgstr "口渇              -%2d%%"
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr "栄養不足"
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
-msgstr "%-20s-%s%d%%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
+msgstr "%s-%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
-msgstr "日陰 -%s%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
+msgstr "日陰     -%2d%%"
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
-msgstr "冷血        %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
+msgstr "冷血        %s%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
-msgstr "俊敏 +%s%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
+msgstr "加速               +%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
-msgstr "生体部品速度 +%s%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
+msgstr "CBM加速        +%2d%%"
 
 #: src/player_display.cpp
 #, c-format
@@ -207742,7 +211226,7 @@ msgid "\"Oh God, what's happening?\""
 msgstr "「おお、何が起こってる？」"
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
+msgid "\"Of course… it's all fractals!\""
 msgstr "「もちろん...全てがフラクタルになる！」"
 
 #: src/player_hardcoded_effects.cpp
@@ -207778,7 +211262,7 @@ msgid "You quiver from the cold."
 msgstr "寒さで小刻みに震えています。"
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
+msgid "Your torso is freezing cold.  You should put on a few more layers."
 msgstr "胴体が凍えるような寒さで震えています。更に重ね着する必要があります。"
 
 #: src/player_hardcoded_effects.cpp
@@ -208153,6 +211637,47 @@ msgstr "アラームが作動しています。"
 msgid "Your alarm went off."
 msgstr "アラームが作動しました。"
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr "全身が痙攣し、上手く動けなくなっています！"
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr "意識を失いました！"
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr "腕"
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr "手"
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr "脚"
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr "%sが突然予想外の方向に動きました！"
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr "運よく装備を落とさずに済みました。"
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr "運よくその場に踏み止まりました。"
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr "突然全身の筋肉から力が抜け，立っていられなくなりました！"
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr "激しい頭痛に悩まされています。"
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -208464,7 +211989,7 @@ msgstr "消費: %s%s(現在: %s)"
 #: src/ranged.cpp
 #, c-format
 msgid "0.0 % Failure Chance"
-msgstr "失敗確率 0.0 %"
+msgstr "0.0 %の確率で失敗"
 
 #: src/ranged.cpp
 #, c-format
@@ -208574,10 +212099,6 @@ msgstr "ダァン！"
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>なし</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr "<color_white>なし</color>"
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -208813,11 +212334,6 @@ msgstr "スコア"
 msgid "KILLS"
 msgstr "殺害"
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr "ゲーム画面を表示するディスプレイを設定します。再起動が必要です。"
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr "禅の境地です。"
@@ -208830,6 +212346,10 @@ msgstr "突然、鼓膜に痛みが走りました！"
 msgid "Something is making noise."
 msgstr "何かが物音を立てました。"
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr "物音"
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -208838,13 +212358,18 @@ msgstr "%sが聞こえました！"
 #: src/sounds.cpp
 #, c-format
 msgid "From your position you hear %1$s."
-msgstr "その場で%1$s"
+msgstr "その場で%1$sが聞こえました。"
 
 #: src/sounds.cpp
 #, c-format
 msgid "You hear %1$s"
 msgstr "%1$s"
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr "%1$sで%2$s"
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "時計のアラームでようやく目が覚めました。"
@@ -208874,6 +212399,408 @@ msgstr "有効なスタート地点を生成できませんでした。不具合
 msgid "d: delete history"
 msgstr "d: 履歴削除"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr "%sは水に濡れてダメージを受けました。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr "<npcname>の%sは水に濡れてダメージを受けました。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr "%sが水に濡れて回復しました。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr "<npcname>の%sが水に濡れて回復しました。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr "栄養失調のため%sを続けられません。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr "%sを続けるには喉が渇き過ぎています。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr "%sを続けるには疲れ過ぎています。"
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "溺れました！"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr "急な眠気に襲われ、意識を失いました。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "身体に痺れを感じました。"
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "急に痛みが走りました。"
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "少し眩暈がしました。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "空腹を感じました。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "少し満腹感を覚えました。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "喉の渇きを感じました。"
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "急に全身に倦怠感を感じました。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "酷い寒気を感じました。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "寒気を感じました。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "酷い熱気を感じました。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "熱気を感じました。"
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr "%1$s"
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr "身体に強烈な痺れを感じました..."
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "震えがこみ上げてきました。"
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr "<npcname>は抑え切れずに震え始めました。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr "会話(%1$s): 「%2$s」"
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr "%1$sは怒り出しました！"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr "%1$sスキルがレベル%2$dに上昇しました。"
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "喘息の発作に見舞われた！"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr "酸素供給装置を使って発作を抑え、再び眠りにつきました。"
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr "吸入器を使用し、再び眠りにつきました。"
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr "酸素タンクを使用して深呼吸し、再び眠りにつきました。"
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr "窒息中は集中できません！"
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "吸入器を使い切りました。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] "吸入器を使用しました。残量は%dです。"
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr "タンクに残った最後の酸素を吸い込みました。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] "酸素タンクを使用して深呼吸しました。酸素の残量は%dです。"
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "日光で皮膚が火傷しました！"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "日光で気が散っています。"
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "日光に耐えられません！"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "日光が目を強く刺激しています。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr "%sなどの部位"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr "日光が%sを強く刺激しています。"
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr "歯が抜け落ちました！"
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "ブーン"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "急に耳が聞こえ無くなりました！"
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "急に目が見え無くなりました！"
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr "視覚中枢がいたずらをしています..."
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr "放射線センサーから得体の知れない感覚が伝わってきます。"
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr "電力系統の過負荷によって胸が燃えるように熱くなっています！"
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "痛みを伴う放電を起こしました！"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr "%sが漏電の影響を受けているようです。"
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "放出された酸によって焼けるような痛みを感じました！"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "電池がわずかに放電しました。"
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "生体部品がカラカラと金属音を発しました！"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "故障したCBMが振動しているようです。"
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr "パシッ！"
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "視界にモザイクがかかりました！"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr "生体部品の機能不全によって発作を起こし、地面に倒れ込みました！"
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr "生体部品が漏電を起こしています。全身の痙攣が止まりません。"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "生体部品の機能不全によって、身体に痒みが走りました！"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr "誤作動を起こした生体部品が光り輝きました！"
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr "筋肉が痙攣しています！"
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr "地面に倒れ込みました！"
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr "息苦しさを感じます。"
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr "震えを抑えきれません。"
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr "吐き気を催しています。"
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr "気絶しました！"
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "ゆったりと呼吸しています。"
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr "つまずいて転倒しました！"
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr "疲れています..."
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr "気だるげに目を擦りました。"
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr "<npcname>は目を擦っています。"
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr "小さく欠伸をしました。"
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr "<npcname>は小さく欠伸をしました。"
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr "背筋を伸ばしました。"
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr "<npcname>は伸びをしました。"
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr "精神的な疲れを感じています。"
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr "<npcname>は大きな欠伸をしました。"
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr "一瞬めまいを感じました。"
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr "筋肉が引きつっており不快な気分です。"
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr "視界が少しぼやけています。"
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr "少しの間ぼーっとしていました。"
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr "筋肉が突然引きつり痛みを感じました。"
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr "しつこい頭痛に苛まれています。"
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr "胸焼けしている気がします。"
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr "精神が疲れ果て、目に見えるものが信じられなくなってきました。"
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr "筋肉が不意に引きつり、身体のバランスを保つのがやっとです。"
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr "足が震えて転びそうになっています。"
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr "<npcname>はよろめきました。"
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr "<npcname>は倒れ込みました！"
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr "転倒しました！"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr "放射線バッジの色が%1$sから%2$sに変化しました！"
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr "%sの治癒が始まりました！"
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr "水に皮膚を焼かれているような気がします。"
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr "内向きに引っ張られるような、奇妙な感覚に襲われました。"
@@ -209023,8 +212950,8 @@ msgstr "[ガラスが砕ける音！]"
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "%sはコットにつまずきました。"
+msgid "The %s stumbles over the cot!"
+msgstr "%sはコットにつまづきました！"
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -209179,11 +213106,6 @@ msgstr "くくり罠に引っ掛かり、足に絡まりました。"
 msgid "A snare closes on <npcname>s leg."
 msgstr "くくり罠に引っ掛かり、<npcname>の足に絡まりました。"
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr "%sの脚にくくり罠が絡まりました。"
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -209405,6 +213327,12 @@ msgstr "<npcname>は下の階層に落下しました！"
 msgid "You fall down under %s!"
 msgstr "下の%sに落下しました！"
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] "%d階層を落下しました！"
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname>は翼を羽ばたかせて優雅に着地しました。"
@@ -209541,6 +213469,10 @@ msgstr ""
 msgid "Select part"
 msgstr "部品選択"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white>所要時間:</color>\n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr "<color_white>必要スキル:</color>\n"
@@ -211975,8 +215907,8 @@ msgstr "@ %d: %s  "
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
-msgstr "%sを.."
+msgid "Set '%s' to…"
+msgstr "%sを..."
 
 #: src/wish.cpp
 msgid " (current)"
diff --git a/lang/po/ko.po b/lang/po/ko.po
index a48b603532f31..f73390786ff69 100644
--- a/lang/po/ko.po
+++ b/lang/po/ko.po
@@ -9,15 +9,15 @@
 # fenjo <fenjo1@gmail.com>, 2019
 # 장현우 <gusdn6763@gmail.com>, 2019
 # T itan <un8214@naver.com>, 2019
-# indejeC <s203258@naver.com>, 2019
 # Sail Recycle <sailrecycle@gmail.com>, 2019
+# indejeC <s203258@naver.com>, 2019
 # Brett Dong <brett.browning.dong@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
 "Last-Translator: Brett Dong <brett.browning.dong@gmail.com>, 2019\n"
 "Language-Team: Korean (https://www.transifex.com/cataclysm-dda-translators/teams/2217/ko/)\n"
@@ -194,6 +194,17 @@ msgstr "고농도의 방사능 폐기물. 되도록 가까이 가지 않는게 
 msgid "watery plutonium slurry"
 msgstr "묽은 플루토늄 슬러리"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr ""
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr "야구공만한 돌입니다. 적당한 근접 무기이며, 적에게 던지기에도 좋습니다."
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "조약돌"
@@ -661,10 +672,8 @@ msgstr "철침박은 사제 로켓"
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
+" of this grade of weapon, but packs a fierce punch… if it hits."
 msgstr ""
-"철침을 용접한 파이프 속에 급조한 로켓 연료를 넣어 만든 수제 로켓. 끔찍할 정도로 명중률이 낮지만, 강력한 파괴력을 발휘합니다... "
-"맞기만 한다면."
 
 #: lang/json/AMMO_from_json.py
 msgid "explosive home-made rocket"
@@ -711,9 +720,9 @@ msgstr "미완성 탄화칼슘"
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
-msgstr "한창 제련 중에 있는 석탄과 석회석 혼합물. 아직 사용할 수 없다."
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
+msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "chain link"
@@ -1130,9 +1139,9 @@ msgstr[0] "산화아연"
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
-msgstr "산화아연 (ZnO) 한 줌. 아연으로 환원하거나 화학반응에 사용할 수 있다."
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
+msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "manganese dioxide"
@@ -1142,11 +1151,10 @@ msgstr[0] "이산화 망가니즈"
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr ""
-"이산화 망가니즈 (MnO2) 한 줌. 연망간광에서 자연적으로 발생하며, 산업적으로 알칼라인 및 아연-탄소 배터리 제작에 사용된다."
 
 #: lang/json/AMMO_from_json.py
 msgid "potassium chloride"
@@ -1156,13 +1164,11 @@ msgstr[0] "염화포타슘"
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr ""
-"염화포타슘 (KCl) 한 줌. 칼리암염에서 자연적으로 생성되며, 초석이나 염산 제작 과정의 부산물이기도 하다. 비료나 수산화 포타슘 "
-"제작에 사용된다."
 
 #: lang/json/AMMO_from_json.py
 msgid "potassium hydroxide"
@@ -1172,10 +1178,10 @@ msgstr[0] "수산화 포타슘"
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
-msgstr "수산화 포타슘 (KOH) 한 줌. 굉장히 부식성이어서 알칼라인 배터리 등 산업적인 용도로 사용되었다."
+msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "sulfuric acid"
@@ -1201,10 +1207,10 @@ msgstr[0] "염산"
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
-msgstr "특유의 날카로운 냄새를 내뿜는 강산. 수많은 용도 덕에 대량으로 사용되었으며, 지금도 충분히 쓸모가 많다."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
+msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "acetone"
@@ -1454,8 +1460,8 @@ msgstr[0] ""
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1808,10 +1814,10 @@ msgstr[0] "화염방사기 연료"
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
-msgstr "가솔린과 디젤의 1:1 혼합물. 기계 따위에 쓰기에는 성질이 너무 달라서 화염방사기 외에는 쓰일 곳이 별로 없다."
+msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "autoclave pouch"
@@ -3225,44 +3231,70 @@ msgid "reloaded .460 Rowland"
 msgstr ".460 Rowland (재생)"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr ".50 BMG 예광탄"
+msgid ".50 BMG M17 tracer"
+msgstr ""
+
+#. ~ Description for .50 BMG M17 tracer
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG M33 Ball"
+msgstr ""
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"강력한 .50 구경 BMG 저격탄의 예광탄 버젼. 예광탄은 지속 사격시 사격 방향을 유지하는데 도움을 주며 가연성 물질의 경우 화재를 "
-"일으킬 수 있습니다."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr ".50 BMG Ball"
+msgid ".50 BMG Match"
+msgstr ""
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
 msgstr ""
-".50 BMG탄. 장거리 사격용으로 제작된 매우 강력한 소총탄입니다. 놀라울 정도로 정확도와 장갑 관통력이 높아 시판중인 가장 강력한 "
-"탄환중 하나이며, 강력한 반동과 총성만이 단점으로 꼽힙니다."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
-msgstr ".50 BMG AP"
+msgid ".50 BMG M2 AP"
+msgstr ""
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
 "tungsten steel.  Penetration is increased, but damage is reduced."
 msgstr "고밀도, 경화처리한 텅스텐강을 탄심으로 사용한 .50 BMG 탄약. 장갑 관통력이 증가했지만, 파괴력이 감소했습니다."
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr ""
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
 msgstr ".50 BMG 예광탄 (재생)"
@@ -3270,27 +3302,24 @@ msgstr ".50 BMG 예광탄 (재생)"
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
 msgstr ""
-"강력한 .50 구경 BMG 저격탄의 예광탄 버젼. 예광탄은 지속 사격시 사격 방향을 유지하는데 도움을 주며 가연성 물질의 경우 화재를 "
-"일으킬 수 있습니다. 이것은 재생탄입니다."
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr ".50 BMG Ball (재생)"
+msgid "reloaded .50 BMG Match"
+msgstr ""
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-".50 BMG 탄약은 매우 강력한 소총탄으로 장거리 사격용입니다. 놀라울 정도로 정확도와 방어구 관통력이 높아 가장 치명적인 탄약으로 불리고, 강력한 반동과 총성만이 단점으로 꼽힙니다.\n"
-"이것은 재생탄입니다."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
@@ -3299,12 +3328,9 @@ msgstr ".50 BMG AP (재생)"
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
 msgstr ""
-"고밀도, 경화처리한 텅스텐강을 탄심으로 사용한 .50 BMG 탄약. 장갑 관통력이 증가했지만, 파괴력이 감소했습니다.\n"
-"이것은 재생탄입니다."
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -4299,6 +4325,106 @@ msgstr "약간의 진균 씨앗."
 msgid "fungal flower"
 msgstr "진균체 꽃"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr ""
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr ""
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr ""
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr ""
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr ""
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr ""
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr ""
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr ""
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr ""
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr ""
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -4443,10 +4569,10 @@ msgstr[0] "아연"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
-msgstr "깨지기 쉬운 청회색 금속. 산성 및 염기성 용매나 비금속 물질과 잘 반응한다. 갈아서 사용하거나 배터리 제작에 쓸 수 있다."
+msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "lead"
@@ -4521,9 +4647,9 @@ msgstr "경첩"
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
-msgstr "쇠로 된 경첩. 스크류 구멍이 있다. 문을 달 때 쓰인다."
+msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "tin powder"
@@ -4570,6 +4696,341 @@ msgid ""
 "explosions."
 msgstr ""
 
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr ""
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] ""
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] ""
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] ""
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] ""
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] ""
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] ""
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] ""
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] ""
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] ""
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] ""
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr ""
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr ""
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr ""
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr ""
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr ""
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] "네오프렌 천"
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr ""
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr ""
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr ""
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr ""
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
 msgid_plural "handloaded .22 CB"
@@ -5086,6 +5547,18 @@ msgid ""
 msgstr ""
 "중기관총 혹은 군용 특수 장비에 사용되는 탄약. 착탄시 연소되어 방어구를 관통해, 가연성 물질에 불을 붙일수 있게 만들어진 탄약."
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr ""
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -5129,9 +5602,30 @@ msgstr[0] "마나 결정"
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
-msgstr "결정으로 굳은 마나 조각들. 충전식 마나 크리스탈을 충전하는 데 쓰일 수 있다."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr ""
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr ""
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
+msgstr ""
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "fire lance charge"
@@ -5638,12 +6132,6 @@ msgid ""
 "blob needs to be healthy.  You think..."
 msgstr "다양한 유기체 구성물로 이루어진 혼합물. 블럽의 건강에 필요한 모든 것이 들어있는 것 같습니다. 그런 것 같은데..."
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "돌"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -6145,8 +6633,10 @@ msgstr[0] "수대"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "%s을(를) 칼집에 넣었다."
@@ -6741,6 +7231,43 @@ msgid ""
 "small straps designed to better distribute the weight."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] ""
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] ""
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] ""
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -6878,6 +7405,26 @@ msgid ""
 "A colorful and ridiculous costume fit for a clown.  Provides decent storage."
 msgstr "화사한 색이 사용된, 우스꽝스러운 광대를 위한 복장. 꽤 괜찮은 저장 공간을 가지고 있습니다."
 
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] ""
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] ""
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
@@ -7117,6 +7664,21 @@ msgstr[0] "정장용 셔츠"
 msgid "A white button-down shirt with long sleeves.  Looks professional!"
 msgstr "단추 달린 하얀색 긴 소매 셔츠. 입으면 전문직 종사자처럼 보입니다!"
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] ""
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -7247,6 +7809,30 @@ msgstr[0] "허리 주머니"
 msgid "Provides a bit of extra storage, with minimal encumbrance."
 msgstr "그다지 불편하지 않으면서, 약간의 저장공간을 제공하는 허리 주머니."
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] ""
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] ""
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -7259,6 +7845,32 @@ msgid ""
 "accidents.  It doesn't have any storage room, but it is very comfortable."
 msgstr "사고를 방지하기 위해 펜싱에서 사용되는 뒷면에 지퍼가 달린 패딩. 저장공간이 없지만, 굉장히 편안합니다."
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] ""
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] ""
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -7279,6 +7891,30 @@ msgstr[0] "펜싱 바지"
 msgid "A pair of reinforced pants used by fencers to prevent injuries."
 msgstr "부상을 방지하기 위해 보강된 펜서용 바지."
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] ""
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] ""
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -7628,18 +8264,6 @@ msgstr[0] "모피 장갑"
 msgid "A pair of warm fur gloves.  They are somewhat cumbersome."
 msgstr "따뜻한 털가죽으로 만든 장갑. 착용하면 손을 움직이기 힘들어집니다."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] "생존용 잠수장갑"
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr "한 쌍의 케블라 보강 맞춤형 네오프렌 장갑. 극한 상황에서도 최고의 보호력과 착용감을 제공합니다."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -7696,6 +8320,19 @@ msgid ""
 "wear while providing maximum protection under extreme conditions."
 msgstr "한 쌍의 케블라 보강 맞춤형 천 장갑. 극한 상황에서도 최고의 보호력과 착용감을 제공합니다."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] ""
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -7906,16 +8543,6 @@ msgid ""
 "excellent protection from environmental dangers."
 msgstr "눈을 전부 감싸주는 큰 고글입니다. 환경적 위험에 대한 완벽한 방호를 제공해줍니다."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] "수영 고글"
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "수영할 때 쓰는 작은 고글 한 쌍."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -7952,19 +8579,6 @@ msgstr ""
 "두껍고 기장이 긴 양모 코트. 불편하지만, 그만큼 따뜻하고 주머니가 깊습니다.\n"
 "(역주: Greatcoat 및 Watchcoat라고 불리며, 보통 발목까지 내려오는 긴 코트를 말합니다.)"
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] "생존용 잠수복"
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr "잘라낸 방탄조끼와 강화된 네오프렌 잠수복을 사용해서 만든 경량 수제 방어구. 각종 피해로부터 몸을 보호해줍니다."
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -8441,17 +9055,6 @@ msgstr[0] "생존용 방화후드"
 msgid "A customized armored Nomex and Kevlar hood, very strong and durable."
 msgstr "노멕스와 케블라로 보강된 수제 후드로, 아주 강하고 튼튼합니다."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] "생존용 잠수모"
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr "네오프렌과 케블라로 보강된 수제 잠수모. 아주 강하고 튼튼합니다."
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -9111,18 +9714,25 @@ msgid_plural "leather belts"
 msgstr[0] "가죽 벨트"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "%s을(를) %s에 꽃아넣었다."
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "벨트에 무엇을 끼웁니까?"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
 msgstr "가죽 허리띠. 바지의 허리를 몸에 맞게 조절할때 사용합니다."
 
@@ -9280,6 +9890,19 @@ msgid ""
 "variety is favored by the military."
 msgstr "허벅지 부분에 스트랩을 이용해 착용하는 주머니 한 쌍. 군대에서 많이 사용됩니다."
 
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] ""
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
 msgid_plural "Linux t-shirts"
@@ -10051,33 +10674,6 @@ msgid ""
 "Activate to sheathe/draw a weapon."
 msgstr "검처럼 큰 날붙이를 넣어둘 수 있는 큰 조정식 검집. 사용하면 무기를 집어넣거나 뽑아들 수 있습니다."
 
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] "상어용 보호구"
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr ""
-"쇠사슬을 엮어 만든 일체형 보호구. 스쿠버 다이버가 상어 공격을 막기 위해 덧입는 것입니다. 플라스틱 헬멧과 부츠가 달려있습니다."
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] "감전방지 상어용 보호구"
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr ""
-"쇠사슬을 엮어 만든 일체형 보호구. 스쿠버 다이버가 상어 공격을 막기 위해 덧입는 것입니다. 감전 방지 처리가 되어 있습니다."
-
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
 msgid_plural "sheathes"
@@ -10145,6 +10741,18 @@ msgid ""
 "from cuts."
 msgstr "데님 반바지 한 벌. 두껍고 튼튼한 이 옷은 베기 공격에 우수한 보호력을 제공합니다."
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] ""
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
@@ -10574,11 +11182,9 @@ msgstr[0] "피험자 슈트"
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
 msgstr ""
-"얇고, 짧은 소매와 짧은 다리의 한 벌 옷입니다. 이상한 재단방식과 조절된 부분으로 미루어보건대... 아무래도 이걸 입던 사람이 "
-"누구였는지에 대해서는 모르는 게 나을 것 같습니다. 작은 저장공간을 가지고 있으며, 그다지 불편하지 않습니다."
 
 #: lang/json/ARMOR_from_json.py
 msgid "suit"
@@ -10648,6 +11254,7 @@ msgstr[0] "생존용 벨트"
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "칼 집어넣기"
@@ -11008,16 +11615,6 @@ msgstr ""
 "고전적인 삼각모는 늘어진 챙을 단순히 핀으로 접어 올린 것이지만, 이 삼각모는 고운 자수 장식과 방수용 기름칠을 더했습니다. 식민지의 "
 "\"총독 가카\"님이나, 세기말의 대장님에게 적격인 모자입니다."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] "트렁크 수영복"
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "망사가 달린 트렁크 수영복."
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
@@ -11259,53 +11856,6 @@ msgid ""
 "would be too casual and a suit would be just overdoing it."
 msgstr "세련된 조끼. 그냥 셔츠만 입는 것은 너무 캐주얼하고 정장은 너무 지나치다고 생각되는 경우에 이상적인 선택입니다."
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] "잠수복"
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "몸 전체를 감싸는 네오프렌 잠수복."
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] "잠수용 장갑"
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr "신축성이 강한 네오프렌 실리콘 고무 장갑 한 쌍. 수중 작업에 적합합니다."
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] "잠수모"
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr "잠수부들이 주로 착용하는 네오프렌 모자."
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] "봄 수영복"
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr ""
-"긴 소매에 분홍색으로 장식된 봄에 입는 수영복. 엉덩이와 가슴골이 강조되어 있습니다. 전신 수영복보다는 몸을 덜 보호하지만, 그만큼 덜 "
-"불편합니다."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -11621,6 +12171,33 @@ msgid ""
 "Useful for improvised rain protection."
 msgstr "비닐 시트에 밧줄과 끈을 매달 고리를 달아 놓은것. 급하게 비를 막아야 할 때 유용하게 쓰입니다."
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] ""
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] ""
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -14133,6 +14710,136 @@ msgstr ""
 "더블테크 파워 아머 Mk. II-L: 이 모델은 Mk. I보다 발전되었으며, 무엇보다도 무게가 가벼워졌습니다. 모든 더블테크 파워 "
 "아머는, 조종과 공기 조절 시스템에 직접적인 피부 접촉이 필요합니다."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] "트렁크 수영복"
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "망사가 달린 트렁크 수영복."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] "잠수복"
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "몸 전체를 감싸는 네오프렌 잠수복."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] "잠수모"
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr "잠수부들이 주로 착용하는 네오프렌 모자."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] "생존용 잠수모"
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr "네오프렌과 케블라로 보강된 수제 잠수모. 아주 강하고 튼튼합니다."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] "생존용 잠수복"
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr "잘라낸 방탄조끼와 강화된 네오프렌 잠수복을 사용해서 만든 경량 수제 방어구. 각종 피해로부터 몸을 보호해줍니다."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] "생존용 잠수장갑"
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr "한 쌍의 케블라 보강 맞춤형 네오프렌 장갑. 극한 상황에서도 최고의 보호력과 착용감을 제공합니다."
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] "봄 수영복"
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr ""
+"긴 소매에 분홍색으로 장식된 봄에 입는 수영복. 엉덩이와 가슴골이 강조되어 있습니다. 전신 수영복보다는 몸을 덜 보호하지만, 그만큼 덜 "
+"불편합니다."
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] "감전방지 상어용 보호구"
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+"쇠사슬을 엮어 만든 일체형 보호구. 스쿠버 다이버가 상어 공격을 막기 위해 덧입는 것입니다. 감전 방지 처리가 되어 있습니다."
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] "상어용 보호구"
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr ""
+"쇠사슬을 엮어 만든 일체형 보호구. 스쿠버 다이버가 상어 공격을 막기 위해 덧입는 것입니다. 플라스틱 헬멧과 부츠가 달려있습니다."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] "수영 고글"
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "수영할 때 쓰는 작은 고글 한 쌍."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] "잠수용 장갑"
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr "신축성이 강한 네오프렌 실리콘 고무 장갑 한 쌍. 수중 작업에 적합합니다."
+
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
 msgid_plural "helmet nettings"
@@ -14697,6 +15404,50 @@ msgid "shotgun bandolier"
 msgid_plural "shotgun bandoliers"
 msgstr[0] "산탄총용 탄약대"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] ""
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] ""
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] ""
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -14717,7 +15468,7 @@ msgstr[0] ""
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
 msgstr ""
 
@@ -14897,6 +15648,22 @@ msgid ""
 "minimize encumbrance."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] ""
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -15395,9 +16162,9 @@ msgstr[0] "CBM:에탄올 반응로"
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -15406,8 +16173,7 @@ msgid_plural "Aero-Evaporator CBMs"
 msgstr[0] "CBM:대기 증류장치"
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -15473,10 +16239,10 @@ msgstr[0] "CBM:손가락 해킹장치"
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -15817,7 +16583,7 @@ msgstr[0] "CBM:파워아머 인터페이스 Mk. II"
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
 
@@ -16337,8 +17103,7 @@ msgstr[0] ""
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
@@ -16880,8 +17645,8 @@ msgstr[0] "인간을 대접하다"
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
-msgstr "이... 이건 요리책입니다! 세상에!"
+msgid "It's… it's a cookbook!"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Cucina Italiana"
@@ -16973,10 +17738,8 @@ msgstr[0] "PE050 \"알파\": 예비 보고서"
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
+"\"APPROVED\"…"
 msgstr ""
-"2주 전에 막 시작된 것으로 보이는, 새로운 화학품 제조 정보가 기록된 종이 묶음입니다. 인간 실험 결과가 포함되어 있으며, "
-"\"승인됨\" 도장이 찍혀있습니다..."
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Dionne"
@@ -17002,8 +17765,8 @@ msgstr[0] "PE065 \"키메라\": 최고의 실험체"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -17016,10 +17779,8 @@ msgstr[0] "실험 보고서-스미스"
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
+"look promising but the procurement methods seem awfully vague…"
 msgstr ""
-"이 합동 보고서는 XE037에 오염된 고기에서 유래된 것들에 집중하여 여러 종류의 돌연변이 실험에 대해서 상세하게 설명합니다. 결과는 "
-"괜찮게 보이지만 조달 방법은 몹시 모호해보입니다..."
 
 #: lang/json/BOOK_from_json.py
 msgid "standpipe maintenance log"
@@ -17031,10 +17792,8 @@ msgstr[0] "배관 유지 보수 기록"
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
+"with… a chemical formula?"
 msgstr ""
-"이 서류철에는 시설 전반에 걸친 여러 배관설비의 정기점검에 관한 정보가 상세히 기록되어 있습니다. 그러나 일부 기록지에는 뭔가 써진 것 "
-"같습니다만... 화학식인가?"
 
 #: lang/json/BOOK_from_json.py
 msgid "chemical reference-CLASSIFIED"
@@ -17078,10 +17837,8 @@ msgstr[0] "PE023 \"의학실험체\": 적용과 결과"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
 msgstr ""
-"새로운 의약품 제조 정보가 기록된, 아주 높은 수준의 기술 보고서 묶음입니다. 인간 실험 결과가 포함되어 있으며, \"승인됨\" 도장이 "
-"찍혀있습니다..."
 
 #: lang/json/BOOK_from_json.py
 msgid "PE070 \"Raptor\": Proposal"
@@ -17356,10 +18113,8 @@ msgstr[0] "실험 보고서-헤레라"
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
+"symbols you've not seen before…"
 msgstr ""
-"이 두꺼운 서류철은 아주 많은 다이어그램과 각종 전자 재료에 대한 기술 사양이 포함되어있습니다. 다이어그램 중 일부는 이전에 보지 못한 "
-"기호를 사용하여..."
 
 #: lang/json/BOOK_from_json.py
 msgid "2XI design binder-CLASSIFIED"
@@ -17422,13 +18177,13 @@ msgstr[0] ""
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -17750,11 +18505,9 @@ msgstr[0] "수제 탄약제작자의 도우미"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
 msgstr ""
-"당신이 여태까지 알고 싶어했을 탄약 장전에 관한 모든것이 들어있는 이 ...아이들이 못열도록 닫혀있는 책을 확실히 책임져야 할 것입니다."
-" 왜냐하면 폭발탄 챕터로 시작해서 세부적인 부분까지 완벽히 아우르는 책이기 때문이죠."
 
 #: lang/json/BOOK_from_json.py
 msgid "Rivtech design binder"
@@ -18232,7 +18985,7 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -19516,6 +20269,34 @@ msgid ""
 " that the author's real name is Fereidoun M. Esfandiary."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
 msgid_plural "phone books"
@@ -19586,8 +20367,8 @@ msgstr[0] "기업 회계장부"
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
-msgstr "당신이 뭘 중요하게 봐야하는지를 알고 있었더라면..."
+msgid "If you knew what to look for something might stand out…"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "patient treatment records"
@@ -19822,6 +20603,106 @@ msgstr ""
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -20723,10 +21604,11 @@ msgstr "플레이어들이 무고한 집사를 살해한 범인이 누군지 알
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
 msgstr[0] ""
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -20737,26 +21619,57 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
 msgstr[0] ""
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
 msgstr[0] ""
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
 "along with emulating their healing factor."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] ""
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] ""
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -21196,7 +22109,7 @@ msgstr ""
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr ""
 
@@ -22088,6 +23001,40 @@ msgstr "인간의 커다란 위장"
 msgid "The stomach of a large humanoid creature.  It is surprisingly durable."
 msgstr "거대한 인간의 내장입니다. 놀라울 정도로 튼튼합니다."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] ""
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr ""
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr ""
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -22130,6 +23077,59 @@ msgid ""
 "pinch."
 msgstr "먹을 수 있는 작은 고기조각. 많지는 않지만, 생존에 도움이 될겁니다."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] ""
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] ""
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr ""
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr ""
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -22162,6 +23162,23 @@ msgid "cooked scrap of meat"
 msgid_plural "cooked scraps of meat"
 msgstr[0] "고기조각 (요리됨)"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr ""
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "생 내장"
@@ -22365,8 +23382,8 @@ msgstr[0] "생 뇌"
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
-msgstr "동물에서 얻은 생 뇌. 이걸 제정신으로 먹고 싶은 마음은 없다."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cooked brains"
@@ -22419,8 +23436,8 @@ msgstr "스위트브레드 (요리됨)"
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
-msgstr "흔히 별미로 먹지만, 이것만으로는 뭔가 부족하다."
+msgid "Normally a delicacy, it needs a little… something."
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bone"
@@ -22473,6 +23490,76 @@ msgstr ""
 "건조 추출된 동물성 지방으로 이루어진 부드러운 흰색의 사각형 덩어리입니다. 이것은 오랫동안 썩지 않고, 많은 음식과 물건의 재료로 사용될"
 " 수 있습니다."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] ""
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr ""
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr ""
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] ""
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr ""
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr ""
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
 msgid_plural "chunks of tainted meat"
@@ -22646,11 +23733,8 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
-"겉보기에는 포유류의 심장을 닮은 두껍고 우렁찬 살덩어리이며, 갈비뼈 홈으로 덮여있고 당신의 머리 크기 또한 들어갑니다. 아직도 자버워커 "
-"안에 피가 흐르는 대로 가득 차 있고 손에 무겁습니다. 최근에 본 모든 것을 보면, 적의 심장을 먹었다는 옛말이 생각나지 않을 수 "
-"없습니다.."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "desiccated putrid heart"
@@ -22666,7 +23750,7 @@ msgstr ""
 "근육의 거대한 한 조각 - 피가 잘리고 빠져나간 퍼트린 심장의 모든 것이 남아 있습니다. 배가 고프면 먹을 수도 있지만, 보기만 해도 "
 "역겁습니다."
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] ""
@@ -22958,7 +24042,7 @@ msgstr[0] ""
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
 msgstr ""
 
@@ -23809,10 +24893,11 @@ msgstr "통조림 안에 링 모양으로 썰어져 있는 파인애플과 물
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
-msgstr[0] "레모네이드 가루"
+msgid_plural "lemonade drink mix"
+msgstr[0] ""
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -24507,8 +25592,8 @@ msgstr[0] "땅콩버터 사탕"
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
-msgstr "땅콩버터 맛 사탕... 이거 제일 좋아하는 맛인데!"
+msgid "A handful of peanut butter cups… your favorite!"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate candy"
@@ -24617,10 +25702,8 @@ msgstr "맛있는 초콜릿 케이크입니다. 케이크 전체가 아이싱으
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr ""
-"당신이 여태까지 본 것 중에서 가장 두꺼운 아이싱이 코팅된 케이크입니다. 누군가가 큰따옴표를 그려 넣고 그 안에 시답잖은 이야기를 "
-"써놓았습니다..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate-covered coffee bean"
@@ -24660,8 +25743,8 @@ msgstr[0] "박하 초콜릿"
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
-msgstr "초콜릿이 덮힌 박하 초콜릿... 냠!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Necco wafers"
@@ -25248,6 +26331,17 @@ msgid ""
 "filling."
 msgstr "부자연스러운 분홍빛이 돌고, 그다지 맛도 안 나는 이상한 식감의 돼지고기 통조림 식품입니다. 하지만 먹으면 꽤 배부릅니다."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr ""
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "정어리 통조림"
@@ -26852,8 +27946,8 @@ msgstr[0] ""
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -26911,11 +28005,8 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
-"썸네일 크기의 사과 붉은 젤 캡슐은 예측 불가능한 간격으로 검정색에서 보라색으로 변하는 기름기가 많은 액체로 가득 차 있고, 작은 회색 "
-"점들로 얼룩져 있습니다. 당신이 어디서 얻었는지를 고려하면, 이것은 매우 강력하거나 혹은 매우 실험적입니다. 들고 있으면, 모든 작은 "
-"아픔과 아픔이 사라지는 것 같아요. 잠시 동안만요.."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattail jelly"
@@ -27308,9 +28399,9 @@ msgstr "뮤타젠 비슷한 냄새가 나는것"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
-msgstr "극도로 농축된 뮤타젠입니다. 이것을 주입하기 위해서는 주사기가 필요합니다... 정말로 주사하고 싶은 마음이 드십니까?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagenic serum"
@@ -27324,10 +28415,8 @@ msgstr "알파 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
+"to inject it… if you really want to?"
 msgstr ""
-"극도로 농축된 뮤타젠으로 혈액과 거의 흡사하게 보입니다. 이것을 주입하기 위해서는 주사기가 필요합니다... 정말로 주사하고 싶은 마음이 "
-"드십니까?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "beast serum"
@@ -27337,7 +28426,7 @@ msgstr "야수 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27348,10 +28437,8 @@ msgstr "조류 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
+"need a syringe to inject it… if you really want to?"
 msgstr ""
-"극도로 농축된 뮤타젠으로 대격변 이전의 하늘 같아 보이는 색입니다. 이것을 주입하기 위해서는 주사기가 필요합니다... 정말로 주사하고 "
-"싶은 마음이 드십니까?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattle serum"
@@ -27361,10 +28448,8 @@ msgstr "초식동물 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
+"inject it… if you really want to?"
 msgstr ""
-"극도로 농축된 뮤타젠으로 풀 같아 보이는 색입니다. 이것을 주입하기 위해서는 주사기가 필요합니다... 정말로 주사하고 싶은 마음이 "
-"드십니까?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cephalopod serum"
@@ -27374,7 +28459,7 @@ msgstr "연체동물 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
+"it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27385,7 +28470,7 @@ msgstr "키메라 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27396,7 +28481,7 @@ msgstr "요정 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27407,7 +28492,7 @@ msgstr "고양이 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27418,10 +28503,8 @@ msgstr "어류 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
+"top.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"극도로 농축된 뮤타젠으로 바다색이고, 위에 흰색 거품이 있습니다. 이것을 주입하기 위해서는 주사기가 필요합니다... 정말로 주사하고 "
-"싶으시다면요?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "insect serum"
@@ -27431,7 +28514,7 @@ msgstr "곤충 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27442,7 +28525,7 @@ msgstr "파충류 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27453,7 +28536,7 @@ msgstr "늑대 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
+" inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27464,7 +28547,7 @@ msgstr "의학실험체 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27475,7 +28558,7 @@ msgstr "식물 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27486,7 +28569,7 @@ msgstr "랩터 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
+"at it.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27497,7 +28580,7 @@ msgstr "설치류 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27508,7 +28591,7 @@ msgstr "슬라임 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27519,7 +28602,7 @@ msgstr "거미 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27530,7 +28613,7 @@ msgstr "동굴성 생물 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27541,7 +28624,7 @@ msgstr "곰 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
+"thick.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27552,7 +28635,7 @@ msgstr "생쥐 혈청"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27567,8 +28650,8 @@ msgstr "응고된 혈액"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
-msgstr "걸쭉하고 수프가 많은 빨간 액체입니다. 역겨워 보이고 냄새도 나고, 그 자체의 지능으로 거품이 나는것 같습니다..."
+"bubble with an intelligence of its own…"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "alpha mutagen"
@@ -27754,21 +28837,21 @@ msgid ""
 msgstr "목마른 돌연변이가 선택한 음료. 끔찍한 맛이지만, 그냥 하수를 마시는 것보단 덜 위험할 것 같다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
+msgid "pine nuts"
+msgid_plural "pine nuts"
 msgstr[0] ""
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
+msgid "junipers"
+msgid_plural "junipers"
 msgstr[0] ""
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -27776,62 +28859,75 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
 msgstr[0] ""
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
 msgstr "피스타치오 나무에서 난 열매를 날 것 그대로 껍질만 벗겨놓은 것입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
-msgstr[0] "볶은 피스타치오"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
+msgstr[0] ""
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr "피스타치오 나무에서 난 열매를 볶은 것입니다"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
 msgstr[0] ""
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
 msgstr "아몬드 나무에서 난 딱딱한 열매를 날 것 그대로 껍질만 벗겨놓은 것입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
-msgstr[0] "볶은 아몬드"
+msgid "almond pulp"
+msgid_plural "almond pulp"
+msgstr[0] ""
+
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
+msgstr[0] ""
 
-#. ~ Description for handful of roasted almonds
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
 msgstr "아몬드 나무에서 난 열매를 볶은 것입니다"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
+msgid "cashews"
+msgid_plural "cashews"
 msgstr[0] ""
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr "짭잘한 캐슈 한 줌."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
 msgstr[0] ""
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -27839,41 +28935,41 @@ msgid ""
 msgstr "히코리 견과류의 아종인 피칸을 날 것 그대로 껍질만 벗겨놓은 것입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
-msgstr[0] "볶은 피칸"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
+msgstr[0] ""
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr "피칸 나무에서 난 열매를 볶은 것입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
-msgstr[0] "땅콩"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
+msgstr[0] ""
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr "껍질이 제거된 짭잘한 땅콩."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
+msgid "beech nuts"
+msgid_plural "beech nuts"
 msgstr[0] ""
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
-msgstr[0] "호두"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
+msgstr[0] ""
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -27881,21 +28977,22 @@ msgid ""
 msgstr "호두 나무에서 난 딱딱한 열매를 날 것 그대로 껍질만 벗겨놓은 것입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
-msgstr[0] "볶은 호두"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
+msgstr[0] ""
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr "호두 나무에서 난 열매를 볶은 것입니다"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
-msgstr[0] "밤"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
+msgstr[0] ""
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -27903,21 +29000,23 @@ msgid ""
 msgstr "밤 나무에서 난 딱딱한 열매를 날 것 그대로 껍질만 벗겨놓은 것입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
-msgstr[0] "볶은 밤"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
+msgstr[0] ""
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr "밤 나무에서 난 열매를 볶은 것입니다"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
 msgstr[0] ""
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -27925,41 +29024,43 @@ msgid ""
 msgstr "헤이즐넛 나무에서 난 열매를 날 것 그대로 껍질만 벗겨놓은 것입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
 msgstr[0] ""
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
 msgstr[0] ""
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
 msgstr[0] ""
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr "헤이즐넛 나무에서 난 열매를 볶은 것입니다"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
-msgstr[0] "히코리 열매"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
+msgstr[0] ""
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -27967,11 +29068,12 @@ msgid ""
 msgstr "히코리 나무에서 난 딱딱한 열매를 날 것 그대로 껍질만 벗겨놓은 것입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
-msgstr[0] "볶은 히코리 열매"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
+msgstr[0] ""
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr "히코리 나무에서 난 열매를 볶은 것입니다."
@@ -27986,11 +29088,11 @@ msgid "Delicious hickory nut ambrosia.  A drink worthy of the gods."
 msgstr "신들의 음료라는 말에 걸맞은 맛있는 히코리 열매 암브로시아입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
-msgstr[0] "도토리"
+msgid "acorns"
+msgid_plural "acorns"
+msgstr[0] ""
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
@@ -27998,11 +29100,11 @@ msgid ""
 msgstr "껍질을 까지 않은 도토리 한 줌. 다람쥐가 좋아하는 음식. 이 상태로 먹긴 힘들다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
 msgstr[0] ""
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr "떡갈나무에서 난 열매를 볶은 것입니다."
@@ -28532,10 +29634,11 @@ msgstr "정제된 인간 단백질과 물을 섞어 만든 걸쭉한 액체. 꽤
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
-msgstr[0] "소일렌트 그린 분말"
+msgid_plural "soylent green powder"
+msgstr[0] ""
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -28579,10 +29682,10 @@ msgstr "정제된 단백질과 물을 섞어 만든, 약간 걸쭉한 액체입
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
-msgstr[0] "단백질 가루"
+msgid_plural "protein powder"
+msgstr[0] ""
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -28651,11 +29754,11 @@ msgid "Very sour citrus.  Can be eaten if you really want."
 msgstr "매우 시큼한 감귤류 과일입니다. 꼭 먹어야만 하겠다면 먹을 수는 있습니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
-msgstr[0] "블루베리"
+msgid "blueberries"
+msgid_plural "blueberries"
+msgstr[0] ""
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr ""
@@ -28663,51 +29766,51 @@ msgstr ""
 "(역주: 'blue'에는 '우울한'이라는 의미도 있다.)"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
-msgstr[0] "딸기"
+msgid "strawberries"
+msgid_plural "strawberries"
+msgstr[0] ""
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr "맛있는 과즙이 들어있는 열매. 종종 들판에서 자라나는 것을 발견할 수 있다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
-msgstr[0] "크랜베리"
+msgid "cranberries"
+msgid_plural "cranberries"
+msgstr[0] ""
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr "새콤한 붉은색 열매입니다. 건강에 좋습니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
-msgstr[0] "산딸기"
+msgid "raspberries"
+msgid_plural "raspberries"
+msgstr[0] ""
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "달콤한 붉은색 열매입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
+msgid "huckleberries"
+msgid_plural "huckleberries"
 msgstr[0] ""
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr "가끔씩 불루베리와 헷갈리는 월귤나무 열매."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
+msgid "mulberries"
+msgid_plural "mulberries"
 msgstr[0] ""
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -28715,21 +29818,21 @@ msgid ""
 msgstr "빨간 오디는 북미 동부 지역에서만 나타나며 세계에서 가장 풍미가 뛰어난 종으로 알려져 있습니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
+msgid "elderberries"
+msgid_plural "elderberries"
 msgstr[0] ""
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr "날것으로 먹으면 독성이 있으니 요리해 먹는 것이 좋다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
+msgid "rose hips"
+msgid_plural "rose hips"
 msgstr[0] ""
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "꽃가루가 들어간 장미꽃의 열매입니다."
@@ -28764,11 +29867,11 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "새콤 달콤한 감귤류 과일입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
+msgid "cherries"
+msgid_plural "cherries"
 msgstr[0] ""
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr "나무에서 자라는 붉고 달콤한 과일입니다."
@@ -28784,11 +29887,11 @@ msgid ""
 msgstr "적당히 큰 보라색 자두입니다. 몸에 좋고, 소화를 돕습니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
+msgid "grapes"
+msgid_plural "grapes"
 msgstr[0] ""
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr "즙이 많은 포도 한 송이."
@@ -28840,11 +29943,11 @@ msgid "A large and very sweet fruit."
 msgstr "크고 아주 달콤한 과일입니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
+msgid "blackberries"
+msgid_plural "blackberries"
 msgstr[0] ""
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "산딸기의 검은색 사촌입니다."
@@ -28887,15 +29990,26 @@ msgid ""
 msgstr "털로 뒤덮인 갈색 껍질의 알찬 열매. 초록색 내용물이 맛있다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
+msgid "apricots"
+msgid_plural "apricots"
 msgstr[0] ""
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "부드러운 촉감의 과일로, 복숭아와 비슷한 과일입니다."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr ""
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr ""
@@ -29064,10 +30178,10 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] ""
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -29077,10 +30191,10 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
+msgid_plural "chicory"
 msgstr[0] ""
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -29192,11 +30306,11 @@ msgid ""
 msgstr "커다란 채소. 대략 당신의 머리만 합니다. 생으로는 별로지만, 요리해 먹으면 아주 맛있습니다."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
-msgstr[0] "민들레"
+msgid "dandelions"
+msgid_plural "dandelions"
+msgstr[0] ""
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -29321,11 +30435,11 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
 msgstr[0] ""
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -31062,8 +32176,8 @@ msgstr[0] ""
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31074,7 +32188,7 @@ msgstr[0] ""
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
 msgstr ""
 
@@ -31520,7 +32634,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31532,7 +32646,7 @@ msgstr[0] ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31629,8 +32743,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31641,8 +32755,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31653,8 +32768,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31665,8 +32780,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31677,9 +32792,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31713,7 +32828,7 @@ msgstr[0] ""
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31729,6 +32844,16 @@ msgid ""
 " properties."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr ""
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
 msgstr "아교 끈"
@@ -32362,15 +33487,6 @@ msgstr[0] "쌀가루"
 msgid "This rice flour is useful for baking."
 msgstr "제빵에 쓰이는 쌀가루"
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr ""
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr ""
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr "부활 혈청"
@@ -32641,8 +33757,8 @@ msgstr[0] ""
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -32653,8 +33769,8 @@ msgstr[0] ""
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -33133,8 +34249,8 @@ msgstr[0] ""
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -33676,8 +34792,8 @@ msgstr[0] ""
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -33688,7 +34804,7 @@ msgstr[0] ""
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr ""
 
@@ -33705,81 +34821,81 @@ msgstr ""
 "*히코리 나무 : 북미에 자생하는 호두과 나무."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
 msgstr[0] ""
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr "히코리 나무 열매 한 줌. 아직 껍질에 덮여있습니다."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
+msgid "pecans"
+msgid_plural "pecans"
 msgstr[0] ""
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr "피칸 나무 열매 한 줌. 아직 껍질에 덮여있습니다."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
+msgid "pistachios"
+msgid_plural "pistachios"
 msgstr[0] ""
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr "피스타치오 나무 열매 한 줌. 아직 껍질에 덮여있습니다."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
+msgid "almonds"
+msgid_plural "almonds"
 msgstr[0] ""
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
 msgstr "아몬드 나무 열매 한 줌. 아직 껍질에 덮여있습니다."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
+msgid "peanuts"
+msgid_plural "peanuts"
 msgstr[0] ""
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr "땅콩 수풀에서 얻은 땅콩 한 줌. 아직 껍질에 덮여있습니다."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
 msgstr[0] ""
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr "헤이즐넛 나무 열매 한 줌. 아직 껍질에 덮여있습니다."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
+msgid "chestnuts"
+msgid_plural "chestnuts"
 msgstr[0] ""
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr "밤 나무 열매 한 줌. 아직 껍질에 덮여있습니다."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
+msgid "walnuts"
+msgid_plural "walnuts"
 msgstr[0] ""
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr "호두 나무 열매 한 줌. 아직 껍질에 덮여있습니다."
@@ -33914,7 +35030,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr ""
 
@@ -33938,7 +35054,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr ""
 
@@ -34033,6 +35149,11 @@ msgstr "근육"
 msgid "wind"
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "a smoking device and a source of flame"
@@ -34080,10 +35201,8 @@ msgstr[0] "푸드플레이스 고객 카드"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr ""
-"모든 포인트가 찍혀 있는 밝은 핑크색 고객 카드. 확실히 푸드플레이스의 단골이란 걸 증명할 수 있을 것입니다. 아직도 쓸모가 "
-"있다면요..."
 
 #: lang/json/GENERIC_from_json.py
 msgid "withered plant"
@@ -34210,8 +35329,8 @@ msgstr[0] ""
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -34488,6 +35607,17 @@ msgid ""
 "constructing tougher walls and such."
 msgstr "좋은 근접 무기를 만들 수 있으며, 보다 더 강한 벽을 건설하는데 유용한 철근입니다."
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] ""
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -34607,8 +35737,8 @@ msgstr[0] "텔레비전"
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
-msgstr "대형 음극 선관 텔레비전. 안에 든 전자부품들이 꿀맛이겠군요."
+msgid "A large LCD television, full of delicious electronics."
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -34994,6 +36124,18 @@ msgid ""
 "communications equipment."
 msgstr "다양한 대역의 신호를 수신할 수 있도록 만들어진 부품. 통신장비 제작에 사용된다."
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] ""
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -35373,8 +36515,8 @@ msgstr[0] "SD 카드 (과학정보)"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
-msgstr "'XEDRA'와 관련이 있어 보이는 저장장치. 당연히 암호화 되어있지만, 일단 '흥미로워' 보인다."
+"encrypted.  Looks *Interesting*, though…"
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "hand mirror"
@@ -35442,11 +36584,12 @@ msgid ""
 msgstr "해바라기 윗부분은 노란색 페달과 아직 동물들에게 먹히지 않은 씨앗이 있다."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
 msgstr[0] ""
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -35704,10 +36847,10 @@ msgstr "20달러 정도의 돈뭉치지만, 지금 같은 상황에서는 쓸모
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -35757,10 +36900,8 @@ msgstr[0] "담배꽁초"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr ""
-"환상적인 중독성을 자랑하던 담배가 냄새나는 쓰레기로 변해버렸다. 이럴 수가!\n"
-"남은 담뱃잎 중 일부는 다른 담배를 만드는데 쓸 수 있을 것 같다. 굳이 그렇게 하겠다면야..."
 
 #. ~ Use action msg for joint.
 #: lang/json/GENERIC_from_json.py
@@ -35805,10 +36946,10 @@ msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
+msgid_plural "raw tobacco"
 msgstr[0] ""
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -35858,11 +36999,6 @@ msgid ""
 "panel, if you can find one."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] "네오프렌 천"
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -36298,13 +37434,6 @@ msgid ""
 "chopping things and for use as a hammer."
 msgstr "한 손으로 쓸 수 있는 손도끼이다. 근접 무기로도 좋지만 대상을 쪼개거나 망치처럼 쓸 수도 있다."
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr "야구공만한 돌입니다. 적당한 근접 무기이며, 적에게 던지기에도 좋습니다."
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -36816,8 +37945,8 @@ msgstr[0] "판 용수철"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
-msgstr "크고 고강도의 판형 스프링. 아마 보통 차나 트럭용도로 보이며 활 처럼 생겼습니다. 힘을 줘도 거의 구부러지지 않습니다."
+" an awful lot like a bow.  You can barely bend it…"
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "hydrangea"
@@ -37416,7 +38545,7 @@ msgstr[0] "방사능 커피 제조기"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
@@ -37430,7 +38559,9 @@ msgstr[0] "원자력 스탠드"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "덮개 닫기"
 
@@ -37457,7 +38588,9 @@ msgstr[0] "원자력 스탠드 (덮임)"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "덮개 열기"
 
@@ -37725,8 +38858,8 @@ msgstr[0] "갈고리"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -38535,9 +39668,7 @@ msgstr[0] ""
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
+msgid "A complete guide to Wing Chun Kung-fu."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
@@ -38550,8 +39681,8 @@ msgstr[0] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -39561,6 +40692,19 @@ msgstr[0] ""
 msgid "This is a slip of paper signed by the issuer."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] ""
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -39885,9 +41029,9 @@ msgstr[0] "포크"
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
-msgstr "포크다. 뭔가를 찌르면 바로 입으로 가져가야... 잠깐, 그러면 안 될 것 같다."
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "plastic fork"
@@ -40969,7 +42113,7 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
 
@@ -41386,8 +42530,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
 msgstr ""
 
 #. ~ Description for estoc
@@ -41482,19 +42626,17 @@ msgstr ""
 "무기로 사용하기에 부적합하다."
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
-msgstr[0] "펜싱용 에페"
+msgid "fencing épée"
+msgid_plural "fencing épées"
+msgstr[0] ""
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
 msgstr ""
-"모든 스포츠 중에서 가장 귀족적인 스포츠인 펜싱에 사용되는 무기. 에페는 펜싱용 무기 중에서 가장 무겁고 잘 휘어지지 않아서 무기로 "
-"사용하기에 적합하다."
 
 #: lang/json/GENERIC_from_json.py
 msgid "fencing saber"
@@ -41505,10 +42647,50 @@ msgstr[0] "펜싱용 사브르"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
+"is marginally shorter than the foil and épée, but no less effective."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] ""
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] ""
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] ""
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
 msgstr ""
-"모든 스포츠 중에서 가장 귀족적인 스포츠인 펜싱에 사용되는 무기. 펜싱용 사브르는 플뢰레와 에페에 비해 조금 짧긴 하기만, 그렇다고 해서"
-" 심하게 효율이 떨어지지는 않는다."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
@@ -41767,10 +42949,8 @@ msgstr[0] "알루미늄 주괴"
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
+"down to a powder, for more… high-profile applications."
 msgstr ""
-"가공의 용이성을 위해 표준규격화한 작은 알루미늄 주괴. 가볍지만 튼튼하며, 건설 작업에 쓸 수 있도록 다른 형태로 주조하거나 갈아서 "
-"가루로 만들 수도 있으며 여타 다른 용도로도 사용된다."
 
 #: lang/json/GENERIC_from_json.py
 msgid "scrap copper"
@@ -42071,6 +43251,43 @@ msgid ""
 " can also serve as an improvised stabbing weapon, but will break quickly."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] ""
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] ""
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] ""
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -43432,7 +44649,7 @@ msgstr[0] ""
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -43443,8 +44660,8 @@ msgstr[0] ""
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -44500,6 +45717,26 @@ msgid ""
 "art."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] ""
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr ""
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -44920,6 +46157,130 @@ msgid "dao +2"
 msgid_plural "dao +2s"
 msgstr[0] ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] ""
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] ""
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] ""
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] ""
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] ""
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] ""
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
@@ -45179,6 +46540,20 @@ msgid ""
 "to land astoundingly powerful blows."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] ""
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -45255,6 +46630,18 @@ msgid ""
 "prized for their beauty and power."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] ""
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -45279,93 +46666,6 @@ msgid ""
 "scales could make a suit of armor as hard as steel and half as heavy."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] ""
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] ""
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] ""
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] ""
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] ""
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] ""
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] ""
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr ""
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -45434,6 +46734,53 @@ msgstr[0] ""
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr ""
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] "궁니르"
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] ""
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] "레바테인"
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -45660,8 +47007,8 @@ msgstr[0] ""
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -45674,7 +47021,7 @@ msgstr[0] ""
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -46383,8 +47730,32 @@ msgstr[0] ""
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] ""
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] ""
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -46401,6 +47772,16 @@ msgid ""
 "rock and lava everywhere."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] ""
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
@@ -47208,11 +48589,6 @@ msgid ""
 "ornaments."
 msgstr "토르의 망치인 묠니르의 복제품이다. 한대 치면 산도 평평해진다는 소문이 있다. 금과 은으로 장식되어 있다."
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] "궁니르"
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -48096,6 +49472,11 @@ msgstr "화학 재료"
 msgid "SPARE PARTS"
 msgstr "예비 부품"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "저장용기"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "아티팩트"
@@ -48106,6 +49487,307 @@ msgstr "아티팩트"
 msgid "ARMOR"
 msgstr "보호구"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "장비 물품"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "장비 무기"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr ""
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr ""
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr ""
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr ""
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr ""
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr ""
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr ""
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr ""
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr ""
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr ""
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr ""
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr ""
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr ""
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr ""
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr ""
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr ""
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr ""
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr ""
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr ""
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr ""
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr ""
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr ""
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr ""
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr ""
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr ""
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr ""
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr ""
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr ""
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr ""
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr ""
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr ""
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -48312,7 +49994,7 @@ msgstr[0] ""
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
 msgstr ""
 
@@ -48672,8 +50354,8 @@ msgstr "H&K G3 드럼탄창"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
-msgstr "H&K G3에 사용되는 50발들이 드럼 탄창"
+msgid "A 50-round drum magazine for the H&K G3 rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "H&K G3 magazine"
@@ -48715,8 +50397,8 @@ msgstr "FN SCAR-H 드럼탄창"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
-msgstr "FN SCAR-H 소총에 사용되는 50발들이 드럼 탄창"
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "FN SCAR-H magazine"
@@ -48810,15 +50492,6 @@ msgstr ""
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr ""
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "타우러스 .38 탄창"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr "타우러스 프로 .38 권총에 사용되는 철제 소형 박스탄창"
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr ""
@@ -48892,6 +50565,16 @@ msgstr ""
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr ""
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr ""
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr ""
@@ -51319,7 +53002,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "chicken"
 msgid_plural "chickens"
-msgstr[0] ""
+msgstr[0] "닭"
 
 #. ~ Description for chicken
 #: lang/json/MONSTER_from_json.py
@@ -51334,7 +53017,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "grouse"
 msgid_plural "grouses"
-msgstr[0] ""
+msgstr[0] "뇌조"
 
 #. ~ Description for grouse
 #: lang/json/MONSTER_from_json.py
@@ -51346,7 +53029,7 @@ msgstr "아주 흔한 경기용 새, 이 생물들은 야생 닭이 어땠을지
 #: lang/json/MONSTER_from_json.py
 msgid "crow"
 msgid_plural "crows"
-msgstr[0] ""
+msgstr[0] "까마귀"
 
 #. ~ Description for crow
 #: lang/json/MONSTER_from_json.py
@@ -51358,7 +53041,7 @@ msgstr "작고 우아한 검은 새. 똑똑한 새로 알려져 있으며, 눈
 #: lang/json/MONSTER_from_json.py
 msgid "duck"
 msgid_plural "ducks"
-msgstr[0] ""
+msgstr[0] "오리"
 
 #. ~ Description for duck
 #: lang/json/MONSTER_from_json.py
@@ -51370,7 +53053,7 @@ msgstr "강이나 다른 물가에서 종종 보이는 청둥오리. 주로 곤
 #: lang/json/MONSTER_from_json.py
 msgid "goose"
 msgid_plural "geese"
-msgstr[0] ""
+msgstr[0] "거위"
 
 #. ~ Description for {'str': 'goose', 'str_pl': 'geese'}
 #: lang/json/MONSTER_from_json.py
@@ -51380,7 +53063,7 @@ msgstr "캐나다 거위, 캐나다를 떠난 것을 후회하는 흔한 물새
 #: lang/json/MONSTER_from_json.py
 msgid "turkey"
 msgid_plural "turkeys"
-msgstr[0] ""
+msgstr[0] "칠면조"
 
 #. ~ Description for turkey
 #: lang/json/MONSTER_from_json.py
@@ -51393,7 +53076,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "pheasant"
 msgid_plural "pheasants"
-msgstr[0] ""
+msgstr[0] "꿩"
 
 #. ~ Description for pheasant
 #: lang/json/MONSTER_from_json.py
@@ -51405,7 +53088,7 @@ msgstr "성별과 종에 따라 밝은 깃털을 가질 수 있는 중간 크기
 #: lang/json/MONSTER_from_json.py
 msgid "cockatrice"
 msgid_plural "cockatrices"
-msgstr[0] ""
+msgstr[0] "계사"
 
 #. ~ Description for cockatrice
 #: lang/json/MONSTER_from_json.py
@@ -51420,7 +53103,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "yellow chick"
 msgid_plural "yellow chicks"
-msgstr[0] ""
+msgstr[0] "노란색 병아리"
 
 #. ~ Description for yellow chick
 #: lang/json/MONSTER_from_json.py
@@ -51432,12 +53115,12 @@ msgstr "노란색과 갈색의 작은 병아리, 많은 다른 종에서 온 것
 #: lang/json/MONSTER_from_json.py
 msgid "brown chick"
 msgid_plural "brown chicks"
-msgstr[0] ""
+msgstr[0] "갈색 병아리"
 
 #: lang/json/MONSTER_from_json.py
 msgid "strange chick"
 msgid_plural "strange chicks"
-msgstr[0] ""
+msgstr[0] "이상한 병아리"
 
 #. ~ Description for strange chick
 #: lang/json/MONSTER_from_json.py
@@ -51447,7 +53130,7 @@ msgstr "이상한 작은 병아리, 여러 종에서 온 것일 수도 있습니
 #: lang/json/MONSTER_from_json.py
 msgid "waterfowl chick"
 msgid_plural "waterfowl chicks"
-msgstr[0] ""
+msgstr[0] "물새 병아리"
 
 #. ~ Description for waterfowl chick
 #: lang/json/MONSTER_from_json.py
@@ -51484,7 +53167,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "skitterbot"
 msgid_plural "skitterbots"
-msgstr[0] ""
+msgstr[0] "스키터봇"
 
 #. ~ Description for skitterbot
 #: lang/json/MONSTER_from_json.py
@@ -51510,7 +53193,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "prototype robot"
 msgid_plural "prototype robots"
-msgstr[0] ""
+msgstr[0] "프로토타입 로봇"
 
 #. ~ Description for prototype robot
 #: lang/json/MONSTER_from_json.py
@@ -51555,96 +53238,98 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "autonomous drone"
 msgid_plural "autonomous drones"
-msgstr[0] ""
+msgstr[0] "무인 드론"
 
 #: lang/json/MONSTER_from_json.py
 msgid "EMP hack"
 msgid_plural "EMP hacks"
-msgstr[0] ""
+msgstr[0] "EMP 맨핵"
 
 #. ~ Description for EMP hack
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "An automated kamikaze drone, this small quadcopter robot appears to have an "
 "EMP grenade inside."
-msgstr ""
+msgstr "자폭형 자동화 드론. 내부에 EMP 수류탄이 들어있는 작은 쿼드콥터 로봇이다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "C-4 hack"
 msgid_plural "C-4 hacks"
-msgstr[0] ""
+msgstr[0] "C-4 맨핵"
 
 #. ~ Description for C-4 hack
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "An automated kamikaze drone, this small quadcopter robot appears to have "
 "some C-4 inside."
-msgstr ""
+msgstr "자폭형 자동화 드론. 내부에 C-4 폭탄이 들어있는 작은 쿼드콥터 로봇이다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "flashbang hack"
 msgid_plural "flashbang hacks"
-msgstr[0] ""
+msgstr[0] "섬광탄 맨핵"
 
 #. ~ Description for flashbang hack
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "An automated kamikaze drone, this small quadcopter robot appears to have a "
 "flashbang inside."
-msgstr ""
+msgstr "자폭형 자동화 드론. 내부에 섬광탄이 들어있는 작은 쿼드콥터 로봇이다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "tear gas hack"
 msgid_plural "tear gas hacks"
-msgstr[0] ""
+msgstr[0] "최루탄 맨핵"
 
 #. ~ Description for tear gas hack
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "An automated kamikaze drone, this small quadcopter robot appears to have a "
 "tear gas canister inside."
-msgstr ""
+msgstr "자폭형 자동화 드론. 내부에 최루탄이 들어있는 작은 쿼드콥터 로봇이다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "grenade hack"
 msgid_plural "grenade hacks"
-msgstr[0] ""
+msgstr[0] "수류탄 맨핵"
 
 #. ~ Description for grenade hack
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "An automated kamikaze drone, this small quadcopter robot appears to have a "
 "grenade inside."
-msgstr ""
+msgstr "자폭형 자동화 드론. 내부에 수류탄이 들어있는 작은 쿼드콥터 로봇이다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "manhack"
 msgid_plural "manhacks"
-msgstr[0] ""
+msgstr[0] "맨핵"
 
 #. ~ Description for manhack
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "An automated anti-personnel drone, a small quadcopter robot surrounded by "
 "whirring blades."
-msgstr ""
+msgstr "대인용 자동화 드론. 윙윙 돌아가는 칼날이 덮인 작은 쿼드콥터 로봇이다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "mininuke hack"
 msgid_plural "mininuke hacks"
-msgstr[0] ""
+msgstr[0] "소형핵 맨핵"
 
 #. ~ Description for mininuke hack
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
+"appears to have a mininuke inside.  If this is targeting you…  Run."
 msgstr ""
+"일반적인 맨핵보다 더 큰 맨핵. 이 날고 있는 쿼드콥터 드론의 내부에는 소형핵이 들어있다. 만약 이 드론에게 목표로 지정된다면... "
+"도망쳐야지."
 
 #: lang/json/MONSTER_from_json.py
 msgid "tiny fish"
 msgid_plural "tiny fish"
-msgstr[0] ""
+msgstr[0] "아주 작은 물고기"
 
 #. ~ Description for {'str': 'tiny fish', 'str_pl': 'tiny fish'}
 #: lang/json/MONSTER_from_json.py
@@ -51654,7 +53339,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "small fish"
 msgid_plural "small fish"
-msgstr[0] ""
+msgstr[0] "작은 물고기"
 
 #. ~ Description for {'str': 'small fish', 'str_pl': 'small fish'}
 #: lang/json/MONSTER_from_json.py
@@ -51664,7 +53349,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "medium fish"
 msgid_plural "medium fish"
-msgstr[0] ""
+msgstr[0] "중형 물고기"
 
 #. ~ Description for {'str': 'medium fish', 'str_pl': 'medium fish'}
 #: lang/json/MONSTER_from_json.py
@@ -51674,7 +53359,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "large fish"
 msgid_plural "large fish"
-msgstr[0] ""
+msgstr[0] "큰 물고기"
 
 #. ~ Description for {'str': 'large fish', 'str_pl': 'large fish'}
 #: lang/json/MONSTER_from_json.py
@@ -51684,7 +53369,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "huge fish"
 msgid_plural "huge fish"
-msgstr[0] ""
+msgstr[0] "거대한 물고기"
 
 #. ~ Description for {'str': 'huge fish', 'str_pl': 'huge fish'}
 #: lang/json/MONSTER_from_json.py
@@ -51694,122 +53379,122 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "trout"
 msgid_plural "trouts"
-msgstr[0] ""
+msgstr[0] "송어"
 
 #. ~ Description for trout
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A Trout.  A fish made popular by father-son fishing trips, Except for the "
 "part where you have to gut it."
-msgstr ""
+msgstr "송어입니다. 부자 동반 낚시 여행으로 유명해 진 물고기입니다. 내장 따는 부분은 빼고요."
 
 #: lang/json/MONSTER_from_json.py
 msgid "brown trout"
 msgid_plural "brown trouts"
-msgstr[0] ""
+msgstr[0] "갈색 송어"
 
 #. ~ Description for brown trout
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A Brown Trout.  A fish made popular by father-son fishing trips, Except for "
 "the part where you have to gut it."
-msgstr ""
+msgstr "갈색 송어입니다. 부자 동반 낚시 여행으로 유명해 진 물고기입니다. 내장 따는 부분은 빼고요."
 
 #: lang/json/MONSTER_from_json.py
 msgid "brook trout"
 msgid_plural "brook trouts"
-msgstr[0] ""
+msgstr[0] "민물송어"
 
 #. ~ Description for brook trout
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A Brook Trout.  A fish made popular by father-son fishing trips, Except for "
 "the part where you have to gut it."
-msgstr ""
+msgstr "민물송어입니다. 부자 동반 낚시 여행으로 유명해 진 물고기입니다. 내장 따는 부분은 빼고요."
 
 #: lang/json/MONSTER_from_json.py
 msgid "lake trout"
 msgid_plural "lake trouts"
-msgstr[0] ""
+msgstr[0] "강 송어"
 
 #. ~ Description for lake trout
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A Lake trout.  A fish made popular by father-son fishing trips, Except for "
 "the part where you have to gut it."
-msgstr ""
+msgstr "강 송어입니다. 부자 동반 낚시 여행으로 유명해 진 물고기입니다. 내장 따는 부분은 빼고요."
 
 #: lang/json/MONSTER_from_json.py
 msgid "rainbow trout"
 msgid_plural "rainbow trouts"
-msgstr[0] ""
+msgstr[0] "무지개 송어"
 
 #. ~ Description for rainbow trout
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A Rainbow Trout.  A fish made popular by father-son fishing trips, Except "
 "for the part where you have to gut it."
-msgstr ""
+msgstr "무지개 송어입니다. 부자 동반 낚시 여행으로 유명해 진 물고기입니다. 내장 따는 부분은 빼고요."
 
 #: lang/json/MONSTER_from_json.py
 msgid "steelhead trout"
 msgid_plural "steelhead trouts"
-msgstr[0] ""
+msgstr[0] "스틸헤드 송어"
 
 #. ~ Description for steelhead trout
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A Steelhead Trout.  A fish made popular by father-son fishing trips, Except "
 "for the part where you have to gut it."
-msgstr ""
+msgstr "스틸헤드 송어입니다. 부자 동반 낚시 여행으로 유명해 진 물고기입니다. 내장 따는 부분은 빼고요."
 
 #: lang/json/MONSTER_from_json.py
 msgid "salmon"
 msgid_plural "salmons"
-msgstr[0] ""
+msgstr[0] "연어"
 
 #. ~ Description for salmon
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "An Atlantic Salmon.  A very fatty, nutritious fish.  Tastes great smoked."
-msgstr ""
+msgstr "대서양 연어는 아주 지방이 많고 영양분이 높은 생선입니다. 훈제하면 맛이 좋아집니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "kokanee salmon"
 msgid_plural "kokanee salmons"
-msgstr[0] ""
+msgstr[0] "코카니 연어"
 
 #. ~ Description for kokanee salmon
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A Kokanee Salmon.  A very fatty, nutritious fish.  Tastes great smoked."
-msgstr ""
+msgstr "코카니 연어는 아주 지방이 많고 영양분이 높은 생선입니다. 훈제하면 맛이 좋아집니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "chinook salmon"
 msgid_plural "chinook salmons"
-msgstr[0] ""
+msgstr[0] "치누크 연어"
 
 #. ~ Description for chinook salmon
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A Chinook Salmon.  A very fatty, nutritious fish.  Tastes great smoked."
-msgstr ""
+msgstr "치누크 연어는 아주 지방이 많고 영양분이 높은 생선입니다. 훈제하면 맛이 좋아집니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "coho salmon"
 msgid_plural "coho salmons"
-msgstr[0] ""
+msgstr[0] "코호 연어"
 
 #. ~ Description for coho salmon
 #: lang/json/MONSTER_from_json.py
 msgid "A Coho Salmon.  A very fatty, nutritious fish.  Tastes great smoked."
-msgstr ""
+msgstr "코호 연어는 아주 지방이 많고 영양분이 높은 생선입니다. 훈제하면 맛이 좋아집니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "whitefish"
 msgid_plural "whitefish"
-msgstr[0] ""
+msgstr[0] "화이트피시"
 
 #. ~ Description for {'str': 'whitefish', 'str_pl': 'whitefish'}
 #: lang/json/MONSTER_from_json.py
@@ -51821,41 +53506,41 @@ msgstr "뱅어. 연어와 밀접한 관계가 있습니다. 누군가는 훈제
 #: lang/json/MONSTER_from_json.py
 msgid "largemouth bass"
 msgid_plural "largemouth bass"
-msgstr[0] ""
+msgstr[0] "큰입우럭"
 
 #. ~ Description for {'str': 'largemouth bass', 'str_pl': 'largemouth bass'}
 #: lang/json/MONSTER_from_json.py
 msgid "A Largemouth Bass.  Very popular with sports fishermen."
-msgstr ""
+msgstr "큰입 배스는 스포츠 낚시꾼들에게 인기가 높습니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "smallmouth bass"
 msgid_plural "smallmouth bass"
-msgstr[0] ""
+msgstr[0] "작은입우럭"
 
 #. ~ Description for {'str': 'smallmouth bass', 'str_pl': 'smallmouth bass'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A Smallmouth Bass.  Being intolerant to pollution in the water, smallmouth "
 "bass are a good indicator of how clean it is."
-msgstr ""
+msgstr "작은입 배스는 수질오염에 민감해 물의 오염도를 측정하는 좋은 지표가 됩니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "striped bass"
 msgid_plural "striped bass"
-msgstr[0] ""
+msgstr[0] "줄무늬농어"
 
 #. ~ Description for {'str': 'striped bass', 'str_pl': 'striped bass'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A Striped Bass.  Mostly a salt water fish, they migrate to fresher water to "
 "spawn."
-msgstr ""
+msgstr "줄무늬 배스는 바다에서 주로 살며 번식하기 위해 민물에 올라옵니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "white bass"
 msgid_plural "white bass"
-msgstr[0] ""
+msgstr[0] "화이트 배스"
 
 #. ~ Description for {'str': 'white bass', 'str_pl': 'white bass'}
 #: lang/json/MONSTER_from_json.py
@@ -51867,14 +53552,14 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "perch"
 msgid_plural "perches"
-msgstr[0] ""
+msgstr[0] "민물 농어"
 
 #. ~ Description for {'str': 'perch', 'str_pl': 'perches'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A small spritely Perch.  A very bony fish, still got some tasty meat on it "
 "though."
-msgstr ""
+msgstr "작고 힘이 넘치는 농어. 뼈가 많지만 뼈에 붙은 살점이 맛있습니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "walleye"
@@ -52126,10 +53811,8 @@ msgstr[0] ""
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
+"off in popularity… and price."
 msgstr ""
-"한때는 못 먹는 해충 정도로 여겨졌지만, 몇몇 마케팅의 귀재들이 별미라고 포장하여 사람들에게 판매하면서 인기가 하늘로 치솟았습니다... "
-"가격도 함께요."
 
 #: lang/json/MONSTER_from_json.py
 msgid "crayfish"
@@ -52140,8 +53823,8 @@ msgstr[0] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
-msgstr "잔뜩 잡아서 큼직한 냄비에 한 가득 물을 끓인 다음, 매콤한 양념을 약간 넣어 마무리하면..."
+"water, and some spicy seasonings…"
+msgstr ""
 
 #: lang/json/MONSTER_from_json.py
 msgid "Blinky"
@@ -53354,8 +55037,8 @@ msgstr[0] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
-msgstr "지렁이같은 꼬리와 긴 수염과 구슬같은 눈을 가진 설치류 동물. 찍찍거리는 소리는 아마... 배고픔을 표현하는 것 같다."
+"makes it sound… hungry."
+msgstr ""
 
 #: lang/json/MONSTER_from_json.py
 msgid "lamb"
@@ -53668,7 +55351,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "scarred zombie"
 msgid_plural "scarred zombies"
-msgstr[0] ""
+msgstr[0] "흉터 좀비"
 
 #. ~ Description for scarred zombie
 #: lang/json/MONSTER_from_json.py
@@ -53779,7 +55462,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "gasoline zombie"
 msgid_plural "gasoline zombies"
-msgstr[0] ""
+msgstr[0] "휘발유 좀비"
 
 #. ~ Description for gasoline zombie
 #: lang/json/MONSTER_from_json.py
@@ -53787,6 +55470,7 @@ msgid ""
 "A huge bloated zombie that appears to have fed upon gasoline; fumes and "
 "flames escape from its mouth and fuel leaks from its waddling form."
 msgstr ""
+"휘발유를 먹은 걸로 보이는 배가 빵빵한 거대한 좀비. 가스와 화염이 입에서 뿜어져 나오고 있고 뒤뚱거리는 몸에서 기름이 새어져 나옵니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "fungal boomer"
@@ -53810,9 +55494,21 @@ msgstr[0] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
-msgstr "부머의 강화체. 입에서 흘러내리는 담즙에서도 변화가 느껴집니다."
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] ""
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
+msgstr ""
 
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
@@ -53862,7 +55558,7 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -54640,16 +56336,11 @@ msgstr[0] "샤이아 라보프"
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
-"그는 숲 속에 산다네, \n"
-"살인은 스포츠라네, \n"
-"시체는 전부 먹어치운다네, \n"
-"진짜 식인종 샤이아 라보프라네.\n"
-"(역주: 샤이아 라보프는 미국의 배우로, 실제로는 식인종이 아니다.)"
 
 #: lang/json/MONSTER_from_json.py
 msgid "shoggoth"
@@ -54692,7 +56383,7 @@ msgstr[0] ""
 msgid ""
 "Distorted outgrowths of calcified bone plates cover this zombie's rotten "
 "skin.  Joints and cracks around its body ooze with black goo."
-msgstr ""
+msgstr "뒤틀리게 자라난 석회화된 뼈 판이 이 좀비의 썩어가는 가죽을 덮고 있습니다. 관절과 금이 간 곳에서 검은 점액이 흐릅니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "skeletal shocker"
@@ -54706,6 +56397,7 @@ msgid ""
 "Underneath, its flesh glows and crackles with the occasional jolt of "
 "electricity."
 msgstr ""
+"무겁고, 삐죽삐죽한 뼈 판이 이 좀비의 몸 바깥으로 자라나 있습니다. 그 아래에서 살이 빛나고 있고 가끔 전기 충격으로 빠직거립니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "sludge crawler"
@@ -54884,7 +56576,7 @@ msgstr "검은 곰의 눈에는 어둡고 기름진 액체가 스며들고, 살
 #: lang/json/MONSTER_from_json.py lang/json/snippet_from_json.py
 msgid "zombie"
 msgid_plural "zombies"
-msgstr[0] ""
+msgstr[0] "좀비"
 
 #. ~ Description for zombie
 #: lang/json/MONSTER_from_json.py
@@ -54901,7 +56593,7 @@ msgstr[0] ""
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr ""
@@ -54909,7 +56601,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "acidic zombie"
 msgid_plural "acidic zombies"
-msgstr[0] ""
+msgstr[0] "산성 좀비"
 
 #. ~ Description for acidic zombie
 #: lang/json/MONSTER_from_json.py
@@ -54933,7 +56625,7 @@ msgstr "뒤틀리고 부풀어오른 인간 시체. 입이 마치 악어 주둥
 #: lang/json/MONSTER_from_json.py
 msgid "brainless zombie"
 msgid_plural "brainless zombies"
-msgstr[0] ""
+msgstr[0] "머리 없는 좀비"
 
 #. ~ Description for brainless zombie
 #: lang/json/MONSTER_from_json.py
@@ -54943,11 +56635,13 @@ msgid ""
 "flesh you can see that its face and brain are gone, though its ears are "
 "intact."
 msgstr ""
+"다른 좀비와 같으나 이목구비와 해골이 날아갔습니다. 무엇이 이런 피해를 준 건지는 잘 모르지만, 살 조각들 사이에서 얼굴과 뇌가 사라진 "
+"걸 볼 수 있습니다. 귀는 아직 붙어 있습니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie brute"
 msgid_plural "zombie brutes"
-msgstr[0] ""
+msgstr[0] "브루트 좀비"
 
 #. ~ Description for zombie brute
 #: lang/json/MONSTER_from_json.py
@@ -54958,7 +56652,7 @@ msgstr "몸 전체가 부풀어 오른 근육과 곪은 상처로 가득한 좀
 #: lang/json/MONSTER_from_json.py
 msgid "zombie wrestler"
 msgid_plural "zombie wrestlers"
-msgstr[0] ""
+msgstr[0] "레슬러 좀비"
 
 #. ~ Description for zombie wrestler
 #: lang/json/MONSTER_from_json.py
@@ -54970,7 +56664,7 @@ msgstr "잘 단련된 보디빌더 사이즈의 끈적끈적한 곪은 근육 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie nightstalker"
 msgid_plural "zombie nightstalkers"
-msgstr[0] ""
+msgstr[0] "나이트스토커 좀비"
 
 #. ~ Description for zombie nightstalker
 #: lang/json/MONSTER_from_json.py
@@ -55011,7 +56705,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "zombie cop"
 msgid_plural "zombie cops"
-msgstr[0] ""
+msgstr[0] "경찰 좀비"
 
 #. ~ Description for zombie cop
 #: lang/json/MONSTER_from_json.py
@@ -55022,7 +56716,7 @@ msgstr "노후되어 거의 부서진 시위 진압용 방어구로 무장한 
 #: lang/json/MONSTER_from_json.py
 msgid "corrosive zombie"
 msgid_plural "corrosive zombies"
-msgstr[0] ""
+msgstr[0] "부식성 좀비"
 
 #. ~ Description for corrosive zombie
 #: lang/json/MONSTER_from_json.py
@@ -55041,7 +56735,7 @@ msgstr "부식성 좀비가 산성액을 뿌립니다!"
 #: lang/json/MONSTER_from_json.py
 msgid "crawling zombie"
 msgid_plural "crawling zombies"
-msgstr[0] ""
+msgstr[0] "기어다니는 좀비"
 
 #. ~ Description for crawling zombie
 #: lang/json/MONSTER_from_json.py
@@ -55053,31 +56747,23 @@ msgstr "팔을 이용해 기어다니는 인간 시체 덩어리. 다리는 쓸
 #: lang/json/MONSTER_from_json.py
 msgid "zombie dancer"
 msgid_plural "zombie dancers"
-msgstr[0] ""
+msgstr[0] "좀비 댄서"
 
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
 msgstr ""
-"불결한 악취가 사방에 있네\n"
-"그것은 4만 년 동안의 악취\n"
-"무덤마다 있는 소름 끼치는 구울\n"
-"그들이 다가오고 있네, 당신의 운명을 결정짓기 위해!\n"
-"\n"
-"이 춤추는 좀비는 당신을 전혀 신경 쓰지 않는데, 마치 근처의 무언가가 이 좀비를 조종하고 있는 것처럼 보인다.\n"
-"\n"
-"(역주: 마이클 잭슨의 앨범 'Thriller' 수록곡 'Thriller'의 가사 중 일부.)"
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie dog"
 msgid_plural "zombie dogs"
-msgstr[0] ""
+msgstr[0] "좀비 개"
 
 #. ~ Description for zombie dog
 #: lang/json/MONSTER_from_json.py
@@ -55089,7 +56775,7 @@ msgstr "변형된 채로 움직이는 개의 시체로, 그들의 두 발 달린
 #: lang/json/MONSTER_from_json.py
 msgid "listener zombie"
 msgid_plural "listener zombies"
-msgstr[0] ""
+msgstr[0] "듣는 좀비"
 
 #. ~ Description for listener zombie
 #: lang/json/MONSTER_from_json.py
@@ -55099,11 +56785,13 @@ msgid ""
 "sides, enormous and unsettling.  Thin slits at the front suggest it may be "
 "able to see."
 msgstr ""
+"이 좀비의 머리는 한번 분명하게 파괴되었으나, 얼굴 조각의 틈이 특이한 회색 점액으로 채워지고 있습니다. 거대한 인간의 귀가 옆에 "
+"불안하게 걸려 있습니다. 앞쪽의 얇고 긴 구멍으로 볼 수 있을 거 같습니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "shocker zombie"
 msgid_plural "shocker zombies"
-msgstr[0] ""
+msgstr[0] "쇼커 좀비"
 
 #. ~ Description for shocker zombie
 #: lang/json/MONSTER_from_json.py
@@ -55113,7 +56801,7 @@ msgstr "피부가 창백하고 푸른 인간 시체로, 주변에 전기가 파
 #: lang/json/MONSTER_from_json.py
 msgid "fat zombie"
 msgid_plural "fat zombies"
-msgstr[0] ""
+msgstr[0] "뚱뚱한 좀비"
 
 #. ~ Description for fat zombie
 #: lang/json/MONSTER_from_json.py
@@ -55137,7 +56825,7 @@ msgstr "뼈로 된 판과 여기저기 튀어나온 뼈 돌기가 있는 시커
 #: lang/json/MONSTER_from_json.py
 msgid "firefighter zombie"
 msgid_plural "firefighter zombies"
-msgstr[0] ""
+msgstr[0] "소방관 좀비"
 
 #. ~ Description for firefighter zombie
 #: lang/json/MONSTER_from_json.py
@@ -55150,7 +56838,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "fungal zombie"
 msgid_plural "fungal zombies"
-msgstr[0] ""
+msgstr[0] "진균체 좀비"
 
 #. ~ Description for fungal zombie
 #: lang/json/MONSTER_from_json.py
@@ -55162,7 +56850,7 @@ msgstr "한때는 인간이었지만, 진균체가 입, 눈, 다른 모든 구
 #: lang/json/MONSTER_from_json.py
 msgid "bloated zombie"
 msgid_plural "bloated zombies"
-msgstr[0] ""
+msgstr[0] "블로트 좀비"
 
 #. ~ Description for bloated zombie
 #: lang/json/MONSTER_from_json.py
@@ -55246,7 +56934,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "bloated fungal zombie"
 msgid_plural "bloated fungal zombies"
-msgstr[0] ""
+msgstr[0] "블로트 진균체 좀비"
 
 #. ~ Description for bloated fungal zombie
 #: lang/json/MONSTER_from_json.py
@@ -55259,7 +56947,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "grabber zombie"
 msgid_plural "grabber zombies"
-msgstr[0] ""
+msgstr[0] "그래버 좀비"
 
 #. ~ Description for grabber zombie
 #: lang/json/MONSTER_from_json.py
@@ -55273,7 +56961,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "grappler zombie"
 msgid_plural "grappler zombies"
-msgstr[0] ""
+msgstr[0] "그래플러 좀비"
 
 #. ~ Description for grappler zombie
 #: lang/json/MONSTER_from_json.py
@@ -55287,7 +56975,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "hazmat zombie"
 msgid_plural "hazmat zombies"
-msgstr[0] ""
+msgstr[0] "화생방 좀비"
 
 #. ~ Description for hazmat zombie
 #: lang/json/MONSTER_from_json.py
@@ -55299,7 +56987,7 @@ msgstr "몸 전체가 보호복으로 둘러싸인 좀비. 비틀거리며 주
 #: lang/json/MONSTER_from_json.py
 msgid "zombie hollow"
 msgid_plural "zombie hollows"
-msgstr[0] ""
+msgstr[0] "할로우 좀비"
 
 #. ~ Description for zombie hollow
 #: lang/json/MONSTER_from_json.py
@@ -55317,7 +57005,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "zombie hulk"
 msgid_plural "zombie hulks"
-msgstr[0] ""
+msgstr[0] "헐크 좀비"
 
 #. ~ Description for zombie hulk
 #: lang/json/MONSTER_from_json.py
@@ -55348,21 +57036,16 @@ msgstr[0] ""
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
-"아무리 정신 차리려 애를 써 보지만, \n"
-"몸은 사정없이 떨려오기 시작하네. \n"
-"왜냐하면 한낱 인간은 \n"
-"사악한 공포 앞에선 어쩔 수 없으니까.\n"
-"(역주: 마이클 잭슨의 앨범 Thriller의 수록곡 Thriller의 가사 일부.)"
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie snapper"
 msgid_plural "zombie snappers"
-msgstr[0] ""
+msgstr[0] "도미 좀비"
 
 #. ~ Description for zombie snapper
 #: lang/json/MONSTER_from_json.py
@@ -55374,7 +57057,7 @@ msgstr "일렬로 늘어선 이빨과 악어와 비슷한 주둥이를 지닌 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie master"
 msgid_plural "zombie masters"
-msgstr[0] ""
+msgstr[0] "좀비 마스터"
 
 #. ~ Description for zombie master
 #: lang/json/MONSTER_from_json.py
@@ -55392,7 +57075,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "zombie necromancer"
 msgid_plural "zombie necromancers"
-msgstr[0] ""
+msgstr[0] "네크로맨서 좀비"
 
 #. ~ Description for zombie necromancer
 #: lang/json/MONSTER_from_json.py
@@ -55436,7 +57119,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "decayed zombie"
 msgid_plural "decayed zombies"
-msgstr[0] ""
+msgstr[0] "부패한 좀비"
 
 #. ~ Description for decayed zombie
 #: lang/json/MONSTER_from_json.py
@@ -55460,7 +57143,7 @@ msgstr "되살아난지 얼마 지나지 않은 이 시체는 잽싸게 움직
 #: lang/json/MONSTER_from_json.py
 msgid "scorched zombie"
 msgid_plural "scorched zombies"
-msgstr[0] ""
+msgstr[0] "반쯤 탄 좀비"
 
 #. ~ Description for scorched zombie
 #: lang/json/MONSTER_from_json.py
@@ -55473,7 +57156,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "screecher zombie"
 msgid_plural "screecher zombies"
-msgstr[0] ""
+msgstr[0] "괴성 좀비"
 
 #. ~ Description for screecher zombie
 #: lang/json/MONSTER_from_json.py
@@ -55486,7 +57169,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "shady zombie"
 msgid_plural "shady zombies"
-msgstr[0] ""
+msgstr[0] "셰이디 좀비"
 
 #. ~ Description for shady zombie
 #: lang/json/MONSTER_from_json.py
@@ -55500,7 +57183,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "shrieker zombie"
 msgid_plural "shrieker zombies"
-msgstr[0] ""
+msgstr[0] "비명 좀비"
 
 #. ~ Description for shrieker zombie
 #: lang/json/MONSTER_from_json.py
@@ -55512,7 +57195,7 @@ msgstr "흉곽이 부어오르고 턱이었을 부분에는 큰 구멍이 뚫려
 #: lang/json/MONSTER_from_json.py
 msgid "skull zombie"
 msgid_plural "skull zombies"
-msgstr[0] ""
+msgstr[0] "해골 좀비"
 
 #. ~ Description for skull zombie
 #: lang/json/MONSTER_from_json.py
@@ -55527,7 +57210,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "smoker zombie"
 msgid_plural "smoker zombies"
-msgstr[0] ""
+msgstr[0] "스모커 좀비"
 
 #. ~ Description for smoker zombie
 #: lang/json/MONSTER_from_json.py
@@ -55539,19 +57222,19 @@ msgstr "새까맣고 뒤틀린 나체상태의 인간 시체로, 살갗이 떨
 #: lang/json/MONSTER_from_json.py
 msgid "pollinator zombie"
 msgid_plural "pollinator zombies"
-msgstr[0] ""
+msgstr[0] "꽃가루 좀비"
 
 #. ~ Description for pollinator zombie
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Every breath of this crooked, fungus-ridden zombie emits a fine dust of "
 "spores, and it constantly looks like it's emerging from a cloud of myst."
-msgstr ""
+msgstr "이 비뚤어지고 진균이 들끓는 좀비가 숨을 쉴 때마다 포자 먼지를 내뿜으며, 계속 안개 구름에서 나오는 것 처럼 보입니다."
 
 #: lang/json/MONSTER_from_json.py
 msgid "spitter zombie"
 msgid_plural "spitter zombies"
-msgstr[0] ""
+msgstr[0] "스피터 좀비"
 
 #. ~ Description for spitter zombie
 #: lang/json/MONSTER_from_json.py
@@ -55566,7 +57249,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "survivor zombie"
 msgid_plural "survivor zombies"
-msgstr[0] ""
+msgstr[0] "생존자 좀비"
 
 #. ~ Description for survivor zombie
 #: lang/json/MONSTER_from_json.py
@@ -55578,7 +57261,7 @@ msgstr "아직도 누더기가 된 급조 방어구를 입고 조각난 무기
 #: lang/json/MONSTER_from_json.py
 msgid "swimmer zombie"
 msgid_plural "swimmer zombies"
-msgstr[0] ""
+msgstr[0] "스위머 좀비"
 
 #. ~ Description for swimmer zombie
 #: lang/json/MONSTER_from_json.py
@@ -55590,7 +57273,7 @@ msgstr "매끈하고 반짝거리는 인간의 시체. 손발에 물갈퀴가 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie technician"
 msgid_plural "zombie technicians"
-msgstr[0] ""
+msgstr[0] "기술자 좀비"
 
 #. ~ Description for zombie technician
 #: lang/json/MONSTER_from_json.py
@@ -55616,7 +57299,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "tough zombie"
 msgid_plural "tough zombies"
-msgstr[0] ""
+msgstr[0] "강한 좀비"
 
 #. ~ Description for tough zombie
 #: lang/json/MONSTER_from_json.py
@@ -56302,7 +57985,7 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "zombie grenadier"
 msgid_plural "zombie grenadiers"
-msgstr[0] ""
+msgstr[0] "척탄병 좀비"
 
 #. ~ Description for zombie grenadier
 #: lang/json/MONSTER_from_json.py
@@ -56788,8 +58471,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
 msgstr[0] ""
 
 #. ~ Description for {'str': 'animatronic sheep', 'str_pl': 'animatronic
@@ -57333,20 +59016,22 @@ msgid "The black pudding burns you with acid!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
+msgid "krabgek"
+msgid_plural "krabgeks"
 msgstr[0] ""
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
 msgstr ""
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
+msgid "The krabgek gazes at %3$s!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -57390,8 +59075,44 @@ msgstr[0] ""
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] ""
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] ""
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] ""
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -59259,9 +60980,9 @@ msgid "Reveals an area around you on the overmap"
 msgstr ""
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
-msgstr "주변 지역에 대한 환상을 보았습니다..."
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
+msgstr ""
 
 #: lang/json/SPELL_from_json.py
 msgid "Artifact Firestorm"
@@ -59466,8 +61187,8 @@ msgstr ""
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -59505,7 +61226,7 @@ msgstr ""
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -59554,6 +61275,20 @@ msgstr ""
 msgid "Translocates the user to an attuned gate."
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr ""
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr ""
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr ""
@@ -59603,7 +61338,7 @@ msgstr ""
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -59760,7 +61495,7 @@ msgstr ""
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr ""
 
@@ -59771,8 +61506,8 @@ msgstr ""
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -59819,8 +61554,8 @@ msgstr ""
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -59846,6 +61581,10 @@ msgstr ""
 msgid "Lava Bomb"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr ""
@@ -59853,7 +61592,7 @@ msgstr ""
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr ""
@@ -59865,9 +61604,9 @@ msgstr ""
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -59940,7 +61679,7 @@ msgstr ""
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -59983,8 +61722,8 @@ msgstr ""
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py lang/json/effects_from_json.py
@@ -60003,6 +61742,15 @@ msgstr ""
 msgid "Fox's Cunning"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr ""
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr ""
@@ -60042,8 +61790,8 @@ msgstr ""
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -60104,8 +61852,8 @@ msgstr ""
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -60132,6 +61880,10 @@ msgstr ""
 msgid "Mirror Image"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr ""
@@ -60628,6 +62380,44 @@ msgstr ""
 "지속성, 밝기, 크기, 배터리팩을 효율적으로 만든 강화된 LED 헤드 랜턴.머리에 쓰거나 헬멧에 달 수 있도록 조절할 수 있는 끈이 "
 "달려있습니다. 지속적으로 배터리를 소모하고 있습니다. 사용(a)하면 꺼집니다."
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] ""
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] ""
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -60708,8 +62498,8 @@ msgstr[0] ""
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
 
@@ -61673,11 +63463,11 @@ msgstr "사격용 이어머프의 배터리가 다 되었다."
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
 msgstr ""
-"총잡이들이 선호하는 귀마개 한 쌍입니다. 귀마개가 꺼져있습니다. 배터리로 충전된다고 가정할 때 특정 데시벨 양 이상의 소리를 차단합니다."
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -62102,6 +63892,196 @@ msgid ""
 "power."
 msgstr ""
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] ""
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] ""
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] ""
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] ""
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr ""
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] ""
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] ""
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] ""
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] ""
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] ""
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] ""
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] ""
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] ""
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] ""
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -62418,9 +64398,9 @@ msgstr[0] ""
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
 
@@ -62539,11 +64519,9 @@ msgstr[0] "투시막대"
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
 
 #: lang/json/TOOL_from_json.py
 msgid "boulder anvil"
@@ -62836,7 +64814,7 @@ msgstr "%s의 도화선에 불을 붙였다."
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr ""
@@ -62856,8 +64834,8 @@ msgstr "이미 도화선에 불을 붙였다. 가만히 서서 뭐하는 거야?
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -62868,7 +64846,7 @@ msgstr[0] ""
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
@@ -62882,8 +64860,8 @@ msgstr[0] ""
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr ""
 
@@ -62902,8 +64880,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -62915,8 +64893,8 @@ msgstr[0] ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -62926,9 +64904,9 @@ msgstr[0] ""
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "빛"
 
@@ -62961,7 +64939,7 @@ msgstr ""
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
+"  The face shifts."
 msgstr ""
 
 #. ~ Description for battle axe
@@ -63098,6 +65076,26 @@ msgid ""
 "fuse stuck inside of it."
 msgstr "검은 화약으로 가득 채워진 깡통, 안에 불붙은 도화선이 박혀 있다."
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] "간이 조리기구 (불붙음)"
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "불씨가 꺼졌다."
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -63319,8 +65317,8 @@ msgstr[0] ""
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py lang/json/furniture_from_json.py
@@ -63331,8 +65329,8 @@ msgstr[0] ""
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -63667,9 +65665,9 @@ msgstr[0] "전동칼 (꺼짐)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
-msgstr "전동 정육 절단기. 두개의 톱칼날이 진동해서 살아 있는 닭을 치킨으로 만들어 줍니다... 좀비도 포함됩니다!"
+msgstr ""
 
 #: lang/json/TOOL_from_json.py
 msgid "electric carver (on)"
@@ -63835,7 +65833,7 @@ msgstr[0] ""
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr ""
@@ -64269,10 +66267,8 @@ msgstr[0] "전자수갑"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-"경찰 로봇과 시위 진압 로봇이 범죄자를 구속할 때 사용하는 전자 수갑. 수갑에서 지속적으로 나오는 경보음이 착용자가 체포된 범죄자임을 다른 인간 경찰에게 명확하게 알리는 역할을 합니다. 경찰이 도착할 때까지 기다리시고, 도망치거나 수갑을 벗으려고 시도하지 마세요. 전자 수갑이 전기 충격을 가할 것입니다.\n"
-"그런데 연락을 받고 올 만한 경찰이 전부 언데드가된터라, 당신은 아주 오랫동안 기다려야 할 것 같네요. 조금 창의력을 발휘하지 않는다면 말입니다…"
 
 #: lang/json/TOOL_from_json.py
 msgid "entrenching tool"
@@ -66151,8 +68147,8 @@ msgstr[0] ""
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -67041,10 +69037,8 @@ msgstr "흑색화약 폭약의 뇌관을 작동시켰다. 여기서 빨리 벗
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr ""
-"검은색 화약과 고철로 가득 찬 대형 플라스틱 통으로 구성된 수제 폭발장치. 긴 도화선이 장착됐습니다. 도화선에 불을 붙여 사용합니다. 몇"
-" 분 안에 폭발할 것입니다."
 
 #: lang/json/TOOL_from_json.py
 msgid "active black gunpowder charge"
@@ -67551,36 +69545,6 @@ msgid "hobo stove"
 msgid_plural "hobo stoves"
 msgstr[0] "간이 조리기구"
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr ""
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "불씨가 필요하다!"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr ""
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] "간이 조리기구 (불붙음)"
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "불씨가 꺼졌다."
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -67747,8 +69711,8 @@ msgstr[0] ""
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -68094,7 +70058,7 @@ msgstr ""
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -68111,7 +70075,7 @@ msgstr[0] ""
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -68197,9 +70161,9 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -68249,7 +70213,7 @@ msgstr ""
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -68277,8 +70241,8 @@ msgstr ""
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
@@ -68303,7 +70267,7 @@ msgstr ""
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
 msgstr ""
@@ -68326,8 +70290,8 @@ msgstr ""
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
 msgstr ""
 
@@ -68349,8 +70313,8 @@ msgstr ""
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
 msgstr ""
 
@@ -68373,9 +70337,9 @@ msgstr ""
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -68396,7 +70360,7 @@ msgstr ""
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
 msgstr ""
@@ -68448,7 +70412,7 @@ msgstr ""
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -68477,8 +70441,8 @@ msgstr ""
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
@@ -68503,10 +70467,10 @@ msgstr ""
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
 
@@ -68826,7 +70790,7 @@ msgstr[0] ""
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
+"of a stick.  However it's quite fragile."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -68918,6 +70882,20 @@ msgid ""
 " be deadly in either the right hands or when attached as a bayonet."
 msgstr "군용 대검. 가볍고 극히 예리하며, 숙달된 사람이 사용하면 치명적입니다. 총기에 부착해 총검으로 쓸 수도 있습니다."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] ""
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -69239,6 +71217,20 @@ msgid ""
 " of a firearm or crossbow converting it into a pike."
 msgstr "총검은 쇠뇌 또는 화기 앞에 날카로운 가시 형태로 장착하여 넓게 휘두를 수 있는 무기입니다. "
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] ""
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -69336,6 +71328,54 @@ msgid ""
 "light for its size."
 msgstr "일본의 거대한 곡선형 양손도. 크기에 비하면 놀랍도록 가볍습니다."
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] ""
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] ""
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] ""
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -69685,6 +71725,32 @@ msgid ""
 "reinforce plastic items."
 msgstr "플라스틱 조각. 플라스틱 재질의 물건을 만들거나, 수리하거나, 강화하는데 사용할 수 있다."
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] ""
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] ""
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -70127,10 +72193,8 @@ msgstr[0] "양방향 라디오"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
 msgstr ""
-"송수신장치가 있는 라디오. 이걸 가진 사람들은 서로 연락할 수 있습니다. 불행하게도 요즘은 쓰는 사람이 아무도 없는 것 같습니다."
 
 #: lang/json/TOOL_from_json.py
 msgid "remote vehicle controller"
@@ -70286,7 +72350,7 @@ msgstr[0] ""
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
@@ -70467,7 +72531,7 @@ msgstr[0] "굵은 케이블"
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr ""
 
@@ -70855,7 +72919,7 @@ msgstr ""
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr ""
 
@@ -70884,7 +72948,7 @@ msgstr[0] ""
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -71844,11 +73908,6 @@ msgid ""
 "This is a stick that has been cut into a trigger mechanism for a snare trap."
 msgstr "올가미 덫에 사용하기 위해 손질한 막대기."
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] "레바테인"
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -72941,6 +75000,17 @@ msgid ""
 " terribly when not on a rail."
 msgstr ""
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr ""
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr ""
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "오토바이 바퀴"
@@ -73297,6 +75367,10 @@ msgstr ""
 msgid "cranking"
 msgstr ""
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr ""
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr ""
@@ -73577,6 +75651,10 @@ msgstr "화살"
 msgid "pebbles"
 msgstr "조약돌"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "돌"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr ""
@@ -73932,7 +76010,7 @@ msgstr "합금 보호판-팔"
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -73967,7 +76045,7 @@ msgstr "합금 보호판-다리"
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -74276,15 +76354,20 @@ msgstr "에탄올 반응로"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
-msgstr "아주 효과적인 반응을 통해 알코올을 연료로 사용할 수 있습니다. 하지만 여전히 술에 취하며, 숙취로 고통받을 수도 있습니다."
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
+msgstr ""
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "대기 증류장치"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr ""
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "다이아몬드 각막"
@@ -74528,10 +76611,10 @@ msgstr ""
 "작동을 중단하면 좋지 못한 부작용이 생길 수 있습니다."
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "소형 화염방사기"
+msgid "Finger Lighter"
+msgstr ""
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -74558,8 +76641,8 @@ msgstr "전자석 장치"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -74618,8 +76701,8 @@ msgstr "재생 나노로봇"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -74655,10 +76738,8 @@ msgstr "고장난 바이오닉입니다. 가끔씩 시끄러운 소음을 냅니
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
+"Increases mouth encumbrance by ten."
 msgstr ""
-"어떻게 이 CBM이 코에 설치된 건지는 잘 모르겠지만, 잘못 설치된 이 바이오닉이 숨쉬기를 어렵게 만들지만 않았다면 그런건 딱히 "
-"상관없었을 텐데요. 입의 방해도가 1 상승합니다."
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -74689,7 +76770,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
+"mild optic neuropathy.  Increases eye encumbrance by ten."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -74722,7 +76803,7 @@ msgstr "전력 저장소"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
 msgstr ""
@@ -74733,8 +76814,7 @@ msgstr "전력 저장소 Mk. II"
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
 msgstr ""
 
 #. ~ Description for Power Overload
@@ -75022,10 +77102,8 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
+" by ten, while failing to improve your ability to hold objects whatsoever."
 msgstr ""
-"잘못 설치된 이 바이오닉은 당신의 손가락을 (당신이 제발 그러지 않기를 바랄 때조차도) 무언가를 꽉 붙잡고 (당신이 붙잡았을 때조차도) "
-"놓지못하게 합니다. 손의 방해도가 2 상승하며, 물체를 붙잡아야 하는 모든 행동의 실패 가능성이 높아집니다."
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -75154,8 +77232,8 @@ msgstr ""
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
@@ -75208,7 +77286,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr ""
@@ -75895,6 +77973,18 @@ msgstr ""
 msgid "Make Woodchip Floor"
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr ""
@@ -76545,6 +78635,10 @@ msgstr ""
 msgid "Build a radio tower console."
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr ""
@@ -77246,6 +79340,42 @@ msgstr ""
 msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr "당신이 가지고 있는 달콤한 꿀을 두고 벌들이 다투는 꿈을 꾸었습니다."
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr ""
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -78545,6 +80675,25 @@ msgstr "손의 떨림이 도무지 멈추질 않는다."
 msgid "You tremble"
 msgstr "몸이 떨린다."
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr ""
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr ""
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr ""
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "출혈"
@@ -79450,6 +81599,26 @@ msgstr "신진대사가 불안정해졌다."
 msgid "Your metabolism becomes more stable."
 msgstr "신진대사의 균형이 바로 잡히고 있습니다."
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr ""
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "빛이 남"
@@ -79692,6 +81861,17 @@ msgstr ""
 msgid "You've been struck by lightning, and feel... different."
 msgstr ""
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr ""
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr ""
@@ -80301,6 +82481,192 @@ msgid ""
 "the commotion."
 msgstr ""
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr ""
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -80520,6 +82886,167 @@ msgid ""
 "weeks after being dragged to her cell she died from dehydration."
 msgstr ""
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr ""
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "당신의 동료들"
@@ -80675,10 +83202,10 @@ msgid "A small family surviving on their generational land."
 msgstr ""
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
+msgid "New England Church Community"
 msgstr ""
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -80716,143 +83243,311 @@ msgstr ""
 msgid "Dusty"
 msgstr ""
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "It's dusty.  Has no effect - obsolete fault."
+msgstr ""
+
+#. ~ name of mending method for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "Wipe clean"
+msgstr ""
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
+#, python-format
+msgid "You clean you %s."
 msgstr ""
 
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr ""
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr ""
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr ""
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr ""
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
 
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr ""
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr ""
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr ""
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr ""
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr ""
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
 
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
 msgstr ""
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "장착된 발전기의 동작에 필요합니다."
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr ""
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr ""
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr "낮은 온도에서 시동을 걸 때 도움이 됩니다."
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr ""
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "알맞은 열쇠 없이 차량에 시동을 걸지 못하도록 합니다."
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr ""
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr ""
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr ""
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr ""
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr ""
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
 msgstr "수명이 다된 필터는 연소 효율을 떨어뜨리며 배기가스량도 늘어납니다."
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr ""
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
 msgstr "수명이 다된 필터는 성능저하를 일으키며 엔진 역화 가능성도 커집니다."
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr ""
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr "차량 탱크에서 휘발유를 끌어오기 위해 필요합니다."
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr ""
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr "외부 방열기 또는 히트싱크에 워터 펌프가 필요합니다."
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr ""
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "엔진에 시동을 걸기 위해 필요합니다."
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr ""
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -81339,6 +84034,10 @@ msgstr ""
 msgid "smoke vent"
 msgstr ""
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr ""
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
 msgstr ""
@@ -81525,11 +84224,11 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "쾅!"
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "쿵."
 
@@ -81642,7 +84341,8 @@ msgstr "동상"
 msgid "A carved statue made of stone."
 msgstr ""
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "쿵."
 
@@ -81653,7 +84353,7 @@ msgstr "마네킹"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
 msgstr ""
 
@@ -82042,7 +84742,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "우지끈!"
 
@@ -82055,7 +84755,7 @@ msgstr "말로스 꽃"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
+"and… delicious?"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -82484,9 +85184,9 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -82556,7 +85256,7 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -82721,7 +85421,7 @@ msgstr "런닝머신"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
+" taken apart for its… parts."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -82747,7 +85447,7 @@ msgstr "피아노"
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -82906,6 +85606,17 @@ msgstr ""
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr ""
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "게시판"
@@ -83374,7 +86085,7 @@ msgstr ""
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
 msgstr ""
 
@@ -83448,11 +86159,11 @@ msgid "This beaded curtain could be pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
+msgid "clickity clack… clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
+msgid "clickity clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -83465,7 +86176,7 @@ msgid "This beaded curtain has been pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
+msgid "clickity clack… clack… clack!"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -83609,8 +86320,7 @@ msgstr ""
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -84118,6 +86828,15 @@ msgid ""
 "blood, candles, and other small knick-knacks."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr ""
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr ""
@@ -84147,8 +86866,8 @@ msgstr "큰 문이 열렸습니다!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
-msgstr "핸들을 돌렸습니다..."
+msgid "You turn the handle…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -84167,8 +86886,8 @@ msgstr "헛간 문이 열렸습니다!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
-msgstr "밧줄을 당겼다..."
+msgid "You pull the rope…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -84202,8 +86921,8 @@ msgstr "문이 열렸다!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
-msgstr "레버를 조작했다..."
+msgid "You throw the lever…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -84387,7 +87106,7 @@ msgstr[0] "수제 활"
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -84554,9 +87273,7 @@ msgstr ""
 "작고 숨기기 쉬운 권총 같은 쇠뇌. 작은 크기와 시위거리 때문에 위력이 약해서 작은 사냥감을 잡는게 좋습니다. 이 무기에서 발사된 볼트는"
 " 재사용 확률이 높습니다."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "권총"
@@ -84721,6 +87438,17 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "던지기"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -84799,6 +87527,10 @@ msgstr ""
 "보잉이 DARPA와 함께 개발한 응집 플라즈마 화기. 고체 수소를 가열해서 플라즈마로 만든 뒤 고분자체로 감싸 확산을 막은 것을 "
 "발사합니다. 매우 높은 살상력을 내지만, 사거리가 짧습니다. UPS로 작동합니다."
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "반자동"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -84807,10 +87539,10 @@ msgstr[0] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -84825,8 +87557,7 @@ msgid ""
 " a double barrel shotgun."
 msgstr ""
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "산탄총"
@@ -84993,6 +87724,10 @@ msgid ""
 " stop fires or \"protesters\"."
 msgstr "소방차에 쓰이는 물대포. 차량에 장착해서 불을 끄거나 \"시위대\"를 향해 쏠 수 있다."
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -85259,8 +87994,8 @@ msgstr[0] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 
@@ -85350,10 +88085,6 @@ msgstr ""
 "빠르고, 안전하게 그리고 효과적으로 교체할 수 있도록 설계되었습니다. 이론적으로는 플랫폼 단독으로도 사용할 수는 있지만, 권장되지 "
 "않으며, 제품의 품질 보증이 무효가 될 수 있습니다. 또한, 시중에서 판매되는 개조 부품과는 호환되지 않습니다."
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "반자동"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -85883,8 +88614,8 @@ msgstr[0] "M24"
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
 
@@ -86032,16 +88763,16 @@ msgstr ""
 "당신을 실망하게 만듭니다."
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
-msgstr[0] "COP .38"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
+msgstr[0] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
-msgstr "소형 데린져 권총인 COP .38. 모스버그 브라우니와 유사하게 생겼습니다. 4연장 총열이 사각형 형태로 모여있습니다."
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
+msgstr ""
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -86070,17 +88801,6 @@ msgid ""
 " sight and a reinforced frame."
 msgstr "스미스 앤 웨슨 (Smith & Wesson) 사의 7연발 .38 리볼버. 고정식 조준기와 강화 프레임으로 구성되어있습니다."
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] "타우러스 프로 .38"
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr "유명한 .38구경 권총. 안전 장치 여러개가 탑재되었으며, 고품질의 고강도 강재로 제작되었습니다."
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -86143,10 +88863,21 @@ msgstr[0] ""
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
 msgid_plural "M1911A1s"
@@ -86235,9 +88966,9 @@ msgstr[0] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -86261,8 +88992,9 @@ msgstr[0] ""
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -86620,8 +89352,9 @@ msgstr[0] ""
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -87564,9 +90297,9 @@ msgstr[0] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -87577,8 +90310,8 @@ msgstr[0] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -87593,7 +90326,7 @@ msgstr[0] ""
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -87605,7 +90338,7 @@ msgstr[0] ""
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
@@ -87617,10 +90350,10 @@ msgstr[0] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
 
@@ -87632,10 +90365,10 @@ msgstr[0] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -88248,10 +90981,6 @@ msgid ""
 "and destruction it can cause."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr ""
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -89048,10 +91777,58 @@ msgstr[0] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] "이치이발"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -89154,11 +91931,6 @@ msgid ""
 "this weapon have a good chance of remaining intact for re-use."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] "이치이발"
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -90082,7 +92854,7 @@ msgstr "조준하는 동안 화살을 올려놓는 손잡이 부분의 확장 
 msgid "accessories"
 msgstr "액세서리"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "활"
@@ -90199,7 +92971,7 @@ msgstr[0] "UPS 시험용"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
+"it's a bug.  50x more UPS drain."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -90344,8 +93116,8 @@ msgstr[0] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -90368,7 +93140,7 @@ msgstr[0] ""
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
+"energy efficiency.  Decreases power consumption."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -90382,9 +93154,9 @@ msgstr[0] "고밀도 축전지"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
-msgstr "고밀도의 축전지. 사거리와 피해량을 증가시키지만 전력 소모량도 매우 증가합니다."
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
+msgstr ""
 
 #: lang/json/gunmod_from_json.py
 msgid "Leadworks magazine adapter"
@@ -90580,6 +93352,19 @@ msgid ""
 msgstr ""
 "소염기는 총구로 빠져나오는 가스를 뒤쪽으로 거슬러가도록 만든다. 반동이 감소하지만, 부피, 소음이 증가하고 정확도가 약간 감소한다."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
 msgid_plural "homemade suppressors"
@@ -90704,6 +93489,19 @@ msgstr "긴 화기의 총열 밑에 장착 가능한 쇠뇌와 발사 레일이
 msgid "rail"
 msgstr "레일"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
@@ -90715,6 +93513,18 @@ msgid ""
 "other modification prevents use of the primary sights."
 msgstr "45도 각도로 기울여져 설치된 기계식 조준기. 조준경이나 다른 개조 부품이 주 조준기를 방해할 때 사용할 수 있습니다."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
@@ -90724,6 +93534,17 @@ msgstr[0] ""
 msgid "An additional rail set at 45° for attaching a secondary optic."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
@@ -90748,6 +93569,19 @@ msgid ""
 "vibration, greatly reducing recoil and slightly increasing accuracy."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -90851,6 +93685,19 @@ msgid ""
 " mrad increments and is remarkably small and light for its magnification."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
@@ -90862,6 +93709,18 @@ msgid ""
 "crosshair."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
 msgid_plural "RS1219 scopes"
@@ -91041,6 +93900,20 @@ msgstr ""
 "양각대는 소총과 기관총에 널리 사용되어 전방 지지대의 역할을 하며 불필요한 움직임을 감소해 줍니다. 반동 제어가 크게 향상하지만, 안정된"
 " 바닥에서만 사용할 수 있고, 총기를 손에 드는데 시간이 더 걸리게 됩니다."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -91074,6 +93947,18 @@ msgid ""
 "effective as a bipod but usable under all conditions."
 msgstr "총열에 부착하는 수직 손잡이. 양각대 보다는 부족하지만 반동 제어가 크게 향상되며, 어떤 상황에서든 사용할 수있습니다."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
@@ -91134,6 +94019,19 @@ msgid ""
 msgstr ""
 "M203은 원래 M16 계열에 장착하는걸로 디자인되었지만 요즘은 대부분의 총에 장착할수 있습니다. 40mm 유탄을 발사할 수 있습니다."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
@@ -91149,6 +94047,20 @@ msgstr ""
 "M320 유탄발사기는 떨어진 정확도 대신 작은 사이즈에 커다란 유탄발사기의 기능을 모두 제공합니다. 소총에 결합하거나 개머리판을 결합해서"
 " 단독으로 쓸 수 있습니다."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "masterkey shotgun"
 msgid_plural "masterkey shotguns"
@@ -91161,6 +94073,19 @@ msgid ""
 "fired."
 msgstr "초소형 펌프액션 산탄총. 대부분의 소총 총열 밑에 장착할 수 있습니다. 최대 4발의 산탄을 장전하고 발사할 수 있습니다."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
 msgid_plural "40mm pipe launchers"
@@ -91168,9 +94093,9 @@ msgstr[0] "40mm 파이프 유탄발사기"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
-msgstr "수제 유탄발사기로 대부분의 소총에 장착 가능합니다. 40mm 유탄 한 발을 장전하고 발사 할 수 있습니다."
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
+msgstr ""
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -91197,6 +94122,19 @@ msgstr ""
 "Rivtech 사의 RM121 보조 무기 시스템은 탄창급탄식 무탄피 반자동 산탄총으로, 대부분의 소총 총열 밑에 장착할 수 있습니다. "
 "RMSA10 박스탄창을 사용합니다."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
 msgid_plural "underslung shotguns"
@@ -91208,6 +94146,19 @@ msgid ""
 "many rifles.  It allows two shotgun shells to be loaded and fired."
 msgstr "단축형 2총열 산탄총으로, 대부분의 소총의 총열 밑에 장착할 수 있습니다. 두 발을 장전하고 쏠 수 있습니다."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
 msgid_plural "LW underbarrel laser sights"
@@ -91459,6 +94410,54 @@ msgstr ""
 "전자기 가속 시스템은 전자석을 일렬로 늘어놓은 배열을 부품으로 만든것으로, 총열 앞에 부착하여 더 높은 총구 속도를 가지게 하여 살상력과"
 " 반동을 증가시키고 정확도가 감소합니다. 발사시 UPS 전원을 소모하며, 이 개조 부품 때문에 UPS 없이는 사격이 불가능합니다."
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -93399,9 +96398,10 @@ msgstr "방사선 측정"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
-msgstr "..."
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
+msgstr ""
 
 #: lang/json/item_action_from_json.py
 msgid "Control an RC car"
@@ -93980,6 +96980,13 @@ msgstr ""
 msgid "This bionic can provide power to powered armor."
 msgstr ""
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr ""
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -95481,6 +98488,7 @@ msgstr "사용자 정의색 제거"
 msgid "Load color template"
 msgstr "글자색 템플릿 불러오기"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -98028,7 +101036,7 @@ msgstr ""
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -98071,6 +101079,90 @@ msgid ""
 "Lasts 2 turns."
 msgstr ""
 
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Kung Fu"
+msgstr "호권"
+
+#. ~ Description for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
+"attacks above all else.  Your Strength determines your accuracy, and your "
+"attacks do increasing damage as you continue attacking."
+msgstr ""
+"소림사의 다섯 동물 권법 중 하나입니다. 호권은 무엇보다도 연속적이고 가차없는 공격에 초점을 맞춰, 체력이 정확도에 영향을 미칩니다. "
+"또한 계속적인 공격을 통해 피해량 보너스를 받을 수 있습니다."
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Fury"
+msgstr "호랑이의 분노"
+
+#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger's Strength"
+msgstr ""
+
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Wing Chun"
+msgstr ""
+
+#. ~ Description for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
+"learn effective techniques from the various Shaolin animal forms.  It has a "
+"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
+"sensitivity to the opponent's direction of force, and flowing around it to "
+"get back to hitting."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr ""
+
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chi-Sao Sensitivity"
+msgstr ""
+
+#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
+msgstr ""
+
 #: lang/json/martial_art_from_json.py
 msgid "Zui Quan"
 msgstr "취권"
@@ -98079,60 +101171,64 @@ msgstr "취권"
 #: lang/json/martial_art_from_json.py
 msgid ""
 "AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
 msgstr ""
-"\"취권\"으로 알려진 이 무술은 술꾼의 움직임을 재현하여 적을 혼란스럽게 만들며, 지능에 기반하여 회피 보너스를 제공합니다. 공격한 뒤"
-" 다음턴에는 얼마나 많은 공격이 날아오더라도 피해 없이 피할 수 있으며, 공격을 훌륭하게 회피해내면 지능에 기반한 공격력 보너스를 "
-"제공합니다."
 
-#. ~ Description of buff for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "지능에 비례해서 회피 능력 상승"
-
-#: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
+msgid "Zui Quan Stance"
 msgstr ""
 
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Kung Fu"
-msgstr "호권"
+msgid "Advanced Zui Quan"
+msgstr ""
 
-#. ~ Description for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
+#, no-python-format
 msgid ""
-"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
-"attacks above all else.  Your Strength determines your accuracy, and your "
-"attacks do increasing damage as you continue attacking."
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
 msgstr ""
-"소림사의 다섯 동물 권법 중 하나입니다. 호권은 무엇보다도 연속적이고 가차없는 공격에 초점을 맞춰, 체력이 정확도에 영향을 미칩니다. "
-"또한 계속적인 공격을 통해 피해량 보너스를 받을 수 있습니다."
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Fury"
-msgstr "호랑이의 분노"
+msgid "Drunken Stumble"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "공격마다 타격 피해량 +3"
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "호랑이의 힘"
+msgid "Drunken Dodging"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "체력에 의한 피해량 보너스 증가"
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Debug Mastery"
@@ -98157,29 +101253,6 @@ msgstr ""
 "+Strength bash armor, +Dexterity acid armor, +Intelligence electricity "
 "armor, +Perception fire armor."
 
-#: lang/json/martial_art_from_json.py
-msgid "Wing Chun"
-msgstr ""
-
-#. ~ Description for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
-"learn effective techniques from the various Shaolin animal forms.  It has a "
-"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
-"sensitivity to the opponent's direction of force, and flowing around it to "
-"get back to hitting."
-msgstr ""
-
-#: lang/json/martial_art_from_json.py
-msgid "Chi-Sao Sensitivity"
-msgstr ""
-
-#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
-msgstr ""
-
 #: lang/json/martial_art_from_json.py
 msgid "Bionic Combatives"
 msgstr "바이오닉 전투"
@@ -98333,12 +101406,11 @@ msgstr "두꺼비권"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
 msgstr ""
-"다섯 맹독권 중 하나입니다. 두꺼비권의 달인은 모든 공격을 막는 데 집중할 수 있습니다. 잠시 멈추고 명상하면, 방어력을 올려주지만, "
-"이동하면 집중이 풀립니다."
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -98346,8 +101418,11 @@ msgstr "두꺼비의 철가죽"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "가만히 서 있을 때 방어 +6"
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -98356,7 +101431,11 @@ msgstr ""
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -98366,38 +101445,48 @@ msgstr "살무사권"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
 msgstr ""
-"다섯 맹독권 중 하나입니다. 살무사권은 3부로 구성된 독특한 콤보를 가지고 있는데, 이 콤보는 회피로 시작하여 놀라운 내려치기와 전설적인"
-" 살무 치기 로 반격합니다."
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "살무사의 잡기"
+msgid "Viper's Patience"
+msgstr ""
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "살무사의 인내"
+msgid "Viper's Ambush"
+msgstr ""
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
+msgid "Viper's Venom"
 msgstr ""
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -98779,6 +101868,10 @@ msgstr "납"
 msgid "Leather"
 msgstr "가죽"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "유제품"
@@ -98843,6 +101936,10 @@ msgstr "초합금"
 msgid "layered carbide"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Tin"
 msgstr ""
@@ -98953,6 +102050,10 @@ msgstr ""
 msgid "Arcane Skin"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr ""
@@ -98962,7 +102063,7 @@ msgid "Sugar"
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
+msgid "Gather bones for the Brigitte.  About 8 should do it."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -102340,8 +105441,8 @@ msgstr ""
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -104961,8 +108062,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -104972,7 +108073,7 @@ msgstr ""
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
 msgstr ""
 
@@ -105095,7 +108196,7 @@ msgstr ""
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
 msgstr ""
 
@@ -105196,6 +108297,27 @@ msgid ""
 "footing."
 msgstr "당신은 다른 사람들보다 더 빨리 달릴 수 있습니다. 안정된 지면 위에서는 이동속도가 15% 더 빨라집니다."
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr ""
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr ""
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr ""
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "좋은 청력"
@@ -105686,12 +108808,10 @@ msgstr "각성제 정신증"
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
-"각성제(커피나 암페타민 같은)에 관한 특이한 내력이 있습니다. 다른 사람보다 조금 더 많이 섭취해도 부작용이 없지만, 너무 많이 "
-"섭취하면, 이상한 것들이 보이기 시작할겁니다.  "
 
 #. ~ Description for Stylish
 #: lang/json/mutation_from_json.py
@@ -105833,6 +108953,18 @@ msgid ""
 " Pentjak Silat, or Sōjutsu."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr ""
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
 msgstr "약한 체취"
@@ -106584,9 +109716,9 @@ msgstr "요정의 눈"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
-msgstr "당신의 눈은... 초록색으로 변했습니다. 그늘진 장소조차 꼼꼼하고 빠르게 살펴볼 수 있습니다. 이건 조금... 좋군요."
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Fey Vision"
@@ -107376,7 +110508,7 @@ msgstr "말로스 보균자"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
+"nose, and you have a strong desire to try some seeds and… sap?"
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -107387,7 +110519,7 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
+"tongue, and you have a strong desire to try some berries and… sap?"
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -107784,8 +110916,8 @@ msgstr "칼날 이빨"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -109024,9 +112156,9 @@ msgstr "주둥이"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
-msgstr "얼굴과 턱이... 변했다. 마스크 등은 맞지만 얼굴이 변한 게 눈에 띈다."
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Bovine Snout"
@@ -109774,10 +112906,11 @@ msgstr "변온동물"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -110069,10 +113202,8 @@ msgstr "문명이 붕괴됐다고요? 잘됐네요! 당신과 당신 친척들
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
+"every need… but how would you keep them in line?"
 msgstr ""
-"여왕이 되는 것은 좋은 일이죠. 일꾼들을 데리고 당신이 필요한 모든 것들을 끊임없이 제공받을 수 있으니까요... 하지만 어떻게 그들을 "
-"계속 유지하죠?"
 
 #. ~ Description for Plant
 #: lang/json/mutation_from_json.py
@@ -110088,9 +113219,9 @@ msgstr "친수성"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
-msgstr "그 오래된 광고가 뭐였더라, 'paint the planet'이었나? 그건 좋은 장기목표입니다만, 현재로서는..."
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Subterranean"
@@ -111734,8 +114865,8 @@ msgid "Scientist"
 msgstr "과학자"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
-msgstr "괴물들의 기원에 관한 단서를 찾고 있어..."
+msgid "I'm looking for clues concerning these monsters' origins…"
+msgstr ""
 
 #: lang/json/npc_class_from_json.py
 msgid "Bounty Hunter"
@@ -111798,7 +114929,7 @@ msgid "Real Person"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -111814,7 +114945,7 @@ msgid "Foodperson"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
@@ -111822,7 +114953,7 @@ msgid "Cyborg"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -111966,6 +115097,14 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr ""
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
+msgstr ""
+
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 #: lang/json/npc_from_json.py
 msgid "Captive"
@@ -113516,6 +116655,10 @@ msgstr "초대형 상점 천장"
 msgid "hotel parking"
 msgstr "호텔 주차장"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "호텔"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "호텔 출입구"
@@ -113885,7 +117028,7 @@ msgid "spiked trench"
 msgstr "참호 스파이크"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
+msgid "fabrication workshop survey"
 msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
@@ -113900,6 +117043,14 @@ msgstr "대장간"
 msgid "livestock survey"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr ""
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr ""
@@ -114585,6 +117736,10 @@ msgstr "사격장"
 msgid "shooting range roof"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "골프장"
@@ -115251,10 +118406,6 @@ msgstr ""
 msgid "dense urban"
 msgstr "복합건물"
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "호텔"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "학교"
@@ -115275,6 +118426,10 @@ msgstr ""
 msgid "mechanics garage"
 msgstr "자동차 정비소"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
 msgstr "하수 처리장"
@@ -119837,6 +122992,36 @@ msgid ""
 "on. This displeases you."
 msgstr ""
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -122770,11 +125955,6 @@ msgstr "발"
 msgid "MEDICAL"
 msgstr "의약품"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "저장용기"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -123760,7 +126940,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
 msgstr ""
 
@@ -123817,7 +126997,7 @@ msgstr ""
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
+"grab a pot.  Let's put it in that dining area."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -124486,7 +127666,7 @@ msgid "build 2 wood stoves"
 msgstr ""
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
+msgid "We should build a well.  This will make cooking more convenient."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -124983,6 +128163,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr ""
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -125003,8 +128359,8 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -125109,7 +128465,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
 msgstr ""
 
@@ -125119,7 +128475,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
 msgstr ""
 
@@ -125129,7 +128485,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
 msgstr ""
 
@@ -125561,7 +128917,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
+"Some benches around the outside would be nice.  Build some to the northwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -125570,7 +128926,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
+"Some benches around the outside would be nice.  Build some to the northeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -125579,7 +128935,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
+"Some benches around the outside would be nice.  Build some to the southeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -125588,7 +128944,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
+"Some benches around the outside would be nice.  Build some to the southwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -125830,6 +129186,10 @@ msgstr ""
 msgid "Central Storage Building"
 msgstr ""
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr ""
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
 msgstr ""
@@ -127199,6 +130559,44 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr ""
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -132088,13 +135486,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
+msgid "Pass some ethanol, I need to power my ethanol burner."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -132102,20 +135494,12 @@ msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
+msgid "I require ethanol for my internal power supply.  Anything on you?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -139052,7 +142436,7 @@ msgid "a static hissing sound."
 msgstr "일정한 쉬익거리는 소리."
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -139066,11 +142450,11 @@ msgid "\"Hold on, I want to pulp that zombie corpse.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
+msgid "\"Burning… from the inside…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
+msgid "\"This smell…  Don't know…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -139082,19 +142466,19 @@ msgid "a scraping noise."
 msgstr "긁히는 소리."
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
+msgid "\"No…  Stop the burning!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
+msgid "\"Hunger…  Must eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
+msgid "\"Run…  Chase…  Eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -139216,7 +142600,7 @@ msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
+msgid "\"Can't… breathe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -139229,8 +142613,8 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -139242,7 +142626,7 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -139250,11 +142634,11 @@ msgid "\"This is a dream.  This has to be a dream.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
+msgid "\"This is my life now… this is my life now… this is my life now…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
+msgid "\"Wanna go home…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -139310,7 +142694,7 @@ msgstr ""
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -139333,18 +142717,18 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -139467,7 +142851,7 @@ msgid "\"Police inbound.  Stay where you are!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -139488,8 +142872,8 @@ msgid "\"FoodPlace: It's the Calories.\""
 msgstr "\"푸드플레이스: 칼로리가 전부입니다.\""
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
-msgstr "\"먹을게 필요하시군요, 그렇죠? 그러면 저와 함께 푸드플레이스로 갑시다!!\""
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "\"FoodPlace: Edible food is OUR guarantee!\""
@@ -139556,8 +142940,8 @@ msgid "You shouldn't have done that."
 msgstr "너 그러면 안 돼."
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
-msgstr "놀자... 러시안 룰렛으로."
+msgid "Let's play… Russian roulette."
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "I hate you."
@@ -139568,8 +142952,8 @@ msgid "Go kill yourself!"
 msgstr "가서 죽어버려!"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
-msgstr "빅 브라더는 당신을 지켜보고 있다..."
+msgid "Big Brother is watching you…"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Die for me!"
@@ -139580,12 +142964,12 @@ msgid "Why won't you die?"
 msgstr "왜 죽지 않는 거야?"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
-msgstr "피는 정말... 맛있어."
+msgid "Blood…  Delicious."
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
-msgstr "나중에 보자... 지옥에서!"
+msgid "See you… IN HELL!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "AAAIEEEEEEE!"
@@ -139600,8 +142984,8 @@ msgid "What did you do with my Mommy?"
 msgstr "너 우리 엄마랑 뭔짓했어?"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
-msgstr "나랑 함께하자... 영원히!"
+msgid "Stay with me… forever!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Hey kids.  Want some candy?"
@@ -141031,6 +144415,10 @@ msgstr "수색꾼(수렵꾼) 벙커"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#: lang/json/start_location_from_json.py
+msgid "Wizard's lake retreat"
+msgstr ""
+
 #: lang/json/start_location_from_json.py
 msgid "Candy Shop"
 msgstr ""
@@ -141080,16 +144468,16 @@ msgid "You there. Quiet down. Can you hear it? The song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
+msgid "What?  What do you mean?  What song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
+msgid "So about the songs…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
 msgstr ""
 
@@ -141106,7 +144494,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141116,11 +144504,11 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
+msgid "What?  Singing bones?  What are you talking about?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141169,7 +144557,7 @@ msgid "I will bear that in mind"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141181,7 +144569,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
+msgid "End the world?  What?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141193,8 +144581,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141209,7 +144597,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
+msgid "I… thank you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141238,28 +144626,28 @@ msgid "That is all for now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgid "A song may yet be sung by you, should you wish to."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
+msgid "There is an additional song you could take on, if you'd like."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
+msgid ""
+"I know of certain bones that could be of use, if you'd like to know more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "A song may yet be sung by you, should you wish to."
+msgid "There are bones to etch, songs to sing. Wish to join me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There is an additional song you could take on, if you'd like."
+msgid "Do you wish to take on more songs?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid ""
-"I know of certain bones that could be of use, if you'd like to know more."
+msgid "Do you believe you can take on the burden of additional bones?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141283,7 +144671,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141291,7 +144679,7 @@ msgid "Not interested."
 msgstr "관심 없어."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
+msgid "Consider it done.  But I also wanted to ask…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141307,7 +144695,7 @@ msgid "I'm off then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141317,7 +144705,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
+msgid "I see.  Very well then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141335,11 +144723,11 @@ msgid "I am glad to hear it. Let's go then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
+msgid "Maybe some other time.  Changing the topic…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141361,17 +144749,17 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
 
@@ -141383,6 +144771,10 @@ msgstr ""
 msgid "Skip it, let's get going."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr ""
@@ -141440,13 +144832,25 @@ msgid "What about chit-chatting and your background?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -141490,10 +144894,10 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
-"내가 너보다 더 나은 기술을 가지고 있으면, 널 가르쳐줄 수 있어. 그렇지만 한번에 다 가르치는 건 엄청 지루해서, 자주 하진 않을거야. 그리고 우리가 위험할 때나 내가 배고프거나 지치거나 네가 운전할 때도 가르쳐주지 않을 거야.\n"
-" 우리가 어딘가 안전한 데 있고 네가 기술을 향상시키는 책을 가지고 있으면, 내가 그 기술이 부족하면 들을거야. 네가 이미 배운 기술이 있는 책을 나한테 읽어줄 수도 있어."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Instead of reading to you, can we just talk?"
@@ -141515,7 +144919,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141554,8 +144960,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
 
@@ -141563,6 +144969,10 @@ msgstr ""
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -141620,11 +145030,27 @@ msgid ""
 "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141635,6 +145061,10 @@ msgstr ""
 msgid "Tell me more about the activities you can do now."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -141841,19 +145271,19 @@ msgid "Let's go."
 msgstr "가자."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
-msgstr "교전 수칙을 좀 바꿨으면 하는데..."
+msgid "Change your engagement rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
-msgstr "조준 수칙을 좀 바꿨으면 하는데..."
+msgid "Change your aiming rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
+msgid "Change your bionic power reserve rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
+msgid "Change your bionic power recharge rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141865,11 +145295,11 @@ msgid "Stick close to me, no matter what."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
+msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_false_text>"
+msgid "<ally_rule_follow_distance_2_true_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -142129,7 +145559,7 @@ msgid "Nah, I'm just kidding."
 msgstr "아니, 그냥 농담이야."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
+msgid "Please go to this location…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -142261,8 +145691,8 @@ msgstr ""
 "있니?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
-msgstr "오, 알아, 나쁘지 않아, 나쁘지 않아...."
+msgid "Oh you know, not bad, not bad…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "<hallu_dont_trade>"
@@ -142349,14 +145779,14 @@ msgstr ""
 msgid "&Put hands up."
 msgstr "&손을 든다."
 
-#: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
-msgstr "*무기를 떨어트렸다."
-
 #: lang/json/talk_topic_from_json.py
 msgid "*drops_her_weapon."
 msgstr "*drops_her_weapon."
 
+#: lang/json/talk_topic_from_json.py
+msgid "*drops his weapon."
+msgstr "*무기를 떨어트렸다."
+
 #: lang/json/talk_topic_from_json.py
 msgid "Now get out of here"
 msgstr "이제 여기서 나가."
@@ -142370,12 +145800,12 @@ msgid "Okay, I'm going."
 msgstr "알았어. 가는 중이야."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
-msgstr "일 말인데..."
+msgid "About that job…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
-msgstr "일거리 말인데..."
+msgid "About one of those jobs…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "What's the matter?"
@@ -142393,14 +145823,6 @@ msgstr "너한테 시킬 일 없어."
 msgid "I don't have any more jobs for you."
 msgstr "더 시킬 일은 없어."
 
-#: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
-msgstr ""
-
 #: lang/json/talk_topic_from_json.py
 msgid "I have another job for you.  Want to hear about it?"
 msgstr "또 해줬으면 하는 일이 있어. 들어볼래?"
@@ -142409,6 +145831,14 @@ msgstr "또 해줬으면 하는 일이 있어. 들어볼래?"
 msgid "I just have one job for you.  Want to hear about it?"
 msgstr "해줬으면 하는 일이 있어. 들어볼래?"
 
+#: lang/json/talk_topic_from_json.py
+msgid "I have other jobs for you.  Want to hear about them?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I have more jobs for you.  Want to hear about them?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
 #: src/npctalk.cpp
 msgid "Oh, okay."
@@ -142467,8 +145897,8 @@ msgid "Whatever.  Bye."
 msgstr "마음대로 해. 안녕."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
-msgstr "미안해... 실패했어."
+msgid "I'm sorry…  I failed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not yet."
@@ -142487,8 +145917,8 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "아니. 난 돌아가지, 안녕!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
-msgstr ""
+msgid "Yup!  Here it is!"
+msgstr "그래! 여기 있어!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "We're here!"
@@ -142739,8 +146169,8 @@ msgid "Alright.  You can lead now."
 msgstr "좋아. 네가 대장을 하라고."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
-msgstr "좋아. 그 밖에..."
+msgid "Good.  Something else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alright, let's go."
@@ -142819,8 +146249,8 @@ msgid "I'd prefer to keep that to myself."
 msgstr "그냥 마음속에 담아 두는게 좋겠어."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
-msgstr "알겠어..."
+msgid "I understand…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "You just asked me for stuff; ask later."
@@ -142843,8 +146273,8 @@ msgid "Because I'm your friend!"
 msgstr "왜냐하면 난 너의 친구니까!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
-msgstr "내가 널 도와주고 있잖아."
+msgid "Well, I am helping you out…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'll give it back!"
@@ -142891,15 +146321,15 @@ msgid "No, I'm keeping it. Try and take it off me, I dare you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
+msgid "Look, I really need this.  Please let me have it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
+msgid "What, this?  It's not the same one, you are mistaken."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
+msgid "I'm sorry.  Look, I already dropped it, okay?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -142907,7 +146337,7 @@ msgid "Don't try and talk yourself out of this, drop it now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
+msgid "Okay, I'm dropping it…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -142969,8 +146399,8 @@ msgid "Pleasure doing business!"
 msgstr "다음에 필요하면 또 오라고!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
-msgstr "니가 나보다 더 많이 보게 될지도 몰라..."
+msgid "You might be seeing more of me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey again. *kzzz*"
@@ -142983,22 +146413,22 @@ msgid ""
 msgstr "나... 나 풀려난 거야? *지직* 진짜? 워후! 저기, 그, 내가 진짜 사람 만나는 건 진짜 오랜만이거든."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
-msgstr "저기, 잠깐 얘기 좀 하자."
+msgid "Hey.  Let's chat for a second."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
-msgstr "내가 너 구해줬으니까 당연히 그래야지. 좀 도와줬으면 하는데..."
+msgid "That's because I saved you.  Listen, I could use your help…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
-msgstr "그래 존나 중요하지. 하라는 대로 안 하면 니 후장에 그 칩 쑤셔넣어 버린다."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
-msgstr "됐어, 그냥 가."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "*buzz* Great! So what happens now?"
@@ -143009,8 +146439,8 @@ msgid "Come with me. We can help each other out."
 msgstr "같이 다니자. 서로 도와주고 뭐 그러자고."
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
-msgstr "서로 갈 길 가자고. 하고 싶은 거 다 해."
+msgid "We both go our separate ways.  Enjoy your freedom."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -143026,9 +146456,9 @@ msgstr "너 풀어줄려고 그 칩 뽑아줬는데 고맙단 소리도 못 하
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
-msgstr "아저씨, 그거 내가 뽑았거든요? 일단은 좋게 봐줄 테니까 고마운 줄 알아."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Forget it. Enjoy your freedom."
@@ -143048,8 +146478,8 @@ msgid "Get out of my sight."
 msgstr "뒤지기 싫으면 꺼져."
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
-msgstr "형씨, 내가 이렇게 사과할 테니까 제발 꺼지세요."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "...kill... *ZTZTZT* ...you!"
@@ -143064,8 +146494,8 @@ msgid "Not if I kill you first!"
 msgstr "널 먼저 죽이면 되지!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
-msgstr "미안, 미안! 말을 잘못 했어."
+msgid "I'm sorry!  I shouldn't have said that!"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Yeah, *beeeeep* I don't think so. Bye."
@@ -143105,16 +146535,37 @@ msgstr "아무것도 아니야. 다시 일하러 가자."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
-"신흥 세력 캠프 시스템은 동료(NPC)에게 여러가지 일을 시키기위해 만들어졌습니다. 동료에게 시킬 수 있는일은 채집이나 물건 제작부터 "
-"주변 지역 순찰까지 다양합니다"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
-msgstr "계속해."
+msgid "Give me an overview of how camps work."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Never mind, let's go back to talking about camps."
@@ -143134,75 +146585,119 @@ msgstr "잊어 버려. 가자."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
 msgstr ""
-"음식은 모든 임무에 필요하거나 생산됩니다. 정해진 시간 동안 하는 미션을 받으려면 미리 비용을 지불해야 하고, 땔감을 모으는 것과 같은 "
-"임무를 반복하는 것은 완료될 때 지불해야 합니다.동료에게 돈을 지불하는 데 필요한 음식을 갖지 못하면 파벌 전체의 평판이 나빠질 "
-"것입니다.너무 낮아지면 나쁜 일이 생길 수 있어요"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
-msgstr "잠깐, 그 말 다시해봐."
+msgid "Wait, we can talk with radios?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
 msgstr ""
-"장소를 선택한 후에는 새 미션에 액세스를 하기 위해 캠프를 더 업그레이드하기 위한 자재를 찾거나 만들어야 합니다. 첫 번째 새로운 임무는"
-" 캠프를 업그레이드하기 위한 자료 수집에 초점을 맞추고 있습니다. 꼭 해야할 필요가 없습니다. 두세 번 업그레이드한 후에는 "
-"<color_yellow> [Menial Labour] </color>미션에 액세스할 수 있으며, 이 미션은 캠프 주변의 모든 항목을 "
-"카테고리로 분류하는 동료에게 작업할 수 있도록 해줍니다. 나중에 업그레이드하면 동료들을 보내 새 멤버를 모집하거나, 오버맵 요새를 "
-"구축하거나, 전투 순찰까지 할 수 있습니다."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
 msgstr ""
-"첫 번째 텐트를 끝까지 업그레이드하면 확장을 구축할 수 있는 기능이 해제됩니다.확장을 통해 필요한 산업에 집중함으로써 각 캠프를 전문화할"
-" 수 있습니다. <color_light_green>[농장]</color>은 큰 파벌을 추구하고자 하는 플레이어에게 권장되며,  NPC로 "
-"모든 요리를 할 수 있는 삶의 질을 향상시키기를 원하는 선수에게는 <color_light_green>[주방]</color>이 더 "
-"좋습니다. <color_light_green>[차고]</color>는 대량의 부품과 자원과 차량을 교환할 수 있도록 해주는 불법 카센터 "
-"유형의 임무가 유용합니다. 이러한 모든 자원은[대장간]에서 중요한 장비로 전환될 수 있습니다.첫 번째 캠프가 잠금 해제된 후 다른 모든 "
-"레벨에서 추가 확장을 구축할 수 있으며 한 캠프가 가득 차면 다른 캠프를 쉽게 구축할 수 있습니다."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
+msgid "Got it.  Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143216,6 +146711,14 @@ msgid ""
 "6.  You can now set up faction camps in select buildings.  The list of available buildings is constantly growing, so you'll have to experiment."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -143317,11 +146820,11 @@ msgid "Well, sure."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
+msgid "I'd… rather not."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143352,7 +146855,7 @@ msgid "Oh, but you already have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
+msgid "Yes… yes I have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143423,8 +146926,8 @@ msgstr ""
 "알았지. 손님들은 사진 찍기 바빴고."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
-msgstr "세상에. 너도 사진 찍은 거 있어?"
+msgid "Horrible.  Did you get any pictures yourself?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -143582,8 +147085,8 @@ msgid "This is a npc allies 1 test response."
 msgstr "This is a npc allies 1 test response."
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
-msgstr "This an error! npc allies 2 test response."
+msgid "This an error!  npc allies 2 test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a npc engagement rule test response."
@@ -143782,8 +147285,8 @@ msgid "This is a u_has_items beer test response."
 msgstr "This is a u_has_items beer test response."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
-msgstr "Test failure! This is a u_has_items test response."
+msgid "Test failure!  This is a u_has_items test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a u_has_item_category books test response."
@@ -143794,7 +147297,7 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143882,7 +147385,7 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143938,11 +147441,7 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
+msgid "Greetings…  Foodperson?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143984,7 +147483,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
+msgid "Ah…  Well, nice to meet you Foodperson."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -144012,7 +147511,7 @@ msgid "Sure, whatever."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
+msgid "Ok…  I believe you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -144108,7 +147607,7 @@ msgid "That sounds great!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
+msgid "Ok…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -144116,7 +147615,7 @@ msgid "I need to think about it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
+msgid "Huh…  No thanks."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -144133,7 +147632,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr ""
 
@@ -144906,7 +148405,7 @@ msgid "Giant bees?  Tell me more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
+msgid "But bees aren't usually aggressive…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -144918,7 +148417,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -145338,7 +148837,7 @@ msgid "No.  I can't.  Just, no."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
+msgid "Sorry…  I'll let you be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -145574,7 +149073,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
+msgid "Okay…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -145943,7 +149442,7 @@ msgid "What do you think happened?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
+msgid "That does sound a little crazy…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -145992,7 +149491,7 @@ msgid "What happened to you after that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
+msgid "It can't be healthy to abandon your past like that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146436,7 +149935,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
+msgid "Do you mean in a religious sense, or…?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146756,8 +150255,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146868,8 +150367,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
-msgstr "오,미안해..."
+msgid "Oh, I'm sorry…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -147195,7 +150694,7 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
+msgid "I'd like to ask you something else…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -147486,7 +150985,8 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -147670,16 +151170,16 @@ msgid "What do you need done?"
 msgstr "뭐 해야할 거라도 있나?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
-msgstr "임무에 대해서..."
+msgid "About the mission…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
-msgstr "임무 중 하나에 대해서..."
+msgid "About one of those missions…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
-msgstr "이만 가보도록 하지..."
+msgid "I've got to go…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -147694,8 +151194,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
-msgstr "괜찮은 계획 같군..."
+msgid "Seems like a decent plan…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -147716,7 +151216,7 @@ msgstr ""
 "전에 아래 층으로 가는 길을 봉인할 수 있었어. 남은 유일한 다른 기록은 모든 수압이 낮은 수준으로 떨어졌다는 거야."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
+msgid "Whatever they did it must have worked since we are still alive…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -147751,8 +151251,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
-msgstr "그럼 당신 지휘관을 찾아보도록 하지..."
+msgid "I'll try and find your commander then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -147810,8 +151310,8 @@ msgid "Hey miss, don't you think it would be safer if you stuck with me?"
 msgstr "이봐 아가씨, 나랑 같이 있는 게 더 안전할 것 같지 않아?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
-msgstr "신경쓰지마..."
+msgid "Don't mind me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -148082,7 +151582,7 @@ msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr "내가 너에게 판지가 있나고 물었나, 친구? 가지고있어?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
+msgid "About that shopping list of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -148148,8 +151648,8 @@ msgid "Would you like me to give you some cardboard?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
-msgstr "난 가봐야 할 것 같아..."
+msgid "I think I have to get going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -148179,7 +151679,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
+msgid "…What were you saying before?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -148197,7 +151697,7 @@ msgid "No."
 msgstr "아니오."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -148289,8 +151789,8 @@ msgid "I found a sample of alien fungus for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
-msgstr "알았어...나중에 봐."
+msgid "Ok… see ya."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -148389,8 +151889,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -148422,7 +151922,7 @@ msgid "You sound more optimistic than usual."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -148542,7 +152042,7 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -148650,7 +152150,7 @@ msgid ""
 msgstr "왜냐하면 난 정말 살아남지 못할 것 같거든. 그래서 죽을 때까지 여기에 처박혀있어. 불쌍하고 아픈 영혼을 구원해주지 않을래?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -149063,7 +152563,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -149319,7 +152819,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
+msgid "About that sourdough starter you had me looking for…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -149613,7 +153113,7 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
+msgid "Yes, yes I would… you monster."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -149809,6 +153309,10 @@ msgid ""
 "idea of trying it."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr "계속해."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -150063,7 +153567,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -150489,7 +153993,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr ""
 
@@ -151182,7 +154686,7 @@ msgid "Are you looking to buy anything else?"
 msgstr "혹시 나한테서 구매하고 싶은 것이 있니?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
+msgid "Very well… let's talk about something else."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -151508,8 +155012,8 @@ msgid "Have you seen anyone who might be hiding something?"
 msgstr "뭔갈 숨기고 있는 거 같은 사람을 본 적 있어?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
-msgstr "잘가..."
+msgid "Bye…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151522,16 +155026,16 @@ msgid "Keep your head down and stay out of my way."
 msgstr "관심 끌지 말고 내 눈앞에서 사라져."
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
-msgstr "알겠어..."
+msgid "OK…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like what?"
 msgstr "예를 들면?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
-msgstr "잘 모르겠어..."
+msgid "I'm not sure…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like they could be working for someone else?"
@@ -151550,8 +155054,8 @@ msgid "Got something to hide?"
 msgstr "뭔가 숨길 거라도 있나?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
-msgstr "미안, 네 기분을 상하게 할 의도는 없었어..."
+msgid "Sorry, I didn't mean to offend you…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151602,7 +155106,7 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr "부인, 밖으로 나가시면 위험합니다."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
+msgid "I heard this place was a refugee center…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -151626,8 +155130,8 @@ msgid "Can I do anything for the center?"
 msgstr "내가 이 센터를 위해 할수 있는 일이 있을까?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
-msgstr "뭔가 도와줄게 없나 물어볼 것 같았지..."
+msgid "I figured you might be looking for some help…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, I'd better be going.  Bye."
@@ -151680,7 +155184,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
 msgstr ""
 
@@ -151728,8 +155232,8 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr "미안하지만 지금 당장 위험을 감수 할 수 없어."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
-msgstr "좋아..."
+msgid "Fine…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151740,8 +155244,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
-msgstr "좋아... *가래 기침*"
+msgid "Fine… *coughupyourscough*"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151771,8 +155275,8 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[STR 11] 내가 힘은 좀 쓰거든!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
-msgstr "다른 곳을 알아 봐야겠군..."
+msgid "I guess I'll look somewhere else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151792,8 +155296,8 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
-msgstr "뭔가 더 있길 바랬는데..."
+msgid "Was hoping for something more…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151895,8 +155399,8 @@ msgid "So what are you doing right now?"
 msgstr "그래서 지금 뭐 하는데?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
-msgstr "아무것도 아냐..."
+msgid "Never mind…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151922,8 +155426,8 @@ msgstr ""
 "가까워질 수 있어. 아직 어림없지만 살아남을 수 있는 희망이 있어."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
-msgstr "행운을 빌어..."
+msgid "Good luck with that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151968,8 +155472,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
-msgstr "젠장..."
+msgid "Sucks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151985,8 +155489,8 @@ msgstr ""
 "설치된 벽이나 울타리를 뚫고 올 놈은 거의 없을걸?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
-msgstr "그래, 그럼..."
+msgid "Well, then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152077,8 +155581,8 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr "허, 새로운 사람 냄새를 맡았는데. 뭐 도와 줄까?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
-msgstr "너... 내 냄새를 맡는거야?"
+msgid "You… smelled me?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Got anything for sale?"
@@ -152132,8 +155636,8 @@ msgstr ""
 "스테이크만한 게 없지!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
-msgstr "훌룡해, 입에 침이 고이기 시작하는걸..."
+msgid "Great, now my mouth is watering…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152243,8 +155747,8 @@ msgstr ""
 "대부분의 생존자들은 그들이 원하는 것이 없기 때문에, 그들은 투사로 환영받고있지."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
-msgstr "으으음..."
+msgid "Hmmm…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152296,8 +155800,8 @@ msgstr ""
 "건 이 세계에 남아 있는 가장 강한 사람들 사이에서 이름을 알리는 좋은 길이야."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
-msgstr "난 잘못한 거 없어..."
+msgid "I haven't done anything wrong…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any tips for surviving?"
@@ -152463,7 +155967,7 @@ msgid "Something to say?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
+msgid "I charge hourly, so be quick…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -152576,7 +156080,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
+msgid "I guess I could help with that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -152687,8 +156191,8 @@ msgid "[$10] I'll get a haircut"
 msgstr "[$10] 머리 좀 다듬어줘."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
-msgstr "다음에 할게..."
+msgid "Maybe another time…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152705,8 +156209,8 @@ msgid "Stand still while I get my clippers..."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
-msgstr "고마워..."
+msgid "Thanks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Want a drink?"
@@ -152725,8 +156229,8 @@ msgid "What do you have on tap?"
 msgstr "어떤 종류의 술이 있지?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
-msgstr "가보도록 할게..."
+msgid "I'll be going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152779,8 +156283,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
-msgstr "그럼 그와 이야기 해야겠군..."
+msgid "I'll talk to him then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152795,8 +156299,8 @@ msgid "I hope you are here to do business."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
-msgstr "농업쪽으로 생각해 보고 있는데..."
+msgid "I'm interested in investing in agriculture…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152822,12 +156326,12 @@ msgid "I imagine we might be able to work something out."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
-msgstr "사이버네틱 임플랜트를 설치해 줄 수 있는지 궁금한데..."
+msgid "I was wondering if you could install a cybernetic implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
-msgstr "임플란트를 제거하는데 도움이 필요해..."
+msgid "I need help removing an implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'd like to hire your services."
@@ -152864,8 +156368,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
-msgstr "더 나쁠수도 있었어..."
+msgid "It could be worse…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152874,8 +156378,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
-msgstr "그럼 그들과 이야기 해야겠군..."
+msgid "I'll talk with them then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Can I help you, marshal?"
@@ -152941,8 +156445,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
-msgstr "여기로 이사하는게 잘한 선택 이었으면 좋겠는데..."
+msgid "Hopefully moving out here was worth it…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -153451,13 +156955,13 @@ msgstr "독사의 이빨"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
-msgstr "%s에게 독사의 이빨을 날렸다."
+msgid "You lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
-msgstr "<npcname>이(가) %s에게 독사의 이빨을 날렸다."
+msgid "<npcname> lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Strike"
@@ -153465,18 +156969,28 @@ msgstr "살무사격"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
+msgid "You hit %s with a spectacular Viper Strike"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr "독사의 몸부림"
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr ""
@@ -153519,6 +157033,34 @@ msgstr ""
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr "두꺼비의 혀"
@@ -155258,32 +158800,18 @@ msgid "<npcname> double-handed palm strikes %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
-msgstr "술고래의 속임수"
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "You stumble and leer at %s"
-msgstr "비틀거리며 %s에게 곁눈질을 날렸습니다."
-
-#: lang/json/technique_from_json.py
-#, python-format
-msgid "<npcname> stumbles and leers at %s"
-msgstr "<npcname>이(가) 비틀거리며 %s에게 곁눈질을 날렸습니다."
-
-#: lang/json/technique_from_json.py
-msgid "Drunk counter"
-msgstr "술고래의 반격"
+msgid "Tiger Palm"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
-msgstr "휘청거리다가 갑자기 거친 공격으로 %s을(를) 때렸다."
+msgid "You land a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
-msgstr "<npcname>이(가) 휘청거리다가 갑자기 거친 공격으로 %s을(를) 때렸다."
+msgid "<npcname> lands a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Tiger Takedown"
@@ -155291,95 +158819,78 @@ msgstr "호랑이의 습격"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
+msgid "You slam %s to the ground"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> grabs and grounds %s"
+msgid "<npcname> slams %s to the ground"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "slow strike"
+msgid "Straight Punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You slowly strike %s"
+msgid "You deliver a vertical straight punch to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
+msgid "<npcname> delivers a vertical straight punch to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
+msgid "Straight Punch (Knockback)"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
+msgid "You force %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
-msgstr ""
-
-#: lang/json/technique_from_json.py
-msgid "Chain Punch"
+msgid "<npcname> forces %s back with a vertical straight punch"
 msgstr ""
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
+msgid "L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
+msgid "You deliver a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
+msgid "<npcname> delivers a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
-msgstr ""
-
-#: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
-msgstr ""
-
-#: lang/json/technique_from_json.py
-msgid "ask the way"
+msgid "L-hook (Knockback)"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You miss but keep striking at %s"
+msgid "You knock %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
-msgstr ""
-
-#: lang/json/technique_from_json.py
-msgid "White Crane stumble"
+msgid "<npcname> knocks %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
+msgid "Your attack misses %s but you don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
+msgid "<npcname>'s attack misses %s but they don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
@@ -155396,15 +158907,71 @@ msgstr ""
 msgid "<npcname> receives %s's attack, and counters"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "Drunken Feint"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You stumble and leer at %s"
+msgstr "비틀거리며 %s에게 곁눈질을 날렸습니다."
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> stumbles and leers at %s"
+msgstr "<npcname>이(가) 비틀거리며 %s에게 곁눈질을 날렸습니다."
+
+#: lang/json/technique_from_json.py
+msgid "Drunk Counter"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
-msgstr "%s의 무장을 해제시켰다."
+msgid "You lurch, and your wild swing hits %s"
+msgstr "휘청거리다가 갑자기 거친 공격으로 %s을(를) 때렸다."
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
-msgstr "<npcname>이(가) %s의 무장을 해제시켰다."
+msgid "<npcname> lurches, and hits %s"
+msgstr "<npcname>이(가) 휘청거리다가 갑자기 거친 공격으로 %s을(를) 때렸다."
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they stumble away!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "slow strike"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You slowly strike %s"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> slowly strikes %s"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You phase-strike %s"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> phase-strikes %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Pressure Crunch"
@@ -156038,7 +159605,7 @@ msgstr ""
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr ""
 
@@ -156049,8 +159616,8 @@ msgstr ""
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -156060,7 +159627,7 @@ msgstr ""
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr ""
 
@@ -157119,7 +160686,7 @@ msgstr ""
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
 msgstr ""
 
@@ -157426,7 +160993,7 @@ msgstr ""
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr ""
 
@@ -157705,10 +161272,10 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
 
 #. ~ Description for juniper tree
@@ -158664,10 +162231,11 @@ msgstr "ATM"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -158771,8 +162339,8 @@ msgstr "원심 분리기"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -159377,7 +162945,7 @@ msgstr ""
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
 msgstr ""
@@ -159389,7 +162957,7 @@ msgstr ""
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
 msgstr ""
@@ -159480,6 +163048,13 @@ msgid ""
 " were still running."
 msgstr ""
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr ""
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "모래상자"
@@ -159546,7 +163121,7 @@ msgstr ""
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr ""
 
@@ -159558,7 +163133,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
 msgstr ""
 
@@ -160341,7 +163916,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr ""
 
@@ -161548,10 +165123,8 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
-"수류탄을 활성화시켰습니다! 아마 던지고 싶겠죠. 물건을 던지려면 't'키를 눌러서 던질 물건을 선택하면 됩니다. 투척 거리는 힘과 물체의"
-" 무게 및 크기에 따라 달라집니다. 대부분의 전투 상황에서 던지기 공격은 그리 좋지 않지만, 만약에 던진 무기가 폭발물이라면..."
 
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
@@ -161634,7 +165207,7 @@ msgstr "여긴 어둡군요! 운 좋게도 당신에게는 손전등이 있습
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr ""
@@ -161983,6 +165556,10 @@ msgstr ""
 msgid "Rail Motorcycle"
 msgstr ""
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr ""
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "평상형 트럭"
@@ -162774,7 +166351,7 @@ msgstr ""
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
 msgstr ""
 
 #. ~ Description for shredder
@@ -163248,8 +166825,8 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr ""
 
 #. ~ Description for autoclave
@@ -163434,7 +167011,7 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
 msgstr ""
 
@@ -163962,6 +167539,14 @@ msgstr ""
 msgid "rail wheel (steerable)"
 msgstr ""
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr ""
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "롤러드럼"
@@ -165650,6 +169235,10 @@ msgstr "비타민 B12"
 msgid "Vitamin C"
 msgstr "비타민 C"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr ""
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr " "
@@ -166139,7 +169728,7 @@ msgstr "%s에 카트리지를 넣었다."
 msgid "You refill the %s."
 msgstr "%s에 채워넣었다."
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "그곳에는 태울만한 것이 없다."
 
@@ -166155,6 +169744,16 @@ msgstr "불 켜는데 쓰려고 했던 물건을 잃어버렸다."
 msgid "There is not enough sunlight to start a fire now.  You stop trying."
 msgstr ""
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr ""
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "%s을(를) 배웠다."
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -166165,11 +169764,6 @@ msgstr "훈련을 통해 %s 기술을 %d 레벨로 상승시켰다."
 msgid "You get some training in %s."
 msgstr ""
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "%s을(를) 배웠다."
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr ""
@@ -166285,15 +169879,22 @@ msgstr ""
 msgid "Your %s is already fully repaired."
 msgstr ""
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr "지금은 %s을(를) 고칠 수 없다."
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgstr ""
+
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr "음식을 해동하고 데웠다."
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr "음식을 데웠다."
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
-msgstr "성공적으로 %s을(를) 고쳤다."
+msgid "You are currently unable to mend the %s."
+msgstr "지금은 %s을(를) 고칠 수 없다."
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -166595,7 +170196,7 @@ msgstr "구멍 뚫기를 마쳤다."
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr ""
 
@@ -167199,12 +170800,12 @@ msgstr ""
 "이동속도가 느려짐. 우울증. 면역력 감소. 잦은 투약충동."
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
-msgstr "지각력 -1; 지능 -1; 잦은 투약충동"
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
-msgstr "지각력 -2; 지능 -2; 잦은 투약충동"
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
 msgid ""
@@ -167388,38 +170989,6 @@ msgstr "위치 수량 무게 부피"
 msgid "Name (charges)"
 msgstr "물품 이름 (충전량)"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "끌고 있는 차량 없음!"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "끌고 있는 차량 없음!"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "잘못된 보관용기!"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "주변 9칸 전부"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr " <color_white_red>화재</color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr " 위험"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr " 함정"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr " 물"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -167541,7 +171110,39 @@ msgstr ""
 msgid "The destination is already full!"
 msgstr "대상 영역에 공간이 부족합니다!"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "끌고 있는 차량 없음!"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "끌고 있는 차량 없음!"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "잘못된 보관용기!"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "주변 9칸 전부"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr " <color_white_red>화재</color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr " 위험"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr " 함정"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr " 물"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "잘못된 보관용기"
 
@@ -167664,6 +171265,14 @@ msgstr "타격:"
 msgid "Cut:"
 msgstr "베기 피해: "
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr ""
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr ""
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "환경:"
@@ -168346,13 +171955,13 @@ msgstr "%s 고통"
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
+"  Seeing this is a bug!"
 msgstr ""
 
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
 msgstr ""
 
@@ -168379,7 +171988,7 @@ msgstr ""
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr ""
 
 #: src/artifact.cpp
@@ -169150,6 +172759,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr ""
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr "%s(으)로 무엇을 합니까?"
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr "껍질 안에 든 상태로는 움직일 수 없다. 움직이려면 비활성화시켜야 한다."
@@ -169282,12 +172896,14 @@ msgid "The %s must be attached to a gun, it can not be fired separately."
 msgstr "%s은(는) 개별적으로 사용할 수 없다. 반드시 화기에 부착해서 사용해야 한다."
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
-msgstr "더는 사격할 수 없다."
+#, c-format
+msgid "You can no longer fire your %s."
+msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "운전하려면 한 팔이 자유로워야 한다!"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -169295,8 +172911,9 @@ msgid "You need two free hands to fire your %s."
 msgstr "%s을(를) 쏘려면 양 팔이 자유로워야 한다."
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "재장전해야 한다!"
+#, c-format
+msgid "Your %s is empty!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -169307,16 +172924,18 @@ msgstr "%s을(를) 발사하려면 충전량이 %i만큼 필요하다!"
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
-msgstr "사격 하려면 적어도 %d의 충전량을 가진 UPS 혹은 %d의 충전량을 가진 개량형 UPS가 필요하다!"
+"charges to fire the %s!"
+msgstr ""
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
 msgstr ""
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
 msgstr ""
 
@@ -169551,6 +173170,16 @@ msgstr "%s이(가) 자동적으로 꺼졌습니다."
 msgid "Your %s automatically turns off."
 msgstr "%s이(가) 자동적으로 꺼졌습니다."
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "생각을 바꿔 바이오닉을 껐다."
@@ -169668,10 +173297,6 @@ msgstr "혈액 검사 결과"
 msgid "No effects."
 msgstr "효과 없음."
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr "물을 추출하기에는 공기가 너무 건조하다!"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr ""
@@ -169684,10 +173309,6 @@ msgstr ""
 msgid "Start a fire where?"
 msgstr "어디에 불을 피웁니까?"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "여기에는 불을 피울 수 없습니다."
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -169862,6 +173483,20 @@ msgstr ""
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr ""
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -169890,6 +173525,21 @@ msgstr "%s이(가) 연결이 끊겨 꺼졌다."
 msgid "You feel your throat open up and air filling your lungs!"
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr ""
@@ -170650,9 +174300,13 @@ msgstr "유일하게 아무나 트롤을 저질러도 용서가 되는 문장. 
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
+msgid "You"
 msgstr "당신"
 
+#: src/character.cpp
+msgid "Your"
+msgstr ""
+
 #: src/character.cpp
 msgid "your"
 msgstr "당신의ㅤ"
@@ -170883,6 +174537,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr ""
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr "그곳에 물품을 놓을 수 없다!"
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr "<npcname>이(가) 그곳에 물품을 놓을 수 없다!"
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -170906,10 +174568,20 @@ msgstr ""
 msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr "%s을(를) 놓을 수 없다."
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr "현재 건강도는 %d이다."
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "심한 탈수증"
@@ -170979,6 +174651,75 @@ msgstr ""
 msgid "Your %s bionic shorts out!"
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "%s에 몇 시간 내로 동상이 걸린다!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "%s에 한 시간 안에 심한 동상이 걸린다!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr "%s에 곧 심한 동상이 걸린다!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr "추위 때문에 %s에 감각이 없어졌다!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr "%s이(가) 아주 차가워졌다."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr "%s이(가) 약간 차가워졌다."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr "열기에 %s이(가) 달아 오르는게 느껴진다!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr "%s이(가) 아주 뜨거워졌다."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr "%s이(가) 약간 뜨거워졌다."
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "바람에 %s이(가) 차갑다."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr "바람이 아주 강하다. %s에 바람을 충분히 막아줄 옷을 입어야 한다."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr "지금 입고 있는 옷은 바람으로부터 %s을(를) 충분히 막아주지 못한다!"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "왼팔"
@@ -171143,8 +174884,8 @@ msgstr ""
 msgid "Big"
 msgstr ""
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "정상"
 
@@ -171248,6 +174989,30 @@ msgstr ""
 msgid "EXTRA_EXERCISE"
 msgstr ""
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr "짐이 너무 무겁다!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] "%s에는 UPS 충전량 %d이 필요하다."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] "%s에는 %d만큼 충전되어있지만, %d 더 필요하다."
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "기침이 심하다."
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "마른 기침이 나온다."
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr ""
@@ -171427,6 +175192,20 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr "겨울잠에 접어든다."
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr "CQB 바이오닉을 이용한 폭넓은 훈련으로 %s을(를) 익혔다."
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr ""
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "무술없음"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "자동 줍기 금지"
@@ -171471,260 +175250,6 @@ msgid ""
 "this area."
 msgstr ""
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr ""
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr ""
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr ""
@@ -171732,7 +175257,7 @@ msgstr ""
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
 msgstr ""
 
@@ -171792,6 +175317,16 @@ msgstr ""
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr ""
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr ""
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr ""
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
 msgstr ""
@@ -173093,24 +176628,6 @@ msgstr ""
 msgid "<npcname> looks better after eating the %s."
 msgstr "<npcname>은(는) %s을(를) 먹더니 한결 나아 보인다."
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "내장 전력 저장소가 완전히 충전되었다."
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr "<npcname>의 내장 전력 저장소가 완전히 충전되었다."
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr "배터리 시스템을 통해 %s을(를) 사용해서 전력을 충전했다."
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr "<npcname>이(가) 배터리 시스템을 통해 %s을(를) 사용해서 전력을 충전했다."
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr "플루토늄이 너무 많아서 전력이 낭비될 겁니다. 그래도 투입하시겠습니까?"
@@ -174098,6 +177615,10 @@ msgstr ""
 msgid "Toggle display temperature"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr ""
@@ -174138,6 +177659,10 @@ msgstr ""
 msgid "Print faction info to console"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Test weather"
 msgstr ""
@@ -174417,6 +177942,10 @@ msgstr "상태창 보기"
 msgid "t[e]leport"
 msgstr "순간이동"
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr "임무 편집 (경고:불안정 함!)"
@@ -174999,10 +178528,12 @@ msgstr ""
 msgid "Spell"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
 msgstr ""
@@ -177011,6 +180542,14 @@ msgstr ", 캠프 관리자"
 msgid "%s has abandoned the camp."
 msgstr "%s은(는) 캠프를 버렸다."
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr ""
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -177026,59 +180565,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -177113,23 +180599,6 @@ msgid ""
 "Positions: %d/1\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -177292,14 +180761,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -177381,6 +180842,61 @@ msgid ""
 "Positions: 0/1\n"
 msgstr ""
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -177391,6 +180907,10 @@ msgid ""
 "Companions must be on missions for at least 24 hours before emergency recall becomes available."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr ""
@@ -177427,10 +180947,6 @@ msgstr ""
 msgid "departs to search for recruits…"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr ""
@@ -177708,7 +181224,7 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
 
@@ -177881,8 +181397,7 @@ msgstr ""
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
+"create a camp food zone, and a camp storage zone."
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -177912,17 +181427,17 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
+msgid ">Travel:  %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
+msgid ">Working: %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
+msgid "Total:    %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -177975,7 +181490,7 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
+msgid "Name:     %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -177984,7 +181499,7 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
+msgid "Engine:   %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -177994,7 +181509,7 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
+msgid ">Fuel:    %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -179424,7 +182939,7 @@ msgstr "최소한 %s이(가) 1개 있어야 %s을(를) 재장전할 수 있다!"
 msgid "The %s is already full!"
 msgstr "%s은(는) 이미 가득 차 있다!"
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr "%s을(를) 장전할 수 없다!"
@@ -179512,6 +183027,19 @@ msgstr "정말로 %s에 발을 내딛습니까?"
 msgid "Your %s refuses to move over that ledge!"
 msgstr ""
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr ""
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr ""
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "잡은 물체를 찾을 수 없다."
@@ -179703,6 +183231,16 @@ msgstr "무거운 %s을(를) 움직이려고 애를 썼다!"
 msgid "There's stuff in the way."
 msgstr "이동방향에 물체가 있다."
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr ""
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -180011,7 +183549,7 @@ msgid ""
 "characters (e.g. empty boxes or question marks). You have been warned."
 msgstr "유니코드 로캘이 올바르지 않습니다. 네모나 물음표 같은 이상한 글자가 보일 수도 있습니다. 미리 경고합니다."
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr "아무 이유 없이 갑자기 날카로운 고통이 느껴졌다."
 
@@ -180295,10 +183833,6 @@ msgstr ""
 msgid "SPOILS IN"
 msgstr "유통기한"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "배터리"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "반응로"
@@ -180323,10 +183857,6 @@ msgstr "쏟아진 액체는 마시지 못함"
 msgid "Your biology is not compatible with that item."
 msgstr ""
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr "완전히 충전됨"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -180418,10 +183948,6 @@ msgid "Needs at least %d charge"
 msgid_plural "Needs at least %d charges"
 msgstr[0] "최소 %d 충전량 필요"
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr ""
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "물품 사용"
@@ -180636,11 +184162,6 @@ msgstr ""
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr ""
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr ""
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -181760,8 +185281,8 @@ msgid "Purchase cash card?"
 msgstr "현금 카드를 구입합니까?"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
-msgstr "현금 카드를 구입하려면 계좌에 적어도 1$가 필요합니다."
+msgid "You need $10.00 in your account to purchase a card."
+msgstr ""
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -181803,7 +185324,7 @@ msgstr ""
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
 msgstr ""
 
 #: src/iexamine.cpp
@@ -182083,7 +185604,8 @@ msgid "The gun safe stumps your efforts to pick it."
 msgstr "총기 금고를 여느라 쩔쩔맸다."
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
 msgstr ""
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
@@ -182092,6 +185614,16 @@ msgstr ""
 msgid "You attempt to pry open the %1$s using your %2$s…"
 msgstr ""
 
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
+msgstr ""
+
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
 msgstr ""
@@ -182552,6 +186084,10 @@ msgstr ""
 msgid "You weren't able to start a fire."
 msgstr ""
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "여기에는 불을 피울 수 없습니다."
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -183235,6 +186771,17 @@ msgstr ""
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr ""
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr ""
@@ -183757,6 +187304,10 @@ msgstr "오버맵 연결"
 msgid "Overmap specials"
 msgstr "오버맵 특수 지역"
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "오버맵 장소"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr "차량 견본"
@@ -183813,6 +187364,10 @@ msgstr "획득 목록"
 msgid "Anatomies"
 msgstr "해체"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "변이"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "타일셋"
@@ -183857,18 +187412,10 @@ msgstr "직업"
 msgid "Scenarios"
 msgstr "시나리오"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "변이"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "변이 분류"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "오버맵 장소"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr ""
@@ -184232,14 +187779,6 @@ msgstr ""
 msgid "Page %d/%d"
 msgstr "페이지 %d/%d"
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "장비 물품"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "장비 무기"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -184672,9 +188211,9 @@ msgstr "이 음식은 <neutral>부패하기</neutral> 시작했지만, <info>소
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
-msgstr "이 음식은<bad>부패하기</bad> 시작했다. 이 음식을 <info>먹는 것</info>은 좋은 생각이 아닌 것 같다."
+msgstr ""
 
 #: src/item.cpp
 #, c-format
@@ -184744,11 +188283,6 @@ msgstr ""
 msgid "This ammo <neutral>starts fires</neutral>."
 msgstr ""
 
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr "활성된 <info>개조부품 (%s)</info>의 수치 표시중."
-
 #: src/item.cpp
 msgid "Skill used: "
 msgstr "사용 기술: "
@@ -184887,8 +188421,9 @@ msgid "Used on: "
 msgstr "사용 대상: "
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "장착 위치: "
+#, c-format
+msgid "Location: %s"
+msgstr ""
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -185399,42 +188934,45 @@ msgid ""
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
+msgid "<info>can be upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
+msgid "<info>can be downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
+msgid "<bad>can not be downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
+msgid "<bad>can not be upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
+#, c-format
+msgid "* This clothing %s."
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
+msgid " and <info>upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
+msgid " and <info>downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
+msgid " but <bad>not downsized</bad>"
+msgstr ""
+
+#: src/item.cpp
+msgid " but <bad>not upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
 msgstr ""
 
 #: src/item.cpp
@@ -185522,6 +189060,19 @@ msgstr "* 이 물품을 <info>라디오 신호</info>로 작동시키면 즉시
 msgid "This bionic is installed in the following body part(s):"
 msgstr "이 바이오닉은 다음 신체 부분에 설치됨:"
 
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] ""
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr ""
+
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr ""
+
 #: src/item.cpp
 msgid "<bold>Encumbrance:</bold> "
 msgstr ""
@@ -185640,6 +189191,11 @@ msgstr "제작 가능한 물품이 다양하다."
 msgid "You could use it to craft: %s"
 msgstr "제작 가능한 물품: %s"
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr "활성된 <info>개조부품 (%s)</info>의 수치 표시중."
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -186808,8 +190364,8 @@ msgid "You do not have that item!"
 msgstr "그 물품을 갖고 있지 않다!"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
-msgstr "어떤 신호에 작동되도록 합니까?:"
+msgid "Which signal should activate the item?"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "\"Blue\""
@@ -187051,16 +190607,6 @@ msgstr "삐삐삐이이이삐이이이익!"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr "소음 발생기를 끄자 지옥 같은 소음이 멈췄다."
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr ""
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr ""
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr "울타리 기둥에 지레질을 해서 뽑아냈다."
@@ -187481,18 +191027,27 @@ msgid "Scan the ground"
 msgstr "지면 스캔하기"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "자신을 스캔하기"
+msgid "Scan yourself or other person"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "지속 스캔 작동"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr ""
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -187560,6 +191115,10 @@ msgstr "째깍!"
 msgid "You've already released the handle, try throwing it instead."
 msgstr "이미 손잡이를 놓았다. 던져야 한다."
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "불씨가 필요하다!"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr "화살에 불을 붙였다!"
@@ -188051,10 +191610,6 @@ msgstr ""
 msgid "You mop up the spill."
 msgstr "바닥에 흘려진 액체를 닦았다."
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr ""
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr "공간의 막이 부패하는 것 같아보입니다."
@@ -188116,17 +191671,9 @@ msgid "You don't have appropriate food to heat up."
 msgstr "데울 음식이 없다."
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgid "You start heating up the food."
 msgstr ""
 
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
-msgstr "음식을 해동하고 데웠다."
-
-#: src/iuse.cpp
-msgid "You heat up the food."
-msgstr "음식을 데웠다."
-
 #: src/iuse.cpp
 msgid "There is no fire around, use your integrated toolset instead?"
 msgstr ""
@@ -189113,8 +192660,8 @@ msgid "Your %s is too heavy or bulky for this RC car."
 msgstr "%s은(는) 이 RC카에는 너무 무겁거나 크다."
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
-msgstr "RC카에서 폭탄을 제거했다."
+msgid "You disarmed your RC car."
+msgstr ""
 
 #. ~Sound of a radio controlled car moving around
 #: src/iuse.cpp
@@ -189126,12 +192673,12 @@ msgid "What to do with activated RC car?"
 msgstr "작동중인 RC카로 무엇을 합니까?"
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
-msgstr "RC카의 전원을 껐다."
+msgid "You turned off your RC car."
+msgstr ""
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
-msgstr "삑."
+#: src/iuse.cpp
+msgid "beep"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Take control of RC car"
@@ -189168,9 +192715,16 @@ msgstr "RC카의 조종권을 획득했다."
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
+msgstr ""
+
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
 "sending the signal."
-msgstr "지금 가지고 있는 %s은(는) 이 신호를 받았을 때 폭발하므로 신호를 보내기 전에 먼저 내려놓아야 한다."
+msgstr ""
 
 #: src/iuse.cpp
 msgid "This vehicle's security system has locked you out!"
@@ -190926,9 +194480,29 @@ msgstr "다른 물품을 개조, 수리할 수 있지만, 자신을 수리할 
 msgid "How do you want to modify it?"
 msgstr "어떻게 개량하시겠습니까?"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
 msgstr ""
 
 #: src/iuse_actor.cpp
@@ -192318,6 +195892,23 @@ msgstr ""
 msgid "All knowledge of %s leaves you."
 msgstr ""
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr ""
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr ""
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr ""
@@ -192326,6 +195917,10 @@ msgstr ""
 msgid "Popup Distractions"
 msgstr ""
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr ""
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr ""
@@ -192390,6 +195985,15 @@ msgstr ""
 msgid "Casting Cost (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr ""
@@ -192398,6 +196002,10 @@ msgstr ""
 msgid "Casting Time (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+msgid "self"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr ""
@@ -192411,29 +196019,37 @@ msgid "Healing"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Variance"
+msgid "Spell Radius"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spawn"
+msgid "Cone Arc"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Summon"
+msgid "degrees"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spell Radius"
+msgid "Line Width"
 msgstr ""
 
-#: src/magic.cpp src/veh_interact.cpp
-msgid "Range"
-msgstr "거리"
+#: src/magic.cpp
+msgid "Variance"
+msgstr ""
 
 #: src/magic.cpp
-msgid "self"
+msgid "Spawn"
 msgstr ""
 
+#: src/magic.cpp
+msgid "Summon"
+msgstr ""
+
+#: src/magic.cpp src/veh_interact.cpp
+msgid "Range"
+msgstr "거리"
+
 #: src/magic.cpp
 msgid "Duration"
 msgstr ""
@@ -192458,18 +196074,22 @@ msgstr ""
 msgid "Damage Type"
 msgstr ""
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr ""
@@ -192518,6 +196138,11 @@ msgstr ""
 msgid "No valid targets to teleport."
 msgstr ""
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr ""
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr ""
@@ -192658,6 +196283,10 @@ msgstr ""
 msgid "Unable to make sound directory.  Check permissions."
 msgstr ""
 
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr ""
+
 #: src/main_menu.cpp
 msgid "Really quit?"
 msgstr "정말로 나가시겠습니까?"
@@ -193346,7 +196975,7 @@ msgstr "%s 은(는) 무기와 함께 사용할 수 없다."
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
+msgid "The %1$s is not a valid %2$s weapon."
 msgstr ""
 
 #: src/martialarts.cpp
@@ -193764,11 +197393,6 @@ msgid "%d enemy hit!"
 msgid_plural "%d enemies hit!"
 msgstr[0] "적 공격으로 %d 피해!"
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr "CQB 바이오닉을 이용한 폭넓은 훈련으로 %s을(를) 익혔다."
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -196131,17 +199755,43 @@ msgid "You don't have any companions to send out…"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
-msgstr "누구를 보내겠습니까?                    [ 전투 : 생존 : 산업시설 ]"
+msgid "Who do you want to send?"
+msgstr "누구를 보냅니까?"
 
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
 msgstr ""
 
+#. ~ %1$s: npc name
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
-msgstr "당신이 선택한 동료는 기술이 없다!"
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
+msgstr ""
+
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
+msgstr ""
+
+#: src/mission_companion.cpp
+msgid "You choose to send no one…"
+msgstr ""
 
 #: src/mission_companion.cpp
 msgid "You don't have any companions ready to return…"
@@ -197824,6 +201474,11 @@ msgstr "%1$s이(가) 팔의 %2$s을(를) 공격했지만, 튕겨나갔다!"
 msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr "%1$s이(가) <npcname> 팔의 %2$s을(를) 공격했지만, 튕겨나갔다!"
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr ""
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -198023,11 +201678,6 @@ msgstr "%s은(는) 산을 내뿜었다!"
 msgid "zombie slave"
 msgstr "노예 좀비"
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr "%s(으)로 무엇을 합니까?"
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -198429,22 +202079,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr "아주 작은"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr "작은"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr "보통"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr "커다란"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr "거대한"
 
@@ -198509,6 +202164,16 @@ msgstr "밀도가 높은 젤리 덩어리"
 msgid "wearing %1$s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr "%s"
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr ""
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -198551,6 +202216,11 @@ msgstr ""
 msgid "Rider: %s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr ""
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr "난이도"
@@ -199199,8 +202869,8 @@ msgid "Crossed a threshold"
 msgstr "한계치를 넘었다"
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
-msgstr "오, 그래! 바로 이거야!"
+msgid "Oh, yeah!  That's the stuff!"
+msgstr ""
 
 #: src/mutation_ui.cpp
 msgid "Reassigning."
@@ -200186,7 +203856,7 @@ msgstr "분노: "
 msgid "%s disappears."
 msgstr ""
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "%s이(가) 죽었다!"
@@ -200933,6 +204603,16 @@ msgstr "말해줄게 있어."
 msgid "Yes, let's resume training "
 msgstr "좋아, 훈련을 다시 시작하자고 "
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr ""
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr ""
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -201101,10 +204781,6 @@ msgstr ""
 msgid "I need a %s to consume that!"
 msgstr "그걸 사용하려면 %s이(가) 필요해!"
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr "별로 좋은 생각이 아닌것 같은데..."
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr "무엇을 줍니까?"
@@ -201182,6 +204858,11 @@ msgstr ""
 msgid "My current location"
 msgstr ""
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -201214,10 +204895,6 @@ msgstr "어느 바이오닉을 제거합니까?"
 msgid "You decide to hold off…"
 msgstr ""
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr ""
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -201284,6 +204961,11 @@ msgstr "%s이(가) 도망간다!"
 msgid "%s leaves."
 msgstr "%s이(가) 떠났다."
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -201343,6 +205025,11 @@ msgstr "추가 >"
 msgid "Examine which item?"
 msgstr "어떤 물건을 조사합니까?"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr ""
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -201658,9 +205345,9 @@ msgstr "안전모드 자동 재설정 턴 수"
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
-msgstr "안전모드 재설정에 걸리는 턴 수를 정합니다. '안전모드 작동 범위' 안에 적이 없을 때에만 재설정됩니다."
+msgstr ""
 
 #: src/options.cpp
 msgid "Turns to remember ignored monsters"
@@ -201761,11 +205448,9 @@ msgstr "빈 용기 버리기"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
 msgstr ""
-"사용후 남은 빈 용기를 버릴지 설정합니다. 아니오: 아무것도 안버림 - 식수제한: 물을 담을수 있는 용기 제외 - 전부: 모든 용기를 "
-"버림"
 
 #: src/options.cpp
 msgid "Watertight"
@@ -201931,12 +205616,12 @@ msgid "If true, automatically follow the crosshair when firing/throwing."
 msgstr "이 설정을 켜면 커서가 자동적으로 사격/투척을 따라갑니다."
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "분해시 물어보기"
+msgid "Query on disassembly while butchering"
+msgstr ""
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
-msgstr "이 설정을 켜면 물품을 분해하기 전에 정말로 분해할 것인지 물어봅니다."
+msgid "If true, will query before disassembling items while butchering."
+msgstr ""
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -202207,9 +205892,9 @@ msgstr "물품 단축키 자동 지정"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
 msgstr ""
 
 #: src/options.cpp
@@ -202573,7 +206258,7 @@ msgstr ""
 msgid "Display"
 msgstr "화면설정"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr "어떤 디스플레이에 표시하는지 설정합니다. 재시작 필요."
@@ -202661,7 +206346,7 @@ msgid "Scaling factor"
 msgstr ""
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
+msgid "Factor by which to scale the display.  Requires restart."
 msgstr ""
 
 #: src/options.cpp
@@ -202942,8 +206627,8 @@ msgstr ""
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
 msgstr ""
 
@@ -202953,9 +206638,9 @@ msgstr ""
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
 msgstr ""
 
 #: src/options.cpp
@@ -203018,9 +206703,9 @@ msgstr "고정적 NPC"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
-msgstr "이 설정을 켜면 지정된 장소에 고정적 NPC가 생성됩니다. 세계 초기화가 필요합니다."
+msgstr ""
 
 #: src/options.cpp
 msgid "Starting NPCs spawn"
@@ -204228,6 +207913,7 @@ msgstr ""
 msgid "Underground"
 msgstr "지하"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
 msgstr ""
@@ -204289,10 +207975,6 @@ msgstr "귀먹음!"
 msgid "Weapon  :"
 msgstr ""
 
-#: src/panels.cpp
-msgid "No Style"
-msgstr "무술없음"
-
 #: src/panels.cpp
 msgid "Day "
 msgstr ""
@@ -204305,10 +207987,12 @@ msgstr ""
 msgid "to open sidebar options"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
 msgstr ""
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
 msgstr ""
@@ -204565,75 +208249,6 @@ msgstr "내용물을 쏟지 않으려고 <npcname>이(가) %1$s을(를) %2$s에
 msgid "You have learned a new style: %s!"
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "%s에 몇 시간 내로 동상이 걸린다!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "%s에 한 시간 안에 심한 동상이 걸린다!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr "%s에 곧 심한 동상이 걸린다!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr "추위 때문에 %s에 감각이 없어졌다!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr "%s이(가) 아주 차가워졌다."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr "%s이(가) 약간 차가워졌다."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr "열기에 %s이(가) 달아 오르는게 느껴진다!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr "%s이(가) 아주 뜨거워졌다."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr "%s이(가) 약간 뜨거워졌다."
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "바람에 %s이(가) 차갑다."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr "바람이 아주 강하다. %s에 바람을 충분히 막아줄 옷을 입어야 한다."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr "지금 입고 있는 옷은 바람으로부터 %s을(를) 충분히 막아주지 못한다!"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "바닥에 굴러 불을 끄려고 했다!"
@@ -205004,14 +208619,6 @@ msgstr "%s에 소독한 상처가 회복되었다."
 msgid "There is not enough %s left to siphon it."
 msgstr "빨아들일 만큼 %s이(가) 충분히 남아있지 않다."
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "기침이 심하다."
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "마른 기침이 나온다."
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "고문하는 듯한 고통 때문에 괴롭다!"
@@ -205057,11 +208664,6 @@ msgstr "%s로 인해 고통이 느껴진다!"
 msgid "Your %s aches."
 msgstr "%s에 통증이 느껴진다."
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr "현재 건강도는 %d이다."
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -205088,420 +208690,6 @@ msgstr "몸속에서 무언가가 죽으면서 몸부림쳤다."
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "뱃속에서 뭔가가 죽으면서 장이 꾸르륵거렸다."
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr "%s을(를) 계속하기엔 너무 목이 마르다."
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr "%s을(를) 계속하기엔 너무 지쳤다."
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "물에 익사하고 있다!"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr "이가 빠졌다!"
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "붕붕"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "갑자기 감각이 없어지는 것을 느꼈다."
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "갑작스럽게 아픔을 느꼈다."
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "잠깐 어지러움을 느꼈다."
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "갑자기 배가 고파졌다."
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "갑자기 약간 배부른듯한 느낌이 들었다."
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "갑자기 목이 말라온다."
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "갑자기 피로감이 든다."
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "갑자기 아주 추워졌다."
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "갑자기 추워졌다."
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "갑자기 매우 더워졌다."
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "갑자기 더워졌다."
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr "%1$s이(가) 화났다!"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr "%1$s이(가) 말했다. \"%2$s\""
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "통제할 수 없을 정도로 떨리기 시작했다."
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr "당신은 갑자기 자고 싶은 충동에 사로잡혀 기절합니다."
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "천식으로 인해 호흡곤란이 일어났다!"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr "산소호흡기를 사용한 다음 다시 잠을 청합니다."
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr "흡입기를 사용하고 다시 잠을 잡니다."
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "남아있던 마지막 흡입기를 사용했다."
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] "흡입기를 사용했다, 앞으로 %d회 쓸 수있다."
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] ""
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "햇빛이 거슬려 잘 보이지 않는다."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "햇빛이 피부를 태우고 있다!"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "햇빛이 거슬린다."
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "햇빛을 견딜 수 없다!"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "갑자기 아무것도 들리지 않는다!"
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "갑자기 눈 앞이 보이지 않는다!"
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr "당신의 방사능 센서로부터 오는 비정상적인 신호가 느껴진다."
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr "전력 시스템에 과부하가 걸려 가슴이 타는 듯 아프다!"
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "전력 누출로 인해 고통이 느껴진다!"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr "%s이(가) 전력누출에 영향을 받은 것 같다."
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "산성액 누출로 화상을 입었다!"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "배터리가 약간 방전되었다."
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "바이오닉에서 시끄러운 소음이 난다!"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "당신은 잘못된 생체 공학적인 떨림을 느낍니다."
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr "치직!"
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "시야가 화소 단위로 쪼개지고 있다!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr "고장난 바이오닉이 경련을 유발해서 바닥에 쓰러졌다!"
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr "합선된 바이오닉이 떨림을 유발한다."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "고장난 바이오닉이 가려움증을 유발한다!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr "근육에 경련이 일어났다!"
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr "지면에 쓰러졌다!"
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr "호흡이 가빠진다."
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr "떨림이 멈추지 않는다."
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr "의식을 잃었다!"
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "호흡 속도가 느려진다."
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr "비틀거리다 쓰러졌다!"
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr "피곤한 듯이 눈을 비볐다."
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr ""
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr "작은 하품을 내뱉었다."
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr "등을 쭉 늘였다."
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr "정신적인 피로감이 느껴진다."
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr "잠깐 어지러움을 느꼈다."
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr "불편할 정도로 근육이 경련한다."
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr "시야가 약간 흐려졌다."
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr "마음이 잠시동안 무의식 속으로 빠져듭니다."
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr "근육이 스트레스적으로 쑤신다."
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr "산만할 정도로 아픈 두통을 가진다."
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr "여러분은 속이 쓰리고 입안에서 산 맛이 나는 것을 느낍니다."
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr "여러분의 마음은 너무 피곤해서 여러분은 더 이상 눈을 믿을 수 없다고 느낍니다."
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr "여러분의 근육은 걷잡을 수 없이 경련을 일으키고, 균형을 유지하는 데 어려움을 겪습니다."
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr "다리가 후들후들 떨린다."
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr "떨어졌다!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr "방사능 배지가 %1$s에서 %2$s로 바뀌었다!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr "%s이(가) 재생되기 시작했다!"
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr "%1$s에서 %2$s 소리를 들었다"
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr ""
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr ""
@@ -205719,11 +208907,6 @@ msgstr "%s은(는) 한손만으로 들 수 없다."
 msgid "You are too weak to wield %s with only one arm."
 msgstr "%s을(를) 한손만으로 들기엔 힘이 너무 약하다."
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr "%s을(를) 놓을 수 없다."
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "맨손 유지 (꺼짐)"
@@ -205797,20 +208980,43 @@ msgstr "%s에는 고칠 부분이 없다."
 msgid "Mend which fault?"
 msgstr "어느 부분을 수리합니까?"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white>소요 시간:</color>\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr ""
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white>기술:</color>\n"
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr ""
+
+#: src/player.cpp
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr ""
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
-msgstr "> <color_%1$s>%2$s %3$i</color>\n"
+msgid "Skills: %s\n"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "You are currently unable to mend the %s this way."
+msgstr ""
 
 #: src/player.cpp
 msgid "You are already wearing that."
@@ -205924,14 +209130,6 @@ msgstr "%s을(를) 벗었다."
 msgid "<npcname> takes off their %s."
 msgstr "<npcname>이(가) %s을(를) 벗었다."
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr "그곳에 물품을 놓을 수 없다!"
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr "<npcname>이(가) 그곳에 물품을 놓을 수 없다!"
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -205979,18 +209177,6 @@ msgstr "미사용 플루토늄 %i개를 회수했다."
 msgid "You can't remove partially depleted plutonium!"
 msgstr "부분적으로 고갈된 플루토늄은 제거할 수 없다!"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] "%s에는 UPS 충전량 %d이 필요하다."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] "%s에는 %d만큼 충전되어있지만, %d 더 필요하다."
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -206162,10 +209348,6 @@ msgstr "피하려고 했지만, 피할 공간이 없다!"
 msgid "%s tries to dodge but there's no room!"
 msgstr "%s이(가) 피하려고 했지만, 피할 공간이 없다!"
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr "짐이 너무 무겁다!"
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -206219,6 +209401,13 @@ msgstr ""
 msgid "Pain "
 msgstr ""
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr ""
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -206432,47 +209621,57 @@ msgstr "현재 행동 속도:"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
-msgstr "무게 초과 -%s%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
-msgstr "고통 -%s%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
-msgstr "갈증 -%s%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr ""
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
-msgstr "햇빛 -%s%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
+msgstr ""
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
-msgstr "빠름 +%s%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
-msgstr "바이오닉 가속        +%s%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
@@ -206683,8 +209882,8 @@ msgid "\"Oh God, what's happening?\""
 msgstr "\"오 맙소사, 대체 무슨 일이 벌어지고 있는 거야?\""
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
-msgstr "\"물론... 모두 프랙탈이야!\""
+msgid "\"Of course… it's all fractals!\""
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "\"Huh?  What was that?\""
@@ -206719,8 +209918,8 @@ msgid "You quiver from the cold."
 msgstr "추위에 몸이 약간 떨린다."
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
-msgstr "상체가 꽁꽁 얼 정도로 차갑다. 옷을 몇 겹 더 겹쳐 입어야 한다."
+msgid "Your torso is freezing cold.  You should put on a few more layers."
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "Your shivering makes you unsteady."
@@ -207094,6 +210293,47 @@ msgstr ""
 msgid "Your alarm went off."
 msgstr ""
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr ""
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -207515,10 +210755,6 @@ msgstr "쿠와앙!"
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>없음</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr ""
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -207745,11 +210981,6 @@ msgstr ""
 msgid "KILLS"
 msgstr ""
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr "화면을 보여줄 때 영상을 어떻게 출력할지를 설정합니다. 설정 후 게임을 재시작해야 합니다."
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr ""
@@ -207762,6 +210993,10 @@ msgstr "고막이 찢어지는 것 같다!"
 msgid "Something is making noise."
 msgstr "무언가가 소리를 낸다."
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr ""
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -207777,6 +211012,11 @@ msgstr ""
 msgid "You hear %1$s"
 msgstr "%1$s 소리를 들었다."
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr "%1$s에서 %2$s 소리를 들었다"
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "알람시계가 마침내 잠을 깨웠다."
@@ -207806,6 +211046,408 @@ msgstr "유효한 시작 위치를 생성할 수 없습니다. 이 실패내역
 msgid "d: delete history"
 msgstr "d: 내역 삭제"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr "%s을(를) 계속하기엔 너무 목이 마르다."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr "%s을(를) 계속하기엔 너무 지쳤다."
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "물에 익사하고 있다!"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr "당신은 갑자기 자고 싶은 충동에 사로잡혀 기절합니다."
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "갑자기 감각이 없어지는 것을 느꼈다."
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "갑작스럽게 아픔을 느꼈다."
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "잠깐 어지러움을 느꼈다."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "갑자기 배가 고파졌다."
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "갑자기 약간 배부른듯한 느낌이 들었다."
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "갑자기 목이 말라온다."
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "갑자기 피로감이 든다."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "갑자기 아주 추워졌다."
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "갑자기 추워졌다."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "갑자기 매우 더워졌다."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "갑자기 더워졌다."
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "통제할 수 없을 정도로 떨리기 시작했다."
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr "%1$s이(가) 말했다. \"%2$s\""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr "%1$s이(가) 화났다!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "천식으로 인해 호흡곤란이 일어났다!"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr "산소호흡기를 사용한 다음 다시 잠을 청합니다."
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr "흡입기를 사용하고 다시 잠을 잡니다."
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "남아있던 마지막 흡입기를 사용했다."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] "흡입기를 사용했다, 앞으로 %d회 쓸 수있다."
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] ""
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "햇빛이 피부를 태우고 있다!"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "햇빛이 거슬린다."
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "햇빛을 견딜 수 없다!"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "햇빛이 거슬려 잘 보이지 않는다."
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr "이가 빠졌다!"
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "붕붕"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "갑자기 아무것도 들리지 않는다!"
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "갑자기 눈 앞이 보이지 않는다!"
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr "당신의 방사능 센서로부터 오는 비정상적인 신호가 느껴진다."
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr "전력 시스템에 과부하가 걸려 가슴이 타는 듯 아프다!"
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "전력 누출로 인해 고통이 느껴진다!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr "%s이(가) 전력누출에 영향을 받은 것 같다."
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "산성액 누출로 화상을 입었다!"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "배터리가 약간 방전되었다."
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "바이오닉에서 시끄러운 소음이 난다!"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "당신은 잘못된 생체 공학적인 떨림을 느낍니다."
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr "치직!"
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "시야가 화소 단위로 쪼개지고 있다!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr "고장난 바이오닉이 경련을 유발해서 바닥에 쓰러졌다!"
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr "합선된 바이오닉이 떨림을 유발한다."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "고장난 바이오닉이 가려움증을 유발한다!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr "근육에 경련이 일어났다!"
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr "지면에 쓰러졌다!"
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr "호흡이 가빠진다."
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr "떨림이 멈추지 않는다."
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr "의식을 잃었다!"
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "호흡 속도가 느려진다."
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr "비틀거리다 쓰러졌다!"
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr "피곤한 듯이 눈을 비볐다."
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr "작은 하품을 내뱉었다."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr "등을 쭉 늘였다."
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr "정신적인 피로감이 느껴진다."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr "잠깐 어지러움을 느꼈다."
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr "불편할 정도로 근육이 경련한다."
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr "시야가 약간 흐려졌다."
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr "마음이 잠시동안 무의식 속으로 빠져듭니다."
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr "근육이 스트레스적으로 쑤신다."
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr "산만할 정도로 아픈 두통을 가진다."
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr "여러분은 속이 쓰리고 입안에서 산 맛이 나는 것을 느낍니다."
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr "여러분의 마음은 너무 피곤해서 여러분은 더 이상 눈을 믿을 수 없다고 느낍니다."
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr "여러분의 근육은 걷잡을 수 없이 경련을 일으키고, 균형을 유지하는 데 어려움을 겪습니다."
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr "다리가 후들후들 떨린다."
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr "떨어졌다!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr "방사능 배지가 %1$s에서 %2$s로 바뀌었다!"
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr "%s이(가) 재생되기 시작했다!"
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr ""
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr ""
@@ -207955,8 +211597,8 @@ msgstr ""
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "%s이(가) 침대에 걸렸다."
+msgid "The %s stumbles over the cot!"
+msgstr ""
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -208111,11 +211753,6 @@ msgstr "올가미가 다리에 걸렸다."
 msgid "A snare closes on <npcname>s leg."
 msgstr "올가미가 <npcname>의 다리에 걸렸다."
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr ""
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -208337,6 +211974,12 @@ msgstr "<npcname>이(가) 아래층으로 떨어졌다!"
 msgid "You fall down under %s!"
 msgstr "%s 밑으로 떨어졌다!"
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] ""
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname>이(가) 날갯짓을 하며 우아하게 착지했다."
@@ -208471,6 +212114,10 @@ msgstr ""
 msgid "Select part"
 msgstr "부품 선택"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white>소요 시간:</color>\n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr "<color_white>필요 기술:</color>\n"
@@ -210903,8 +214550,8 @@ msgstr "@ %d: %s  "
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
-msgstr "'%s'을(를).."
+msgid "Set '%s' to…"
+msgstr ""
 
 #: src/wish.cpp
 msgid " (current)"
diff --git a/lang/po/pl.po b/lang/po/pl.po
index d77d81e4fec18..2c42ef862f32f 100644
--- a/lang/po/pl.po
+++ b/lang/po/pl.po
@@ -3,18 +3,18 @@
 # Wojciech K <wojter321-98@o2.pl>, 2018
 # Millennium Falcon <srebnypatryk@gmail.com>, 2018
 # Radomir Kozłowski <avikarrkorax@gmail.com>, 2018
-# Brett Dong <brett.browning.dong@gmail.com>, 2019
-# Ewa Cichosz <marchefe@gmail.com>, 2019
 # Faalagorn, 2019
 # Artur Gromek <artur.gromek@gmail.com>, 2019
+# Brett Dong <brett.browning.dong@gmail.com>, 2019
 # Aleksander Sienkiewicz <nexus.mrsep@gmail.com>, 2019
+# Ewa Cichosz <marchefe@gmail.com>, 2019
 # Chris Bittner <krzysztofbittner@hotmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
 "Last-Translator: Chris Bittner <krzysztofbittner@hotmail.com>, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/cataclysm-dda-translators/teams/2217/pl/)\n"
@@ -215,6 +215,19 @@ msgstr ""
 msgid "watery plutonium slurry"
 msgstr "wodnista zawiesina plutonu"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr "kamień"
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr ""
+"Kamień wielkości piłki futbolowej. Niezła broń ręczna, przydatna także do "
+"rzucania w przeciwnika."
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "kamyk"
@@ -350,6 +363,10 @@ msgid ""
 "or shape.  It has been slightly ground to make its properties more uniform."
 "  Only the truly desperate would attempt to reload with this."
 msgstr ""
+"Proch strzelniczy o jakości broni palnej, mieszany bez względu na skład, "
+"szybkość spalania i kształt. Został lekko zmielony, aby jego właściwości "
+"były bardziej jednolite. Tylko prawdziwie zdesperowani próbowaliby tym "
+"przeładować."
 
 #: lang/json/AMMO_from_json.py
 msgid "smokeless shotgun powder"
@@ -732,12 +749,8 @@ msgstr "kolczasta rakieta domowej roboty"
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
+" of this grade of weapon, but packs a fierce punch… if it hits."
 msgstr ""
-"Domowej roboty rakieta złożona z kolca przyspawanego na rurze, którą "
-"wypełniono improwizowanym paliwem rakietowym. Okropnie niecelna jak można "
-"się spodziewać po tej klasie broni, ale przypakuje ostry cios... jeśli "
-"trafi."
 
 #: lang/json/AMMO_from_json.py
 msgid "explosive home-made rocket"
@@ -789,11 +802,9 @@ msgstr "niedokończony węglik wapnia"
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
 msgstr ""
-"Niekompletny proces przekształcania węgla i wapna w węglik wapnia. "
-"Bezużyteczne w tym stanie."
 
 #: lang/json/AMMO_from_json.py
 msgid "chain link"
@@ -1148,6 +1159,10 @@ msgid ""
 "smoke, that is deadly to bacteria and humans alike, or oxidized to make "
 "paper-bleaching agents."
 msgstr ""
+"Garść czystej siarki. Siarka, stosowana głównie do produkcji akumulatorów, "
+"jest czasem używana jako paliwo do materiałów wybuchowych. Można ją spalić, "
+"aby wytworzyć kwaśny dym, który jest śmiertelny zarówno dla bakterii, jak i "
+"ludzi, lub utlenić, aby uzyskać środki wybielające papier."
 
 #: lang/json/AMMO_from_json.py
 msgid "chunk of sulfur"
@@ -1307,8 +1322,8 @@ msgstr[3] ""
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1322,7 +1337,7 @@ msgstr[3] ""
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr ""
@@ -1338,10 +1353,10 @@ msgstr[3] ""
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1355,8 +1370,8 @@ msgstr[3] ""
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
 msgstr ""
 
@@ -1392,9 +1407,9 @@ msgstr[3] ""
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -1716,8 +1731,8 @@ msgstr[3] ""
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py
@@ -2154,7 +2169,7 @@ msgstr[3] ""
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
 msgstr ""
@@ -3660,41 +3675,47 @@ msgid "reloaded .460 Rowland"
 msgstr "zregenerowany .460 Rowland"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr "5.56 NATO smugowy"
+msgid ".50 BMG M17 tracer"
+msgstr ""
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M17 tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
 msgstr ""
-"Smugowy wariant potężnego pocisku snajperskiego .50 BMG. Ładunek smugowy "
-"pozwala śledzić tor lotu pocisku i utrzymywać go w celu, kosztem ryzyka "
-"podpalenia łatwopalnych substancji."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr ".50 BMG"
+msgid ".50 BMG M33 Ball"
+msgstr ""
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"Kule kalibru .50 BMG to bardzo potężne naboje karabinowe przeznaczone do "
-"dalekosiężnych strzałów. Niezrównana celność i siła przebicia pancerzy "
-"czynią go jeden z najbardziej zabójczych naboi. Jedynie olbrzymi odrzut i "
-"hałas wystrzału ograniczają jego zastosowania."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
-msgstr ".50 BMG przeciwpancerne"
+msgid ".50 BMG Match"
+msgstr ""
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG Match
+#: lang/json/AMMO_from_json.py
+msgid ""
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG M2 AP"
+msgstr ""
+
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
@@ -3704,6 +3725,23 @@ msgstr ""
 "wytrzymałej stali wolframowej. Powiększono tym siłę przepicia, zmniejszając "
 "obrażenia."
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr ""
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
 msgstr "zregenerowany .50 BMG smugowy"
@@ -3711,30 +3749,24 @@ msgstr "zregenerowany .50 BMG smugowy"
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
 msgstr ""
-"Smugowy wariant potężnego pocisku snajperskiego .50 BMG. Ładunek smugowy "
-"pozwala śledzić tor lotu pocisku i utrzymywać go w celu, kosztem ryzyka "
-"podpalenia łatwopalnych substancji. Ręcznie zregenerowany."
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr "zregenerowany .50 BMG"
+msgid "reloaded .50 BMG Match"
+msgstr ""
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-"Pociski kalibru .50 BMG to bardzo potężne naboje karabinowe przeznaczone do "
-"dalekosiężnych strzałów. Niezrównana celność i siła przebicia pancerzy "
-"czynią go jeden z najbardziej zabójczych naboi. Jedynie olbrzymi odrzut i "
-"hałas wystrzału ograniczają jego zastosowania. Ręcznie zregenerowany."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
@@ -3743,13 +3775,9 @@ msgstr "zregenerowany .50 BMG przeciwpancerny"
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
 msgstr ""
-"Wariant pocisków .50 BMG w których użyto rdzenia z bardzo gęstej i "
-"wytrzymałej stali wolframowej. Powiększono tym siłę przepicia, zmniejszając "
-"obrażenia. Ręcznie zregenerowany."
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -4851,6 +4879,106 @@ msgstr "Trochę zarodników grzybów."
 msgid "fungal flower"
 msgstr "grzybiczy kwiat"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr ""
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr ""
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr ""
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr ""
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr ""
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr ""
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr ""
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr ""
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr ""
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr ""
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -5029,7 +5157,7 @@ msgstr[3] ""
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
 msgstr ""
@@ -5123,11 +5251,9 @@ msgstr "zawias drzwiowy"
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
 msgstr ""
-"Mały metalowy zawias z dwiema metalowymi płytkami z otworami na śruby. "
-"Przydatne do robienia drzwi."
 
 #: lang/json/AMMO_from_json.py
 msgid "tin powder"
@@ -5183,6 +5309,395 @@ msgid ""
 "explosions."
 msgstr ""
 
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr ""
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr ""
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr ""
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr ""
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr ""
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr ""
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] "arkusz neoprenu"
+msgstr[1] "arkusz neoprenu"
+msgstr[2] "arkusz neoprenu"
+msgstr[3] "arkusz neoprenu"
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr ""
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr ""
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr ""
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr ""
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
 msgid_plural "handloaded .22 CB"
@@ -5833,6 +6348,18 @@ msgstr ""
 "płonąć w wysokiej temperaturze po trafieniu w cel, przebijając pancerz i "
 "powodując zapłon palnych substancji. "
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr ""
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -5888,11 +6415,30 @@ msgstr[3] "skrystalizowanych mocy"
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr ""
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr ""
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
 msgstr ""
-"Jakaś skrystalizowana moc. Może być ponownie załadowana do kryształów mocy, "
-"ale nigdy nie może być rozładowana."
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "fire lance charge"
@@ -6498,15 +7044,6 @@ msgstr ""
 "Amalgam różnych organicznych substancji, zawierających wszystko co glut "
 "potrzebuje dla zdrowia. Tak myślisz..."
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "kamień"
-msgstr[1] "kamienie"
-msgstr[2] "kamienie"
-msgstr[3] "kamienie"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -7168,8 +7705,10 @@ msgstr[3] "pas piersiowy"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "Chowasz swój %s do pochwy"
@@ -7936,6 +8475,52 @@ msgid ""
 "small straps designed to better distribute the weight."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -8130,6 +8715,32 @@ msgstr ""
 "Kolorowy i absurdalny kostium odpowiedni dla klowna. Zapewnia przyzwoitą "
 "ilość miejsca w kieszeniach."
 
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
@@ -8455,6 +9066,24 @@ msgstr ""
 "Biała, zapinana na guziki, z długimi rękawami, kołnierzykiem i mankietami. "
 "Wygląda profesjonalnie!"
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -8633,6 +9262,36 @@ msgstr ""
 "Sakwa noszona na biodrze dzięki zintegrowanemu paskowi. Zapewnia nieco "
 "przestrzeni minimalnie krępując ruchy."
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -8650,6 +9309,38 @@ msgstr ""
 "Podbita kurtka z rzepami na plecach używana w szermierce w celu zapobiegania"
 " wypadkom. Nie ma kieszeni, ale jest bardzo wygodna."
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -8678,6 +9369,36 @@ msgstr ""
 "Wzmocnione spodnie szermiercze używane podczas pojedynków by zapobiegać "
 "zranieniu."
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -9143,23 +9864,6 @@ msgstr[3] "futrzane rękawice"
 msgid "A pair of warm fur gloves.  They are somewhat cumbersome."
 msgstr "Para ciepłych futrzanych rękawic. Mocno krępują dłonie."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] "rękawice do nurkowania ocalonych"
-msgstr[1] "rękawice do nurkowania ocalonych"
-msgstr[2] "rękawice do nurkowania ocalonych"
-msgstr[3] "rękawice do nurkowania ocalonych"
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr ""
-"Para przerabianych wzmacnianych Kevlarem rękawic z neoprenu zmodyfikowanych "
-"do ochrony przed żywiołami i komfortu nawet w ekstremalnych warunkach."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -9239,6 +9943,22 @@ msgstr ""
 "zmodyfikowanych do ochrony przed żywiołami i komfortu nawet w ekstremalnych "
 "warunkach."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -9528,19 +10248,6 @@ msgstr ""
 "Duża para gogli, które odcinają oczy od warunków zewnętrznych. Świetnie "
 "chronią przed złymi warunkami środowiskowymi."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] "okulary pływackie"
-msgstr[1] "okulary pływackie"
-msgstr[2] "okulary pływackie"
-msgstr[3] "okulary pływackie"
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "Okulary przeznaczone do pływania w nich."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -9589,25 +10296,6 @@ msgstr ""
 "Pełnej długości palto z dwoma rzędami guzików szyte z grubej tkaniny "
 "wełnianej. Krępuje ruchy, ale jest ciepłe i ma głębokie kieszenie."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] "kombinezon do nurkowania ocalonych"
-msgstr[1] "kombinezon do nurkowania ocalonych"
-msgstr[2] "kombinezon do nurkowania ocalonych"
-msgstr[3] "kombinezon do nurkowania ocalonych"
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr ""
-"Domowej roboty lekki kombinezon ochronny powstały z połączenia pociętej "
-"kamizelki kuloodpornej i wzmacnianego neoprenowego kombinezonu. Chroni "
-"zarówno przed żywiołami jak i obrażeniami."
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -10248,22 +10936,6 @@ msgstr ""
 "Przerabiany wzmacniany kaptur z Nomeksu i Kevlaru, bardzo trwały i "
 "wytrzymały."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] "kaptur do nurkowania ocalonych"
-msgstr[1] "kaptur do nurkowania ocalonych"
-msgstr[2] "kaptur do nurkowania ocalonych"
-msgstr[3] "kaptur do nurkowania ocalonych"
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr ""
-"Przerabiany wzmacniany kaptur z neoprenu i Kevlaru, bardzo trwały i "
-"wytrzymały."
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -11159,18 +11831,25 @@ msgstr[2] "skórzany pas"
 msgstr[3] "skórzany pas"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "Wkładasz swój %s w swój %s"
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "Włożyć co za pas?"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
 msgstr "Skórzany pas. Użyteczny by dopasować parę spodni."
 
@@ -11376,6 +12055,22 @@ msgid ""
 "variety is favored by the military."
 msgstr "Zestaw sakw wiązanych na udach, stosowanych przez wojsko."
 
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
 msgid_plural "Linux t-shirts"
@@ -12419,42 +13114,6 @@ msgstr ""
 "Długa pochwa do noszenia mieczy i innych długich ostrzy. Posiada pasek, "
 "którym można dostosować przypięcie. Aktywuj by wyjąć/schować broń."
 
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] "kostium na rekiny"
-msgstr[1] "kostium na rekiny"
-msgstr[2] "kostium na rekiny"
-msgstr[3] "kostium na rekiny"
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr ""
-"Jednoczęściowa kolczuga używana przez nurków dla ochrony przed krwiożerczymi"
-" rekinami. W zestawie z plastikowym hełmem i butami."
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] "kostium na rekiny faradaya"
-msgstr[1] "kostium na rekiny faradaya"
-msgstr[2] "kostium na rekiny faradaya"
-msgstr[3] "kostium na rekiny faradaya"
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr ""
-"Jednoczęściowa kolczuga używana przez nurków dla ochrony przed krwiożerczymi"
-" rekinami. Jej ogniwa są połączone więc chroni przez porażeniem "
-"elektrycznością."
-
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
 msgid_plural "sheathes"
@@ -12545,6 +13204,21 @@ msgid ""
 "from cuts."
 msgstr "Szorty dżinsowe, o grubym splocie chroniącym przez skaleczeniami."
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
@@ -13123,13 +13797,9 @@ msgstr[3] "jednoczęściowy kombinezon dla pacjentów"
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
 msgstr ""
-"Cienki jednoczęściowy kombinezon z krótkim rękawkiem i krótkimi nogawkami. "
-"Patrząc na udziwnione przeszycia i przeróbki tracisz ochotę by dowiedzieć "
-"dla kogo je zaprojektowano. Zapewnia niewielką przestrzeń w kieszeni i nie "
-"jest zbyt krępujący."
 
 #: lang/json/ARMOR_from_json.py
 msgid "suit"
@@ -13217,6 +13887,7 @@ msgstr[3] "pas ocalonych"
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "Schowaj ostrze"
@@ -13687,19 +14358,6 @@ msgstr ""
 "piratem z Karaibów, zarządcą koloni lub kapitanem postapokaliptycznego "
 "statku, to będzie dla ciebie doskonały wybór."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] "kąpielówki"
-msgstr[1] "kąpielówki"
-msgstr[2] "kąpielówki"
-msgstr[3] "kąpielówki"
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "Kąpielówki czyli bielizna na plażę i do pływania, z siatką."
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
@@ -14008,68 +14666,6 @@ msgstr ""
 "Elegancka kamizelka. Idealna na okazje gdzie sama koszula była by zbyt "
 "luźnym strojem a pełen garnitur przedobrzeniem."
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] "strój do nurkowania"
-msgstr[1] "strój do nurkowania"
-msgstr[2] "strój do nurkowania"
-msgstr[3] "strój do nurkowania"
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "Pokrywający całe ciało neoprenowy piankowy strój do nurkowania."
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] "rękawice pływackie"
-msgstr[1] "rękawice pływackie"
-msgstr[2] "rękawice pływackie"
-msgstr[3] "rękawice pływackie"
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr ""
-"Para bardzo elastycznych neoprenowo-silikonowych gumowych rękawic do użytku "
-"podwodnego."
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] "kaptur do nurkowania"
-msgstr[1] "kaptur do nurkowania"
-msgstr[2] "kaptur do nurkowania"
-msgstr[3] "kaptur do nurkowania"
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr "Neoprenowy kaptur nurka stanowiący uzupełnienie stroju do nurkowania."
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] "damski strój pływacki"
-msgstr[1] "damski strój pływacki"
-msgstr[2] "damski strój pływacki"
-msgstr[3] "damski strój pływacki"
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr ""
-"Krótki strój pływacki dla kobiet z długimi rękawami i różowymi wstawkami, "
-"podkreślający dekolt i biodra. Nie tak ochronny jak pełny strój pływacki ale"
-" o wiele mniej krępujący."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -14479,6 +15075,39 @@ msgstr ""
 "Plastikowa płachta z kilkoma metalowymi oczkami do przywiązywania sznurkiem "
 "lub kablem. Dobra do improwizowanej ochrony przed deszczem."
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -17780,6 +18409,182 @@ msgstr ""
 "zbroje DoubleTech kontrola i klimatyzacja wymaga bezpośredniego kontaktu ze "
 "skórą."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] "kąpielówki"
+msgstr[1] "kąpielówki"
+msgstr[2] "kąpielówki"
+msgstr[3] "kąpielówki"
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "Kąpielówki czyli bielizna na plażę i do pływania, z siatką."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] "strój do nurkowania"
+msgstr[1] "strój do nurkowania"
+msgstr[2] "strój do nurkowania"
+msgstr[3] "strój do nurkowania"
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "Pokrywający całe ciało neoprenowy piankowy strój do nurkowania."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] "kaptur do nurkowania"
+msgstr[1] "kaptur do nurkowania"
+msgstr[2] "kaptur do nurkowania"
+msgstr[3] "kaptur do nurkowania"
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr "Neoprenowy kaptur nurka stanowiący uzupełnienie stroju do nurkowania."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] "kaptur do nurkowania ocalonych"
+msgstr[1] "kaptur do nurkowania ocalonych"
+msgstr[2] "kaptur do nurkowania ocalonych"
+msgstr[3] "kaptur do nurkowania ocalonych"
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr ""
+"Przerabiany wzmacniany kaptur z neoprenu i Kevlaru, bardzo trwały i "
+"wytrzymały."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] "kombinezon do nurkowania ocalonych"
+msgstr[1] "kombinezon do nurkowania ocalonych"
+msgstr[2] "kombinezon do nurkowania ocalonych"
+msgstr[3] "kombinezon do nurkowania ocalonych"
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr ""
+"Domowej roboty lekki kombinezon ochronny powstały z połączenia pociętej "
+"kamizelki kuloodpornej i wzmacnianego neoprenowego kombinezonu. Chroni "
+"zarówno przed żywiołami jak i obrażeniami."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] "rękawice do nurkowania ocalonych"
+msgstr[1] "rękawice do nurkowania ocalonych"
+msgstr[2] "rękawice do nurkowania ocalonych"
+msgstr[3] "rękawice do nurkowania ocalonych"
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr ""
+"Para przerabianych wzmacnianych Kevlarem rękawic z neoprenu zmodyfikowanych "
+"do ochrony przed żywiołami i komfortu nawet w ekstremalnych warunkach."
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] "damski strój pływacki"
+msgstr[1] "damski strój pływacki"
+msgstr[2] "damski strój pływacki"
+msgstr[3] "damski strój pływacki"
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr ""
+"Krótki strój pływacki dla kobiet z długimi rękawami i różowymi wstawkami, "
+"podkreślający dekolt i biodra. Nie tak ochronny jak pełny strój pływacki ale"
+" o wiele mniej krępujący."
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] "kostium na rekiny faradaya"
+msgstr[1] "kostium na rekiny faradaya"
+msgstr[2] "kostium na rekiny faradaya"
+msgstr[3] "kostium na rekiny faradaya"
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+"Jednoczęściowa kolczuga używana przez nurków dla ochrony przed krwiożerczymi"
+" rekinami. Jej ogniwa są połączone więc chroni przez porażeniem "
+"elektrycznością."
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] "kostium na rekiny"
+msgstr[1] "kostium na rekiny"
+msgstr[2] "kostium na rekiny"
+msgstr[3] "kostium na rekiny"
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr ""
+"Jednoczęściowa kolczuga używana przez nurków dla ochrony przed krwiożerczymi"
+" rekinami. W zestawie z plastikowym hełmem i butami."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] "okulary pływackie"
+msgstr[1] "okulary pływackie"
+msgstr[2] "okulary pływackie"
+msgstr[3] "okulary pływackie"
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "Okulary przeznaczone do pływania w nich."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] "rękawice pływackie"
+msgstr[1] "rękawice pływackie"
+msgstr[2] "rękawice pływackie"
+msgstr[3] "rękawice pływackie"
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr ""
+"Para bardzo elastycznych neoprenowo-silikonowych gumowych rękawic do użytku "
+"podwodnego."
+
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
 msgid_plural "helmet nettings"
@@ -18496,6 +19301,62 @@ msgstr[1] "bandolier do strzelb"
 msgstr[2] "bandolier do strzelb"
 msgstr[3] "bandolier do strzelb"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -18522,7 +19383,7 @@ msgstr[3] ""
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
 msgstr ""
 
@@ -18753,6 +19614,28 @@ msgid ""
 "minimize encumbrance."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -19011,6 +19894,10 @@ msgid ""
 "cost of energy, reducing their ability to deal damage.  Bullets will be "
 "deflected more than swords and those in turn more than massive objects."
 msgstr ""
+"Ten bionik rzutuje cienkie pole siłowe wokół ciała użytkownika. Każda próba "
+"penetracji tego pola ma szansę zostać odbita kosztem energii, co zmniejsza "
+"ich zdolność do zadawania obrażeń. Pociski będą odbijane bardziej niż "
+"miecze, a te z kolei bardziej niż masywne przedmioty."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Alarm System CBM"
@@ -19388,9 +20275,9 @@ msgstr[3] "Spalacz Etanolu CBM"
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -19402,8 +20289,7 @@ msgstr[2] "Aero-Skraplacz CBM"
 msgstr[3] "Aero-Skraplacz CBM"
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -19484,10 +20370,10 @@ msgstr[3] "Palcowy E-Wytrych"
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -19907,7 +20793,7 @@ msgstr[3] "Interfejs Pancerzy Wspomaganych Wer.II CBM"
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
 
@@ -19978,6 +20864,9 @@ msgid ""
 "or airborne diseases find their way into the windpipe, the filter will "
 "attempt to remove them."
 msgstr ""
+"Zaawansowany system filtracji wszczepiony w tchawicę. Jeśli toksyny lub "
+"choroby przenoszone przez powietrze przedostaną się do tchawicy, filtr "
+"spróbuje je usunąć."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Radiation Scrubber System CBM"
@@ -20556,9 +21445,8 @@ msgstr[3] "Świecąca Rzecz"
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
-msgstr "To... rzecz? I świeci, a przynajmniej świeciła jak była przyłączona."
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
+msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Leaky Bionic"
@@ -21271,8 +22159,8 @@ msgstr[3] "Człowiek na talerzu."
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
-msgstr "To jest... To jest książka kucharska!"
+msgid "It's… it's a cookbook!"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Cucina Italiana"
@@ -21395,11 +22283,8 @@ msgstr[3] "PE050 \"Alfa\": Raport Wstępny"
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
+"\"APPROVED\"…"
 msgstr ""
-"Ten zwitek papierów, datowany na dwa tygodnie przed dniem w którym się to "
-"wszystko zaczęło - opisuje nowy związek chemiczny, i jego skutki na ludzkich"
-" osobnikach badawczych. Ostemplowano \"ZATWIERDZONO\""
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Dionne"
@@ -21433,8 +22318,8 @@ msgstr[3] "PE065 \"Chimera\": Wzorcowe Rozwiązania."
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -21450,11 +22335,8 @@ msgstr[3] "dziennik badań - Smythe"
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
+"look promising but the procurement methods seem awfully vague…"
 msgstr ""
-"Ten zespołowy dziennik opisuje szereg eksperymentów mutagennych, z grupy "
-"związków pochodzących ze skażonego XE037 ciała. Rezultaty są obiecujące, ale"
-" metody pozyskiwania są dość niejasne."
 
 #: lang/json/BOOK_from_json.py
 msgid "standpipe maintenance log"
@@ -21469,11 +22351,8 @@ msgstr[3] "logi konserwacji pompy zwrotnej"
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
+"with… a chemical formula?"
 msgstr ""
-"Ten segregator opisuje planowane prace konserwacyjne dla kilku systemów "
-"hydraulicznych rozmieszczonych wskroś obiektu. Wśród nich, na kilku "
-"skoroszytach znajduje się rozpisana... formuła chemiczna?"
 
 #: lang/json/BOOK_from_json.py
 msgid "chemical reference-CLASSIFIED"
@@ -21529,11 +22408,8 @@ msgstr[3] "PE023 \"Medyczny\": Zastosowania i Wyniki Badań"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
 msgstr ""
-"Zbindowany, napisany technicznym językiem raport, opisujący nowy związek "
-"chemiczny i jego działanie na badanych ludzi. Opieczętowano \"ZATWIERDZONO\""
-" ...."
 
 #: lang/json/BOOK_from_json.py
 msgid "PE070 \"Raptor\": Proposal"
@@ -21896,11 +22772,8 @@ msgstr[3] "dziennik badań - Herrera"
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
+"symbols you've not seen before…"
 msgstr ""
-"Ten opasły tom zawiera szereg diagramów i specyfikacji technicznych o "
-"różnych materiałów elektronicznych. Niektóre diagramy zawierają symbole "
-"których wcześniej nigdzie nie widziałeś."
 
 #: lang/json/BOOK_from_json.py
 msgid "2XI design binder-CLASSIFIED"
@@ -21985,13 +22858,13 @@ msgstr[3] ""
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -22397,13 +23270,9 @@ msgstr[3] "Samopomoc Ładowacza"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
 msgstr ""
-"Poradnik w stylu 'wszystko co kiedykolwiek chciałbyś wiedzieć o ręcznym "
-"przeładowywaniu i recyklingu amunicji', zamknięty w... dziecioodpornej "
-"oprawie. Najwyraźniej dość odpowiedzialny, gdyż rozdział o amunicji "
-"wybuchowej opisuje ją w doskonałych szczegółach."
 
 #: lang/json/BOOK_from_json.py
 msgid "Rivtech design binder"
@@ -23050,7 +23919,7 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -24595,6 +25464,34 @@ msgid ""
 " that the author's real name is Fereidoun M. Esfandiary."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
 msgid_plural "phone books"
@@ -24688,8 +25585,8 @@ msgstr[3] "księgi rachunkowe korporacji"
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
-msgstr "Gdybyś tylko wiedział jak szukać rzeczy, które nie pasują..."
+msgid "If you knew what to look for something might stand out…"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "patient treatment records"
@@ -24973,6 +25870,106 @@ msgstr ""
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -26144,13 +27141,14 @@ msgstr "Gra, w której gracze próbują dowiedzieć się, kto zamordował lokaja
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -26161,32 +27159,69 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
 "along with emulating their healing factor."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -26760,7 +27795,7 @@ msgstr ""
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr ""
 
@@ -27862,6 +28897,43 @@ msgstr "duży ludzki żołądek"
 msgid "The stomach of a large humanoid creature.  It is surprisingly durable."
 msgstr "Żołądek dużego humanoida. Zadziwiająco odporny."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr ""
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr ""
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -27915,6 +28987,65 @@ msgid ""
 msgstr ""
 "Nieduży jadalny ścinek mięsa. Niewielki, ale w niedostatku i tyle się nada."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr ""
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr ""
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -27957,6 +29088,26 @@ msgstr[1] "gotowane skrawki mięsa"
 msgstr[2] "gotowane skrawki mięsa"
 msgstr[3] "gotowane skrawki mięsa"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr ""
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "surowe podroby"
@@ -28206,8 +29357,8 @@ msgstr[3] "surowe mózgi"
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
-msgstr "Zwierzęcy mózg. Nie chciałbyś jeść tego na surowo..."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cooked brains"
@@ -28267,8 +29418,8 @@ msgstr "gotowana nerkówka"
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
-msgstr "Zwykle jest to przysmak, ale brakuję trochę... czegoś."
+msgid "Normally a delicacy, it needs a little… something."
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bone"
@@ -28330,6 +29481,82 @@ msgstr ""
 "jadalny przez bardzo długi czas, i może być wykorzystany do wielu potraw i "
 "innych celów."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr ""
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr ""
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr ""
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr ""
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
 msgid_plural "chunks of tainted meat"
@@ -28530,13 +29757,8 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
-"Gruba, olbrzymia masa ciała na pierwszy rzut oka przypominająca serce ssaka,"
-" otoczona w prążkowane rowki wielkości twojej głowy. Jest wciąż pełna, em, "
-"cokolwiek jest odpowiednikiem krwi żaberzwłoków i czujesz że jest ciężkie. "
-"Po wszystkim co ostatnio było ci widziane, nie możesz zapomnieć starego "
-"porzekadła o zjadaniu serc swoich wrogów..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "desiccated putrid heart"
@@ -28553,7 +29775,7 @@ msgstr ""
 "zostało wycięte i odsączone ze krwi. Może być zjedzone jeśli doskwiera ci "
 "głód, ale wygląda *obrzydliwie*."
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] ""
@@ -28920,7 +30142,7 @@ msgstr[3] ""
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
 msgstr ""
 
@@ -29955,13 +31177,14 @@ msgstr "Krążki ananasa w wodnej zalewie. Całkiem smaczne."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
-msgstr[0] "lemoniada w proszku"
-msgstr[1] "lemoniada w proszku"
-msgstr[2] "lemoniada w proszku"
-msgstr[3] "lemoniada w proszku"
+msgid_plural "lemonade drink mix"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -30846,8 +32069,8 @@ msgstr[3] "cukierki z masłem orzechowym"
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
-msgstr "Garść kubełków z masłem orzechowym... twoje ulubione."
+msgid "A handful of peanut butter cups… your favorite!"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate candy"
@@ -30983,10 +32206,8 @@ msgstr "Pyszny tort czekoladowy. Ta polewa... mmm... polewa."
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr ""
-"Ciasto pokryte najgrubszą polewą jaką kiedykolwiek widziałeś. Ktoś wypisał "
-"na nim jakieś głupoty w cudzysłowach. "
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate-covered coffee bean"
@@ -31038,8 +32259,8 @@ msgstr[3] "czekoladki miętowe"
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
-msgstr "Garść miękkich czekoladek wypełnionych miętowym nadzieniem... mniam!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Necco wafers"
@@ -31765,6 +32986,17 @@ msgstr ""
 "jest zbyt smaczna i wydaje się być lekko gumowata, ale za to pożywna. "
 "Zapewnia pełen żołądek kosztem odstręczającego smaku."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr ""
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "sardynki w puszce"
@@ -33681,8 +34913,8 @@ msgstr[3] ""
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -33753,14 +34985,8 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
-"Kapsułka żelowa o kolorze czerwonego jabłka wielkości twojego kciuka, "
-"wypełniona gęstym oleistym płynem który zmienia się z czarnego na fioletowy "
-"w nieprzewidywalnych odstępach czasu, nakrapiany w maleńkie szare kropki. "
-"Biorąc pod uwagę miejsce w którym to zdobyłeś albo jest bardzo silne, albo "
-"mocno eksperymentalne. Trzymając to, wszystkie drobne bóle zdają się znikać,"
-" tylko na chwilę..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattail jelly"
@@ -34215,11 +35441,9 @@ msgstr "abstrakcyjny smak mutagenu w kroplówce"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
 msgstr ""
-"Super-skoncentrowany mutagen. Potrzebujesz strzykawki do wstrzyknięcia... "
-"jeżeli rzeczywiscie tego chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagenic serum"
@@ -34233,10 +35457,8 @@ msgstr "serum alfa"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
+"to inject it… if you really want to?"
 msgstr ""
-"Super-skoncentrowany mutagen bardzo przypominający krew. Potrzebujesz "
-"strzykawki do wstrzyknięcia... jeżeli rzeczywiście tego chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "beast serum"
@@ -34246,10 +35468,8 @@ msgstr "bestialskie serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
-"Super skoncentrowany mutagen w kolorze czerwonym jak peleryna matadora. "
-"Potrzebujesz strzykawki, żeby go wstrzyknąć... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bird serum"
@@ -34259,10 +35479,8 @@ msgstr "ptasie serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
+"need a syringe to inject it… if you really want to?"
 msgstr ""
-"Super-skoncentrowany mutagen w kolorze nieba sprzed kataklizmu. Potrzebujesz"
-" strzykawki do wstrzyknięcia... jeżeli rzeczywiście tego chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattle serum"
@@ -34272,10 +35490,8 @@ msgstr "bydlęce serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
+"inject it… if you really want to?"
 msgstr ""
-"Super-skoncentrowany mutagen w kolorze trawy. Potrzebujesz strzykawki do "
-"wstrzyknięcia... jeżeli rzeczywiście tego chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cephalopod serum"
@@ -34285,10 +35501,8 @@ msgstr "głowonogie serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
+"it… if you really want to?"
 msgstr ""
-"Super skoncentrowany mutagen tak czarny jak atrament. Potrzebujesz "
-"strzykawki, żeby go wstrzyknąć... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chimera serum"
@@ -34298,10 +35512,8 @@ msgstr "chimeryczne serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Superskoncentrowany mutagen, który mieni się opalizacją. Potrzebujesz "
-"strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "elf-a serum"
@@ -34311,10 +35523,8 @@ msgstr "serum elf-a"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Superskoncentrowany mutagen o uderzającej sylvanowej zieleni. Potrzebujesz "
-"strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "feline serum"
@@ -34324,10 +35534,8 @@ msgstr "kocie serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Superkoncentrowany mutagen, żółty i silnie odblaskowy. Potrzebujesz "
-"strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "fish serum"
@@ -34337,10 +35545,8 @@ msgstr "rybie serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
+"top.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Super-skoncentrowany mutagen w kolorze oceanu, z białą pianą na wierzchu. "
-"Potrzebujesz strzykawki do wstrzyknięcia... jeżeli rzeczywiście tego chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "insect serum"
@@ -34350,10 +35556,8 @@ msgstr "owadzie serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Superkoncentrowany mutagen o pięknym bursztynowym kolorze. Potrzebujesz "
-"strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lizard serum"
@@ -34363,10 +35567,8 @@ msgstr "jaszczurze serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Superskoncentrowany mutagen, który zmienia różne odcienie zieleni. "
-"Potrzebujesz strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lupine serum"
@@ -34376,10 +35578,8 @@ msgstr "wilcze serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
+" inject it… if you really want to?"
 msgstr ""
-"Superkoncentrowany mutagen biały jak księżyc w pełni. Potrzebujesz "
-"strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "medical serum"
@@ -34389,11 +35589,8 @@ msgstr "medyczne serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Superskoncentrowany mutagen, który wygląda jak mieszanina płynów "
-"ustrojowych. Potrzebujesz strzykawki, aby ją wstrzyknąć ... jeśli naprawdę "
-"chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "plant serum"
@@ -34403,10 +35600,8 @@ msgstr "roślinne serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Superskoncentrowany mutagen, który wygląda jak puree ze szpinaku. "
-"Potrzebujesz strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raptor serum"
@@ -34416,11 +35611,8 @@ msgstr "drapieżne serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
+"at it.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Superkoncentrowany mutagen, który wydaje się nieznacznie przesuwać za każdym"
-" razem, gdy na niego patrzysz. Potrzebujesz strzykawki, aby ją wstrzyknąć "
-"... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "rat serum"
@@ -34430,10 +35622,8 @@ msgstr "szczurze serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Superskoncentrowany mutagen, który jest raczej nieprzyjemnym beżem. "
-"Potrzebujesz strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "slime serum"
@@ -34443,11 +35633,8 @@ msgstr "ślimacze serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Superskoncentrowany mutagen, który wygląda bardzo podobnie do czarnego "
-"szlamu w oczach zombie. Potrzebujesz strzykawki, aby ją wstrzyknąć ... jeśli"
-" naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "spider serum"
@@ -34457,10 +35644,8 @@ msgstr "pajęcze serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
-"Superkoncentrowany mutagen z zawieszonymi w nim jasnymi włóknami. "
-"Potrzebujesz strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "troglobite serum"
@@ -34470,10 +35655,8 @@ msgstr "troglobiontyczne serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
-"Superskoncentrowany mutagen, który wydaje się odskakiwać od światła. "
-"Potrzebujesz strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "ursine serum"
@@ -34483,10 +35666,8 @@ msgstr "niedźwiedzie serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
+"thick.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-"Superskoncentrowany mutagen, który ma kolor miodu i jest równie gęsty. "
-"Potrzebujesz strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mouse serum"
@@ -34496,10 +35677,8 @@ msgstr "mysie serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
-"Superkoncentrowany mutagen przypominający skroplony metal. Potrzebujesz "
-"strzykawki, aby ją wstrzyknąć ... jeśli naprawdę chcesz?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagen"
@@ -34513,10 +35692,8 @@ msgstr "zastygła krew"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
+"bubble with an intelligence of its own…"
 msgstr ""
-"Gęsty, zupowaty czarny płyn. Wygląda i pachnie ohydnie i wygląda jakby "
-"bulgotało inteligentnie samo z siebie..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "alpha mutagen"
@@ -34721,27 +35898,27 @@ msgstr ""
 "bezpieczniejszy do picia niż wcześniej."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
+msgid "pine nuts"
+msgid_plural "pine nuts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
+msgid "junipers"
+msgid_plural "junipers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -34749,80 +35926,96 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
 msgstr "Garść pistacji, których skorupy zostały obrane."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
-msgstr[0] "garść prażonych pistacji"
-msgstr[1] "garść prażonych pistacji"
-msgstr[2] "garść prażonych pistacji"
-msgstr[3] "garście prażonych pistacji"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr "Garść prażonych orzeszków pistacjowych."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
 msgstr "Garść orzechów z drzewa migdałowego, ich skorupki zostały usunięte."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
-msgstr[0] "garść prażonych migdałów"
-msgstr[1] "garście prażonych migdałów"
-msgstr[2] "garści prażonych migdałów"
-msgstr[3] "garście prażonych migdałów"
+msgid "almond pulp"
+msgid_plural "almond pulp"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of roasted almonds
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
 msgstr "Garść prażonych orzechów z drzewa migdałowego."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
+msgid "cashews"
+msgid_plural "cashews"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr "Garść solonych orzechów nerkowca."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -34832,53 +36025,53 @@ msgstr ""
 "skorupki usunięte."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
-msgstr[0] "garść pieczonych pekan"
-msgstr[1] "garście pieczonych pekan"
-msgstr[2] "garści pieczonych pekan"
-msgstr[3] "garście pieczonych pekan"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr "Garść prażonych orzechów z drzewa pekan."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
-msgstr[0] "garść orzeszków ziemnych"
-msgstr[1] "garście orzeszków ziemnych"
-msgstr[2] "garści orzeszków ziemnych"
-msgstr[3] "garście orzeszków ziemnych"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr "Słone orzeszki ziemne bez skorupek."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
+msgid "beech nuts"
+msgid_plural "beech nuts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
-msgstr[0] "garść orzechów włoskich"
-msgstr[1] "garście orzechów włoskich"
-msgstr[2] "garści orzechów włoskich"
-msgstr[3] "garście orzechów włoskich"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -34886,27 +36079,28 @@ msgid ""
 msgstr "Garść surowych twardych orzechów włoskich, bez skorupek."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
-msgstr[0] "garść prażonych orzechów włoskich"
-msgstr[1] "garście prażonych orzechów włoskich"
-msgstr[2] "garści prażonych orzechów włoskich"
-msgstr[3] "garście prażonych orzechów włoskich"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr "Garść prażonych orzechów włoskich."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
-msgstr[0] "garść łuskanych kasztanów"
-msgstr[1] "garście łuskanych kasztanów"
-msgstr[2] "garści łuskanych kasztanów"
-msgstr[3] "garść łuskanych kasztanów"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -34914,27 +36108,29 @@ msgid ""
 msgstr "Garść surowych twardych orzechów z kasztanowca, bez skorupek."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
-msgstr[0] "garść pieczonych kasztanów"
-msgstr[1] "garście pieczonych kasztanów"
-msgstr[2] "garści pieczonych kasztanów"
-msgstr[3] "garście pieczonych kasztanów"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr "Garść prażonych kasztanów z kasztanowca."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -34942,53 +36138,55 @@ msgid ""
 msgstr "Garść surowych twardych orzechów z drzewa orzechowego, bez skorupek."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
-msgstr[0] "garść prażonych orzechów laskowych"
-msgstr[1] "garście prażonych orzechów laskowych"
-msgstr[2] "garści prażonych orzechów laskowych"
-msgstr[3] "garście prażonych orzechów laskowych"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr "Garść prażonych orzechów laskowych."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
-msgstr[0] "garść łuskanych orzechów orzesznika"
-msgstr[1] "garść łuskanych orzechów orzesznika"
-msgstr[2] "garść łuskanych orzechów orzesznika"
-msgstr[3] "garść łuskanych orzechów orzesznika"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -34998,14 +36196,15 @@ msgstr ""
 "zostały obrane."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
-msgstr[0] "garść prażonych orzechów hikory"
-msgstr[1] "garście prażonych orzechów hikory"
-msgstr[2] "garści prażonych orzechów hikory"
-msgstr[3] "garście prażonych orzechów hikory"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr "Garść prażonych orzechów z drzewa orzesznika."
@@ -35020,14 +36219,14 @@ msgid "Delicious hickory nut ambrosia.  A drink worthy of the gods."
 msgstr "Przepyszna ambrozja z orzechów orzesznika. Napój godny bogów."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
-msgstr[0] "garść żołędzi"
-msgstr[1] "garść żołędzi"
-msgstr[2] "garść żołędzi"
-msgstr[3] "garść żołędzi"
+msgid "acorns"
+msgid_plural "acorns"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
@@ -35037,14 +36236,14 @@ msgstr ""
 " będziesz mógł ich zjeść."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
-msgstr[0] "garść pieczonych żołędzi"
-msgstr[1] "garście pieczonych żołędzi"
-msgstr[2] "garści pieczonych żołędzi"
-msgstr[3] "garście pieczonych żołędzi"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr "Garść prażonych żołędzi."
@@ -35708,13 +36907,14 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
-msgstr[0] "porcja zielonej pożywki"
-msgstr[1] "porcja zielonej pożywki"
-msgstr[2] "porcja zielonej pożywki"
-msgstr[3] "porcja zielonej pożywki"
+msgid_plural "soylent green powder"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -35765,13 +36965,13 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
-msgstr[0] "dawka proszku proteinowego"
-msgstr[1] "dawka proszku proteinowego"
-msgstr[2] "dawka proszku proteinowego"
-msgstr[3] "dawka proszku proteinowego"
+msgid_plural "protein powder"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -35846,79 +37046,79 @@ msgid "Very sour citrus.  Can be eaten if you really want."
 msgstr "Kwaśny cytrus. Możesz ją zjeść jeśli bardzo tego chcesz."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
-msgstr[0] "garść jagód"
-msgstr[1] "garść jagód"
-msgstr[2] "garść jagód"
-msgstr[3] "garść jagód"
+msgid "blueberries"
+msgid_plural "blueberries"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr "Niebieskie, co nie znaczy że smutne."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
-msgstr[0] "garść truskawek"
-msgstr[1] "garść truskawek"
-msgstr[2] "garść truskawek"
-msgstr[3] "garść truskawek"
+msgid "strawberries"
+msgid_plural "strawberries"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr "Pyszne, czerwone, duże soczyste jagody. Często rosną dziko na polach."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
-msgstr[0] "garść żurawin"
-msgstr[1] "garść żurawin"
-msgstr[2] "garść żurawin"
-msgstr[3] "garść żurawin"
+msgid "cranberries"
+msgid_plural "cranberries"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr "Kwaśne czerwone jagody. Dobre dla zdrowia."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
-msgstr[0] "garść malin"
-msgstr[1] "garść malin"
-msgstr[2] "garść malin"
-msgstr[3] "garść malin"
+msgid "raspberries"
+msgid_plural "raspberries"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "Słodka czerwona jagoda."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
-msgstr[0] "garść borówek"
-msgstr[1] "garść borówek"
-msgstr[2] "garść borówek"
-msgstr[3] "garść borówek"
+msgid "huckleberries"
+msgid_plural "huckleberries"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr "Borówki, często mylone z jagodami."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
-msgstr[0] "garść owoców morwy"
-msgstr[1] "garść owoców morwy"
-msgstr[2] "garść owoców morwy"
-msgstr[3] "garść owoców morwy"
+msgid "mulberries"
+msgid_plural "mulberries"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -35929,14 +37129,14 @@ msgstr ""
 "świecie."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
-msgstr[0] "garść owoców czarnego bzu"
-msgstr[1] "garść owoców czarnego bzu"
-msgstr[2] "garść owoców czarnego bzu"
-msgstr[3] "garść owoców czarnego bzu"
+msgid "elderberries"
+msgid_plural "elderberries"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr ""
@@ -35944,14 +37144,14 @@ msgstr ""
 "nadaje się do zjedzenia."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
-msgstr[0] "garść owoców dzikiej róży"
-msgstr[1] "garść owoców dzikiej róży"
-msgstr[2] "garść owoców dzikiej róży"
-msgstr[3] "garść owoców dzikiej róży"
+msgid "rose hips"
+msgid_plural "rose hips"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "Owoc zapylonego kwiatu róży."
@@ -35988,14 +37188,14 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "Owoc cytrusowy, którego smak oscyluje między kwaśnym a półsłodkim."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
-msgstr[0] "garść wiśni"
-msgstr[1] "garść wiśni"
-msgstr[2] "garść wiśni"
-msgstr[3] "garść wiśni"
+msgid "cherries"
+msgid_plural "cherries"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr "Czerwone słodkie owoce z pestką, które rosną na drzewach."
@@ -36011,14 +37211,14 @@ msgid ""
 msgstr "Garść dużych purpurowych śliwek. Zdrowe i poprawiają trawienie."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
-msgstr[0] "garść winogron"
-msgstr[1] "garść winogron"
-msgstr[2] "garść winogron"
-msgstr[3] "garść winogron"
+msgid "grapes"
+msgid_plural "grapes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr "Pęk soczystych winogron."
@@ -36073,14 +37273,14 @@ msgid "A large and very sweet fruit."
 msgstr "Duży i bardzo słodki owoc."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
-msgstr[0] "garść jeżyn"
-msgstr[1] "garść jeżyn"
-msgstr[2] "garść jeżyn"
-msgstr[3] "garść jeżyn"
+msgid "blackberries"
+msgid_plural "blackberries"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "Ciemniejszy kuzyn malin."
@@ -36123,18 +37323,29 @@ msgid ""
 msgstr "Duża, brązowa i włochata jagoda. Ma smaczny miąższ zielonego koloru."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
-msgstr[0] "garść moreli"
-msgstr[1] "garść moreli"
-msgstr[2] "garść moreli"
-msgstr[3] "garść moreli"
+msgid "apricots"
+msgid_plural "apricots"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "Miękkoskóry owoc podobny do brzoskwini."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr ""
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr ""
@@ -36341,13 +37552,13 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -36357,13 +37568,13 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
+msgid_plural "chicory"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -36493,14 +37704,14 @@ msgstr ""
 "ale doskonale nadaje się do gotowania."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
-msgstr[0] "garść mleczy"
-msgstr[1] "garść mleczy"
-msgstr[2] "garść mleczy"
-msgstr[3] "garść mleczy"
+msgid "dandelions"
+msgid_plural "dandelions"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -36650,14 +37861,14 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr "Surowa, niegotowana soczewica. Może być ugotowana."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -38838,8 +40049,8 @@ msgstr[3] ""
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -38853,7 +40064,7 @@ msgstr[3] ""
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
 msgstr ""
 
@@ -39347,7 +40558,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -39362,7 +40573,7 @@ msgstr[3] ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -39453,14 +40664,14 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "zombie voodoo doll"
-msgstr ""
+msgstr "zombie laleczka voodoo"
 
 #. ~ Description for zombie voodoo doll
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -39471,8 +40682,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -39483,8 +40695,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -39495,8 +40707,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -39507,9 +40719,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -39546,7 +40758,7 @@ msgstr[3] ""
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -39565,6 +40777,16 @@ msgid ""
 " properties."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr ""
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
 msgstr "żywiczny sznur"
@@ -40356,15 +41578,6 @@ msgstr[3] "mąk ryżowych"
 msgid "This rice flour is useful for baking."
 msgstr "Ta mąka ryżowa nadaje się do pieczenia."
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr ""
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr ""
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr "ożywcze serum"
@@ -40723,8 +41936,8 @@ msgstr[3] ""
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -40738,8 +41951,8 @@ msgstr[3] ""
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -41391,8 +42604,8 @@ msgstr[3] ""
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -42042,8 +43255,8 @@ msgstr[3] ""
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -42057,7 +43270,7 @@ msgstr[3] ""
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr ""
 
@@ -42075,69 +43288,69 @@ msgid "A root from a hickory tree.  It has an earthy smell."
 msgstr "Korzeń drzewa orzesznika. Pachnie ziemią."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
-msgstr[0] "garść orzechów orzesznika"
-msgstr[1] "garść orzechów orzesznika"
-msgstr[2] "garść orzechów orzesznika"
-msgstr[3] "garście orzechów orzesznika"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr ""
 "Garść surowych twardych orzechów z drzewa orzesznika, nadal w skorupach."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
-msgstr[0] "garść pekan"
-msgstr[1] "garść pekan"
-msgstr[2] "garść pekan"
-msgstr[3] "gaście pekan"
+msgid "pecans"
+msgid_plural "pecans"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr "Garść twardych orzechów pecan, wciąż w skorupce."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
-msgstr[0] "garść pistacji"
-msgstr[1] "garść pistacji"
-msgstr[2] "garść pistacji"
-msgstr[3] "garście pistacji"
+msgid "pistachios"
+msgid_plural "pistachios"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr ""
 "Garść surowych twardych orzechów z drzewa pistacjowego, nadal w skorupach."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
-msgstr[0] "gaść migdałów"
-msgstr[1] "gaść migdałów"
-msgstr[2] "gaść migdałów"
-msgstr[3] "garście migdałów"
+msgid "almonds"
+msgid_plural "almonds"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
 msgstr ""
 "Garść surowych twardych orzechów z drzewa migdałowca, nadal w skorupach."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
-msgstr[0] "garść orzeszków ziemnych"
-msgstr[1] "garść orzeszków ziemnych"
-msgstr[2] "garść orzeszków ziemnych"
-msgstr[3] "garście orzeszków ziemnych"
+msgid "peanuts"
+msgid_plural "peanuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr ""
@@ -42145,40 +43358,40 @@ msgstr ""
 "orzeszki ziemne, nadal w skorupach."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr "Garść twardych orzechów laskowych, wciąż w skorupce."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
-msgstr[0] "garść kasztanów"
-msgstr[1] "garść kasztanów"
-msgstr[2] "garść kasztanów"
-msgstr[3] "garście kasztanów"
+msgid "chestnuts"
+msgid_plural "chestnuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr "Garść twardych kasztanów, wciąż w skorupce."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
-msgstr[0] "garść orzechów włoskich"
-msgstr[1] "garść orzechów włoskich"
-msgstr[2] "garść orzechów włoskich"
-msgstr[3] "garście orzechów włoskich"
+msgid "walnuts"
+msgid_plural "walnuts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr "Garść twardych orzechów włoskich, wciąż w skorupce."
@@ -42338,7 +43551,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr ""
 
@@ -42362,7 +43575,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr ""
 
@@ -42483,6 +43696,14 @@ msgstr "mięsień"
 msgid "wind"
 msgstr "wiatr"
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "wędzarnia i źródło ognia"
@@ -42547,7 +43768,7 @@ msgstr[3] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -42718,8 +43939,8 @@ msgstr[3] ""
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -43094,6 +44315,20 @@ msgstr ""
 "Kawałek pręta zbrojeniowego, z którego jest niezła broń, i który może być "
 "użyty w budowie mocnych ścian i innych konstrukcji."
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -43258,8 +44493,8 @@ msgstr[3] "telewizor"
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
-msgstr "Duży kineskopowy telewizor, pełen elektroniki."
+msgid "A large LCD television, full of delicious electronics."
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -43786,6 +45021,21 @@ msgstr ""
 "Moduł opracowany do odbioru wielu form sygnałów. Użyteczny w wielu "
 "projektach sprzętu komunikacyjnego."
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -44296,10 +45546,8 @@ msgstr[3] "Naukowa karta pamięci SD"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
+"encrypted.  Looks *Interesting*, though…"
 msgstr ""
-"Ta karta pamięci ma chyba związek z 'XEDRA', i jest oczywiście zaszyfrowana."
-" Niemniej jednak wygląda 'interesująco'..."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hand mirror"
@@ -44391,14 +45639,15 @@ msgstr ""
 " zjedzone przez zwierzęta."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
-msgstr[0] "garść kwiatów rumianku"
-msgstr[1] "garście kwiatów rumianku"
-msgstr[2] "garści kwiatów rumianku"
-msgstr[3] "garści kwiatów rumianku"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -44735,10 +45984,10 @@ msgstr ""
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -44796,12 +46045,8 @@ msgstr[3] "pet z papierosa"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr ""
-"Co kiedyś było uzależniającą tubką suszonych liści tytoniu, jest teraz "
-"śmierdzącym śmieciem. Co za tragedia. Resztki tytoniu z kilku takich można "
-"by prawdopodobnie użyć do zwinięcia kolejnego skręta. O ile jesteś tak "
-"bardzo zdesperowany."
 
 #. ~ Use action msg for joint.
 #: lang/json/GENERIC_from_json.py
@@ -44856,13 +46101,13 @@ msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
-msgstr[0] "garść surowego tytoniu"
-msgstr[1] "garść surowego tytoniu"
-msgstr[2] "garść surowego tytoniu"
-msgstr[3] "garść surowego tytoniu"
+msgid_plural "raw tobacco"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -44928,14 +46173,6 @@ msgstr ""
 "strona opisuje protokół jej użycia; może pozwolić na dostęp do panelu "
 "kontrolnego, jeśli taki znajdziesz."
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] "arkusz neoprenu"
-msgstr[1] "arkusz neoprenu"
-msgstr[2] "arkusz neoprenu"
-msgstr[3] "arkusz neoprenu"
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -45503,15 +46740,6 @@ msgstr ""
 "Jednostronna siekiera. Dobra broń do walki wręcz, i nadaje się zarówno jako "
 "narzędzie do rąbania, jak i jako młotek."
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr ""
-"Kamień wielkości piłki futbolowej. Niezła broń ręczna, przydatna także do "
-"rzucania w przeciwnika."
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -46209,10 +47437,8 @@ msgstr[3] "resory piórowe"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
+" an awful lot like a bow.  You can barely bend it…"
 msgstr ""
-"Duży, resor piórowy do znacznych obciążeń. Zapewne pochodzi z samochodu lub "
-"ciężarówki i przypomina mocno łuk. Ledwo jesteś w tanie go ugiąć..."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hydrangea"
@@ -46994,7 +48220,7 @@ msgstr[3] "atomowy ekspres do kawy"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
@@ -47011,7 +48237,9 @@ msgstr[3] "atomowa lampa"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "Zamknij pokrywę"
 
@@ -47041,7 +48269,9 @@ msgstr[3] "atomowa lampa (zakryta)"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "Otwórz pokrywę"
 
@@ -47377,8 +48607,8 @@ msgstr[3] "kotwiczka na linie"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -48390,9 +49620,7 @@ msgstr[3] ""
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
+msgid "A complete guide to Wing Chun Kung-fu."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
@@ -48408,8 +49636,8 @@ msgstr[3] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -49742,6 +50970,22 @@ msgstr[3] ""
 msgid "This is a slip of paper signed by the issuer."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -50126,10 +51370,9 @@ msgstr[3] "widelec"
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
 msgstr ""
-"Widelec, jak nim coś dziabniesz od razu to zjadasz. Czekaj... nieważne."
 
 #: lang/json/GENERIC_from_json.py
 msgid "plastic fork"
@@ -50609,10 +51852,10 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "steel frying pan"
 msgid_plural "steel frying pans"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "stalowa patelnia"
+msgstr[1] "stalowe patelnie"
+msgstr[2] "stalowych patelni"
+msgstr[3] "stalowych patelni"
 
 #. ~ Description for steel frying pan
 #: lang/json/GENERIC_from_json.py
@@ -50623,10 +51866,10 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "copper frying pan"
 msgid_plural "copper frying pans"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "miedziana patelnia"
+msgstr[1] "miedziane patelnie"
+msgstr[2] "miedzianych patelni"
+msgstr[3] "miedzianych patelni"
 
 #. ~ Description for copper frying pan
 #: lang/json/GENERIC_from_json.py
@@ -51539,7 +52782,7 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
 
@@ -52072,8 +53315,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
 msgstr ""
 
 #. ~ Description for estoc
@@ -52194,23 +53437,20 @@ msgstr ""
 "floret jest beznadziejną bronią, z uwagi na elastyczny pręt i tępy koniec."
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
-msgstr[0] "szpada szermiercza"
-msgstr[1] "szpada szermiercza"
-msgstr[2] "szpada szermiercza"
-msgstr[3] "szpada szermiercza"
+msgid "fencing épée"
+msgid_plural "fencing épées"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
 msgstr ""
-"Broń używana w szermierce, najbardziej szlachetnym ze sportów. Szpada jest "
-"najcięższa i najsztywniejsza z broni szermierczych, stąd chyba najbardziej "
-"użyteczna."
 
 #: lang/json/GENERIC_from_json.py
 msgid "fencing saber"
@@ -52224,11 +53464,59 @@ msgstr[3] "szabla szermiercza"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
+"is marginally shorter than the foil and épée, but no less effective."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
 msgstr ""
-"Broń używana w szermierce, najbardziej szlachetnym ze sportów. Szabla "
-"szermiercza jest niewiele krótsza od floretu i szpady, ale nie mniej "
-"efektywna."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
@@ -52564,11 +53852,8 @@ msgstr[3] "sztaba aluminium"
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
+"down to a powder, for more… high-profile applications."
 msgstr ""
-"Mała sztaba aluminium, standaryzowana do dalszego przetworzenia. Lekka ale "
-"wytrzymała, może być odlana w różne kształty dla budowy, lub starta w "
-"proszek dla... wyższych zastosowań."
 
 #: lang/json/GENERIC_from_json.py
 msgid "scrap copper"
@@ -52958,6 +54243,52 @@ msgid ""
 " can also serve as an improvised stabbing weapon, but will break quickly."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -54796,7 +56127,7 @@ msgstr[3] ""
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -54810,8 +56141,8 @@ msgstr[3] ""
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -56170,6 +57501,29 @@ msgid ""
 "art."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr ""
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -56842,6 +58196,154 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
@@ -57155,6 +58657,23 @@ msgid ""
 "to land astoundingly powerful blows."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -57249,6 +58768,21 @@ msgid ""
 "prized for their beauty and power."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -57279,114 +58813,6 @@ msgid ""
 "scales could make a suit of armor as hard as steel and half as heavy."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr ""
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -57473,6 +58899,62 @@ msgstr[3] ""
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr ""
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] "Gungnir"
+msgstr[1] "Gungnir"
+msgstr[2] "Gungnir"
+msgstr[3] "Gungnir"
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] "Laevateinn"
+msgstr[1] "Laevateinn"
+msgstr[2] "Laevateinn"
+msgstr[3] "Laevateinn"
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -57756,8 +59238,8 @@ msgstr[3] ""
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -57773,7 +59255,7 @@ msgstr[3] ""
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -58653,8 +60135,38 @@ msgstr[3] ""
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -58674,6 +60186,19 @@ msgid ""
 "rock and lava everywhere."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
@@ -59776,14 +61301,6 @@ msgstr ""
 "Replika Mjölnir'a, młota Thora. Legenda głosi że zrównuje z ziemią góry "
 "jednym ciosem. Jest udekorowany złotymi i srebrnymi ornamentami."
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] "Gungnir"
-msgstr[1] "Gungnir"
-msgstr[2] "Gungnir"
-msgstr[3] "Gungnir"
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -60975,6 +62492,11 @@ msgstr "CHEMIA"
 msgid "SPARE PARTS"
 msgstr "CZĘŚCI ZAMIENNE"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "POJEMNIKI"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "ARTEFAKTY"
@@ -60985,6 +62507,309 @@ msgstr "ARTEFAKTY"
 msgid "ARMOR"
 msgstr "ZBROJE"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "PRZEDMIOTY NOSZONE"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "TRZYMANA BROŃ"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr "Łup: Nieposortowane"
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr "Łup: Żywność"
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr "Łup: P.Żywność"
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr "Łup: Napoje"
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr "Łup: P.Napoje"
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr "Miejsce na psujące się drinki."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr ""
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr "Łup: Broń palna"
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr "Łup: Magazynki"
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr "Miejsce na magazynki do broni palnej."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr "Łup: Amunicja"
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr "Miejsce na amunicję."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr "Łup: Broń"
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr "Miejsce na broń do walki wręcz."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr "Łup: Narzędzia"
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr "Miejsce na narzędzia."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr "Łup: Ubrania"
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr "Łup: B.Ubrania"
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr "Miejsce na brudne ubrania."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr "Łup: Leki"
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr "Miejsce na leki i inne medykamenty."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr "Łup: Książki"
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr "Miejsce na książki i czasopisma."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr "Łup: Modyfikacje"
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr "Miejsce na modyfikacje do broni itp."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr "Łup: Mutageny"
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr "Miejsce na mutageny, sera, i czyściki."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr "Łup: Bionika"
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr "Łup: C.Pojazdów"
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr "Miejsce na części samochodowe."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr "Łup: Inne"
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr "Miejsce na inne niesklasyfikowane przedmioty."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr "Łup: Paliwo"
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr ""
+"Miejsce na benzynę, diesla, olej do lamp i inne substancje używane jako "
+"paliwa."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr "Łup: Nasiona"
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr "Miejsce na nasiona, sadzonki, itp."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr "Łup: Chemia"
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr "Miejsce na chemikalia."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr "Łup: C.Zamienne"
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr "Miejsce na części zamienne."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr "Łup: Artefakty"
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr "Miejsce na artefakty."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr ""
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr "Łup: Zbroje"
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr "Łup: B.Zbroja"
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr "Miejsce na brudne zbroje."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr "Łup: Drewno"
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr "Miejsce na drewno opałowe i inne rzeczy, które mogą za nie służyć."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr ""
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr "Łup: Ignoruj"
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr "Rzeczy w tej strefie są ignorowane przez akcję sortowania zdobyczy."
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -61236,7 +63061,7 @@ msgstr[3] ""
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
 msgstr ""
 
@@ -61617,8 +63442,8 @@ msgstr "magazynek bębnowy H&K G3"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
-msgstr "50-nabojowy bębnowy magazynek do karabinu H&K G3."
+msgid "A 50-round drum magazine for the H&K G3 rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "H&K G3 magazine"
@@ -61661,8 +63486,8 @@ msgstr "magazynek bębnowy FN SCAR-H"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
-msgstr "50-nabojowy magazynek bębnowy do karabinu FN SCAR-H."
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "FN SCAR-H magazine"
@@ -61759,15 +63584,6 @@ msgstr ""
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr ""
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "magazynek Taurus .38"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr "Kompaktowy stalowy magazynek do pistoletu  Taurus Pro .38."
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr ""
@@ -61841,6 +63657,16 @@ msgstr ""
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr ""
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr ""
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr ""
@@ -64333,7 +66159,7 @@ msgstr ""
 
 #: lang/json/MOD_INFO_from_json.py
 msgid "Classes and Scenarios Mod"
-msgstr "Zawody i Scenraiusze"
+msgstr "Zawody i Scenariusze"
 
 #. ~ Description for Classes and Scenarios Mod
 #: lang/json/MOD_INFO_from_json.py
@@ -64868,7 +66694,7 @@ msgstr[3] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
+"appears to have a mininuke inside.  If this is targeting you…  Run."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -65509,11 +67335,8 @@ msgstr[3] ""
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
+"off in popularity… and price."
 msgstr ""
-"Uważane swego czasu za niewarte widelca szkodniki, dopóki jakiś geniusz od "
-"marketingu nie zaczął ich sprzedawać jako delikates i odtąd odleciały z "
-"popularnością... i ceną."
 
 #: lang/json/MONSTER_from_json.py
 msgid "crayfish"
@@ -65527,10 +67350,8 @@ msgstr[3] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
+"water, and some spicy seasonings…"
 msgstr ""
-"Gdybyś się mógł dobrać do garści tych stworzeń, zgrabnego rondelka "
-"przegotowanej wody, i zestawu pikantnych przypraw..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "Blinky"
@@ -65978,10 +67799,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "giant wasp"
 msgid_plural "giant wasps"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "wielka osa"
+msgstr[1] "wielkie osy"
+msgstr[2] "wielkich os"
+msgstr[3] "wielkich os"
 
 #. ~ Description for giant wasp
 #: lang/json/MONSTER_from_json.py
@@ -67162,10 +68983,8 @@ msgstr[3] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
+"makes it sound… hungry."
 msgstr ""
-"Gryzoń z przypominającym robaka ogonem, długimi wąsami i paciorkowatymi "
-"oczami. Piszczy w sposób jakby sugerujący... głód."
 
 #: lang/json/MONSTER_from_json.py
 msgid "lamb"
@@ -67551,10 +69370,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "scarred zombie"
 msgid_plural "scarred zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "zombie pokryty bliznami"
+msgstr[1] "zombie pokryte bliznami"
+msgstr[2] "zombie pokrytych bliznami"
+msgstr[3] "zombie pokrytych bliznami"
 
 #. ~ Description for scarred zombie
 #: lang/json/MONSTER_from_json.py
@@ -67695,10 +69514,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "gasoline zombie"
 msgid_plural "gasoline zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "benzynowy zombie"
+msgstr[1] "benzynowe zombie"
+msgstr[2] "benzynowych zombie"
+msgstr[3] "benzynowych zombie"
 
 #. ~ Description for gasoline zombie
 #: lang/json/MONSTER_from_json.py
@@ -67738,11 +69557,24 @@ msgstr[3] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
 msgstr ""
-"Ten wybuchacz, normalnie opuchnięty i gotowy by wybuchnąć, wzmocnił się i "
-"skrzepnął. Żółć kapiąca mu z ust także wygląda na odmienioną..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
@@ -67805,13 +69637,8 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
-"Człowiek złączony z mieszaniną metalowych części i kabli. Choć jego oczy są "
-"puste, to skurcze bólu ogarniają jego twarz przypominają o osobie uwięzionej"
-" w tym groteskowym ciele. Mając dość chirurgicznych umiejętności, ktoś "
-"mógłby być w stanie przywrócić mu nieco człowieczeństwa. Gdyby tylko tego "
-"kogoś to obchodziło..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "charred nightmare"
@@ -68829,15 +70656,11 @@ msgstr[3] "Shia LaBeouf"
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
-"Żyjący w lasach,\n"
-"zabijający dla sportu,\n"
-"pożerający wszystkie ciała,\n"
-"prawdziwy kanibal Shia LaBeouf."
 
 #: lang/json/MONSTER_from_json.py
 msgid "shoggoth"
@@ -69146,10 +70969,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py lang/json/snippet_from_json.py
 msgid "zombie"
 msgid_plural "zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "zombie"
+msgstr[1] "zombie"
+msgstr[2] "zombie"
+msgstr[3] "zombie"
 
 #. ~ Description for zombie
 #: lang/json/MONSTER_from_json.py
@@ -69169,7 +70992,7 @@ msgstr[3] ""
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr ""
@@ -69177,10 +71000,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "acidic zombie"
 msgid_plural "acidic zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "kwasowy zombie"
+msgstr[1] "kwasowe zombie"
+msgstr[2] "kwasowych zombie"
+msgstr[3] "kwasowych zombie"
 
 #. ~ Description for acidic zombie
 #: lang/json/MONSTER_from_json.py
@@ -69211,10 +71034,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "brainless zombie"
 msgid_plural "brainless zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "bezmózgie zombie"
+msgstr[1] "bezmózgie zombie"
+msgstr[2] "bezmózgich zombie"
+msgstr[3] "bezmózgich zombie"
 
 #. ~ Description for brainless zombie
 #: lang/json/MONSTER_from_json.py
@@ -69232,10 +71055,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "zombie brute"
 msgid_plural "zombie brutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "zombie brutal"
+msgstr[1] "zombie brutale"
+msgstr[2] "zombie brutali"
+msgstr[3] "zombie brutali"
 
 #. ~ Description for zombie brute
 #: lang/json/MONSTER_from_json.py
@@ -69248,10 +71071,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "zombie wrestler"
 msgid_plural "zombie wrestlers"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "zapaśnik zombie"
+msgstr[1] "zapaśnicy zombie"
+msgstr[2] "zapaśników zombie"
+msgstr[3] "zapaśników zombie"
 
 #. ~ Description for zombie wrestler
 #: lang/json/MONSTER_from_json.py
@@ -69265,10 +71088,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "zombie nightstalker"
 msgid_plural "zombie nightstalkers"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "zombie nocny prześladowca"
+msgstr[1] "zombie nocni prześladowcy"
+msgstr[2] "zombie nocnych prześladowców"
+msgstr[3] "zombie nocnych prześladowców"
 
 #. ~ Description for zombie nightstalker
 #: lang/json/MONSTER_from_json.py
@@ -69323,10 +71146,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "zombie cop"
 msgid_plural "zombie cops"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "gliniarz zombie"
+msgstr[1] "gliniarzy zombie"
+msgstr[2] "gliniarzy zombie"
+msgstr[3] "gliniarzy zombie"
 
 #. ~ Description for zombie cop
 #: lang/json/MONSTER_from_json.py
@@ -69339,10 +71162,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "corrosive zombie"
 msgid_plural "corrosive zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "żrący zombie"
+msgstr[1] "żrących zombie"
+msgstr[2] "żrących zombie"
+msgstr[3] "żrących zombie"
 
 #. ~ Description for corrosive zombie
 #: lang/json/MONSTER_from_json.py
@@ -69362,10 +71185,10 @@ msgstr "Kwasowy zombie wypluwa globulę kwasu!"
 #: lang/json/MONSTER_from_json.py
 msgid "crawling zombie"
 msgid_plural "crawling zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "pełzający zombie"
+msgstr[1] "pełzające zombie"
+msgstr[2] "pełzających zombie"
+msgstr[3] "pełzających zombie"
 
 #. ~ Description for crawling zombie
 #: lang/json/MONSTER_from_json.py
@@ -69379,35 +71202,29 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "zombie dancer"
 msgid_plural "zombie dancers"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "tancerz zombie"
+msgstr[1] "tancerze zombie"
+msgstr[2] "tancerzy zombie"
+msgstr[3] "tancerzy zombie"
 
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
 msgstr ""
-"W powietrzu zapach cuchnący,\n"
-"czterdzieści wieków pierdzący,\n"
-"a ghule z każdej mogiły,\n"
-"już biegną odebrać ci siły!\n"
-"\n"
-"Tancerz zdaje się ciebie nawet nie zauważać, jakby coś w pobliżu go kontrolowało."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie dog"
 msgid_plural "zombie dogs"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "pies zombie"
+msgstr[1] "psy zombie"
+msgstr[2] "psów zombie"
+msgstr[3] "psów zombie"
 
 #. ~ Description for zombie dog
 #: lang/json/MONSTER_from_json.py
@@ -69421,10 +71238,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "listener zombie"
 msgid_plural "listener zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "nasłuchujący zombie"
+msgstr[1] "nasłuchujące zombie"
+msgstr[2] "nasłuchujących zombie"
+msgstr[3] "nasłuchujących zombie"
 
 #. ~ Description for listener zombie
 #: lang/json/MONSTER_from_json.py
@@ -69442,10 +71259,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "shocker zombie"
 msgid_plural "shocker zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "zombie porażacz"
+msgstr[1] "zombie porażacze"
+msgstr[2] "zombie porażaczy"
+msgstr[3] "zombie porażaczy"
 
 #. ~ Description for shocker zombie
 #: lang/json/MONSTER_from_json.py
@@ -69456,10 +71273,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "fat zombie"
 msgid_plural "fat zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "gruby zombie"
+msgstr[1] "grubych zombie"
+msgstr[2] "grubych zombie"
+msgstr[3] "grubych zombie"
 
 #. ~ Description for fat zombie
 #: lang/json/MONSTER_from_json.py
@@ -69490,10 +71307,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "firefighter zombie"
 msgid_plural "firefighter zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "strażak zombie"
+msgstr[1] "strażacy zombie"
+msgstr[2] "strażaków zombie"
+msgstr[3] "strażaków zombie"
 
 #. ~ Description for firefighter zombie
 #: lang/json/MONSTER_from_json.py
@@ -69507,10 +71324,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "fungal zombie"
 msgid_plural "fungal zombies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "grzybicze zombie"
+msgstr[1] "grzybicze zombie"
+msgstr[2] "grzybiczych zombie"
+msgstr[3] "grzybiczych zombie"
 
 #. ~ Description for fungal zombie
 #: lang/json/MONSTER_from_json.py
@@ -69737,10 +71554,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "feral hunter"
 msgid_plural "feral hunters"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "dziki łowca"
+msgstr[1] "dzikich łowców"
+msgstr[2] "dzikich łowców"
+msgstr[3] "dzikich łowców"
 
 #. ~ Description for feral hunter
 #: lang/json/MONSTER_from_json.py
@@ -69763,15 +71580,11 @@ msgstr[3] ""
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
-"I choć walczysz by żyć,\n"
-"już wkrótce zaczniesz wyć,\n"
-"bo śmiertelna dusza twa,\n"
-"nie zniesie dreszczowca zła."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie snapper"
@@ -69855,10 +71668,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "feral predator"
 msgid_plural "feral predators"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "dziki drapieżnik"
+msgstr[1] "dzikich drapieżników"
+msgstr[2] "dzikich drapieżników"
+msgstr[3] "dzikich drapieżników"
 
 #. ~ Description for feral predator
 #: lang/json/MONSTER_from_json.py
@@ -69893,10 +71706,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "feral runner"
 msgid_plural "feral runners"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "dziki biegacz"
+msgstr[1] "dzikich biegaczy"
+msgstr[2] "dzikich biegaczy"
+msgstr[3] "dzikich biegaczy"
 
 #. ~ Description for feral runner
 #: lang/json/MONSTER_from_json.py
@@ -70290,10 +72103,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "centipede"
 msgid_plural "centipedes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "stonoga"
+msgstr[1] "stonogi"
+msgstr[2] "stonóg"
+msgstr[3] "stonóg"
 
 #. ~ Description for centipede
 #: lang/json/MONSTER_from_json.py
@@ -70356,10 +72169,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "mosquito"
 msgid_plural "mosquitos"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "komar"
+msgstr[1] "komary"
+msgstr[2] "komarów"
+msgstr[3] "komarów"
 
 #. ~ Description for mosquito
 #: lang/json/MONSTER_from_json.py
@@ -70408,10 +72221,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "jumping spider"
 msgid_plural "jumping spiders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "skaczący pająk"
+msgstr[1] "skaczące pająki"
+msgstr[2] "skaczących pająków"
+msgstr[3] "skaczących pająków"
 
 #. ~ Description for jumping spider
 #: lang/json/MONSTER_from_json.py
@@ -70477,10 +72290,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "wasp"
 msgid_plural "wasps"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "osa"
+msgstr[1] "osy"
+msgstr[2] "os"
+msgstr[3] "os"
 
 #. ~ Description for wasp
 #: lang/json/MONSTER_from_json.py
@@ -70494,10 +72307,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "giant frog"
 msgid_plural "giant frogs"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "gigantyczna żaba"
+msgstr[1] "gigantyczne żaby"
+msgstr[2] "gigantycznych żab"
+msgstr[3] "gigantycznych żab"
 
 #. ~ Description for giant frog
 #: lang/json/MONSTER_from_json.py
@@ -71691,8 +73504,8 @@ msgstr ""
 "świnko do domu, mała świnko nie nie. Choć jest robotem, to śmierdzi trupem."
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -72401,23 +74214,25 @@ msgid "The black pudding burns you with acid!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
+msgid "krabgek"
+msgid_plural "krabgeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
 msgstr ""
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
+msgid "The krabgek gazes at %3$s!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -72473,8 +74288,53 @@ msgstr[3] ""
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -74891,9 +76751,9 @@ msgid "Reveals an area around you on the overmap"
 msgstr ""
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
-msgstr "Masz wizję otaczającego cię obszaru..."
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
+msgstr ""
 
 #: lang/json/SPELL_from_json.py
 msgid "Artifact Firestorm"
@@ -75098,8 +76958,8 @@ msgstr ""
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -75137,7 +76997,7 @@ msgstr ""
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -75186,6 +77046,20 @@ msgstr ""
 msgid "Translocates the user to an attuned gate."
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr ""
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr ""
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr ""
@@ -75235,7 +77109,7 @@ msgstr ""
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -75392,7 +77266,7 @@ msgstr ""
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr ""
 
@@ -75403,8 +77277,8 @@ msgstr ""
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -75451,8 +77325,8 @@ msgstr ""
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -75478,6 +77352,10 @@ msgstr ""
 msgid "Lava Bomb"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr ""
@@ -75485,7 +77363,7 @@ msgstr ""
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr ""
@@ -75497,9 +77375,9 @@ msgstr ""
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -75572,7 +77450,7 @@ msgstr ""
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -75615,8 +77493,8 @@ msgstr ""
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py lang/json/effects_from_json.py
@@ -75635,6 +77513,15 @@ msgstr ""
 msgid "Fox's Cunning"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr ""
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr ""
@@ -75674,8 +77561,8 @@ msgstr ""
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -75736,8 +77623,8 @@ msgstr ""
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -75764,6 +77651,10 @@ msgstr ""
 msgid "Mirror Image"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr ""
@@ -76376,6 +78267,50 @@ msgstr ""
 "dopasowywania dla komfortowego noszenia. Może być noszona na hełmie. Obecnie"
 " włączona i stale drenuje baterie. Użyj, by wyłączyć."
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -76474,8 +78409,8 @@ msgstr[3] ""
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
 
@@ -77717,13 +79652,11 @@ msgstr "Baterie w nausznikach są wyczerpane."
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
 msgstr ""
-"Nauszniki aktywne preferowane przez strzelców. Są teraz wyłączone. Będą "
-"blokować dźwięki powyżej progowej wartości decybeli, zakładając że są "
-"wyposażone w baterie."
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -78236,6 +80169,247 @@ msgid ""
 "power."
 msgstr ""
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr ""
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -78639,9 +80813,9 @@ msgstr[3] ""
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
 
@@ -78802,11 +80976,9 @@ msgstr[3] "pręt jasnowidztwa"
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr ""
-"Przedmiot testowy aep_clairvoyance_plus flag. Jeżeli się pojawia znikąd to "
-"bład."
 
 #: lang/json/TOOL_from_json.py
 msgid "boulder anvil"
@@ -79160,7 +81332,7 @@ msgstr "Odpalasz zapalnik na %s."
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr ""
@@ -79183,8 +81355,8 @@ msgstr "Już zapaliłeś lont - na co czekasz?"
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -79198,7 +81370,7 @@ msgstr[3] ""
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
@@ -79215,8 +81387,8 @@ msgstr[3] ""
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr ""
 
@@ -79238,8 +81410,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -79254,8 +81426,8 @@ msgstr[3] ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -79268,9 +81440,9 @@ msgstr[3] ""
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "Lekkie"
 
@@ -79306,7 +81478,7 @@ msgstr ""
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
+"  The face shifts."
 msgstr ""
 
 #. ~ Description for battle axe
@@ -79479,6 +81651,29 @@ msgstr ""
 "To puszka aluminiowa wypełniona po brzegi czarnym prochem z wystającym "
 "zapalonym lontem."
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] "kuchenka menela (zapalona)"
+msgstr[1] "kuchenka menela (zapalona)"
+msgstr[2] "kuchenka menela (zapalona)"
+msgstr[3] "kuchenka menela (zapalona)"
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "Żar wygasł."
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -79760,8 +81955,8 @@ msgstr[3] ""
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py lang/json/furniture_from_json.py
@@ -79775,8 +81970,8 @@ msgstr[3] ""
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -80198,11 +82393,9 @@ msgstr[3] "elektryczna wyżynarka (wył.)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
 msgstr ""
-"Elektryczna wyżynarka do mięsa na baterie. Dwa ząbkowane ostrza, które "
-"wibrują razem by ciąć wszystko od indyka do szynki... nawet zombie!"
 
 #: lang/json/TOOL_from_json.py
 msgid "electric carver (on)"
@@ -80413,7 +82606,7 @@ msgstr[3] ""
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr ""
@@ -80988,10 +83181,8 @@ msgstr[3] "elektroniczne kajdanki"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-"Para elektronicznych kajdanek, używanych przez policję i boty kontroli tłumów do aresztowania schwytanych. Ich stały dźwięk syreny jasno identyfikują noszącego jako aresztowanego przestępcę i alarmuje policjantów. Zaczekaj na ich przybycie, nie próbuj uciekać i zdejmować kajdanek, gdyż porażą cię ładunkiem elektrycznym.\n"
-"Jednakże jedyna policja która może zareagować to nieumarli, możesz długo czekać, chyba ze będziesz kreatywny..."
 
 #: lang/json/TOOL_from_json.py
 msgid "entrenching tool"
@@ -83419,8 +85610,8 @@ msgstr[3] ""
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -84558,11 +86749,8 @@ msgstr "Zapalasz lont na ładunku czarnoprochowym. Pozbądź się go szybko!"
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr ""
-"Domowej roboty ładunek wybuchowy z dużej plastikowej butli wypełnionej "
-"czarnym prochem i drobnym złomem metalowym, zaopatrzonej w długi lont. Użyj "
-"by go zapalić. Wybuchnie w nie więcej jak kilka minut..."
 
 #: lang/json/TOOL_from_json.py
 msgid "active black gunpowder charge"
@@ -85228,39 +87416,6 @@ msgstr[1] "kuchenka menela"
 msgstr[2] "kuchenka menela"
 msgstr[3] "kuchenka menela"
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr ""
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "Potrzebujesz źródła ognia!"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr ""
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] "kuchenka menela (zapalona)"
-msgstr[1] "kuchenka menela (zapalona)"
-msgstr[2] "kuchenka menela (zapalona)"
-msgstr[3] "kuchenka menela (zapalona)"
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "Żar wygasł."
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -85473,8 +87628,8 @@ msgstr[3] ""
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -85885,7 +88040,7 @@ msgstr ""
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -85905,7 +88060,7 @@ msgstr[3] ""
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -86003,9 +88158,9 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -86061,7 +88216,7 @@ msgstr ""
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -86092,11 +88247,15 @@ msgstr ""
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
+"To nieaktywny robot policyjny. Korzystanie z tego przedmiotu polega na "
+"umieszczeniu go na ziemi i włączeniu. Jeśli przeprogramujesz i okablujesz go"
+" pomyślnie, bot policyjny zidentyfikuje cię jako organ ścigania, krąży wokół"
+" lub podąża za tobą i próbuje zatrzymać przestępców."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive eyebot"
@@ -86121,7 +88280,7 @@ msgstr ""
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
 msgstr ""
@@ -86147,8 +88306,8 @@ msgstr ""
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
 msgstr ""
 
@@ -86173,8 +88332,8 @@ msgstr ""
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
 msgstr ""
 
@@ -86200,9 +88359,9 @@ msgstr ""
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -86226,7 +88385,7 @@ msgstr ""
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
 msgstr ""
@@ -86284,7 +88443,7 @@ msgstr ""
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -86316,8 +88475,8 @@ msgstr ""
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
@@ -86345,10 +88504,10 @@ msgstr ""
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
 
@@ -86746,11 +88905,8 @@ msgstr[3] "improwizowana kosa bojowa"
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
+"of a stick.  However it's quite fragile."
 msgstr ""
-"To narzędzie rolnicze zostało zmodyfikowane w broń improwizowaną poprzez "
-"obrócenie jej ostrza o 90 stopni, przekształcając go w śmiertelne ostrze na "
-"końcu laski. Jest to dosyć krucha broń."
 
 #: lang/json/TOOL_from_json.py
 msgid "spike on a stick"
@@ -86868,6 +89024,23 @@ msgstr ""
 "Wojskowy nóż bojowy. Lekki i bardzo ostry, i zabójczy w uzdolnionych "
 "dłoniach, lub przyłączony jako bagnet."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -87285,6 +89458,23 @@ msgstr ""
 "Miecz bagnet do długa broń tnąca którą można przyłączyć do lufy broni "
 "palnej, lub kuszy, zamieniając ją w pikę."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -87400,6 +89590,63 @@ msgstr ""
 "To wielki zakrzywiony miecz dwuręczny z Japonii. Jest zaskakująco lekki jak "
 "na swój rozmiar."
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -87827,6 +90074,38 @@ msgstr ""
 "To kawałek plastiku. Możesz go użyć do produkcji, naprawy, lub wzmocnienia "
 "plastikowych rzeczy."
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -88405,11 +90684,8 @@ msgstr[3] "radio dwukierunkowe"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
 msgstr ""
-"To radio z nadajnikiem. Możesz się nim połączyć z osobą która też ma takie. "
-"Niestety obecnie chyba nikt ich nie używa..."
 
 #: lang/json/TOOL_from_json.py
 msgid "remote vehicle controller"
@@ -88627,7 +90903,7 @@ msgstr[3] ""
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
@@ -88854,7 +91130,7 @@ msgstr[3] "kable przemysłowe"
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr ""
 
@@ -89321,7 +91597,7 @@ msgstr ""
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr ""
 
@@ -89356,7 +91632,7 @@ msgstr[3] ""
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -90661,14 +92937,6 @@ msgid ""
 "This is a stick that has been cut into a trigger mechanism for a snare trap."
 msgstr "To patyk, który wycięto by służył jako mechanizm zwalniający wnyki."
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] "Laevateinn"
-msgstr[1] "Laevateinn"
-msgstr[2] "Laevateinn"
-msgstr[3] "Laevateinn"
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -92163,6 +94431,17 @@ msgid ""
 " terribly when not on a rail."
 msgstr ""
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr ""
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr ""
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "koło motocyklowe"
@@ -92573,6 +94852,10 @@ msgstr "rozbija"
 msgid "cranking"
 msgstr "nakręca"
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr ""
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr "odstresowuje"
@@ -92853,6 +95136,10 @@ msgstr "strzały"
 msgid "pebbles"
 msgstr "kamyki"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "kamienie"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr ""
@@ -93185,6 +95472,10 @@ msgid ""
 "deflected more than melee weapons and those in turn more than massive "
 "objects."
 msgstr ""
+"Cienkie pole siłowe otacza twoje ciało, nieustannie pobierając moc. Każda "
+"próba penetracji tego pola ma szansę zostać odbita kosztem energii, co "
+"zmniejsza zdolność do zadania obrażeń. Pociski będą odbijane bardziej niż "
+"broń do walki w zwarciu, a ta z kolei bardziej niż masywne przedmioty."
 
 #: lang/json/bionic_from_json.py
 msgid "Alarm System"
@@ -93218,7 +95509,7 @@ msgstr "Opancerzenie Ramion"
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -93256,7 +95547,7 @@ msgstr "Opancerzenie Nóg"
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -93607,17 +95898,20 @@ msgstr "Spalacz Etanolu"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
 msgstr ""
-"Spalasz alkohol jako paliwo w bardzo wydajnej reakcji chemicznej. Jednakże "
-"nadal doświadczasz upajających efektów substancji."
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "Areo-Skraplacz"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr ""
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "Diamentowa Rogówka"
@@ -93898,10 +96192,10 @@ msgstr ""
 "nieprzyjemne skutki uboczne gdy zostanie wyłączony."
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "Mini Miotacz Ognia"
+msgid "Finger Lighter"
+msgstr ""
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -93934,8 +96228,8 @@ msgstr "Elektromagnes"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -94000,8 +96294,8 @@ msgstr "Nanoboty Naprawcze"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -94037,11 +96331,8 @@ msgstr "Popsuta bionika. Od czasu do czasu emituje głośne dźwięki."
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
+"Increases mouth encumbrance by ten."
 msgstr ""
-"Nie jesteś pewny jak ten CBM znalazł się w twoim nosie, ale jakkolwiek to "
-"się stało, ta źle umiejscowiona bionika utrudnia ci oddychanie. Podnosi "
-"skrępowanie ust o jeden."
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -94074,7 +96365,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
+"mild optic neuropathy.  Increases eye encumbrance by ten."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -94107,7 +96398,7 @@ msgstr "Magazyn Mocy"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
 msgstr ""
@@ -94118,8 +96409,7 @@ msgstr "Magazyn Mocy II Gen."
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
 msgstr ""
 
 #. ~ Description for Power Overload
@@ -94161,6 +96451,9 @@ msgid ""
 "toxins, or airborne diseases find their way into your windpipe, the filter "
 "will attempt to remove them."
 msgstr ""
+"Chirurgicznie wszczepiony w tchawicę jest zaawansowanym systemem filtracji. "
+"Jeśli toksyny lub choroby przenoszone przez powietrze przedostaną się do "
+"tchawicy, filtr spróbuje je usunąć."
 
 #: lang/json/bionic_from_json.py
 msgid "Radiation Scrubber System"
@@ -94450,11 +96743,8 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
+" by ten, while failing to improve your ability to hold objects whatsoever."
 msgstr ""
-"Samoblokujące się kciuki mocno trzymają (nawet gdy nie chcesz by to robiły) "
-"i nie puszczają (nawet gdy chciałbyś by odpuściły). Zwiększa skrępowanie rąk"
-" o dwa, i ani trochę nie ulepsza twoich zdolności do trzymania przedmiotów."
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -94599,8 +96889,8 @@ msgstr ""
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
@@ -94665,7 +96955,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr ""
@@ -94957,7 +97247,7 @@ msgstr ""
 
 #: lang/json/bodypart_from_json.py
 msgid "Arms"
-msgstr "Ręki"
+msgstr "Ręce"
 
 #: lang/json/bodypart_from_json.py
 msgid "L ARM"
@@ -95229,6 +97519,11 @@ msgid ""
 "Does not prevent using a proper workbench, if available.  Deconstruct or "
 "smash to remove."
 msgstr ""
+"Zaznacz miejsce do tworzenia. Zadania rzemieślnicze znajdujące się obok tego"
+" kafelka automatycznie wykorzystają tę lokalizację zamiast próbować tworzyć "
+"w rękach, ze zwykłą karą za szybkość rzemieślniczą za pracę na ziemi. Nie "
+"uniemożliwia korzystania z odpowiedniego stołu roboczego, jeśli jest "
+"dostępny. Dekonstruuj lub rozbij, aby usunąć."
 
 #: lang/json/construction_from_json.py
 msgid "Spike Pit"
@@ -95366,6 +97661,18 @@ msgstr "Zasyp Dół Ziemią"
 msgid "Make Woodchip Floor"
 msgstr "Zbuduj Podłogę Z Wiór"
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr "Zbuduj Drewnianą Podłogę"
@@ -96026,6 +98333,10 @@ msgstr ""
 msgid "Build a radio tower console."
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr "Przerób Zasilacz Lodówki"
@@ -96767,6 +99078,42 @@ msgstr ""
 msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr "Śnisz o pszczołach latających nad twoim słodkim nektarem. Mmm."
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr ""
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -98124,6 +100471,25 @@ msgstr "Twoje ręce nie chcą przestać się trząść."
 msgid "You tremble"
 msgstr "Trzęsiesz się"
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr ""
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr ""
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr ""
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "Krwawienie"
@@ -99051,6 +101417,26 @@ msgstr "Twój metabolizm staje się niestabilny."
 msgid "Your metabolism becomes more stable."
 msgstr "Twój metabolizm stabilizuje się."
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr ""
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "Oświetlony"
@@ -99306,6 +101692,17 @@ msgstr "Przeładowany"
 msgid "You've been struck by lightning, and feel... different."
 msgstr "Trafił cię piorun, i czujesz się... inaczej."
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr ""
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr "Obraza Religijna"
@@ -100036,6 +102433,192 @@ msgstr ""
 "policji został rozdarty na strzępy przez martwaków, które zbiegły się "
 "słysząc zamieszanie."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr ""
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -100372,6 +102955,167 @@ msgstr ""
 "pomoc, i zjadając resztki pozostałych jej zapasów. Dwa tygodnie od "
 "uwięzienia umiera z odwodnienia."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr ""
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "Twoi Towarzysze"
@@ -100543,10 +103287,10 @@ msgid "A small family surviving on their generational land."
 msgstr ""
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
-msgstr "Komuna Boża"
+msgid "New England Church Community"
+msgstr ""
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -100593,111 +103337,231 @@ msgstr ""
 msgid "Dusty"
 msgstr ""
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "It's dusty.  Has no effect - obsolete fault."
+msgstr ""
+
+#. ~ name of mending method for fault 'Dusty'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
+msgid "Wipe clean"
+msgstr ""
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean you %s."
 msgstr ""
 
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr ""
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr ""
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr ""
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr ""
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
 
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr ""
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr ""
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr ""
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr ""
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr ""
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
 
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
 msgstr ""
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "Potrzebny do pracy przyłączonego alternatora."
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr ""
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr ""
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr "Pomagają uruchomić silnik w niskich temperaturach zewnętrznych."
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr ""
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "Uniemożliwia uruchomienie silnika bez odpowiedniego klucza."
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr ""
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr ""
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr ""
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr "Potrzebna do pompowania i sprężania diesla ze zbiornika paliwa."
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr ""
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
 msgstr "Zużyty filtr redukuje efektywność paliwa i zwiększa produkcję dymu."
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr ""
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
@@ -100705,33 +103569,81 @@ msgstr ""
 "Zużyty filtr redukuje wydajność paliwa i zwiększa szansę na strzelanie "
 "gaźnika."
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr ""
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr "Potrzebna do pompowania benzyny ze zbiornika paliwa."
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr ""
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr "Potrzebna do pompowania wody do chłodnicy lub radiatora."
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr ""
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "Potrzebny do wstępnego rozruchu silnika."
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr ""
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -101218,6 +104130,10 @@ msgstr ""
 msgid "smoke vent"
 msgstr "komin"
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr ""
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
 msgstr ""
@@ -101409,11 +104325,11 @@ msgstr "Barykada drogowa. Do blokowania dróg."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "smash!"
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "whump."
 
@@ -101528,7 +104444,8 @@ msgstr "posąg"
 msgid "A carved statue made of stone."
 msgstr ""
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "thump."
 
@@ -101539,7 +104456,7 @@ msgstr "manekin"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
 msgstr ""
 
@@ -101936,7 +104853,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "crunch!"
 
@@ -101949,7 +104866,7 @@ msgstr "kwiat marloss"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
+"and… delicious?"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -102382,9 +105299,9 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -102454,7 +105371,7 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -102623,7 +105540,7 @@ msgstr "bieżnia"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
+" taken apart for its… parts."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -102649,10 +105566,8 @@ msgstr "pianino"
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr ""
-"Stary heban i kość słoniowa. Naprawdę podnosi klasę tego miejsca. Możesz go "
-"rozebrać, jeśli chcesz ... ty potworze."
 
 #: lang/json/furniture_from_json.py
 msgid "a suffering piano!"
@@ -102810,6 +105725,17 @@ msgstr "taboret"
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr ""
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "słup ogłoszeniowy"
@@ -103291,7 +106217,7 @@ msgstr ""
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
 msgstr ""
 
@@ -103365,12 +106291,12 @@ msgid "This beaded curtain could be pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
-msgstr "klekocący klak...klak...klak"
+msgid "clickity clack… clack… clack"
+msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
-msgstr "klekocący klak...klak"
+msgid "clickity clack… clack"
+msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "open beaded curtain"
@@ -103382,8 +106308,8 @@ msgid "This beaded curtain has been pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
-msgstr "klekocący klaps... klak ... klak!"
+msgid "clickity clack… clack… clack!"
+msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "canvas floor"
@@ -103529,11 +106455,8 @@ msgstr "stos śmieci"
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
 msgstr ""
-"Śmieci zasypane ziemią i porośnięte trawą, które okropnie cuchną. Ale dla "
-"jednego śmieć, dla drugiego..."
 
 #: lang/json/furniture_from_json.py
 msgid "metal wreckage"
@@ -104063,6 +106986,15 @@ msgid ""
 "blood, candles, and other small knick-knacks."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr ""
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr "krash!"
@@ -104092,8 +107024,8 @@ msgstr "Brama jest otwarta!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
-msgstr "Przekręcasz klamkę..."
+msgid "You turn the handle…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -104112,8 +107044,8 @@ msgstr "Drzwi stodoły otwarte!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
-msgstr "Ciągniesz za linę..."
+msgid "You pull the rope…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -104147,8 +107079,8 @@ msgstr "Drzwi unoszą się!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
-msgstr "Popychasz dźwignię..."
+msgid "You throw the lever…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -104353,11 +107285,8 @@ msgstr[3] "łuk prosty"
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr ""
-"Prymitywny łuk wycięty z pojedynczego kawałka drewna, opracowany pod wymiary"
-" osoby, która będzie go używać. Słaby i okropnie niecelny, i niezbyt "
-"funkcjonalny, niestety..."
 
 #: lang/json/gun_from_json.py
 msgid "short bow"
@@ -104600,9 +107529,7 @@ msgstr ""
 " Bełty z niej wystrzelone mają dobrą szansę pozostanie w jednym kawałku i "
 "mogą być ponownie użyte."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "pistolet"
@@ -104828,6 +107755,20 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "rzuć"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -104930,6 +107871,10 @@ msgstr ""
 " tworząc plazmę i otacza ją polimerami by zredukować rozpad. Choć potężny, "
 "to traci z uwagi na krótki zasięg. Zasilany z UPS."
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "półautomatyczny"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -104941,10 +107886,10 @@ msgstr[3] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -104965,8 +107910,7 @@ msgstr ""
 "pozostałymi dwiema na naboje do strzelby. Jest zrobiona z rur i części "
 "skanibalizowanych z dwururki."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "strzelba"
@@ -105185,6 +108129,10 @@ msgstr ""
 "Działko wodne ze strażackiego wozu bojowego. Zamontowane na pojeździe może "
 "służyć do powstrzymywania ognia lub 'protestujących'."
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -105559,8 +108507,8 @@ msgstr[3] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 
@@ -105681,10 +108629,6 @@ msgstr ""
 "gwarancji. Nie ma tu miejsca do stosowania wtórnych modyfikacji na tej "
 "nagiej proto-broni."
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "półautomatyczny"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -106379,15 +109323,10 @@ msgstr[3] "M24"
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
-"Karabin wyborowy M24 jest wojskową i policyjną wersją karabinu Remington "
-"model 700. M24 jest modelem nadanym przez armię Stanów Zjednoczonych po "
-"wdrożeniu jej jako standardowy karabin wyborowy w roku 1988. M24 jest "
-"nazwany \"systemem broni\" ponieważ zawiera nie tylko karabin, ale także "
-"wymienny celownik optyczny i inne akcesoria."
 
 #: lang/json/gun_from_json.py
 msgid "HK417 A2"
@@ -106577,21 +109516,19 @@ msgstr ""
 "rozleci."
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
-msgstr[0] "COP .38"
-msgstr[1] "COP .38"
-msgstr[2] "COP .38"
-msgstr[3] "COP .38"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
 msgstr ""
-"COP .38 to mały gruby pistolet derringer, lekko podobny do Mossberg Brownie."
-" Ma cztery lufy ułożone w kwadrat."
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -106633,22 +109570,6 @@ msgstr ""
 "Siedmiostrzałowy rewolwer .38 sprzedawany przez Smith & Wesson. Ma stałe "
 "tylne przyrządy celownicze i wzmocnioną ramę."
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] "Taurus Pro .38"
-msgstr[1] "Taurus Pro .38"
-msgstr[2] "Taurus Pro .38"
-msgstr[3] "Taurus Pro .38"
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr ""
-"Popularny pistolet kalibru .38. Opracowany z wieloma bezpiecznikami i "
-"zbudowany z wytrzymałych materiałów wysokiej jakości."
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -106726,10 +109647,24 @@ msgstr[3] ""
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
 msgid_plural "M1911A1s"
@@ -106847,9 +109782,9 @@ msgstr[3] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -106879,8 +109814,9 @@ msgstr[3] ""
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -107352,8 +110288,9 @@ msgstr[3] ""
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -108609,9 +111546,9 @@ msgstr[3] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -108625,8 +111562,8 @@ msgstr[3] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -108644,7 +111581,7 @@ msgstr[3] ""
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -108659,7 +111596,7 @@ msgstr[3] ""
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
@@ -108674,10 +111611,10 @@ msgstr[3] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
 
@@ -108692,10 +111629,10 @@ msgstr[3] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -109543,10 +112480,6 @@ msgid ""
 "and destruction it can cause."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr ""
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -110632,10 +113565,70 @@ msgstr[3] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] "Ichaival"
+msgstr[1] "Ichaival"
+msgstr[2] "Ichaival"
+msgstr[3] "Ichaival"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -110786,14 +113779,6 @@ msgstr ""
 "modele, lecz łatwiejsza do naciągnięcia. Strzały z niej wystrzelone mają "
 "dobrą szansę pozostanie w jednym kawałku i mogą być ponownie użyte."
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] "Ichaival"
-msgstr[1] "Ichaival"
-msgstr[2] "Ichaival"
-msgstr[3] "Ichaival"
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -112152,7 +115137,7 @@ msgstr ""
 msgid "accessories"
 msgstr "akcesoria"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "łuk"
@@ -112298,7 +115283,7 @@ msgstr[3] "upstest"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
+"it's a bug.  50x more UPS drain."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -112487,8 +115472,8 @@ msgstr[3] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -112520,7 +115505,7 @@ msgstr[3] ""
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
+"energy efficiency.  Decreases power consumption."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -112537,11 +115522,9 @@ msgstr[3] "kondensator wysokiej gęstości"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
 msgstr ""
-"Kondensator ze zwiększoną gęstością zwiększa zasięg i siłę rażenia, kosztem "
-"zauważalnie zwiększonego zużycia mocy."
 
 #: lang/json/gunmod_from_json.py
 msgid "Leadworks magazine adapter"
@@ -112796,6 +115779,22 @@ msgstr ""
 "uniesienie lufy, ulepszając odrzut ale zwiększając rozmiar, hałas i nieco "
 "celność broni."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
 msgid_plural "homemade suppressors"
@@ -112958,6 +115957,22 @@ msgstr ""
 msgid "rail"
 msgstr "szyna akcesoryjna"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
@@ -112975,6 +115990,21 @@ msgstr ""
 "45 stopni, używanych gdy luneta lub inna modyfikacja uniemożliwia używanie "
 "podstawowych celowników."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
@@ -112989,6 +116019,20 @@ msgstr ""
 "Dodatkowa szyna akcesoryjna ustawiona pod kątem 45° do umieszczania drugiego"
 " celownika."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
@@ -113023,6 +116067,22 @@ msgstr ""
 "Zaawansowana jednostka przywiązywana do boku broni redukująca wibracje, "
 "znacznie redukująca odrzut i nieco zwiększająca celność."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -113165,6 +116225,22 @@ msgid ""
 " mrad increments and is remarkably small and light for its magnification."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
@@ -113179,6 +116255,21 @@ msgid ""
 "crosshair."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
 msgid_plural "RS1219 scopes"
@@ -113421,6 +116512,23 @@ msgstr ""
 " w panowaniu nad odrzutem, mogą być używane tylko na stabilnych "
 "powierzchniach i powoli się je rozkłada."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -113469,6 +116577,21 @@ msgstr ""
 "Chwyt umieszczany z przodu lufy zapewniający lepszą kontrolę. Nie tak dobry "
 "jak dwójnóg, ale nadaję się do używania w każdych warunkach."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
@@ -113551,6 +116674,22 @@ msgstr ""
 "przyłączany do niemal każdego karabinu. Pozwala na załadowanie i "
 "wystrzelenie pojedynczego granatu 40mm."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
@@ -113570,6 +116709,23 @@ msgstr ""
 "małej postaci, kosztem zmniejszonej celności. Może być albo przyłączony do "
 "karabinu, lub przyłączony do kolby dla samodzielnego użycia."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "masterkey shotgun"
 msgid_plural "masterkey shotguns"
@@ -113588,6 +116744,22 @@ msgstr ""
 "montowanie pod wieloma karabinkami. Pozwala załadować i wystrzelić łącznie "
 "cztery naboje do strzelby."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
 msgid_plural "40mm pipe launchers"
@@ -113598,12 +116770,9 @@ msgstr[3] "rurowy granatnik 40mm"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
 msgstr ""
-"To domowej roboty tuba wyrzutni granatów 40mm, która może być przyłączana do"
-" niemal każdego karabinu. Pozwala na załadowanie i wystrzelenie pojedynczego"
-" granatu 40mm."
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -113639,6 +116808,22 @@ msgstr ""
 "półautomatyczna strzelba bezłuskowa, która może być montowana pod wieloma "
 "rodzjami karabinów. Używa magazynków pudełkowych RMSA10."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
 msgid_plural "underslung shotguns"
@@ -113655,6 +116840,22 @@ msgstr ""
 "Krótka strzelba dwulufowa która może być mocowana pod lufą wielu karabinów. "
 "Mieści dwa naboje do strzelby."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
 msgid_plural "LW underbarrel laser sights"
@@ -113999,6 +117200,66 @@ msgstr ""
 "celność. Jednakże zużywa ładunki z UPS-a podczas strzelania a z uwagi na "
 "rozległość modyfikacji broń nie będzie działać bez UPS'a."
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -115096,6 +118357,13 @@ msgid ""
 "adjust course and speed.  You default to cruise control, so the gas/brake "
 "adjust the speed which the vehicle will attempt to maintain."
 msgstr ""
+"Aby przejąć kontrolę nad pojazdem, przejdź do miejsca z działającymi "
+"„sterownikami pojazdu” i „siedzeniem”, a następnie naciśnij "
+"<press_control_vehicle>.  Kiedy przejmiesz kontrolę, <press_UP> przyspiesza,"
+" <press_DOWN> zwalnia bądź zawraca, & <press_LEFT> & <press_RIGHT> skręca w "
+"lewo lub prawo.  Przekątne dostosowują kurs i prędkość. Domyślnie wybierasz "
+"tempomat, więc gaz / hamulec dostosowują prędkość, którą pojazd będzie "
+"próbował utrzymać."
 
 #: lang/json/help_from_json.py
 msgid ""
@@ -116010,9 +119278,10 @@ msgstr "Zmierz promieniowanie"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
-msgstr "..."
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
+msgstr ""
 
 #: lang/json/item_action_from_json.py
 msgid "Control an RC car"
@@ -116669,6 +119938,13 @@ msgstr ""
 msgid "This bionic can provide power to powered armor."
 msgstr "Ta bionika zapewnia zasilanie pancerzy wspomaganych."
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr ""
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -118203,6 +121479,7 @@ msgstr "Usuń wybrany kolor"
 msgid "Load color template"
 msgstr "Wczytaj szablon kolorów"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -119959,6 +123236,9 @@ msgid ""
 "\n"
 "+1 Block attempts, +1 Dodge attempts."
 msgstr ""
+"Średnio zaawansowany praktykant aikido może chronić się przed wieloma przeciwnikami.\n"
+"\n"
+"+1 prób bloku, +1 prób uniku."
 
 #: lang/json/martial_art_from_json.py
 msgid "Advanced Aikido"
@@ -119971,6 +123251,9 @@ msgid ""
 "\n"
 "+1 Block attempts, +1 Dodge attempts."
 msgstr ""
+"Zaawansowany praktykant aikido może chronić się przed jeszcze większą ilością przeciwników niż normalnie.\n"
+"\n"
+"+1 prób bloku, +1 prób uniku."
 
 #: lang/json/martial_art_from_json.py
 msgid "Boxing"
@@ -120059,6 +123342,9 @@ msgid ""
 "\n"
 "+1.0 Dodge skill, +1 Dodge attempts."
 msgstr ""
+"Nigdy nie przestajesz się poruszać podczas wykonywania gingi. Dzięki temu jesteś bardzo mobilny podczas walki.\n"
+"\n"
+"+1.0 umiejętności uniku, +1 prób uniku."
 
 #: lang/json/martial_art_from_json.py
 msgid "Capoeira Momentum"
@@ -120125,6 +123411,10 @@ msgid ""
 "+1 Dodge attempts, +1.0 Dodge skill.\n"
 "Lasts 2 turns."
 msgstr ""
+"Podobnie jak żuraw, szybko unikniesz niebezpieczeństwa.\n"
+"\n"
+"+1.0 umiejętności uniku, +1 prób uniku.\n"
+"Trwa 2 tury."
 
 #: lang/json/martial_art_from_json.py
 msgid "Dragon Kung Fu"
@@ -120240,6 +123530,9 @@ msgid ""
 "\n"
 "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength."
 msgstr ""
+"Jesteś krzepki i nie drgniesz wobec żadnego zagrożenia.\n"
+"\n"
+"+2 prób uniku, -1.0 umiejętności uniku, blokowane obrażenia zmniejszone o 50%% siły."
 
 #: lang/json/martial_art_from_json.py
 msgid "Tactical Retreat"
@@ -120774,7 +124067,7 @@ msgstr ""
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -120817,6 +124110,91 @@ msgid ""
 "Lasts 2 turns."
 msgstr ""
 
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Kung Fu"
+msgstr "Kung Fu Tygrysa"
+
+#. ~ Description for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
+"attacks above all else.  Your Strength determines your accuracy, and your "
+"attacks do increasing damage as you continue attacking."
+msgstr ""
+"Jeden z pięciu stylów zwierzęcych z Szaolin. Tygrys skupia się na "
+"nieustępliwych atakach ponad wszytko inne. Twoja Siła determinuje celność, a"
+" ataki zadają większe obrażenia gdy kontynuujesz atakować."
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Fury"
+msgstr "Furia Tygrysa"
+
+#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger's Strength"
+msgstr ""
+
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Wing Chun"
+msgstr ""
+
+#. ~ Description for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
+"learn effective techniques from the various Shaolin animal forms.  It has a "
+"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
+"sensitivity to the opponent's direction of force, and flowing around it to "
+"get back to hitting."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr ""
+
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chi-Sao Sensitivity"
+msgstr ""
+
+#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
+msgstr ""
+
 #: lang/json/martial_art_from_json.py
 msgid "Zui Quan"
 msgstr "Zui Quan"
@@ -120825,62 +124203,64 @@ msgstr "Zui Quan"
 #: lang/json/martial_art_from_json.py
 msgid ""
 "AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
 msgstr ""
-"Także znana jako \"pijany boks\". Zui Quan imituje ruchy pijaka dla zmylenia"
-" przeciwnika, dając ci pasywny bonus do uników bazujący na inteligencji. "
-"Turę po ataku, możesz uniknąć dowolnej ilości ataków bez kar, a udany unik "
-"daje bonus do obrażeń i celności w oparciu o twoją inteligencję."
-
-#. ~ Description of buff for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "Inteligencja zwiększa zdolność uników"
 
 #: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
-msgstr "Kontr Uderzenie"
+msgid "Zui Quan Stance"
+msgstr ""
 
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
-msgstr "Ekstra obrażenia i celność po udanym uniku."
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Kung Fu"
-msgstr "Kung Fu Tygrysa"
+msgid "Advanced Zui Quan"
+msgstr ""
 
-#. ~ Description for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
+#, no-python-format
 msgid ""
-"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
-"attacks above all else.  Your Strength determines your accuracy, and your "
-"attacks do increasing damage as you continue attacking."
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
 msgstr ""
-"Jeden z pięciu stylów zwierzęcych z Szaolin. Tygrys skupia się na "
-"nieustępliwych atakach ponad wszytko inne. Twoja Siła determinuje celność, a"
-" ataki zadają większe obrażenia gdy kontynuujesz atakować."
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Fury"
-msgstr "Furia Tygrysa"
+msgid "Drunken Stumble"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "+3 miażdżone/atak"
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "Siła Tygrysa"
+msgid "Drunken Dodging"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "Siła zapewnia dodatkowy bonus do ataku."
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Debug Mastery"
@@ -120905,29 +124285,6 @@ msgstr ""
 "+Siła zbroja vs miażdżonym, +Zręczność zbroja vs kwasowi, +Inteligencja "
 "zbroja vs elektryczności, +Percepcja zbroja vs ogniowi."
 
-#: lang/json/martial_art_from_json.py
-msgid "Wing Chun"
-msgstr ""
-
-#. ~ Description for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
-"learn effective techniques from the various Shaolin animal forms.  It has a "
-"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
-"sensitivity to the opponent's direction of force, and flowing around it to "
-"get back to hitting."
-msgstr ""
-
-#: lang/json/martial_art_from_json.py
-msgid "Chi-Sao Sensitivity"
-msgstr ""
-
-#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
-msgstr ""
-
 #: lang/json/martial_art_from_json.py
 msgid "Bionic Combatives"
 msgstr "Bioniczna Waleczność"
@@ -121081,13 +124438,11 @@ msgstr "Kung Fu Ropuchy"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
 msgstr ""
-"Jeden z Pięciu Zabójczych Jadów. Mistrzowie Stylu Ropuchy potrafią skupić "
-"się przeciwko wszelkim atakom. Możesz medytować przez pauzowanie, zyskując "
-"zbroję, ale będziesz tracił skupienie przy poruszaniu się."
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -121095,8 +124450,11 @@ msgstr "Żelazna Skóra Ropuchy"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "Zyskaj do +6 zbroi stojąc bez ruchu"
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -121105,8 +124463,12 @@ msgstr "Rozmiękczenie Żelaznej Skóry"
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
-msgstr "Żelazna Skóra mięknie gdy się ruszasz!"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Viper Kung Fu"
@@ -121115,40 +124477,49 @@ msgstr "Kung Fu Żmiji"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
 msgstr ""
-"Dziedzictwo Pięciu Zabójczych Jadów. Styl Żmiji ma unikalne trzyczęściowe "
-"kombo, inicjowane unikiem, kontrujące ogłuszającym rąbnięciem i legendarnym "
-"Uderzeniem Żmiji."
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "Cel Żmiji"
+msgid "Viper's Patience"
+msgstr ""
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
-msgstr "Gryziesz prawdziwie! Twój kolejny atak to Uderzenie Żmiji!"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "Cierpliwość Żmiji"
+msgid "Viper's Ambush"
+msgstr ""
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
-msgstr "+2 do Uników. Uniknięcie ataku inicjuje kombo."
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
-msgstr "Zasadzka Żmiji"
+msgid "Viper's Venom"
+msgstr ""
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
-msgstr "Zwabiłeś ich! Twój kolejny atak to Ukąszenie Żmiji."
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "C.R.I.T Blade-work"
@@ -121529,6 +124900,10 @@ msgstr "Ołów"
 msgid "Leather"
 msgstr "Skóra"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "Nabiał"
@@ -121593,6 +124968,10 @@ msgstr "Superstop"
 msgid "layered carbide"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Tin"
 msgstr ""
@@ -121703,6 +125082,10 @@ msgstr ""
 msgid "Arcane Skin"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr ""
@@ -121712,7 +125095,7 @@ msgid "Sugar"
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
+msgid "Gather bones for the Brigitte.  About 8 should do it."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -123148,29 +126531,35 @@ msgid ""
 "I'll see you then...or I won't, and then I'll know I made the right "
 "decision."
 msgstr ""
+"Zobaczymy się wtedy... albo nie, i wtedy będę wiedział, że podjąłem właściwą"
+" decyzję."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Don't die. If you're asking me for advice, that doesn't bode well for you."
-msgstr ""
+msgstr "Nie umieraj. Jeśli prosisz mnie o radę, to nie wróży ci dobrze."
 
 #: lang/json/mission_def_from_json.py
 msgid "Well, you're not dead...yet."
-msgstr ""
+msgstr "Cóż, nie jesteś martwy... jeszcze."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
 "I'll be honest, I wasn't really expecting to see you again. A promise is a "
 "promise, I'll follow you now!"
 msgstr ""
+"Będę szczery, tak naprawdę nie spodziewałem się, że cię znowu zobaczę. "
+"Obietnica jest obietnicą, pójdę za tobą teraz!"
 
 #: lang/json/mission_def_from_json.py
 msgid "I know time is relative and all that."
-msgstr ""
+msgstr "Wiem, że czas jest względny i tak dalej."
 
 #: lang/json/mission_def_from_json.py
 msgid "I'm not quite sure how you failed to survive AND are talking to me."
 msgstr ""
+"Nie jestem do końca pewien, jak nie udało ci się przeżyć ORAZ ze mną "
+"rozmawiasz."
 
 #: lang/json/mission_def_from_json.py
 msgid "Gather cattail stalks to create cattail jelly"
@@ -123761,7 +127150,7 @@ msgstr ""
 
 #: lang/json/mission_def_from_json.py
 msgid "A library, bookstore or a glass blower's studio should have one."
-msgstr ""
+msgstr "Biblioteka, księgarnia lub studio dmuchania szkła powinny je mieć."
 
 #: lang/json/mission_def_from_json.py
 msgid "Do you have the book?"
@@ -123800,6 +127189,8 @@ msgstr ""
 #: lang/json/mission_def_from_json.py
 msgid "A library, bookstore should have one, schools are another good idea."
 msgstr ""
+"Biblioteka, księgarnia powinny je mieć, szkoły to kolejne dobre miejsce na "
+"nie."
 
 #: lang/json/mission_def_from_json.py
 msgid "Locate Commo Team"
@@ -124344,6 +127735,9 @@ msgid ""
 "most libraries and bookstores.  Make sure you get the translated version, I "
 "can't read Arabic!"
 msgstr ""
+"To nie jest tak powszechne jak Biblia, ale powinieneś być w stanie znaleźć "
+"kopie w większości bibliotek i księgarń. Upewnij się, że masz przetłumaczoną"
+" wersję, nie umiesz czytać po arabsku!"
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -125422,8 +128816,8 @@ msgstr ""
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -128271,8 +131665,8 @@ msgstr "Zarost: kotwica"
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -128282,7 +131676,7 @@ msgstr "Zarost: krótka pełna broda"
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
 msgstr ""
 
@@ -128405,7 +131799,7 @@ msgstr "zarost: neckbeard"
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
 msgstr ""
 
@@ -128508,6 +131902,27 @@ msgstr ""
 "Poruszasz się szybciej niż inni, wiec masz 15% bonus do szybkości na pewnym "
 "podłożu."
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr ""
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr ""
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr ""
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "Dobry Słuch"
@@ -129049,13 +132464,10 @@ msgstr "Psychoza Stymulantów"
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
-"Masz barwną historię ze stymulantami (jak kawa lub amfetamina). Tolerujesz "
-"je bardziej bez przedawkowania, ale jeśli pozwolisz sobie na więcej, "
-"zaczynasz widzieć rzeczy..."
 
 #. ~ Description for Stylish
 #: lang/json/mutation_from_json.py
@@ -129213,6 +132625,18 @@ msgid ""
 " Pentjak Silat, or Sōjutsu."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr ""
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
 msgstr "Słaby Zapach"
@@ -130043,11 +133467,9 @@ msgstr "Elfie Oczy"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
 msgstr ""
-"Twoje oczy stały się... zielone. Trudno określić jaki to odcień, gdyż stale "
-"się zmienia. Efekt jest... przyjemny."
 
 #: lang/json/mutation_from_json.py
 msgid "Fey Vision"
@@ -130945,10 +134367,8 @@ msgstr "Nośnik Marloss"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
+"nose, and you have a strong desire to try some seeds and… sap?"
 msgstr ""
-"Od kiedy zjadłeś jagodę Marloss, jej zapach wciąż za tobą chodzi, i masz "
-"silną ochotę by spróbować nasion i... żywicy?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vessel"
@@ -130958,10 +134378,8 @@ msgstr "Pojemnik Marloss"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
+"tongue, and you have a strong desire to try some berries and… sap?"
 msgstr ""
-"Od kiedy zjadłeś nasiono Marloss, jego smak wciąż za tobą chodzi, i masz "
-"silną ochotę by spróbować jagód i... żywicy?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vector"
@@ -131426,12 +134844,9 @@ msgstr "Szablozęby"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
 msgstr ""
-"Wyrosły ci niezwykle duże i ostre. Czynią niemożliwym noszenie czegokolwiek "
-"na ustach i utrudniają jedzenie... ale zostawiają paskudne rany przy "
-"ugryzieniu."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
@@ -132843,11 +136258,9 @@ msgstr "Ryj"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
 msgstr ""
-"Twoja twarz i szczęka zaczęły... się zmieniać. Maski itp. pasują, ale jesteś"
-" zauważalnie zmutowany."
 
 #: lang/json/mutation_from_json.py
 msgid "Bovine Snout"
@@ -133700,15 +137113,12 @@ msgstr "Zmiennocieplny"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
-"Twoje ciało jest na stałe zimnokrwiste. Twoja szybkość maleje bądź rośnie na"
-" każde 2 stopnie Fahrenheita  (1,1 stopnia Celsjusza) poniżej lub powyżej 65"
-" F (18,3 C). Potrzebujesz do jedzenia tylko połowę porcji żywności w "
-"porównaniu do przeciętnego człowieka."
 
 #: lang/json/mutation_from_json.py
 msgid "Growling Voice"
@@ -134049,10 +137459,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
+"every need… but how would you keep them in line?"
 msgstr ""
-"Było by dobrze być Królową, mając robotnice stale zaspokajające każdą twoją "
-"potrzebę... ale jak byś je utrzymał w ryzach?"
 
 #. ~ Description for Plant
 #: lang/json/mutation_from_json.py
@@ -134070,11 +137478,9 @@ msgstr "Wodnisty"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
 msgstr ""
-"Jak to szło w tej starej reklamie, 'pomaluj planetę'? To może być niezły "
-"plan długoterminowy, ale na razie..."
 
 #: lang/json/mutation_from_json.py
 msgid "Subterranean"
@@ -135866,8 +139272,8 @@ msgid "Scientist"
 msgstr "Naukowiec"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
-msgstr "Szukam śladów dotyczących pochodzenia tych stworów..."
+msgid "I'm looking for clues concerning these monsters' origins…"
+msgstr ""
 
 #: lang/json/npc_class_from_json.py
 msgid "Bounty Hunter"
@@ -135930,7 +139336,7 @@ msgid "Real Person"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -135946,7 +139352,7 @@ msgid "Foodperson"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
@@ -135954,8 +139360,8 @@ msgid "Cyborg"
 msgstr "Cyborg"
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
-msgstr "Bzzzzzt... Jest...jestem cy...PIIIIIP...borgiem."
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
+msgstr ""
 
 #: lang/json/npc_class_from_json.py
 msgid "former cop"
@@ -136098,6 +139504,14 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr ""
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
+msgstr ""
+
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 #: lang/json/npc_from_json.py
 msgid "Captive"
@@ -137721,6 +141135,10 @@ msgstr "dach hipermarketu"
 msgid "hotel parking"
 msgstr "parking hotelowy"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "hotel"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "hol hotelowy"
@@ -138090,7 +141508,7 @@ msgid "spiked trench"
 msgstr "okopy z palami"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
+msgid "fabrication workshop survey"
 msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
@@ -138105,6 +141523,14 @@ msgstr "kuźnia z warsztatem"
 msgid "livestock survey"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr ""
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr ""
@@ -138790,6 +142216,10 @@ msgstr "strzelnica"
 msgid "shooting range roof"
 msgstr "dach strzelnicy"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "pole golfowe"
@@ -139309,7 +142739,7 @@ msgstr "dach sklepu magicznego"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "used bookstore"
-msgstr ""
+msgstr "antykwariat"
 
 #: lang/json/overmap_terrain_from_json.py
 #: lang/json/start_location_from_json.py
@@ -139456,10 +142886,6 @@ msgstr "centrum sterowania robotami"
 msgid "dense urban"
 msgstr "gęsto zurbanizowany"
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "hotel"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "szkoła"
@@ -139480,6 +142906,10 @@ msgstr "biblioteka publiczna, 2-gie piętro"
 msgid "mechanics garage"
 msgstr "garaż mechaników"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
 msgstr "oczyszczalnia ścieków"
@@ -144455,6 +147885,36 @@ msgid ""
 "on. This displeases you."
 msgstr ""
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -147534,11 +150994,6 @@ msgstr "STOPY"
 msgid "MEDICAL"
 msgstr "MEDYCZNE"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "POJEMNIKI"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -148524,7 +151979,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
 msgstr ""
 
@@ -148581,7 +152036,7 @@ msgstr ""
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
+"grab a pot.  Let's put it in that dining area."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -149310,7 +152765,7 @@ msgid "build 2 wood stoves"
 msgstr ""
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
+msgid "We should build a well.  This will make cooking more convenient."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -149807,6 +153262,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr ""
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -149827,8 +153458,8 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -149933,7 +153564,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
 msgstr ""
 
@@ -149943,7 +153574,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
 msgstr ""
 
@@ -149953,7 +153584,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
 msgstr ""
 
@@ -150385,7 +154016,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
+"Some benches around the outside would be nice.  Build some to the northwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -150394,7 +154025,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
+"Some benches around the outside would be nice.  Build some to the northeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -150403,7 +154034,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
+"Some benches around the outside would be nice.  Build some to the southeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -150412,7 +154043,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
+"Some benches around the outside would be nice.  Build some to the southwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -150654,6 +154285,10 @@ msgstr ""
 msgid "Central Storage Building"
 msgstr ""
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr ""
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
 msgstr ""
@@ -152053,6 +155688,44 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr ""
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -157212,13 +160885,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
+msgid "Pass some ethanol, I need to power my ethanol burner."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -157226,20 +160893,12 @@ msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
+msgid "I require ethanol for my internal power supply.  Anything on you?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -164906,7 +168565,7 @@ msgid "a static hissing sound."
 msgstr "statyczny syk."
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -164920,11 +168579,11 @@ msgid "\"Hold on, I want to pulp that zombie corpse.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
+msgid "\"Burning… from the inside…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
+msgid "\"This smell…  Don't know…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -164936,19 +168595,19 @@ msgid "a scraping noise."
 msgstr "zgrzytający odgłos."
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
+msgid "\"No…  Stop the burning!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
+msgid "\"Hunger…  Must eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
+msgid "\"Run…  Chase…  Eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -165073,7 +168732,7 @@ msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
+msgid "\"Can't… breathe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -165086,8 +168745,8 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -165099,7 +168758,7 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr "\"Zrobiłem o co prosiłeś.  Pozwól mi odejść!\""
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -165107,11 +168766,11 @@ msgid "\"This is a dream.  This has to be a dream.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
+msgid "\"This is my life now… this is my life now… this is my life now…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
+msgid "\"Wanna go home…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -165167,7 +168826,7 @@ msgstr ""
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -165190,18 +168849,18 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -165324,7 +168983,7 @@ msgid "\"Police inbound.  Stay where you are!\""
 msgstr "„Policja w drodze. Zostań tam, gdzie jesteś!”"
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -165345,7 +169004,7 @@ msgid "\"FoodPlace: It's the Calories.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -165413,8 +169072,8 @@ msgid "You shouldn't have done that."
 msgstr "Nie powinieneś był tego robić."
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
-msgstr "Zagrajmy... w rosyjską ruletkę."
+msgid "Let's play… Russian roulette."
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "I hate you."
@@ -165425,8 +169084,8 @@ msgid "Go kill yourself!"
 msgstr "Idź się zabij!"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
-msgstr "Wielki Brat patrzy..."
+msgid "Big Brother is watching you…"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Die for me!"
@@ -165437,12 +169096,12 @@ msgid "Why won't you die?"
 msgstr "Czemu nie umierasz?"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
-msgstr "Krew... pyszna."
+msgid "Blood…  Delicious."
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
-msgstr "Do zobaczenia... W PIEKLE!"
+msgid "See you… IN HELL!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "AAAIEEEEEEE!"
@@ -165457,8 +169116,8 @@ msgid "What did you do with my Mommy?"
 msgstr "Co zrobiłeś z moją mamusią?"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
-msgstr "Zostań ze mną... na zawsze!"
+msgid "Stay with me… forever!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Hey kids.  Want some candy?"
@@ -166900,6 +170559,10 @@ msgstr "Bunkier Zbieracza"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#: lang/json/start_location_from_json.py
+msgid "Wizard's lake retreat"
+msgstr ""
+
 #: lang/json/start_location_from_json.py
 msgid "Candy Shop"
 msgstr ""
@@ -166949,16 +170612,16 @@ msgid "You there. Quiet down. Can you hear it? The song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
+msgid "What?  What do you mean?  What song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
+msgid "So about the songs…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
 msgstr ""
 
@@ -166975,7 +170638,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166985,11 +170648,11 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
+msgid "What?  Singing bones?  What are you talking about?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167044,7 +170707,7 @@ msgid "I will bear that in mind"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167056,7 +170719,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
+msgid "End the world?  What?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167068,8 +170731,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167084,7 +170747,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
+msgid "I… thank you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167113,28 +170776,28 @@ msgid "That is all for now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgid "A song may yet be sung by you, should you wish to."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
+msgid "There is an additional song you could take on, if you'd like."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
+msgid ""
+"I know of certain bones that could be of use, if you'd like to know more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "A song may yet be sung by you, should you wish to."
+msgid "There are bones to etch, songs to sing. Wish to join me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There is an additional song you could take on, if you'd like."
+msgid "Do you wish to take on more songs?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid ""
-"I know of certain bones that could be of use, if you'd like to know more."
+msgid "Do you believe you can take on the burden of additional bones?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167158,7 +170821,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167166,7 +170829,7 @@ msgid "Not interested."
 msgstr "Nie zgłaszam zainteresowania."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
+msgid "Consider it done.  But I also wanted to ask…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167182,7 +170845,7 @@ msgid "I'm off then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167192,7 +170855,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
+msgid "I see.  Very well then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167210,11 +170873,11 @@ msgid "I am glad to hear it. Let's go then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
+msgid "Maybe some other time.  Changing the topic…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167236,17 +170899,17 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
 
@@ -167258,6 +170921,10 @@ msgstr "Zapomnij, że pytałem."
 msgid "Skip it, let's get going."
 msgstr "Olej to, chodźmy."
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr "O co chodziło z tym wydawaniem poleceń?"
@@ -167315,13 +170982,25 @@ msgid "What about chit-chatting and your background?"
 msgstr "A co z pogaduszkami i twoją historią?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
-msgstr "Coś jeszcze powonieniem wiedzieć?"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -167372,7 +171051,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167395,7 +171076,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167434,8 +171117,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
 
@@ -167443,6 +171126,10 @@ msgstr ""
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -167513,11 +171200,27 @@ msgid ""
 "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167528,6 +171231,10 @@ msgstr ""
 msgid "Tell me more about the activities you can do now."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -167734,19 +171441,19 @@ msgid "Let's go."
 msgstr "Idziemy."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
-msgstr "Zmień zasady walki..."
+msgid "Change your engagement rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
-msgstr "Zmień zasady celowania..."
+msgid "Change your aiming rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
+msgid "Change your bionic power reserve rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
+msgid "Change your bionic power recharge rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167758,11 +171465,11 @@ msgid "Stick close to me, no matter what."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
+msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_false_text>"
+msgid "<ally_rule_follow_distance_2_true_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168022,8 +171729,8 @@ msgid "Nah, I'm just kidding."
 msgstr "Nah, to tylko żarty."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
-msgstr "Proszę idź w to miejsce..."
+msgid "Please go to this location…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Stay at your current position."
@@ -168156,16 +171863,16 @@ msgstr ""
 "miesiąc od... od kiedy to się zdarzyło, jak sobie dajesz z tym radę?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
-msgstr "Oh, no wiesz, nieźle, całkiem nieźle..."
+msgid "Oh you know, not bad, not bad…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "<hallu_dont_trade>"
-msgstr ""
+msgstr "<hallu_dont_trade>"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Fair enough."
-msgstr ""
+msgstr "W porządku."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Another survivor!  We should travel together."
@@ -168222,7 +171929,7 @@ msgstr "Trzymaj dystans!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "<drop_it>"
-msgstr ""
+msgstr "<drop_it>"
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is my territory, <name_b>."
@@ -168244,14 +171951,14 @@ msgstr "<hands_up>"
 msgid "&Put hands up."
 msgstr "&Podnieś ręce."
 
-#: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
-msgstr "*upuszcza jego broń."
-
 #: lang/json/talk_topic_from_json.py
 msgid "*drops_her_weapon."
 msgstr "*upuszcza jej broń."
 
+#: lang/json/talk_topic_from_json.py
+msgid "*drops his weapon."
+msgstr "*upuszcza jego broń."
+
 #: lang/json/talk_topic_from_json.py
 msgid "Now get out of here"
 msgstr "A teraz wypad stąd"
@@ -168265,12 +171972,12 @@ msgid "Okay, I'm going."
 msgstr "Okej, idę."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
+msgid "About that job…"
 msgstr "W sprawie tej pracy..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
-msgstr "W sprawie jednej z tych prac.."
+msgid "About one of those jobs…"
+msgstr "W sprawie jednej z tych prac..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "What's the matter?"
@@ -168288,14 +171995,6 @@ msgstr "Nie mam żadnych prac dla ciebie."
 msgid "I don't have any more jobs for you."
 msgstr "Nie mam już więcej prac dla ciebie."
 
-#: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
-msgstr ""
-
 #: lang/json/talk_topic_from_json.py
 msgid "I have another job for you.  Want to hear about it?"
 msgstr "Mam kolejną robotę dla ciebie. Chcesz o niej usłyszeć?"
@@ -168304,6 +172003,14 @@ msgstr "Mam kolejną robotę dla ciebie. Chcesz o niej usłyszeć?"
 msgid "I just have one job for you.  Want to hear about it?"
 msgstr "Mam tylko jedną robotę. Chcesz posłuchać?"
 
+#: lang/json/talk_topic_from_json.py
+msgid "I have other jobs for you.  Want to hear about them?"
+msgstr "Mam inne zadania dla ciebie. Chcesz o nich usłyszeć?"
+
+#: lang/json/talk_topic_from_json.py
+msgid "I have more jobs for you.  Want to hear about them?"
+msgstr "Mam kolejne zadania dla ciebie. Chcesz o nich usłyszeć?"
+
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
 #: src/npctalk.cpp
 msgid "Oh, okay."
@@ -168315,7 +172022,7 @@ msgstr "Nieważne, nie jestem zainteresowany."
 
 #: lang/json/talk_topic_from_json.py
 msgid "You're not working on anything for me now."
-msgstr ""
+msgstr "Nie pracujesz teraz nad żadnym moim zleceniem."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Which job?"
@@ -168362,7 +172069,7 @@ msgid "Whatever.  Bye."
 msgstr "Nieważne. Żegnaj."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
+msgid "I'm sorry…  I failed."
 msgstr "Wybacz... zawiodłem."
 
 #: lang/json/talk_topic_from_json.py
@@ -168371,7 +172078,7 @@ msgstr "Jeszcze nie."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I killed him."
-msgstr ""
+msgstr "Zabiłem go."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I killed it."
@@ -168382,8 +172089,8 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "Nie. Wracam do tego. Żegnaj."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
-msgstr "Ta. Jest tutaj!"
+msgid "Yup!  Here it is!"
+msgstr "Tak. Jest tutaj!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "We're here!"
@@ -168395,7 +172102,7 @@ msgstr "Oto jestem."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I talked to them."
-msgstr ""
+msgstr "Rozmawiałem z nimi."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Here it is!"
@@ -168422,10 +172129,12 @@ msgid ""
 "I found it, but I'm keeping it, and I'll find you another one.  Let's talk "
 "about something else."
 msgstr ""
+"Znalazłem to, ale to zatrzymam, a tobie znajdę inny. Porozmawiajmy o czymś "
+"innym."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I found it, but I'm keeping it, and I'll find you another one.  Bye!"
-msgstr ""
+msgstr "Znalazłem to, ale to zatrzymam, a tobie znajdę inny. Na razie!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Mission success!  I don't know what else to say."
@@ -168449,11 +172158,11 @@ msgstr "Cieszę się że pomogłem. Nie potrzebuję zapłaty. Żegnaj!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Glad to help."
-msgstr ""
+msgstr "Miło było pomóc."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Glad to help.  Bye!"
-msgstr ""
+msgstr "Miło było pomóc. Żegnaj!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, um, sorry."
@@ -168493,7 +172202,7 @@ msgstr "Chcesz podróżować ze mną?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Want to share some useful items with me?"
-msgstr ""
+msgstr "Chcesz się podzielić jakimś użytecznym sprzętem?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, bye."
@@ -168541,11 +172250,11 @@ msgstr "Dzięki!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Focus on the road, mate!"
-msgstr ""
+msgstr "Skup się na drodze, kolego!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I must focus on the road!"
-msgstr ""
+msgstr "Muszę się skupić na drodze!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'm too thirsty, give me something to drink."
@@ -168561,11 +172270,11 @@ msgstr "Jestem zbyt zmęczony, pozwól mi wpierw odpocząć."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Nothing comes to my mind now. Ask me later perhaps?"
-msgstr ""
+msgstr "Nic nie przychodzi mi na myśl. Może zapytaj mnie później?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I have some reason for not telling you."
-msgstr ""
+msgstr "Mam swoje powody by ci nie mówić."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Ah, okay."
@@ -168640,8 +172349,8 @@ msgid "Alright.  You can lead now."
 msgstr "W porządku. Prowadzisz."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
-msgstr "W prządku. Coś jeszcze..."
+msgid "Good.  Something else…"
+msgstr "Dobrze. Coś jeszcze..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alright, let's go."
@@ -168677,7 +172386,7 @@ msgstr "Nie jestem w stanie cię trenować gdy prowadzisz pojazd!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I can't train you properly while I'm operating a vehicle!"
-msgstr ""
+msgstr "Nie jestem w stanie cię trenować gdy prowadzę pojazd!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Give it some time, I'll show you something new later..."
@@ -168720,7 +172429,7 @@ msgid "I'd prefer to keep that to myself."
 msgstr "Wolę zachować to dla siebie."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
+msgid "I understand…"
 msgstr "Rozumiem..."
 
 #: lang/json/talk_topic_from_json.py
@@ -168744,7 +172453,7 @@ msgid "Because I'm your friend!"
 msgstr "Ponieważ jestem twoim przyjacielem."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
+msgid "Well, I am helping you out…"
 msgstr "Cóż, przecież ci pomagam..."
 
 #: lang/json/talk_topic_from_json.py
@@ -168781,34 +172490,34 @@ msgstr "Dziękuję, do zobaczenia!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "You picked up something that does not belong to you..."
-msgstr ""
+msgstr "Wziąłeś coś co nie należy do ciebie..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Okay, okay, this is all a misunderstanding.  Sorry, I'll drop it now."
-msgstr ""
+msgstr "Okej, okej, to nieporozumienie. Wybacz, już to odkładam."
 
 #: lang/json/talk_topic_from_json.py
 msgid "No, I'm keeping it. Try and take it off me, I dare you."
-msgstr ""
+msgstr "Nie, zatrzymam to sobie. A spróbuj tylko to wziąć to ode mnie."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
-msgstr ""
+msgid "Look, I really need this.  Please let me have it."
+msgstr "Słuchaj, naprawdę tego potrzebuję. Pozwól mi to wziąć."
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
-msgstr ""
+msgid "What, this?  It's not the same one, you are mistaken."
+msgstr "Co, to? Mylisz się, to inny egzemplarz."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
-msgstr ""
+msgid "I'm sorry.  Look, I already dropped it, okay?"
+msgstr "Przepraszam. Patrz, już to odłożyłem, okej?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Don't try and talk yourself out of this, drop it now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
+msgid "Okay, I'm dropping it…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168870,8 +172579,8 @@ msgid "Pleasure doing business!"
 msgstr "Miło było robić interesy!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
-msgstr "Jeszcze mnie zobaczysz..."
+msgid "You might be seeing more of me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey again. *kzzz*"
@@ -168884,21 +172593,21 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
+msgid "Hey.  Let's chat for a second."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
+msgid "That's because I saved you.  Listen, I could use your help…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168910,8 +172619,8 @@ msgid "Come with me. We can help each other out."
 msgstr "Chodź ze mną. Możemy pomóc sobie nawzajem."
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
-msgstr "Oboje idźmy swoimi drogami. Ciesz się wolnością."
+msgid "We both go our separate ways.  Enjoy your freedom."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -168927,8 +172636,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168949,7 +172658,7 @@ msgid "Get out of my sight."
 msgstr "Zejdź mi z oczu."
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168965,8 +172674,8 @@ msgid "Not if I kill you first!"
 msgstr "Nie, jeśli zabiję cię pierwszy!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
-msgstr "Wybacz! Nie powinien był tego mówić."
+msgid "I'm sorry!  I shouldn't have said that!"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Yeah, *beeeeep* I don't think so. Bye."
@@ -169006,17 +172715,37 @@ msgstr "Nic takiego. Wracajmy do pracy."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
-"System obozu frakcji zapewnia ci większą kontrolę nad twoimi towarzyszami, "
-"pozwalając ci przypisywać im ich własne misje. Misje rozciągają się od "
-"zbierania zasobów i wytwarzania aż po ewentualne patrole bojowe."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
-msgstr "Kontynuuj."
+msgid "Give me an overview of how camps work."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Never mind, let's go back to talking about camps."
@@ -169036,87 +172765,120 @@ msgstr "Zapomnij o tym. Ruszajmy."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
 msgstr ""
-"Żywność jest niezbędna na misjach lub jest produkowana w ich trakcie. Misje "
-"o stałym czasie wymagają od ciebie zapłaty z góry, podczas gdy misje "
-"powtarzane, jak zbieranie drewna opałowego, są płatne po ich wykonaniu. Brak"
-" pożywienia niezbędnego do opłacenia towarzyszy spowoduje utratę reputacji "
-"we frakcji. Może to prowadzić do BARDZO złych rzeczy, gdy spadnie zbyt "
-"nisko."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
-msgstr "Zaczekaj, powtórz co powiedziałeś."
+msgid "Wait, we can talk with radios?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
 msgstr ""
-"Po wybraniu miejsca potrzebujesz znaleźć lub wytworzyć materiały do "
-"ulepszenia obozu, by wykonywać zaawansowane misje. Pierwsze skupiają się na "
-"zdobyciu materiałów do rozbudowy, abyś sam się nie musiał tym martwić. Po "
-"dwóch lub trzech rozbudowach będziesz miał dostęp do <color_yellow>[Prac "
-"Fizycznych]</color>, misji pozwalających wysłać towarzyszy do posortowania "
-"wszystkich rzeczy w pobliżu obozu w kategorie. Późniejsze rozbudowy pozwolą "
-"wysyłać towarzyszy na rekrutację nowych członków, budowę fortyfikacji, lub "
-"na zbrojne patrole."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
 msgstr ""
-"Kiedy całkowicie rozbudujesz pierwszy namiot odblokujesz możliwość rozwoju. "
-"Opcje rozwoju pozwolą wyspecjalizować każdy zbudowany obóz przez skupienie "
-"się na potrzebnym ci przemyśle. <color_light_green>[Farma]</color> przyda "
-"się graczom, którzy chcą zbudować dużą frakcję podczas gdy "
-"<color_light_green>[Kuchnia]</color> jest lepsza dla graczy poszukujących "
-"jakości życia w zleceniu NPC gotowania ich pożywienia. "
-"<color_light_green>[Garaż]</color> to użyteczna dziupla do misji "
-"pozwalających rozebrać pojazd na użyteczne części i zasoby. Zasoby te można "
-"zmienić w cenny sprzęt w [<color_light_green>Kuźni]</color>. Możesz zbudować"
-" dodatkowe rozszerzenie obozu co drugi poziomi po odblokowaniu pierwszego, a"
-" gdy jeden obóz jest pełen, możesz zbudować łatwo kolejny."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
-msgstr "Dzięki, wróćmy do rozmowy o obozach."
+msgid "Got it.  Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -169129,6 +172891,14 @@ msgid ""
 "6.  You can now set up faction camps in select buildings.  The list of available buildings is constantly growing, so you'll have to experiment."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr "Dzięki, wróćmy do rozmowy o obozach."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -169229,11 +172999,11 @@ msgid "Well, sure."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
+msgid "I'd… rather not."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169264,7 +173034,7 @@ msgid "Oh, but you already have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
+msgid "Yes… yes I have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169329,7 +173099,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
+msgid "Horrible.  Did you get any pictures yourself?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169481,8 +173251,8 @@ msgid "This is a npc allies 1 test response."
 msgstr "To odpowiedź testowa towarzyszy npc 1."
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
-msgstr "To odpowiedź testowa towarzyszy npc 2."
+msgid "This an error!  npc allies 2 test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a npc engagement rule test response."
@@ -169681,8 +173451,8 @@ msgid "This is a u_has_items beer test response."
 msgstr "To odpowiedź testowa - u_has_items - piwo"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
-msgstr "Bład testu! To odpowiedź testowa h_has_item."
+msgid "Test failure!  This is a u_has_items test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a u_has_item_category books test response."
@@ -169693,7 +173463,7 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169781,7 +173551,7 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169837,11 +173607,7 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
+msgid "Greetings…  Foodperson?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169883,7 +173649,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
+msgid "Ah…  Well, nice to meet you Foodperson."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169911,7 +173677,7 @@ msgid "Sure, whatever."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
+msgid "Ok…  I believe you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -170007,7 +173773,7 @@ msgid "That sounds great!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
+msgid "Ok…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -170015,7 +173781,7 @@ msgid "I need to think about it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
+msgid "Huh…  No thanks."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -170032,7 +173798,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr ""
 
@@ -171030,8 +174796,8 @@ msgid "Giant bees?  Tell me more."
 msgstr "Wielkie pszczoły? Powiedz mi więcej."
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
-msgstr "Ale pszczoły nie są zwykle agresywne..."
+msgid "But bees aren't usually aggressive…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171046,8 +174812,8 @@ msgstr ""
 "długoterminowe skutki. Ale nie wstydzę się że uciekałem jak <swear> tchórz."
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
-msgstr "Ale pszczoły nie są zwykle agresywne... Masz na myśli osy?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171625,8 +175391,8 @@ msgid "No.  I can't.  Just, no."
 msgstr "Nie. Nie mogę. Po prostu nie."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
-msgstr "Wybacz... zostawię cię samemu sobie."
+msgid "Sorry…  I'll let you be."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171979,8 +175745,8 @@ msgstr ""
 "upadnie."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
-msgstr "Okey..."
+msgid "Okay…"
+msgstr "Okej…"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172476,8 +176242,8 @@ msgid "What do you think happened?"
 msgstr "Jak myślisz, co się stało?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
-msgstr "To faktycznie brzmi trochę jak wariactwo..."
+msgid "That does sound a little crazy…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172546,8 +176312,8 @@ msgid "What happened to you after that?"
 msgstr "Co się wydarzyło z tobą potem?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
-msgstr "To nie jest chyba zdrowe tak porzucić swoją przeszłość..."
+msgid "It can't be healthy to abandon your past like that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -173143,8 +176909,8 @@ msgstr ""
 "wiem czemu mnie także nie wziął, ale to pewnie stanie się jasne z czasem."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
-msgstr "Mówisz w sensie religijnym, czy... ?"
+msgid "Do you mean in a religious sense, or…?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -173582,11 +177348,9 @@ msgstr "Co z tego wyszło?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
 msgstr ""
-"Jakbym ci znalazł właściwe rzeczy, to czy zdołałbyś nie wiem... zaaplikować "
-"temu trochę nauki?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -173750,8 +177514,8 @@ msgid ""
 msgstr "Oh, to niezła historia. <the_cataclysm> wypadł w dniu mojego ślubu."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
-msgstr "Oh, przykro mi..."
+msgid "Oh, I'm sorry…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -174096,7 +177860,7 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
+msgid "I'd like to ask you something else…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -174387,7 +178151,8 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -174575,16 +178340,16 @@ msgid "What do you need done?"
 msgstr "Co potrzebujesz żeby było zrobione?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
-msgstr "A'propos misji..."
+msgid "About the mission…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
-msgstr "Jeśli chodzi o jedno z tych zadań..."
+msgid "About one of those missions…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
-msgstr "Muszę już iść..."
+msgid "I've got to go…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -174606,8 +178371,8 @@ msgstr ""
 "nasze siły do kolejnych misji odzyskiwania."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
-msgstr "Wygląda na niezły plan..."
+msgid "Seems like a decent plan…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -174634,8 +178399,8 @@ msgstr ""
 "logi to przekierowanie całego ciśnienia wody na niższe poziomy."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
-msgstr "Cokolwiek zrobili musiało zadziałać, bo wciąż żyjemy..."
+msgid "Whatever they did it must have worked since we are still alive…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Marshal, I'm rather surprised to see you here."
@@ -174672,8 +178437,8 @@ msgstr ""
 "masz pytania."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
-msgstr "Spróbuję znaleźć waszego dowódcę..."
+msgid "I'll try and find your commander then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -174740,8 +178505,8 @@ msgstr ""
 " mną?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
-msgstr "Mną się nie przejmuj..."
+msgid "Don't mind me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -175018,7 +178783,7 @@ msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr "Czy mówiłem ci już o kartonie przyjacielu? Czy masz może jakiś?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
+msgid "About that shopping list of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -175086,8 +178851,8 @@ msgid "Would you like me to give you some cardboard?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
-msgstr "Myślę, że muszę już iść."
+msgid "I think I have to get going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -175118,7 +178883,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
+msgid "…What were you saying before?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -175138,7 +178903,7 @@ msgid "No."
 msgstr "Nie."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -175230,8 +178995,8 @@ msgid "I found a sample of alien fungus for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
-msgstr "Ok... do zobaczenia."
+msgid "Ok… see ya."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -175333,8 +179098,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -175366,7 +179131,7 @@ msgid "You sound more optimistic than usual."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -175435,12 +179200,16 @@ msgid ""
 "  I know a little bit about a lot of things, I guess you could say.  I kinda"
 " loved the job, to be honest."
 msgstr ""
+"Cóż, przed końcem <the_cataclysm> pracowałem w uniwersyteckiej księgarni. "
+"Wiem trochę o wielu rzeczach, myślę, że można tak powiedzieć. Szczerze "
+"mówiąc, kochałem tą pracę."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "What had you working at the university bookstore in the first place?  Are "
 "you an academic yourself?"
 msgstr ""
+"Nad czym pracowałeś w uniwersyteckiej księgarni? Czy sam jesteś akademikiem?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "What's this I hear about you having a doctorate?"
@@ -175460,6 +179229,14 @@ msgid ""
 "got crazy.  Now, people are just breaking down my door to get my sweet sweet"
 " knowledge of mold to help them fight the incoming zombie threat."
 msgstr ""
+"Tak, tak, wszystko jest bardzo efektowne. Jasne, trenowałem w wielkiej wieży"
+" z kości słoniowej, uzyskałem doktorat z mikologii. Zrobiłem moją rozprawę "
+"na temat szlaków sygnałowych w tworzeniu strzępek i postdok w komunikacji "
+"roślin-grzybów w kłączach. Potem dostałem pracę w księgarni, ponieważ nie "
+"było wiele pracy dla lekarza mikologii, przynajmniej miałem kilka przekąsek,"
+" zanim wszystko naprawdę oszalało. Teraz ludzie po prostu wyłamują moje "
+"drzwi, aby uzyskać moją słodką słodką wiedzę na temat pleśni, aby pomóc im "
+"walczyć z nadchodzącym zagrożeniem zombie."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Do you know about the fungal zombies though?"
@@ -175476,6 +179253,14 @@ msgid ""
 "breaking down my door to get my sweet sweet knowledge of mold to help them "
 "fight the incoming zombie threat."
 msgstr ""
+"Heh. Tak, to było świetne wykorzystanie mojego czasu. Jak widać, naprawdę "
+"pomogło to moim perspektywom zatrudnienia. Tak, mam doktorat z mikologii. "
+"Zrobiłem moją rozprawę na temat szlaków sygnałowych w tworzeniu strzępek i "
+"postdoc w komunikacji roślin-grzybów w kłączach. Potem dostałem pracę w "
+"księgarni, ponieważ nie było mnóstwo pracy dla lekarza mikologii, "
+"przynajmniej miałem kilka przekąsek, zanim wszystko naprawdę oszalało. Teraz"
+" ludzie po prostu wyłamują moje drzwi, aby uzyskać moją słodką słodką wiedzę"
+" na temat pleśni, aby pomóc im walczyć z nadchodzącym zagrożeniem zombie."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -175486,7 +179271,7 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -175596,7 +179381,7 @@ msgstr ""
 "głodu. Pomożesz biednej duszy w potrzebie?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -176027,7 +179812,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -176294,8 +180079,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
-msgstr "O tym zakwasie, którego szukałem dla ciebie..."
+msgid "About that sourdough starter you had me looking for…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Got any more bread I can trade flour for?"
@@ -176601,8 +180386,8 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
-msgstr "Tak, tak, chciałbym ... ty potworze."
+msgid "Yes, yes I would… you monster."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -176812,6 +180597,10 @@ msgstr ""
 "bibułę. Był zbyt ostry. Po prostu daję ci znać na wypadek, gdybyś wpadł na "
 "sprytny pomysł."
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr "Kontynuuj."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -177072,7 +180861,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -177602,7 +181391,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr ""
 
@@ -178313,7 +182102,7 @@ msgid "Are you looking to buy anything else?"
 msgstr "Czy chcesz kupić coś jeszcze?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
+msgid "Very well… let's talk about something else."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -178660,8 +182449,8 @@ msgid "Have you seen anyone who might be hiding something?"
 msgstr "Widziałeś kogoś kto mógłby mieć coś do ukrycia?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
-msgstr "Żegnaj..."
+msgid "Bye…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -178676,16 +182465,16 @@ msgid "Keep your head down and stay out of my way."
 msgstr "Trzymaj głowę nisko i zejdź mi z drogi."
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
-msgstr "OK..."
+msgid "OK…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like what?"
 msgstr "Jak co na przykład?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
-msgstr "Nie jestem pewien..."
+msgid "I'm not sure…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like they could be working for someone else?"
@@ -178704,8 +182493,8 @@ msgid "Got something to hide?"
 msgstr "Masz coś do ukrycia?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
-msgstr "Wybacz, nie chciałem cię urazić..."
+msgid "Sorry, I didn't mean to offend you…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -178760,7 +182549,7 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr "Psze pani, naprawdę nie powinna pani podróżować tam na zewnątrz."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
+msgid "I heard this place was a refugee center…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -178784,8 +182573,8 @@ msgid "Can I do anything for the center?"
 msgstr "Co mogę zrobić dla centrum?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
-msgstr "Wydawało mi się że możesz szukać pomocy..."
+msgid "I figured you might be looking for some help…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, I'd better be going.  Bye."
@@ -178841,7 +182630,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
 msgstr ""
 
@@ -178900,8 +182689,8 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr "Wybacz, nie podejmiemy takiego ryzyka w tej chwili."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
-msgstr "W porządku..."
+msgid "Fine…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -178916,8 +182705,8 @@ msgstr ""
 "zewnątrz to ma moc zmutować znacznie więcej niż tylko jego włosy."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
-msgstr "Dobrze *kaszleciwdupękaszle*"
+msgid "Fine… *coughupyourscough*"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -178951,8 +182740,8 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[STR 11] Obijam mordy różnych rzeczy i idzie mi to całkiem nieźle!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
-msgstr "Chyba poszukam gdzie indziej..."
+msgid "I guess I'll look somewhere else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -178978,8 +182767,8 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr "Słyszałeś o czym lepszym niż dziwny skład broni?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
-msgstr "Liczyłem na coś więcej..."
+msgid "Was hoping for something more…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -179082,8 +182871,8 @@ msgid "So what are you doing right now?"
 msgstr "No więc co teraz porabiasz?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
-msgstr "Nieważne..."
+msgid "Never mind…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -179113,8 +182902,8 @@ msgstr ""
 "daleko idące, ale trzeba mieć nadzieję na przetrwanie."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
-msgstr "Powodzenia z tym..."
+msgid "Good luck with that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -179162,8 +182951,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
-msgstr "Do dupy..."
+msgid "Sucks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -179182,8 +182971,8 @@ msgstr ""
 "zbudowany z czegokolwiek."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
-msgstr "Coż, zatem..."
+msgid "Well, then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -179283,8 +183072,8 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr "Huh, tak myślałem że wyczuwam kogoś nowego. W czym pomóc?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
-msgstr "Ty... wyczułeś mnie?"
+msgid "You… smelled me?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Got anything for sale?"
@@ -179342,8 +183131,8 @@ msgstr ""
 "zastąpi świeżo pieczonego steku z łosia na kolację."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
-msgstr "Super, teraz ślinka mi cieknie..."
+msgid "Great, now my mouth is watering…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -179470,8 +183259,8 @@ msgstr ""
 "czempioni."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
-msgstr "Hmmm..."
+msgid "Hmmm…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -179533,8 +183322,8 @@ msgstr ""
 "pozostają przy życiu."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
-msgstr "Nie zrobiłem nic złego..."
+msgid "I haven't done anything wrong…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any tips for surviving?"
@@ -179701,7 +183490,7 @@ msgid "Something to say?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
+msgid "I charge hourly, so be quick…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -179814,7 +183603,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
+msgid "I guess I could help with that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -179925,8 +183714,8 @@ msgid "[$10] I'll get a haircut"
 msgstr "[$10] Chcę skrócić włosy"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
-msgstr "Może innym razem..."
+msgid "Maybe another time…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -179945,8 +183734,8 @@ msgid "Stand still while I get my clippers..."
 msgstr "Nie ruszaj się, już się biorę za maszynkę do strzyżenia..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
-msgstr "Dzięuję..."
+msgid "Thanks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Want a drink?"
@@ -179965,8 +183754,8 @@ msgid "What do you have on tap?"
 msgstr "Co tam masz dostępnego?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
-msgstr "Będę się zbierać..."
+msgid "I'll be going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -180025,8 +183814,8 @@ msgstr ""
 "co jest do zrobienia."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
-msgstr "Z nim zatem porozmawiam..."
+msgid "I'll talk to him then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -180046,8 +183835,8 @@ msgid "I hope you are here to do business."
 msgstr "Liczę na to, że przybyłeś ubić interes."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
-msgstr "Interesuje mnie inwestycja w agrokulturę..."
+msgid "I'm interested in investing in agriculture…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -180076,12 +183865,12 @@ msgid "I imagine we might be able to work something out."
 msgstr "Wyobrażam sobie że możemy coś wypracować."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
-msgstr "Zastanawiam się czy mógłbyś zainstalować implant cybernetyczny..."
+msgid "I was wondering if you could install a cybernetic implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
-msgstr "Potrzebuję pomocy w usunięciu implantu..."
+msgid "I need help removing an implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'd like to hire your services."
@@ -180128,8 +183917,8 @@ msgstr ""
 "zobaczymy udziału z naszej pracy chyba że plon obrodzi."
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
-msgstr "Mogło być gorzej..."
+msgid "It could be worse…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -180140,8 +183929,8 @@ msgstr ""
 "przodownika lub nadzorcy upraw."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
-msgstr "Zatem porozmawiam z nimi..."
+msgid "I'll talk with them then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Can I help you, marshal?"
@@ -180220,8 +184009,8 @@ msgstr ""
 "głodem i napadami zombie."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
-msgstr "Oby wyprowadzka tutaj była tego warta..."
+msgid "Hopefully moving out here was worth it…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -180779,13 +184568,13 @@ msgstr "Ukąszenie Żmii"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
-msgstr "Kąsasz jak waż %s"
+msgid "You lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
-msgstr "<npcname> kąsa jak wąż %s"
+msgid "<npcname> lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Strike"
@@ -180793,18 +184582,28 @@ msgstr "Uderzenie Żmii"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
-msgstr "Zadajesz Uderzenie Żmii %s"
+msgid "You hit %s with a spectacular Viper Strike"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
-msgstr "<npcname> zadajesz Uderzenie Żmii %s"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr "Skręcenie Żmii"
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr ""
@@ -180847,6 +184646,34 @@ msgstr ""
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr "<npcname> dźga %s Pięścią-Szczypcem"
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr "Język Ropuchy"
@@ -182193,12 +186020,12 @@ msgstr ""
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You attempt to slay %s in a single stroke"
-msgstr ""
+msgstr "Próbujesz zabić %s jednym uderzeniem"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> attempts to slay %s in a single stroke"
-msgstr ""
+msgstr "<npcname> próbuje zabić %s jednym uderzeniem"
 
 #: lang/json/technique_from_json.py
 msgid "Ninjutsu Takedown"
@@ -182586,153 +186413,178 @@ msgid "<npcname> double-handed palm strikes %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
-msgstr "Pijana zmyłka"
+msgid "Tiger Palm"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble and leer at %s"
-msgstr "Potykasz się i łypiesz okiem na%s"
+msgid "You land a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles and leers at %s"
-msgstr "<npcname> potykasz się i łypie okiem na%s"
+msgid "<npcname> lands a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk counter"
-msgstr "Pijana kontra"
+msgid "Tiger Takedown"
+msgstr "Rzut Tygrysa"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
-msgstr "Chwiejesz się, i twój szeroki zamach trafia %s"
+msgid "You slam %s to the ground"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
-msgstr "<npcname> chwieje się, i trafia %s"
+msgid "<npcname> slams %s to the ground"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Tiger Takedown"
-msgstr "Rzut Tygrysa"
+msgid "Straight Punch"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
-msgstr "Chwytasz i uziemiasz %s"
+msgid "You deliver a vertical straight punch to %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> grabs and grounds %s"
-msgstr "<npcname> chwyta i uziemia %s"
+msgid "<npcname> delivers a vertical straight punch to %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "slow strike"
-msgstr "wolne uderzenie"
+msgid "Straight Punch (Knockback)"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You slowly strike %s"
-msgstr "Wolno uderzasz %s"
+msgid "You force %s back with a vertical straight punch"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
-msgstr "<npcname> wolno uderza %s"
+msgid "<npcname> forces %s back with a vertical straight punch"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
-msgstr "fazowe uderzenie"
+msgid "L-hook"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
-msgstr "Uderzasz fazowo %s"
+msgid "You deliver a solid L-hook to %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
-msgstr "<npcname> uderza fazowo %s"
-
-#: lang/json/technique_from_json.py
-msgid "Chain Punch"
+msgid "<npcname> delivers a solid L-hook to %s"
 msgstr ""
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
+msgid "L-hook (Knockback)"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
+msgid "You knock %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
+msgid "<npcname> knocks %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
+#, python-format
+msgid "Your attack misses %s but you don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
+#, python-format
+msgid "<npcname>'s attack misses %s but they don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "ask the way"
+msgid "Receive and Counter"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You miss but keep striking at %s"
+msgid "You receive %s's gift of violence, and return it in kind"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
+msgid "<npcname> receives %s's attack, and counters"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "White Crane stumble"
+msgid "Drunken Feint"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
-msgstr ""
+msgid "You stumble and leer at %s"
+msgstr "Potykasz się i łypiesz okiem na%s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
-msgstr ""
+msgid "<npcname> stumbles and leers at %s"
+msgstr "<npcname> potykasz się i łypie okiem na%s"
 
 #: lang/json/technique_from_json.py
-msgid "Receive and Counter"
+msgid "Drunk Counter"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You receive %s's gift of violence, and return it in kind"
+msgid "You lurch, and your wild swing hits %s"
+msgstr "Chwiejesz się, i twój szeroki zamach trafia %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> lurches, and hits %s"
+msgstr "<npcname> chwieje się, i trafia %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> receives %s's attack, and counters"
+msgid "The %s tries to grab <npcname>, but they stumble away!"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "slow strike"
+msgstr "wolne uderzenie"
+
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
-msgstr "Rozbrajasz%s"
+msgid "You slowly strike %s"
+msgstr "Wolno uderzasz %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
-msgstr "<npcname> rozbraja %s"
+msgid "<npcname> slowly strikes %s"
+msgstr "<npcname> wolno uderza %s"
+
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
+msgstr "fazowe uderzenie"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You phase-strike %s"
+msgstr "Uderzasz fazowo %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> phase-strikes %s"
+msgstr "<npcname> uderza fazowo %s"
 
 #: lang/json/technique_from_json.py
 msgid "Pressure Crunch"
@@ -183370,7 +187222,7 @@ msgstr ""
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr ""
 
@@ -183381,8 +187233,8 @@ msgstr ""
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -183392,7 +187244,7 @@ msgstr ""
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr ""
 
@@ -184597,7 +188449,7 @@ msgstr ""
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
 msgstr ""
 
@@ -184930,13 +188782,9 @@ msgstr "platforma radiacyjna"
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr ""
-"Platforma o podwójnym zastosowaniu, która służy za przechowalnik i jako "
-"urządzenie do wystawienia przedmiotów na nie umieszczonych na źródło "
-"promieniowania, przez krótkotrwałe wyniesienie materiału radioaktywnego "
-"przechowywanego wewnątrz. Sterowana z zewnętrznej konsoli."
 
 #: lang/json/terrain_from_json.py
 msgid "junk metal floor"
@@ -185278,10 +189126,10 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
 
 #. ~ Description for juniper tree
@@ -186294,10 +190142,11 @@ msgstr "bankomat"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -186402,8 +190251,8 @@ msgstr "centryfuga"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -187019,7 +190868,7 @@ msgstr ""
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
 msgstr ""
@@ -187031,7 +190880,7 @@ msgstr ""
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
 msgstr ""
@@ -187124,6 +190973,13 @@ msgid ""
 " were still running."
 msgstr ""
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr ""
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "piaskownica"
@@ -187190,7 +191046,7 @@ msgstr ""
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr ""
 
@@ -187202,7 +191058,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
 msgstr ""
 
@@ -188087,13 +191943,9 @@ msgstr "nieukończona kolumna"
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr ""
-"Pusta drewniana rama w kształcie kolumny, zbudowana na fundamencie z betonu "
-"i prętów zbrojeniowych. Nie jest w stanie utrzymać dachów ani schronienia i "
-"wydaje się, że potrzebuje więcej zasobów, zanim zostanie uznana za "
-"kompletną."
 
 #: lang/json/terrain_from_json.py
 msgid "column"
@@ -189410,12 +193262,8 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
-"Właśnie aktywowałeś granat! Najpewniej chcesz nim teraz rzucić. By rzucić "
-"przedmiotem, naciśnij 't' i wybierz przedmiot do rzucenia. Maksymalny zasięg"
-" zależy od siły oraz wagi i rozmiaru przedmiotu. Rzucanie nie jest zbyt "
-"dobre w większości scenariuszy bitewnych, ale jak masz siłę ognia..."
 
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
@@ -189515,13 +193363,10 @@ msgstr ""
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr ""
-"~ to teren symbolizujący wodę. Ze źródła takiego jak to możesz napełnić "
-"dowolne posiadane pojemniki. Zbadaj wodę ('e') i naciśnij 'c' by napełnić "
-"pojemnik, następnie wybierz szczelny pojemnik by nalać do niego wody."
 
 #: lang/json/vehicle_from_json.py
 msgid "work light"
@@ -189867,6 +193712,10 @@ msgstr ""
 msgid "Rail Motorcycle"
 msgstr ""
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr ""
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "Laweta"
@@ -190756,7 +194605,7 @@ msgstr ""
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
 msgstr ""
 
 #. ~ Description for shredder
@@ -191258,8 +195107,8 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr ""
 
 #. ~ Description for autoclave
@@ -191455,7 +195304,7 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
 msgstr ""
 
@@ -192090,6 +195939,14 @@ msgstr ""
 msgid "rail wheel (steerable)"
 msgstr ""
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr ""
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "bęben obrotowy"
@@ -193863,6 +197720,10 @@ msgstr "Witamina B12"
 msgid "Vitamin C"
 msgstr "Witamina C"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr ""
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr "Naciśnij "
@@ -194395,7 +198256,7 @@ msgstr "Wkładasz kartridż do %s. "
 msgid "You refill the %s."
 msgstr "Uzupełniasz %s."
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "Nie ma tam czego podpalić."
 
@@ -194412,6 +198273,16 @@ msgid "There is not enough sunlight to start a fire now.  You stop trying."
 msgstr ""
 "Nie ma tyle światła słonecznego by rozpalić teraz ogień. Zaprzestajesz prób."
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr ""
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "Nauczyłeś się %s."
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -194422,11 +198293,6 @@ msgstr "Zakończyłeś trenowanie %s do poziomu %d."
 msgid "You get some training in %s."
 msgstr ""
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "Nauczyłeś się %s."
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr ""
@@ -194551,15 +198417,22 @@ msgstr "Szansa uszkodzenia: <color_light_blue>%.1f</color>%%"
 msgid "Your %s is already fully repaired."
 msgstr "Twój %s jest już całkowicie naprawiony."
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr "Nie jesteś obecnie w stanie załatać %s."
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgstr ""
+
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr "Rozmrażasz i podgrzewasz jedzenie."
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr "Podgrzewasz jedzenie."
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
-msgstr "Powiodło ci się załatanie %s."
+msgid "You are currently unable to mend the %s."
+msgstr "Nie jesteś obecnie w stanie załatać %s."
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -194703,7 +198576,7 @@ msgstr ""
 
 #: src/activity_handlers.cpp
 msgid "The Autodoc attempts to carefully extract the bionic."
-msgstr ""
+msgstr "Autodoc próbuje ostrożnie wydobyć bionikę."
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -194712,7 +198585,7 @@ msgstr ""
 
 #: src/activity_handlers.cpp
 msgid "The Autodoc attempts to carefully insert the bionic."
-msgstr ""
+msgstr "Autodoc próbuje ostrożnie wstawić bionikę."
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -194861,7 +198734,7 @@ msgstr "Kończysz wiercenie."
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr "hsh!"
 
@@ -195508,12 +199381,12 @@ msgstr ""
 "Tempo ruchu zredukowane. Depresja. Osłabiony system odpornościowy. Częste ciągi."
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
-msgstr "Percepcja -1; Inteligencja -1; Częste ciągi."
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
-msgstr "Percepcja -2; Inteligencja -2; Częste ciągi."
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
 msgid ""
@@ -195699,38 +199572,6 @@ msgstr "src amt waga poj"
 msgid "Name (charges)"
 msgstr "Nazwa (ładunki)"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "Nie ciągniesz żadnego pojazdu!"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "Brak ciągniętego pojazdu!"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "Niewłaściwy pojemnik!"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "Wszystkie 9 pól"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr "<color_white_red>OGIEŃ</color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr "NIEBEZPIECZEŃSTWO"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr "PUŁAPKA"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr "WODA"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -195852,7 +199693,39 @@ msgstr ""
 msgid "The destination is already full!"
 msgstr "Cel jest już pełny!"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "Nie ciągniesz żadnego pojazdu!"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "Brak ciągniętego pojazdu!"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "Niewłaściwy pojemnik!"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "Wszystkie 9 pól"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr "<color_white_red>OGIEŃ</color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr "NIEBEZPIECZEŃSTWO"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr "PUŁAPKA"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr "WODA"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "Niewłaściwy pojemnik"
 
@@ -196008,6 +199881,14 @@ msgstr "Miażdżone:"
 msgid "Cut:"
 msgstr "Cięte:"
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr ""
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr ""
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "Środowiskowe:"
@@ -196692,19 +200573,15 @@ msgstr "%s Cirpienia"
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
+"  Seeing this is a bug!"
 msgstr ""
-"%s jest jakimś sposobem nieco niezadowolony mimo iż niczego nie chce. Jeśli "
-"to widzisz to błąd."
 
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
 msgstr ""
-"%s jest zadowolony, i tak ma być bo nie ma żadnych norm. Jeśli to widzisz to"
-" błąd."
 
 #: src/artifact.cpp
 #, c-format
@@ -196729,9 +200606,8 @@ msgstr "Przyciskasz swój %s do skóry."
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr ""
-"%s jest zdezorientowany widząc że śnisz na jawie. Jeśli to widzisz to błąd."
 
 #: src/artifact.cpp
 #, c-format
@@ -197510,6 +201386,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr ""
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr "Co robisz z twoim %s?"
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr ""
@@ -197646,12 +201527,14 @@ msgid "The %s must be attached to a gun, it can not be fired separately."
 msgstr "%s musi być przyłączona do bronie, nie można z niej strzelać osobno."
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
-msgstr "Nie możesz dłużej strzelać."
+#, c-format
+msgid "You can no longer fire your %s."
+msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "Potrzebujesz wolnej ręki by prowadzić!"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -197659,8 +201542,9 @@ msgid "You need two free hands to fire your %s."
 msgstr "Potrzebujesz obu wolnych rąk by strzelać z %s."
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "Musisz przeładować!"
+#, c-format
+msgid "Your %s is empty!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -197671,18 +201555,18 @@ msgstr "Twój %s potrzebuje %i ładunków by strzelać!"
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
+"charges to fire the %s!"
 msgstr ""
-"Potrzebujesz UPS-a z co najmniej %d ładunkami lub zaawansowanego UPS-a z co "
-"najmniej %d ładunkami do strzelania z tego!"
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
 msgstr ""
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
 msgstr ""
 
@@ -197771,7 +201655,7 @@ msgstr "[PN]"
 #: src/basecamp.cpp
 msgctxt "base camp: north"
 msgid "[N]"
-msgstr ""
+msgstr "[PN]"
 
 #: src/basecamp.cpp
 msgctxt "base camp: northeast"
@@ -197781,7 +201665,7 @@ msgstr "[PNW]"
 #: src/basecamp.cpp
 msgctxt "base camp: northeast"
 msgid "[NE]"
-msgstr ""
+msgstr "[PNW]"
 
 #: src/basecamp.cpp
 msgctxt "base camp: east"
@@ -197791,7 +201675,7 @@ msgstr "[W]"
 #: src/basecamp.cpp
 msgctxt "base camp: east"
 msgid "[E]"
-msgstr ""
+msgstr "[W]"
 
 #: src/basecamp.cpp
 msgctxt "base camp: southeast"
@@ -197801,7 +201685,7 @@ msgstr "[PDW]"
 #: src/basecamp.cpp
 msgctxt "base camp: southeast"
 msgid "[SE]"
-msgstr ""
+msgstr "[PDW]"
 
 #: src/basecamp.cpp
 msgctxt "base camp: south"
@@ -197811,7 +201695,7 @@ msgstr "[PD]"
 #: src/basecamp.cpp
 msgctxt "base camp: south"
 msgid "[S]"
-msgstr ""
+msgstr "[PD]"
 
 #: src/basecamp.cpp
 msgctxt "base camp: southwest"
@@ -197821,7 +201705,7 @@ msgstr "[PDZ]"
 #: src/basecamp.cpp
 msgctxt "base camp: southwest"
 msgid "[SW]"
-msgstr ""
+msgstr "[PDZ]"
 
 #: src/basecamp.cpp
 msgctxt "base camp: west"
@@ -197831,7 +201715,7 @@ msgstr "[Z]"
 #: src/basecamp.cpp
 msgctxt "base camp: west"
 msgid "[W]"
-msgstr ""
+msgstr "[Z]"
 
 #: src/basecamp.cpp
 msgctxt "base camp: northwest"
@@ -197841,7 +201725,7 @@ msgstr "[PN]"
 #: src/basecamp.cpp
 msgctxt "base camp: northwest"
 msgid "[NW]"
-msgstr ""
+msgstr "[PNZ]"
 
 #. ~ Name of a basecamp
 #: src/basecamp.cpp
@@ -197917,6 +201801,16 @@ msgstr "Twój %s automatycznie wyłącza się."
 msgid "Your %s automatically turns off."
 msgstr "Twój %s automatycznie wyłącza się."
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "Zmieniasz zdanie i wyłączasz to."
@@ -198034,10 +201928,6 @@ msgstr "Rezultaty Badania Krwi"
 msgid "No effects."
 msgstr "Brak efektów."
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr "Nie było wystarczająco wilgoci w powietrzu, z której uzyskałbyś wodę!"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr "Przekładnie zębate zaciska się na twoich stawach."
@@ -198050,10 +201940,6 @@ msgstr "Możesz teraz biegać szybciej, wspomagany przez serwomotory stawów."
 msgid "Start a fire where?"
 msgstr "Gdzie rozpalić ogień?"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "Nie możesz tam rozpalić ognia."
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -198230,6 +202116,20 @@ msgstr ""
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr ""
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -198258,6 +202158,21 @@ msgstr "Twój %s utracił łączność i wyłącza się."
 msgid "You feel your throat open up and air filling your lungs!"
 msgstr "Czujesz jak twoje gardło otwiera się a powietrze wypełnia ci płuca!"
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr "Usunięcie nie powodzi się bez dodatkowych incydentów. "
@@ -199087,8 +203002,12 @@ msgstr "に坂索トし荷測のンおク妙免イロコヤ梅棋厚れ表幌"
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
-msgstr "ty"
+msgid "You"
+msgstr "Ty"
+
+#: src/character.cpp
+msgid "Your"
+msgstr ""
 
 #: src/character.cpp
 msgid "your"
@@ -199321,6 +203240,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr ""
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr "Nie możesz umieścić tam przedmiotów!"
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr "<npcname> nie może umieścić tam przedmiotów!"
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -199345,10 +203272,20 @@ msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr ""
 "<npcname> potrzebujesz co najmniej %1$s by użyć tego %2$s ze swoim%3$s."
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr "Nie możesz odłożyć twojego %s."
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr "Płyn z twojego ekwipunku wyciekł na ziemię."
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr "Twoja obecna wartość zdrowia to %d."
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "Spieczony"
@@ -199418,6 +203355,77 @@ msgstr "Śmiertelnie Zmęczony"
 msgid "Your %s bionic shorts out!"
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "Twoje %s będą lekko odmrożone w ciągu kilku godzin."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "Twoje %s będą odmrożone w ciągu godziny!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr "Twoje %s będą odmrożone w każdej chwili!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr "Czujesz jak sztywność ogrania %s z powodu zimna!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr "Czujesz jak wyziębienie ogarnia %s."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr "Czujesz jak chłód ogarnia %s."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr "Żar rozgrzewa %s do czerwoności!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr "Czujesz że %s ogarnia żar."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr "Czujesz że ciepło ogarniające %s."
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "Wiatr wychładza ci %s."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr ""
+"Wiatr jest bardzo silny, powinieneś znaleźć coś co ochroni przed nim %s."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr ""
+"Twój ubiór nie zapewnia dostatecznej ochrony przed wiatrem dla twojej %s!"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "Lewa Ręka"
@@ -199582,8 +203590,8 @@ msgstr ""
 msgid "Big"
 msgstr ""
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "Normalny"
 
@@ -199687,6 +203695,36 @@ msgstr ""
 msgid "EXTRA_EXERCISE"
 msgstr ""
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr "Twoje ciało ugina się pod ciężarem!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] "Twój %s potrzebuje %d ładunek elektryczny z jakiegoś UPS-a."
+msgstr[1] "Twój %s potrzebuje %d ładunków elektrycznych z jakiegoś UPS-a."
+msgstr[2] "Twój %s potrzebuje %d ładunków elektrycznych z jakiegoś UPS-a."
+msgstr[3] "Twój %s potrzebuje %d ładunków elektrycznych z jakiegoś UPS-a."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] "Twój %s ma %d ładunek a potrzebuje %d."
+msgstr[1] "Twój %s ma %d ładunków a potrzebuje %d."
+msgstr[2] "Twój %s ma %d ładunków a potrzebuje %d."
+msgstr[3] "Twój %s ma %d ładunków a potrzebuje %d."
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "Intensywnie kaszlesz."
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "suchy kaszel."
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr ""
@@ -199866,6 +203904,21 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr "Rozpoczynasz hibernację."
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr ""
+"Nauczyłeś się %s z intensywnej praktyki z Bioniką Walki Na Bliski Dystans"
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr "%s by wybrać styl walki wręcz."
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "Brak Stylu"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "Bez Auto Podnoszenia"
@@ -199914,275 +203967,6 @@ msgid ""
 "this area."
 msgstr ""
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr "Łup: Nieposortowane"
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr ""
-"Miejsce na upuszczenie nieposortowanych zdobyczy. Możesz użyć akcji "
-"obszarowej \"posortuj zdobycz\" by posegregować zawartość. Może nakładać się"
-" na inne obszary zdobyczy różnego typu."
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr "Łup: Żywność"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr ""
-"Miejsce na żywność. Jeżeli bardziej szczegółowa strefa żywności nie jest "
-"zdefiniowana, cała żywność trafi tutaj."
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr "Łup: P.Żywność"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr ""
-"Miejsce na psującą się żywność. Uwzględnia psujące się napoje, jeśli takiej "
-"strefy nie zdefiniowano."
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr "Łup: Napoje"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr ""
-"Miejsce na napoje. Uwzględnia psujące się drinki jeśli takiej strefy nie "
-"zdefiniowano."
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr "Łup: P.Napoje"
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr "Miejsce na psujące się drinki."
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr "Łup: Broń palna"
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr "Miejsce na broń palną, łuki i im podobne."
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr "Łup: Magazynki"
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr "Miejsce na magazynki do broni palnej."
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr "Łup: Amunicja"
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr "Miejsce na amunicję."
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr "Łup: Broń"
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr "Miejsce na broń do walki wręcz."
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr "Łup: Narzędzia"
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr "Miejsce na narzędzia."
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr "Łup: Ubrania"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr ""
-"Miejsce na ubrania. Uwzględnia brudne ubrania jeśli taka strefa nie została "
-"wyznaczona."
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr "Łup: B.Ubrania"
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr "Miejsce na brudne ubrania."
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr "Łup: Leki"
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr "Miejsce na leki i inne medykamenty."
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr "Łup: Książki"
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr "Miejsce na książki i czasopisma."
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr "Łup: Modyfikacje"
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr "Miejsce na modyfikacje do broni itp."
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr "Łup: Mutageny"
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr "Miejsce na mutageny, sera, i czyściki."
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr "Łup: Bionika"
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr "Miejsca na Kompaktowe Bioniczne Moduły aka CBM."
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr "Łup: C.Pojazdów"
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr "Miejsce na części samochodowe."
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr "Łup: Inne"
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr "Miejsce na inne niesklasyfikowane przedmioty."
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr "Łup: Paliwo"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr ""
-"Miejsce na benzynę, diesla, olej do lamp i inne substancje używane jako "
-"paliwa."
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr "Łup: Nasiona"
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr "Miejsce na nasiona, sadzonki, itp."
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr "Łup: Chemia"
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr "Miejsce na chemikalia."
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr "Łup: C.Zamienne"
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr "Miejsce na części zamienne."
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr "Łup: Artefakty"
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr "Miejsce na artefakty."
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr "Łup: Zbroje"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr ""
-"Miejsca na zbroje. Uwzględnia brudne zbroje, jeśli strefa na nie nie została"
-" wyznaczona."
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr "Łup: B.Zbroja"
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr "Miejsce na brudne zbroje."
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr "Łup: Drewno"
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr "Miejsce na drewno opałowe i inne rzeczy, które mogą za nie służyć."
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr "Łup: Ignoruj"
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr "Rzeczy w tej strefie są ignorowane przez akcję sortowania zdobyczy."
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr ""
@@ -200190,7 +203974,7 @@ msgstr ""
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
 msgstr ""
 
@@ -200250,6 +204034,16 @@ msgstr ""
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr ""
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr ""
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr ""
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
 msgstr ""
@@ -200450,6 +204244,7 @@ msgstr ""
 #: src/computer.cpp
 msgid "Maximum login attempts exceeded.  Press any key…"
 msgstr ""
+"Przekroczono maksymalną liczbę prób logowania. Naciśnij dowolny klawisz…"
 
 #: src/computer.cpp
 msgid "Login successful.  Press any key…"
@@ -200522,6 +204317,8 @@ msgstr ""
 #: src/computer.cpp
 msgid "Warning: resticted data access.  Attempt logged.  Press any key…"
 msgstr ""
+"Ostrzeżenie: ograniczony dostęp do danych. Próba zalogowana. Naciśnij "
+"dowolny klawisz…"
 
 #: src/computer.cpp
 msgid "Press any key…"
@@ -200626,11 +204423,11 @@ msgstr "ODMOWA DOSTĘPU"
 
 #: src/computer.cpp
 msgid "Repeater mod installed…"
-msgstr ""
+msgstr "Mod Wzmacniaka zainstalowany..."
 
 #: src/computer.cpp
 msgid "You do not have a repeater mod to install…"
-msgstr ""
+msgstr "Nie masz modu wzmacniaka do zainstalowania..."
 
 #: src/computer.cpp
 msgid "Computer couldn't find its mission!"
@@ -200662,15 +204459,15 @@ msgstr "BŁĄD: Użyj wyłącznie próbek krwi."
 
 #: src/computer.cpp
 msgid "Result: Human blood, no pathogens found."
-msgstr ""
+msgstr "Rezultat: Ludzka krew, nie znaleziono patogenów."
 
 #: src/computer.cpp
 msgid "Result: Human blood.  Unknown pathogen found."
-msgstr ""
+msgstr "Rezultat: Ludzka krew. Znaleziono nieznany patogen."
 
 #: src/computer.cpp
 msgid "Result: Unknown blood type.  Unknown pathogen found."
-msgstr ""
+msgstr "Rezultat: Nieznany typ krwi. Znaleziono nieznany patogen."
 
 #: src/computer.cpp
 msgid "Pathogen bonded to erythrocytes and leukocytes."
@@ -200727,7 +204524,7 @@ msgstr ""
 
 #: src/computer.cpp
 msgid "Press any key to continue…"
-msgstr ""
+msgstr "Naciśnij dowolny klawisz by kontynuować..."
 
 #: src/computer.cpp
 msgid ""
@@ -200743,6 +204540,18 @@ msgid ""
 "\n"
 "  \n"
 msgstr ""
+"WITAJ OBYWATELU. MIAŁ MIEJSCE ATAK BIOLOGICZNY I OGŁOSZONO STAN \n"
+"ZAGROŻENIA. PERSONEL KRYZYSOWY WKRÓTCE CI POMOŻE. BY ZAPEWNIĆ \n"
+"CI BEZPIECZEŃSTWO POSTĘPUJ WG PONIŻSZYCH KROKÓW.\n"
+"\n"
+"\n"
+"1. NIE PANIKUJ.\n"
+"2. POZOSTAŃ WEWNĄTRZ BUDYNKU.\n"
+"3. SZUKAJ SCHRONIENIA W PIWNICY.\n"
+"4. UŻYJ DOSTĘPNYCH MASEK PRZECIWGAZOWYCH.\n"
+"5. OCZEKUJ DALSZYCH POLECEŃ\n"
+"\n"
+"\n"
 
 #: src/computer.cpp
 msgid ""
@@ -200754,6 +204563,13 @@ msgid ""
 "  \n"
 "  \n"
 msgstr ""
+"  UWAGA, WIEŻA RADIOWA NIE ODPOWIADA.\n"
+"  \n"
+"  ZASILANIE AWARYJNE NIEWYSTARCZAJĄCE DO OSIĄGNIECIA WYMAGAŃ TRANSMISJI. \n"
+"  NA WYPADEK SYTUACJI AWARYJNEJ, SKONTAKTUJ SIĘ Z LOKALNĄ GWARDIĄ NARODOWĄ \n"
+"  JEDNOSTKI OTRZYMUJĄCE PRIORYTET PODCZAS ROZMIESZCZANIA GENERATORÓW. \n"
+"  \n"
+"  \n"
 
 #: src/computer.cpp
 msgid "Charges Detonated"
@@ -200798,7 +204614,7 @@ msgstr "OSTRZEŻENIE [409]: Główne czujniki wyłączone!"
 
 #: src/computer.cpp
 msgid "  >> Initialize secondary sensors: Geiger profiling…"
-msgstr ""
+msgstr "  >> Inicjacja czujników pobocznych:  Profilowanie Geigera..."
 
 #: src/computer.cpp
 msgid "  >> Radiation spike detected!\n"
@@ -200806,7 +204622,7 @@ msgstr "  >> Wykryto skok promieniowania!\n"
 
 #: src/computer.cpp
 msgid "WARNING [912]: Catastrophic malfunction!  Contamination detected!"
-msgstr ""
+msgstr "OSTRZEŻENIE [912]: Katastrofalna awaria! Wykryto zanieczyszczenie!"
 
 #: src/computer.cpp
 msgid "EMERGENCY PROCEDURE [1]:  Evacuate.  Evacuate.  Evacuate.\n"
@@ -200818,7 +204634,7 @@ msgstr ""
 
 #: src/computer.cpp
 msgid "PROCESSING…  CYCLE COMPLETE."
-msgstr ""
+msgstr "PRZETWARZANIE...  CYKL ZAKOŃCZONY."
 
 #: src/computer.cpp
 #, c-format
@@ -200830,6 +204646,8 @@ msgid ""
 "CRITICAL ERROR…  RADIATION PLATFORM UNRESPONSIVE.  COMPLY TO PROCEDURE "
 "RP_M_01_rev.03."
 msgstr ""
+"BŁĄD KRYTYCZNY... PLATFORMA RADIACYJNA NIE ODPOWIADA. ZASTOSUJ PROCEDURĘ "
+"RP_M_01_rev.03."
 
 #: src/computer.cpp
 msgid "RADIATION MEASUREMENTS:"
@@ -200838,22 +204656,22 @@ msgstr "POMIARY RADIACJI:"
 #: src/computer.cpp
 #, c-format
 msgid "GEIGER COUNTER @ ZONE:… AVG %s mSv/h."
-msgstr ""
+msgstr "MIERNIK GEIGERA - STREFA:.. ŚR.: %s mSv/h."
 
 #: src/computer.cpp
 #, c-format
 msgid "GEIGER COUNTER @ ZONE:… MAX %s mSv/h."
-msgstr ""
+msgstr "MIERNIK GEIGERA - STREFA:.. MAX.: %s mSv/h."
 
 #: src/computer.cpp
 #, c-format
 msgid "GEIGER COUNTER @ CONSOLE:… %s mSv/h."
-msgstr ""
+msgstr "MIERNIK GEIGERA - KONSOLA: .... %s mSv/h."
 
 #: src/computer.cpp
 #, c-format
 msgid "PERSONAL DOSIMETRY:… %s mSv."
-msgstr ""
+msgstr "OSOBISTA DOZYMETRIA: .... %s mSv."
 
 #: src/computer.cpp
 msgid "Conveyor belt malfunction.  Consult maintenance team."
@@ -200877,11 +204695,11 @@ msgstr "Nie wykryto przedmiotów w: STREFA ZAŁADUNKU"
 
 #: src/computer.cpp
 msgid "Conveyor belt cycle complete.  Press any key…"
-msgstr ""
+msgstr "Przewijanie taśmociągu wykonane. Naciśnij dowolny klawisz..."
 
 #: src/computer.cpp
 msgid "Toggling shutters.  Press any key…"
-msgstr ""
+msgstr "Przełączanie zasłon. Naciśnij dowolny klawisz..."
 
 #: src/computer.cpp
 msgid "Operation irreversible.  Extract radioactive material?"
@@ -200889,15 +204707,17 @@ msgstr "Czynność nieodwracalna. Wydobyć materiał radioaktywny?"
 
 #: src/computer.cpp
 msgid "Extraction sequence complete…  Press any key."
-msgstr ""
+msgstr "Sekwencja wydobycia zakończona... Naciśnij dowolny klawisz."
 
 #: src/computer.cpp
 msgid "ERROR!  Radiation platform unresponsive…  Press any key."
 msgstr ""
+"BŁĄD! Platforma napromieniowywania nie odpowiada... Naciśnij dowolny "
+"klawisz."
 
 #: src/computer.cpp
 msgid "Initiating POWER-DIAG ver.2.34…"
-msgstr ""
+msgstr "Uruchamiam DIAG-MOC ver.2.34 ..."
 
 #: src/computer.cpp
 msgid "Short circuit detected!"
@@ -200919,6 +204739,7 @@ msgstr "Uziemienie przywrócone."
 #, c-format
 msgid "Internal power lines status: 85%% OFFLINE.  Reason: DAMAGED."
 msgstr ""
+"Status wewnętrznych linii zasilania 85%% WYŁĄCZONE: Powód: USZKODZENIA."
 
 #: src/computer.cpp
 #, c-format
@@ -200926,6 +204747,8 @@ msgid ""
 "External power lines status: 100%% OFFLINE.  Reason: NO EXTERNAL POWER "
 "DETECTED."
 msgstr ""
+"Status zewnętrznych linii zasilania: 100%% OFFLINE. Powód: NIE WYKRYTO "
+"ZEWNĘTRZNEGO ZASILANIA."
 
 #: src/computer.cpp
 msgid "Backup power status: STANDBY MODE."
@@ -200933,7 +204756,7 @@ msgstr "Status zasilania awaryjnego: TRYB GOTOWOŚCI."
 
 #: src/computer.cpp
 msgid "Backup power status: OFFLINE.  Reason: UNKNOWN"
-msgstr ""
+msgstr "Status zasilania awaryjnego: WYŁĄCZONE. Przyczyna: NIEZNANA"
 
 #: src/computer.cpp
 msgid "The console shuts down."
@@ -200993,7 +204816,7 @@ msgstr "BŁĄD: Bank danych zniszczony."
 
 #: src/computer.cpp
 msgid "SEARCHING FOR NEAREST REFUGEE CENTER, PLEASE WAIT…"
-msgstr ""
+msgstr "POSZUKIWANIE NAJBLIŻSZEGO CENTRUM DLA UCHODŹCÓW, PROSZĘ CZEKAĆ ..."
 
 #. ~555-0164 is a fake phone number in the US, please replace it with a number
 #. that will not cause issues in your locale if possible.
@@ -201011,6 +204834,13 @@ msgid ""
 "IF YOU WOULD LIKE TO SPEAK WITH SOMEONE IN PERSON OR WOULD LIKE\n"
 "TO WRITE US A LETTER PLEASE SEND IT TO…\n"
 msgstr ""
+"\n"
+"CENTRUM DLA UCHODŹCÓW ZNALEZIONE! LOKALIZACJA: %d %s\n"
+"\n"
+"JEŚLI MASZ UWAGI DO SWOJEJ WIZYTY PROSZĘ O KONTAKT\n"
+" Z DEPARTAMENTEM ZARZĄDZANIA KRYZYSOWEGO BIURA SPRAW WEWNĘTRZNYCH.\n"
+"LOKALNE BIURO JEST DOSTĘPNE W GODZ. OD 9AM DO 4PM POD TEL. 555-0164.\n"
+" GDYBYŚ CHCIAŁ ROZMAWIAĆ Z KIMŚ OSOBIŚCIE LUB NAPISAĆ LIST WYŚLIJ GO DO...\n"
 
 #: src/construction.cpp
 msgid " Construction "
@@ -201084,7 +204914,7 @@ msgstr "Naciśnij %s by zobaczyć kolejne fazy."
 
 #: src/construction.cpp
 msgid "It is too dark to construct right now."
-msgstr ""
+msgstr "Jest zbyt ciemno by teraz cokolwiek konstruować."
 
 #: src/construction.cpp
 msgid "You can't build that!"
@@ -201099,31 +204929,35 @@ msgid ""
 "There is already an unfinished construction there, examine it to continue "
 "working on it"
 msgstr ""
+"Tutaj już jest nieukończona konstrukcja, zbadaj ją be kontynuować nad nią "
+"pracę."
 
 #: src/construction.cpp
 #, c-format
 msgid "%s assists you with the work…"
-msgstr ""
+msgstr "%s asystuje ci przy pracy..."
 
 #: src/construction.cpp
 #, c-format
 msgid "%s watches you work…"
-msgstr ""
+msgstr "%s obserwuje cię przy pracy..."
 
 #: src/construction.cpp
 #, c-format
 msgid "%s finished construction: %s."
-msgstr ""
+msgstr "%s kończy konstrukcję: %s."
 
 #: src/construction.cpp
 msgid ""
 "You feel relieved after providing last rites for this human being, whose "
 "name is lost in the Cataclysm."
 msgstr ""
+"Czujesz ulgę odprawiając ostatnie obrzędy dla tego człowieka, którego imię "
+"zaginęło w Kataklizmie."
 
 #: src/construction.cpp
 msgid "You bury remains of a human, whose name is lost in the Cataclysm."
-msgstr ""
+msgstr "Grzebiesz szczątki człowieka, którego imię zaginęło w Kataklizmie."
 
 #: src/construction.cpp
 #, c-format
@@ -201131,6 +204965,8 @@ msgid ""
 "You feel sadness, but also relief after providing last rites for %s, whose "
 "name you will keep in your memory."
 msgstr ""
+"Czujesz smutek, ale też i ulgę odprawiając ostatnie obrzędy dla %s, którego "
+"imię zachowasz w pamięci."
 
 #: src/construction.cpp
 #, c-format
@@ -201138,16 +204974,18 @@ msgid ""
 "You bury remains of %s, who joined uncounted masses perished in the "
 "Cataclysm."
 msgstr ""
+"Grzebiesz szczątki %s, który dołączył do niezliczonych mas ludzi straconych "
+"w Kataklizmie."
 
 #: src/construction.cpp
 msgid "Inscribe something on the grave?"
-msgstr ""
+msgstr "Napisać coś na nagrobku?"
 
 #: src/construction.cpp
 msgid ""
 "Unfortunately you don't have anything sharp to place an inscription on the "
 "grave."
-msgstr ""
+msgstr "Niestety nie masz nic ostrego by wyryć napis na nagrobku."
 
 #: src/construction.cpp src/veh_interact.cpp
 msgid "Enter new vehicle name:"
@@ -201161,16 +204999,16 @@ msgstr "Ten %s nie może być rozłożony!"
 #: src/construction.cpp
 #, c-format
 msgid "The %s is disassembled."
-msgstr ""
+msgstr "%s jest rozłożony."
 
 #: src/construction.cpp
 #, c-format
 msgid "That %s can not be dissasembled, since there is furniture above it."
-msgstr ""
+msgstr "Ten %s nie może być rozłożony, bo nad nim jest umeblowanie."
 
 #: src/construction.cpp
 msgid "The rock feels much warmer than normal.  Proceed?"
-msgstr ""
+msgstr "Kamień jest dużo cieplejszy niż normalnie. Kontynuować?"
 
 #: src/construction.cpp
 msgid "You just tunneled into lava!"
@@ -201236,7 +205074,7 @@ msgstr "To nie wygląda na jadalne."
 
 #: src/consumption.cpp
 msgid "That doesn't look edible to you."
-msgstr ""
+msgstr "To dla ciebie nie wygląda na jadalne."
 
 #: src/consumption.cpp
 msgid "That doesn't look edible in its current form."
@@ -201283,7 +205121,7 @@ msgstr "Myśl o zjedzeniu tego przyprawia cię o mdłości."
 
 #: src/consumption.cpp
 msgid "You can't eat this."
-msgstr ""
+msgstr "Nie możesz zjeść tego."
 
 #: src/consumption.cpp
 msgid "This is rotten and smells awful!"
@@ -201315,7 +205153,7 @@ msgstr "Jesteś pełen i będziesz zmuszać się do zjedzenia."
 
 #: src/consumption.cpp
 msgid "You're full already and will be forcing yourself to drink."
-msgstr ""
+msgstr "Jesteś pełen i będziesz zmuszać się do wypicia."
 
 #: src/consumption.cpp
 #, c-format
@@ -201338,16 +205176,19 @@ msgid ""
 "feeling that you should prepare for bed, just in case, but… you're hungry "
 "again, and you could eat a whole week's worth of food RIGHT NOW."
 msgstr ""
+"Rozpocząłeś gromadzenie kalorii i płynów do hibernacji. Czujesz, że "
+"powinieneś przygotować się do spania, na wszelki wypadek, ale... jesteś znów"
+" głodny, i zjadłbyś konia z kopytami JUŻ TERAZ."
 
 #: src/consumption.cpp
 #, c-format
 msgid "Ick, this %s doesn't taste so good…"
-msgstr ""
+msgstr "Ick, %s nie smakuje zbyt dobrze..."
 
 #: src/consumption.cpp
 #, c-format
 msgid "Mmm, this %s tastes delicious…"
-msgstr ""
+msgstr "Mmm, %s smakuje wybornie..."
 
 #: src/consumption.cpp
 #, c-format
@@ -201362,7 +205203,7 @@ msgstr "Asymilujesz %s."
 #: src/consumption.cpp
 #, c-format
 msgid "Ick, this %s (rotten) doesn't taste so good…"
-msgstr ""
+msgstr "Ick, %s (zgniłe) nie smakuje zbyt dobrze..."
 
 #: src/consumption.cpp
 #, c-format
@@ -201416,7 +205257,7 @@ msgstr "Chciwie pożerasz zakazane mięso."
 
 #: src/consumption.cpp
 msgid "Meh.  You've eaten worse."
-msgstr ""
+msgstr "Meh. Jadałeś gorsze."
 
 #: src/consumption.cpp
 msgid ""
@@ -201439,15 +205280,15 @@ msgstr ""
 
 #: src/consumption.cpp
 msgid "You can't taste much of anything with this cold."
-msgstr ""
+msgstr "Przeziębienie powoduje, że nie czujesz smaku zbyt dobrze."
 
 #: src/consumption.cpp
 msgid "You can't taste much of anything with this flu."
-msgstr ""
+msgstr "Grypa powoduje, że nie czujesz smaku zbyt dobrze."
 
 #: src/consumption.cpp
 msgid "Yuck!  How can anybody eat this stuff?"
-msgstr ""
+msgstr "Ohyda! Jak ktokolwiek może to jeść?"
 
 #: src/consumption.cpp
 msgid "Mmm, junk food."
@@ -201459,7 +205300,7 @@ msgstr "Gdy życie daje ci kopa, zawsze jest jeszcze cukier."
 
 #: src/consumption.cpp
 msgid "They may do what they must… you've already won."
-msgstr ""
+msgstr "Mogą robić to co muszą... ty już zwyciężyłeś."
 
 #: src/consumption.cpp
 msgid "Your stomach begins gurgling and you feel bloated and ill."
@@ -201495,7 +205336,7 @@ msgstr "Idą po ciebie."
 
 #: src/consumption.cpp
 msgid "This might've been a bad idea…"
-msgstr ""
+msgstr "To był zły pomysł..."
 
 #: src/consumption.cpp
 msgid "You've really done it this time, haven't you?"
@@ -201503,7 +205344,7 @@ msgstr "Tym razem nawaliłeś na całego, czyż nie?"
 
 #: src/consumption.cpp
 msgid "You have to stay vigilant.  They're always watching…"
-msgstr ""
+msgstr "Musisz być czujny. Oni zawsze obserwują..."
 
 #: src/consumption.cpp
 msgid "mistake mistake mistake mistake mistake"
@@ -201523,7 +205364,7 @@ msgstr "Coś się rusza na granicy twojego wzroku."
 
 #: src/consumption.cpp
 msgid "They know what you've done…"
-msgstr ""
+msgstr "Wiedzą co zrobiłeś..."
 
 #: src/consumption.cpp
 msgid "You're feeling even more paranoid than usual."
@@ -201537,16 +205378,19 @@ msgstr "Obżerasz się, przygotowując się do hibernacji."
 msgid ""
 "You feel stocked for a day or two.  Got your bed all ready and secured?"
 msgstr ""
+"Czujesz się napełniony na dzień czy dwa. Przygotowałeś i zabezpieczyłeś "
+"łóżko?"
 
 #: src/consumption.cpp
 msgid ""
 "Mmm.  You can still fit some more in… but maybe you should get comfortable "
 "and sleep."
 msgstr ""
+"Mmm. Jeszcze byś trochę zmieścił... ale może powinieneś się umościć do snu."
 
 #: src/consumption.cpp
 msgid "That filled a hole!  Time for bed…"
-msgstr ""
+msgstr "To wypełniło dziurę! Czas do snu..."
 
 #: src/consumption.cpp
 msgid "You feel as though you're going to split open!  In a good way?"
@@ -201568,24 +205412,6 @@ msgstr "Czujesz że %s wypełnia cię."
 msgid "<npcname> looks better after eating the %s."
 msgstr "<npcname> wygląda lepiej po zjedzeniu %s."
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "Twój wewnętrzny magazyn mocy jest w pełni zasilony."
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr "Wewnętrzny magazyn mocy <npcname> jest w pełni zasilony."
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr "Ładujesz swój system bateryjny z użyciem %s."
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr "<npcname> ładuje swój system bateryjny z użyciem %s."
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr "To jest DUŻO plutonu. Czy jesteś pewien, że chcesz tak dużą ilość?"
@@ -201603,7 +205429,7 @@ msgstr "<npcname> wlewa %s do zbiornika jego reaktora."
 #: src/consumption.cpp
 #, c-format
 msgid "Are you sure you want to eat your favorited %s?"
-msgstr ""
+msgstr "Jesteś pewien, że chcesz zjeść twój ulubiony %s?"
 
 #: src/consumption.cpp
 #, c-format
@@ -201635,10 +205461,10 @@ msgstr ""
 #, c-format
 msgid "You digest %d %s and recharge %d point of energy."
 msgid_plural "You digest %d %s and recharge %d points of energy."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Trawisz %d %s, uzyskując %d punkt energii."
+msgstr[1] "Trawisz %d %s, uzyskując %d punktów energii."
+msgstr[2] "Trawisz %d %s, uzyskując %d punktów energii."
+msgstr[3] "Trawisz %d %s, uzyskując %d punktów energii."
 
 #: src/consumption.cpp
 #, c-format
@@ -201701,10 +205527,12 @@ msgid ""
 "You don't have enough charges to complete the %s.\n"
 "Start crafting anyway?"
 msgstr ""
+"Nie masz wystarczająco ładunków żeby ukończyć %s.\n"
+"Zacząć wytwarzać mimo to?"
 
 #: src/craft_command.cpp
 msgid "Some components used previously are missing.  Continue?"
-msgstr ""
+msgstr "Niektórych komponentów użytych poprzednio brakuje. Kontynuować?"
 
 #: src/craft_command.cpp
 msgid "Item(s): "
@@ -201716,7 +205544,7 @@ msgstr "Narzędzie(a):"
 
 #: src/crafting.cpp
 msgid "Your morale is too low to craft such a difficult thing…"
-msgstr ""
+msgstr "Twoje morale jest zbyt niskie by wytwarzać tak skomplikowaną rzecz..."
 
 #: src/crafting.cpp
 msgid "You can't see to craft!"
@@ -201738,10 +205566,12 @@ msgid ""
 "The %s is too large and/or heavy to work on.  You may want to use a "
 "workbench or a smaller batch size"
 msgstr ""
+"%s jest zbyt duże i/lub ciężkie by nad tym pracować. Możesz chcieć użyć "
+"warsztatu lub mniejszej ilości hurtowej."
 
 #: src/crafting.cpp
 msgid "Your morale is too low to continue crafting."
-msgstr ""
+msgstr "Twoje morale jest zbyt niskie żeby kontynuować majsterkowanie."
 
 #: src/crafting.cpp
 msgid "You are too frustrated to continue and just give up."
@@ -201749,7 +205579,7 @@ msgstr "Jesteś zbyt sfrustrowany by kontynuować i poddajesz się."
 
 #: src/crafting.cpp
 msgid "You can't see well and are working slowly."
-msgstr ""
+msgstr "Nie widzisz zbyt dobrze i pracujesz wolno."
 
 #: src/crafting.cpp
 #, c-format
@@ -201757,6 +205587,8 @@ msgid ""
 "The %s is to large and/or heavy to work on comfortably.  You are working "
 "slowly."
 msgstr ""
+"%s jest zbyt duże i/lub ciężkie by nad tym wygodnie pracować. Idzie ci to "
+"powoli."
 
 #: src/crafting.cpp
 msgid "You can't focus and are working slowly."
@@ -201776,6 +205608,8 @@ msgid ""
 "You don't have anything in which to store %s and may have to pour it out or "
 "consume it as soon as it is prepared!  Proceed?"
 msgstr ""
+"Nie masz pojemnika na %s i będziesz musiał to wylać albo wypić jak tylko "
+"będzie gotowe! Kontynuować?"
 
 #: src/crafting.cpp src/pickup.cpp
 #, c-format
@@ -201791,37 +205625,37 @@ msgstr "Używasz - %s"
 #, c-format
 msgctxt "item, furniture"
 msgid "You put the %1$s on the %2$s."
-msgstr ""
+msgstr "Umieszczasz %1$s na %2$s."
 
 #: src/crafting.cpp
 #, c-format
 msgctxt "item, furniture"
 msgid "<npcname> puts the %1$s on the %2$s."
-msgstr ""
+msgstr "<npcname> umieszcza %1$s na %2$s."
 
 #: src/crafting.cpp
 #, c-format
 msgctxt "furniture, item"
 msgid "Not enough space on the %s. You drop the %s on the ground."
-msgstr ""
+msgstr "Brakuje miejsca na %s. Upuszczasz %s na ziemię."
 
 #: src/crafting.cpp
 #, c-format
 msgctxt "furniture, item"
 msgid "Not enough space on the %s. <npcname> drops the %s on the ground."
-msgstr ""
+msgstr "Brakuje miejsca na %s. <npcname> upuszcza %s na ziemię."
 
 #: src/crafting.cpp
 #, c-format
 msgctxt "item"
 msgid "You put the %s on the ground."
-msgstr ""
+msgstr "Kładziesz %s na ziemi."
 
 #: src/crafting.cpp
 #, c-format
 msgctxt "item"
 msgid "<npcname> puts the %s on the ground."
-msgstr ""
+msgstr "<npcname> kładzie %s na ziemi."
 
 #: src/crafting.cpp
 #, c-format
@@ -201832,7 +205666,7 @@ msgstr "Co zrobić z %s?"
 #: src/crafting.cpp
 #, c-format
 msgid "Dispose of your wielded %s and start working."
-msgstr ""
+msgstr "Pozbądź się trzymanego %s i rozpocznij pracę."
 
 #: src/crafting.cpp
 msgid "Put it down and start working."
@@ -201849,7 +205683,7 @@ msgstr "Upuść to na ziemię."
 #: src/crafting.cpp
 #, c-format
 msgid "Wield and activate the %s to start crafting."
-msgstr ""
+msgstr "Weź do rąk i aktywuj %s by rozpocząć wytwarzanie."
 
 #: src/crafting.cpp src/iexamine.cpp src/iuse.cpp
 #, c-format
@@ -201866,32 +205700,32 @@ msgstr "<npcname> zaczyna pracę nad %s."
 #: src/crafting.cpp
 #, c-format
 msgid "%s assists with crafting…"
-msgstr ""
+msgstr "%s asystuje ci w produkcji..."
 
 #: src/crafting.cpp
 #, c-format
 msgid "%s could assist you with a batch…"
-msgstr ""
+msgstr "%s asystuje ci w masowej produkcji..."
 
 #: src/crafting.cpp
 #, c-format
 msgid "%s watches you craft…"
-msgstr ""
+msgstr "%s obserwuje cię przy procesie wytwarzania..."
 
 #: src/crafting.cpp
 #, c-format
 msgid "%s helps with crafting…"
-msgstr ""
+msgstr "%s pomaga ci w produkcji..."
 
 #: src/crafting.cpp
 #, c-format
 msgid "You mess up and destroy the %s."
-msgstr ""
+msgstr "Schrzaniłeś sprawę i zniszczyłeś %s."
 
 #: src/crafting.cpp
 #, c-format
 msgid "<npcname> messes up and destroys the %s"
-msgstr ""
+msgstr "<npcname> schrzanił sprawę i zniszczył %s."
 
 #: src/crafting.cpp
 #, c-format
@@ -202618,6 +206452,10 @@ msgstr ""
 msgid "Toggle display temperature"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr ""
@@ -202658,6 +206496,10 @@ msgstr "Przełącz pathfiding NPC na mapie"
 msgid "Print faction info to console"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Test weather"
 msgstr ""
@@ -202937,6 +206779,10 @@ msgstr "Okno Statusu {@]"
 msgid "t[e]leport"
 msgstr "t[e]leport"
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr "Edytuj [M]isje (UWAGA: Niestabilne!)"
@@ -203526,13 +207372,15 @@ msgstr ""
 msgid "Spell"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
-msgstr ""
+msgstr "POZ"
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
-msgstr ""
+msgstr "MAX"
 
 #: src/debug_menu.cpp
 msgid "Debug level spell:"
@@ -205579,6 +209427,14 @@ msgstr ", Zarządca Obozu"
 msgid "%s has abandoned the camp."
 msgstr "%s opuszcza obóz."
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr "Rozszerzenie"
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr "Wycofaj Sojusznika,"
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -205594,59 +209450,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr "Rozdaj Żywność"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr "Resetuj Punkty Sortowania"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -205681,23 +209484,6 @@ msgid ""
 "Positions: %d/1\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -205860,14 +209646,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr "Rozszerzenie"
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr "Wycofaj Sojusznika,"
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -205949,6 +209727,61 @@ msgid ""
 "Positions: 0/1\n"
 msgstr ""
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr "Rozdaj Żywność"
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -205959,6 +209792,10 @@ msgid ""
 "Companions must be on missions for at least 24 hours before emergency recall becomes available."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr ""
@@ -205995,10 +209832,6 @@ msgstr ""
 msgid "departs to search for recruits…"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr ""
@@ -206291,7 +210124,7 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
 
@@ -206464,8 +210297,7 @@ msgstr ""
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
+"create a camp food zone, and a camp storage zone."
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -206495,18 +210327,18 @@ msgstr ">Obszar pokrycia: %15d (m)\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
-msgstr ">Podróż:  %23s\n"
+msgid ">Travel:  %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
-msgstr ">Praca: %23s\n"
+msgid ">Working: %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
-msgstr "Razem:    %23s\n"
+msgid "Total:    %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -206562,8 +210394,8 @@ msgstr "Wymaga Orki:"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
-msgstr "Nazwa:        %25s\n"
+msgid "Name:     %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 msgid "----          Engines          ----\n"
@@ -206571,8 +210403,8 @@ msgstr "----          Silniki          ----\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
-msgstr "Silnik: %25s\n"
+msgid "Engine:   %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -206581,8 +210413,8 @@ msgstr ">Status:  %24d%%\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
-msgstr ">Paliwo:      %25s\n"
+msgid ">Fuel:    %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 msgid "----  Fuel Storage & Battery   ----\n"
@@ -208061,7 +211893,7 @@ msgstr "Potrzebujesz co najmniej jeden %s by przeładować %s!"
 msgid "The %s is already full!"
 msgstr "%s jest już pełny!"
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr "Nie możesz przeładować %s!"
@@ -208149,6 +211981,19 @@ msgstr "Naprawdę wejść w %s?"
 msgid "Your %s refuses to move over that ledge!"
 msgstr ""
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr ""
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr ""
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "Nie możesz znaleźć uchwyconego obiektu."
@@ -208348,6 +212193,16 @@ msgstr "Przeciążasz się próbując przemieścić ciężki%s! "
 msgid "There's stuff in the way."
 msgstr "Jakiś sprzęt stoi na przeszkodzie."
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr ""
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -208675,7 +212530,7 @@ msgstr ""
 "Nie masz chyba właściwej lokalizacji Unicode. Możesz widzieć dziwne znaczki "
 "(np. puste pudełka lub pytajniki). Zostałeś ostrzeżony."
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr "Nagle czujesz ostry ból bez powodu."
 
@@ -208961,10 +212816,6 @@ msgstr "ŚWIERZOŚĆ"
 msgid "SPOILS IN"
 msgstr "PSUJE SIĘ W"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "Akumulator"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "Reaktor"
@@ -208989,10 +212840,6 @@ msgstr "Nie możesz wypić rozlanych napojów"
 msgid "Your biology is not compatible with that item."
 msgstr ""
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr "Jesteś w pełni naładowany"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -209087,10 +212934,6 @@ msgstr[1] "Potrzebuje co najmniej %d ładunków"
 msgstr[2] "Potrzebuje co najmniej %d ładunków"
 msgstr[3] "Potrzebuje co najmniej %d ładunków"
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr ""
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "Użyj przedmiotu"
@@ -209305,11 +213148,6 @@ msgstr ""
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr ""
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr ""
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -210432,8 +214270,8 @@ msgid "Purchase cash card?"
 msgstr "Zakupić kartę płatniczą?"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
-msgstr "Potrzebujesz  $1.00 na koncie żeby kupić kartę."
+msgid "You need $10.00 in your account to purchase a card."
+msgstr ""
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -210478,7 +214316,7 @@ msgstr "Twoje konto obecnie przechowuje %s."
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
 msgstr ""
 
 #: src/iexamine.cpp
@@ -210767,15 +214605,26 @@ msgid "The gun safe stumps your efforts to pick it."
 msgstr "Sejf z bronią opiera się twoim próbom włamania."
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
 msgstr ""
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
 #: src/iexamine.cpp
 #, c-format
 msgid "You attempt to pry open the %1$s using your %2$s…"
+msgstr "Próbujesz wyważyć zamek %1$s używając %2$s…"
+
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
 msgstr ""
 
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr "Próbujesz złamać zamek %1$s używając%2$s…"
+
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
 msgstr "Ta tablica ogłoszeń nie jest wewnątrz obozu"
@@ -211237,12 +215086,16 @@ msgstr "Rozbierz %s"
 #: src/iexamine.cpp
 #, c-format
 msgid "You attempt to start a fire with your %s…"
-msgstr ""
+msgstr "Próbujesz rozpalić ogień używając %s…"
 
 #: src/iexamine.cpp
 msgid "You weren't able to start a fire."
 msgstr "Nie udało ci się rozpalić ognia."
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "Nie możesz tam rozpalić ognia."
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -211951,6 +215804,17 @@ msgstr ""
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr ""
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr ""
@@ -212490,6 +216354,10 @@ msgstr "Połączenia mapy zasadniczej"
 msgid "Overmap specials"
 msgstr "Obiekty specjalne mapy"
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "Lokacje mapy zasadniczej"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr "Prototypy pojazdów"
@@ -212546,6 +216414,10 @@ msgstr "Listy żniw"
 msgid "Anatomies"
 msgstr "Anatomie"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "Mutacje"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "Zestaw Kafelków"
@@ -212590,18 +216462,10 @@ msgstr "Zawody i profesje"
 msgid "Scenarios"
 msgstr "Scenariusze"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "Mutacje"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "Kategorie Mutacji"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "Lokacje mapy zasadniczej"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr ""
@@ -212969,14 +216833,6 @@ msgstr ""
 msgid "Page %d/%d"
 msgstr "Strona %d/%d"
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "PRZEDMIOTY NOSZONE"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "TRZYMANA BROŃ"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -213434,11 +217290,9 @@ msgstr ""
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
 msgstr ""
-"Ta żywność zaczęła się <bad>psuć</bad>. <info>Zjedenie</info> jej byłoby "
-"<bad>bardzo złym pomysłem</bad>."
 
 #: src/item.cpp
 #, c-format
@@ -213511,11 +217365,6 @@ msgstr ""
 msgid "This ammo <neutral>starts fires</neutral>."
 msgstr ""
 
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr "Statystyki aktywnej <info>modyfikacji (%s)</info> są pokazane."
-
 #: src/item.cpp
 msgid "Skill used: "
 msgstr "Użyta zdolność:"
@@ -213664,8 +217513,9 @@ msgid "Used on: "
 msgstr "Używany na: "
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "Lokacja: "
+#, c-format
+msgid "Location: %s"
+msgstr ""
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -214206,42 +218056,45 @@ msgid ""
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
+msgid "<info>can be upsized</info>"
+msgstr ""
+
+#: src/item.cpp
+msgid "<info>can be downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
+msgid "<bad>can not be downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
+msgid "<bad>can not be upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
+#, c-format
+msgid "* This clothing %s."
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
+msgid " and <info>upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
+msgid " and <info>downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
+msgid " but <bad>not downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
+msgid " but <bad>not upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
 msgstr ""
 
 #: src/item.cpp
@@ -214339,6 +218192,22 @@ msgstr ""
 msgid "This bionic is installed in the following body part(s):"
 msgstr "Ta bionika jest zainstalowana w następującej(ych) części(ach) ciała:"
 
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr ""
+
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr ""
+
 #: src/item.cpp
 msgid "<bold>Encumbrance:</bold> "
 msgstr ""
@@ -214467,6 +218336,11 @@ msgstr "Możesz użyć tego by wytworzyć różne inne rzeczy."
 msgid "You could use it to craft: %s"
 msgstr "Możesz tego użyć by wytworzyć: %s"
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr "Statystyki aktywnej <info>modyfikacji (%s)</info> są pokazane."
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -214494,7 +218368,7 @@ msgstr "Chwytasz w dłonie %s."
 
 #: src/item.cpp
 msgid "faulty "
-msgstr "wadliwe"
+msgstr "wadliwe "
 
 #: src/item.cpp
 #, c-format
@@ -214516,7 +218390,7 @@ msgstr "mocno spalone"
 #: src/item.cpp
 msgctxt "burnt adjective"
 msgid "burnt "
-msgstr "przypalone"
+msgstr "przypalone "
 
 #: src/item.cpp
 #, c-format
@@ -215692,8 +219566,8 @@ msgid "You do not have that item!"
 msgstr "Nie masz tego przedmiotu!"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
-msgstr "Jaki sygnał powinien aktywować przedmiot?:"
+msgid "Which signal should activate the item?"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "\"Blue\""
@@ -215938,16 +219812,6 @@ msgstr "KXSHHHHRRCRKLKKK!"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr "Piekielne głosy milkną gdy emiter dźwięku wyłącza się."
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr "Uczysz się zasadniczych elementów stylu %s."
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr "%s by wybrać styl walki wręcz."
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr "Wyważasz palik płotu."
@@ -216370,18 +220234,27 @@ msgid "Scan the ground"
 msgstr "Skanuj ziemię"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "Skanuj siebie"
+msgid "Scan yourself or other person"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "Włącz stałe skanowanie"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr ""
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -216449,6 +220322,10 @@ msgstr "Tik!"
 msgid "You've already released the handle, try throwing it instead."
 msgstr "Już uwolniłeś rączkę, spróbuj zamiast tego rzucić."
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "Potrzebujesz źródła ognia!"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr "Podpalasz strzałę!"
@@ -216946,10 +220823,6 @@ msgstr "Poruszasz mopem w ten i nazad, niepewny czy to cokolwiek pomaga."
 msgid "You mop up the spill."
 msgstr "Mopujesz to co się rozlało."
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr ""
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr "Materia przestrzeni wydaje się rozpadać."
@@ -217011,17 +220884,9 @@ msgid "You don't have appropriate food to heat up."
 msgstr "Nie masz odpowiedniego do pogrzania jedzenia."
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgid "You start heating up the food."
 msgstr ""
 
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
-msgstr "Rozmrażasz i podgrzewasz jedzenie."
-
-#: src/iuse.cpp
-msgid "You heat up the food."
-msgstr "Podgrzewasz jedzenie."
-
 #: src/iuse.cpp
 msgid "There is no fire around, use your integrated toolset instead?"
 msgstr "Nie ma ognia w pobliżu, użyć twojego zintegrowanego zestawu narzędzi?"
@@ -218042,8 +221907,8 @@ msgstr ""
 "samochodu."
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
-msgstr "Rozbrajasz swój zdalnie sterowany samochód"
+msgid "You disarmed your RC car."
+msgstr ""
 
 #. ~Sound of a radio controlled car moving around
 #: src/iuse.cpp
@@ -218055,12 +221920,12 @@ msgid "What to do with activated RC car?"
 msgstr "Co chcesz zrobić z aktywnym zdalnie sterowanym samochodem?"
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
-msgstr "Wyłączyłeś swój zdalnie sterowany samochód"
+msgid "You turned off your RC car."
+msgstr ""
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
-msgstr "beep."
+#: src/iuse.cpp
+msgid "beep"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Take control of RC car"
@@ -218097,11 +221962,16 @@ msgstr "Przejmujesz kontrolę nad zdalnie sterowanym samochodem."
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
+msgstr ""
+
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
 "sending the signal."
 msgstr ""
-"%s na twoim wyposażeniu eksplodowałby na ten sygnał. Umieść go na ziemi "
-"zanim go wyślesz."
 
 #: src/iuse.cpp
 msgid "This vehicle's security system has locked you out!"
@@ -219906,9 +223776,29 @@ msgstr ""
 msgid "How do you want to modify it?"
 msgstr "Jak chcesz to zmodyfikować?"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
 msgstr ""
 
 #: src/iuse_actor.cpp
@@ -221306,6 +225196,23 @@ msgstr ""
 msgid "All knowledge of %s leaves you."
 msgstr ""
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr ""
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr ""
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr ""
@@ -221314,6 +225221,10 @@ msgstr ""
 msgid "Popup Distractions"
 msgstr ""
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr ""
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr ""
@@ -221378,6 +225289,15 @@ msgstr ""
 msgid "Casting Cost (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr ""
@@ -221386,6 +225306,10 @@ msgstr ""
 msgid "Casting Time (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+msgid "self"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr ""
@@ -221399,29 +225323,37 @@ msgid "Healing"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Variance"
+msgid "Spell Radius"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spawn"
+msgid "Cone Arc"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Summon"
+msgid "degrees"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spell Radius"
+msgid "Line Width"
 msgstr ""
 
-#: src/magic.cpp src/veh_interact.cpp
-msgid "Range"
-msgstr "Zasięg"
+#: src/magic.cpp
+msgid "Variance"
+msgstr ""
 
 #: src/magic.cpp
-msgid "self"
+msgid "Spawn"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Summon"
 msgstr ""
 
+#: src/magic.cpp src/veh_interact.cpp
+msgid "Range"
+msgstr "Zasięg"
+
 #: src/magic.cpp
 msgid "Duration"
 msgstr ""
@@ -221446,18 +225378,22 @@ msgstr ""
 msgid "Damage Type"
 msgstr ""
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr ""
@@ -221506,6 +225442,11 @@ msgstr ""
 msgid "No valid targets to teleport."
 msgstr ""
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr ""
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr ""
@@ -221646,6 +225587,10 @@ msgstr ""
 msgid "Unable to make sound directory.  Check permissions."
 msgstr ""
 
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr ""
+
 #: src/main_menu.cpp
 msgid "Really quit?"
 msgstr "Naprawdę wyjść?"
@@ -222345,7 +226290,7 @@ msgstr ""
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
+msgid "The %1$s is not a valid %2$s weapon."
 msgstr ""
 
 #: src/martialarts.cpp
@@ -222777,12 +226722,6 @@ msgstr[1] "%d trafionych wrogów!"
 msgstr[2] "%d trafionych wrogów!"
 msgstr[3] "%d trafionych wrogów!"
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr ""
-"Nauczyłeś się %s z intensywnej praktyki z Bioniką Walki Na Bliski Dystans"
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -225114,18 +229053,43 @@ msgid "You don't have any companions to send out…"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
+msgid "Who do you want to send?"
+msgstr "Kogo chcesz wysłać?"
+
+#: src/mission_companion.cpp
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
 msgstr ""
-"Kogo chcesz wysłać?                       [ WALKA : PRZETRWANIE : PRZEMYSŁ ]"
 
+#. ~ %1$s: npc name
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
+msgstr ""
+
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
-msgstr "Towarzysz, którego wybrałeś nie ma umiejętności!"
+msgid "You choose to send no one…"
+msgstr ""
 
 #: src/mission_companion.cpp
 msgid "You don't have any companions ready to return…"
@@ -226842,6 +230806,11 @@ msgstr "Ramię %1$s trafia twoją %2$s, ale odbija sie od zbroi!"
 msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr "%1$s trafia %2$s <npcname>, ale odbija się od zbroi!"
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr ""
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -227041,11 +231010,6 @@ msgstr "Po trafieniu %s wytryskuje zeń kwas!"
 msgid "zombie slave"
 msgstr "niewolnik zombie"
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr "Co robisz z twoim %s?"
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -227451,22 +231415,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr "malutki"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr "mały"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr "średni"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr "duży"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr "wielki"
 
@@ -227531,6 +231500,16 @@ msgstr "gęsta masa żelowa"
 msgid "wearing %1$s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr "%s"
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr ""
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -227573,6 +231552,11 @@ msgstr ""
 msgid "Rider: %s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr ""
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr "Trudność "
@@ -228234,8 +232218,8 @@ msgid "Crossed a threshold"
 msgstr "Przekroczyłaś próg"
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
-msgstr "Ooo, tak! To jest TO!"
+msgid "Oh, yeah!  That's the stuff!"
+msgstr ""
 
 #: src/mutation_ui.cpp
 msgid "Reassigning."
@@ -229264,7 +233248,7 @@ msgstr "Gniew:"
 msgid "%s disappears."
 msgstr ""
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "%s umiera!"
@@ -230025,6 +234009,16 @@ msgstr "Mam wieści."
 msgid "Yes, let's resume training "
 msgstr "Tak, wznówmy trening"
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr ""
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr ""
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -230193,10 +234187,6 @@ msgstr ""
 msgid "I need a %s to consume that!"
 msgstr "Potrzebuję %s żeby to zjeść!"
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr "To nie wygląda na najlepszy pomysł, żeby to zjeść..."
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr "Co oferujesz?"
@@ -230274,6 +234264,11 @@ msgstr ""
 msgid "My current location"
 msgstr "Moja obecna lokalizacja"
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -230306,10 +234301,6 @@ msgstr "Którą bionikę chcesz odinstalować? "
 msgid "You decide to hold off…"
 msgstr ""
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr ""
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -230376,6 +234367,11 @@ msgstr "%s zaczyna uciekać!"
 msgid "%s leaves."
 msgstr "%s odchodzi."
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -230435,6 +234431,11 @@ msgstr "Więcej >"
 msgid "Examine which item?"
 msgstr "Obejrzeć który przedmiot?"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr ""
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -230777,11 +234778,9 @@ msgstr "Liczba tur do ponownego automatycznego włączenia trybu bezpiecznego"
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
 msgstr ""
-"Liczba tur, po których tryb bezpieczny jest włączany ponownie. Zadziała "
-"jeśli nie ma wrogich kreatur w 'Zasięgu trybu bezpiecznego'."
 
 #: src/options.cpp
 msgid "Turns to remember ignored monsters"
@@ -230890,12 +234889,9 @@ msgstr "Upuszczaj puste zbiorniki"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
 msgstr ""
-"Ustawienia dotyczące upuszczania pustych zbiorników po użyciu. Nie: Nie "
-"upuszczaj żadnych. - Wodoszczelne: Wszystkie oprócz pojemników "
-"wodoszczelnych. - Wszystkie: Upuszczaj wszystkie pojemniki."
 
 #: src/options.cpp
 msgid "Watertight"
@@ -231067,12 +235063,12 @@ msgstr ""
 "Jeśli prawdziwe, automatycznie śledzi celownik podczas strzelania/rzucania."
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "Pytaj się przy demontażu"
+msgid "Query on disassembly while butchering"
+msgstr ""
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
-msgstr "Jeśli prawdziwe, gra zapyta się przed demontażem przedmiotów."
+msgid "If true, will query before disassembling items while butchering."
+msgstr ""
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -231360,9 +235356,9 @@ msgstr "Autonumerowanie wyposażenia"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
 msgstr ""
 
 #: src/options.cpp
@@ -231743,7 +235739,7 @@ msgstr ""
 msgid "Display"
 msgstr "Wyświetlanie"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr "Wybiera sposób, w jaki gra będzie wyświetlana. Wymaga restartu gry."
@@ -231838,8 +235834,8 @@ msgid "Scaling factor"
 msgstr "Mnożnik skalowania"
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
-msgstr "Czynnik, przez który skalowane jest wyświetlanie. Wymaga restartu."
+msgid "Factor by which to scale the display.  Requires restart."
+msgstr ""
 
 #: src/options.cpp
 msgid "1x"
@@ -232145,13 +236141,10 @@ msgstr "Początkowy dzień"
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
 msgstr ""
-"W którym dniu roku wystąpił kataklizm. Dzień 0 to pierwszy dzień wiosny. "
-"Może być nadpisane przez scenariusze. Nie przyspiesza gnicia żywności ani "
-"ewolucji potworów."
 
 #: src/options.cpp
 msgid "Spawn delay"
@@ -232159,13 +236152,10 @@ msgstr "Opóźnienie odradzania się"
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
 msgstr ""
-"Jak wiele dni po kataklizmie zjawia się gracz. Dzień 0 to dzień kataklizmu. "
-"Może być nadpisany przez scenariusze. Zwiększenie powoduje psucie żywności i"
-" postęp ewolucji potworów."
 
 #: src/options.cpp
 msgid "Season length"
@@ -232235,11 +236225,9 @@ msgstr "Statyczni NPC-e"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
 msgstr ""
-"Zaznaczone: gra wygeneruje statycznych NPC-ów na z góry określonych "
-"lokacjach. Wymaga restartu świata."
 
 #: src/options.cpp
 msgid "Starting NPCs spawn"
@@ -233511,6 +237499,7 @@ msgstr "Ciepł:"
 msgid "Underground"
 msgstr "Pod ziemią"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
 msgstr ""
@@ -233572,10 +237561,6 @@ msgstr "Głuchy!"
 msgid "Weapon  :"
 msgstr "Broń :"
 
-#: src/panels.cpp
-msgid "No Style"
-msgstr "Brak Stylu"
-
 #: src/panels.cpp
 msgid "Day "
 msgstr "Dzień"
@@ -233588,10 +237573,12 @@ msgstr "Temp.: "
 msgid "to open sidebar options"
 msgstr "by otworzyć opcje panelu bocznego"
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
 msgstr ""
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
 msgstr ""
@@ -233848,77 +237835,6 @@ msgstr "By uniknąć rozlania zawartości, <npcname> ustawia %1$s na %2$s."
 msgid "You have learned a new style: %s!"
 msgstr "Nauczyłeś się nowego stylu: %s!"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "Twoje %s będą lekko odmrożone w ciągu kilku godzin."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "Twoje %s będą odmrożone w ciągu godziny!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr "Twoje %s będą odmrożone w każdej chwili!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr "Czujesz jak sztywność ogrania %s z powodu zimna!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr "Czujesz jak wyziębienie ogarnia %s."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr "Czujesz jak chłód ogarnia %s."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr "Żar rozgrzewa %s do czerwoności!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr "Czujesz że %s ogarnia żar."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr "Czujesz że ciepło ogarniające %s."
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "Wiatr wychładza ci %s."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr ""
-"Wiatr jest bardzo silny, powinieneś znaleźć coś co ochroni przed nim %s."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr ""
-"Twój ubiór nie zapewnia dostatecznej ochrony przed wiatrem dla twojej %s!"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "Tarzasz się na ziemi, chcąc zdusić ogień!"
@@ -234293,14 +238209,6 @@ msgstr "Zdezynfekowane rany na twojej %s zagoiły się."
 msgid "There is not enough %s left to siphon it."
 msgstr "Nie ma już wystarczająco dużo %s do spuszczenia ze zbiornika."
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "Intensywnie kaszlesz."
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "suchy kaszel."
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "Twoje ciało przeszywa straszliwy ból!"
@@ -234346,11 +238254,6 @@ msgstr "Czujesz ból %s."
 msgid "Your %s aches."
 msgstr "Czujesz lekki ból %s."
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr "Twoja obecna wartość zdrowia to %d."
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -234379,441 +238282,6 @@ msgstr "Coś się wije w twoim ciele gdy umiera."
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "Twoje kiszki bulgoczą gdy coś w nich umiera."
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr "Jesteś zbyt wygłodzony by dalej prowadzić %s."
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr "Jesteś zbyt odwodniony by dalej prowadzić %s."
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr "Jesteś zbyt wyczerpany by dalej prowadzić %s."
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "Topisz się!"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr "Zrzucasz ząb!"
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "BZZZZZ"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "Nagle czujesz odrętwienie."
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "Nagle kaszlesz."
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "Czujesz chwilowe zawroty głowy."
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "Nagle czujesz się głodny."
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "Nagle czujesz się lekko najedzony."
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "Nagle czujesz pragnienie."
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "Nagle czujesz zmęczenie."
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "Nagle czujesz mróz."
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "Nagle czujesz chłód."
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "Nagle czujesz żar."
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "Nagle czujesz gorąco."
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr "%1$s się złości!"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr "%1$s mówi: \"%2$s\""
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr "Ulepszasz %1$s do poziomu %2$d."
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "Zaczynasz się trząść spazmatycznie."
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr "Nagle ogarnia cię pragnienie snu i tracisz przytomność."
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "Masz atak astmy!"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr "Używasz swojego Oxygenatora by ją uspokoić, i wracasz do snu."
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr "Używasz inhalatora i wracasz spać."
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr "Bierzesz głęboki wdech ze swojej butli tlenowej i wracasz spać."
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "Zużyłeś ostatnią porcję z inhalatora."
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] "Użyłeś inhalatora. Została %d porcja."
-msgstr[1] "Użyłeś inhalatora. Zostały %d porcje."
-msgstr[2] "Użyłeś inhalatora. Zostały %d porcje."
-msgstr[3] "Użyłeś inhalatora. Zostały %d porcje."
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr "Wdychasz ostatnią porcję tlenu z butli."
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] ""
-"Bierzesz głęboki wdech wdech ze swojej butli tlenowej, pozostał %d ładunek."
-msgstr[1] ""
-"Bierzesz głęboki wdech wdech ze swojej butli tlenowej, pozostało %d "
-"ładunków."
-msgstr[2] ""
-"Bierzesz głęboki wdech wdech ze swojej butli tlenowej, pozostało %d "
-"ładunków."
-msgstr[3] ""
-"Bierzesz głęboki wdech wdech ze swojej butli tlenowej, pozostało %d "
-"ładunków."
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "Słońce poważnie drażni twoje oczy."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "Słońce pali twoją skórę!"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "Słońce odwraca twoją uwagę."
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "Nie możesz znieść tego słońca!"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "Nagle, nie możesz niczego słyszeć!"
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "Znienacka twoje oczy przestają działać!"
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr "Czujesz dziwne wrażenia sensoryczne w twoich detektorach radiacji."
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr ""
-"Klatka piersiowa pali żywnym ogniem gdy twoje systemy zasilania doznają "
-"przeciążenia."
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "Odczuwasz bolesne porażenie elektryczne!"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr "Wygląda na to że %s odczuł porażenie pradem."
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "Czujesz bolesną eksplozję kwasu!"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "Twoje baterie rozładowyją się nieco."
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "Bionika emituje skwierczące dźwięki!"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "Czujesz jak twoja niesprawna bionika drga."
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr "Trzeszczenie!"
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "Twój wzrok się pikselizuje."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr "Twoja felerna bionika powoduje spazmy, które miotają cię o podłogę."
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr ""
-"Twoja bionika ma krótkie spięcie, powodując u ciebie dreszcze i drżenie "
-"ciała."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "Twoja uszkodzona bionika strasznie swędzi."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr "Twoja uszkodzona bionika zaczyna się jarzyć!"
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr "Twoje mięśnie drżą spazmatycznie!"
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr "Upadasz na ziemię!"
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr "Brakuje ci tchu."
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr "Trzęsiesz się spazmatycznie."
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr "Tracisz przytomność!"
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "Twój oddech zwalnia."
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr "Potykasz się i upadasz!"
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr "Pocierasz swoje zmęczone oczy."
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr "<npcname> pociera zmęczone oczy."
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr "Wyrywa ci się małe ziewnięcie."
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr "<npcname> ziewa cicho."
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr "Rozciągasz plecy."
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr "<npcname> rozciąga plecy."
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr "Odczuwasz psychiczne zmęczenie."
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr "<npcname> ziewa rozdzierająco."
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr "Masz lekkie zawroty głowy."
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr "Przez twojej mięśnie przebiega niekontrolowany dreszcz."
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr "Twój wzrok jest przez chwilę zamglony."
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr "Twój umysł przeskakuje chwilowo w stan nieświadomości."
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr "Twoje mięśnie bolą w stresująco nieprzewidywany sposób."
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr "Masz nieznośny ból głowy."
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr "Mas zgagę i posmak kwasu w ustach."
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr ""
-"Twój umysł jest tak zmęczony, że czujesz, że nie możesz ufać swoim własnym "
-"oczom."
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr ""
-"Twoje mięśnie drżą poza twoją kontrolą, i masz problemy z zachowaniem "
-"równowagi."
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr "Twoje drżące nogi plączą się i potykają."
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr "<npcname> potyka się."
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr "<npcname> przewraca się!"
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr "Przewracasz się!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr "Twoja opaska radiacyjna zmienia kolor z %1$s na %2$s!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr "Twoja %s zaczyna się zrastać."
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr "Z kierunku %1$s słyszysz %2$s"
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr ""
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr ""
@@ -235031,11 +238499,6 @@ msgstr "Ten %s nie może być uchwycony tylko jedną ręką."
 msgid "You are too weak to wield %s with only one arm."
 msgstr "Jesteś zbyt slaby by utrzymać %s tylko jedną ręką."
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr "Nie możesz odłożyć twojego %s."
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "Trzymaj ręce wolne (NIE)"
@@ -235111,20 +238574,43 @@ msgstr "Ten %s nie ma uszkodzeń do naprawienia."
 msgid "Mend which fault?"
 msgstr "Napraw który defekt?"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white>Czas potrzebny:</color>\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr ""
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white>Umiejętności:</color>\n"
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr ""
+
+#: src/player.cpp
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "Skills: %s\n"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr ""
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
-msgstr "> <color_%1$s>%2$s %3$i</color>\n"
+msgid "You are currently unable to mend the %s this way."
+msgstr ""
 
 #: src/player.cpp
 msgid "You are already wearing that."
@@ -235239,14 +238725,6 @@ msgstr "Zdejmujesz %s."
 msgid "<npcname> takes off their %s."
 msgstr "<npcname> zdejmuje %s."
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr "Nie możesz umieścić tam przedmiotów!"
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr "<npcname> nie może umieścić tam przedmiotów!"
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -235294,24 +238772,6 @@ msgstr "Odzyskujesz %i niezużytego plutonu."
 msgid "You can't remove partially depleted plutonium!"
 msgstr "Nie możesz usunąć częściowo zużytego plutonu!"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] "Twój %s potrzebuje %d ładunek elektryczny z jakiegoś UPS-a."
-msgstr[1] "Twój %s potrzebuje %d ładunków elektrycznych z jakiegoś UPS-a."
-msgstr[2] "Twój %s potrzebuje %d ładunków elektrycznych z jakiegoś UPS-a."
-msgstr[3] "Twój %s potrzebuje %d ładunków elektrycznych z jakiegoś UPS-a."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] "Twój %s ma %d ładunek a potrzebuje %d."
-msgstr[1] "Twój %s ma %d ładunków a potrzebuje %d."
-msgstr[2] "Twój %s ma %d ładunków a potrzebuje %d."
-msgstr[3] "Twój %s ma %d ładunków a potrzebuje %d."
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -235486,10 +238946,6 @@ msgstr "Chcesz uskoczyć, ale nie ma gdzie!"
 msgid "%s tries to dodge but there's no room!"
 msgstr "%s chce uskoczyć, ale nie ma gdzie!"
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr "Twoje ciało ugina się pod ciężarem!"
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -235544,6 +239000,13 @@ msgstr "Głodnawy"
 msgid "Pain "
 msgstr "Ból"
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr ""
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -235775,47 +239238,57 @@ msgstr "Obecna Prędkość:"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
-msgstr "Przeciążenie -%s%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
-msgstr "Ból -%s%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
-msgstr "Pragnienie         -%s%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr ""
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
-msgstr "Brak Słońca     -%s%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
+msgstr ""
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
-msgstr "Szybki               +%s%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
-msgstr "Bioniczna Szybkość        +%s%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
@@ -236026,8 +239499,8 @@ msgid "\"Oh God, what's happening?\""
 msgstr "\"Mój Boże, co się dzieje?\""
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
-msgstr "\"Oczywiście... to wszystko fraktale!\""
+msgid "\"Of course… it's all fractals!\""
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "\"Huh?  What was that?\""
@@ -236062,8 +239535,8 @@ msgid "You quiver from the cold."
 msgstr "Drżysz z zimna."
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
-msgstr "Twoja klatka piersiowa przemarza. Powinieneś się ubrać na cebulkę."
+msgid "Your torso is freezing cold.  You should put on a few more layers."
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "Your shivering makes you unsteady."
@@ -236453,6 +239926,47 @@ msgstr "Twój alarm się włączył."
 msgid "Your alarm went off."
 msgstr ""
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr ""
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -236876,10 +240390,6 @@ msgstr "kerblam!"
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>żaden</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr ""
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -237135,13 +240645,6 @@ msgstr ""
 msgid "KILLS"
 msgstr ""
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr ""
-"Ustawia który wyświetlacz zostanie użyty do wyświetlenia gry. Wymaga "
-"restartu."
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr ""
@@ -237154,6 +240657,10 @@ msgstr "Twoje bębenki uszne nagle zabolały!"
 msgid "Something is making noise."
 msgstr "Coś hałasuje."
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr ""
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -237169,6 +240676,11 @@ msgstr ""
 msgid "You hear %1$s"
 msgstr "Słyszysz %1$s"
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr "Z kierunku %1$s słyszysz %2$s"
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "Twój budzik w końcu cię budzi."
@@ -237200,6 +240712,429 @@ msgstr ""
 msgid "d: delete history"
 msgstr "d: skasować historię"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr "Jesteś zbyt wygłodzony by dalej prowadzić %s."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr "Jesteś zbyt odwodniony by dalej prowadzić %s."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr "Jesteś zbyt wyczerpany by dalej prowadzić %s."
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "Topisz się!"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr "Nagle ogarnia cię pragnienie snu i tracisz przytomność."
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "Nagle czujesz odrętwienie."
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "Nagle kaszlesz."
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "Czujesz chwilowe zawroty głowy."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "Nagle czujesz się głodny."
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "Nagle czujesz się lekko najedzony."
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "Nagle czujesz pragnienie."
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "Nagle czujesz zmęczenie."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "Nagle czujesz mróz."
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "Nagle czujesz chłód."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "Nagle czujesz żar."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "Nagle czujesz gorąco."
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "Zaczynasz się trząść spazmatycznie."
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr "%1$s mówi: \"%2$s\""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr "%1$s się złości!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr "Ulepszasz %1$s do poziomu %2$d."
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "Masz atak astmy!"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr "Używasz swojego Oxygenatora by ją uspokoić, i wracasz do snu."
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr "Używasz inhalatora i wracasz spać."
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr "Bierzesz głęboki wdech ze swojej butli tlenowej i wracasz spać."
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "Zużyłeś ostatnią porcję z inhalatora."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] "Użyłeś inhalatora. Została %d porcja."
+msgstr[1] "Użyłeś inhalatora. Zostały %d porcje."
+msgstr[2] "Użyłeś inhalatora. Zostały %d porcje."
+msgstr[3] "Użyłeś inhalatora. Zostały %d porcje."
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr "Wdychasz ostatnią porcję tlenu z butli."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] ""
+"Bierzesz głęboki wdech wdech ze swojej butli tlenowej, pozostał %d ładunek."
+msgstr[1] ""
+"Bierzesz głęboki wdech wdech ze swojej butli tlenowej, pozostało %d "
+"ładunków."
+msgstr[2] ""
+"Bierzesz głęboki wdech wdech ze swojej butli tlenowej, pozostało %d "
+"ładunków."
+msgstr[3] ""
+"Bierzesz głęboki wdech wdech ze swojej butli tlenowej, pozostało %d "
+"ładunków."
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "Słońce pali twoją skórę!"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "Słońce odwraca twoją uwagę."
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "Nie możesz znieść tego słońca!"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "Słońce poważnie drażni twoje oczy."
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr "Zrzucasz ząb!"
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "BZZZZZ"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "Nagle, nie możesz niczego słyszeć!"
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "Znienacka twoje oczy przestają działać!"
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr "Czujesz dziwne wrażenia sensoryczne w twoich detektorach radiacji."
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr ""
+"Klatka piersiowa pali żywnym ogniem gdy twoje systemy zasilania doznają "
+"przeciążenia."
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "Odczuwasz bolesne porażenie elektryczne!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr "Wygląda na to że %s odczuł porażenie pradem."
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "Czujesz bolesną eksplozję kwasu!"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "Twoje baterie rozładowyją się nieco."
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "Bionika emituje skwierczące dźwięki!"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "Czujesz jak twoja niesprawna bionika drga."
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr "Trzeszczenie!"
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "Twój wzrok się pikselizuje."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr "Twoja felerna bionika powoduje spazmy, które miotają cię o podłogę."
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr ""
+"Twoja bionika ma krótkie spięcie, powodując u ciebie dreszcze i drżenie "
+"ciała."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "Twoja uszkodzona bionika strasznie swędzi."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr "Twoja uszkodzona bionika zaczyna się jarzyć!"
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr "Twoje mięśnie drżą spazmatycznie!"
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr "Upadasz na ziemię!"
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr "Brakuje ci tchu."
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr "Trzęsiesz się spazmatycznie."
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr "Tracisz przytomność!"
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "Twój oddech zwalnia."
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr "Potykasz się i upadasz!"
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr "Pocierasz swoje zmęczone oczy."
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr "<npcname> pociera zmęczone oczy."
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr "Wyrywa ci się małe ziewnięcie."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr "<npcname> ziewa cicho."
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr "Rozciągasz plecy."
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr "<npcname> rozciąga plecy."
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr "Odczuwasz psychiczne zmęczenie."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr "<npcname> ziewa rozdzierająco."
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr "Masz lekkie zawroty głowy."
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr "Przez twojej mięśnie przebiega niekontrolowany dreszcz."
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr "Twój wzrok jest przez chwilę zamglony."
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr "Twój umysł przeskakuje chwilowo w stan nieświadomości."
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr "Twoje mięśnie bolą w stresująco nieprzewidywany sposób."
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr "Masz nieznośny ból głowy."
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr "Mas zgagę i posmak kwasu w ustach."
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr ""
+"Twój umysł jest tak zmęczony, że czujesz, że nie możesz ufać swoim własnym "
+"oczom."
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr ""
+"Twoje mięśnie drżą poza twoją kontrolą, i masz problemy z zachowaniem "
+"równowagi."
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr "Twoje drżące nogi plączą się i potykają."
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr "<npcname> potyka się."
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr "<npcname> przewraca się!"
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr "Przewracasz się!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr "Twoja opaska radiacyjna zmienia kolor z %1$s na %2$s!"
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr "Twoja %s zaczyna się zrastać."
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr ""
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr ""
@@ -237349,8 +241284,8 @@ msgstr "pękające szkło!"
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "%s potyka się o łóżko"
+msgid "The %s stumbles over the cot!"
+msgstr ""
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -237505,11 +241440,6 @@ msgstr "Węzeł linki zaciska się na twojej stopie!"
 msgid "A snare closes on <npcname>s leg."
 msgstr "Węzeł linki zaciska się na stopie <npcname>!"
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr ""
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -237733,6 +241663,15 @@ msgstr "<npcname> spada poziom w dół!"
 msgid "You fall down under %s!"
 msgstr "Spadasz w dół pod %s!"
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname> macha skrzydłami i sfruwa w dół z gracją."
@@ -237877,6 +241816,10 @@ msgstr ""
 msgid "Select part"
 msgstr "Wybierz część"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white>Czas potrzebny:</color>\n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr ""
@@ -240327,8 +244270,8 @@ msgstr "@ %d: %s  "
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
-msgstr "Ustaw '%s' na..."
+msgid "Set '%s' to…"
+msgstr ""
 
 #: src/wish.cpp
 msgid " (current)"
diff --git a/lang/po/pt_BR.po b/lang/po/pt_BR.po
index 7de81d43bd682..312860d59b212 100644
--- a/lang/po/pt_BR.po
+++ b/lang/po/pt_BR.po
@@ -14,16 +14,16 @@
 # Breno Gomes da Fonseca <brenogfonseca@gmail.com>, 2019
 # Lucas Reis <lucasreis3000@gmail.com>, 2019
 # Hugo Santos <hugo_gomes11@hotmail.com>, 2019
-# C. J. <carlosjordao@gmail.com>, 2019
 # Douglas Onofre Rosas dos Santos <douglas12ds@hotmail.com>, 2019
 # Brett Dong <brett.browning.dong@gmail.com>, 2019
+# C. J. <carlosjordao@gmail.com>, 2019
 # Yuri Laskowski <yurinikolai00@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
 "Last-Translator: Yuri Laskowski <yurinikolai00@gmail.com>, 2019\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/pt_BR/)\n"
@@ -44,7 +44,7 @@ msgid ""
 "energy based weapons.  The result was the standard fusion pack, capable of "
 "delivering bolts of superheated gas at near light speed with no recoil."
 msgstr ""
-"Em meados do século 21 , as potências militares começaram a estudar armas "
+"Em meados do século 21, as potências militares começaram a estudar armas "
 "baseadas em energia. O resultado foi o pacote de fusão padrão, capaz de "
 "emitir raios de gás superaquecido próximos à velocidade da luz e sem recuo."
 
@@ -60,7 +60,7 @@ msgid ""
 "delivering bolts of superheated gas at near light speed with no recoil.  "
 "This one has been hand-crafted from spare parts."
 msgstr ""
-" Em meados do século XXI, as potências militares começaram a procurar armas "
+"Em meados do século XXI, as potências militares começaram a procurar armas "
 "baseadas em energia. O resultado foi o pacote de fusão padrão, capaz de "
 "emitir raios de gás superaquecido a uma velocidade próxima da luz sem recuo."
 " Este foi feito a mão a partir de peças de reposição."
@@ -90,7 +90,7 @@ msgid ""
 "A thin foil made of aluminum.  Sometimes called 'tin foil' due to being made"
 " of tin in the past."
 msgstr ""
-"Uma folha fina de alumínio . Às vezes chamada de 'folha de estanho' por ser "
+"Uma folha fina de alumínio. Às vezes chamada de 'folha de estanho' por ser "
 "feita de estanho no passado."
 
 #: lang/json/AMMO_from_json.py
@@ -218,6 +218,19 @@ msgstr ""
 msgid "watery plutonium slurry"
 msgstr "pasta de plutônio aquosa"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr "pedra"
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr ""
+"Uma rocha do tamanho de uma bola de beisebol. Dá uma arma decente e também é"
+" boa para atirar nos inimigos."
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "seixo"
@@ -359,53 +372,63 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "smokeless shotgun powder"
-msgstr ""
+msgstr "pólvora sem fumaça para escopetas"
 
 #. ~ Description for smokeless shotgun powder
 #: lang/json/AMMO_from_json.py
 msgid "Firearm-quality gunpowder, intended for use in shotgun shells."
 msgstr ""
+"Pólvora de qualidade para armamentos, projetada para uso em cartuchos de "
+"escopeta."
 
 #: lang/json/AMMO_from_json.py
 msgid "smokeless pistol powder"
-msgstr ""
+msgstr "pólvora sem fumaça para pistolas"
 
 #. ~ Description for smokeless pistol powder
 #: lang/json/AMMO_from_json.py
 msgid "Firearm-quality gunpowder, intended for use in pistol ammunition."
 msgstr ""
+"Pólvora de qualidade para armamentos, projetada para uso em munições de "
+"pistola."
 
 #: lang/json/AMMO_from_json.py
 msgid "smokeless magnum powder"
-msgstr ""
+msgstr "pólvora sem fumaça para magnum"
 
 #. ~ Description for smokeless magnum powder
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Firearm-quality gunpowder intended for use in magnum pistol ammunition."
 msgstr ""
+"Pólvora de qualidade para armamentos, projetada para uso em munições de "
+"pistolas magnum."
 
 #: lang/json/AMMO_from_json.py
 msgid "smokeless rifle powder"
-msgstr ""
+msgstr "pólvora sem fumaça para rifles"
 
 #. ~ Description for smokeless rifle powder
 #: lang/json/AMMO_from_json.py
 msgid "Firearm-quality gunpowder intended for use in rifle ammunition."
 msgstr ""
+"Pólvora de qualidade para armamentos, projetada para uso em munições de "
+"rifle."
 
 #: lang/json/AMMO_from_json.py
 msgid "smokeless overbore rifle powder"
-msgstr ""
+msgstr "pólvora sem fumaça para rifles pesados"
 
 #. ~ Description for smokeless overbore rifle powder
 #: lang/json/AMMO_from_json.py
 msgid "Firearm-quality gunpowder intended for use in large rifle ammunition."
 msgstr ""
+"Pólvora de qualidade para armamentos, projetada para uso em munições de "
+"rifles de calibres pesados."
 
 #: lang/json/AMMO_from_json.py
 msgid "artillery propellant"
-msgstr ""
+msgstr "propelente de artilharia"
 
 #. ~ Description for artillery propellant
 #: lang/json/AMMO_from_json.py
@@ -413,6 +436,8 @@ msgid ""
 "Single base smokeless gunpowder intended for use in artillery propelling "
 "charges."
 msgstr ""
+"Pólvora de base única sem fumaça, projetada para uso em cargas de "
+"artilharia."
 
 #: lang/json/AMMO_from_json.py
 msgid "oxidizer powder"
@@ -528,7 +553,7 @@ msgstr "foguete PG-7VR 64mm/105mm"
 #. ~ Description for PG-7VR 64mm/105mm rocket
 #: lang/json/AMMO_from_json.py
 msgid "64mm/105mm high-explosive tandem ammunition for the RPG-7."
-msgstr ""
+msgstr "Munição alto-explosiva de 64mm/105mm para o RPG-7."
 
 #: lang/json/AMMO_from_json.py
 msgid "TBG-7V 105mm rocket"
@@ -553,7 +578,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "placeholder ammunition"
-msgstr "munição improvisada"
+msgstr "placeholder de munição"
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "charcoal"
@@ -567,14 +592,14 @@ msgid ""
 "remove contaminants out of air and water."
 msgstr ""
 "Material inflamável a base de carbono produzido pela queima lenta da "
-"madeira. Utilizada em receitas requer um chama quente e pura. Pode também "
-"ser utilizado para remover contaminantes do ar e água."
+"madeira. Utilizado em receitas que requerem uma chama quente e pura. Pode "
+"também ser utilizado para remover contaminantes do ar e da água."
 
 #: lang/json/AMMO_from_json.py
 msgid "calcium carbide premix"
 msgid_plural "calcium carbide premix"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "pré-mistura de carbeto de cálcio"
+msgstr[1] "pré-mistura de carbeto de cálcio"
 
 #. ~ Description for calcium carbide premix
 #: lang/json/AMMO_from_json.py
@@ -582,6 +607,8 @@ msgid ""
 "A powdered mixture of coke and lime ready to be smelted into usable calcium "
 "carbide in an arc furnace."
 msgstr ""
+"Uma mistura em pó de coque e cal, pronta para ser transformada em carbeto de"
+" cálcio em um forno a arco elétrico."
 
 #: lang/json/AMMO_from_json.py
 msgid "coal"
@@ -608,10 +635,10 @@ msgid ""
 "instead of on a timer.  It can fly further than the explosion will reach, "
 "probably."
 msgstr ""
-"Um dispositivo nuclear portátil fortemente modificado preso em um foguete. "
+"Um dispositivo nuclear portátil altamente modificado preso em um foguete. "
 "Usado como munição de um lançador especializado, foi equipado para explodir "
-"com o impacto ao invés de um temporizador. Provavelmente deve voar além do "
-"alcance da explosão."
+"com o impacto ao invés de com um temporizador. Provavelmente deve voar além "
+"do alcance da explosão."
 
 #: lang/json/AMMO_from_json.py
 msgid "RA21E medical ampoule"
@@ -650,11 +677,11 @@ msgstr "cartucho de filtro para rebreather"
 #. ~ Description for rebreather filter cartridge
 #: lang/json/AMMO_from_json.py
 msgid "A replacement filter cartridge for a rebreather."
-msgstr "Um cartucho de filtro para rebreather"
+msgstr "Um cartucho de filtro de reposição para um rebreather."
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "filter mask cartridge"
-msgstr "cartucho de máscara de gás"
+msgstr "cartucho de máscara de filtragem de ar"
 
 #. ~ Description for filter mask cartridge
 #: lang/json/AMMO_from_json.py
@@ -718,18 +745,18 @@ msgstr "Uma lata de oxigênio."
 
 #: lang/json/AMMO_from_json.py
 msgid "spiked home-made rocket"
-msgstr "foguete caseiro espetado"
+msgstr "foguete caseiro com espeto"
 
 #. ~ Description for spiked home-made rocket
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
+" of this grade of weapon, but packs a fierce punch… if it hits."
 msgstr ""
-"Um foguete artesanal, feito ao soldar um espeto a um cano e encher de "
-"combustível improvisado. Terrivelmente impreciso, como esperado desse tipo "
-"de munição, mas se acertar pode causar um estrago."
+"Um foguete feito á mão, consistindo de um espeto soldado em um cano cheio de"
+" combustível improvisado de foguete. Terrivelmente impreciso, como se "
+"esperaria desse tipo de arma, mas causa um dano terrível... caso acerte."
 
 #: lang/json/AMMO_from_json.py
 msgid "explosive home-made rocket"
@@ -776,14 +803,16 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "unfinished calcium carbide"
-msgstr ""
+msgstr "carbeto de cálcio incompleto"
 
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
 msgstr ""
+"O processo incompleto de converter carvão e cal em carbeto de cálcio. Inútil"
+" em seu estado atual."
 
 #: lang/json/AMMO_from_json.py
 msgid "chain link"
@@ -793,7 +822,7 @@ msgstr "elo de corrente"
 #: lang/json/AMMO_from_json.py
 msgid "Small metal rings, suitable for constructing chainmail."
 msgstr ""
-"Pequenos anéis de metal, apropriado para a construção de cota de malha"
+"Pequenos anéis de metal, apropriados para a construção de cota de malha."
 
 #: lang/json/AMMO_from_json.py
 msgid "nitrox"
@@ -805,7 +834,7 @@ msgstr[1] "nitrox"
 #: lang/json/AMMO_from_json.py
 msgid "Mixture of oxygen and nitrogen in proportions suitable for diving."
 msgstr ""
-"Mistura de oxigenio e nitrogenio em proporções próprias para mergulho."
+"Mistura de oxigênio e nitrogênio em proporções próprias para mergulho."
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "tinder"
@@ -817,7 +846,7 @@ msgstr[1] "acendalhas"
 #: lang/json/AMMO_from_json.py
 msgid "Flammable material, finely divided for easy combustion."
 msgstr ""
-"Material Inflamavel, dividido em pequenas partes para fácil combustão."
+"Material inflamável, dividido em pequenas partes para fácil combustão."
 
 #: lang/json/AMMO_from_json.py
 msgid "RPG die"
@@ -828,7 +857,7 @@ msgstr[1] "dados de RPG"
 #. ~ Description for RPG die
 #: lang/json/AMMO_from_json.py
 msgid "A die used to play various role-playing games."
-msgstr "Um dado utilizado para jogar vários jogos de rpg."
+msgstr "Um dado utilizado para jogar vários jogos de RPG."
 
 #: lang/json/AMMO_from_json.py
 msgid "metal RPG die"
@@ -839,7 +868,7 @@ msgstr[1] "dados de metal de RPG"
 #. ~ Description for metal RPG die
 #: lang/json/AMMO_from_json.py
 msgid "A metal die used to play various role-playing games"
-msgstr "Um dado de metal utilizado para jogar vários jogos de rpg"
+msgstr "Um dado de metal utilizado para jogar vários jogos de RPG."
 
 #: lang/json/AMMO_from_json.py
 msgid "bronze"
@@ -856,7 +885,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "crude wooden arrow"
-msgstr "flecha de madeira crua"
+msgstr "flecha de madeira grosseira"
 
 #. ~ Description for crude wooden arrow
 #: lang/json/AMMO_from_json.py
@@ -865,7 +894,7 @@ msgid ""
 "chance of remaining intact once fired."
 msgstr ""
 "Uma haste pontuda de madeira grosseira com um entalhe na parte de trás. Tem "
-"uma chance muito baixa de se manter intacto depois de atirado."
+"uma chance muito baixa de se manter intacta depois de atirada."
 
 #: lang/json/AMMO_from_json.py
 msgid "wooden bodkin arrow"
@@ -877,8 +906,8 @@ msgid ""
 "A fletched wooden arrow shaft with a pointed tip.  Useful for piercing "
 "armor.  Stands a decent chance of remaining intact once fired."
 msgstr ""
-"Uma flecha emplumada de madeira com uma ponta pontiaguda. Util para perfurar"
-" armadura. Tem uma chance decente de se manter intacta apos ser atirada"
+"Uma flecha emplumada de madeira com uma ponta pontiaguda. Útil para perfurar"
+" armadura. Tem uma chance decente de se manter intacta após ser atirada."
 
 #: lang/json/AMMO_from_json.py
 msgid "simple wooden small game arrow"
@@ -897,7 +926,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "wooden broadhead arrow"
-msgstr "flecha broadhead de madeira"
+msgstr "flecha de ponta larga de madeira"
 
 #. ~ Description for wooden broadhead arrow
 #: lang/json/AMMO_from_json.py
@@ -906,6 +935,9 @@ msgid ""
 "damage to the target.  Stands a decent chance of remaining intact once "
 "fired."
 msgstr ""
+"Uma haste de flecha, emplumada e de madeira, com uma ponta de lâmina. Útil "
+"para maximizar dano. Possui uma chance decente de permanecer intacta após "
+"ser disparada."
 
 #: lang/json/AMMO_from_json.py
 msgid "simple wooden arrow"
@@ -963,7 +995,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "aluminum broadhead arrow"
-msgstr "flecha broadhead de alumínio"
+msgstr "flecha de ponta larga de alumínio"
 
 #. ~ Description for aluminum broadhead arrow
 #: lang/json/AMMO_from_json.py
@@ -971,10 +1003,13 @@ msgid ""
 "A fletched aluminum arrow shaft with a bladed tip.  Useful for maximizing "
 "damage to the target.  Stands a good chance of remaining intact once fired."
 msgstr ""
+"Uma haste de flecha, emplumada e de alumínio, com uma ponta de lâmina. Útil "
+"para maximizar dano ao alvo. Possui uma boa chance de permanecer intacta "
+"após ser disparada."
 
 #: lang/json/AMMO_from_json.py
 msgid "aluminum field point arrow"
-msgstr "flecha ponta de campo de alumínio"
+msgstr "flecha com ponta de campo de alumínio"
 
 #. ~ Description for aluminum field point arrow
 #: lang/json/AMMO_from_json.py
@@ -1012,8 +1047,8 @@ msgid ""
 "impressive damage to targets.  Stands a good chance of remaining intact once"
 " fired."
 msgstr ""
-"Uma flecha de fibra de carbono emplumada com uma ponta broadhead expansível."
-" Causa um dano impressionanteaos alvos. Tem uma boa chance de permanecer "
+"Uma flecha de fibra de carbono emplumada com uma ponta larga expansível. "
+"Causa um dano impressionante aos alvos. Tem uma boa chance de permanecer "
 "intacta uma vez disparada."
 
 #: lang/json/AMMO_from_json.py
@@ -1045,7 +1080,7 @@ msgid ""
 "should shoot it soon before it burns your bow."
 msgstr ""
 "Esta flecha tem um um trapo flamejante enrolado próximo à ponta. Você deve "
-"atirar logo antes de queimar seu arco."
+"atirar logo, antes que ela queime seu arco."
 
 #: lang/json/AMMO_from_json.py
 msgid "wooden fishing spear"
@@ -1058,7 +1093,7 @@ msgid ""
 "light, but doesn't have much range.  Stands a below average chance of "
 "remaining intact once fired."
 msgstr ""
-"Uma lança de pesca submersa feita de madeira e aço. É muito leve, mas não "
+"Uma lança de pesca aquática feita de madeira e aço. É muito leve, mas não "
 "tem muito alcance. Tem uma chance pequena de permanecer intacta ao ser "
 "atirada."
 
@@ -1072,7 +1107,7 @@ msgid ""
 "An underwater fishing spear made from metal.  It's light, but doesn't have "
 "much range.  Stands a very good chance of remaining intact once fired."
 msgstr ""
-"Uma lança de pesca submersa feita de metal. É leve, mas não tem muito "
+"Uma lança de pesca aquática feita de metal. É leve, mas não tem muito "
 "alcance. Tem uma chance muito boa de permanecer intacta ao ser atirada."
 
 #: lang/json/AMMO_from_json.py
@@ -1086,7 +1121,7 @@ msgid ""
 "doesn't have much range.  Stands a bad chance of remaining intact once "
 "fired."
 msgstr ""
-"Uma lança de pesca submersa feita de fibra de carbono. É muito leve, mas não"
+"Uma lança de pesca aquática feita de fibra de carbono. É muito leve, mas não"
 " tem muito alcance. Tem uma chance ruim de permanecer intacta ao ser "
 "atirada."
 
@@ -1115,9 +1150,10 @@ msgid ""
 "intended for use in specialized medical equipment, and can't be administered"
 " manually.  You can reload an anesthesia kit with it."
 msgstr ""
-"Uma variedade poderosos medicamentos hipnóticos, analgésicos e estimulantes."
-" É destinado para uso em equipamento médico especializado, e não pode ser "
-"administrado manualmente. Você pode recarregar um kit de anestesia com ele."
+"Uma variedade de poderosos medicamentos hipnóticos, analgésicos e "
+"estimulantes. É destinado para uso em equipamento médico especializado, e "
+"não pode ser administrado manualmente. Você pode recarregar um kit de "
+"anestesia com isso."
 
 #: lang/json/AMMO_from_json.py
 msgid "sulfur"
@@ -1133,6 +1169,10 @@ msgid ""
 "smoke, that is deadly to bacteria and humans alike, or oxidized to make "
 "paper-bleaching agents."
 msgstr ""
+"Um punhado de enxofre puro. Usado principalmente para fazer ácido de "
+"bateria, o enxofre é às vezes usado em explosivos. Pode ser queimado para "
+"produzir uma fumaça ácida, mortal tanto para bactérias como para pessoas, ou"
+" oxidado para fazer agentes de branqueamento de papel."
 
 #: lang/json/AMMO_from_json.py
 msgid "chunk of sulfur"
@@ -1143,7 +1183,7 @@ msgstr[1] "pedaços de enxofre"
 #. ~ Description for chunk of sulfur
 #: lang/json/AMMO_from_json.py
 msgid "A chunk of pure sulfur.  Break it up to use it."
-msgstr ""
+msgstr "Um bloco de enxofre puro. Quebre-o em pedaços menores para utilizar."
 
 #: lang/json/AMMO_from_json.py
 msgid "cement"
@@ -1212,7 +1252,8 @@ msgid ""
 "it into glass.  Otherwise, it's only good for making cement."
 msgstr ""
 "Um punhado de areia da Nova Inglaterra. Se você tivesse uma fornalha acesa, "
-"talvez pudesse transformar em vidro. Fora isso, só é bom para fazer cimento."
+"talvez pudesse transformar isso em vidro. Fora isso, só é bom para fazer "
+"cimento."
 
 #: lang/json/AMMO_from_json.py
 msgid "soil"
@@ -1226,8 +1267,8 @@ msgid ""
 "A pile of loosely packed, slightly damp loamy soil.  This mixture of sand, "
 "silt and clay is ideal for growing plants."
 msgstr ""
-"Uma pilha levemente embalada, e levemente úmida de terra. Essa mistura de "
-"areia, lodo e barro é ideal para o crescimento de plantas."
+"Uma pilha levemente compactada e úmida de terra. Essa mistura de areia, lodo"
+" e barro é ideal para o crescimento de plantas."
 
 #: lang/json/AMMO_from_json.py
 msgid "aluminum powder"
@@ -1244,9 +1285,9 @@ msgid ""
 "virtually all commercial metallic-hued paints and anti-corrosive coatings."
 msgstr ""
 "Um punhado de pó de alumínio finamente moído. Este forte agente redutor era "
-"usado combinado a vários oxidantes para soldagem química e explosivos. Pouco"
-" antes do Cataclismo, no entanto, era a base de praticamente todas as tintas"
-" metálicas comerciais e revestimentos anticorrosivos."
+"usado juntamente com vários oxidantes para soldagem química e explosivos. "
+"Pouco antes do Cataclismo, no entanto, era a base de praticamente todas as "
+"tintas metálicas comerciais e revestimentos anticorrosivos."
 
 #: lang/json/AMMO_from_json.py
 msgid "zinc powder"
@@ -1261,10 +1302,10 @@ msgid ""
 "for paints, hobbyists used to mix it with sulfur to make basic rocket fuel /"
 " smokescreen.  When treated with a strong acid, it will produce hydrogen."
 msgstr ""
-"Um punhado de pós de zinco. Embora comercialmente usado principalmente em "
+"Um punhado de pó de zinco. Embora comercialmente usado principalmente em "
 "cosméticos e para tintas, os amadores costumavam misturá-lo com enxofre para"
-" fazer combustível de foguete básico / cortina de fumaça. Quando tratado com"
-" um ácido forte, produzirá hidrogênio."
+" fazer combustível de foguete básico ou cortinas de fumaça. Quando tratado "
+"com um ácido forte, produzirá hidrogênio."
 
 #: lang/json/AMMO_from_json.py
 msgid "zinc oxide"
@@ -1275,11 +1316,11 @@ msgstr[1] "óxido de zinco"
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
 msgstr ""
-"Um punhado de óxido de zinco. Pode ser reduzido em zinco ou utilizado para "
-"algumas outras reações."
+"Um punhado de óxido de zinco. Pode ser reduzido para se obter zinco, ou "
+"utilizado por si só em algumas outras reações."
 
 #: lang/json/AMMO_from_json.py
 msgid "manganese dioxide"
@@ -1290,12 +1331,12 @@ msgstr[1] "dióxido de manganês"
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr ""
-"Um punhado de pó de dióxido de manganês. Ocorre naturalmente como o mineral "
-"pirolusita, é usado comercialmente na produção de baterias alcalinas e de "
+"Um punhado de pó de dióxido de manganês. Ocorre naturalmente no mineral "
+"pirolusita, e é usado na produção comercial de baterias alcalinas e de "
 "zinco-carbono."
 
 #: lang/json/AMMO_from_json.py
@@ -1307,15 +1348,11 @@ msgstr[1] "cloreto de potássio"
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr ""
-"Um punhado de cloreto de potássio. Embora ocorra naturalmente como o mineral"
-" silvina, pode ser produzido como subproduto da reação de salitre e ácido "
-"hidroclórico. Pode ser usado na criação de fertilizante, ou hidróxido de "
-"potássio via eletrólise."
 
 #: lang/json/AMMO_from_json.py
 msgid "potassium hydroxide"
@@ -1326,14 +1363,10 @@ msgstr[1] "hidróxido de potássio"
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
 msgstr ""
-"Um punhado de hidróxido de potássio. Comumente chamado de potassa cáustica, "
-"era utilizado na indústria principalmente devido às suas propriedades "
-"cáusticas. Pode ser usado como eletrólito em baterias alcalinas, entre "
-"outras aplicações."
 
 #: lang/json/AMMO_from_json.py
 msgid "sulfuric acid"
@@ -1363,10 +1396,13 @@ msgstr[1] "ácido hidroclórico"
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
 msgstr ""
+"Ácido hidroclórico, também conhecido como ácido muriático. É um ácido forte "
+"que possui um cheiro distinto. Importante e frequentemente utilizado desde "
+"sua descoberta, ainda possui uma vasta gama de usos."
 
 #: lang/json/AMMO_from_json.py
 msgid "acetone"
@@ -1382,7 +1418,7 @@ msgid ""
 "demonstrated by the terrorist attacks of 2016."
 msgstr ""
 "Acetona, mais conhecida como o principal constituinte da maioria dos "
-"removedores de esmalte. Inflamável e pode facilmente ser usado para "
+"removedores de esmalte. Inflamável e pode facilmente ser usada para "
 "explosivos caseiros potentes, como demonstrado pelos ataques terroristas de "
 "2016."
 
@@ -1405,7 +1441,7 @@ msgstr ""
 "principalmente na produção de fertilizantes sintéticos, para gravação de "
 "placas de circuito e em marcenaria. Ainda é bastante útil tanto para criar "
 "uma vasta gama de agentes pirotécnicos e explosivos quanto para ser uma arma"
-" direta: não muitos seres gostam de ser ensopados em ácido nítrico."
+" direta: não há muitos seres que gostam de ser ensopados em ácido nítrico."
 
 #: lang/json/AMMO_from_json.py
 msgid "chromium oxide"
@@ -1454,12 +1490,11 @@ msgid ""
 "before, being the key component in the preparation of several military-grade"
 " explosives."
 msgstr ""
-" hexamineUm punhado de comprimidos de hexamina cerosa. "
-"Estecombustívelonipresente foi usado para iniciar quase todas as "
-"churrasqueirasde jardime nenhuma viagem de acampamento \"real\" poderia "
-"fazer sua cozinha sem ele, até o Cataclismo. Hoje em dia, é ainda mais "
-"valioso do que antes, sendo ocomponente chave na preparação de vários "
-"explosivos militares."
+"Um punhado de comprimidos de hexamina cerosa. Este combustível onipresente "
+"foi usado para acender quase todas as churrasqueiras de jardim, e nenhuma "
+"viagem de acampamento \"real\" poderia fazer sua cozinha sem ele, até o "
+"Cataclismo. Hoje em dia, é ainda mais valioso do que antes, sendo o "
+"componente chave na preparação de vários explosivos militares."
 
 #: lang/json/AMMO_from_json.py
 msgid "hydrogen peroxide (concentrated)"
@@ -1647,16 +1682,19 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "match head powder"
 msgid_plural "match head powder"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "pó de cabeças de fósforos"
+msgstr[1] "pó de cabeças de fósforos"
 
 #. ~ Description for match head powder
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
 msgstr ""
+"Um pouco de pó de cabeças de fósforos, similar a pólvora negra mas um pouco "
+"mais fraco. Pode ser usado na criação de explosivos e pavios quando outros "
+"materiais mais apropriados não estiverem disponíveis."
 
 #: lang/json/AMMO_from_json.py
 msgid "RDX"
@@ -1779,7 +1817,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "simple wooden bolt"
-msgstr ""
+msgstr "seta simples de madeira"
 
 #. ~ Description for simple wooden bolt
 #: lang/json/AMMO_from_json.py
@@ -1790,7 +1828,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "simple wooden small game bolt"
-msgstr ""
+msgstr "seta simples de madeira para caça pequena"
 
 #. ~ Description for simple wooden small game bolt
 #: lang/json/AMMO_from_json.py
@@ -1802,7 +1840,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "makeshift wooden bolt"
-msgstr ""
+msgstr "seta improvisada de madeira"
 
 #. ~ Description for makeshift wooden bolt
 #: lang/json/AMMO_from_json.py
@@ -1813,7 +1851,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "wooden broadhead bolt"
-msgstr ""
+msgstr "seta de ponta larga de madeira"
 
 #. ~ Description for wooden broadhead bolt
 #: lang/json/AMMO_from_json.py
@@ -1825,7 +1863,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "wooden bodkin bolt"
-msgstr ""
+msgstr "seta bodkin de madeira"
 
 #. ~ Description for wooden bodkin bolt
 #: lang/json/AMMO_from_json.py
@@ -1836,7 +1874,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "wooden small game bolt"
-msgstr ""
+msgstr "seta de madeira para caça pequena"
 
 #. ~ Description for wooden small game bolt
 #: lang/json/AMMO_from_json.py
@@ -1848,7 +1886,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "simple metal bolt"
-msgstr ""
+msgstr "seta simples de metal"
 
 #. ~ Description for simple metal bolt
 #: lang/json/AMMO_from_json.py
@@ -1859,7 +1897,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "aluminum broadhead bolt"
-msgstr ""
+msgstr "seta de ponta larga de alumínio"
 
 #. ~ Description for aluminum broadhead bolt
 #: lang/json/AMMO_from_json.py
@@ -2041,13 +2079,13 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "flamethrower fuel"
 msgid_plural "flamethrower fuel"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "combustível de lança-chamas"
+msgstr[1] "combustível de lança-chamas"
 
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
 msgstr ""
@@ -2174,7 +2212,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "10mm Auto FMJ"
-msgstr ""
+msgstr "10mm Auto FMJ"
 
 #. ~ Description for 10mm Auto FMJ
 #: lang/json/AMMO_from_json.py
@@ -2189,7 +2227,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 10mm Auto FMJ"
-msgstr ""
+msgstr "10mm Auto FMJ recarregado"
 
 #: lang/json/AMMO_from_json.py
 msgid "H&K 12mm"
@@ -2785,7 +2823,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".357 magnum JHP"
-msgstr ""
+msgstr ".357 magnum JHP"
 
 #. ~ Description for .357 magnum JHP
 #: lang/json/AMMO_from_json.py
@@ -2806,14 +2844,14 @@ msgstr ""
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .357 Magnum FMJ"
 msgid_plural "reloaded .357 Magnum FMJ"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] ".357 Magnum FMJ recarregado"
+msgstr[1] ".357 Magnum FMJ recarregados"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .357 Magnum JHP"
 msgid_plural "reloaded .357 Magnum JHP"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] ".357 Magnum JHP recarregado"
+msgstr[1] ".357 Magnum JHP recarregados"
 
 #: lang/json/AMMO_from_json.py
 msgid ".357 SIG FMJ"
@@ -2910,11 +2948,11 @@ msgstr "recarregado .38 FMJ"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .38 Special"
-msgstr ""
+msgstr ".38 Special recarregado"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .38 Super"
-msgstr ""
+msgstr ".38 Super recarregado"
 
 #: lang/json/AMMO_from_json.py
 msgid ".38 FMJ blackpowder"
@@ -2926,7 +2964,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".380 ACP FMJ"
-msgstr ""
+msgstr ".380 ACP FMJ"
 
 #. ~ Description for .380 ACP FMJ
 #: lang/json/AMMO_from_json.py
@@ -2939,7 +2977,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".380 ACP JHP"
-msgstr ""
+msgstr ".380 ACP JHP"
 
 #. ~ Description for .380 ACP JHP
 #: lang/json/AMMO_from_json.py
@@ -2952,7 +2990,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".380 ACP +P"
-msgstr ""
+msgstr ".380 ACP +P"
 
 #. ~ Description for .380 ACP +P
 #: lang/json/AMMO_from_json.py
@@ -2985,7 +3023,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".38 Super FMJ"
-msgstr ""
+msgstr ".38 Super FMJ"
 
 #. ~ Description for .38 Super FMJ
 #: lang/json/AMMO_from_json.py
@@ -3001,7 +3039,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".40 S&W FMJ"
-msgstr ""
+msgstr ".40 S&W FMJ"
 
 #. ~ Description for .40 S&W FMJ
 #: lang/json/AMMO_from_json.py
@@ -3017,7 +3055,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".40 S&W JHP"
-msgstr ""
+msgstr ".40 S&W JHP"
 
 #. ~ Description for .40 S&W JHP
 #: lang/json/AMMO_from_json.py
@@ -3342,7 +3380,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".45-70 SP"
-msgstr ""
+msgstr ".45-70 SP"
 
 #. ~ Description for .45-70 SP
 #: lang/json/AMMO_from_json.py
@@ -3429,7 +3467,7 @@ msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid ".45 Colt JHP"
-msgstr ""
+msgstr ".45 Colt JHP"
 
 #. ~ Description for .45 Colt JHP
 #: lang/json/AMMO_from_json.py
@@ -3537,41 +3575,47 @@ msgid "reloaded .460 Rowland"
 msgstr "recarregado .460 Rowland"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr "0,5 tracer BMG"
+msgid ".50 BMG M17 tracer"
+msgstr ""
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M17 tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
 msgstr ""
-" Uma variante do rastreador do poderoso .50 BMG sniper round. "
-"Tracerarredonda-se para ajudar a manter a arma em que são disparados noalvo,"
-" sobrisco de inflamar substâncias inflamáveis."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr "0,50 bola BMG"
+msgid ".50 BMG M33 Ball"
+msgstr ""
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-" O 0,50 BMG é um rifle muito poderoso projetado para uso em longoalcance. "
-"Sua estupenda precisão e capacidade de perfuração de blindagemfazem deleum "
-"dos rounds mais mortíferos disponíveis, compensados apenas porseu recuoe "
-"ruído drásticos."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
+msgid ".50 BMG Match"
 msgstr ""
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG Match
+#: lang/json/AMMO_from_json.py
+msgid ""
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG M2 AP"
+msgstr ""
+
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
@@ -3581,6 +3625,23 @@ msgstr ""
 "açodetungsténio muito denso e endurecido. A penetração é aumentada, mas o "
 "danoéreduzido."
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr ""
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
 msgstr "recarregado .50 BMG tracer"
@@ -3588,31 +3649,24 @@ msgstr "recarregado .50 BMG tracer"
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
 msgstr ""
-" Uma variante do rastreador do poderoso .50 BMG sniper round. "
-"Tracerarredonda-se para ajudar a manter a arma em que são disparados noalvo,"
-" sobrisco de inflamar substâncias inflamáveis. Este "
-"foirecarregadomanualmente."
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr "bola recarregada .50 BMG"
+msgid "reloaded .50 BMG Match"
+msgstr ""
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-" O 0,50 BMG é um rifle muito poderoso projetado para uso em longoalcance. "
-"Sua estupenda precisão e capacidade de perfuração de blindagemfazem deleum "
-"dos rounds mais mortíferos disponíveis, compensados apenas porseu recuoe "
-"ruído drásticos. Este foi recarregado manualmente."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
@@ -3621,13 +3675,9 @@ msgstr "recarregado .50 BMG AP"
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
 msgstr ""
-" Variante do round de 0,50 BMG que usa um núcleo de aço "
-"detungstênioendurecido, muito denso. A penetração é aumentada, mas o dano "
-"éreduzido. Este foi recarregado manualmente."
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -4729,6 +4779,106 @@ msgstr "Algumas sementes de fungos."
 msgid "fungal flower"
 msgstr "flor de fungos"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr ""
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr ""
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr ""
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr ""
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr ""
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr ""
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr ""
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr ""
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr ""
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr ""
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -4887,7 +5037,7 @@ msgstr[1] "zinco"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
 msgstr ""
@@ -4904,15 +5054,15 @@ msgid ""
 "A soft dull metal known since ancient times.  Due to its malleability it has"
 " a wide variety of uses including the manufacture of ammunition."
 msgstr ""
-" platinumlead Um metal opaco e macio conhecido desde a antiguidade. "
-"Devidoàsua maleabilidade, possui uma ampla variedade de usos, "
-"incluindoafabricação de munição."
+"Um metal opaco e macio conhecido desde a antiguidade. Devido à sua "
+"maleabilidade, possui uma ampla variedade de usos, incluindo a fabricação de"
+" munição."
 
 #: lang/json/AMMO_from_json.py
 msgid "magnesium powder"
 msgid_plural "magnesium powder"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "pó de magnésio"
+msgstr[1] "pó de magnésio"
 
 #. ~ Description for magnesium powder
 #: lang/json/AMMO_from_json.py
@@ -4920,8 +5070,8 @@ msgid ""
 "A gray powder composed of the highly flammable alkaline earth metal "
 "magnesium.  Useful for constructing flares and similar items."
 msgstr ""
-" pó de magnésioUm pó cinza composto de magnésio alcalino- "
-"terrosoaltamenteinflamável. Útil para construir flares e itens semelhantes."
+"Um pó cinza composto de magnésio alcalino-terroso altamente inflamável. Útil"
+" para construir sinalizadores e itens semelhantes."
 
 #: lang/json/AMMO_from_json.py
 msgid "silver"
@@ -4935,12 +5085,12 @@ msgid ""
 "A soft shiny metal.  Before the cataclysm it was worth quite a bit but its "
 "value is now greatly diminished."
 msgstr ""
-" silverA metal macio e brilhante. Antes do cataclismo, valeu um bocado, "
-"masoseu valor é agora grandemente diminuído."
+"Um metal macio e brilhante. Antes do cataclismo, valeu um bocado, mas o seu "
+"valor é agora grandemente diminuído."
 
 #: lang/json/AMMO_from_json.py
 msgid "small metal sheet"
-msgstr "pequena folha de metal"
+msgstr "folha de metal pequena"
 
 #. ~ Description for small metal sheet
 #: lang/json/AMMO_from_json.py
@@ -4949,7 +5099,7 @@ msgstr "Uma pequena folha de metal."
 
 #: lang/json/AMMO_from_json.py
 msgid "chunk of steel"
-msgstr "pedaço de aço"
+msgstr "porção de aço"
 
 #. ~ Description for chunk of steel
 #: lang/json/AMMO_from_json.py
@@ -4957,8 +5107,8 @@ msgid ""
 "A misshapen chunk of steel.  Makes a decent weapon in a pinch, and is also "
 "useful for some crafting recipes."
 msgstr ""
-" Um pedaço de aço deformado. Faz uma arma decente em um aperto, e "
-"tambéméútil para algumas receitas de artesanato."
+"Um pedaço de aço deformado. Dá uma arma decente em um aperto, e também é "
+"útil para algumas receitas de artesanato."
 
 #: lang/json/AMMO_from_json.py
 msgid "lump of steel"
@@ -4968,7 +5118,7 @@ msgstr "pedaço de aço"
 #: lang/json/AMMO_from_json.py
 msgid "A heavy formed piece of steel.  Useful for some crafting recipes."
 msgstr ""
-" Um pedaço pesado de aço formado. Útil para algumas receitas de artesanato."
+"Um pedaço pesado de aço fundido. Útil para algumas receitas de artesanato."
 
 #: lang/json/AMMO_from_json.py
 msgid "door hinge"
@@ -4977,11 +5127,11 @@ msgstr "dobradiça de porta"
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
 msgstr ""
-"Uma pequena dobradiça metálica, composta de duas placas com buracos de "
-"parafuso. Útil para fazer portas."
+"Uma pequena dobradiça metálica com duas placas de parafusar. Útil para fazer"
+" portas."
 
 #: lang/json/AMMO_from_json.py
 msgid "tin powder"
@@ -4993,6 +5143,8 @@ msgid ""
 "A fine gray powder composed of tin, usable for making solder and lining "
 "containers to prevent corrosion."
 msgstr ""
+"Um fino pó cinza de estanho, útil para fazer solda e forrar recipientes para"
+" evitar corrosão."
 
 #: lang/json/AMMO_from_json.py
 msgid "solder"
@@ -5003,13 +5155,13 @@ msgstr "solda"
 msgid ""
 "A small spool of solder, able to be used in ammunition and electronics."
 msgstr ""
-"Um pequeno carretel de solda, capas de ser usado como munição e eletrônicos."
+"Um pequeno carretel de solda, capaz de ser usado para munição e eletrônicos."
 
 #: lang/json/AMMO_from_json.py
 msgid "incendiary"
 msgid_plural "incendiaries"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "incendiário"
+msgstr[1] "incendiários"
 
 #. ~ Description for incendiary
 #: lang/json/AMMO_from_json.py
@@ -5017,14 +5169,14 @@ msgid ""
 "Material from an incendiary round, useful in constructing incendiary "
 "ammunition."
 msgstr ""
-" Material incendiário de uma rodada incendiária, útil na construçãodemunição"
-" incendiária."
+"Material de um cartucho incendiário,útil na construção de munição "
+"incendiária."
 
 #: lang/json/AMMO_from_json.py
 msgid "fuse"
 msgid_plural "fuse"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "pavio"
+msgstr[1] "pavios"
 
 #. ~ Description for fuse
 #: lang/json/AMMO_from_json.py
@@ -5032,6 +5184,363 @@ msgid ""
 "A piece of fuse, long enough to give you enough time to get away from most "
 "explosions."
 msgstr ""
+"Um pedaço de pavio, longo o bastante para lhe dar tempo o suficiente para se"
+" afastar da maioria das explosões."
+
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr "sola de borracha"
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr ""
+"Isto é uma sola feita de borracha, normalmente encontrada nos fundos de "
+"botas. Pode ser usada para fazer botas de verdade."
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr ""
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr ""
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr ""
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr ""
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr ""
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr ""
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr ""
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr ""
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr ""
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr ""
 
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
@@ -5641,6 +6150,18 @@ msgstr ""
 "calorosamentenoimpacto, perfurar armaduras e inflamar substâncias "
 "inflamáveis."
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr ""
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -5688,8 +6209,29 @@ msgstr[1] ""
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr ""
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr ""
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
 msgstr ""
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
@@ -5975,8 +6517,8 @@ msgstr "espoleta elétrica pequena"
 #: lang/json/AMMO_from_json.py
 msgid "Primer for an autocannon shell.  Seems to use an electric ignition."
 msgstr ""
-" Primer para uma concha de canhão automático. Parece usar "
-"umaigniçãoelétrica."
+"Espoleta para um projétil de canhão automático. Parece usar uma ignição "
+"elétrica."
 
 #: lang/json/AMMO_from_json.py
 msgid "large electric primer"
@@ -6291,13 +6833,6 @@ msgstr ""
 " blob feed Um amálgama de vários tipos de material orgânico, contém tudooque"
 " o blob precisa para ser saudável. Você pensa..."
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "rocha"
-msgstr[1] "rochas"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -6894,8 +7429,10 @@ msgstr[1] "talabartes"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "Você embainha sua %s"
@@ -7590,6 +8127,46 @@ msgid ""
 "small straps designed to better distribute the weight."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -7735,14 +8312,13 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "wool cloak"
 msgid_plural "wool cloaks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "capa de lã"
+msgstr[1] "capas de lã"
 
 #. ~ Description for wool cloak
 #: lang/json/ARMOR_from_json.py
 msgid "A heavy woolen cloak meant to be thrown over your body."
-msgstr ""
-"manto de lãUma capa de lã pesada deveria ser jogada sobre o seu corpo."
+msgstr "Uma capa de lã pesada, feita para ser jogada sobre o seu corpo."
 
 #: lang/json/ARMOR_from_json.py
 msgid "clown suit"
@@ -7755,27 +8331,46 @@ msgstr[1] "fantasias de palhaço"
 msgid ""
 "A colorful and ridiculous costume fit for a clown.  Provides decent storage."
 msgstr ""
-" traje de palhaço Um traje colorido e ridículo para um palhaço. "
-"Fornecearmazenamento decente."
+"Um traje colorido e ridículo para um palhaço. Fornece armazenamento decente."
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] "peruca de palhaço"
+msgstr[1] "perucas de palhaço"
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr "Uma peruca colorida e ridícula, feita para um palhaço."
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] "nariz de palhaço"
+msgstr[1] "narizes de palhaço"
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr "Um nariz vermelho de látex, comumente usado por palhaços."
 
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "casaco de pele"
+msgstr[1] "casacos de pele"
 
 #. ~ Description for fur coat
 #: lang/json/ARMOR_from_json.py
 msgid "A fur coat with a couple small pockets.  Extremely warm."
-msgstr ""
-" casaco de peleUm casaco de pele com um par de pequenos bolsos. "
-"Extremamentequente."
+msgstr "Um casaco de pele com um par de pequenos bolsos. Extremamente quente."
 
 #: lang/json/ARMOR_from_json.py
 msgid "faux fur coat"
 msgid_plural "faux fur coats"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "casaco de pele falsa"
+msgstr[1] "casacos de pele falsa"
 
 #. ~ Description for faux fur coat
 #: lang/json/ARMOR_from_json.py
@@ -7783,15 +8378,15 @@ msgid ""
 "A garishly-colored faux fur coat with a couple small pockets.  Although not "
 "as warm as the natural fur, it gives you some of that unique flair."
 msgstr ""
-" Um casaco de peles artificiais de cores garridascom um par de "
-"pequenosbolsos. Embora não seja tão quente quanto o pêlonatural, ele dá a "
-"você umpouco desse estilo único."
+"Um casaco de pele artificial de cores garridas com um par de pequenos "
+"bolsos. Embora não seja tão quente quanto o pêlo natural, ele dá a você um "
+"pouco desse estilo único."
 
 #: lang/json/ARMOR_from_json.py
 msgid "sable coat"
 msgid_plural "sable coats"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "casaco de zibelina"
+msgstr[1] "casacos de zibelina"
 
 #. ~ Description for sable coat
 #: lang/json/ARMOR_from_json.py
@@ -7799,14 +8394,14 @@ msgid ""
 "A very well-made fur coat, featuring thick panels of sable fur.  Very warm "
 "and very good-looking."
 msgstr ""
-" Um casaco de pele muito bem feito, com grossos painéis depele de zibelina. "
+"Um casaco de pele muito bem feito, com grossos painéis de pele de zibelina. "
 "Muito quente e muito bonito."
 
 #: lang/json/ARMOR_from_json.py
 msgid "lab coat"
 msgid_plural "lab coats"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "jaleco"
+msgstr[1] "jalecos"
 
 #. ~ Description for lab coat
 #: lang/json/ARMOR_from_json.py
@@ -7814,14 +8409,14 @@ msgid ""
 "A long white coat with several large pockets.  Comes with a very nice pocket"
 " protector."
 msgstr ""
-" Casaco de laboratórioUm casaco branco longo com vários bolsos grandes. "
-"Vemcom um protetor de bolso muito bom."
+"Um casaco branco longo com vários bolsos grandes. Vem com um protetor de "
+"bolso muito bom."
 
 #: lang/json/ARMOR_from_json.py
 msgid "rain coat"
 msgid_plural "rain coats"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "capa de chuva"
+msgstr[1] "capas de chuva"
 
 #. ~ Description for rain coat
 #: lang/json/ARMOR_from_json.py
@@ -7829,8 +8424,8 @@ msgid ""
 "A plastic coat with a hood and two very large pockets.  Provides protection "
 "from rain."
 msgstr ""
-" capa de chuvaUm casaco de plástico com um capuz e dois bolsos muitograndes."
-" Fornece proteção contra chuva."
+"Um casaco de plástico com um capuz e dois bolsos muito grandes. Fornece "
+"proteção contra chuva."
 
 #: lang/json/ARMOR_from_json.py
 msgid "gutskin parka"
@@ -8054,11 +8649,27 @@ msgstr ""
 "Pareceprofissional!"
 
 #: lang/json/ARMOR_from_json.py
-msgid "wedding dress"
-msgid_plural "wedding dresses"
+msgid "drinking hat"
+msgid_plural "drinking hats"
 msgstr[0] ""
 msgstr[1] ""
 
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "wedding dress"
+msgid_plural "wedding dresses"
+msgstr[0] "vestido de casamento"
+msgstr[1] "vestidos de casamento"
+
 #. ~ Description for wedding dress
 #: lang/json/ARMOR_from_json.py
 msgid "A beautiful white wedding dress.  What good will it be now?"
@@ -8181,8 +8792,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "pair of elbow pads"
 msgid_plural "pairs of elbow pads"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "par de cotoveleiras"
+msgstr[1] "pares de cotoveleiras"
 
 #. ~ Description for pair of elbow pads
 #: lang/json/ARMOR_from_json.py
@@ -8218,6 +8829,32 @@ msgid "Provides a bit of extra storage, with minimal encumbrance."
 msgstr ""
 " fanny packFornece um pouco de armazenamento extra, com o mínimo de ônus."
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -8234,6 +8871,34 @@ msgstr ""
 "usadoporesgrimistas para evitar acidentes. Não possui depósito, mas "
 "émuitoconfortável."
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -8260,6 +8925,32 @@ msgstr ""
 " calça de esgrimaUm par de calças reforçadas usadas por "
 "esgrimistasparaevitar ferimentos."
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -8357,8 +9048,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "flag shirt"
 msgid_plural "flag shirts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "camiseta de bandeira"
+msgstr[1] "camisetas de bandeira"
 
 #. ~ Description for flag shirt
 #: lang/json/ARMOR_from_json.py
@@ -8682,8 +9373,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fur gloves"
 msgid_plural "pairs of fur gloves"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "par de luvas de pele"
+msgstr[1] "pares de luvas de pele"
 
 #. ~ Description for pair of fur gloves
 #: lang/json/ARMOR_from_json.py
@@ -8692,22 +9383,6 @@ msgstr ""
 " par de luvas de peleUm par de luvas de peles quentes. Eles são "
 "umpoucocomplicados."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr ""
-" um par de luvas de neoprene para sobreviventesUm par de luvas "
-"deneopreneKevlar blindadas personalizadas, modificadas para serem fáceis "
-"deusar, proporcionando proteção máxima sob condições extremas."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -8777,6 +9452,20 @@ msgstr ""
 "tecidoKevlarpersonalizadas, modificadas para serem fáceis de usar, "
 "proporcionandoproteção máxima sob condições extremas."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -9039,17 +9728,6 @@ msgstr ""
 " par de óculos de esquiUm grande par de óculos que fecham "
 "completamenteosolhos. Fornece excelente proteção contra perigos ambientais."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "Um par de óculos de natação feitos para nadar."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -9092,23 +9770,6 @@ msgstr ""
 " greatcoatUm casaco de lã pesado e comprido. Incômodo, mas quente ecombolsos"
 " profundos."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr ""
-" roupa de mergulho para sobreviventesUma combinação de armadura leve, "
-"feitaàmão, feita de um colete à prova de balas e um fato de "
-"neoprenereforçado. Protege dos elementos, bem como do dano."
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -9696,20 +10357,6 @@ msgstr ""
 " Sobrevivente IncêndioUm personalizado Nomex blindado e capô Kevlar, "
 "muitoforte e durável."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr ""
-" capa de wetsuit survivorUm neoprene blindado personalizado e capuzKevlar, "
-"muito forte e durável."
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -10058,8 +10705,8 @@ msgid ""
 "Long, flowing robes.  Simple and comfortable to wear.  Be sure to tear it "
 "off dramatically before fighting any foes!"
 msgstr ""
-" Jedi manto Longos trajes esvoaçantes. Simples e confortável deusar. "
-"Certifique-se de rasgá-lo dramaticamente antes de lutar contra osinimigos!"
+"Longos trajes esvoaçantes. Simples e confortável de usar. Certifique-se de "
+"rasgá-lo dramaticamente antes de lutar contra os inimigos!"
 
 #: lang/json/ARMOR_from_json.py
 msgid "sports jersey"
@@ -10073,80 +10720,80 @@ msgid ""
 "A shirt made of thick material imprinted with the name and logo of a sports "
 "team."
 msgstr ""
-" jersey esportivoUma camisa feita de material grosso com o nome e o logoti "
-"pode uma equipe esportiva."
+"Uma camisa feita de material grosso com o nome e o logotipo de uma equipe "
+"esportiva."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A pro thunderball jersey made of thick material imprinted with the logo of "
 "the Decatur Fist."
 msgstr ""
-" Uma camisa pro thunderball feita de material grosso impresso com "
-"ologotipodo Decatur Fist."
+" Uma camisa de pro thunderball feita de material grosso impresso com o "
+"logotipo do Decatur Fist."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A 43-man squamish jersey made of thick material imprinted with the logo of "
 "the Gainesville Veeblefetzers."
 msgstr ""
-" Uma camisa squamish de 43 homens feita de material grosso impresso comologo"
-" dos Veeblefetzers de Gainesville."
+" Uma camisa squamish 43 feita de material grosso impresso com o logo dos "
+"Veeblefetzers de Gainesville."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A zero-G football jersey made of thick material imprinted with the logo of "
 "the London Jets."
 msgstr ""
-" Uma camisa de futebol zero-G feita de material grosso impresso comologotipo"
-" do London Jets."
+" Uma camisa de futebol zero-G feita de material grosso impresso com o "
+"logotipo do London Jets."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A football jersey made of thick material imprinted with the logo of the "
 "Endsville Fluffycats."
 msgstr ""
-" Uma camisa de futebol feita de material grosso impresso com o "
-"logotipodaEndsville Fluffycats."
+" Uma camisa de futebol feita de material grosso impresso com o logotipo da "
+"Endsville Fluffycats."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A baseball jersey made of thick material imprinted with the logo of the "
 "Tokyo Samurai."
 msgstr ""
-" Uma camisa de beisebol feita de material grosso impresso com o "
-"logotipodosamurai de Tóquio."
+" Uma camisa de beisebol feita de material grosso impresso com o logotipo do "
+"Samurai de Tóquio."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A basketball jersey made of thick material imprinted with the logo of the "
 "Basin City Blues."
 msgstr ""
-" Uma camisa de basquete feita de material grosso impresso com o "
-"logotipodaBasin City Blues."
+" Uma camisa de basquete feita de material grosso impresso com o logotipo da "
+"Basin City Blues."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A death race jersey made of thick material imprinted with Frankenstein's "
 "logo and signature."
 msgstr ""
-" Uma camisa da raça da morte feita de material grosso impresso com "
-"ologotipoe a assinatura de Frankenstein."
+" Uma camisa de corrida da morte feita de material grosso impresso com o "
+"logotipo e a assinatura de Frankenstein."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A rollerball jersey made of thick material imprinted with the logo of the "
 "Houston Energy Corporation."
 msgstr ""
-" Uma camisa de rollerball feita de material grosso impresso com o "
-"logotipodaHouston Energy Corporation."
+" Uma camisa de rollerball feita de material grosso impresso com o logotipo "
+"da Houston Energy Corporation."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A hockey jersey made of thick material imprinted with the logo of the "
 "Monroeville Zombies."
 msgstr ""
-" Uma camisa de hóquei feita de material grosso impresso com o "
-"logotipodosMonroeville Zombies."
+" Uma camisa de hóquei feita de material grosso impresso com o logotipo dos "
+"Monroeville Zombies."
 
 #: lang/json/ARMOR_from_json.py
 msgid "judo belt template"
@@ -10158,8 +10805,7 @@ msgstr[1] "modelos de faixas judô"
 #: lang/json/ARMOR_from_json.py
 msgid "This is a template for judo belts.  If found in a game it is a bug."
 msgstr ""
-" modelo de cinto de judôEste é um modelo para cintos de judô. Seencontradoem"
-" um jogo, é um bug."
+"Este é um modelo para cintos de judô. Se encontrado em um jogo, é um bug."
 
 #: lang/json/ARMOR_from_json.py
 msgid "black belt"
@@ -10171,8 +10817,7 @@ msgstr[1] "faixas pretas"
 #: lang/json/ARMOR_from_json.py
 msgid "A belt worn by martial arts practitioners, advertising a master."
 msgstr ""
-" cinto pretoUm cinto usado por praticantes de artes marciais, "
-"anunciandoummestre."
+"Um cinto usado por praticantes de artes marciais, anunciando um mestre."
 
 #: lang/json/ARMOR_from_json.py
 msgid "blue belt"
@@ -10186,8 +10831,8 @@ msgid ""
 "A belt worn by martial arts practitioners, advertising a strong "
 "intermediate."
 msgstr ""
-" cinto azulUm cinto usado por praticantes de artes marciais, "
-"anunciandoumintermediário forte."
+"Um cinto usado por praticantes de artes marciais, anunciando um "
+"intermediário forte."
 
 #: lang/json/ARMOR_from_json.py
 msgid "brown belt"
@@ -10199,8 +10844,8 @@ msgstr[1] "faixas marrons"
 #: lang/json/ARMOR_from_json.py
 msgid "A belt worn by martial arts practitioners, advertising a near-master."
 msgstr ""
-" cinto marromUm cinto usado por praticantes de artes marciais, "
-"anunciandoummestre próximo."
+"Um cinto usado por praticantes de artes marciais, anunciando um praticante "
+"próximo de ser um mestre."
 
 #: lang/json/ARMOR_from_json.py
 msgid "green belt"
@@ -10213,8 +10858,8 @@ msgstr[1] "faixas verdes"
 msgid ""
 "A belt worn by martial arts practitioners, advertising an intermediate."
 msgstr ""
-" cinto verdeUm cinto usado por praticantes de artes marciais, "
-"anunciandoumintermediário."
+"Um cinto usado por praticantes de artes marciais, anunciando um "
+"intermediário."
 
 #: lang/json/ARMOR_from_json.py
 msgid "orange belt"
@@ -10227,8 +10872,8 @@ msgstr[1] "faixas laranjas"
 msgid ""
 "A belt worn by martial arts practitioners, advertising a fresh intermediate."
 msgstr ""
-" cinto laranjaUm cinto usado por praticantes de artes marciais, "
-"anunciandoumintermediário fresco."
+"Um cinto usado por praticantes de artes marciais, anunciando um "
+"intermediário fresco."
 
 #: lang/json/ARMOR_from_json.py
 msgid "white belt"
@@ -10240,8 +10885,7 @@ msgstr[1] "faixas brancas"
 #: lang/json/ARMOR_from_json.py
 msgid "A belt worn by martial arts practitioners, advertising a novice."
 msgstr ""
-" cinto brancoUm cinto usado por praticantes de artes marciais, "
-"anunciandoumnovato."
+"Um cinto usado por praticantes de artes marciais, anunciando um novato."
 
 #: lang/json/ARMOR_from_json.py
 msgid "yellow belt"
@@ -10254,14 +10898,14 @@ msgstr[1] "faixas amarelas"
 msgid ""
 "A belt worn by martial arts practitioners, advertising a moderate novice."
 msgstr ""
-" cinto amareloUm cinto usado por praticantes de artes marciais, "
-"anunciandoumnovato moderado."
+"Um cinto usado por praticantes de artes marciais, anunciando um novato "
+"moderado."
 
 #: lang/json/ARMOR_from_json.py
 msgid "judo gi"
 msgid_plural "judo gis"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "gi de judô"
+msgstr[1] "gis de judô"
 
 #. ~ Description for judo gi
 #: lang/json/ARMOR_from_json.py
@@ -10269,8 +10913,8 @@ msgid ""
 "Plain white judo gi.  Thick and a little stiff, it gives minor protection "
 "from cuts and punches."
 msgstr ""
-" judo giPlain branco judo gi. Grosso e um pouco duro, dá menorproteçãocontra"
-" cortes e socos."
+"Um gi branco de judô. Grosso e um pouco duro, oferece um pouco de proteção "
+"contra cortes e socos."
 
 #: lang/json/ARMOR_from_json.py
 msgid "jumpsuit"
@@ -10284,9 +10928,8 @@ msgid ""
 "A thin, short-sleeved jumpsuit; similar to those worn by prisoners.  "
 "Provides decent storage and is not very encumbering."
 msgstr ""
-" macacãoA macacão de manga curta fina; semelhante aos "
-"usadospelosprisioneiros. Fornece armazenamento decente e não é muito "
-"oneroso."
+"Um macacão fino de mangas curtas; semelhante aos usados pelos prisioneiros. "
+"Fornece armazenamento decente e não é muito desajeitado."
 
 #: lang/json/ARMOR_from_json.py
 msgid "Hub 01 jumpsuit"
@@ -10312,15 +10955,15 @@ msgid ""
 "body clothing.  Provides some storage and is adjustable to minimize "
 "encumbrance."
 msgstr ""
-" Macacão XLAlto macacão de mangas curtas atualizado para o "
-"transexualqueprecisa de roupas de corpo inteiro. Fornece algum armazenamento"
-" eéajustável para minimizar o ônus."
+"Um macacão fino de mangas curtas atualizado para os trans-humanos que "
+"precisam de roupas de corpo inteiro. Fornece algum armazenamento e é "
+"ajustável para minimizar o incômodo."
 
 #: lang/json/ARMOR_from_json.py
 msgid "karate gi"
 msgid_plural "karate gis"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "gi de karatê"
+msgstr[1] "gis de karatê"
 
 #. ~ Description for karate gi
 #: lang/json/ARMOR_from_json.py
@@ -10328,14 +10971,14 @@ msgid ""
 "Plain white karate gi.  Loose and flowing, it offers little protection, and "
 "little encumbrance."
 msgstr ""
-" karate giPlain branco karatê gi. Solta e fluindo, oferece pouca "
-"proteçãoepouco fardo."
+"Um gi liso e branco de karatê. Solto e fluído, oferece pouca proteção e "
+"pouco incômodo."
 
 #: lang/json/ARMOR_from_json.py
 msgid "kariginu"
 msgid_plural "kariginus"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "kariginu"
+msgstr[1] "kariginus"
 
 #. ~ Description for kariginu
 #: lang/json/ARMOR_from_json.py
@@ -10343,8 +10986,8 @@ msgid ""
 "A traditional, ankle-length Shinto robe with several layers and very wide "
 "sleeves."
 msgstr ""
-" kariginuUm robe xintoísta tradicional, até os tornozelos, com "
-"váriascamadase mangas muito largas."
+"Uma túnica xintoísta tradicional, até os tornozelos, com várias camadas e "
+"mangas muito largas."
 
 #: lang/json/ARMOR_from_json.py
 msgid "keffiyeh"
@@ -10358,15 +11001,14 @@ msgid ""
 "A type of headdress traditionally used in the Middle East.  It can be used "
 "in different ways to protect the head and mouth from the elements."
 msgstr ""
-" keffiyeh Um tipo de cocar usado tradicionalmente no Oriente Médio. "
-"Podeserusado de diferentes maneiras para proteger a cabeça e a boca "
-"doselementos."
+"Um tipo de lenço usado tradicionalmente no Oriente Médio. Pode ser usado de "
+"diferentes maneiras para proteger a cabeça e a boca dos elementos."
 
 #: lang/json/ARMOR_from_json.py
 msgid "cyan scarf"
 msgid_plural "cyan scarfs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "cachecól ciano"
+msgstr[1] "cachecóis ciano"
 
 #. ~ Description for cyan scarf
 #: lang/json/ARMOR_from_json.py
@@ -10378,13 +11020,13 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "keikogi"
 msgid_plural "keikogis"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "keikogi"
+msgstr[1] "keikogis"
 
 #. ~ Description for keikogi
 #: lang/json/ARMOR_from_json.py
 msgid "Plain white keikogi for use in martial arts."
-msgstr "keikogiPlain keikogi branco para uso em artes marciais."
+msgstr "Um keikogi branco e liso para uso em artes marciais."
 
 #: lang/json/ARMOR_from_json.py
 msgid "Kevlar vest"
@@ -10396,9 +11038,7 @@ msgstr[1] ""
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A lightweight, bullet resistant vest.  Suitable for wearing under clothing."
-msgstr ""
-" Kevlar vestA colete leve e resistente a balas. Adequado para usar "
-"sobaroupa."
+msgstr "Um colete leve e resistente a balas. Adequado para usar sob a roupa."
 
 #: lang/json/ARMOR_from_json.py
 msgid "kilt"
@@ -10410,7 +11050,7 @@ msgstr[1] "kilts"
 #. ~ Description for leather kilt
 #: lang/json/ARMOR_from_json.py
 msgid "No true Scotsman would leave home without his kilt."
-msgstr "kiltNão o verdadeiro escocês sairia de casa sem o kilt."
+msgstr "Nenhum verdadeiro escocês sairia de casa sem seu kilt."
 
 #: lang/json/ARMOR_from_json.py
 msgid "leather kilt"
@@ -10430,14 +11070,14 @@ msgid ""
 "A traditional, ankle-length Japanese robe, wrapped around the body with a "
 "sash."
 msgstr ""
-" kiltkimono de couroUm robe tradicional japonês até o tornozelo, "
-"enroladoemvolta do corpo com uma faixa."
+"Uma túnica tradicional japonesa que desce até o tornozelo, enrolado em volta"
+" do corpo com uma faixa."
 
 #: lang/json/ARMOR_from_json.py
 msgid "yukata"
 msgid_plural "yukatas"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "yukata"
+msgstr[1] "yukatas"
 
 #. ~ Description for yukata
 #: lang/json/ARMOR_from_json.py
@@ -10449,8 +11089,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "haori"
 msgid_plural "haoris"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "haori"
+msgstr[1] "haoris"
 
 #. ~ Description for haori
 #: lang/json/ARMOR_from_json.py
@@ -10469,7 +11109,8 @@ msgstr[1] ""
 #: lang/json/ARMOR_from_json.py
 msgid "A thin, rounded skullcap.  A traditional headdress in Judaism."
 msgstr ""
-" kippahA calota craniana fina e arredondada. Um cocar tradicionalnojudaísmo."
+"Uma peça para a cabeça, fina e arredondada, parte das vestimentas "
+"tradicionais no judaísmo."
 
 #: lang/json/ARMOR_from_json.py
 msgid "kittel"
@@ -10483,20 +11124,19 @@ msgid ""
 "A white, knee-length cotton robe, traditionally worn by Jews on special "
 "occasions."
 msgstr ""
-" kittelUm robe branco de algodão até os joelhos, tradicionalmente "
-"usadopelosjudeus em ocasiões especiais."
+"Uma túnica branca de algodão até os joelhos, tradicionalmente usada pelos "
+"judeus em ocasiões especiais."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of knee pads"
 msgid_plural "pairs of knee pads"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "par de joelheiras"
+msgstr[1] "pares de joelheiras"
 
 #. ~ Description for pair of knee pads
 #: lang/json/ARMOR_from_json.py
 msgid "A pair of knee pads made of stout plastic and cloth."
-msgstr ""
-" par de joelheirasUm par de joelheiras feitas de plástico robusto e pano."
+msgstr "Um par de joelheiras feitas de plástico robusto e pano."
 
 #: lang/json/ARMOR_from_json.py
 msgid "kufi cap"
@@ -10507,7 +11147,7 @@ msgstr[1] ""
 #. ~ Description for kufi cap
 #: lang/json/ARMOR_from_json.py
 msgid "A brimless, short and rounded cap."
-msgstr "kufi capA tampa sem aba, curta e arredondada."
+msgstr "Um chapéu sem aba, curto e arredondado."
 
 #: lang/json/ARMOR_from_json.py
 msgid "leather belt"
@@ -10516,20 +11156,27 @@ msgstr[0] "cinto de couro"
 msgstr[1] "cintos de couro"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "Você coloca seu %sno seu %s."
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "Cole o que em seu cinto"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
-msgstr "Um cinto de couro. Útil para fazer o seu par de calças se encaixar."
+msgstr "Um cinto de couro. Útil para fazer o seu par de calças servir."
 
 #: lang/json/ARMOR_from_json.py
 msgid "leather pouch"
@@ -10543,8 +11190,8 @@ msgid ""
 "A bag stitched together from leather scraps.  Doesn't hold an awful lot but "
 "is easy to wear."
 msgstr ""
-" bolsa de couroUma bolsa costurada a partir de restos de couro. Não "
-"temmuitacoisa, mas é fácil de usar."
+"Uma bolsa costurada a partir de restos de couro. Não cabe muita coisa, mas é"
+" fácil de usar."
 
 #: lang/json/ARMOR_from_json.py
 msgid "ammo pouch"
@@ -10579,8 +11226,8 @@ msgid ""
 "A tool to help set bones and hold them in place.  It is specifically "
 "designed to fit Huge people."
 msgstr ""
-" ferramenta splintleg splintleg splintleg perna para ajudar a definirosossos"
-" e mantê-los no lugar. É projetado especificamente para caberpessoasenormes."
+"Uma ferramenta para ajudar a sarar os ossos e mantê-los no lugar. É "
+"projetada especificamente para servir a pessoas enormes."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of leg warmers"
@@ -10591,9 +11238,7 @@ msgstr[1] ""
 #. ~ Description for pair of leg warmers
 #: lang/json/ARMOR_from_json.py
 msgid "Snug, soft cloth sleeves to keep your legs warm."
-msgstr ""
-" par de aquecedores de pernaEncaixe, mangas de tecido macias para "
-"manteraspernas aquecidas."
+msgstr "Mangas de tecido justas e macias para manter as pernas aquecidas."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of XL leg warmers"
@@ -10605,8 +11250,8 @@ msgstr[1] ""
 #: lang/json/ARMOR_from_json.py
 msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm."
 msgstr ""
-" par de aquecedores de perna XLLarga, macio, mangas de pano "
-"confortávelparamanter sua anatomia exótica quente."
+"Mangas de pano macias, justas e confortáveis, para manter sua anatomia "
+"exótica quente."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fetlock furs"
@@ -10617,8 +11262,7 @@ msgstr[1] ""
 #. ~ Description for pair of fetlock furs
 #: lang/json/ARMOR_from_json.py
 msgid "Snug fur sleeves to keep your fetlocks warm."
-msgstr ""
-" par de peles fetlockSnug mangas de pele para manter seus fetiches quentes."
+msgstr "Mangas de pele para manter seus fetiches quentes."
 
 #: lang/json/ARMOR_from_json.py
 msgid "leggings"
@@ -10632,8 +11276,8 @@ msgid ""
 "Skin-tight nylon leggings, sometimes used when exercising, that keep your "
 "legs nice and warm."
 msgstr ""
-" leggingsLeggings de nylon justas em pele, por vezes usadas "
-"duranteoexercício, que mantêm as suas pernas agradáveis e quentes."
+"Leggings de nylon justas, por vezes usadas durante o exercício, que mantêm "
+"as suas pernas agradáveis e quentes."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of hard leg guards"
@@ -10644,9 +11288,7 @@ msgstr[1] ""
 #. ~ Description for pair of hard leg guards
 #: lang/json/ARMOR_from_json.py
 msgid "A pair of polyurethane leg guards with neoprene backing."
-msgstr ""
-" par de guardas de pernas durasUm par de proteções de perna depoliuretanocom"
-" apoio de neoprene."
+msgstr "Um par de proteções de perna de poliuretano com camadas de neoprene."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of steel leg guards"
@@ -10660,9 +11302,9 @@ msgid ""
 "A full assembly of medieval leg protection.  Cuisses, poleyns, and greaves, "
 "with leather straps to secure each piece and connect it as part of a set."
 msgstr ""
-" par de guardas de perna de açoUm conjunto completo de proteção "
-"depernamedieval. Cuisses, poleyns e grevas, com tiras de couro para "
-"prendercadapeça e conectá-la como parte de um conjunto."
+"Um conjunto completo de proteção medieval para pernas. Cuisses, poleyns e "
+"grevas, com tiras de couro para prender cada peça e conectá-la como parte de"
+" um conjunto."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of iron greaves"
@@ -10673,9 +11315,7 @@ msgstr[1] ""
 #. ~ Description for pair of iron greaves
 #: lang/json/ARMOR_from_json.py
 msgid "A pair of iron leg guards with a simple leather lining."
-msgstr ""
-" par de ganchos de ferroUm par de guardas de perna de ferro com um "
-"forrodecouro simples."
+msgstr "Um par de guardas de perna de ferro com um forro de couro simples."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of paper leg guards"
@@ -10687,8 +11327,8 @@ msgstr[1] ""
 #: lang/json/ARMOR_from_json.py
 msgid "Leg guards made of stacked paper sheets held together with duct tape."
 msgstr ""
-" par de guardas de perna de papelLeg guardas feitas de folhas "
-"depapelempilhadas realizada em conjunto com fita adesiva."
+"Guardas de perna feitas de folhas de papel empilhadas e presas no lugar com "
+"fita adesiva."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of scrap leg guards"
@@ -10716,9 +11356,22 @@ msgid ""
 "A set of pouches that can be worn on the thighs using buckled straps.  This "
 "variety is favored by the military."
 msgstr ""
-" par de bolsas para pernas baixasUm conjunto de bolsas que podem "
-"serusadasnas coxas usando tiras afiveladas. Esta variedade é "
-"favorecidapelosmilitares."
+"Um conjunto de bolsas que podem ser usadas nas coxas usando tiras "
+"afiveladas. Esta variedade é favorecida pelos militares."
+
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr ""
 
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
@@ -10732,73 +11385,72 @@ msgid ""
 "A t-shirt with a picture of the Tux mascot on it.  Underneath it says \"You "
 "wouldn't buy a car with the hood welded shut.\""
 msgstr ""
-" T-shirt de Linux t-shirtA com uma imagem da mascote de Tux nele. "
-"Porbaixodiz:\"Você não compraria um carro com o capô soldado e fechado.\""
+"Uma camiseta com uma imagem do mascote Tux nele. Por baixo diz: \"Você não "
+"compraria um carro com o capô soldado e fechado.\""
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A t-shirt with a picture of Tux, the Linux mascot!  It says \"You wouldn't "
 "buy a car with the hood welded shut.\""
 msgstr ""
-" Uma camiseta com uma foto do Tux, a mascote do Linux! Diz\"Vocênãocompraria"
-" um carro com o capô soldado e fechado."
+"Uma camiseta com imagem do Tux, a mascote do Linux! Ela diz \"Você não "
+"compraria um carro com o capô soldado e fechado.\""
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A t-shirt with the Ubuntu logo on it, underneath it says \"Ubuntu is a South"
 " African word for 'I can't configure Debian'\""
 msgstr ""
-" Uma camiseta com o logotipo do Ubuntu, abaixo dele, diz\"O Ubuntu "
-"éumapalavra sul-africana para &#39;eu não consigo configurar o Debian&#39; "
-"\""
+"Uma camiseta com o logotipo do Ubuntu, abaixo dele está escrito \"Ubuntu é "
+"uma palavra sul-africana para 'Eu não consigo configurar o Debian'\""
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A t-shirt with the Arch Linux logo on it, underneath it says \"Keep it "
 "Simple Stupid\""
 msgstr ""
-" Uma camiseta com o logotipo do Arch Linux, abaixo dele, diz \"Keep "
-"itSimpleStupid \""
+"Uma camiseta com o logotipo do Arch Linux, abaixo dele, está escrito "
+"\"Mantenha tudo estúpidamente simples\""
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A t-shirt with the Ubuntu logo on it, underneath it says \"Linux for human "
 "beings\""
 msgstr ""
-" Uma camiseta com o logotipo do Ubuntu, abaixo dele diz \"Linux "
-"parasereshumanos \""
+"Uma camiseta com o logotipo do Ubuntu. Abaixo dele está escrito \"Linux para"
+" seres humanos\""
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A t-shirt with the Linux Mint logo on it, underneath it says \"From freedom "
 "came elegance\""
 msgstr ""
-" Uma camiseta com o logo do Linux Mint, abaixo dele diz:\"Da liberdade "
-"veioaelegância\""
+"Uma camiseta com o logo do Linux Mint. Abaixo dele, está escrito: \"Da "
+"liberdade veio a elegância\"."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A t-shirt with the Fedora logo on it, underneath it says \"Freedom. Friends."
 " Features. First.\""
 msgstr ""
-" Uma camiseta com o logotipo do Fedora, embaixo diz:\"Liberdade. Amigos. "
-"Recursos. Primeiro."
+"Uma camiseta com o logotipo do Fedora. Abaixo dele, está escrito: "
+"\"Liberdade. Amigos. Recursos. Primeiro.\""
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A t-shirt with Red Hat's logo on it, underneath it says \"The World's Open "
 "Source Leader\""
 msgstr ""
-" Uma camiseta com o logotipo da Red Hat, abaixo dele, diz:\"O Líder "
-"deCódigoAberto do Mundo \""
+"Uma camiseta com o logotipo da Red Hat. Abaixo dele, está escrito \"A Líder "
+"de Código Aberto do Mundo\"."
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A t-shirt with the Debian logo on it, underneath it says \"The Universal "
 "Operating System\""
 msgstr ""
-" Uma camiseta com o logotipo do Debian, abaixo dele, diz "
-"\"OSistemaOperacional Universal \""
+"Uma camiseta com o logotipo do Debian. Abaixo dele, está escrito \"O Sistema"
+" Operacional Universal\"."
 
 #: lang/json/ARMOR_from_json.py
 msgid "loincloth"
@@ -10842,8 +11494,8 @@ msgid ""
 "Leather patches stitched together and tied into a makeshift loincloth.  "
 "Covers your modesty, but not much else."
 msgstr ""
-" tanga de couroAs manchas de couro costuradas e amarradas em "
-"umatangaimprovisada. Cobre sua modéstia, mas não muito mais."
+"Pedaços de couro costurados e amarrados em uma tanga improvisada. Cobre sua "
+"modéstia, mas não muito mais."
 
 #: lang/json/ARMOR_from_json.py
 msgid "wool loincloth"
@@ -10857,8 +11509,8 @@ msgid ""
 "Bits of wool stitched together and tied into a makeshift loincloth.  Covers "
 "your modesty, but not much else."
 msgstr ""
-" Tanga de lãBotas de lã costuradas e amarradas em uma tangaimprovisada. "
-"Cobre sua modéstia, mas não muito mais."
+"Pedaços de lã costuradas e amarradas em uma tanga improvisada. Cobre sua "
+"modéstia, mas não muito mais."
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of extra long white gloves"
@@ -10869,7 +11521,7 @@ msgstr[1] ""
 #. ~ Description for pair of extra long white gloves
 #: lang/json/ARMOR_from_json.py
 msgid "Long white costume gloves."
-msgstr "par de luvas brancas extra longasLuvas de fantasia brancas compridas."
+msgstr "Luvas de fantasia, brancas e compridas."
 
 #: lang/json/ARMOR_from_json.py
 msgid "long underwear bottom"
@@ -10881,8 +11533,8 @@ msgstr[1] ""
 #: lang/json/ARMOR_from_json.py
 msgid "A pair of long underwear that help to maintain body temperature."
 msgstr ""
-" roupa íntima longa bottomUm par de roupas íntimas compridas que "
-"ajudamamanter a temperatura corporal."
+"Um par de roupas íntimas compridas que ajudam a manter a temperatura "
+"corporal."
 
 #: lang/json/ARMOR_from_json.py
 msgid "long underwear top"
@@ -10894,8 +11546,7 @@ msgstr[1] ""
 #: lang/json/ARMOR_from_json.py
 msgid "A long underwear top that helps to maintain body temperature."
 msgstr ""
-" roupa interior comprida topA roupa interior comprida que ajuda a "
-"manteratemperatura corporal."
+"Uma roupa interior comprida que ajuda a manter a temperatura corporal."
 
 #: lang/json/ARMOR_from_json.py
 msgid "sleeveless underwear top"
@@ -10917,7 +11568,7 @@ msgstr[1] ""
 #. ~ Description for long-sleeved shirt
 #: lang/json/ARMOR_from_json.py
 msgid "A long-sleeved cotton shirt."
-msgstr "camisa de manga compridaUma camisa de algodão de manga comprida."
+msgstr "Uma camisa de algodão de manga comprida."
 
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor body armor"
@@ -10931,8 +11582,8 @@ msgid ""
 "Lightweight, custom built body armor made from Kevlar and tough fabric.  "
 "Mostly waterproof."
 msgstr ""
-" armadura leve para o corpo do sobreviventeCarcaça leve feita sobmedidafeita"
-" de tecido Kevlar e resistente. Principalmente impermeável."
+"Uma armadura corporal leve feita sob medida de Kevlar e tecido resistente. "
+"Razoávelmente impermeável."
 
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor cargo pants"
@@ -10946,9 +11597,8 @@ msgid ""
 "Lightweight, Kevlar armored cargo pants designed to hold as much as "
 "possible.  Strong and mostly waterproof."
 msgstr ""
-" calças de carga leves para sobreviventes Calça leve de cargaKevlar, "
-"projetada para acomodar o máximo possível. Forte e principalmente "
-"àprovad&#39;água."
+"Calças leve de carga de Kevlar, projetadas para acomodar o máximo possível. "
+"Forte e razoavelmente à prova d'água."
 
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor suit"
@@ -10963,9 +11613,8 @@ msgid ""
 " vest and a reinforced fabric jumpsuit.  Protects from the elements as well "
 "as from harm."
 msgstr ""
-"Uma combinação de armadura leve, feita à mão, feita de um colete à prova de "
-"bala e um macacão de tecido reforçado. Protege dos elementos, bem como do "
-"dano."
+"Uma combinação de armadura leve, feita à mão com um colete à prova de bala e"
+" um macacão de tecido reforçado. Protege dos elementos, bem como do dano."
 
 #: lang/json/ARMOR_from_json.py
 msgid "French maid clothes"
@@ -11228,8 +11877,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "panties"
 msgid_plural "panties"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "calcinha"
+msgstr[1] "calcinhas"
 
 #. ~ Description for panties
 #: lang/json/ARMOR_from_json.py
@@ -11243,8 +11892,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "pants"
 msgid_plural "pants"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "calça"
+msgstr[1] "calças"
 
 #. ~ Description for pants
 #: lang/json/ARMOR_from_json.py
@@ -11254,8 +11903,8 @@ msgstr "Um par de calças cáqui. Um pouco mais quente que jeans."
 #: lang/json/ARMOR_from_json.py
 msgid "army pants"
 msgid_plural "army pants"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "calça de exército"
+msgstr[1] "calças de exército"
 
 #. ~ Description for army pants
 #: lang/json/ARMOR_from_json.py
@@ -11266,8 +11915,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "cargo pants"
 msgid_plural "cargo pants"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "calça de carga"
+msgstr[1] "calças de carga"
 
 #. ~ Description for cargo pants
 #: lang/json/ARMOR_from_json.py
@@ -11279,8 +11928,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "checkered pants"
 msgid_plural "checkered pants"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "calça xadrez"
+msgstr[1] "calças xadrez"
 
 #. ~ Description for checkered pants
 #: lang/json/ARMOR_from_json.py
@@ -11307,8 +11956,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "fur pants"
 msgid_plural "fur pants"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "calça de pele"
+msgstr[1] "calças de pele"
 
 #. ~ Description for fur pants
 #: lang/json/ARMOR_from_json.py
@@ -11318,8 +11967,8 @@ msgstr "calças de pele Um par robusto de calças forrada de pele."
 #: lang/json/ARMOR_from_json.py
 msgid "faux fur pants"
 msgid_plural "faux fur pantss"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "calça de pele artificial"
+msgstr[1] "calças de pele artificial"
 
 #. ~ Description for faux fur pants
 #: lang/json/ARMOR_from_json.py
@@ -11331,8 +11980,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "leather pants"
 msgid_plural "leather pants"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "calça de couro"
+msgstr[1] "calças de couro"
 
 #. ~ Description for leather pants
 #: lang/json/ARMOR_from_json.py
@@ -11346,8 +11995,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "ski pants"
 msgid_plural "ski pants"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "calça de esqui"
+msgstr[1] "calças de esqui"
 
 #. ~ Description for ski pants
 #: lang/json/ARMOR_from_json.py
@@ -11357,8 +12006,8 @@ msgstr "calça de esquiUm par de calças significou para esqui alpino."
 #: lang/json/ARMOR_from_json.py
 msgid "survivor cargo pants"
 msgid_plural "survivor cargo pants"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "calça de carga do sobrevivente"
+msgstr[1] "calças de carga do sobrevivente"
 
 #. ~ Description for survivor cargo pants
 #: lang/json/ARMOR_from_json.py
@@ -11452,8 +12101,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "polo shirt"
 msgid_plural "polo shirts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "camisa polo"
+msgstr[1] "camisas polo"
 
 #. ~ Description for polo shirt
 #: lang/json/ARMOR_from_json.py
@@ -11465,8 +12114,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "wool poncho"
 msgid_plural "wool ponchos"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "poncho de lã"
+msgstr[1] "ponchos de lã"
 
 #. ~ Description for wool poncho
 #: lang/json/ARMOR_from_json.py
@@ -11555,8 +12204,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "quiver"
 msgid_plural "quivers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "aljava"
+msgstr[1] "aljavas"
 
 #. ~ Description for quiver
 #: lang/json/ARMOR_from_json.py
@@ -11585,8 +12234,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "large quiver"
 msgid_plural "large quivers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "aljava grande"
+msgstr[1] "aljavas grandes"
 
 #. ~ Description for large quiver
 #: lang/json/ARMOR_from_json.py
@@ -11660,39 +12309,6 @@ msgstr ""
 " Bainha Uma bainha grande e ajustável para segurar espadas e "
 "outraslâminasgrandes. Ative para embainhar / sacar uma arma."
 
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr ""
-" terno de tubarãoUm terno de cota de malha de uma peça usadopormergulhadores"
-" para proteção contra picadas de tubarão. Ele vem comcapacetede plástico e "
-"botas."
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr ""
-" faraday shark suitUm terno de cota de malha de uma peça "
-"usadopormergulhadores para proteção contra picadas de tubarão. "
-"Foicondutivamenteinterligado, protegendo contra a eletricidade."
-
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
 msgid_plural "sheathes"
@@ -11738,8 +12354,8 @@ msgstr "camisa do xerifeUma camisa de botão bege com mangas compridas."
 #: lang/json/ARMOR_from_json.py
 msgid "shorts"
 msgid_plural "shorts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "shorts"
+msgstr[1] "shorts"
 
 #. ~ Description for shorts
 #: lang/json/ARMOR_from_json.py
@@ -11749,8 +12365,8 @@ msgstr "calções Um par de calções cáqui."
 #: lang/json/ARMOR_from_json.py
 msgid "cargo shorts"
 msgid_plural "cargo shorts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "shorts de carga"
+msgstr[1] "shorts de carga"
 
 #. ~ Description for cargo shorts
 #: lang/json/ARMOR_from_json.py
@@ -11762,8 +12378,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "denim shorts"
 msgid_plural "denim shorts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "bermuda jeans"
+msgstr[1] "bermudas jeans"
 
 #. ~ Description for denim shorts
 #: lang/json/ARMOR_from_json.py
@@ -11774,11 +12390,24 @@ msgstr ""
 " shorts jeans Um par de shorts jeans. Grosso e resistente, "
 "elesfornecemexcelente proteção contra cortes."
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] "camisa termal"
+msgstr[1] "camisas termais"
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "gravata skinny"
+msgstr[1] "gravatas skinny"
 
 #. ~ Description for skinny tie
 #: lang/json/ARMOR_from_json.py
@@ -11830,8 +12459,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "sleeping bag"
 msgid_plural "sleeping bags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "saco de dormir"
+msgstr[1] "sacos de dormir"
 
 #. ~ Use action menu_text for sleeping bag.
 #. ~ Use action menu_text for fur sleeping bag.
@@ -11852,8 +12481,8 @@ msgstr "Um saco de dormir grande que cobre da cabeça aos pés."
 #: lang/json/ARMOR_from_json.py
 msgid "rolled sleeping bag"
 msgid_plural "rolled sleeping bags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "saco de dormir enrolados"
+msgstr[1] "sacos de dormir enrolados"
 
 #. ~ Use action menu_text for rolled sleeping bag.
 #. ~ Use action menu_text for rolled fur sleeping bag.
@@ -11878,8 +12507,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "fur sleeping bag"
 msgid_plural "fur sleeping bags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "saco de dormir de pele"
+msgstr[1] "sacos de dormir de pele"
 
 #. ~ Use action msg for fur sleeping bag.
 #: lang/json/ARMOR_from_json.py
@@ -11897,8 +12526,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "rolled fur sleeping bag"
 msgid_plural "rolled fur sleeping bags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "saco de dormir de pele enrolado"
+msgstr[1] "sacos de dormir de pele enrolados"
 
 #. ~ Use action msg for rolled fur sleeping bag.
 #: lang/json/ARMOR_from_json.py
@@ -12296,13 +12925,9 @@ msgstr[1] ""
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
 msgstr ""
-" terno de sujeitoA um terno de uma peça fina, de manga curta e "
-"depernascurtas. A julgar pelos estranhos pontos de ajuste e alfaiataria "
-"...talvezvocê não queira saber quem usou. Fornece armazenamento nominal e "
-"nãoémuito oneroso."
 
 #: lang/json/ARMOR_from_json.py
 msgid "suit"
@@ -12385,6 +13010,7 @@ msgstr[1] ""
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "Lâmina de sobrevivente"
@@ -12790,8 +13416,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "tricorne"
 msgid_plural "tricornes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "tricorne"
+msgstr[1] "tricornes"
 
 #. ~ Description for tricorne
 #: lang/json/ARMOR_from_json.py
@@ -12808,22 +13434,11 @@ msgstr ""
 "aágua. Se você é o \"guvnah\" de um assentamento, ou o capitão de uma "
 "equipepós-apocalíptico, este é o chapéu para você."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "par de calções de banho Um par de calções de banho, com rede."
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "camiseta"
+msgstr[1] "camisetas"
 
 #. ~ Description for t-shirt
 #. ~ Description for tour t-shirt
@@ -12842,8 +13457,8 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "tour t-shirt"
 msgid_plural "tour t-shirts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "camiseta de tour"
+msgstr[1] "camisetas de tour"
 
 #: lang/json/ARMOR_from_json.py
 msgid ""
@@ -13097,61 +13712,6 @@ msgstr ""
 " coleteColete elegante. Ideal para aquelas ocasiões em que vestindoapenasuma"
 " camisa seria muito casual e um terno seria apenas exagerar."
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "wetsuitUm fato de neoprene de corpo inteiro."
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr ""
-" par de luvas de nataçãoUm par de luvas de borracha de neopreno- "
-"siliconemuito flexíveis, adequadas para uso subaquático."
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr ""
-" capuz de neoprene Um capuz de neoprene, comumente usado por mergulhadores."
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr ""
-" Fato de moletom de moletom de mangas compridas com detalhes em cor "
-"rosaeconstrução que acentua o decote e acentua o quadril. Não é "
-"tãoprotetorquanto um traje de corpo inteiro, mas também menos restritivo."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -13520,6 +14080,35 @@ msgstr ""
 " lona de plástico com vários ilhós para prendê-lo com corda ou cabo.Útilpara"
 " proteção contra chuva improvisada."
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -16490,6 +17079,163 @@ msgstr ""
 "armaduras da DoubleTech, os sistemas de controle e regulação do clima exigem"
 " contato direto com a pele."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "par de calções de banho Um par de calções de banho, com rede."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "wetsuitUm fato de neoprene de corpo inteiro."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr ""
+" capuz de neoprene Um capuz de neoprene, comumente usado por mergulhadores."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr ""
+" capa de wetsuit survivorUm neoprene blindado personalizado e capuzKevlar, "
+"muito forte e durável."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr ""
+" roupa de mergulho para sobreviventesUma combinação de armadura leve, "
+"feitaàmão, feita de um colete à prova de balas e um fato de "
+"neoprenereforçado. Protege dos elementos, bem como do dano."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr ""
+" um par de luvas de neoprene para sobreviventesUm par de luvas "
+"deneopreneKevlar blindadas personalizadas, modificadas para serem fáceis "
+"deusar, proporcionando proteção máxima sob condições extremas."
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr ""
+" Fato de moletom de moletom de mangas compridas com detalhes em cor "
+"rosaeconstrução que acentua o decote e acentua o quadril. Não é "
+"tãoprotetorquanto um traje de corpo inteiro, mas também menos restritivo."
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+" faraday shark suitUm terno de cota de malha de uma peça "
+"usadopormergulhadores para proteção contra picadas de tubarão. "
+"Foicondutivamenteinterligado, protegendo contra a eletricidade."
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr ""
+" terno de tubarãoUm terno de cota de malha de uma peça usadopormergulhadores"
+" para proteção contra picadas de tubarão. Ele vem comcapacetede plástico e "
+"botas."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "Um par de óculos de natação feitos para nadar."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr ""
+" par de luvas de nataçãoUm par de luvas de borracha de neopreno- "
+"siliconemuito flexíveis, adequadas para uso subaquático."
+
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
 msgid_plural "helmet nettings"
@@ -17110,6 +17856,57 @@ msgid_plural "shotgun bandoliers"
 msgstr[0] "bandoleira de escopeta"
 msgstr[1] "bandoleiras de escopeta"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] "cinto de ferramentas do Tecnomante"
+msgstr[1] "cintos de ferramentas do Tecnomante"
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr ""
+"Um cinto de utilidades customizado, feito de couro, que instantaneamente "
+"cria qualquer ferramenta que você requisite. Ative para sacar ou guardar uma"
+" arma."
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] "botas de sete léguas"
+msgstr[1] "pares de botas de sete léguas"
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -17132,7 +17929,7 @@ msgstr[1] ""
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
 msgstr ""
 
@@ -17331,6 +18128,24 @@ msgid ""
 "minimize encumbrance."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -17885,9 +18700,9 @@ msgstr[1] ""
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -17897,8 +18712,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -17970,10 +18784,10 @@ msgstr[1] ""
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -18339,7 +19153,7 @@ msgstr[1] ""
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
 
@@ -18898,8 +19712,7 @@ msgstr[1] ""
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
@@ -19534,8 +20347,8 @@ msgstr[1] ""
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
-msgstr "Para servir o homem ... é um livro de receitas!"
+msgid "It's… it's a cookbook!"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Cucina Italiana"
@@ -19645,12 +20458,8 @@ msgstr[1] ""
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
+"\"APPROVED\"…"
 msgstr ""
-" PE050 \"Alfa \": Relatório Preliminar Esse maço de papéis - datado "
-"deduassemanas antes de tudo isso começar - descreve alguma nova "
-"fórmulaquímica eseus efeitos sobre os seres humanos. É carimbado \"APROVADO "
-"\" ..."
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Dionne"
@@ -19680,8 +20489,8 @@ msgstr[1] ""
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -19695,12 +20504,8 @@ msgstr[1] ""
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
+"look promising but the procurement methods seem awfully vague…"
 msgstr ""
-" Este diário de equipe detalha diversas variedades "
-"deexperimentosmutagênicos, concentrando-se naqueles derivados de "
-"carnecontaminada comXE037. Os resultados parecem promissores, mas os métodos"
-" deaquisiçãoparecem muito vagos ..."
 
 #: lang/json/BOOK_from_json.py
 msgid "standpipe maintenance log"
@@ -19713,12 +20518,8 @@ msgstr[1] ""
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
+"with… a chemical formula?"
 msgstr ""
-" log de manutenção do tubo vertical Este encadernador detalha "
-"amanutençãoprogramada para vários sistemas de encanamento em toda "
-"ainstalação. Noentanto, algumas das folhas de registro parecem "
-"serpreenchidas com ... umafórmula química?"
 
 #: lang/json/BOOK_from_json.py
 msgid "chemical reference-CLASSIFIED"
@@ -19770,11 +20571,8 @@ msgstr[1] ""
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
 msgstr ""
-" PE023 \"Medical \": Aplicação e Descobertas Este fichário "
-"dedocumentosaltamente técnicos descreve algumas novas fórmulas químicas "
-"eseus efeitosem seres humanos. É carimbado \"APROVADO \" ...."
 
 #: lang/json/BOOK_from_json.py
 msgid "PE070 \"Raptor\": Proposal"
@@ -20103,12 +20901,8 @@ msgstr[1] ""
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
+"symbols you've not seen before…"
 msgstr ""
-" jornal de laboratório-HerreraEste fichário pesado contém uma "
-"infinidadedediagramas e especificações técnicas para vários "
-"materiaiseletrônicos. Alguns dos diagramas usam símbolos que você não viu "
-"antes ..."
 
 #: lang/json/BOOK_from_json.py
 msgid "2XI design binder-CLASSIFIED"
@@ -20186,13 +20980,13 @@ msgstr[1] ""
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -20551,13 +21345,9 @@ msgstr[1] ""
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
 msgstr ""
-" The Handloader&#39;s HelperTudo que você poderia querer saber "
-"sobrecarregarmunição, selado com uma ... capa para crianças. Aparentemente, "
-"umacoisa deresponsabilidade, porque o capítulo sobre rodadas explosivas "
-"oscobre emdetalhes excelentes também."
 
 #: lang/json/BOOK_from_json.py
 msgid "Rivtech design binder"
@@ -21145,7 +21935,7 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -22574,6 +23364,34 @@ msgid ""
 " that the author's real name is Fereidoun M. Esfandiary."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
 msgid_plural "phone books"
@@ -22657,8 +23475,8 @@ msgstr[1] ""
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
-msgstr "Se você soubesse o que procurar, algo poderia se destacar..."
+msgid "If you knew what to look for something might stand out…"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "patient treatment records"
@@ -22910,6 +23728,106 @@ msgstr ""
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -23977,11 +24895,12 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -23992,28 +24911,61 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
 "along with emulating their healing factor."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -24533,11 +25485,9 @@ msgstr "acetileno"
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr ""
-"Um gás inflamável que explode sob pressão. Combinado com oxigênio, acetileno"
-" gera um ótimo gás de soldagem."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Spice"
@@ -25566,6 +26516,41 @@ msgid "The stomach of a large humanoid creature.  It is surprisingly durable."
 msgstr ""
 " O estômago de uma grande criatura humanóide. É surpreendentemente durável."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr ""
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr ""
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -25615,6 +26600,61 @@ msgstr ""
 " pedaço de carneEste é um pequeno pedaço de carne comestível. Não émuito, "
 "mas vai ser fácil."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr ""
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr ""
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -25653,6 +26693,24 @@ msgid_plural "cooked scraps of meat"
 msgstr[0] ""
 msgstr[1] ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr ""
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "sucata cozida de miudezas"
@@ -25887,9 +26945,8 @@ msgstr[1] "cérebros crus"
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
 msgstr ""
-" Cérebros crusO cérebro de um animal. Você não gostaria de comer isso cru..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cooked brains"
@@ -25948,8 +27005,8 @@ msgstr "bolinho cozido"
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
-msgstr "Normalmente uma delicadeza, precisa de um pouco ... alguma coisa."
+msgid "Normally a delicacy, it needs a little… something."
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bone"
@@ -26009,6 +27066,78 @@ msgstr ""
 "Elepermanecerácomestível por muito tempo e pode ser usado como ingrediente "
 "emmuitosalimentos e projetos."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr ""
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr ""
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr ""
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr ""
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
 msgid_plural "chunks of tainted meat"
@@ -26048,8 +27177,8 @@ msgid ""
 "A watery yellow glob of fat from some unnatural creature or other.  You "
 "could eat it, but it will poison you."
 msgstr ""
-" Um gotejamento amarelo de gordura de alguma criatura não natural ououtra. "
-"Você pode comê-lo, mas vai envenená-lo."
+" Um bloco úmido e amarelo de gordura de alguma criatura não natural. Você "
+"pode comê-lo, mas vai envenená-lo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "tainted tallow"
@@ -26062,13 +27191,13 @@ msgid ""
 "'fresh' for a very long time, and can be used as an ingredient in many "
 "projects.  You could eat it, but it will poison you."
 msgstr ""
-" Um bloco acinzentado suave de gordura de monstro limpa e renderizada. "
-"Elepermanecerá\"fresco\" por muito tempo e pode ser usado como "
-"umingredienteem muitos projetos. Você pode comê-lo, mas vai envenená-lo."
+"Um bloco acinzentado suave de gordura de monstro limpa e filtrada. Ele "
+"permanecerá \"fresco\" por muito tempo e pode ser usado como um ingrediente "
+"em muitos projetos. Você pode comê-lo, mas vai envenená-lo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "large boiled stomach"
-msgstr "estômago grande e cozido"
+msgstr "estômago grande cozido"
 
 #. ~ Description for large boiled stomach
 #: lang/json/COMESTIBLE_from_json.py
@@ -26087,8 +27216,8 @@ msgid ""
 "A boiled stomach from a large humanoid creature, nothing else.  It looks all"
 " but appetizing."
 msgstr ""
-" Um estômago fervido de uma grande criatura humanóide, nada mais. "
-"Parecetudo, menos apetitoso."
+" Um estômago fervido de uma grande criatura humanóide, nada mais. Parece "
+"tudo, menos apetitoso."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "boiled stomach"
@@ -26100,8 +27229,8 @@ msgid ""
 "A small boiled stomach from an animal, nothing else.  It looks all but "
 "appetizing."
 msgstr ""
-" Um pequeno estômago cozido de um animal, nada mais. Parece tudo, "
-"menosapetitoso."
+" Um pequeno estômago cozido de um animal, nada mais. Parece tudo, menos "
+"apetitoso."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "boiled human stomach"
@@ -26113,8 +27242,8 @@ msgid ""
 "A small boiled stomach from a human, nothing else.  It looks all but "
 "appetizing."
 msgstr ""
-" Um pequeno estômago cozido de um humano, nada mais. Parece tudo, "
-"menosapetitoso."
+" Um pequeno estômago cozido de um humano, nada mais. Parece tudo, menos "
+"apetitoso."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw hide"
@@ -26126,9 +27255,9 @@ msgid ""
 "A carefully folded raw skin harvested from an animal.  You can cure it for "
 "storage and tanning, or eat it if you're desperate enough."
 msgstr ""
-" Uma pele crua cuidadosamente dobrada colhida de um animal. Você pode curá- "
-"lo para armazenamento e bronzeamento, ou comê-lo, se estiver "
-"desesperadoosuficiente."
+"Uma pele crua cuidadosamente dobrada, colhida de um animal. Você pode curá-"
+"la para armazenamento e curtição, ou comê-la, se estiver desesperado o "
+"suficiente."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "tainted hide"
@@ -26140,8 +27269,8 @@ msgid ""
 "A carefully folded poisonous raw skin harvested from an unnatural creature."
 "  You can cure it for storage and tanning."
 msgstr ""
-" Uma pele crua venenosa cuidadosamente dobrada, colhida de uma "
-"criaturanãonatural. Você pode curá-lo para armazenamento e bronzeamento."
+"Uma pele crua venenosa cuidadosamente dobrada, colhida de uma criatura não "
+"natural. Você pode curá-la para armazenamento e curtição."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw human skin"
@@ -26153,13 +27282,13 @@ msgid ""
 "A carefully folded raw skin harvested from a human.  You can cure it for "
 "storage and tanning, or eat it if you're desperate enough."
 msgstr ""
-" Uma pele crua cuidadosamente dobrada colhida de um ser humano. "
-"Vocêpodecurá-lo para armazenamento e bronzeamento, ou comê-lo, "
-"seestiverdesesperado o suficiente."
+"Uma pele crua cuidadosamente dobrada, colhida de um ser humano. Você pode "
+"curá-la para armazenamento e curtição, ou comê-la, se estiver desesperado o "
+"suficiente."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw pelt"
-msgstr "pele crua"
+msgstr "pelagem crua"
 
 #. ~ Description for raw pelt
 #: lang/json/COMESTIBLE_from_json.py
@@ -26168,13 +27297,13 @@ msgid ""
 "has the fur attached.  You can cure it for storage and tanning, or eat it if"
 " you're desperate enough."
 msgstr ""
-" Uma pele crua cuidadosamente dobrada colhida de um animal com pele. "
-"Aindatem a pele presa. Você pode curá-lo para armazenamento e bronzeamento, "
-"oucomê- lo, se estiver desesperado o suficiente."
+"Uma pele crua cuidadosamente dobrada, colhida de um animal com pelos. Ainda "
+"tem os pelos presos. Você pode curá-la para armazenamento e curtição, ou "
+"comê-la, se estiver desesperado o suficiente."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "tainted pelt"
-msgstr "pele contaminada"
+msgstr "pelagem contaminada"
 
 #. ~ Description for tainted pelt
 #: lang/json/COMESTIBLE_from_json.py
@@ -26183,13 +27312,13 @@ msgid ""
 "  It still has the fur attached and is poisonous.  You can cure it for "
 "storage and tanning."
 msgstr ""
-" Uma pele crua cuidadosamente dobrada, colhida de uma criatura nãonatural. "
-"Ainda tem a pele presa e é venenosa. Você pode curá-lo paraarmazenamento "
-"ebronzeamento."
+"Uma pelagem crua cuidadosamente dobrada, colhida de uma criatura não "
+"natural. Ainda tem os pelos presos e é venenosa. Você pode curá-la para "
+"armazenamento e curtição."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "seeping heart"
-msgstr ""
+msgstr "coração gotejante"
 
 #. ~ Description for seeping heart
 #: lang/json/COMESTIBLE_from_json.py
@@ -26197,6 +27326,8 @@ msgid ""
 "A thick mass of flesh superficially resembling a mammalian heart, covered in"
 " dimpled grooves and the size of your fist."
 msgstr ""
+"Uma grossa massa de carne superficialmente lembrando um coração de mamífero,"
+" coberta de covas e do tamanho de seu punho."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "putrid heart"
@@ -26209,14 +27340,8 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
-" Uma massa espessa de carne, superficialmente parecida com um "
-"coraçãodemamífero, coberta de ranhuras estriadas e facilmente do tamanho "
-"desuacabeça. Ainda está cheio de, er, o que passa por sangue em jabberwocks,"
-" e épesado em suas mãos. Depois de tudo o que você viu ultimamente, você não"
-" pode deixar de lembrar os velhos ditos sobre comer os corações "
-"deseusinimigos ..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "desiccated putrid heart"
@@ -26229,11 +27354,11 @@ msgid ""
 "sliced open and drained of blood.  It could be eaten if you're hungry, but "
 "looks *disgusting*."
 msgstr ""
-" Uma enorme faixa de músculo - tudo o que resta de um coração pútrido "
-"quefoicortado e drenado de sangue. Pode ser comido se estiver com fome, "
-"masparece* nojento *."
+"Uma enorme faixa de músculo - tudo o que resta de um coração pútrido que foi"
+" cortado e drenado de sangue. Pode ser comido se estiver com fome, mas "
+"parece *nojento*."
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] "leite cru"
@@ -26255,8 +27380,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid "shelf stable milk"
 msgid_plural "shelf stable milk"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "leite estabilizado"
+msgstr[1] "leite estabilizado"
 
 #. ~ Description for shelf stable milk
 #: lang/json/COMESTIBLE_from_json.py
@@ -26269,8 +27394,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid "evaporated milk"
 msgid_plural "evaporated milk"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "leite evaporado"
+msgstr[1] "leite evaporado"
 
 #. ~ Description for evaporated milk
 #: lang/json/COMESTIBLE_from_json.py
@@ -26333,7 +27458,7 @@ msgstr "pudim"
 #. ~ Description for pudding
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sugary, fermented dairy.  A wonderful treat."
-msgstr "Laticínios fermentados e açucarados. Um deleite maravilhoso."
+msgstr "Laticínio fermentado e açucarado. Um deleite maravilhoso."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "curdled milk"
@@ -26345,8 +27470,8 @@ msgid ""
 "Milk that has been curdled with vinegar and rennet.  It still needs to be "
 "salted and drained of whey."
 msgstr ""
-" Leite que foi coalhado com vinagre e coalho. Ainda precisa ser "
-"salgadoedrenado de soro."
+"Leite que foi coalhado com vinagre e coalheira. Ainda precisa ser salgado e "
+"drenado de soro."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "hard cheese"
@@ -26360,8 +27485,8 @@ msgid ""
 "Hard, dry cheese made to last, unlike modern processed cheese.  Will make "
 "you thirsty though."
 msgstr ""
-" queijo duro, queijo seco feito para durar, ao contrário do "
-"queijoprocessadomoderno. Vai fazer você com sede embora."
+"Queijo duro e seco feito para durar, ao contrário do queijo processado "
+"moderno. Vai deixar você com sede, entretanto."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cheese"
@@ -26372,11 +27497,11 @@ msgstr[1] "queijos"
 #. ~ Description for cheese
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A block of yellow processed cheese."
-msgstr "queijoUm bloco de queijo processado amarelo."
+msgstr "Um bloco de queijo processado amarelo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "quesadilla"
-msgstr "Quesadilla"
+msgstr "quesadilla"
 
 #. ~ Description for quesadilla
 #: lang/json/COMESTIBLE_from_json.py
@@ -26386,15 +27511,13 @@ msgstr "Uma tortilla recheada com queijo e levemente grelhada."
 #: lang/json/COMESTIBLE_from_json.py
 msgid "powdered milk"
 msgid_plural "powdered milk"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "leite em pó"
+msgstr[1] "leite em pó"
 
 #. ~ Description for powdered milk
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Dehydrated milk powder.  Mix with water to make drinkable milk."
-msgstr ""
-" Leite em pó Leite em pó desidratado. Misture com água para "
-"fazerleitebebível."
+msgstr "Leite em pó desidratado. Misture com água para fazer leite bebível."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "condensed milk"
@@ -26408,8 +27531,8 @@ msgid ""
 "Cow's milk that has been partly dehydrated to vastly increase its shelf "
 "life, and also sweetened."
 msgstr ""
-" Leite condensado Leite da vaca parcialmente desidratado "
-"paraaumentarconsideravelmente o prazo de validade e também adoçado."
+"Leite de vaca parcialmente desidratado para aumentar consideravelmente o "
+"prazo de validade, e também adoçado."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "apple cider"
@@ -26420,8 +27543,7 @@ msgstr[1] "cidra de maçã"
 #. ~ Description for apple cider
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Pressed from fresh apples.  Tasty and nutritious."
-msgstr ""
-" cidreira de maçã Pressionado a partir de maçãs frescas. Saborosaenutritiva."
+msgstr "Pressionado a partir de maçãs frescas. Saborosa e nutritiva."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "almond milk"
@@ -26448,8 +27570,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid "atomic coffee"
 msgid_plural "atomic coffee"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "café atômico"
+msgstr[1] "cafés atômicos"
 
 #. ~ Description for atomic coffee
 #: lang/json/COMESTIBLE_from_json.py
@@ -26458,16 +27580,15 @@ msgid ""
 "NUCLEAR brewing cycle.  Every possible microgram of caffeine and flavor has "
 "been carefully extracted for your enjoyment, using the power of the atom."
 msgstr ""
-" café atômicoEsta porção de café foi criada usando o ciclo de "
-"fabricaçãodeFULL NUCLEAR de um pote de café atômico. Cada micrograma "
-"possíveldecafeína e sabor foi cuidadosamente extraído para sua diversão, "
-"usandoo poder do átomo."
+"Esta porção de café foi criada usando o ciclo de fervura NUCLEAR TOTAL de "
+"uma cafeteira atômica. Cada micrograma possível de cafeína e sabor foi "
+"cuidadosamente extraído para o seu deleite, usando o poder do átomo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bee balm tea"
 msgid_plural "bee balm tea"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "chá de bálsamo de abelha"
+msgstr[1] "chás de bálsamo de abelha"
 
 #. ~ Description for bee balm tea
 #: lang/json/COMESTIBLE_from_json.py
@@ -26475,9 +27596,9 @@ msgid ""
 "A healthy beverage made from bee balm steeped in boiling water.  Can be used"
 " to reduce negative effects of common cold or flu."
 msgstr ""
-" chá de bálsamo de abelha Uma bebida saudável feita de bálsamo "
-"deabelhamergulhada em água fervente. Pode ser usado para reduzir "
-"osefeitosnegativos do resfriado comum ou gripe."
+"Uma bebida saudável feita de bálsamo de abelha mergulhado em água fervente. "
+"Pode ser usado para reduzir os efeitos negativos do resfriado comum ou da "
+"gripe."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "coconut milk"
@@ -26491,13 +27612,13 @@ msgstr "Um molho cremoso denso e doce, usado frequentemente em caril."
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chai tea"
 msgid_plural "chai tea"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "masala chai"
+msgstr[1] "masala chai"
 
 #. ~ Description for chai tea
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A traditional south Asian mixed-spice tea with milk."
-msgstr "chai teaUm chá tradicional de especiarias asiáticas do sul com leite."
+msgstr "Um chá de especiarias com leite, tradicional do sul da Ásia."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chamomile tea"
@@ -26524,9 +27645,8 @@ msgid ""
 "A chocolate flavored beverage made of artificial flavoring and milk "
 "byproducts.  Shelf stable and vaguely appetizing even when lukewarm."
 msgstr ""
-" Uma bebida com sabor de chocolate feita de aroma artificial e "
-"derivadosdeleite. Prateleira estável e vagamente apetitosa mesmo quando "
-"morna."
+"Uma bebida com sabor de chocolate feita de aroma artificial e derivados de "
+"leite. Dura um bom tempo e é vagamente apetitosa mesmo quando morna."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "coffee"
@@ -26541,10 +27661,10 @@ msgid ""
 "cherries through a complex process of seed removal, roasting, grinding, and "
 "brewing.  Coffee is substantially richer in caffeine than its rival tea."
 msgstr ""
-" O ritual da manhã do mundo pré-apocalíptico, criado a partir de "
-"cerejasdecafé através de um processo complexo de remoção de sementes, "
-"torrefação, moagem e fabricação de cerveja. O café é substancialmente "
-"maisrico emcafeína que seu chá rival."
+"O ritual da manhã do mundo pré-apocalíptico, criado a partir de frutos de "
+"café através de um processo complexo de remoção de sementes, torrefação, "
+"moagem e fervura. O café é substancialmente mais rico em cafeína do que seu "
+"rival, o chá."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "coffee substitute"
@@ -26569,13 +27689,13 @@ msgstr[1] "infusões de chicória"
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "dark cola"
-msgstr "cola escura"
+msgstr "refrigerante escuro de cola"
 
 #. ~ Description for dark cola
 #: lang/json/COMESTIBLE_from_json.py
@@ -26584,7 +27704,7 @@ msgstr "As coisas vão melhor com cola. Água de açúcar com cafeína adicionad
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "energy cola"
-msgstr "cola de energia"
+msgstr "energético de cola"
 
 #. ~ Description for energy cola
 #: lang/json/COMESTIBLE_from_json.py
@@ -26592,8 +27712,8 @@ msgid ""
 "It tastes and looks like windshield wiper fluid, but it's loaded to the brim"
 " with sugar and caffeine."
 msgstr ""
-" Tem gosto e se parece com fluido limpador de pára-brisa, mas é "
-"carregadoatéa borda com açúcar e cafeína."
+"Tem gosto e se parece com fluido limpador de pára-brisa, mas é carregado até"
+" a borda com açúcar e cafeína."
 
 #. ~ Description for condensed milk
 #: lang/json/COMESTIBLE_from_json.py
@@ -26611,11 +27731,11 @@ msgstr "refrigerante de creme"
 #. ~ Description for cream soda
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A caffeinated, carbonated drink, flavored with vanilla."
-msgstr "Uma bebida com cafeína e carbonatada, aromatizada com baunilha."
+msgstr "Uma bebida carbonatada com cafeína, aromatizada com baunilha."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cranberry juice"
-msgstr "Suco de oxicoco"
+msgstr "suco de oxicoco"
 
 #. ~ Description for cranberry juice
 #: lang/json/COMESTIBLE_from_json.py
@@ -26638,15 +27758,15 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid "dandelion tea"
 msgid_plural "dandelion tea"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "chá de dente-de-leão"
+msgstr[1] "chás de dente-de-leão"
 
 #. ~ Description for dandelion tea
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A healthy beverage made from dandelion roots steeped in boiling water."
 msgstr ""
-" dandelion teaUma bebida saudável feita a partir de raízes de dente "
-"deleãomergulhada em água fervente."
+"Uma bebida saudável feita a partir de raízes de dente-de-leão mergulhadas em"
+" água fervente."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "eggnog"
@@ -26659,9 +27779,9 @@ msgid ""
 "popular traditional holiday drink.  While often spiked, it is still "
 "delicious on its own.  Meant to be stored cold, it will spoil rapidly."
 msgstr ""
-" Suave e rica, esta mistura de leite, creme e ovos é uma bebida "
-"tradicionalepopular. Embora muitas vezes, ele ainda é delicioso por "
-"contaprópria. Significa ser armazenado frio, vai estragar rapidamente."
+"Suave e rica, esta mistura de leite, creme e ovos é uma bebida tradicional e"
+" popular. Embora muitas vezes consumida com álcool, ainda é deliciosa por "
+"conta própria. Deve ser armazenada fria, e vai estragar rapidamente."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "energy drink"
@@ -26673,8 +27793,8 @@ msgid ""
 "A heavily caffeinated soft drink.  Energy drinks are popular among those who"
 " need to stay up late working."
 msgstr ""
-" Um refrigerante fortemente cafeinado. Bebidas energéticas sãopopularesentre"
-" aqueles que precisam ficar acordados até tarde trabalhando."
+"Um refrigerante fortemente cafeinado. Bebidas energéticas são populares "
+"entre aqueles que precisam ficar acordados até tarde trabalhando."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "atomic energy drink"
@@ -26688,10 +27808,10 @@ msgid ""
 " consumer UNCOMFORTABLY ENERGETIC using ELECTROLYTES and THE POWER OF THE "
 "ATOM."
 msgstr ""
-" De acordo com o rótulo, esta bebida de gosto repugnante é chamada "
-"deATOMICPOWER THIRST. Juntamente com a longa advertência de saúde, "
-"elaprometetornar o consumidor INTEGRADAMENTE ENERGÉTICO usando ELETRÓLITOS e"
-" OPODERDO ATOM."
+"De acordo com o rótulo, esta bebida de gosto repugnante é chamada de SEDE "
+"ATÔMICA POWER. Juntamente com a longa advertência de saúde, ela promete "
+"tornar o consumidor EXAGERADAMENTE ENERGÉTICO usando ELETRÓLITOS e O PODER "
+"DO ÁTOMO."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "herbal tea"
@@ -26702,8 +27822,7 @@ msgstr[1] "chás de ervas"
 #. ~ Description for herbal tea
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A healthy beverage made from herbs steeped in boiling water."
-msgstr ""
-" herbal teaA bebida saudável feita de ervas mergulhada em água fervente."
+msgstr "Uma bebida saudável feita de ervas mergulhadas em água fervente."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "hot chocolate"
@@ -26717,8 +27836,7 @@ msgid ""
 "Also known as hot cocoa, this heated chocolate beverage is perfect for a "
 "cold winter day."
 msgstr ""
-" chocolate quenteTambém conhecido como chocolate quente, esta "
-"bebidadechocolate aquecida é perfeita para um dia frio de inverno."
+"Esta bebida de chocolate derretido é perfeita para um dia frio de inverno."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "fruit juice"
@@ -26727,17 +27845,17 @@ msgstr "suco de fruta"
 #. ~ Description for fruit juice
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Freshly-squeezed from real fruit!  Tasty and nutritious."
-msgstr "Recém-espremido de fruta real! Saborosa e nutritiva."
+msgstr "Recém-espremido de frutas reais! Saboroso e nutritivo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "kompot"
-msgstr "compota"
+msgstr "kompot"
 
 #. ~ Description for kompot
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Clear juice obtained by cooking fruit in a large volume of water."
 msgstr ""
-"Suco claro obtido por cozimento de frutas em um grande volume de água."
+"Suco claro obtido pelo cozimento de frutas em um grande volume de água."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade"
@@ -26751,8 +27869,8 @@ msgid ""
 "Lemon juice mixed with water and sugar to dull the sourness.  Delicious and "
 "refreshing."
 msgstr ""
-" limonadaLemon suco misturado com água e açúcar para amenizar aacidez. "
-"Delicioso e refrescante."
+"Suco de limão misturado com água e açúcar para amenizar a acidez. Delicioso "
+"e refrescante."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemon-lime soda"
@@ -26764,9 +27882,8 @@ msgid ""
 "Unlike cola this is caffeine free, however it is still carbonated and has "
 "plenty of sugar.  Not to mention a lemon-lime taste."
 msgstr ""
-" Ao contrário de cola, esta é livre de cafeína, no entanto, "
-"aindaégaseificada e tem muito açúcar. Para não mencionar um sabor de "
-"limãoelima."
+"Ao contrário de cola, esta é livre de cafeína, no entanto, ainda é "
+"gaseificada e tem muito açúcar. Para não mencionar um sabor de limão e lima."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Mexican hot chocolate"
@@ -26780,9 +27897,8 @@ msgid ""
 "This semi-bitter chocolate drink made from cocoa, cinnamon, and chilies, "
 "traces its history to the Maya and Aztecs.  Perfect for a cold winter day."
 msgstr ""
-" Chocolate quente mexicano Esta bebida de chocolate semi-amargo "
-"feitodecacau, canela e pimenta, traça sua história para os maias eastecas. "
-"Perfeito para um dia frio de inverno."
+"Esta bebida de chocolate semi-amargo feito de cacau, canela e pimenta, traça"
+" sua história até os maias e astecas. Perfeita para um dia frio de inverno."
 
 #: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "milk"
@@ -26794,8 +27910,8 @@ msgstr[1] "leite"
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Baby cow food, appropriated for adult humans.  Spoils rapidly."
 msgstr ""
-" alimento de vaca milkBaby, apropriado para humanos adultos. "
-"Estragarapidamente."
+"Alimento de vacas filhotes, apropriado para humanos adultos. Estraga "
+"rapidamente."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "reconstituted milk"
@@ -26812,7 +27928,7 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "coffee milk"
-msgstr "café com leite"
+msgstr "leite de café"
 
 #. ~ Description for coffee milk
 #: lang/json/COMESTIBLE_from_json.py
@@ -26820,12 +27936,12 @@ msgid ""
 "Coffee syrup mixed into milk.  It's been the state drink of Rhode Island "
 "since 1993."
 msgstr ""
-" Xarope de café misturado com leite. Tem sido a bebida do estado "
-"deRhodeIsland desde 1993."
+"Xarope de café misturado com leite. Tem sido a bebida do estado de Rhode "
+"Island desde 1993."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "milk tea"
-msgstr "Chã com leite"
+msgstr "chá com leite"
 
 #. ~ Description for milk tea
 #: lang/json/COMESTIBLE_from_json.py
@@ -26851,14 +27967,14 @@ msgid ""
 "Unlike cola this is caffeine free, however it is still carbonated, sweet, "
 "and tastes vaguely orange-like."
 msgstr ""
-" Ao contrário de cola, esta é livre de cafeína, no entanto, "
-"aindaégaseificada, doce e tem um gosto ligeiramente semelhante a laranja."
+"Ao contrário da cola, isto é livre de cafeína, no entanto, ainda é "
+"gaseificado, doce e tem um gosto ligeiramente semelhante a laranja."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "pine needle tea"
 msgid_plural "pine needle tea"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "chá de folhas de pinheiro"
+msgstr[1] "chás de folhas de pinheiro"
 
 #. ~ Description for pine needle tea
 #: lang/json/COMESTIBLE_from_json.py
@@ -26866,8 +27982,8 @@ msgid ""
 "A fragrant and healthy beverage made from pine needles steeped in boiling "
 "water."
 msgstr ""
-" Uma agulha perfumada e saudável feita a partir de agulhas "
-"depinheiromergulhadas em água fervente."
+"Uma bebida perfumada e saudável feita a partir de agulhas de pinheiro "
+"mergulhadas em água fervente."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "grape drink"
@@ -26880,9 +27996,8 @@ msgid ""
 " you want something that tastes like fruit, but still don't care about your "
 "health."
 msgstr ""
-" Uma bebida de origem artificial com sabor a uva produzida em massa. "
-"Bomparaquando você quer algo que gosto de frutas, mas ainda não se "
-"preocupamcomsua saúde."
+"Uma bebida industrializada com sabor de uva. Bom para quando você quer algo "
+"que tenha gosto de frutas, mas ainda não se preocupa com sua saúde."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "root beer"
@@ -26893,7 +28008,7 @@ msgstr[1] ""
 #. ~ Description for root beer
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Like cola, but without caffeine.  Still not that healthy."
-msgstr "cerveja de raiz, mas sem cafeína. Ainda não é tão saudável."
+msgstr "Como refrigerante de cola, mas sem cafeína. Ainda não é saudável."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "spezi"
@@ -26905,8 +28020,8 @@ msgid ""
 "Originating in Germany almost a century ago, this mix of cola and orange "
 "soda tastes great."
 msgstr ""
-" Originada na Alemanha há quase um século, essa mistura de "
-"refrigerantedecola e laranja tem um ótimo sabor."
+"Originada na Alemanha há quase um século, essa mistura de refrigerante de "
+"cola e laranja tem um ótimo sabor."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "sports drink"
@@ -27550,11 +28665,12 @@ msgstr "Anéis de abacaxi em conserva na água. Muito saborosa."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
+msgid_plural "lemonade drink mix"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -28395,8 +29511,8 @@ msgstr[1] ""
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
-msgstr "Um punhado de xícaras de manteiga de amendoim ... o seu favorito!"
+msgid "A handful of peanut butter cups… your favorite!"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate candy"
@@ -28521,10 +29637,8 @@ msgstr "Delicioso bolo de chocolate. Tem toda a cobertura. Tudo isso."
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr ""
-" Um bolo coberto com a cobertura mais grossa que você já viu. "
-"Alguémescreveu\"guff\" entre aspas ..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate-covered coffee bean"
@@ -28572,10 +29686,8 @@ msgstr[1] ""
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
 msgstr ""
-" peppermint pattyA um punhado de pastéis de hortelã cobertos de "
-"chocolate...yum!"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Necco wafers"
@@ -29259,6 +30371,17 @@ msgstr ""
 "estranhamente emborrachado e não muito saboroso, este SPAMpermanecebastante "
 "recheado. Completamente pouco apetitoso, mas bastanterecheio."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr ""
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "sardinha enlatada"
@@ -31098,8 +32221,8 @@ msgstr[1] ""
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31165,14 +32288,8 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
-" Panaceus Uma cápsula de gel de maçã vermelha do tamanho da suaunha, "
-"preenchida com um líquido oleoso e espesso que muda de preto parapúrpuraem "
-"intervalos imprevisíveis, salpicado de pequenos pontos cinzentos. Dado "
-"olugar de onde você tirou, é muito potente ou altamenteexperimental. "
-"Segurando, todas as pequenas dores e dores parecemdesaparecer, só por "
-"ummomento ..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattail jelly"
@@ -31621,11 +32738,9 @@ msgstr "sabor de mutagênico iv abstrato"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
 msgstr ""
-" Um mutagênico superconcentrado. Você precisa de uma seringa para "
-"injetar...se você realmente quiser?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagenic serum"
@@ -31639,10 +32754,8 @@ msgstr "soro alfa"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
+"to inject it… if you really want to?"
 msgstr ""
-" Um mutagênico superconcentrado que lembra muito o sangue. Você precisadeuma"
-" seringa para injetar ... se você realmente quiser?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "beast serum"
@@ -31652,7 +32765,7 @@ msgstr "soro de fera"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31663,10 +32776,8 @@ msgstr "soro de aves"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
+"need a syringe to inject it… if you really want to?"
 msgstr ""
-" Um mutagênico superconcentrado da cor dos céus pré- cataclísmicos. "
-"Vocêprecisa de uma seringa para injetar ... se você realmente quiser?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattle serum"
@@ -31676,10 +32787,8 @@ msgstr "soro de gado"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
+"inject it… if you really want to?"
 msgstr ""
-" Um mutagênico superconcentrado da cor da grama. Você precisa de "
-"umaseringapara injetar ... se você realmente quiser?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cephalopod serum"
@@ -31689,7 +32798,7 @@ msgstr "soro cefalópode"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
+"it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31700,7 +32809,7 @@ msgstr "soro de quimera"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31711,7 +32820,7 @@ msgstr "elf-a serum"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31722,7 +32831,7 @@ msgstr "soro felino"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31733,10 +32842,8 @@ msgstr "soro de peixe"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
+"top.  You need a syringe to inject it… if you really want to?"
 msgstr ""
-" Um mutagênico superconcentrado da cor do oceano, com espuma branca notopo. "
-"Você precisa de uma seringa para injetar ... se você realmente quiser?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "insect serum"
@@ -31746,7 +32853,7 @@ msgstr "soro de inseto"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31757,7 +32864,7 @@ msgstr "soro de lagarto"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31768,7 +32875,7 @@ msgstr "soro de tremoço"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
+" inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31779,7 +32886,7 @@ msgstr "soro médico"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31790,7 +32897,7 @@ msgstr "soro de plantas"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31801,7 +32908,7 @@ msgstr "soro de raptor"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
+"at it.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31812,7 +32919,7 @@ msgstr "soro de rato"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31823,7 +32930,7 @@ msgstr "soro de lodo"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31834,7 +32941,7 @@ msgstr "soro de aranha"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31845,7 +32952,7 @@ msgstr "soro de troglóbio"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31856,7 +32963,7 @@ msgstr "soro de ursina"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
+"thick.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31867,7 +32974,7 @@ msgstr "soro de rato"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31882,10 +32989,8 @@ msgstr "sangue coagulado"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
+"bubble with an intelligence of its own…"
 msgstr ""
-" Um líquido vermelho espesso e grosso. Parece e cheira repugnante, "
-"epareceborbulhar com uma inteligência própria ..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "alpha mutagen"
@@ -32081,23 +33186,23 @@ msgstr ""
 "masprovavelmente é muito mais seguro beber do que antes."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
+msgid "pine nuts"
+msgid_plural "pine nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
+msgid "junipers"
+msgid_plural "junipers"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -32105,12 +33210,13 @@ msgid ""
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
@@ -32119,12 +33225,13 @@ msgstr ""
 "suasconchas foram removidas."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr ""
@@ -32132,12 +33239,12 @@ msgstr ""
 "árvoredepistache."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
 msgstr ""
@@ -32145,35 +33252,47 @@ msgstr ""
 "suasconchas foram removidas."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
+msgid "almond pulp"
+msgid_plural "almond pulp"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted almonds
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
 msgstr ""
 " punhado de amêndoas torradas Um punhado de nozes torradas de umaamendoeira."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
+msgid "cashews"
+msgid_plural "cashews"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr "castanha de caju Um punhado de cajus salgados."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -32183,47 +33302,47 @@ msgstr ""
 "umasubespéciede nozes de nogueira, suas cascas foram removidas."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr ""
 "punhado de nozes torradas Um punhado de nozes assadas de uma noz-pecã."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr ""
 " punhado de amendoim sem cascaSalty amendoins com suas cascas removidas."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
+msgid "beech nuts"
+msgid_plural "beech nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -32233,24 +33352,25 @@ msgstr ""
 "deumanogueira, suas cascas foram removidas."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr ""
 "punhado de nozes torradas Um punhado de nozes assadas de uma nogueira."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -32260,24 +33380,26 @@ msgstr ""
 "deumacastanheira, suas conchas foram removidas."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr ""
 " punhado de castanhas assadas Um punhado de nozes assadas de umacastanheira."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -32287,34 +33409,35 @@ msgstr ""
 "suascascasforam removidas."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr ""
@@ -32322,12 +33445,13 @@ msgstr ""
 "árvoredeavelã."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -32337,12 +33461,13 @@ msgstr ""
 "decastanhasduras e cruas de uma nogueira, suas cascas foram removidas."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr ""
@@ -32359,12 +33484,12 @@ msgid "Delicious hickory nut ambrosia.  A drink worthy of the gods."
 msgstr "Ambrosia deliciosa da noz de hicória. Uma bebida digna dos deuses."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
+msgid "acorns"
+msgid_plural "acorns"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
@@ -32375,12 +33500,12 @@ msgstr ""
 "nesseestado."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr "Um punhado de nozes assadas de um carvalho."
@@ -32990,11 +34115,12 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
+msgid_plural "soylent green powder"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -33045,11 +34171,11 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
+msgid_plural "protein powder"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -33125,12 +34251,12 @@ msgid "Very sour citrus.  Can be eaten if you really want."
 msgstr "Muito cítrico azedo. Pode ser comido se você realmente quiser."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
+msgid "blueberries"
+msgid_plural "blueberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr ""
@@ -33138,12 +34264,12 @@ msgstr ""
 "queelesestão tristes."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
+msgid "strawberries"
+msgid_plural "strawberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr ""
@@ -33151,34 +34277,34 @@ msgstr ""
 "vezesencontradocrescendo selvagem em campos."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
+msgid "cranberries"
+msgid_plural "cranberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr "punhado de cranberries. Sour bagas vermelhas. Bom para a sua saúde."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
+msgid "raspberries"
+msgid_plural "raspberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "punhado de framboesas Uma baga vermelha doce."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
+msgid "huckleberries"
+msgid_plural "huckleberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr ""
@@ -33186,12 +34312,12 @@ msgstr ""
 "confundidocomblueberries."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
+msgid "mulberries"
+msgid_plural "mulberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -33202,12 +34328,12 @@ msgstr ""
 "mundo."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
+msgid "elderberries"
+msgid_plural "elderberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr ""
@@ -33215,12 +34341,12 @@ msgstr ""
 "ótimoquandocozido."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
+msgid "rose hips"
+msgid_plural "rose hips"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "punhado de rosa mosquetaO fruto de uma flor rosa polinizada."
@@ -33257,12 +34383,12 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "Uma fruta cítrica, cujo sabor varia de azedo a meio doce."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
+msgid "cherries"
+msgid_plural "cherries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr ""
@@ -33280,12 +34406,12 @@ msgstr ""
 "Um punhado de grandes ameixas roxas. Saudável e bom para sua digestão."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
+msgid "grapes"
+msgid_plural "grapes"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr "punhado de uvasUm cacho de uvas suculentas."
@@ -33339,12 +34465,12 @@ msgid "A large and very sweet fruit."
 msgstr "Uma fruta grande e muito doce."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
+msgid "blackberries"
+msgid_plural "blackberries"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "Um punhado de amoras Um primo mais escuro de framboesa."
@@ -33389,16 +34515,27 @@ msgstr ""
 "interioressãoverdes."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
+msgid "apricots"
+msgid_plural "apricots"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "punhado de damascosUm fruto de casca mole, relacionado ao pêssego."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr ""
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr ""
@@ -33590,11 +34727,11 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -33604,11 +34741,11 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
+msgid_plural "chicory"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -33734,12 +34871,12 @@ msgstr ""
 "maséótimo para cozinhar."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
+msgid "dandelions"
+msgid_plural "dandelions"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -33883,12 +35020,12 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -35116,11 +36253,11 @@ msgstr[1] "canja com massa"
 #. ~ Description for chicken and dumplings
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A soup with chicken chunks and balls of dough.  Not bad."
-msgstr "Uma sopa com pedaços de frango e bolas de massa. Não é ruim."
+msgstr "Uma sopa com pedaços de frango e bolas de massa. Nada mal."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cullen skink"
-msgstr "Cullen Skink"
+msgstr "cullen skink"
 
 #. ~ Description for cullen skink
 #: lang/json/COMESTIBLE_from_json.py
@@ -35128,7 +36265,7 @@ msgid ""
 "A rich and tasty fish chowder from Scotland, made with preserved fish and "
 "creamy milk."
 msgstr ""
-" Um rico e saboroso ensopado de peixe da Escócia, feito com conservasdepeixe"
+"Um rico e saboroso ensopado de peixe da Escócia, feito com conserva de peixe"
 " e leite cremoso."
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35160,8 +36297,8 @@ msgstr "Casca de canela em pó com um aroma doce mas ligeiramente picante."
 #: lang/json/COMESTIBLE_from_json.py
 msgid "curry powder"
 msgid_plural "curry powder"
-msgstr[0] "Pó de caril"
-msgstr[1] "Pó de caril"
+msgstr[0] "pó de caril"
+msgstr[1] "pó de caril"
 
 #. ~ Description for curry powder
 #: lang/json/COMESTIBLE_from_json.py
@@ -35175,8 +36312,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid "black pepper"
 msgid_plural "black pepper"
-msgstr[0] "Pimenta preta"
-msgstr[1] "Pimenta preta"
+msgstr[0] "pimenta preta"
+msgstr[1] "pimenta preta"
 
 #. ~ Description for black pepper
 #: lang/json/COMESTIBLE_from_json.py
@@ -35648,8 +36785,8 @@ msgid ""
 "Dehydrated vegetable flakes.  With proper storage, this dried food will "
 "remain edible for an incredibly long time."
 msgstr ""
-" Flocos vegetais desidratados. Com armazenamento adequado, este alimento "
-"seco permanecerá comestível por um tempo incrivelmente longo."
+"Flocos vegetais desidratados. Com armazenamento adequado, este alimento seco"
+" permanecerá comestível por um tempo incrivelmente longo."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "rehydrated vegetable"
@@ -35848,11 +36985,9 @@ msgstr[1] "espaguete cru"
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
 msgstr ""
-"Um tipo de massa normalmente usada para preparar espaguete. Poderia ser "
-"comida crua em caso de desespero, mas é muito melhor quando cozida."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw lasagne pasta"
@@ -35863,7 +36998,7 @@ msgstr[1] ""
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
 msgstr ""
 
@@ -36343,7 +37478,7 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36356,7 +37491,7 @@ msgstr[1] ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36453,8 +37588,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36465,8 +37600,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36477,8 +37613,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36489,8 +37625,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36501,9 +37637,9 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36538,7 +37674,7 @@ msgstr[1] "bolas de pelo"
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36555,6 +37691,16 @@ msgid ""
 " properties."
 msgstr ""
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr ""
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
 msgstr "cordão resinoso"
@@ -36767,8 +37913,8 @@ msgid ""
 "A delicious peanut butter and jelly gluten free sandwich.  It reminds you of"
 " the times your mother would make you lunch."
 msgstr ""
-" sanduíche PB &amp; J sem glúten Uma deliciosa manteiga de amendoim "
-"egeléiasem glúten sanduíche. Faz lembrar as vezes que sua mãe faria oalmoço."
+"Um delicioso sanduíche de manteiga de amendoim e geléia sem glúten. Faz "
+"lembrar as vezes que sua mãe fazia o almoço."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "gluten free PB&H sandwich"
@@ -36782,9 +37928,9 @@ msgid ""
 "Some damned fool put honey on this peanut butter sandwich, who in their "
 "right mind- oh wait this is pretty good. Gluten free too!"
 msgstr ""
-" sem glúten sanduíche PB &amp; H Alguns malditos idiotas colocam "
-"melnestesanduíche de manteiga de amendoim, que em seu juízo perfeito - oh, "
-"espere, isso é muito bom. Sem glúten também!"
+"Algum maldito idiota colocou mel neste sanduíche de manteiga de amendoim, "
+"quem em seu juízo perfeito - oh, espere, isso é muito bom. Sem glúten "
+"também!"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "gluten free PB&M sandwich"
@@ -36798,12 +37944,12 @@ msgid ""
 "Who knew you could mix maple syrup and peanut butter to create yet another "
 "different gluten free sandwich?"
 msgstr ""
-" sanduíche PB &amp; M sem glútenQuem sabia que você poderia misturarxaropede"
-" bordo e manteiga de amendoim para criar outro sanduíche semglúten?"
+"Quem diria que você poderia misturar xarope de bordo e manteiga de amendoim "
+"para criar outro sanduíche sem glúten?"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lactose free hickory nut ambrosia"
-msgstr "ambrosia de noz de nogueira sem lactose"
+msgstr "ambrosia de nozes sem lactose"
 
 #. ~ Description for lactose free hickory nut ambrosia
 #: lang/json/COMESTIBLE_from_json.py
@@ -36811,8 +37957,8 @@ msgid ""
 "Delicious hickory nut ambrosia.  A drink worthy of the gods. This one was "
 "made with an alternative to cows milk."
 msgstr ""
-" Ambrosia deliciosa da noz de hicória. Uma bebida digna dos deuses. "
-"Estefoifeito com uma alternativa ao leite de vaca."
+"Ambrosia deliciosa de nozes. Uma bebida digna dos deuses. Este foi feito com"
+" uma alternativa ao leite de vaca."
 
 #. ~ Description for cornmeal
 #: lang/json/COMESTIBLE_from_json.py
@@ -36820,9 +37966,9 @@ msgid ""
 "You think this is cornflour... or rice flour... Or something else. However, "
 "it certainly is not wheat flour! It is useful for baking though."
 msgstr ""
-" Você acha que isso é farinha de milho ... ou farinha de arroz ... "
-"Ououtracoisa. No entanto, certamente não é farinha de trigo! É útil "
-"paraassarembora."
+"Você acha que isso é farinha de milho... ou farinha de arroz... Ou outra "
+"coisa. No entanto, certamente não é farinha de trigo! Mas ainda é útil para "
+"assar coisas."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "gluten free johnnycake"
@@ -36840,8 +37986,8 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py
 msgid "gluten free fruit pancake"
 msgid_plural "gluten free fruit pancakes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "panqueca de frutas sem glúten"
+msgstr[1] "panquecas de frutas sem glúten"
 
 #. ~ Description for gluten free fruit pancake
 #: lang/json/COMESTIBLE_from_json.py
@@ -36849,15 +37995,14 @@ msgid ""
 "Fluffy and delicious gluten free pancakes with real maple syrup, made "
 "sweeter and healthier with the addition of wholesome fruit."
 msgstr ""
-" panqueca de frutas sem glúten Panquecas sem glúten e "
-"deliciosascomverdadeiro xarope de bordo, feitas mais doces e saudáveis com a"
-" adiçãodefrutas saudáveis."
+"Panquecas fofinhas e deliciosas, sem glúten e com verdadeiro xarope de "
+"bordo, feitas mais doces e saudáveis com a adição de frutas frescas."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lactose free fruit pancake"
 msgid_plural "lactose free fruit pancakes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "panqueca de frutas sem lactose"
+msgstr[1] "panquecas de frutas sem lactose"
 
 #. ~ Description for lactose free fruit pancake
 #: lang/json/COMESTIBLE_from_json.py
@@ -36865,14 +38010,14 @@ msgid ""
 "Fluffy and delicious lactose free pancakes with real maple syrup, made "
 "sweeter and healthier with the addition of wholesome fruit."
 msgstr ""
-" panqueca de frutas sem lactose Panquecas sem lactose e deliciosassemlactose"
-" com xarope de bordo, adoçadas e saudáveis com a adição defrutassaudáveis."
+"Panquecas fofinhas e deliciosas, sem lactose e com xarope de bordo, tornadas"
+" mais doces e saudáveis com a adição de frutas frescas."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "gluten free lactose free fruit pancake"
 msgid_plural "gluten free lactose free fruit pancakes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "panqueca de frutas sem lactose ou glúten"
+msgstr[1] "panquecas de frutas sem lactose ou glúten"
 
 #. ~ Description for gluten free lactose free fruit pancake
 #: lang/json/COMESTIBLE_from_json.py
@@ -36881,16 +38026,15 @@ msgid ""
 " But at least it has real maple syrup, made sweeter and healthier with the "
 "addition of wholesome fruit."
 msgstr ""
-" panqueca de frutas sem lactose sem glúten Panquecas fofinhas "
-"edeliciosasfeitas com as únicas coisas que você ainda pode comer. Mas "
-"pelomenos temxarope de bordo real, feito mais doce e saudável com a adição "
-"defrutassaudáveis."
+"Panquecas fofinhas e deliciosas feitas com as únicas coisas que você ainda "
+"pode comer. Mas pelo menos tem xarope de bordo real, feito mais doce e "
+"saudável com a adição de frutas frescas."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "gluten free chocolate pancake"
 msgid_plural "gluten free chocolate pancakes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "panqueca de chocolate sem glúten"
+msgstr[1] "panquecas de chocolate sem glúten"
 
 #. ~ Description for gluten free chocolate pancake
 #: lang/json/COMESTIBLE_from_json.py
@@ -36898,28 +38042,28 @@ msgid ""
 "Fluffy and delicious gluten free pancakes with real maple syrup, with "
 "delicious chocolate baked right in."
 msgstr ""
-" panqueca de chocolate sem glúten Panquecas sem glúten e deliciosascomxarope"
-" de bordo, com delicioso chocolate assado."
+"Panquecas deliciosas e fofinhas, sem glúten e com xarope de bordo, assadas "
+"com chocolate."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "gluten free French toast"
 msgid_plural "gluten free French toasts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "rabanada sem glúten"
+msgstr[1] "rabanadas sem glúten"
 
 #. ~ Description for gluten free French toast
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Slices of gluten free bread dipped in a milk and egg mixture then fried."
 msgstr ""
-" torradas francesas sem glútenSlices de pão sem glúten mergulhados "
-"emumamistura de leite e ovo, em seguida, frito."
+"Fatias de pão sem glúten mergulhadas em uma mistura de leite e ovo, e fritas"
+" em seguida."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "gluten free lactose free French toast"
 msgid_plural "gluten free lactose free French toasts"
-msgstr[0] "Rabanada sem lactose ou glúten"
-msgstr[1] "Rabanadas sem lactose ou glúten"
+msgstr[0] "rabanada sem lactose ou glúten"
+msgstr[1] "rabanadas sem lactose ou glúten"
 
 #. ~ Description for gluten free lactose free French toast
 #: lang/json/COMESTIBLE_from_json.py
@@ -36930,7 +38074,7 @@ msgid ""
 msgstr ""
 "Fatias de pão sem glúten mergulhadas em uma mistura de leite e ovo sem "
 "lactose e fritas. Você nunca pensou que era possível, mas agora você "
-"realmente se sente como um pós-milenista."
+"realmente se sente como um pós-milenial."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "gluten free biscuit"
@@ -36961,7 +38105,7 @@ msgstr "torta de legumes sem glúten"
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A delicious baked gluten free pie with a delicious vegetable filling."
 msgstr ""
-" Uma torta sem glúten cozida deliciosa com um enchimento vegetal delicioso."
+"Uma deliciosa torta sem glúten cozida com um recheio vegetal delicioso."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "gluten free meat pie"
@@ -37297,15 +38441,6 @@ msgstr[1] ""
 msgid "This rice flour is useful for baking."
 msgstr "farinha de arrozEsta farinha de arroz é útil para assar."
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr ""
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr ""
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr "soro revival"
@@ -37631,8 +38766,8 @@ msgstr[1] ""
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -37644,8 +38779,8 @@ msgstr[1] ""
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -38229,8 +39364,8 @@ msgstr[1] ""
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -38837,8 +39972,8 @@ msgstr[1] ""
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -38850,7 +39985,7 @@ msgstr[1] ""
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr ""
 
@@ -38866,12 +40001,12 @@ msgid "A root from a hickory tree.  It has an earthy smell."
 msgstr "Hickory Root Uma raiz de uma nogueira. Tem um cheiro de terra."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr ""
@@ -38879,24 +40014,24 @@ msgstr ""
 "emsuaconcha."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
+msgid "pecans"
+msgid_plural "pecans"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr ""
 " Pecan Um punhado de nozes duras de uma nogueira-pecã, ainda em sua casca."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
+msgid "pistachios"
+msgid_plural "pistachios"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr ""
@@ -38904,24 +40039,24 @@ msgstr ""
 "emsuaconcha."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
+msgid "almonds"
+msgid_plural "almonds"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
 msgstr ""
 " amêndoa Um punhado de nozes duras de uma amendoeira, ainda em sua casca."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
+msgid "peanuts"
+msgid_plural "peanuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr ""
@@ -38929,34 +40064,34 @@ msgstr ""
 "emsuacasca."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr "Avelã Um punhado de nozes duras de uma avelã, ainda em sua casca."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
+msgid "chestnuts"
+msgid_plural "chestnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr "Um punhado de nozes duras de uma castanheira, ainda em sua casca."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
+msgid "walnuts"
+msgid_plural "walnuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr "noz Um punhado de nozes duras de uma nogueira, ainda em sua concha."
@@ -39100,7 +40235,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr ""
 
@@ -39124,7 +40259,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr ""
 
@@ -39231,6 +40366,12 @@ msgstr "vendo isso é um bugmuscle"
 msgid "wind"
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "um aparelho de fumar e uma fonte de fogo"
@@ -39285,14 +40426,14 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "withered plant"
 msgid_plural "withered plants"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "planta morta"
+msgstr[1] "plantas mortas"
 
 #. ~ Description for withered plant
 #: lang/json/GENERIC_from_json.py
@@ -39300,6 +40441,8 @@ msgid ""
 "A dead plant.  Good for starting fires or making a pile of leaves to sleep "
 "on."
 msgstr ""
+"Uma planta morta. Boa para acender fogos ou fazer uma pilha de folhas para "
+"dormir."
 
 #: lang/json/GENERIC_from_json.py
 msgid "fur pelt"
@@ -39432,14 +40575,14 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "set of 100 ceramic disk"
 msgid_plural "ceramic disks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "conjunto de 100 discos de cerâmica"
+msgstr[1] "discos de cerâmica"
 
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -39544,8 +40687,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "petrified eye"
 msgid_plural "petrified eyes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "olho petrificado"
+msgstr[1] "olhos petrificados"
 
 #. ~ Description for petrified eye
 #: lang/json/GENERIC_from_json.py
@@ -39597,6 +40740,8 @@ msgid ""
 "Some type of advanced data storage device.  Useful for storing very large "
 "amounts of information."
 msgstr ""
+"Algum tipo de dispositivo avançado de armazenamento de dados. Útil para "
+"armazenar quantidades muito grandes de informações."
 
 #: lang/json/GENERIC_from_json.py
 msgid "golf tee"
@@ -39616,8 +40761,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "golf ball"
 msgid_plural "golf balls"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "bola de golfe"
+msgstr[1] "bolas de golfe"
 
 #. ~ Description for golf ball
 #: lang/json/GENERIC_from_json.py
@@ -39632,8 +40777,8 @@ msgstr "Uma bola colorida e dura. Basicamente uma rocha."
 #: lang/json/GENERIC_from_json.py
 msgid "bowling ball"
 msgid_plural "bowling balls"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "bola de boliche"
+msgstr[1] "bolas de boliche"
 
 #. ~ Description for bowling ball
 #: lang/json/GENERIC_from_json.py
@@ -39674,8 +40819,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "scythe blade"
 msgid_plural "scythe blades"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "lâmina de foice"
+msgstr[1] "lâminas de foice"
 
 #. ~ Description for scythe blade
 #: lang/json/GENERIC_from_json.py
@@ -39683,6 +40828,8 @@ msgid ""
 "A large, curved blade.  Could be used to assemble a scythe, or make an "
 "improvised polearm."
 msgstr ""
+"Uma lâmina grande e curva. Poderia ser usada para montar uma foice, ou criar"
+" uma arma de haste improvisada."
 
 #: lang/json/GENERIC_from_json.py
 msgid "circular sawblade"
@@ -39773,6 +40920,18 @@ msgstr ""
 " rebar Um comprimento de vergalhão, faz uma boa arma corpo-a-corpo, e pode "
 "ser útil na construção de paredes mais duras e tal."
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -39918,10 +41077,8 @@ msgstr[1] ""
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
+msgid "A large LCD television, full of delicious electronics."
 msgstr ""
-" televisionA grande televisão de tubo de raios catódicos, cheia "
-"dedeliciososeletrônicos."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -40386,6 +41543,19 @@ msgstr ""
 "Um módulo projetado para receber muitas formas de sinais. Útil para a "
 "elaboração de equipamentos de comunicação."
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -40604,8 +41774,8 @@ msgid ""
 "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'.  The "
 "fish appears to have tiny antlers."
 msgstr ""
-" Uma tigela de peixe cheia, a etiqueta diz\"para Ed\" e o "
-"nomedopeixe,\"Hoss\". O peixe parece ter chifres minúsculos."
+"Um aquário de peixe cheio, a etiqueta diz \"para Ed\" e o nome do peixe, "
+"\"Hoss\". O peixe parece ter chifres minúsculos."
 
 #: lang/json/GENERIC_from_json.py
 msgid "blood soaked rag"
@@ -40714,10 +41884,10 @@ msgid ""
 "actions.  With gunsmithing tools, some skill, and a few hours, you could "
 "give the classic Russian design modern furniture and customization capacity."
 msgstr ""
-" Kit de conversão Mosin-Nagant EBR Um estoque sintético e "
-"hardwareprojetadopara acomodar ações comuns de Mosin-Nagant. Com ferramentas"
-" dearmeiro, alguma habilidade e algumas horas, você poderia dar ao "
-"designmoderno russomobiliário moderno e capacidade de personalização."
+"Uma coronha sintética e peças projetadas para acomodar ações comuns de "
+"Mosin-Nagant. Com ferramentas de armeiro, alguma habilidade e algumas horas,"
+" você poderia dar capacidade de personalização moderna ao clássico design "
+"russo."
 
 #: lang/json/GENERIC_from_json.py
 msgid "L523-CAR conversion"
@@ -40733,10 +41903,10 @@ msgid ""
 "already-configured L523, you'll need to disassemble it to the base platform,"
 " then assemble with the parts you prefer."
 msgstr ""
-" Conversão L523-CARTodas as peças necessárias para converter um L523 "
-"paraaconfiguração Carbine, a escolha da Leadworks LLC para o trabalho "
-"deperto. Para reconfigurar um L523 já configurado, você precisará desmontá- "
-"lonaplataforma de base e depois montá-lo com as peças de sua preferência."
+"Todas as peças necessárias para converter um L523 para a configuração "
+"Carbine, a escolha da Leadworks LLC para combate de proximidade. Para "
+"reconfigurar um L523 já configurado, você precisará desmontá- lo na "
+"plataforma de base e depois montá-lo com as peças de sua preferência."
 
 #: lang/json/GENERIC_from_json.py
 msgid "L523-MBR conversion"
@@ -40752,10 +41922,10 @@ msgid ""
 "configured L523, you'll need to disassemble it to the base platform, then "
 "assemble with the parts you prefer."
 msgstr ""
-" Conversão L523-MBRTodas as partes necessárias para converter um L523 "
-"emumRifle de Combate Principal, uma arma balanceada para todas assituações. "
-"Para reconfigurar um L523 já configurado, você precisarádesmontá-lo "
-"naplataforma de base e depois montá-lo com as peças de suapreferência."
+"Todas as partes necessárias para converter um L523 em um Rifle de Batalha "
+"Principal, uma arma balanceada para todas as situações. Para reconfigurar um"
+" L523 já configurado, você precisará desmontá-lo na plataforma de base e "
+"depois montá-lo com as peças de sua preferência."
 
 #: lang/json/GENERIC_from_json.py
 msgid "L523-DSR conversion"
@@ -40771,10 +41941,10 @@ msgid ""
 "configured L523, you'll need to disassemble it to the base platform, then "
 "assemble with the parts you prefer."
 msgstr ""
-" Conversão L523-DSRTodas as peças necessárias para converter um L523 "
-"emumRifle Shootist Designado, adequado para trabalhos de longo alcance. "
-"Parareconfigurar um L523 já configurado, você precisará desmontá- "
-"lonaplataforma de base e depois montá-lo com as peças de sua preferência."
+"Todas as peças necessárias para converter um L523 em um Rifle Shootist "
+"Designado, adequado para trabalhos de longo alcance. Para reconfigurar um "
+"L523 já configurado, você precisará desmontá-lo na plataforma de base e "
+"depois montá-lo com as peças de sua preferência."
 
 #: lang/json/GENERIC_from_json.py
 msgid "L523-LMG conversion"
@@ -40789,10 +41959,9 @@ msgid ""
 " to reconfigure an already-configured L523, you'll need to disassemble it to"
 " the base platform, then assemble with the parts you prefer."
 msgstr ""
-" Conversão de L523-LMGTodas as peças necessárias para converter um L523emuma"
-" metralhadora leve. Para reconfigurar um L523 já configurado, vocêprecisará "
-"desmontá-lo na plataforma de base e depois montá-lo com aspeçasde sua "
-"preferência."
+"Todas as peças necessárias para converter um L523 em uma metralhadora leve. "
+"Para reconfigurar um L523 já configurado, você precisará desmontá-lo na "
+"plataforma de base e depois montá-lo com as peças de sua preferência."
 
 #: lang/json/GENERIC_from_json.py
 msgid "SD-Memory card"
@@ -40803,9 +41972,7 @@ msgstr[1] ""
 #. ~ Description for SD-Memory card
 #: lang/json/GENERIC_from_json.py
 msgid "A memory card, used.  Might be worth a look."
-msgstr ""
-" Cartão de memória SDUm cartão de memória usado. Pode valer a pena "
-"darumaolhada."
+msgstr "Um cartão de memória usado. Pode valer a pena dar uma olhada."
 
 #: lang/json/GENERIC_from_json.py
 msgid "SD-Memory card (clean)"
@@ -40819,8 +41986,8 @@ msgid ""
 "This memory card is either unused or has been wiped clean.  You could use it"
 " to store your data, though!"
 msgstr ""
-" Cartão de memória SD (limpo) Este cartão de memória não está sendo "
-"usadooufoi limpo. Você poderia usá-lo para armazenar seus dados!"
+"Este cartão de memória nunca foi usado ou foi formatado. Você poderia usá-lo"
+" para armazenar seus dados!"
 
 #: lang/json/GENERIC_from_json.py
 msgid "SD-Memory card (encrypted)"
@@ -40834,9 +42001,8 @@ msgid ""
 "This memory card appears to have the firmware encryption set.  Hopefully it "
 "contains something worth encrypting."
 msgstr ""
-" Cartão de memória SD (criptografado) Este cartão de memória parece "
-"teracriptografia de firmware definida. Espero que contenha algo que "
-"valhaapena criptografar."
+"Este cartão de memória parece ter a criptografia de firmware definida. "
+"Espero que contenha algo que valha a pena criptografar."
 
 #: lang/json/GENERIC_from_json.py
 msgid "Science SD-Memory card"
@@ -40848,11 +42014,8 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
+"encrypted.  Looks *Interesting*, though…"
 msgstr ""
-" Science SD-Memory cardEste cartão de memória parece estar "
-"relacionadoao&#39;XEDRA&#39; e é certamente criptografado. Parece * "
-"Interessante*,embora ..."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hand mirror"
@@ -40863,7 +42026,7 @@ msgstr[1] "espelhos portáteis"
 #. ~ Description for hand mirror
 #: lang/json/GENERIC_from_json.py
 msgid "A small hand mirror."
-msgstr "espelho de mão Um pequeno espelho de mão."
+msgstr "Um pequeno espelho de mão."
 
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "manhole cover"
@@ -40877,8 +42040,8 @@ msgid ""
 "A heavy iron disc that typically covers a ladder into the sewers.  Lifting "
 "it from the manhole is impossible without a crowbar."
 msgstr ""
-" tampa de bueiroUm disco de ferro pesado que normalmente cobre uma "
-"escadanosesgotos. Levantá-lo do bueiro é impossível sem um pé de cabra."
+"Um disco de ferro pesado que normalmente cobre uma escada nos esgotos. "
+"Levantá-lo do bueiro é impossível sem um pé de cabra."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pine bough"
@@ -40892,8 +42055,8 @@ msgid ""
 "A branch from a pine tree, oozing sticky sap and bristling with prickly "
 "needles."
 msgstr ""
-" galho de pinheiroA ramo de um pinheiro, escorrendo seiva pegajosa "
-"eeriçadocom espinhosas agulhas."
+"O ramo de um pinheiro, escorrendo seiva pegajosa e eriçado com folhas "
+"espinhentas."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pinecone"
@@ -40907,8 +42070,8 @@ msgid ""
 "A spiny pod from a pine tree.  Dry seeds rattle around inside when you shake"
 " it."
 msgstr ""
-" pineconeUm spiny pod de um pinheiro. Sementes secas chocalham "
-"pordentroquando você a agita."
+"Uma espinhenta pinha. Sementes secas chocalham por dentro quando você a "
+"agita."
 
 #: lang/json/GENERIC_from_json.py
 msgid "poppy bud"
@@ -40922,8 +42085,8 @@ msgid ""
 "A poppy bud.  Contains some substances commonly produced by a mutated poppy "
 "flower."
 msgstr ""
-" papoila papoula papoula broto. Contém algumas "
-"substânciascomumenteproduzidas por uma flor de papoula mutada."
+"Um broto de papoula. Contém algumas substâncias comumente produzidas por uma"
+" flor de papoula mutada."
 
 #. ~ Description for sunflower
 #: lang/json/GENERIC_from_json.py
@@ -40931,16 +42094,17 @@ msgid ""
 "The top of a sunflower, with yellow pedals and some seeds that have yet to "
 "be eaten by animals."
 msgstr ""
-" O topo de um girassol, com pedais amarelos e algumas sementes que "
-"aindanãoforam comidas pelos animais."
+" O topo de um girassol, com pétalas amarelas e algumas sementes que ainda "
+"não foram comidas pelos animais."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -40955,9 +42119,7 @@ msgstr[1] "pedaços de argila"
 #. ~ Description for lump of clay
 #: lang/json/GENERIC_from_json.py
 msgid "A fresh piece of clay.  Useful for some crafting recipes."
-msgstr ""
-" pedaço de argilaUm pedaço de barro fresco. Útil para algumas "
-"receitasdeartesanato."
+msgstr "Um pedaço de barro fresco. Útil para algumas receitas de artesanato."
 
 #: lang/json/GENERIC_from_json.py
 msgid "brick"
@@ -40969,8 +42131,7 @@ msgstr[1] "tijolos"
 #: lang/json/GENERIC_from_json.py
 msgid "A fire hardened building block used in masonry construction."
 msgstr ""
-" tijoloUm bloco de construção endurecido por fogo usado na "
-"construçãodealvenaria."
+"Um bloco de construção endurecido por fogo usado na construção de alvenaria."
 
 #: lang/json/GENERIC_from_json.py
 msgid "mortar"
@@ -41041,9 +42202,7 @@ msgstr[1] ""
 #. ~ Description for tanbark
 #: lang/json/GENERIC_from_json.py
 msgid "A sheet of tannin-rich bark from a tree, useful for tanning leather"
-msgstr ""
-" tanbarkUma folha de casca rica em tanino de uma árvore, útil "
-"paracurtircouro"
+msgstr "Uma folha de casca de árvore rica em tanino, útil para curtir couro."
 
 #: lang/json/GENERIC_from_json.py
 msgid "birchbark"
@@ -41055,8 +42214,8 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid "A sheet of tough, water-resistant bark taken from a birch tree."
 msgstr ""
-" birchbark Uma folha de casca resistente e resistente à água retirada "
-"deumaárvore de vidoeiro."
+"Uma folha de casca dura e resistente à água retirada de uma árvore de "
+"vidoeiro."
 
 #: lang/json/GENERIC_from_json.py
 msgid "willowbark"
@@ -41070,8 +42229,7 @@ msgid ""
 "A sheet of bark taken from a willow tree.  Used in the production of "
 "aspirin."
 msgstr ""
-" willowbark Uma folha de casca retirada de um salgueiro. Usado na "
-"produçãodeaspirina."
+"Uma folha de casca retirada de um salgueiro. Usada na produção de aspirina."
 
 #: lang/json/GENERIC_from_json.py
 msgid "diamond"
@@ -41082,7 +42240,7 @@ msgstr[1] ""
 #. ~ Description for diamond
 #: lang/json/GENERIC_from_json.py
 msgid "A sparkling diamond."
-msgstr "diamante Um diamante cintilante."
+msgstr "Um diamante cintilante."
 
 #: lang/json/GENERIC_from_json.py
 msgid "cured hide"
@@ -41097,9 +42255,8 @@ msgid ""
 "and treated to prevent decay.  It still requires tanning to become usable "
 "leather."
 msgstr ""
-" pele curada enrolada em pele animal que foi raspada de cabelo "
-"ecarneestranhos e tratada para prevenir a cárie. Ainda requer "
-"bronzeamentoparase tornar couro utilizável."
+" Uma pele animal curada e enrolada que foi raspada e tratada para prevenir a"
+" deterioração. Ainda deve ser curtida para se tornar couro utilizável."
 
 #: lang/json/GENERIC_from_json.py
 msgid "tanned hide"
@@ -41113,8 +42270,8 @@ msgid ""
 "A folded sheet of leather made from carefully tanned animal hide.  Can be "
 "cut up or used as is."
 msgstr ""
-" couro curtidoUma folha dobrada de couro feita de couro "
-"animalcuidadosamentecurtido. Pode ser cortado ou usado como está."
+"Uma folha dobrada de couro feita de couro animal cuidadosamente curtido. "
+"Pode ser cortado ou usado como está."
 
 #: lang/json/GENERIC_from_json.py
 msgid "cured pelt"
@@ -41129,9 +42286,9 @@ msgid ""
 "and treated to prevent decay.  It still requires tanning to become usable "
 "fur."
 msgstr ""
-" Peles curadas enroladas em peles de animais que foram raspadas de "
-"pêlosecarne estranhos e tratadas para prevenir a cárie. Ainda "
-"requerbronzeamentopara se tornar pele utilizável."
+"Pele curada e enrolada que foi raspada de pêlos e carne e tratada para "
+"prevenir a deterioração. Ainda precisa ser curtida para se tornar uma pele "
+"utilizável."
 
 #: lang/json/GENERIC_from_json.py
 msgid "tanned pelt"
@@ -41145,9 +42302,8 @@ msgid ""
 "A folded sheet of leather made from carefully tanned animal hide, with the "
 "fur still intact.  Can be cut up or used as is."
 msgstr ""
-" pelagem curtidaFolha de couro dobrada feita de couro "
-"animalcuidadosamentecurtido, com a pele ainda intacta. Pode ser cortado ou "
-"usadocomo está."
+"Folha de couro dobrada feita de pele animal cuidadosamente curtida, com os "
+"pelos ainda intactos. Pode ser cortada ou usada como está."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pile of straw"
@@ -41161,8 +42317,8 @@ msgid ""
 "A pile of dry grass.  Can be used to craft a straw bed if there is nothing "
 "else to sleep on."
 msgstr ""
-" pilha de palha Uma pilha de capim seco. Pode ser usado para fazer umacamade"
-" palha se não houver mais nada para dormir."
+"Uma pilha de capim seco. Pode ser usado para fazer uma cama de palha se não "
+"houver mais nada para dormir."
 
 #: lang/json/GENERIC_from_json.py
 msgid "straw doll"
@@ -41173,7 +42329,7 @@ msgstr[1] "bonecas de palha"
 #. ~ Description for straw doll
 #: lang/json/GENERIC_from_json.py
 msgid "Old straw doll.  Represents a woman in a dress."
-msgstr "boneco de palha Representa uma mulher em um vestido."
+msgstr "Representa uma mulher em um vestido."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pillow"
@@ -41184,7 +42340,7 @@ msgstr[1] "travesseiros"
 #. ~ Description for pillow
 #: lang/json/GENERIC_from_json.py
 msgid "A pillow to rest your head on when sleeping."
-msgstr "pillowA travesseiro para descansar a cabeça ao dormir."
+msgstr "Um travesseiro para descansar a cabeça ao dormir."
 
 #: lang/json/GENERIC_from_json.py
 msgid "body pillow"
@@ -41198,8 +42354,8 @@ msgid ""
 "A big, body-sized pillow with a print of an anime character on the front and"
 " their scantily clad version on the back."
 msgstr ""
-" pillow Um travesseiro grande, de tamanho corporal, com uma impressão "
-"deumpersonagem de anime na frente e sua versão seminua nas costas."
+"Um travesseiro grande, de tamanho corporal, com uma impressão de um "
+"personagem de anime na frente e sua versão seminua nas costas."
 
 #: lang/json/GENERIC_from_json.py
 msgid "down-filled pillow"
@@ -41210,9 +42366,7 @@ msgstr[1] "travesseiros de penas"
 #. ~ Description for down-filled pillow
 #: lang/json/GENERIC_from_json.py
 msgid "A fluffy pillow to rest your head on when sleeping."
-msgstr ""
-" travesseiro cheio de penasUm travesseiro fofo para descansar a "
-"cabeçaquandoestiver dormindo."
+msgstr "Um travesseiro fofo para descansar a cabeça ao dormir."
 
 #: lang/json/GENERIC_from_json.py
 msgid "teddy bear"
@@ -41226,8 +42380,8 @@ msgid ""
 "An old and half rotten teddy bear.  Looks like this one commemorates the "
 "grave of the child who once owned it."
 msgstr ""
-" ursinho de pelúciaUm urso de pelúcia velho e meio podre. Parece "
-"queestecomemora o túmulo da criança que o possuiu."
+"Um urso de pelúcia velho e meio podre. Parece que este marca o túmulo da "
+"criança que o possuiu."
 
 #: lang/json/GENERIC_from_json.py
 msgid "money bundle"
@@ -41238,18 +42392,16 @@ msgstr[1] ""
 #. ~ Description for money bundle
 #: lang/json/GENERIC_from_json.py
 msgid "A bundle holding many 20 dollar bills, pretty useless now though."
-msgstr ""
-" pacote de dinheiroUm pacote contendo muitas notas de 20 dólares, "
-"bastanteinútil agora embora."
+msgstr "Um pacote contendo muitas notas de 20 dólares, bastante inútil agora."
 
 #. ~ Use action menu_text for cigar.
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -41303,10 +42455,8 @@ msgstr[1] "bitucas de cigarro"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr ""
-" O que antes era um tubo maravilhosamente viciante de folhas secas detabacoé agora apenas um pedaço fedorento de lixo. Que tragédia! \n"
-"  O tabaco restante em alguns deles provavelmente poderia ser usado para enrolaroutrocigarro. Se você está disposto a ir tão longe ..."
 
 #. ~ Use action msg for joint.
 #: lang/json/GENERIC_from_json.py
@@ -41358,11 +42508,11 @@ msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
-msgstr[0] "tabaco cru"
-msgstr[1] "punhados de tabaco cru"
+msgid_plural "raw tobacco"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -41419,12 +42569,6 @@ msgid ""
 "panel, if you can find one."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] ""
-msgstr[1] ""
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -41935,15 +43079,6 @@ msgstr ""
 " hatchetA machadinha de uma mão. Faz uma grande arma corpo-a-corpo, e "
 "éútiltanto para cortar coisas quanto para usar como um martelo."
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr ""
-" Uma rocha do tamanho de uma bola de beisebol. Faz uma arma decente etambémé"
-" bom para atirar nos inimigos."
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -42579,11 +43714,8 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
+" an awful lot like a bow.  You can barely bend it…"
 msgstr ""
-" mola da folhaUma mola de lâmina grande, resistente. Provavelmente "
-"dealgumcarro ou caminhão, e parece muito com um arco. Você mal "
-"conseguedobrar ..."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hydrangea"
@@ -43261,7 +44393,7 @@ msgstr[1] "cafeteiras atômicas"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
@@ -43276,7 +44408,9 @@ msgstr[1] "lâmpadas atômicas"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "Fechar tampa"
 
@@ -43304,7 +44438,9 @@ msgstr[1] "lâmpadas atômicas (cobertas)"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "Abrir tampa"
 
@@ -43605,8 +44741,8 @@ msgstr[1] "ganchos de escalada"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -44505,9 +45641,7 @@ msgstr[1] ""
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
+msgid "A complete guide to Wing Chun Kung-fu."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
@@ -44521,8 +45655,8 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -45708,6 +46842,20 @@ msgstr[1] ""
 msgid "This is a slip of paper signed by the issuer."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -46052,11 +47200,9 @@ msgstr[1] ""
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
 msgstr ""
-" garfo de forkA, se você apunhalar algo com isto você comeistoimediatamente."
-" Espere ... deixa pra lá."
 
 #: lang/json/GENERIC_from_json.py
 msgid "plastic fork"
@@ -47324,7 +48470,7 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
 
@@ -47813,8 +48959,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
 msgstr ""
 
 #. ~ Description for estoc
@@ -47927,21 +49073,18 @@ msgstr ""
 "seu eixo flexível e ponta maçante."
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
+msgid "fencing épée"
+msgid_plural "fencing épées"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
 msgstr ""
-" Esgrima epeeA arma usada para esgrima, o mais nobre de todos os esportes. "
-"Aespada é a mais pesada e mais rígida das armas de esgrima e, portanto, "
-"talvez a mais útil."
 
 #: lang/json/GENERIC_from_json.py
 msgid "fencing saber"
@@ -47953,11 +49096,53 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
+"is marginally shorter than the foil and épée, but no less effective."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
 msgstr ""
-" esgrima sabreUma arma usada para esgrima, o mais nobre de todos osesportes."
-" O sabre de esgrima é ligeiramente mais curto que o papel alumínioe aespada,"
-" mas não menos eficaz."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
@@ -48266,12 +49451,8 @@ msgstr[1] ""
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
+"down to a powder, for more… high-profile applications."
 msgstr ""
-" lingote de alumínio Um pequeno lingote de alumínio, "
-"padronizadoparaprocessamento posterior. Leve, mas durável, pode ser moldado "
-"emváriasformas para construção ou triturado até um pó, para mais "
-"...aplicações dealto perfil."
 
 #: lang/json/GENERIC_from_json.py
 msgid "scrap copper"
@@ -48613,6 +49794,46 @@ msgid ""
 " can also serve as an improvised stabbing weapon, but will break quickly."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -48775,8 +49996,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "oars"
 msgid_plural "oars"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "remos"
+msgstr[1] "remos"
 
 #. ~ Description for oars
 #: lang/json/GENERIC_from_json.py
@@ -48786,19 +50007,19 @@ msgstr "Caso contrário, para um barco."
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "sail"
 msgid_plural "sails"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "vela de barco"
+msgstr[1] "velas de barco"
 
 #. ~ Description for sail
 #: lang/json/GENERIC_from_json.py
 msgid "Sails for a boat."
-msgstr ""
+msgstr "Velas para um barco."
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "inflatable section"
 msgid_plural "inflatable section"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "seção inflável"
+msgstr[1] "seções infláveis"
 
 #. ~ Description for inflatable section
 #: lang/json/GENERIC_from_json.py
@@ -48808,8 +50029,8 @@ msgstr "seção inflávelUma seção inflável do barco."
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "inflatable airbag"
 msgid_plural "inflatable airbag"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "airbag inflável"
+msgstr[1] "airbags infláveis"
 
 #. ~ Description for inflatable airbag
 #: lang/json/GENERIC_from_json.py
@@ -48819,8 +50040,8 @@ msgstr "airbag inflávelUma bolsa a ar inflável."
 #: lang/json/GENERIC_from_json.py
 msgid "wire basket"
 msgid_plural "wire baskets"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "cesto de arame"
+msgstr[1] "cestos de arame"
 
 #. ~ Description for wire basket
 #: lang/json/GENERIC_from_json.py
@@ -48830,8 +50051,8 @@ msgstr "cesta de arameUma cesta de arame grande de um carrinho de compras."
 #: lang/json/GENERIC_from_json.py
 msgid "folding wire basket"
 msgid_plural "folding wire baskets"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "cesto de arame dobrável"
+msgstr[1] "cestos de arame dobráveis"
 
 #. ~ Description for folding wire basket
 #: lang/json/GENERIC_from_json.py
@@ -48843,8 +50064,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "bike basket"
 msgid_plural "bike baskets"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "cesto de bicicleta"
+msgstr[1] "cestos de bicicleta"
 
 #. ~ Description for bike basket
 #: lang/json/GENERIC_from_json.py
@@ -48855,8 +50076,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "cargo carrier"
 msgid_plural "cargo carriers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "carregador de carga"
+msgstr[1] "carregadores de carga"
 
 #. ~ Description for cargo carrier
 #: lang/json/GENERIC_from_json.py
@@ -48870,8 +50091,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "floor trunk"
 msgid_plural "floor trunks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "porta-malas de piso"
+msgstr[1] "porta-malas de piso"
 
 #. ~ Description for floor trunk
 #: lang/json/GENERIC_from_json.py
@@ -48879,6 +50100,8 @@ msgid ""
 "A section of flooring with a cargo-space beneath, and a hinged door for "
 "access."
 msgstr ""
+"Uma seção de piso com um espaço para carga em baixo, e uma porta com "
+"dobradiças para acesso."
 
 #: lang/json/GENERIC_from_json.py
 msgid "livestock carrier"
@@ -48936,8 +50159,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "dashboard"
 msgid_plural "dashboards"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "painél"
+msgstr[1] "painéis"
 
 #. ~ Description for dashboard
 #. ~ Description for electronics control unit
@@ -48952,8 +50175,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "electronics control unit"
 msgid_plural "electronics control units"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "unidade de controle de eletrônicos"
+msgstr[1] "unidades de controle de eletrônicos"
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 #: lang/json/vehicle_part_from_json.py
@@ -49253,8 +50476,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "plow"
 msgid_plural "plows"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "arado"
+msgstr[1] "arados"
 
 #. ~ Description for plow
 #: lang/json/GENERIC_from_json.py
@@ -49498,8 +50721,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "wind turbine"
 msgid_plural "wind turbines"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "turbina de vento"
+msgstr[1] "turbinas de vento"
 
 #. ~ Description for wind turbine
 #: lang/json/GENERIC_from_json.py
@@ -49511,13 +50734,13 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "large wind turbine"
 msgid_plural "large wind turbines"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "turbina de vento grande"
+msgstr[1] "turbinas de vento grandes"
 
 #. ~ Description for large wind turbine
 #: lang/json/GENERIC_from_json.py
 msgid "A large turbine that can convert wind into electric power."
-msgstr ""
+msgstr "Uma grande turbina que pode converter vento em energia elétrica."
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "water wheel"
@@ -50264,7 +51487,7 @@ msgstr[1] ""
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -50276,8 +51499,8 @@ msgstr[1] ""
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -51482,6 +52705,27 @@ msgid ""
 "art."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr ""
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -51986,6 +53230,138 @@ msgid_plural "dao +2s"
 msgstr[0] ""
 msgstr[1] ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
@@ -52263,6 +53639,21 @@ msgid ""
 "to land astoundingly powerful blows."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -52345,6 +53736,19 @@ msgid ""
 "prized for their beauty and power."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -52371,100 +53775,6 @@ msgid ""
 "scales could make a suit of armor as hard as steel and half as heavy."
 msgstr ""
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr ""
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr ""
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -52539,6 +53849,56 @@ msgstr[1] ""
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr ""
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -52784,8 +54144,8 @@ msgstr[1] ""
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -52799,7 +54159,7 @@ msgstr[1] ""
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -53565,8 +54925,34 @@ msgstr[1] ""
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -53584,6 +54970,17 @@ msgid ""
 "rock and lava everywhere."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
@@ -54549,12 +55946,6 @@ msgstr ""
 "podernivelarmontanhas com um único golpe. Está decorado com ornamentos de "
 "ouro eprata."
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] ""
-msgstr[1] ""
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -55640,6 +57031,11 @@ msgstr "MATERIAL QUÍMICO"
 msgid "SPARE PARTS"
 msgstr "PARTES SEPARADAS"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "RECIPIENTES"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "ARTEFATOS"
@@ -55650,6 +57046,311 @@ msgstr "ARTEFATOS"
 msgid "ARMOR"
 msgstr "ARMADURAS"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "ITENS VESTADOS"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "ARMA REALIZADA"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr "Roubo: Não sorteado"
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr "Roubo: Comida"
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr "Saque: P. Food"
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr "Roubo: Beba"
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr "Saque: P. Drink"
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr "Destino para bebidas perecíveis."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr ""
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr "Roubo: Armas"
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr "Roubo: Revistas"
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr "Destino para revistas de armas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr "Roubo: Munição"
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr "Destino para munição."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr "Saque: Armas"
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr "Destino para armas brancas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr "Roubo: Ferramentas"
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr "Destino para ferramentas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr "Roubo: Vestuário"
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr "Saque: F. Roupa"
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr "Destino para roupas imundas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr "Roubo: Drogas"
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr "Destino de drogas e outros itens médicos."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr "Roubo: Livros"
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr "Destino para livros e revistas."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr "Roubo: Mods"
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr "Destino para modificações de arma de fogo e itens semelhantes."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr "Roubo: Mutagens"
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr "Destino para mutagênicos, soros e purificadores."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr "Roubo: Biônica"
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr "Saque: V. Parts"
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr "Destino para peças de veículos."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr "Roubo: Outro"
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr "Destino para outros itens diversos."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr "Roubo: Combustível"
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr ""
+" Destino para gasolina, diesel, óleo de lâmpada e outras substâncias usadas "
+"como combustível."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr "Saque: Sementes"
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr "Destino para sementes, caules e itens semelhantes."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr "Roubo: Químico"
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr "Destino para produtos químicos."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr "Saque: S. Parts"
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr "Destino para peças de reposição."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr "Roubo: Artefatos"
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr "Destino para artefatos"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr ""
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr "Roubo: Armadura"
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr "Saque: F. Armor"
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr "Destino para armadura imunda."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr "Roubo: Madeira"
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr "Destino para lenha e itens que podem ser usados como tal."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr ""
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr "Roubo: Ignorar"
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr ""
+" Os itens dentro desta zona são ignorados pela \\ 'ordenar saquear \\' ação "
+"da zona."
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -55871,7 +57572,7 @@ msgstr[1] ""
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
 msgstr ""
 
@@ -56260,8 +57961,8 @@ msgstr "Compartimento de bateria H &amp; K G3"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
-msgstr "Uma revista de tambor de 50 rounds para o rifle H &amp; K G3."
+msgid "A 50-round drum magazine for the H&K G3 rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "H&K G3 magazine"
@@ -56306,8 +58007,8 @@ msgstr "Revista de tambores FN SCAR-H"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
-msgstr "Uma revista de tambor de 50 rounds para o rifle FN SCAR-H."
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "FN SCAR-H magazine"
@@ -56405,17 +58106,6 @@ msgstr ""
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr ""
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "Revista Taurus .38"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr ""
-" Um compartimento compacto de caixa de aço para uso com a pistola "
-"TaurusPro.38."
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr ""
@@ -56489,6 +58179,16 @@ msgstr ""
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr ""
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr ""
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr ""
@@ -56533,12 +58233,13 @@ msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "SIG Pro .40 magazine"
-msgstr "Revista SIG Pro .40"
+msgstr "carregador SIG Pro .40"
 
 #. ~ Description for SIG Pro .40 magazine
 #: lang/json/MAGAZINE_from_json.py
 msgid "A compact and reliable magazine for use with the SIG Pro .40 pistol."
-msgstr "Uma revista compacta e confiável para uso com a pistola SIG Pro .40."
+msgstr ""
+"Um carregador compacto e confiável para uso com a pistola SIG Pro .40."
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "makeshift .40 20-round magazine"
@@ -56591,7 +58292,7 @@ msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "grenade belt"
-msgstr "cinto de granada"
+msgstr "cinto de granadas"
 
 #. ~ Description for grenade belt
 #: lang/json/MAGAZINE_from_json.py
@@ -56600,13 +58301,13 @@ msgid ""
 "This one holds 40mm grenades and is too bulky to be worn like other ammo "
 "belts."
 msgstr ""
-" Um cinto de munição que consiste de ligações metálicas que "
-"sedesintegramapós o disparo. Este tem granadas de 40mm e é muito "
-"volumosopara ser usadocomo outros cinturões de munição."
+"Um cinto de munição feito de ligações metálicas que se desintegram após o "
+"disparo. Este tem granadas de 40mm e é muito volumoso para ser vestido como "
+"outros cinturões de munição."
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "Saiga-410 box magazine"
-msgstr "Revista de caixa Saiga-410"
+msgstr "Carregador caixa de Saiga-410"
 
 #. ~ Description for Saiga-410 box magazine
 #: lang/json/MAGAZINE_from_json.py
@@ -56614,10 +58315,12 @@ msgid ""
 "A removable plastic box magazine for the Saiga-410 shotgun.  Holds 10 "
 "shells."
 msgstr ""
+"Um carregador plástico removível em forma de caixa para uma escopeta "
+"Saiga-410. Armazena 10 cartuchos."
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "Saiga-410 drum magazine"
-msgstr "Lojas de estrada Saiga-410"
+msgstr "Carregador tambor de Saiga-410"
 
 #. ~ Description for Saiga-410 drum magazine
 #: lang/json/MAGAZINE_from_json.py
@@ -56625,6 +58328,8 @@ msgid ""
 "A removable plastic drum magazine for the Saiga-410 shotgun.  Holds 30 "
 "shells."
 msgstr ""
+"Um carregador plástico removível em forma de tambor para uma escopeta "
+"Saiga-410. Armazena 30 cartuchos."
 
 #: lang/json/MAGAZINE_from_json.py
 msgid ".44 6-round speedloader"
@@ -56639,46 +58344,47 @@ msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "Desert Eagle magazine"
-msgstr "Revista Desert Eagle"
+msgstr "carregador de Desert Eagle"
 
 #. ~ Description for Desert Eagle magazine
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "A standard 7-round steel box magazine for use with the IMI Desert Eagle."
 msgstr ""
-"Um magazine de 7 barras de aço padrão para uso com o IMI Desert Eagle."
+"Um carregador de aço padrão de 7 tiros para uso com a IMI Desert Eagle."
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 extended magazine"
-msgstr "Revista estendida M1911"
+msgstr "carregador estendido de M1911"
 
 #. ~ Description for M1911 extended magazine
 #: lang/json/MAGAZINE_from_json.py
 msgid "An extended 10-round magazine for use with the M1911 handgun."
-msgstr "Uma revista estendida de 10 rodadas para uso com a pistola M1911."
+msgstr "Um carregador estendido de 10 cartuchos para uso com a pistola M1911."
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 magazine"
-msgstr "Revista M1911"
+msgstr "carregador de M1911"
 
 #. ~ Description for M1911 magazine
 #: lang/json/MAGAZINE_from_json.py
 msgid "A military issue 7-round magazine for use with the M1911 handgun."
-msgstr "Uma revista militar de 7 rounds para uso com a pistola M1911."
+msgstr "Um carregador militar de 7 cartuchos para uso com a pistola M1911."
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "MAC-10 magazine"
-msgstr "Revista MAC-10"
+msgstr "carregador de MAC-10"
 
 #. ~ Description for MAC-10 magazine
 #: lang/json/MAGAZINE_from_json.py
 msgid "A cheap 30-round steel box magazine for use with the MAC-10 SMG."
 msgstr ""
-"Um compartimento de 30 barras de aço barato para uso com o MAC-10 SMG."
+"Um carregador de aço barato de 30 cartuchos, para uso com a submetralhadora "
+"MAC-10."
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "makeshift .45 20-round magazine"
-msgstr ""
+msgstr "carregador improvisado .45 de 20 cartuchos"
 
 #. ~ Description for makeshift .45 20-round magazine
 #: lang/json/MAGAZINE_from_json.py
@@ -56687,15 +58393,18 @@ msgid ""
 "submachinegun, with a simplified feed system.  It looks like it might feed "
 "20 rounds of .45 ACP."
 msgstr ""
+"Um carregador improvisado, razoavelmente compatível com uma submetralhadora "
+"\"Luty\" caseira, com um sistema de alimentação simplificado. Parece que "
+"pode carregar 20 cartuchos de .45 ACP."
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "TDI Vector magazine"
-msgstr "Revista TDI Vector"
+msgstr "carregador de TDI Vector"
 
 #. ~ Description for TDI Vector magazine
 #: lang/json/MAGAZINE_from_json.py
 msgid "A 30-round steel box magazine for use with the TDI Vector"
-msgstr "Um magazine de caixa de aço 30 redondo para uso com o vetor TDI"
+msgstr "Um carregador de aço de 30 cartuchos para uso com o TDI Vector"
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "Thompson extended magazine"
@@ -56704,11 +58413,12 @@ msgstr "carregador estendido de Thompson"
 #. ~ Description for Thompson extended magazine
 #: lang/json/MAGAZINE_from_json.py
 msgid "An extended 30-round magazine for the Thompson submachine gun."
-msgstr "Uma revista estendida de 30 rounds para a submetralhadora Thompson."
+msgstr ""
+"Um carregador estendido de 30 cartuchos para a submetralhadora Thompson."
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "Thompson drum magazine"
-msgstr "carregador de tambor para Thumpson"
+msgstr "carregador de tambor para Thompson"
 
 #. ~ Description for Thompson drum magazine
 #: lang/json/MAGAZINE_from_json.py
@@ -59484,7 +61194,7 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
+"appears to have a mininuke inside.  If this is targeting you…  Run."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -60018,11 +61728,8 @@ msgstr[1] ""
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
+"off in popularity… and price."
 msgstr ""
-" Essas coisas já foram consideradas pragas que não valem a penaseremcomidas,"
-" então algum gênio do marketing começou a vendê-las para aspessoascomo uma "
-"iguaria e elas decolaram em popularidade ... e preço."
 
 #: lang/json/MONSTER_from_json.py
 msgid "crayfish"
@@ -60034,10 +61741,8 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
+"water, and some spicy seasonings…"
 msgstr ""
-" Se você pudesse pegar mais um desses, uma panela de água fervente "
-"ealgunstemperos picantes ..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "Blinky"
@@ -61473,10 +63178,8 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
+"makes it sound… hungry."
 msgstr ""
-" Um roedor de cauda de verme com longos bigodes e olhos redondos. A maneira "
-"como ele chia o faz parecer... com fome."
 
 #: lang/json/MONSTER_from_json.py
 msgid "lamb"
@@ -61989,11 +63692,22 @@ msgstr[1] ""
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
 msgstr ""
-" Este boomer, normalmente inchado e pronto para explodir, fortaleceu-se e "
-"solidificou-se. A bílis driblando de sua boca também parece ter mudado..."
 
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
@@ -62050,7 +63764,7 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -62793,8 +64507,8 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "jabberwock"
 msgid_plural "jabberwocks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "jaguadarte"
+msgstr[1] "jaguadartes"
 
 #. ~ Description for jabberwock
 #: lang/json/MONSTER_from_json.py
@@ -62957,13 +64671,11 @@ msgstr[1] ""
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
-" Shia LaBeoufLiving na floresta, \n"
-"  kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk."
 
 #: lang/json/MONSTER_from_json.py
 msgid "shoggoth"
@@ -63254,7 +64966,7 @@ msgstr[1] ""
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr ""
@@ -63445,19 +65157,13 @@ msgstr[1] ""
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
 msgstr ""
-" O fedor mais horrível está no ar, \n"
-" O funk de quarenta mil anos, \n"
-"  Esarcásticos carniçais de todos os túmulos, \n"
-" Estão se aproximandoparaselar sua desgraça! \n"
-"  \n"
-" A dançarina nem percebe você, parecealgopróximo está controlando isso."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie dog"
@@ -63776,14 +65482,11 @@ msgstr[1] ""
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
-" E apesar de lutar para se manter vivo, o seu corpo começa a tremer. \n"
-"  Porque nenhum mero mortal pode resistir, \n"
-" O mal do thriller."
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie snapper"
@@ -65486,8 +67189,8 @@ msgstr ""
 "umrobô,ele fede como a morte."
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -66117,21 +67820,23 @@ msgid "The black pudding burns you with acid!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
+msgid "krabgek"
+msgid_plural "krabgeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
 msgstr ""
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
+msgid "The krabgek gazes at %3$s!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -66179,8 +67884,47 @@ msgstr[1] ""
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -66538,8 +68282,8 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "EMP turret"
 msgid_plural "EMP turrets"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "torre PEM"
+msgstr[1] "torres PEM"
 
 #. ~ Description for EMP turret
 #: lang/json/MONSTER_from_json.py
@@ -66549,16 +68293,16 @@ msgid ""
 "enemies alike.  Its electro magnetic pulse generator can swivel a full 360 "
 "degrees."
 msgstr ""
-" O DoubleTech T-EMP3 Corona, uma torre EMP automatizada avançada "
-"queutilizasistemas ATR de última geração para reorientar-se dinamicamente "
-"paranovosamigos e inimigos. Seu gerador de pulsos eletromagnéticos pode "
-"girar360graus."
+"O DoubleTech T-EMP3 Corona, uma avançada torre automatizada de PEM que "
+"utiliza sistemas ATR de última geração para reorientar-se dinamicamente para"
+" novos amigos e inimigos. Seu gerador de pulsos eletromagnéticos pode girar "
+"360 graus."
 
 #: lang/json/MONSTER_from_json.py
 msgid "guardin gnome"
 msgid_plural "guardin gnomes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "gnobô de jardim"
+msgstr[1] "gnobôs de jardim"
 
 #. ~ Description for guardin gnome
 #. ~ Description for garden gnome
@@ -66569,8 +68313,8 @@ msgstr "Um gnomo de jardim normal e completamente inofensivo."
 #: lang/json/MONSTER_from_json.py
 msgid "utility robot"
 msgid_plural "utility robots"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "robô utilitário"
+msgstr[1] "robôs utilitários"
 
 #. ~ Description for utility robot
 #: lang/json/MONSTER_from_json.py
@@ -66578,8 +68322,8 @@ msgid ""
 "One of the many models of utility robot formerly in use by government "
 "agencies, private corporations, and civilians alike."
 msgstr ""
-" Um dos muitos modelos de robôs utilitários anteriormente usados "
-"poragênciasgovernamentais, corporações privadas e civis."
+"Um dos muitos modelos de robôs utilitários anteriormente usados por agências"
+" governamentais, corporações privadas e civis."
 
 #. ~ Description for eyebot
 #: lang/json/MONSTER_from_json.py
@@ -66588,9 +68332,9 @@ msgid ""
 "blinding flash.  No longer linked to police or security network, it "
 "continues its unending hunt for criminals and trespassers."
 msgstr ""
-" Um pequeno robô aéreo equipado com um conjunto de câmeras e armado "
-"comumflash ofuscante. Não está mais ligado à polícia ou à rede de "
-"segurançaecontinua sua busca interminável por criminosos e invasores."
+"Um pequeno robô aéreo equipado com um conjunto de câmeras e armado com um "
+"flash ofuscante. Não está mais ligado à polícia ou à rede de segurança, mas "
+"continua sua busca interminável por criminosos e invasores."
 
 #. ~ Description for skitterbot
 #: lang/json/MONSTER_from_json.py
@@ -66599,15 +68343,15 @@ msgid ""
 "Armed with two close-range tazers, it can skate across the ground with great"
 " speed."
 msgstr ""
-" Um robô insectoide do tamanho de um cachorro pequeno, "
-"projetadoparasegurança doméstica. Armado com dois tazers de curto alcance, "
-"ele pode patinar no chão com grande velocidade."
+"Um robô insectóide do tamanho de um cachorro pequeno, projetado para "
+"segurança doméstica. Armado com dois tazers de curto alcance, ele pode "
+"patinar no chão com grande velocidade."
 
 #: lang/json/MONSTER_from_json.py
 msgid "defense robot"
 msgid_plural "defense robots"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "robô de defesa"
+msgstr[1] "robôs de defesa"
 
 #. ~ Description for defense robot
 #: lang/json/MONSTER_from_json.py
@@ -66615,15 +68359,15 @@ msgid ""
 "An automated defense robot still active due to its internal power source. "
 "This one is armed with an electric prod and an integrated 9mm firearm."
 msgstr ""
-" Um robô de defesa automatizado ainda ativo devido à sua fonte "
-"deenergiainterna. Este é armado com um impulso elétrico e uma arma de "
-"fogointegradade 9mm."
+"Um robô de defesa automatizado ainda ativo devido à sua fonte de energia "
+"interna. Este é armado com um bastão de choque elétrico e uma arma de fogo "
+"integrada de 9mm."
 
 #: lang/json/MONSTER_from_json.py
 msgid "security robot"
 msgid_plural "security robots"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "robô de segurança"
+msgstr[1] "robôs de segurança"
 
 #. ~ Description for security robot
 #: lang/json/MONSTER_from_json.py
@@ -66631,14 +68375,14 @@ msgid ""
 "An automated defense robot still active due to its internal power source. "
 "This one is equipped with an integrated 9mm firearm."
 msgstr ""
-" Um robô de defesa automatizado ainda ativo devido à sua fonte "
-"deenergiainterna. Este é equipado com uma arma de fogo integrada de 9mm."
+"Um robô de defesa automatizado ainda ativo devido à sua fonte de energia "
+"interna. Este é equipado com uma arma de fogo integrada de 9 mm."
 
 #: lang/json/MONSTER_from_json.py
 msgid "riotcontrol robot"
 msgid_plural "riotcontrol robots"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "robô para controle de manifestações"
+msgstr[1] "robôs para controle de manifestações"
 
 #. ~ Description for riotcontrol robot
 #: lang/json/MONSTER_from_json.py
@@ -66647,9 +68391,9 @@ msgid ""
 "This one is equipped with an electric prod, tear gas sprayer, and integrated"
 " 40mm beanbag launcher."
 msgstr ""
-" Um robô de defesa automatizado ainda ativo devido à sua fonte "
-"deenergiainterna. Este é equipado com um dispositivo elétrico, spray "
-"degáslacrimogêneo e um lançador de beanbag integrado de 40mm."
+"Um robô de defesa automatizado ainda ativo devido à sua fonte de energia "
+"interna. Este é equipado com um bastão elétrico, spray de gás lacrimogêneo e"
+" um lançador integrado de munição não-letal de 40mm."
 
 #: lang/json/MONSTER_from_json.py
 msgid "necco"
@@ -68414,9 +70158,9 @@ msgid "Reveals an area around you on the overmap"
 msgstr ""
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
-msgstr "Você tem uma visão da área circundante ..."
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
+msgstr ""
 
 #: lang/json/SPELL_from_json.py
 msgid "Artifact Firestorm"
@@ -68621,8 +70365,8 @@ msgstr ""
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -68660,7 +70404,7 @@ msgstr ""
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -68709,6 +70453,20 @@ msgstr ""
 msgid "Translocates the user to an attuned gate."
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr ""
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr ""
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr ""
@@ -68758,7 +70516,7 @@ msgstr ""
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -68915,7 +70673,7 @@ msgstr ""
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr ""
 
@@ -68926,8 +70684,8 @@ msgstr ""
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -68974,8 +70732,8 @@ msgstr ""
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69001,6 +70759,10 @@ msgstr ""
 msgid "Lava Bomb"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr ""
@@ -69008,7 +70770,7 @@ msgstr ""
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr ""
@@ -69020,9 +70782,9 @@ msgstr ""
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69095,7 +70857,7 @@ msgstr ""
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 
@@ -69138,8 +70900,8 @@ msgstr ""
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py lang/json/effects_from_json.py
@@ -69158,6 +70920,15 @@ msgstr ""
 msgid "Fox's Cunning"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr ""
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr ""
@@ -69197,8 +70968,8 @@ msgstr ""
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69259,8 +71030,8 @@ msgstr ""
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr ""
 
 #: lang/json/SPELL_from_json.py
@@ -69287,6 +71058,10 @@ msgstr ""
 msgid "Mirror Image"
 msgstr ""
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr ""
@@ -69859,6 +71634,46 @@ msgstr ""
 "capacete. Está ligado e drenando continuamente as baterias. Use-o para "
 "desligá-lo."
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -69948,8 +71763,8 @@ msgstr[1] ""
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
 
@@ -71093,13 +72908,11 @@ msgstr "As baterias do protetor de ouvido estão mortas."
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
 msgstr ""
-" Um par de abafadores favorecidos pelos atiradores. Os protetores "
-"deouvidoestão desligados. Eles bloquearão sons acima de uma certa "
-"quantidadededecibéis, presumindo que eles estejam carregados com baterias."
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -71568,6 +73381,213 @@ msgid ""
 "power."
 msgstr ""
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr ""
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -71913,9 +73933,9 @@ msgstr[1] ""
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
 
@@ -72048,12 +74068,9 @@ msgstr[1] ""
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr ""
-" ferramentas integradasetópios bionicosBisturis "
-"cirúrgicosautônomosbionicnavalhavara de clarividênciaArtigo para testar "
-"abandeiraaep_clairvoyance_plus. Se isso gera aleatoriamente, então é um bug."
 
 #: lang/json/TOOL_from_json.py
 msgid "boulder anvil"
@@ -72381,7 +74398,7 @@ msgstr "Você acende o pavio na %s."
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr ""
@@ -72404,8 +74421,8 @@ msgstr ""
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -72417,7 +74434,7 @@ msgstr[1] ""
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
@@ -72432,8 +74449,8 @@ msgstr[1] ""
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr ""
 
@@ -72453,8 +74470,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -72467,8 +74484,8 @@ msgstr[1] ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -72479,9 +74496,9 @@ msgstr[1] ""
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "Luz"
 
@@ -72515,7 +74532,7 @@ msgstr ""
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
+"  The face shifts."
 msgstr ""
 
 #. ~ Description for battle axe
@@ -72681,6 +74698,27 @@ msgstr ""
 " Esta é uma lata cheia até a borda com pólvora preta e com um "
 "fusívelacesodentro dela."
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "fogareiro hobo (aceso) A brasa se extingue."
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -72878,8 +74916,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "compressed air horn"
 msgid_plural "compressed air horns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "buzina de ar comprimido"
+msgstr[1] "buzinas de ar comprimido"
 
 #. ~ Use action noise_message for compressed air horn.
 #: lang/json/TOOL_from_json.py
@@ -72904,8 +74942,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "alarm clock"
 msgid_plural "alarm clocks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "despertador"
+msgstr[1] "despertadores"
 
 #. ~ Description for alarm clock
 #: lang/json/TOOL_from_json.py
@@ -72945,8 +74983,8 @@ msgstr[1] "moinhos d'água"
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py lang/json/furniture_from_json.py
@@ -72958,8 +74996,8 @@ msgstr[1] "moinhos de vento"
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -73045,8 +75083,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "nailboard trap"
 msgid_plural "nailboard traps"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "armadilha de tábua com pregos"
+msgstr[1] "armadilhas de tábua com pregos"
 
 #. ~ Use action done_message for nailboard trap.
 #: lang/json/TOOL_from_json.py
@@ -73083,8 +75121,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "bone flute"
 msgid_plural "bone flutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "flauta de osso"
+msgstr[1] "flautas de osso"
 
 #. ~ Description for bone flute
 #: lang/json/TOOL_from_json.py
@@ -73115,8 +75153,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "brick kiln"
 msgid_plural "brick kilns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "forno de tijolo"
+msgstr[1] "fornos de tijolo"
 
 #. ~ Description for brick kiln
 #: lang/json/TOOL_from_json.py
@@ -73355,12 +75393,9 @@ msgstr[1] ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
 msgstr ""
-" carver elétrico (off) Um carver elétrico de carne alimentado porbaterias. "
-"Duas lâminas serrilhadas que vibram juntas para cortarpraticamentequalquer "
-"coisa, de peru a presunto ... até zumbis!"
 
 #: lang/json/TOOL_from_json.py
 msgid "electric carver (on)"
@@ -73557,7 +75592,7 @@ msgstr[1] ""
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr ""
@@ -74084,10 +76119,8 @@ msgstr[1] ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-" algemas eletrônicasUm par de algemas eletrônicas, usadas por policiaisebots de motim para deter cativos. Sua sirene contínua identificaclaramenteo usuário como criminoso preso e alerta a polícia humana. Esperepelachegada, não tente escapar ou remover as algemas - eles administrarãoumchoque elétrico. \n"
-" No entanto, como a única polícia queprovavelmenteresponderá é morta-viva, você pode ter uma longa espera pelafrente, amenos que seja criativo. .."
 
 #: lang/json/TOOL_from_json.py
 msgid "entrenching tool"
@@ -76316,8 +78349,8 @@ msgstr[1] ""
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -77160,8 +79193,8 @@ msgid ""
 "This is an experimental device that will teleport you a short distance when "
 "activated."
 msgstr ""
-" teleporterEste é um dispositivo experimental que te teletransportará "
-"aumacurta distância quando ativado."
+"Este é um dispositivo experimental que te teletransportará a uma curta "
+"distância quando ativado."
 
 #: lang/json/TOOL_from_json.py
 msgid "tent"
@@ -77174,8 +79207,8 @@ msgstr[1] ""
 msgid ""
 "This is a small personal tent, it's just big enough to fit you comfortably."
 msgstr ""
-" Esta é uma pequena tenda pessoal, é grande o suficiente para vocêseencaixar"
-" confortavelmente."
+"Esta é uma pequena tenda pessoal, é grande o suficiente para você se "
+"encaixar confortavelmente."
 
 #: lang/json/TOOL_from_json.py
 msgid "Flaming Chunk of Steel +2"
@@ -77197,7 +79230,7 @@ msgstr[1] "termômetros"
 #. ~ Description for thermometer
 #: lang/json/TOOL_from_json.py
 msgid "A plastic thermometer that can read the air temperature."
-msgstr "um termômetro de plástico que pode ler a temperatura do ar"
+msgstr "Um termômetro de plástico que pode medir a temperatura do ar."
 
 #: lang/json/TOOL_from_json.py
 msgid "throwable fire extinguisher"
@@ -77212,10 +79245,9 @@ msgid ""
 "regular fire extinguisher, you can use it from a distance.  It is activated "
 "by heat, so just throw it into the flames."
 msgstr ""
-" extintor de incêndio que pode ser lançadoEste é um extintor de "
-"incêndioemforma de granada. Embora não seja tão eficaz quanto um extintor "
-"deincêndiocomum, você pode usá-lo à distância. É ativado pelo calor, "
-"entãoapenasjogue-o nas chamas."
+"Este é um extintor de incêndio em forma de granada. Embora não seja tão "
+"eficaz quanto um extintor de incêndio comum, você pode usá-lo à distância. É"
+" ativado pelo calor, então apenas jogue-o nas chamas."
 
 #: lang/json/TOOL_from_json.py
 msgid "pair of metal tongs"
@@ -77229,8 +79261,8 @@ msgid ""
 "These are long, metal tongs.  They are commonly used for cooking or in "
 "metalworking fabrication recipes."
 msgstr ""
-" par de pinças de metalEstas são longas pinças de metal. Eles "
-"sãocomumenteusados para cozinhar ou em receitas de fabricação de metais."
+"Estas são longas pinças de metal. Elas são comumente usadas para cozinhar ou"
+" em receitas de fabricação de metais."
 
 #: lang/json/TOOL_from_json.py
 msgid "small space heater"
@@ -77307,9 +79339,7 @@ msgstr[1] ""
 #. ~ Use action msg for ANFO charge.
 #: lang/json/TOOL_from_json.py
 msgid "You light the fuse on the ANFO charge.  Run survivor, run!"
-msgstr ""
-" ANFO chargeVocê acende o fusível na carga do ANFO. Corrasobrevivente, "
-"corra!"
+msgstr "Você acende o fusível na carga do ANFO. Corra sobrevivente, corra!"
 
 #. ~ Description for ANFO charge
 #: lang/json/TOOL_from_json.py
@@ -77332,7 +79362,7 @@ msgstr[1] ""
 #. ~ Use action no_deactivate_msg for active black gunpowder charge.
 #: lang/json/TOOL_from_json.py
 msgid "You've already lit the fuse - run!"
-msgstr "carga ANFO ativaVocê já acendeu o fusível - corra!"
+msgstr "Você já acendeu o fusível - corra!"
 
 #. ~ Description for active ANFO charge
 #: lang/json/TOOL_from_json.py
@@ -77340,9 +79370,8 @@ msgid ""
 "This is a large metal keg filled with ANFO pellets and equipped with a "
 "dynamite primer.  The fuse has been lit - better run like hell!"
 msgstr ""
-" Este é um grande barril de metal cheio de pelotas ANFO e equipado "
-"comumprimer de dinamite. O fusível foi aceso - é melhor correr como o "
-"inferno!"
+" Este é um grande barril de metal cheio de pelotas ANFO e equipado com uma "
+"espoleta de dinamite. O fusível foi aceso - é melhor correr como o inferno!"
 
 #: lang/json/TOOL_from_json.py
 msgid "black gunpowder charge"
@@ -77355,20 +79384,15 @@ msgstr[1] ""
 msgid ""
 "You light the fuse on the black gunpowder charge.  Get rid of it quickly!"
 msgstr ""
-" Carga preta de pólvora Você acende o fusível na carga preta depólvora. "
-"Livre-se disso rapidamente!"
+"Você acende o fusível na carga de pólvora negra. Livre-se disso rapidamente!"
 
 #. ~ Description for black gunpowder charge
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr ""
-" Este é um dispositivo explosivo caseiro, consistindo de um grande "
-"jarrodeplástico cheio de pólvora preta e sucata de metal, equipado com "
-"umlongoestopim. Use este item para acender o fusível. Deve explodir "
-"empoucosminutos ..."
 
 #: lang/json/TOOL_from_json.py
 msgid "active black gunpowder charge"
@@ -77383,9 +79407,9 @@ msgid ""
 "filled with black gunpowder and scrap metal, whose fuse has been lit, its "
 "final countdown starting."
 msgstr ""
-" Este é um dispositivo explosivo caseiro, consistindo de um grande "
-"jarrodeplástico cheio de pólvora preta e sucata de metal, cujo fusível "
-"foiaceso, começando sua contagem regressiva final."
+"Este é um dispositivo explosivo caseiro, consistindo de um grande jarro de "
+"plástico cheio de pólvora negra e sucata de metal, cujo fusível foi aceso, "
+"começando sua contagem regressiva final."
 
 #: lang/json/TOOL_from_json.py
 msgid "RDX charge"
@@ -77396,7 +79420,7 @@ msgstr[1] ""
 #. ~ Use action msg for RDX charge.
 #: lang/json/TOOL_from_json.py
 msgid "You light the fuse on the explosive charge.  Clear the area!"
-msgstr "Carga RDXVocê acende o fusível na carga explosiva. Limpe a área!"
+msgstr "Você acende o fusível na carga explosiva. Limpe a área!"
 
 #. ~ Description for RDX charge
 #: lang/json/TOOL_from_json.py
@@ -77405,9 +79429,9 @@ msgid ""
 "Contains a core of primary explosive to ensure that the charge detonates "
 "completely and delivers its entire destructive power to everything in sight."
 msgstr ""
-" Este é um barril de metal, cheio com 50 litros de RDX e sucata de metal. "
-"Contém um núcleo de explosivo primário para garantir que a carga "
-"detonecompletamente e entregue todo o seu poder destrutivo a tudo à vista."
+"Este é um barril de metal, cheio com 50 litros de RDX e sucata de metal. "
+"Contém um núcleo de explosivo primário para garantir que a carga detone "
+"completamente e entregue todo o seu poder destrutivo a tudo à vista."
 
 #: lang/json/TOOL_from_json.py
 msgid "active RDX charge"
@@ -77418,8 +79442,7 @@ msgstr[1] ""
 #. ~ Use action no_deactivate_msg for active RDX charge.
 #: lang/json/TOOL_from_json.py
 msgid "You've already lit the fuse - clear the area immediately!"
-msgstr ""
-" carga de RDX ativa Você já acendeu o fusível - limpe a área imediatamente!"
+msgstr "Você já acendeu o pavio - limpe a área imediatamente!"
 
 #. ~ Description for active RDX charge
 #: lang/json/TOOL_from_json.py
@@ -77428,9 +79451,9 @@ msgid ""
 "The fuse has been lit and once it ignites the primary explosive, the charge "
 "will detonate and rain fire and steel on everything in sight."
 msgstr ""
-" Este é um barril de metal, cheio com 50 litros de RDX e sucata de metal. "
-"Ofusível foi aceso e, uma vez que acenda o explosivo primário, a carga "
-"irádetonar e chover fogo e aço em tudo à vista."
+"Este é um barril de metal, cheio com 50 litros de RDX e sucata de metal. O "
+"fusível foi aceso e, uma vez que acenda o explosivo primário, a carga irá "
+"detonar e chover fogo e aço em tudo à vista."
 
 #: lang/json/TOOL_from_json.py
 msgid "rocket candy"
@@ -77441,12 +79464,12 @@ msgstr[1] ""
 #. ~ Use action menu_text for rocket candy.
 #: lang/json/TOOL_from_json.py
 msgid "Light candy"
-msgstr "rocket candy Light candy"
+msgstr "Acender doce"
 
 #. ~ Use action msg for rocket candy.
 #: lang/json/TOOL_from_json.py
 msgid "You light the rocket candy on fire.  Throw it!"
-msgstr "Você acende o foguete em chamas. Jogá-lo!"
+msgstr "Você acende o foguete doce em chamas. Jogue-o!"
 
 #. ~ Description for rocket candy
 #: lang/json/TOOL_from_json.py
@@ -77456,11 +79479,11 @@ msgid ""
 " smokescreen - if you lit the narrow end, you should be able to throw it "
 "before the flame reaches the broad end."
 msgstr ""
-" Um pedaço em forma de pêra de doce de foguete obtido aquecendo salitre "
-"comaçúcar e lançando o líquido obtido. Pode servir como um combustível "
-"defoguete, mas também como uma cortina de fumaça - se você acender "
-"aextremidade estreita, você deve ser capaz de jogá-lo antes que a "
-"chamaatinja a extremidade mais larga."
+" Um pedaço em forma de pêra de doce de foguete obtido aquecendo salitre com "
+"açúcar e fundindo o líquido obtido. Pode servir como um combustível de "
+"foguete, mas também como uma cortina de fumaça - se você acender a "
+"extremidade estreita, você deve ser capaz de jogá-lo antes que a chama "
+"atinja a extremidade mais larga."
 
 #: lang/json/TOOL_from_json.py
 msgid "burning rocket candy"
@@ -77476,7 +79499,7 @@ msgstr "Você já acendeu o pavio - livre-se dele imediatamente!"
 #. ~ Use action sound_msg for burning rocket candy.
 #: lang/json/TOOL_from_json.py
 msgid "Hsssss."
-msgstr "Hsssss"
+msgstr "Hsssss."
 
 #. ~ Description for burning rocket candy
 #: lang/json/TOOL_from_json.py
@@ -77975,37 +79998,6 @@ msgid_plural "hobo stoves"
 msgstr[0] ""
 msgstr[1] ""
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr ""
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "Você precisa de uma fonte de fogo!"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr ""
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "fogareiro hobo (aceso) A brasa se extingue."
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -78196,8 +80188,8 @@ msgstr[1] ""
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -78588,7 +80580,7 @@ msgstr ""
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -78606,7 +80598,7 @@ msgstr[1] ""
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -78696,9 +80688,9 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -78750,7 +80742,7 @@ msgstr ""
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -78779,8 +80771,8 @@ msgstr ""
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
@@ -78806,7 +80798,7 @@ msgstr ""
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
 msgstr ""
@@ -78814,8 +80806,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "inactive cleaner bot"
 msgid_plural "inactive cleaner bots"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "robô faxineiro inativo"
+msgstr[1] "robôs faxineiros inativos"
 
 #. ~ Use action friendly_msg for inactive cleaner bot.
 #: lang/json/TOOL_from_json.py
@@ -78830,8 +80822,8 @@ msgstr ""
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
 msgstr ""
 
@@ -78854,8 +80846,8 @@ msgstr ""
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
 msgstr ""
 
@@ -78879,9 +80871,9 @@ msgstr ""
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -78903,7 +80895,7 @@ msgstr ""
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
 msgstr ""
@@ -78957,7 +80949,7 @@ msgstr ""
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -78987,8 +80979,8 @@ msgstr ""
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
@@ -79014,10 +81006,10 @@ msgstr ""
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
 
@@ -79386,7 +81378,7 @@ msgstr[1] ""
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
+"of a stick.  However it's quite fragile."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -79493,6 +81485,21 @@ msgstr ""
 "pode ser fatal tanto nas mãos certas quanto quando conectada "
 "comoumabaioneta."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -79888,6 +81895,21 @@ msgstr ""
 "pode ser anexada à frente de uma arma de fogo ou uma besta, convertendo- aem"
 " umalança."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -80000,6 +82022,57 @@ msgstr ""
 " Esta é uma enorme espada curva de duas mãos do Japão. É surpreendentemente "
 "leve para o seu tamanho."
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -80407,6 +82480,34 @@ msgstr ""
 " pedaço de plásticoEste é um pedaço de plástico. Pode ser usadoparafabricar,"
 " reparar ou reforçar itens de plástico."
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -80828,15 +82929,15 @@ msgid ""
 "for people with asthma.  A mild stimulant, it may cause nervousness or "
 "tremors."
 msgstr ""
-" inalador inalador Albuterol. Usado no tratamento de broncoespasmo, é "
-"umatábua de salvação para as pessoas com asma. Um estimulante leve, "
-"podecausar nervosismo ou tremores."
+"inalador de Albuterol. Usado no tratamento de broncoespasmos, é uma salvação"
+" para as pessoas com asma. Um estimulante leve, pode causar nervosismo ou "
+"tremores."
 
 #: lang/json/TOOL_from_json.py
 msgid "RC control"
 msgid_plural "RC controls"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "controle remoto de carrinho"
+msgstr[1] "controles remotos de carrinho"
 
 #. ~ Description for RC control
 #: lang/json/TOOL_from_json.py
@@ -80845,27 +82946,26 @@ msgid ""
 "buttons that don't seem to do anything.  Perhaps they were for the deluxe "
 "model?"
 msgstr ""
-" Controle RC Um controle remoto para carros RC, com joystick para dirigir "
-"ocarro e botões coloridos que não parecem fazer nada. Talvez eles fossempara"
-" o modelo de luxo?"
+"Um controle remoto para carrinhos de controle remoto, com joystick para "
+"dirigir o carro e botões coloridos que não parecem fazer nada. Talvez eles "
+"fossem para o modelo de luxo?"
 
 #: lang/json/TOOL_from_json.py
 msgid "RC car"
 msgid_plural "RC cars"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "carrinho de controle remoto"
+msgstr[1] "carrinhos de controle remoto"
 
 #. ~ Description for RC car
 #: lang/json/TOOL_from_json.py
 msgid "A remote-controlled car.  Fun for young and old alike."
-msgstr ""
-" Carro de RC Um carro de controle remoto. Diversão para jovens e velhos."
+msgstr "Um carrinho de controle remoto. Diversão para jovens e velhos."
 
 #: lang/json/TOOL_from_json.py
 msgid "RC car (on)"
 msgid_plural "RC cars (on)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "carrinhos de controle remoto (ligado)"
+msgstr[1] "carrinhos de controle remoto (ligados)"
 
 #. ~ Description for RC car (on)
 #: lang/json/TOOL_from_json.py
@@ -80873,9 +82973,8 @@ msgid ""
 "This remote-controlled car is on, and draining its batteries just like a "
 "real electric car!  Use a remote control to drive it around."
 msgstr ""
-" Carro RC (ligado) Este carro de controle remoto está ligado e drenando "
-"suasbaterias como um verdadeiro carro elétrico! Use um controle remoto "
-"paradirigi-lo."
+"Este carrinho de controle remoto está ligado e drenando suas baterias como "
+"um verdadeiro carro elétrico! Use um controle remoto para dirigi-lo por aí."
 
 #: lang/json/TOOL_from_json.py
 msgid "radio activation mod"
@@ -80895,8 +82994,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "radio (off)"
 msgid_plural "radios (off)"
-msgstr[0] "rádio (off)"
-msgstr[1] "rádios (off)"
+msgstr[0] "rádio (desligado)"
+msgstr[1] "rádios (desligados)"
 
 #. ~ Description for radio (off)
 #: lang/json/TOOL_from_json.py
@@ -80905,14 +83004,14 @@ msgid ""
 "any nearby signals being broadcast and play them audibly."
 msgstr ""
 "Isso é um rádio portátil. Utilizar esse rádio irá ligá-lo. Ele sintonizará "
-"com qualquer sinal próximo sendo transmitido e começará a tocar "
+"com qualquer sinal próximo sendo transmitido e começará a tocá-lo "
 "audivelmente."
 
 #: lang/json/TOOL_from_json.py
 msgid "radio (on)"
 msgid_plural "radios (on)"
-msgstr[0] "rádio (on)"
-msgstr[1] "rádios (on)"
+msgstr[0] "rádio (ligado)"
+msgstr[1] "rádios (ligados)"
 
 #. ~ Description for radio (on)
 #: lang/json/TOOL_from_json.py
@@ -80920,9 +83019,9 @@ msgid ""
 "This portable radio is turned on, and continually draining its batteries.  "
 "It is playing the broadcast being sent from any nearby radio towers."
 msgstr ""
-" rádio (ligado) Este rádio portátil está ligado e drenando continuamentesuas"
-" baterias. Está tocando a transmissão que está sendo enviada de todasas "
-"torres de rádio próximas."
+"Este rádio portátil está ligado e drenando continuamente suas baterias. Está"
+" tocando a transmissão que está sendo enviada de todas as torres de rádio "
+"próximas."
 
 #: lang/json/TOOL_from_json.py
 msgid "two-way radio"
@@ -80934,18 +83033,14 @@ msgstr[1] ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
 msgstr ""
-" rádio bidirecional Este é um rádio com uma unidade de transmissão. "
-"Vocêpoderia usá-lo para contatar alguém que também tenha um. "
-"Infelizmenteninguém parece usá-los hoje em dia ..."
 
 #: lang/json/TOOL_from_json.py
 msgid "remote vehicle controller"
 msgid_plural "remote vehicle controllers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "controle remoto de veículo"
+msgstr[1] "controles remotos de veículo"
 
 #. ~ Description for remote vehicle controller
 #: lang/json/TOOL_from_json.py
@@ -80953,15 +83048,14 @@ msgid ""
 "A remote controller for real cars.  Can turn onboard devices on and off.  "
 "Some cars can be driven remotely."
 msgstr ""
-" controle remoto do veículo Um controle remoto para carros reais. Pode "
-"ligare desligar os dispositivos onboard. Alguns carros podem ser "
-"acionadosremotamente."
+"Um controle remoto para carros reais. Pode ligar e desligar os dispositivos "
+"do painel. Alguns carros podem ser dirigidos remotamente."
 
 #: lang/json/TOOL_from_json.py
 msgid "chemistry set"
 msgid_plural "chemistry sets"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "conjunto de química"
+msgstr[1] "conjuntos de química"
 
 #. ~ Description for chemistry set
 #: lang/json/TOOL_from_json.py
@@ -80970,16 +83064,16 @@ msgid ""
 "containers, hoses, metal wire, a hotplate, and safety glasses.  It might be "
 "used to craft some chemistry projects if you're so inclined."
 msgstr ""
-" conjunto de química Este é um conjunto de química armazenado em uma caixa. "
-"O conteúdo inclui recipientes de vidro, mangueiras, fios de metal, placa "
-"deaquecimento e óculos de segurança. Pode ser usado para criar "
-"algunsprojetos de química, se você é tão inclinado."
+"Este é um conjunto de química armazenado em uma caixa. O conteúdo inclui "
+"recipientes de vidro, mangueiras, fios de metal, uma placa de aquecimento e "
+"óculos de segurança. Pode ser usado para criar alguns projetos de química, "
+"se você quiser."
 
 #: lang/json/TOOL_from_json.py
 msgid "basic chemistry set"
 msgid_plural "basic chemistry sets"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "conjunto básico de química"
+msgstr[1] "conjuntos básicos de química"
 
 #. ~ Description for basic chemistry set
 #: lang/json/TOOL_from_json.py
@@ -80988,16 +83082,16 @@ msgid ""
 "safety glasses.  It might be used to craft some chemistry projects if you're"
 " so inclined, but you'll need a source of heat."
 msgstr ""
-" Este é um conjunto básico de química que inclui recipientes de vidro, "
-"mangueiras e óculos de segurança. Pode ser usado para criar alguns "
-"projetosde química, se você estiver inclinado, mas precisará de uma fonte de"
-" calor."
+"Este é um conjunto básico de química que inclui recipientes de vidro, "
+"mangueiras e óculos de segurança. Pode ser usado para criar alguns projetos "
+"de química, se você se sentir inclinado a isso, mas precisará de uma fonte "
+"de calor."
 
 #: lang/json/TOOL_from_json.py
 msgid "basic laboratory analysis kit"
 msgid_plural "basic laboratory analysis kits"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "conjunto básico de análise de laboratório"
+msgstr[1] "conjuntos básicos de análise de laboratório"
 
 #. ~ Description for basic laboratory analysis kit
 #: lang/json/TOOL_from_json.py
@@ -81008,18 +83102,18 @@ msgid ""
 " for thin layer chromatography.  This makes it a lot easier to feel "
 "confident that the chemical you've made is what you think you've made."
 msgstr ""
-" Este kit pesado contém algumas coisas básicas que você provavelmente "
-"nãodeve tentar fazer química precisa sem: ou seja, uma pequena escala "
-"deequilíbrio, um espectrofotômetro, um aparelho de ponto de fusão, um "
-"medidorde pH e um conjunto de papel para cromatografia em camada fina . Isso"
-" tornamuito mais fácil se sentir confiante de que o produto químico que "
-"vocêcriou é o que você acha que fez."
+"Este kit pesado contém algumas coisas básicas, sem as quais você "
+"provavelmente não deve tentar fazer química precisa: ou seja, uma pequena "
+"balança de equilíbrio, um espectrofotômetro, um aparelho de ponto de fusão, "
+"um medidor de pH e um conjunto de papel para cromatografia em camada fina. "
+"Isso torna muito mais fácil se sentir confiante de que o produto químico que"
+" você criou é o que você acha que fez."
 
 #: lang/json/TOOL_from_json.py
 msgid "small weight scale"
 msgid_plural "small weight scales"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "balança de pesos pequenos"
+msgstr[1] "balanças de pesos pequenos"
 
 #. ~ Description for small weight scale
 #: lang/json/TOOL_from_json.py
@@ -81027,15 +83121,14 @@ msgid ""
 "This is a simple scale that uses a set of steel weights on sliding bars to "
 "measure a sample's mass quite accurately."
 msgstr ""
-" escala de peso pequeno Esta é uma escala simples que usa um conjunto "
-"depesos de aço em barras deslizantes para medir a massa de uma amostra "
-"combastante precisão."
+"Esta é uma balança simples que usa um conjunto de pesos de aço em barras "
+"deslizantes para medir a massa de uma amostra com bastante precisão."
 
 #: lang/json/TOOL_from_json.py
 msgid "spectrophotometer"
 msgid_plural "spectrophotometers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "espectrofotômetro"
+msgstr[1] "espectrofotômetros"
 
 #. ~ Description for spectrophotometer
 #: lang/json/TOOL_from_json.py
@@ -81043,15 +83136,14 @@ msgid ""
 "This ubiquitous analytical chemistry tool measures the light absorption of a"
 " liquid sample in a special tube called a cuvette."
 msgstr ""
-" espectrofotômetro Esta ferramenta de química analítica onipresente mede "
-"aabsorção de luz de uma amostra líquida em um tubo especial chamado "
-"decuvete."
+"Esta ferramenta de química analítica onipresente mede a absorção de luz de "
+"uma amostra líquida em um tubo especial chamado de cubeta ou cuvete."
 
 #: lang/json/TOOL_from_json.py
 msgid "set of spectrometry cuvettes"
 msgid_plural "sets of spectrometry cuvettes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "conjunto de cubetas de espectrometria"
+msgstr[1] "conjuntos de cubetas de espectrometria"
 
 #. ~ Description for set of spectrometry cuvettes
 #: lang/json/TOOL_from_json.py
@@ -81059,15 +83151,14 @@ msgid ""
 "This is a small box filled with precisely calibrated square plastic tubes "
 "for laboratory spectrometer use."
 msgstr ""
-" conjunto de cuvetes de espectrometria Esta é uma pequena caixa cheia "
-"detubos de plástico quadrados precisamente calibrados para uso "
-"emespectrômetros de laboratório."
+" Esta é uma pequena caixa cheia de tubos de plástico quadrados precisamente "
+"calibrados para uso em espectrômetros de laboratório."
 
 #: lang/json/TOOL_from_json.py
 msgid "pH meter"
 msgid_plural "pH meters"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "medidor de pH"
+msgstr[1] "medidores de pH"
 
 #. ~ Description for pH meter
 #: lang/json/TOOL_from_json.py
@@ -81076,9 +83167,9 @@ msgid ""
 "probe into a calibration solution (conveniently included) and the other in a"
 " substance, you can calculate the acidity."
 msgstr ""
-" Medidor de pH Este é basicamente um par de sondas de vidro em umvoltímetro."
-" Colocando uma sonda em uma solução de calibração(convenientemente incluída)"
-" e a outra em uma substância, você pode calculara acidez."
+"Este é basicamente um par de sondas de vidro em um voltímetro. Colocando uma"
+" sonda em uma solução de calibração (convenientemente incluída) e a outra em"
+" uma substância, você pode calcular a acidez."
 
 #: lang/json/TOOL_from_json.py
 msgid "voltmeter"
@@ -81140,7 +83231,7 @@ msgstr[1] ""
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
@@ -81345,7 +83436,7 @@ msgstr[1] ""
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr ""
 
@@ -81765,7 +83856,7 @@ msgstr ""
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr ""
 
@@ -81796,7 +83887,7 @@ msgstr[1] ""
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -82948,12 +85039,6 @@ msgstr ""
 " snare trigger Este é um stick que foi cortado em um mecanismo de "
 "gatilhopara uma armadilha de caixa."
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] ""
-msgstr[1] ""
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -83333,9 +85418,9 @@ msgid ""
 "lights, and programmed to dance.  Activate this item to get the party "
 "started."
 msgstr ""
-" bot inativo de festa Um medibot recheado recheado com maconha, coberto "
-"deluzes intermitentes multicoloridas e programado para dançar. Ative "
-"esteitem para iniciar a festa."
+"Um medibot reprogramado, recheado com maconha, coberto deluzes intermitentes"
+" multicoloridas e programado para dançar. Ative este item para iniciar a "
+"festa."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive rat snatcher"
@@ -83350,9 +85435,9 @@ msgid ""
 "with pincers and an integrated tazer.  Activate this item to deploy the "
 "robot."
 msgstr ""
-" skitterbot inativo snatcher de rato inativo Um skitterbot "
-"recuperadoreaproveitado para caçar caça pequena. Ele ataca alvos com pinças "
-"e umtazer integrado. Ative este item para implantar o robô."
+"Um skitterbot recuperado e reaproveitado para caçar animais pequenos. Ele "
+"ataca alvos com pinças e um tazer integrado. Use este item para ativar o "
+"robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive grab-bot"
@@ -83366,8 +85451,8 @@ msgid ""
 "A salvaged skitterbot repurposed to grab onto and immobilize enemies.  "
 "Activate this item to deploy the robot."
 msgstr ""
-" inactive grab-bot Um skitterbot recuperado reaproveitado para agarrar "
-"eimobilizar inimigos. Ative este item para implantar o robô."
+"Um skitterbot recuperado e reaproveitado para agarrar e imobilizar inimigos."
+" Use este item para ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive pest hunter"
@@ -83381,9 +85466,8 @@ msgid ""
 "A salvaged skitterbot refitted with an 8mm integrated firearm.  Activate "
 "this item, with ammo in your inventory, to load and deploy the robot."
 msgstr ""
-" caçador inativo de pragas Um skitterbot recuperado foi reformado com "
-"umaarma de fogo integrada de 8mm. Ative este item, com munição em "
-"seuinventário, para carregar e implantar o robô."
+"Um skitterbot recuperado e reformado com uma arma de fogo integrada de 8mm. "
+"Use este item, com munição em seuinventário, para carregar e ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive cyborg"
@@ -83404,9 +85488,9 @@ msgid ""
 "animate head retains some of its ability to revive zombies. Activate this "
 "item to deploy the robot."
 msgstr ""
-" cyborg inativo cyborg inativo necrótico Um cyborg recuperado com a cabeçade"
-" um necromante zumbi. A cabeça animada mantém algumas de suas "
-"habilidadespara reviver zumbis. Ative este item para implantar o robô."
+"Um cyborg recuperado com a cabeça de um necromante zumbi. A cabeça animada "
+"mantém algumas de suas habilidades para reviver zumbis. Use este item para "
+"ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive defense robot"
@@ -83427,9 +85511,9 @@ msgid ""
 "  Activate this item, with ammo in your inventory, to load and deploy the "
 "robot."
 msgstr ""
-" inactivo defesa robô inactivo ferro-velho vaqueiro Um robô de "
-"defesarecuperado equipado com uma espingarda e duas serras circulares. Ative"
-" esteitem, com munição em seu inventário, para carregar e implantar o robô."
+"Um robô de defesa recuperado e equipado com uma espingarda e duas serras "
+"circulares. Use este item, com munição em seu inventário, para carregar e "
+"ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive shortcircuit samurai"
@@ -83443,9 +85527,8 @@ msgid ""
 "A salvaged defense robot refitted with an integrated tazer and two "
 "electrified blades.  Activate this item to deploy the robot."
 msgstr ""
-" samurai de curto-circuito inativo Um robô de defesa recuperado equipado "
-"comum tazer integrado e duas lâminas eletrificadas. Ative este item "
-"paraimplantar o robô."
+"Um robô de defesa recuperado e equipado com um tazer integrado e duas "
+"lâminas eletrificadas. Ative este item para ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive slapdash paladin"
@@ -83460,10 +85543,10 @@ msgid ""
 "searing hot blades.  Activate this item, with gasoline in your inventory, to"
 " load and deploy the robot... preferably far from anything flammable"
 msgstr ""
-" Um paladino de defesa recuperado foi reformado com um lança-chamas caseiroe"
-" duas lâminas quentes. Ative este item, com gasolina em seu inventário, para"
-" carregar e implantar o robô ... de preferência longe de qualquer "
-"coisainflamável"
+" Um paladino de defesa recuperado e reformado com um lança-chamas caseiro e "
+"duas lâminas aquecidas. Ative este item, com gasolina em seu inventário, "
+"para carregar e ativar o robô... de preferência longe de qualquer coisa "
+"inflamável."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive military robot"
@@ -83478,9 +85561,9 @@ msgid ""
 "electric prod.  Activate this item, with ammo in your inventory, to load and"
 " deploy the robot."
 msgstr ""
-" robot militar inactivo Um robot militar não motorizado equipado com umaarma"
-" de fogo 7.62 integrada e um gerador eléctrico. Ative este item, communição "
-"em seu inventário, para carregar e implantar o robô."
+"Um robot militar desligado, equipado com uma arma de fogo 7.62 integrada e "
+"um gerador elétrico. Ative este item, com munição em seu inventário, para "
+"carregar e ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive robo-guardian"
@@ -83495,9 +85578,9 @@ msgid ""
 "Activate this item, with ammo in your inventory, to load and deploy the "
 "robot."
 msgstr ""
-" inativo robo-gaurdian Um robô militar resgatado reformado com um par "
-"dearmas de fogo integradas de 9mm. Ative este item, com munição em "
-"seuinventário, para carregar e implantar o robô."
+"Um robô militar resgatado e reformado com um par de armas de fogo integradas"
+" de 9mm. Use este item, com munição em seu inventário, para carregar e "
+"ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive robote deluxe"
@@ -83513,11 +85596,10 @@ msgid ""
 "apocalypse in style.  Activate this item, with ammo in your inventory, to "
 "load and deploy the robot."
 msgstr ""
-" inativo robote deluxe Um robô banhado a ouro cravejado de diamantes "
-"armadocom um par de armas de fogo integradas de 9mm. Um luxo opulento- "
-"botadequado para aqueles que desejam sobreviver ao apocalipse em "
-"grandeestilo. Ative este item, com munição em seu inventário, para carregar "
-"eimplantar o robô."
+"Um robô banhado a ouro e cravejado de diamantes armado com um par de armas "
+"de fogo integradas de 9mm. Um luxo opulento adequado para aqueles que "
+"desejam sobreviver ao apocalipse em grande estilo. Use este item, com "
+"munição em seu inventário, para carregar e ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive robo-protector"
@@ -83570,10 +85652,9 @@ msgid ""
 "  It attacks hostile targets with its two integral lasers and blinding "
 "flashes.  Activate this item to deploy the robot."
 msgstr ""
-" inativo avançado robô inativo resplandecente senhora Um robô "
-"avançadorecuperado transformado em um farol luminoso de destruição. Ataca "
-"alvoshostis com seus dois lasers integrais e flashes ofuscantes. Ative este "
-"itempara implantar o robô."
+"Um robô avançado recuperado e transformado em um farol luminoso de "
+"destruição. Ataca alvos hostis com seus dois lasers integrais e flashes "
+"ofuscantes. Ative este item para ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive bitter spinster"
@@ -83588,9 +85669,9 @@ msgid ""
 "acid fermenter feeds a ranged glob spitter and sprayer.  Activate this item "
 "to deploy the robot."
 msgstr ""
-" solteira amarga inativa Um robô militar recuperado transformado em "
-"ummonstro cáustico. Um fermentador ácido interno alimenta um spitter "
-"globglob e pulverizador. Ative este item para implantar o robô."
+"Um robô militar recuperado e transformado em um monstro cáustico. Um "
+"fermentador de ácido interno alimenta um lançador e pulverizador de glob. "
+"Ative este item para ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive chickenwalker"
@@ -83612,10 +85693,9 @@ msgid ""
 "chainsaws and a deafening sound system.  Activate this item to deploy the "
 "robot."
 msgstr ""
-" inactivo chickenwalker inactivo motosserra horror A recuperadochickenwalker"
-" modificado em um monstro horrível adornado com caveiras epicos. Ataca alvos"
-" hostis com um par de motosserras zunindo e um sistema desom ensurdecedor. "
-"Ative este item para implantar o robô."
+"Um chickenwalker recuperado e modificado em um monstro horrível adornado com"
+" caveiras e espinhos. Ataca alvos hostis com um par de motosserras zunindo e"
+" um sistema de som ensurdecedor. Ative este item para ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive screeching terror"
@@ -83631,10 +85711,9 @@ msgid ""
 "lances and a deafening sound system.  Activate this item to deploy the "
 "robot."
 msgstr ""
-" Um terrorista recuperado modificado em um horrível monstro adornado "
-"comcaveiras e espinhos. Ataca alvos hostis com um par de lanças movidas "
-"apistão e um sistema de som ensurdecedor. Ative este item para implantar "
-"orobô."
+"Um chickenwalker recuperado e modificado em um horrível monstro adornado com"
+" caveiras e espinhos. Ataca alvos hostis com um par de lanças movidas a "
+"pistão e um sistema de som ensurdecedor. Ative este item para ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive hooked nightmare"
@@ -83650,10 +85729,10 @@ msgid ""
 " on chains and a deafening sound system.  Activate this item to deploy the "
 "robot."
 msgstr ""
-" pesadelo inativo viciado Um caminhante de galos resgatado modificado em "
-"ummonstro horrível adornado com crânios e picos. Ataca alvos hostis com "
-"umpar de ganchos giratórios em correntes e um sistema de som ensurdecedor. "
-"Ative este item para implantar o robô."
+"Um chickenwalker resgatado e modificado em um monstro horrível adornado com "
+"crânios e espinhos. Ataca alvos hostis com um par de ganchos giratórios em "
+"correntes e um sistema de som ensurdecedor. Ative este item para ativar o "
+"robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive tankbot"
@@ -83675,10 +85754,9 @@ msgid ""
 "it uses to crush anything in its way, including buildings.  Activate this "
 "item to deploy the robot."
 msgstr ""
-" inactive tankbot inactive fist king Um tankbot recuperado equipado com "
-"umpar de poderosos martelos pneumáticos que ele usa para esmagar "
-"qualquercoisa em seu caminho, incluindo edifícios. Ative este item para "
-"implantar orobô."
+"Um tankbot recuperado e equipado com um par de poderosos martelos "
+"pneumáticos que ele usa para esmagar qualquer coisa em seu caminho, "
+"incluindo edifícios. Ative este item para ativar o robô."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive atomic sultan"
@@ -83695,7 +85773,7 @@ msgstr[1] ""
 #. ~ Use action msg for active glowball.
 #: lang/json/TOOL_from_json.py
 msgid "The glowball goes dim."
-msgstr "sultão atômico inativo glowball ativo O glowball vai escurecer."
+msgstr "O glowball escurece."
 
 #. ~ Description for active glowball
 #: lang/json/TOOL_from_json.py
@@ -84210,7 +86288,7 @@ msgstr[1] ""
 #. ~ Use action friendly_msg for dormant minion.
 #: lang/json/TOOL_from_json.py
 msgid "The jabberwock climbs to its feet and shambles around."
-msgstr "lacaio adormecido O jabberwock sobe a seus pés e desmorona ao redor."
+msgstr "O jaguadarte sobe a seus pés e caminha a esmo."
 
 #. ~ Use action hostile_msg for dormant minion.
 #: lang/json/TOOL_from_json.py
@@ -84218,8 +86296,8 @@ msgid ""
 "Something has gone wrong; after getting up the jabberwock lumbers toward you"
 " menacingly!"
 msgstr ""
-" Algo deu errado; depois de se levantar, o jabberwock se aproxima de "
-"vocêameaçadoramente!"
+"Algo deu errado; depois de se levantar, o jaguadarte se aproxima de você "
+"ameaçadoramente!"
 
 #. ~ Description for dormant minion
 #: lang/json/TOOL_from_json.py
@@ -84335,6 +86413,17 @@ msgid ""
 " terribly when not on a rail."
 msgstr ""
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr ""
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr ""
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "roda de moto"
@@ -84745,6 +86834,10 @@ msgstr ""
 msgid "cranking"
 msgstr ""
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr ""
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr ""
@@ -85025,6 +87118,10 @@ msgstr "Setas; flechas"
 msgid "pebbles"
 msgstr "britas"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "rochas"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr ""
@@ -85388,7 +87485,7 @@ msgstr "Chapeamento de liga - armas"
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -85427,7 +87524,7 @@ msgstr "Chapeamento de liga - pernas"
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -85779,18 +87876,20 @@ msgstr "EMP Projector Ethanol Burner"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
 msgstr ""
-" Queimador de Etanol CBMVocê queima álcool como combustível em "
-"umareaçãoextremamente eficiente. No entanto, você ainda sofrerá "
-"osefeitosinebriantes da substância."
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "Aero-Evaporador"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr ""
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "Córnea Diamante"
@@ -86075,10 +88174,10 @@ msgstr ""
 "desagradáveisquandodesligado."
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "Mini-lança-chamas"
+msgid "Finger Lighter"
+msgstr ""
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -86111,8 +88210,8 @@ msgstr "Unidade eletromagnética"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -86179,8 +88278,8 @@ msgstr "Reparar Nanobots"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -86218,11 +88317,8 @@ msgstr ""
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
+"Increases mouth encumbrance by ten."
 msgstr ""
-" Você realmente não tem certeza de como o CBM acabou em seu nariz, mas "
-"nãoimporta como ele chegou lá, este biônico mal colocado dificulta "
-"arespiração. Aumenta o ônus da boca em um."
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -86256,7 +88352,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
+"mild optic neuropathy.  Increases eye encumbrance by ten."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -86289,7 +88385,7 @@ msgstr "Armazenamento de energia"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
 msgstr ""
@@ -86300,8 +88396,7 @@ msgstr "Armazenamento de energia Mk. II"
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
 msgstr ""
 
 #. ~ Description for Power Overload
@@ -86631,12 +88726,8 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
+" by ten, while failing to improve your ability to hold objects whatsoever."
 msgstr ""
-" Os polegares com travamento automático ficam firmes (mesmo quando "
-"vocêrealmente não quer) e não soltam (mesmo quando você preferir que eles "
-"ofizessem). Aumenta o peso da mão em dois, ao mesmo tempo em que não "
-"melhorasua habilidade de segurar objetos."
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -86778,8 +88869,8 @@ msgstr ""
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
@@ -86845,7 +88936,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr ""
@@ -87546,6 +89637,18 @@ msgstr ""
 msgid "Make Woodchip Floor"
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr ""
@@ -88209,6 +90312,10 @@ msgstr ""
 msgid "Build a radio tower console."
 msgstr ""
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr ""
@@ -88985,6 +91092,42 @@ msgstr ""
 msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr "Você sonha com abelhas brigando por seu doce néctar. Mmm"
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr ""
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -90352,6 +92495,25 @@ msgstr "Suas mãos simplesmente não vão parar de tremer."
 msgid "You tremble"
 msgstr "Você tremer"
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr ""
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr ""
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr ""
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "Sangramento"
@@ -91289,6 +93451,26 @@ msgstr "Seu metabolismo se torna instável."
 msgid "Your metabolism becomes more stable."
 msgstr "Seu metabolismo se torna mais estável."
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr ""
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "Iluminou"
@@ -91547,6 +93729,17 @@ msgstr "Sobrealimentado"
 msgid "You've been struck by lightning, and feel... different."
 msgstr "Você foi atingido por um raio e se sente ... diferente."
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr ""
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr "Ofensa religiosa"
@@ -92289,6 +94482,192 @@ msgstr ""
 "deunidades adicionais de resposta da polícia, ele foi despedaçado "
 "pelosmortos-vivos que foram atraídos pela comoção."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr ""
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -92631,6 +95010,167 @@ msgstr ""
 "suprimentosque carregava. Duas semanas depois de ser arrastada para o "
 "celular, elamorreu de desidratação."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr ""
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "Seus seguidores"
@@ -92795,10 +95335,10 @@ msgid "A small family surviving on their generational land."
 msgstr ""
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
+msgid "New England Church Community"
 msgstr ""
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -92844,102 +95384,210 @@ msgstr ""
 msgid "Dusty"
 msgstr ""
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "It's dusty.  Has no effect - obsolete fault."
+msgstr ""
+
+#. ~ name of mending method for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "Wipe clean"
+msgstr ""
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
+#, python-format
+msgid "You clean you %s."
 msgstr ""
 
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr "Já implantado"
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr ""
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr ""
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr ""
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
 
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr ""
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr ""
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr ""
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr ""
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr ""
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
 
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
 msgstr ""
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "humano Necessário para operação de um alternador acoplado."
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr ""
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr ""
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr "Ajuda ao ligar um motor em baixas temperaturas ambientes."
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr ""
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "Impede a partida do veículo sem a chave apropriada."
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr ""
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr ""
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr ""
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr ""
 " Necessário para bombear e pressurizar o diesel de um tanque de veículos."
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr ""
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
@@ -92947,11 +95595,23 @@ msgstr ""
 " Um filtro expirado reduz a eficiência de combustível e aumenta a produçãode"
 " fumaça."
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr ""
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
@@ -92959,35 +95619,83 @@ msgstr ""
 " Um filtro expirado reduz o desempenho e aumenta a chance de "
 "efeitoscolaterais."
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr ""
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr "Necessário para bombear gasolina de um tanque de veículos."
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr ""
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr ""
 " Necessário para bombear água para um radiador externo ou dissipador "
 "decalor."
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr ""
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "Necessário para iniciar o mecanismo inicialmente."
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr ""
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -93376,7 +96084,7 @@ msgstr "enxame de abelhas"
 
 #: lang/json/field_type_from_json.py
 msgid "angry swarm of bees"
-msgstr "Enxame zangado de abelhas"
+msgstr "enxame zangado de abelhas"
 
 #: lang/json/field_type_from_json.py
 msgid "airborne incendiary"
@@ -93392,7 +96100,7 @@ msgstr "gás de relaxamento"
 
 #: lang/json/field_type_from_json.py lang/json/furniture_from_json.py
 msgid "swamp gas"
-msgstr ""
+msgstr "gás de pântano"
 
 #: lang/json/field_type_from_json.py
 msgid "mist"
@@ -93474,21 +96182,25 @@ msgstr "nuvem espessa de inseticida"
 msgid "smoke vent"
 msgstr "respiradouro de fumo"
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr "clarividência"
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
-msgstr ""
+msgstr "presença aterrorizante"
 
 #: lang/json/field_type_from_json.py
 msgid "frightful presense"
-msgstr ""
+msgstr "presença assustadora"
 
 #: lang/json/field_type_from_json.py
 msgid "terrifying presense"
-msgstr ""
+msgstr "presença horripilante"
 
 #: lang/json/furniture_from_json.py
 msgid "mutated cactus"
-msgstr "cactus mutante"
+msgstr "cacto mutante"
 
 #: lang/json/furniture_from_json.py
 msgid "cooling unit"
@@ -93498,10 +96210,11 @@ msgstr "unidade de refrigeração"
 #: lang/json/furniture_from_json.py
 msgid "A big, blocky metal device for refrigerating large areas."
 msgstr ""
+"Um dispositivo metálico grande e quadrado, para refrigerar grandes áreas."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "metal screeching!"
-msgstr "metal gritando!"
+msgstr "metal rangendo!"
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "clang!"
@@ -93514,7 +96227,7 @@ msgstr "filtro de ar central"
 #. ~ Description for central air filter
 #: lang/json/furniture_from_json.py
 msgid "Cleans out dust mites, smoke particles, and more!"
-msgstr ""
+msgstr "Filtra ácaros, partículas de fumaça, e mais!"
 
 #. ~ Description for dishwasher
 #: lang/json/furniture_from_json.py
@@ -93523,6 +96236,10 @@ msgid ""
 " clean and to save people an unpleasant chore.  Now, with the power gone and"
 " it sitting for a while, it's starting to smell a bit off."
 msgstr ""
+"Esta caixa de metal costumava esguichar água quente e sabão em louças sujas "
+"para limpá-las e poupar as pessoas de uma tarefa chata. Agora, com a "
+"eletricidade desligada e um bom tempo de inatividade, está começando a "
+"cheirar mal."
 
 #: lang/json/furniture_from_json.py
 msgid "dryer"
@@ -93532,6 +96249,8 @@ msgstr "secador"
 #: lang/json/furniture_from_json.py
 msgid "'Dry your clothes!' would be what you'd do if electricity was running."
 msgstr ""
+"\"Seque suas roupas!\" É o que você estaria fazendo se houvesse "
+"eletricidade."
 
 #: lang/json/furniture_from_json.py lang/json/vehicle_part_from_json.py
 msgid "refrigerator"
@@ -93547,7 +96266,7 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "glass door fridge"
-msgstr "geladeira porta de vidro"
+msgstr "geladeira com porta de vidro"
 
 #. ~ Description for glass door fridge
 #: lang/json/furniture_from_json.py
@@ -93620,12 +96339,12 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "server stack"
-msgstr "pila de servidores"
+msgstr "pilha de servidores"
 
 #. ~ Description for server stack
 #: lang/json/furniture_from_json.py
 msgid "This is a big pile of computers.  They're all turned off."
-msgstr "isto é uma grande pilha de computadores. Todos estão desligados."
+msgstr "Isto é uma grande pilha de computadores. Todos estão desligados."
 
 #: lang/json/furniture_from_json.py
 msgid "large satellite dish"
@@ -93647,7 +96366,7 @@ msgstr "painel solar montado"
 #. ~ Description for mounted solar panel
 #: lang/json/furniture_from_json.py
 msgid "A mounted solar panel."
-msgstr ""
+msgstr "Um painel solar montado."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whack!"
@@ -93664,22 +96383,23 @@ msgstr "Uma barricada de estrada. Para barricar estradas."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "esmagar!"
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "pio."
 
 #: lang/json/furniture_from_json.py
 msgid "earthbag barricade"
-msgstr ""
+msgstr "barricada de sacos de terra"
 
 #. ~ Description for earthbag barricade
 #: lang/json/furniture_from_json.py
 msgid "An earthbag barricade, typically used for blocking bullets."
 msgstr ""
+"Uma barricada de sacos de terra, típicamente usada para bloquear balas."
 
 #: lang/json/furniture_from_json.py
 msgid "rrrip!"
@@ -93687,12 +96407,12 @@ msgstr "rrrip!"
 
 #: lang/json/furniture_from_json.py
 msgid "earthbag wall"
-msgstr ""
+msgstr "muro de sacos de terra"
 
 #. ~ Description for earthbag wall
 #: lang/json/furniture_from_json.py
 msgid "An earthbag wall."
-msgstr ""
+msgstr "Um muro de sacos cheios de terra."
 
 #: lang/json/furniture_from_json.py
 msgid "lane guard"
@@ -93701,7 +96421,7 @@ msgstr "guarda de pista"
 #. ~ Description for lane guard
 #: lang/json/furniture_from_json.py
 msgid "Used to be used for keeping traffic."
-msgstr "Costumava ser usado para manter o tráfego."
+msgstr "Costumava ser usado para cuidar do tráfego."
 
 #: lang/json/furniture_from_json.py
 msgid "sandbag barricade"
@@ -93711,6 +96431,7 @@ msgstr "barricada de sacos de areia"
 #: lang/json/furniture_from_json.py
 msgid "A sandbag barricade, typically used for blocking bullets."
 msgstr ""
+"Uma barricada de sacos de areia, típicamente usada para bloquear balas."
 
 #: lang/json/furniture_from_json.py
 msgid "sandbag wall"
@@ -93719,7 +96440,7 @@ msgstr "parede de sacos de areia"
 #. ~ Description for sandbag wall
 #: lang/json/furniture_from_json.py
 msgid "A sandbag wall."
-msgstr ""
+msgstr "Um muro de sacos cheios de areia."
 
 #: lang/json/furniture_from_json.py
 msgid "standing mirror"
@@ -93728,7 +96449,7 @@ msgstr "espelho de pé"
 #. ~ Description for standing mirror
 #: lang/json/furniture_from_json.py
 msgid "Lookin' good - is that blood?"
-msgstr ""
+msgstr "Uma boa aparência - aquilo ali é sangue?"
 
 #: lang/json/furniture_from_json.py
 msgid "glass breaking"
@@ -93768,6 +96489,8 @@ msgid ""
 "Chain serfs in your dungeon.  All you need now is an iron ball to chain to "
 "it."
 msgstr ""
+"Algeme plebeus em sua masmorra. Tudo de que você precisa agora é uma bola de"
+" ferro onde prender isso."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py
@@ -93783,7 +96506,8 @@ msgstr "estatua"
 msgid "A carved statue made of stone."
 msgstr "Uma estátua esculpida em pedra."
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "baque."
 
@@ -93794,7 +96518,7 @@ msgstr "manequim"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
 msgstr ""
 
@@ -93818,12 +96542,13 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "floor lamp"
-msgstr ""
+msgstr "abajur grande"
 
 #. ~ Description for floor lamp
 #: lang/json/furniture_from_json.py
 msgid "A tall standing lamp, meant to plug into a wall and light up a room."
 msgstr ""
+"Um abajur alto, feito para se ligar a uma tomada e iluminar um cômodo."
 
 #: lang/json/furniture_from_json.py
 msgid "bonk!"
@@ -93849,7 +96574,7 @@ msgstr "Uma variedade de plantas para decoração. É amarelo."
 
 #: lang/json/furniture_from_json.py
 msgid "harvestable plant"
-msgstr ""
+msgstr "planta colhível"
 
 #. ~ Description for harvestable plant
 #: lang/json/furniture_from_json.py
@@ -93875,7 +96600,7 @@ msgstr "planta matura"
 #. ~ Description for mature plant
 #: lang/json/furniture_from_json.py
 msgid "This plant has matured."
-msgstr ""
+msgstr "Esta planta terminou de madurar."
 
 #: lang/json/furniture_from_json.py
 msgid "seed"
@@ -93886,7 +96611,7 @@ msgstr "semente"
 msgid ""
 "A humble planted seed.  Actions are the seed of fate deeds grow into "
 "destiny."
-msgstr ""
+msgstr "Uma humilde semente plantada. Ações são as sementes do destino."
 
 #: lang/json/furniture_from_json.py
 msgid "seedling"
@@ -93895,11 +96620,11 @@ msgstr "plântula"
 #. ~ Description for seedling
 #: lang/json/furniture_from_json.py
 msgid "This plant is just getting started."
-msgstr ""
+msgstr "Esta planta mal começou a crescer."
 
 #: lang/json/furniture_from_json.py
 msgid "planter"
-msgstr "plantas"
+msgstr "planteira"
 
 #. ~ Description for planter
 #: lang/json/furniture_from_json.py
@@ -93942,7 +96667,7 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "spider egg sack"
-msgstr "saco de ovo de aranha"
+msgstr "saco de ovos de aranha"
 
 #. ~ Description for spider egg sack
 #: lang/json/furniture_from_json.py
@@ -93950,6 +96675,8 @@ msgid ""
 "Much too large, off-white egg sack.  Kind of icky.  Something IS moving in "
 "there."
 msgstr ""
+"Grande demais, branco demais. Meio nojento. ALGUMA COISA se mexe dentro "
+"dele."
 
 #: lang/json/furniture_from_json.py
 msgid "splat!"
@@ -93992,7 +96719,7 @@ msgstr "respingo!"
 #. ~ Description for fog
 #: lang/json/furniture_from_json.py
 msgid "This is a misty cloud of fog."
-msgstr ""
+msgstr "Uma grossa nuvem de neblina."
 
 #: lang/json/furniture_from_json.py
 msgid "fake workbench hands"
@@ -94053,6 +96780,7 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid "A raised metal dish in which to safely burn things."
 msgstr ""
+"Uma tigela de metal erguida, em que se pode queimar coisas com segurança."
 
 #: lang/json/furniture_from_json.py
 msgid "fire ring"
@@ -94061,11 +96789,11 @@ msgstr "anel de fogo"
 #. ~ Description for fire ring
 #: lang/json/furniture_from_json.py
 msgid "A ring of stones to safely contain a fire."
-msgstr ""
+msgstr "Um anel de pedras para conter um fogo com segurança."
 
 #: lang/json/furniture_from_json.py
 msgid "mutated poppy flower"
-msgstr "flor papoula mutante"
+msgstr "flor de papoula mutante"
 
 #. ~ Description for mutated poppy flower
 #: lang/json/furniture_from_json.py
@@ -94087,7 +96815,7 @@ msgstr ""
 #. ~ Description for chamomile
 #: lang/json/furniture_from_json.py
 msgid "Ahh, soothing chamomile tea."
-msgstr ""
+msgstr "Ahh, um calmante chá de camomila..."
 
 #. ~ Description for tulip
 #: lang/json/furniture_from_json.py
@@ -94105,7 +96833,7 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "cattails"
-msgstr "cattails"
+msgstr "taboas"
 
 #. ~ Description for cattails
 #: lang/json/furniture_from_json.py
@@ -94142,7 +96870,7 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "lilypad"
-msgstr "vitória Régia"
+msgstr "vitória-régia"
 
 #. ~ Description for lilypad
 #: lang/json/furniture_from_json.py
@@ -94181,9 +96909,11 @@ msgid ""
 "A sizable pile of leaves.  You could sleep on it if you don't care about "
 "comfort or warmth."
 msgstr ""
+"Uma grande pilha de folhas. Você poderia dormir nela, se não ligar pra "
+"conforto ou calor."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "crunch!"
 
@@ -94196,7 +96926,7 @@ msgstr "marloss flower"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
+"and… delicious?"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -94239,7 +96969,7 @@ msgstr "laje de pedra"
 #. ~ Description for stone slab
 #: lang/json/furniture_from_json.py
 msgid "A flat slab of heavy stone."
-msgstr ""
+msgstr "Uma laje plana de pedra pesada."
 
 #: lang/json/furniture_from_json.py
 msgid "headstone"
@@ -94281,7 +97011,7 @@ msgstr "obelisco"
 #. ~ Description for obelisk
 #: lang/json/furniture_from_json.py
 msgid "Monument to pride."
-msgstr ""
+msgstr "Um monumento ao orgulho."
 
 #: lang/json/furniture_from_json.py
 msgid "thunk!"
@@ -94297,6 +97027,8 @@ msgid ""
 "A durable and versatile robotic arm with a tool fitted to the end, for "
 "working on an assembly line."
 msgstr ""
+"Um braço robótico versátil e resistente, com uma ferramente acoplada na "
+"ponta, para trabalho em uma linha de montagem."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "chemical mixer"
@@ -94336,8 +97068,8 @@ msgid ""
 "A surgical apparatus used for installation and uninstallation of bionics.  "
 "It's only as skilled as its operator."
 msgstr ""
-" Um aparelho cirúrgico usado para instalação e desinstalação da biônica. "
-"Étão habilidoso quanto seu operador."
+"Um aparelho cirúrgico usado para instalação e desinstalação de biônicos. É "
+"tão habilidoso quanto seu operador."
 
 #: lang/json/furniture_from_json.py
 msgid "Autodoc operation couch"
@@ -94349,8 +97081,8 @@ msgid ""
 "A plush red sofa made less comfortable by the medical machinery directly "
 "above it.  It has a single leather strap on the right armrest."
 msgstr ""
-" Um sofá vermelho de pelúcia tornava menos confortável a máquina "
-"médicadiretamente acima dela. Tem uma correia de couro no braço direito."
+"Um sofá vermelho de pelúcia, tornado menos confortável pelas máquinas "
+"médicas diretamente acima dele. Tem uma correia de couro no braço direito."
 
 #. ~ Description for autoclave
 #. ~ Description for filled autoclave
@@ -94367,7 +97099,7 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "sample freezer"
-msgstr ""
+msgstr "congelador de amostras"
 
 #. ~ Description for sample freezer
 #: lang/json/furniture_from_json.py
@@ -94379,7 +97111,7 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "lab workbench"
-msgstr ""
+msgstr "bancada de laboratório"
 
 #. ~ Description for lab workbench
 #: lang/json/furniture_from_json.py
@@ -94629,9 +97361,9 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -94701,7 +97433,7 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -94866,7 +97598,7 @@ msgstr "esteira"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
+" taken apart for its… parts."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -94892,7 +97624,7 @@ msgstr "plano"
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -95052,6 +97784,17 @@ msgstr "banquinho"
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr ""
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "quadro de avisos"
@@ -95527,7 +98270,7 @@ msgstr ""
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
 msgstr ""
 
@@ -95601,12 +98344,12 @@ msgid "This beaded curtain could be pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
-msgstr "clickity clack...clack...clack"
+msgid "clickity clack… clack… clack"
+msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
-msgstr "clickity clack...clack"
+msgid "clickity clack… clack"
+msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "open beaded curtain"
@@ -95618,7 +98361,7 @@ msgid "This beaded curtain has been pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
+msgid "clickity clack… clack… clack!"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -95765,8 +98508,7 @@ msgstr "pilha de entulho inútil"
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -96294,6 +99036,15 @@ msgid ""
 "blood, candles, and other small knick-knacks."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr ""
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr "Crash!"
@@ -96323,8 +99074,8 @@ msgstr "O portão se abre!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
-msgstr "Você vira a maçaneta..."
+msgid "You turn the handle…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -96343,8 +99094,8 @@ msgstr "As portas do celeiro se abrem!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
-msgstr "Você puxa a corda..."
+msgid "You pull the rope…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -96378,8 +99129,8 @@ msgstr "A porta sobe!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
-msgstr "Você empurra a alavanca..."
+msgid "You throw the lever…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -96574,11 +99325,8 @@ msgstr[1] "arcos simples"
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr ""
-"Um arco primitivo feito de uma peça unica de madeira, feito especialmente "
-"para a pessoa que a usa, fraco e altamente impreciso, ele não funciona tão "
-"bem, infelizmente..."
 
 #: lang/json/gun_from_json.py
 msgid "short bow"
@@ -96798,9 +99546,7 @@ msgstr ""
 " caçamenor. Os parafusos disparados dessa arma têm uma boa chance de "
 "permanecerintactos para reutilização."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "pistola"
@@ -97006,6 +99752,18 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "arremessar"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -97101,6 +99859,10 @@ msgstr ""
 "plasma e oenvolve com polímeros para reduzir o florescimento. Embora "
 "poderoso, elesofre de curto alcance. Alimentado por UPS."
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "semi-automática"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -97110,10 +99872,10 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -97132,8 +99894,7 @@ msgstr ""
 "um barril em 30-06 e outros dois para cartuchos de espingarda. É feito "
 "decanos e peças canibalizadas de uma espingarda de cano duplo."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "espingarda"
@@ -97331,6 +100092,10 @@ msgstr ""
 "Um canhão de água de um caminhão de bombeiros. Montado em um veículo, ele "
 "poderia ser usado para parar incêndios ou \"manifestantes\"."
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -97639,8 +100404,8 @@ msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 
@@ -97749,10 +100514,6 @@ msgstr ""
 "édesaconselhável e anulará sua garantia. Não há lugar real para "
 "incorporarmodificações pós-venda nessa proto-arma estéril."
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "semi-automática"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -98386,15 +101147,10 @@ msgstr[1] ""
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
-"A Sniper M24 é a versão militar e policial do rifle Remington Modelo 700, a "
-"M24 sendo o nome modelo dado pelas Forças Armadas dos Estados Unidos após a "
-"adoção como seu rifle sniper padrão em 1988. A M24 é referenciada como uma "
-"\"arma de sistema\" já que não consiste em apenas um rifle, mas também "
-"possuir uma mira removível e outros acessórios."
 
 #: lang/json/gun_from_json.py
 msgid "HK417 A2"
@@ -98561,20 +101317,17 @@ msgstr ""
 " tiros que você terá antes de quebrar em você."
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
 msgstr[0] ""
 msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
 msgstr ""
-" COP .38 O COP .38 é uma pequena pistola derringer gordinha que tem "
-"umaligeira semelhança com o Mossberg Brownie. Tem quatro barris dispostos "
-"emuma formação quadrada."
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -98610,20 +101363,6 @@ msgstr ""
 " S &amp; W 619 Um revólver .38 de sete voltas vendido pela Smith "
 "&amp;Wesson. Possui uma visão traseira fixa e um quadro reforçado."
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr ""
-" Taurus Pro .38 Uma popular pistola .38. Projetado com vários recursos "
-"desegurança e construído com materiais duráveis de alta qualidade."
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -98691,10 +101430,22 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
 msgid_plural "M1911A1s"
@@ -98799,9 +101550,9 @@ msgstr[1] ""
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -98827,8 +101578,9 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -99249,8 +102001,9 @@ msgstr[1] ""
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -99430,8 +102183,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Barrett M107A1"
 msgid_plural "Barrett M107A1"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Barrett M107A1"
+msgstr[1] "Barrett M107A1"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99461,8 +102214,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid ".50 caliber rifle"
 msgid_plural ".50 caliber rifles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "rifle calibre 50"
+msgstr[1] "rifles calibre 50"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99496,8 +102249,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "McMillan TAC-50"
 msgid_plural "McMillan TAC-50s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "McMillan TAC-50"
+msgstr[1] "McMillan TAC-50s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99512,8 +102265,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Serbu BFG-50"
 msgid_plural "Serbu BFG-50s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Serbu BFG-50"
+msgstr[1] "Serbu BFG-50s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99524,8 +102277,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Big Horn Model 89"
 msgid_plural "Big Horn Model 89"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Big Horn Modelo 89"
+msgstr[1] "Big Horn Modelos 89"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99540,8 +102293,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "S&W 500"
 msgid_plural "S&W 500"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "S&W 500"
+msgstr[1] "S&W 500s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99554,8 +102307,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "AK-74M"
 msgid_plural "AK-74Ms"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "AK-74M"
+msgstr[1] "AK-74Ms"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99568,8 +102321,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "AN-94"
 msgid_plural "AN-94s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "AN-94"
+msgstr[1] "AN-94s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99591,8 +102344,8 @@ msgstr "2 rd."
 #: lang/json/gun_from_json.py
 msgid "FN Five-Seven"
 msgid_plural "FN Five-Sevens"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "FN Five-Seven"
+msgstr[1] "FN Five-Sevens"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99607,8 +102360,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "FN P90"
 msgid_plural "FN P90s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "FN P90"
+msgstr[1] "FN P90s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99623,8 +102376,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "RM216 SPIW"
 msgid_plural "RM216 SPIWs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "RM216 SPIW"
+msgstr[1] "RM216 SPIWs"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99646,8 +102399,8 @@ msgstr "5 rd."
 #: lang/json/gun_from_json.py
 msgid "RM232 IDW"
 msgid_plural "RM232 IDWs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "RM232 IDW"
+msgstr[1] "RM232 IDWs"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99665,8 +102418,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "M202A1 FLASH"
 msgid_plural "M202A1 FLASH"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "M202A1 FLASH"
+msgstr[1] "M202A1 FLASH"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99677,13 +102430,13 @@ msgstr ""
 
 #: lang/json/gun_from_json.py
 msgid "all barrels"
-msgstr ""
+msgstr "todos os canos"
 
 #: lang/json/gun_from_json.py
 msgid "Elephant gun"
 msgid_plural "Elephant guns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Arma para elefantes"
+msgstr[1] "Armas para elefantes"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99698,8 +102451,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "AKM"
 msgid_plural "AKMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "AKM"
+msgstr[1] "AKMs"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99712,8 +102465,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Beretta ARX-160"
 msgid_plural "Beretta ARX-160"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Beretta ARX-160"
+msgstr[1] "Beretta ARX-160"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99731,8 +102484,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "SKS"
 msgid_plural "SKSs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "SKS"
+msgstr[1] "SKSs"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99748,8 +102501,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Mosin-Nagant M44"
 msgid_plural "Mosin-Nagant M44"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Mosin-Nagant M44"
+msgstr[1] "Mosin-Nagant M44"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99764,8 +102517,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Mosin-Nagant M44-EBR"
 msgid_plural "Mosin-Nagant M44-EBR"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Mosin-Nagant M44-EBR"
+msgstr[1] "Mosin-Nagant M44-EBR"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99778,8 +102531,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Mosin-Nagant 1891/30"
 msgid_plural "Mosin-Nagant 1891/30"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Mosin-Nagant 1891/30"
+msgstr[1] "Mosin-Nagant 1891/30"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99794,8 +102547,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Mosin-Nagant 1891/30-EBR"
 msgid_plural "Mosin-Nagant 1891/30-EBR"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Mosin-Nagant 1891/30-EBR"
+msgstr[1] "Mosin-Nagant 1891/30-EBR"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99811,8 +102564,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "PPSh-41"
 msgid_plural "PPSh-41s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "PPSh-41"
+msgstr[1] "PPSh-41s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99825,8 +102578,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Tokarev TT-33"
 msgid_plural "Tokarev TT-33"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tokarev TT-33"
+msgstr[1] "Tokarev TT-33"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99843,8 +102596,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "M3 recoilless rifle"
 msgid_plural "M3 recoilless rifles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "rifle sem recuo M3"
+msgstr[1] "rifles sem recuo M3"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99859,8 +102612,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "AT4"
 msgid_plural "AT4s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "AT4"
+msgstr[1] "AT4s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -99871,8 +102624,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "RM103A automagnum"
 msgid_plural "RM103A automagnums"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "automagnum RM103A"
+msgstr[1] "automagnums RM103A"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100203,8 +102956,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "L39"
 msgid_plural "L39s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "L39"
+msgstr[1] "L39s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100327,8 +103080,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Glock 17"
 msgid_plural "Glock 17s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Glock 17"
+msgstr[1] "Glock 17s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100341,8 +103094,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Glock 18C"
 msgid_plural "Glock 18Cs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Glock 18C"
+msgstr[1] "Glock 18Cs"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100354,8 +103107,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Kel-Tec PF-9"
 msgid_plural "Kel-Tec PF-9s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kel-Tec PF-9"
+msgstr[1] "Kel-Tec PF-9s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100368,40 +103121,42 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "M17"
 msgid_plural "M17s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "M17"
+msgstr[1] "M17s"
 
 #: lang/json/gun_from_json.py
 msgid ""
 "The M17 is a semi automatic, short recoil operated pistol derived from the "
 "SIG Sauer P320."
 msgstr ""
+"A M17 é uma pistola semiautomática de baixo recuo, derivada da SIG Sauer "
+"P320."
 
 #: lang/json/gun_from_json.py
 msgid "Browning Hi-Power 9x19mm"
 msgid_plural "Browning Hi-Power 9x19mms"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Browning Hi-Power 9x19mm"
+msgstr[1] "Browning Hi-Power 9x19mms"
 
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
 msgid "Walther P38"
 msgid_plural "Walther P38s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Walther P38"
+msgstr[1] "Walther P38s"
 
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -100410,66 +103165,66 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Walther PPQ 9mm"
 msgid_plural "Walther PPQ 9mms"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Walther PPQ 9mm"
+msgstr[1] "Walther PPQ 9mms"
 
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
 msgid "Hi-Point C-9"
 msgid_plural "Hi-Point C-9s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hi-Point C-9"
+msgstr[1] "Hi-Point C-9s"
 
 #: lang/json/gun_from_json.py
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
 msgid "CZ-75"
 msgid_plural "CZ-75s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "CZ-75"
+msgstr[1] "CZ-75s"
 
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
 
 #: lang/json/gun_from_json.py
 msgid "Walther CCP"
 msgid_plural "Walther CCPs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Walther CCP"
+msgstr[1] "Walther CCPs"
 
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 
 #: lang/json/gun_from_json.py
 msgid "Makarov PM"
 msgid_plural "Makarov PMs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Makarov PM"
+msgstr[1] "Makarov PMs"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100485,8 +103240,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Skorpion Vz. 82"
 msgid_plural "Skorpion Vz. 82s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Skorpion Vz. 82"
+msgstr[1] "Skorpion Vz. 82s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100499,8 +103254,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "BGM-71F TOW"
 msgid_plural "BGM-71F TOW"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "BGM-71F TOW"
+msgstr[1] "BGM-71F TOW"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100515,18 +103270,18 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "bionic shotgun"
 msgid_plural "bionic shotguns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "escopeta biônica"
+msgstr[1] "escopetas biônicas"
 
 #: lang/json/gun_from_json.py
 msgid "Bionic one-shot retracting shotgun integrated with your arm."
-msgstr ""
+msgstr "Escopeta biônica retrátil de tiro único, integrada em seu braço."
 
 #: lang/json/gun_from_json.py
 msgid "laser finger"
 msgid_plural "laser fingers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "dedo de laser"
+msgstr[1] "dedos de laser"
 
 #: lang/json/gun_from_json.py lang/json/mutation_from_json.py
 msgid "Assault barbs"
@@ -100561,8 +103316,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "flamethrower"
 msgid_plural "flamethrowers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "lança-chamas"
+msgstr[1] "lança-chamas"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100575,8 +103330,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "RM451 flamethrower"
 msgid_plural "RM451 flamethrowers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "lança-chamas RM451"
+msgstr[1] "lança-chamas RM451"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100729,8 +103484,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "nail gun"
 msgid_plural "nail guns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "pistola de pregos"
+msgstr[1] "pistolas de pregos"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100743,8 +103498,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "nail rifle"
 msgid_plural "nail rifles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "rifle de pregos"
+msgstr[1] "rifles de pregos"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100759,8 +103514,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Paintball gun"
 msgid_plural "Paintball guns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "arma de Paintball"
+msgstr[1] "armas de Paintball"
 
 #: lang/json/gun_from_json.py
 msgid "A fairly harmless gun that shoots small paintballs."
@@ -100771,8 +103526,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "heavy automatic shotgun"
 msgid_plural "heavy automatic shotguns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "escopeta pesada automática"
+msgstr[1] "escopetas pesadas automáticas"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100788,8 +103543,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "12 gauge pistol"
 msgid_plural "12 gauge pistols"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "pistola calibre 12"
+msgstr[1] "pistolas calibre 12"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100802,8 +103557,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "manual autoshotgun"
 msgid_plural "manual autoshotguns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "autoescopeta manual"
+msgstr[1] "autoescopetas manuais"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100817,8 +103572,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Kel-Tec KSG"
 msgid_plural "Kel-Tec KSG"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kel-Tec KSG"
+msgstr[1] "Kel-Tec KSGs"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100834,8 +103589,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "L12 Defender"
 msgid_plural "L12 Defender"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "L12 Defender"
+msgstr[1] "L12 Defenders"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100853,8 +103608,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "M1014 shotgun"
 msgid_plural "M1014 shotguns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "escopeta M1014"
+msgstr[1] "escopetas M1014"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100867,8 +103622,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Mossberg 500"
 msgid_plural "Mossberg 500"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Mossberg 500"
+msgstr[1] "Mossberg 500s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100911,8 +103666,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Remington 870"
 msgid_plural "Remington 870"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Remington 870"
+msgstr[1] "Remington 870s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100927,8 +103682,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "shotgun revolver"
 msgid_plural "shotgun revolvers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "revólver-escopeta"
+msgstr[1] "revólveres-escopeta"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -100941,8 +103696,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Saiga-12"
 msgid_plural "Saiga-12s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Saiga-12"
+msgstr[1] "Saiga-12s"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -101003,8 +103758,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "flaregun"
 msgid_plural "flareguns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "pistola sinalizadora"
+msgstr[1] "pistolas sinalizadoras"
 
 #: lang/json/gun_from_json.py
 msgid "A plastic single shot pistol that can be loaded with signal flares."
@@ -101070,8 +103825,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "A7 laser rifle"
 msgid_plural "A7 laser rifles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "rifle laser A7"
+msgstr[1] "rifles laser A7"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -101234,10 +103989,6 @@ msgid ""
 "and destruction it can cause."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr ""
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -101295,8 +104046,8 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "pellet gun"
 msgid_plural "pellet guns"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "carabina de pressão"
+msgstr[1] "carabinas de pressão"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -102215,10 +104966,62 @@ msgstr[1] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -102345,12 +105148,6 @@ msgstr ""
 "disparados dessa arma têm uma boa chance de permanecer intactos para "
 "reutilização."
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -103609,7 +106406,7 @@ msgstr ""
 msgid "accessories"
 msgstr "acessórios"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "arco"
@@ -103746,7 +106543,7 @@ msgstr[1] ""
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
+"it's a bug.  50x more UPS drain."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -103920,8 +106717,8 @@ msgstr[1] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -103950,7 +106747,7 @@ msgstr[1] ""
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
+"energy efficiency.  Decreases power consumption."
 msgstr ""
 
 #: lang/json/gunmod_from_json.py
@@ -103965,12 +106762,9 @@ msgstr[1] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
 msgstr ""
-" capacitor de alta densidade Um capacitor com maior densidade de "
-"energiaaumenta o alcance e o dano; à custa de um consumo de energia "
-"acentuadamenteaumentado."
 
 #: lang/json/gunmod_from_json.py
 msgid "Leadworks magazine adapter"
@@ -104203,6 +106997,20 @@ msgstr ""
 "asubida da boca, melhorando o recuo, mas aumentando o volume, o ruído "
 "ereduzindo a precisão levemente."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
 msgid_plural "homemade suppressors"
@@ -104351,6 +107159,20 @@ msgstr ""
 msgid "rail"
 msgstr "mira telescópica"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
@@ -104366,6 +107188,19 @@ msgstr ""
 "montadasa 45 ° para uso quando um escopo ou outra modificação impedir o uso "
 "dasmiras primárias."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
@@ -104378,6 +107213,18 @@ msgstr ""
 " trilho de desvio Um trilho adicional ajustado a 45 ° para conectar "
 "umaóptica secundária."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
@@ -104410,6 +107257,20 @@ msgstr ""
 "dasua arma de fogo e reduz a vibração, reduzindo bastante o recuo "
 "eaumentando ligeiramente a precisão."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -104536,6 +107397,20 @@ msgid ""
 " mrad increments and is remarkably small and light for its magnification."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
@@ -104548,6 +107423,19 @@ msgid ""
 "crosshair."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
 msgid_plural "RS1219 scopes"
@@ -104768,6 +107656,21 @@ msgstr ""
 "omanuseio do recuo, eles são utilizáveis apenas em certas superfícies e "
 "sãolentos para se equipar."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -104812,6 +107715,19 @@ msgstr ""
 "ummaior controle. Não tão eficaz quanto um bipé, mas utilizável sob todas "
 "ascondições."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
@@ -104884,6 +107800,20 @@ msgstr ""
 " pode ser conectado a quase todos os rifles. Ele permite que uma "
 "únicagranada de 40mm seja carregada e disparada."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
@@ -104903,20 +107833,54 @@ msgstr ""
 "parauso independente."
 
 #: lang/json/gunmod_from_json.py
-msgid "masterkey shotgun"
-msgid_plural "masterkey shotguns"
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
 msgstr[0] ""
 msgstr[1] ""
 
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "masterkey shotgun"
+msgid_plural "masterkey shotguns"
+msgstr[0] "espingarda masterkey"
+msgstr[1] "espingardas masterkey"
+
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A minimalist pump action shotgun, which can be mounted under the barrel of "
 "many rifles.  It allows a total of four shotgun shells to be loaded and "
 "fired."
 msgstr ""
-" espingarda masterkey Uma espingarda de acção de bomba minimalista, que "
-"podeser montada sob o cano de muitos espingardas. Ele permite que um total "
-"dequatro cartuchos de espingarda sejam carregados e disparados."
+"Uma espingarda minimalista de ação de bomba, que pode ser montada sob o cano"
+" de muitos rifles. Permite que um total de quatro cartuchos de espingarda "
+"sejam carregados e disparados."
+
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] "espingarda masterkey modificada"
+msgstr[1] "espingardas masterkey modificadas"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+"Uma espingarda minimalista de ação de bomba, que pode ser montada sob o cano"
+" de muitos rifles. Permite que um total de quatro cartuchos de espingarda "
+"sejam carregados e disparados. Esta foi customizada para poder ser montada "
+"em quase todas as armas, exceto pistolas e armas por ação de bomba, caso "
+"desejado."
 
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
@@ -104926,12 +107890,9 @@ msgstr[1] ""
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
 msgstr ""
-" Lançador de tubos de 40mm Este é um tubo de lançador construído em casa que"
-" pode ser anexado a quase qualquer rifle. Ele permite que uma única "
-"granadade 40mm seja carregada e disparada."
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -104944,9 +107905,8 @@ msgid ""
 "A pistol bayonet is a stabbing weapon that can be attached to the front of a"
 " handgun, allowing a melee attack to deal piercing damage."
 msgstr ""
-" baioneta de pistola Uma baioneta de pistola é uma arma que pode ser "
-"anexadaà frente de uma arma, permitindo que um ataque corpo-a-corpo cause "
-"danoperfurante."
+"Uma baioneta de pistola é uma arma que pode ser anexada à frente de uma "
+"arma, permitindo que um ataque corpo-a-corpo cause dano perfurante."
 
 #: lang/json/gunmod_from_json.py
 msgid "RM121 aux shotgun"
@@ -104960,9 +107920,23 @@ msgid ""
 "caseless shotgun, which can be mounted under the barrel of many rifles.  "
 "Accepts RMSA10 box magazines."
 msgstr ""
-" RM121 aux shotgun O sistema de armas auxiliares Rivtech RM121 é "
-"umaespingarda semi-automática, alimentada a carregador, que pode ser "
-"montadasob o cano de muitas espingardas. Aceita revistas de caixa RMSA10."
+"O sistema de armas auxiliares Rivtech RM121 é uma espingarda semi-"
+"automática, alimentada a carregador, que pode ser montada sob o cano de "
+"muitos rifles. Aceita carregadores de caixa RMSA10."
+
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
 
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
@@ -104975,9 +107949,23 @@ msgid ""
 "A short shotgun with 2 barrels, which can be mounted under the barrel of "
 "many rifles.  It allows two shotgun shells to be loaded and fired."
 msgstr ""
-" espingarda underslung Uma espingarda curta com 2 barris, que pode "
-"sermontada sob o cano de muitos rifles. Permite que dois cartuchos "
-"deespingarda sejam carregados e disparados."
+"Uma espingarda curta com 2 canos, que pode ser montada sob o cano de muitos "
+"rifles. Permite que dois cartuchos de espingarda sejam carregados e "
+"disparados."
+
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr ""
 
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
@@ -105291,6 +108279,58 @@ msgstr ""
 "eledescarrega as cargas da UPS durante o disparo e, devido a "
 "extensasmodificações, a pistola não pode mais operar sem um no-break."
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -107280,9 +110320,10 @@ msgstr "Medir radiação"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
-msgstr "..."
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
+msgstr ""
 
 #: lang/json/item_action_from_json.py
 msgid "Control an RC car"
@@ -107560,21 +110601,21 @@ msgid ""
 "As a weapon, this item is <good>well-made</good> and will <info>withstand "
 "the punishment of combat</info>."
 msgstr ""
-" Como arma, este item é <good> bem feito </good> e vai <info> suportar "
-"apunição do combate </info> ."
+"Como arma, este item é <good> bem feito </good> e vai <info> suportar a "
+"punição do combate </info>."
 
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid "This tastes <good>better</good> while <color_light_cyan>cold</color>."
 msgstr ""
-" Este gostos <good> Melhor </good> enquanto <color_light_cyan> frio "
+"Isto tem um gosto <good> melhor </good> quando <color_light_cyan> frio "
 "</color>."
 
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid "This tastes <good>better</good> while <color_red>hot</color>."
 msgstr ""
-" Este gostos <good> Melhor </good> enquanto <color_red> quente </color> ."
+"Isto tem um gosto <good> melhor </good> quando <color_red> quente </color>."
 
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
@@ -107582,8 +110623,8 @@ msgid ""
 "This gear <good>completely protects</good> you from <info>electric "
 "discharges</info>."
 msgstr ""
-" Esta engrenagem <good> protege completamente </good> Você é de "
-"<info>descargas elétricas </info> ."
+"Este equipamento <good> lhe protege completamente </good> de <info>descargas"
+" elétricas</info>."
 
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
@@ -107595,23 +110636,24 @@ msgstr ""
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid "You can wear <info>only one</info>."
-msgstr "Você pode vestir <info> apenas um </info> ."
+msgstr "Você pode vestir <info> apenas um</info>."
 
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid "This piece of clothing is <info>fancy</info>."
-msgstr "Esta peça de roupa é <info> chique </info> ."
+msgstr "Esta peça de roupa é <info> chique </info>."
 
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid "This item counts as <color_red>fire</color> for crafting purposes."
 msgstr ""
-" Este item conta como <color_red> fogo </color> para fins de elaboração."
+"Este item conta como <color_red> fogo </color> para fins de criação de "
+"itens."
 
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid "This item can start <color_red>fire</color>."
-msgstr "Este item pode começar <color_red> fogo </color> ."
+msgstr "Este item pode acender <color_red> fogo </color>."
 
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
@@ -107943,6 +110985,13 @@ msgstr ""
 msgid "This bionic can provide power to powered armor."
 msgstr "Este biônico pode fornecer energia à armadura elétrica."
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr ""
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -108795,11 +111844,11 @@ msgstr "Largo movimento para a direita"
 
 #: lang/json/keybinding_from_json.py
 msgid "Wide move up"
-msgstr "Largo subir"
+msgstr "Largo movimento para cima"
 
 #: lang/json/keybinding_from_json.py
 msgid "Wide move down"
-msgstr "Largo descer"
+msgstr "Largo movimento para baixo"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle category selection mode"
@@ -108807,7 +111856,7 @@ msgstr "Alternar modo de seleção de categoria"
 
 #: lang/json/keybinding_from_json.py
 msgid "Set item filter"
-msgstr "Definir filtro de item"
+msgstr "Definir filtro de itens"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle item as favorite"
@@ -108815,7 +111864,7 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle activate/examine"
-msgstr "Alternar ativar / examinar"
+msgstr "Alternar ativar/examinar"
 
 #: lang/json/keybinding_from_json.py src/martialarts.cpp
 msgid "Pause"
@@ -108827,31 +111876,31 @@ msgstr "Alternar Memória do Mapa"
 
 #: lang/json/keybinding_from_json.py
 msgid "Center View"
-msgstr "Vista central"
+msgstr "Centralizar Vista"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move View North"
-msgstr "Mover a vista norte"
+msgstr "Mover Vista para o Norte"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move View East"
-msgstr "Mover a vista do leste"
+msgstr "Mover Vista para o Leste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move View South"
-msgstr "Mover para o sul"
+msgstr "Mover Vista para o Sul"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move View West"
-msgstr "Mover a vista para oeste"
+msgstr "Mover Vista para o Oeste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Open Door"
-msgstr "Porta aberta"
+msgstr "Abrir Porta"
 
 #: lang/json/keybinding_from_json.py
 msgid "Close Door"
-msgstr "Porta fechada"
+msgstr "Fechar Porta"
 
 #: lang/json/keybinding_from_json.py
 msgid "Smash Nearby Terrain"
@@ -108859,7 +111908,7 @@ msgstr "Esmagar Terreno Próximo"
 
 #: lang/json/keybinding_from_json.py
 msgid "Examine Nearby Terrain"
-msgstr "Examinar o terreno nas proximidades"
+msgstr "Examinar Terreno Próximo"
 
 #: lang/json/keybinding_from_json.py
 msgid "Advanced Inventory management"
@@ -108875,11 +111924,11 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "Grab something nearby"
-msgstr "Pegue algo nas proximidades"
+msgstr "Pegar algo próximo"
 
 #: lang/json/keybinding_from_json.py
 msgid "Haul items along the ground"
-msgstr "Itens de transporte ao longo do solo"
+msgstr "Transportar itens pelo chão"
 
 #: lang/json/keybinding_from_json.py
 msgid "Zone activities"
@@ -108887,7 +111936,7 @@ msgstr "Atividades de zona"
 
 #: lang/json/keybinding_from_json.py src/options.cpp
 msgid "Butcher"
-msgstr "açougueiro"
+msgstr "Carnear"
 
 #: lang/json/keybinding_from_json.py
 msgid "Chat with NPC"
@@ -108895,7 +111944,7 @@ msgstr "Bate-papo com NPC"
 
 #: lang/json/keybinding_from_json.py src/game.cpp
 msgid "Look Around"
-msgstr "Olhar em volta"
+msgstr "Olhar em Volta"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle thief mode"
@@ -108903,7 +111952,7 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "Peek Around Corners"
-msgstr "Espreite em torno dos cantos"
+msgstr "Espiar em Torno de Esquina"
 
 #: lang/json/keybinding_from_json.py
 msgid "List all items around the player"
@@ -108915,31 +111964,31 @@ msgstr "Gerenciar zonas"
 
 #: lang/json/keybinding_from_json.py
 msgid "Open Inventory"
-msgstr "Inventário Aberto"
+msgstr "Abrir Inventário"
 
 #: lang/json/keybinding_from_json.py
 msgid "Compare two Items"
-msgstr "Compare dois itens"
+msgstr "Comparar dois Itens"
 
 #: lang/json/keybinding_from_json.py src/game_inventory.cpp
 msgid "Swap Inventory Letters"
-msgstr "Trocar cartas de inventário"
+msgstr "Trocar Letras de Inventário"
 
 #: lang/json/keybinding_from_json.py
 msgid "Apply or Use Item"
-msgstr "Aplicar ou usar item"
+msgstr "Aplicar ou Usar Item"
 
 #: lang/json/keybinding_from_json.py
 msgid "Apply or Use Wielded Item"
-msgstr "Aplicar ou usar item empunhado"
+msgstr "Aplicar ou Usar Item Empunhado"
 
 #: lang/json/keybinding_from_json.py
 msgid "Wear Item"
-msgstr "Item de desgaste"
+msgstr "Vestir Item"
 
 #: lang/json/keybinding_from_json.py
 msgid "Take Off Worn Item"
-msgstr "Retire o item desgastado"
+msgstr "Remover Item Vestido"
 
 #: lang/json/keybinding_from_json.py
 msgid "Consume Item Menu"
@@ -108947,11 +111996,11 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "Wield"
-msgstr "Manejar"
+msgstr "Empunhar"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select Martial Arts Style"
-msgstr "Selecione o estilo de artes marciais"
+msgstr "Selecionar Estilo de Artes Marciais"
 
 #: lang/json/keybinding_from_json.py
 msgid "Reload Wielded Item"
@@ -108959,55 +112008,55 @@ msgstr "Recarregar Item Empunhado"
 
 #: lang/json/keybinding_from_json.py
 msgid "Unload or Empty Wielded Item"
-msgstr "Descarregar ou esvaziar item empunhado"
+msgstr "Descarregar ou Esvaziar Item Empunhado"
 
 #: lang/json/keybinding_from_json.py
 msgid "Throw Item"
-msgstr "Throw Item"
+msgstr "Arremessar Item"
 
 #: lang/json/keybinding_from_json.py
 msgid "Blind Throw Item"
-msgstr "Item de lance cego"
+msgstr "Arremessar Item Cegamente"
 
 #: lang/json/keybinding_from_json.py
 msgid "Fire Wielded Item"
-msgstr "Item Empunhado por Fogo"
+msgstr "Disparar Item Empunhado"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle attack mode of Wielded Item"
-msgstr "Alternar o modo de ataque do Item empunhado"
+msgstr "Alternar modo de ataque do Item empunhado"
 
 #: lang/json/keybinding_from_json.py
 msgid "Drop Item"
-msgstr "Drop Item"
+msgstr "Largar Item"
 
 #: lang/json/keybinding_from_json.py
 msgid "Drop Item to Adjacent Tile"
-msgstr "Soltar Item para o Mosaico Adjacente"
+msgstr "Largar Item no Espaço Adjacente"
 
 #: lang/json/keybinding_from_json.py
 msgid "View/Activate Bionics"
-msgstr "Ver / Ativar Biônica"
+msgstr "Ver/Ativar Biônicos"
 
 #: lang/json/keybinding_from_json.py
 msgid "View/Activate Mutations"
-msgstr "Visualizar / Ativar Mutações"
+msgstr "Ver/Ativar Mutações"
 
 #: lang/json/keybinding_from_json.py
 msgid "Re-layer armor/clothing"
-msgstr "Re-camada de armadura / roupa"
+msgstr "Alterar Camadas de armadura/roupa"
 
 #: lang/json/keybinding_from_json.py
 msgid "Wait for Several Minutes"
-msgstr "Aguarde alguns minutos"
+msgstr "Esperar Vários Minutos"
 
 #: lang/json/keybinding_from_json.py
 msgid "Craft Items"
-msgstr "Itens de artesanato"
+msgstr "Criar Itens"
 
 #: lang/json/keybinding_from_json.py src/iexamine.cpp
 msgid "Recraft last recipe"
-msgstr "Recraft a última receita"
+msgstr "Recriar Última Receita"
 
 #: lang/json/keybinding_from_json.py
 msgid "Construct Terrain"
@@ -109023,7 +112072,7 @@ msgstr "Dormir"
 
 #: lang/json/keybinding_from_json.py
 msgid "Control Vehicle"
-msgstr "Veículo de Controle"
+msgstr "Controlar Veículo"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Auto Travel Mode"
@@ -109031,31 +112080,31 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Safe Mode"
-msgstr "Alternar o modo de segurança"
+msgstr "Alternar Modo de Segurança"
 
 #: lang/json/keybinding_from_json.py
 msgid "Ignore Nearby Enemy"
-msgstr "Ignorar inimigo nas proximidades"
+msgstr "Ignorar Inimigo Próximo"
 
 #: lang/json/keybinding_from_json.py
 msgid "Whitelist enemy"
-msgstr "Inimigo Whitelist"
+msgstr "Whitelist em Inimigo"
 
 #: lang/json/keybinding_from_json.py
 msgid "Save and Quit"
-msgstr "Salvar e sair"
+msgstr "Salvar e Sair"
 
 #: lang/json/keybinding_from_json.py
 msgid "Commit Suicide"
-msgstr "Cometer suicídio"
+msgstr "Cometer Suicídio"
 
 #: lang/json/keybinding_from_json.py
 msgid "View Player Info"
-msgstr "Visualizar informações do jogador"
+msgstr "Visualizar Informações do Jogador"
 
 #: lang/json/keybinding_from_json.py
 msgid "View Map"
-msgstr "Ver mapa"
+msgstr "Ver Mapa"
 
 #: lang/json/keybinding_from_json.py
 msgid "Look at the sky"
@@ -109063,7 +112112,7 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "View Factions"
-msgstr "Ver facções"
+msgstr "Ver Facções"
 
 #: lang/json/keybinding_from_json.py
 msgid "View Scores"
@@ -109071,15 +112120,15 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "View Morale"
-msgstr "Ver moral"
+msgstr "Ver Moral"
 
 #: lang/json/keybinding_from_json.py
 msgid "View Message Log"
-msgstr "Exibir log de mensagens"
+msgstr "Exibir Log de Mensagens"
 
 #: lang/json/keybinding_from_json.py
 msgid "View Help"
-msgstr "Ver ajuda"
+msgstr "Ver Ajuda"
 
 #: lang/json/keybinding_from_json.py
 msgid "Zoom In"
@@ -109087,11 +112136,11 @@ msgstr "Mais Zoom"
 
 #: lang/json/keybinding_from_json.py
 msgid "Zoom Out"
-msgstr "Reduzir o zoom"
+msgstr "Menos Zoom"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Debug Mode"
-msgstr "Alternar modo de depuração"
+msgstr "Ativar Modo de Depuração"
 
 #: lang/json/keybinding_from_json.py
 msgid "Debug Menu"
@@ -109119,11 +112168,11 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "Switch Sidebar Style"
-msgstr "Mudar o estilo da barra lateral"
+msgstr "Estilo da Barra Lateral"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Fullscreen mode"
-msgstr "Alternar modo de tela cheia"
+msgstr "Alternar Modo de Tela Cheia"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Minimap"
@@ -109135,19 +112184,19 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "Reload Item"
-msgstr ""
+msgstr "Recarregar Item"
 
 #: lang/json/keybinding_from_json.py
 msgid "Reload Tileset"
-msgstr "Recarregar o Tileset"
+msgstr "Recarregar Tileset"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Auto Features"
-msgstr "Alternar recursos automáticos"
+msgstr "Alternar Recursos Automáticos"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Auto Pulp/Butcher"
-msgstr "Toggle Auto Pulp / Açougueiro"
+msgstr "Alternar Auto Pulp/Carnear"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Auto Mining"
@@ -109155,67 +112204,67 @@ msgstr "Alternar Auto Mineração"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Auto Foraging"
-msgstr "Toggle Auto Foraging"
+msgstr "Alternar Auto Forragem"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Auto Pickup"
-msgstr ""
+msgstr "Alternar Auto-Coleta"
 
 #: lang/json/keybinding_from_json.py
 msgid "Action Menu"
-msgstr "Menu Ação"
+msgstr "Menu de Ações"
 
 #: lang/json/keybinding_from_json.py
 msgid "Item Action Menu"
-msgstr "Menu de ação do item"
+msgstr "Menu de Ações de Itens"
 
 #: lang/json/keybinding_from_json.py
 msgid "Quicksave"
-msgstr "Salvamento rapido"
+msgstr "Salvamento Rápido"
 
 #: lang/json/keybinding_from_json.py
 msgid "Quickload"
-msgstr "Quickload"
+msgstr "Carregamento Rápido"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move View Northeast"
-msgstr "Mover-se para o nordeste"
+msgstr "Mover Vista para o Nordeste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move View Southeast"
-msgstr "Mover a vista para o sudeste"
+msgstr "Mover Vista para o Sudeste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move View Southwest"
-msgstr "Mover a vista do sudoeste"
+msgstr "Mover Vista para o Sudoeste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move View Northwest"
-msgstr "Mover a vista noroeste"
+msgstr "Mover Vista para o Noroeste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Burst-Fire Wielded Item"
-msgstr "Item Empunhado Contra Incêndio"
+msgstr "Disparar Item Empunhado em Modo Burst-Fire"
 
 #: lang/json/keybinding_from_json.py src/iexamine.cpp
 msgid "Craft as long as possible"
-msgstr "Craft o maior tempo possível"
+msgstr "Criar pelo Máximo Possível"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Auto-Safemode"
-msgstr "Toggle Auto-Safemode"
+msgstr "Ativar Auto-Modo de Segurança"
 
 #: lang/json/keybinding_from_json.py
 msgid "Autoattack"
-msgstr "autoattack"
+msgstr "Auto Atacar"
 
 #: lang/json/keybinding_from_json.py
 msgid "Main Menu"
-msgstr "Menu principal"
+msgstr "Menu Principal"
 
 #: lang/json/keybinding_from_json.py src/input.cpp
 msgid "Keybindings"
-msgstr "Combinações de teclas"
+msgstr "Combinações de Teclas"
 
 #: lang/json/keybinding_from_json.py src/game.cpp
 msgid "Options"
@@ -109223,15 +112272,15 @@ msgstr "Opções"
 
 #: lang/json/keybinding_from_json.py
 msgid "Autopickup manager"
-msgstr "Gerente de Autopickup"
+msgstr "Gerente de Auto-coleta"
 
 #: lang/json/keybinding_from_json.py
 msgid "Autonotes manager"
-msgstr ""
+msgstr "Gerenciador de autonotas"
 
 #: lang/json/keybinding_from_json.py
 msgid "Safe Mode manager"
-msgstr "Gerenciador de modo de segurança"
+msgstr "Gerenciador de Modo de Segurança"
 
 #: lang/json/keybinding_from_json.py
 msgid "Color manager"
@@ -109239,7 +112288,7 @@ msgstr "Gerenciador de cores"
 
 #: lang/json/keybinding_from_json.py
 msgid "Active World Mods"
-msgstr "Modos Ativos do Mundo"
+msgstr "Mods Ativos do Mundo"
 
 #: lang/json/keybinding_from_json.py
 msgid "Cycle move mode (run/walk/crouch)"
@@ -109247,15 +112296,15 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "Reset Movement to Walk"
-msgstr ""
+msgstr "Resetar Movimento para Caminhada"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Run"
-msgstr ""
+msgstr "Ativar Corrida"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Crouch"
-msgstr ""
+msgstr "Ativar Agachar"
 
 #: lang/json/keybinding_from_json.py
 msgid "Movement Mode Menu"
@@ -109287,11 +112336,11 @@ msgstr "Alterar ordem de classificação"
 
 #: lang/json/keybinding_from_json.py
 msgid "Add to safemode blacklist"
-msgstr "Adicionar à lista negra de safemode"
+msgstr "Adicionar à lista negra do modo de segurança"
 
 #: lang/json/keybinding_from_json.py
 msgid "Remove from safemode blacklist"
-msgstr "Remover da lista negra de safemode"
+msgstr "Remover da lista negra do modo de segurança"
 
 #: lang/json/keybinding_from_json.py
 msgid "look around"
@@ -109317,11 +112366,11 @@ msgstr "Mover cursor para baixo"
 
 #: lang/json/keybinding_from_json.py
 msgid "Exit this keybinding screen"
-msgstr "Saia desta tela de teclas"
+msgstr "Sair desta tela de atalhos de teclas"
 
 #: lang/json/keybinding_from_json.py
 msgid "Remove bindings"
-msgstr "Remover ligações"
+msgstr "Remover atalhos de teclado"
 
 #: lang/json/keybinding_from_json.py
 msgid "Add local keybinding"
@@ -109341,7 +112390,7 @@ msgstr "Remover zona"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move zone up"
-msgstr "Mova a zona para cima"
+msgstr "Mover a zona para cima"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move zone down"
@@ -109365,15 +112414,15 @@ msgstr "Mostrar todas as zonas / ocultar zonas distantes"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select left inventory"
-msgstr "Selecione o inventário da esquerda"
+msgstr "Selecionar o inventário da esquerda"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select right inventory"
-msgstr "Selecione o inventário certo"
+msgstr "Selecionar o inventário da direita"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle tab"
-msgstr "Guia de alternância"
+msgstr "Alternar aba"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle vehicle"
@@ -109381,7 +112430,7 @@ msgstr "Alternar veículo"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle auto-pickup for item"
-msgstr "Alternar auto-pickup para item"
+msgstr "Alternar auto-coleta para item"
 
 #: lang/json/keybinding_from_json.py
 msgid "Change sorting mode"
@@ -109393,7 +112442,7 @@ msgstr "Mover um único item"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move an amount of item"
-msgstr "Mover uma quantidade de item"
+msgstr "Mover uma quantidade do item"
 
 #: lang/json/keybinding_from_json.py
 msgid "Move item stack"
@@ -109409,39 +112458,39 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "Select items @ North-West"
-msgstr "Selecione os itens @ North-West"
+msgstr "Selecione os itens @ Noroeste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select items @ North"
-msgstr "Selecione os itens @ North"
+msgstr "Selecione os itens @ Norte"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select items @ North-East"
-msgstr "Selecione os itens @ North-East"
+msgstr "Selecione os itens @ Nordeste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select items @ West"
-msgstr "Selecione os itens @ West"
+msgstr "Selecione os itens @ Oeste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select items @ center"
-msgstr "Selecione itens @ center"
+msgstr "Selecione itens @ Centro"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select items @ East"
-msgstr "Selecione os itens @ East"
+msgstr "Selecione os itens @ Leste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select items @ South-West"
-msgstr "Selecione os itens @ South-West"
+msgstr "Selecione os itens @ Sudoeste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select items @ South"
-msgstr "Selecione os itens @ South"
+msgstr "Selecione os itens @ Sul"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select items @ South-East"
-msgstr "Selecione os itens @ South-East"
+msgstr "Selecione os itens @ Sudeste"
 
 #: lang/json/keybinding_from_json.py
 msgid "Select items in inventory"
@@ -109483,6 +112532,7 @@ msgstr "Remover cor personalizada"
 msgid "Load color template"
 msgstr "Carregar modelo de cor"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -109528,7 +112578,7 @@ msgstr "Liberar controles"
 
 #: lang/json/keybinding_from_json.py
 msgid "Sound horn"
-msgstr "Buzina de som"
+msgstr "Soar buzina"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle aisle lights"
@@ -109548,7 +112598,7 @@ msgstr ""
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle camera system"
-msgstr "Alternar sistema de câmera"
+msgstr "Alternar sistema de câmeras"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle chimes"
@@ -109556,7 +112606,7 @@ msgstr "Alternar sinos"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle cruise control"
-msgstr "Alternar cruise control"
+msgstr "Alternar piloto automático"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle dome lights"
@@ -109568,11 +112618,11 @@ msgstr "Alternar portas"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle engine"
-msgstr "Toggle engine"
+msgstr "Alternar motor"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle fridge"
-msgstr "Refrigerador"
+msgstr "Alternar geladeira"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle freezer"
@@ -109584,11 +112634,11 @@ msgstr "Alternar faróis"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle wide-angle headlights"
-msgstr "Alternar faróis de grande angular"
+msgstr "Alternar faróis largos"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle directional overhead lights"
-msgstr "Alternar luzes indiretas direcionais"
+msgstr "Alternar luzes suspensas direcionais"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle overhead lights"
@@ -109596,31 +112646,31 @@ msgstr "Alternar luzes suspensas"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle planter"
-msgstr "Plantador de alternância"
+msgstr "Alternar planteira"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle plow"
-msgstr "Arado de alavanca"
+msgstr "Alternar arado"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle reactor"
-msgstr "Reator de alternância"
+msgstr "Alternar reator"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle reaper"
-msgstr "Alternar Ceifador"
+msgstr "Alternar ceifador"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle recharger"
-msgstr "Alternar recarga"
+msgstr "Alternar recarregador"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle scoop"
-msgstr "Colher de alternância"
+msgstr "Alternar colhedor"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle stereo"
-msgstr "Alternar estéreo"
+msgstr "Alternar aparelho de som"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle water purifiers"
@@ -109636,19 +112686,19 @@ msgstr "Definir modos de disparo da torre"
 
 #: lang/json/keybinding_from_json.py src/vehicle_use.cpp
 msgid "Aim turrets manually"
-msgstr "Aponte as torretas manualmente"
+msgstr "Mirar torretas manualmente"
 
 #: lang/json/keybinding_from_json.py src/vehicle_use.cpp
 msgid "Aim automatic turrets"
-msgstr "Aponte torres automáticas"
+msgstr "Mirar torres automáticas"
 
 #: lang/json/keybinding_from_json.py src/vehicle_use.cpp
 msgid "Aim individual turret"
-msgstr "Aponte torre individual"
+msgstr "Mirar torre individual"
 
 #: lang/json/keybinding_from_json.py src/vehicle_use.cpp
 msgid "Set turret targeting modes"
-msgstr "Definir modos de segmentação da torre"
+msgstr "Definir modos de mira da torre"
 
 #: lang/json/map_extra_from_json.py src/character.cpp src/iuse_actor.cpp
 msgid "Nothing"
@@ -109657,11 +112707,11 @@ msgstr "Nada"
 #. ~ Description for Nothing
 #: lang/json/map_extra_from_json.py
 msgid "Nothing of interest is here."
-msgstr ""
+msgstr "Aqui não tem nada de interessante."
 
 #: lang/json/map_extra_from_json.py
 msgid "Crater"
-msgstr ""
+msgstr "Cratera"
 
 #. ~ Description for Crater
 #: lang/json/map_extra_from_json.py
@@ -109670,7 +112720,7 @@ msgstr ""
 
 #: lang/json/map_extra_from_json.py
 msgid "Fumarole"
-msgstr ""
+msgstr "Fumarola"
 
 #. ~ Description for Fumarole
 #: lang/json/map_extra_from_json.py
@@ -109679,7 +112729,7 @@ msgstr ""
 
 #: lang/json/map_extra_from_json.py
 msgid "College Kids"
-msgstr ""
+msgstr "Universitários"
 
 #. ~ Description for College Kids
 #: lang/json/map_extra_from_json.py
@@ -109733,7 +112783,7 @@ msgstr ""
 
 #: lang/json/map_extra_from_json.py
 msgid "Minefield"
-msgstr ""
+msgstr "Campo Minado"
 
 #. ~ Description for Minefield
 #: lang/json/map_extra_from_json.py
@@ -109761,7 +112811,7 @@ msgstr ""
 
 #: lang/json/map_extra_from_json.py
 msgid "Helicopter Crash"
-msgstr "Acidente de helicóptero"
+msgstr "Acidente de Helicóptero"
 
 #. ~ Description for Helicopter Crash
 #: lang/json/map_extra_from_json.py
@@ -109770,7 +112820,7 @@ msgstr ""
 
 #: lang/json/map_extra_from_json.py
 msgid "Scientists"
-msgstr ""
+msgstr "Cientistas"
 
 #. ~ Description for Scientists
 #: lang/json/map_extra_from_json.py
@@ -109779,7 +112829,7 @@ msgstr ""
 
 #: lang/json/map_extra_from_json.py
 msgid "Portal"
-msgstr ""
+msgstr "Portal"
 
 #. ~ Description for Portal
 #: lang/json/map_extra_from_json.py
@@ -109797,30 +112847,30 @@ msgstr ""
 
 #: lang/json/map_extra_from_json.py
 msgid "Anomaly"
-msgstr ""
+msgstr "Anomalia"
 
 #. ~ Description for Anomaly
 #: lang/json/map_extra_from_json.py
 msgid "Some anomaly is here."
-msgstr ""
+msgstr "Aqui tem alguma anomalia."
 
 #: lang/json/map_extra_from_json.py
 msgid "Spider Nest"
-msgstr ""
+msgstr "Ninho de Aranhas"
 
 #. ~ Description for Spider Nest
 #: lang/json/map_extra_from_json.py
 msgid "Spider nest is here."
-msgstr ""
+msgstr "Aqui tem um ninho de aranhas."
 
 #: lang/json/map_extra_from_json.py
 msgid "Wasp Nest"
-msgstr ""
+msgstr "Ninho de Vespas"
 
 #. ~ Description for Wasp Nest
 #: lang/json/map_extra_from_json.py
 msgid "Wasp nest is here."
-msgstr ""
+msgstr "Aqui tem um ninho de vespas."
 
 #: lang/json/map_extra_from_json.py src/defense.cpp
 msgid "Spiders"
@@ -109829,21 +112879,21 @@ msgstr "Aranhas"
 #. ~ Description for Spiders
 #: lang/json/map_extra_from_json.py
 msgid "This area is covered with webs.  Probably spiders are nearby"
-msgstr ""
+msgstr "Esta área está coberta com teias. Provavelmente há aranhas por perto."
 
 #. ~ Description for Shia LaBeouf
 #: lang/json/map_extra_from_json.py
 msgid "Cannibal is nearby."
-msgstr ""
+msgstr "Há um canibal por perto."
 
 #: lang/json/map_extra_from_json.py
 msgid "Jabberwock"
-msgstr ""
+msgstr "Jaguadarte"
 
 #. ~ Description for Jabberwock
 #: lang/json/map_extra_from_json.py
 msgid "Jabberwock is nearby."
-msgstr ""
+msgstr "Há um Jaguadarte por perto."
 
 #: lang/json/map_extra_from_json.py
 msgid "Grove"
@@ -109962,7 +113012,7 @@ msgstr "Banco Informatizado Consolidado do Tesouro"
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
 msgid "Open Vault"
-msgstr "Cofre aberto"
+msgstr "Cofre Aberto"
 
 #. ~ Computer name
 #: lang/json/mapgen_from_json.py
@@ -109984,17 +113034,17 @@ msgstr "Fechado ao pôr do sol."
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Maintained by the <city> church."
-msgstr "Mantido pelo <city> Igreja."
+msgstr "Mantido pela Igreja de <city>."
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "<city> Cemetery"
-msgstr "<city> Cemitério"
+msgstr "Cemitério <city>"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "<family_name> Cemetery"
-msgstr "<family_name> Cemitério"
+msgstr "Cemitério <family_name>"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110004,17 +113054,17 @@ msgstr "Por favor, respeite o cemitério"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "May <given_name> and their family rest in peace"
-msgstr "Maio <given_name> e sua família descansa em paz"
+msgstr "Que <given_name> e sua família descansem em paz"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "<family_name> Family Cemetery"
-msgstr "<family_name> Cemitério da Família"
+msgstr "Cemitério da Família <family_name>."
 
 #. ~ Computer name
 #: lang/json/mapgen_from_json.py
 msgid "Church Bells 1.2"
-msgstr "Igreja Bels 1.2"
+msgstr "Sinos de Igreja 1.2"
 
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
@@ -110034,17 +113084,17 @@ msgstr "Pedágio Funeral"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Municipal City Dump"
-msgstr "Depósito de cidade municipal"
+msgstr "Aterro Municipal"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Caution: Work in Progress"
-msgstr "Cuidado: trabalho em andamento"
+msgstr "Atenção: Trabalho em Andamento"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Private Property: No Trespassing"
-msgstr "Propriedade Privada: No Trespassing"
+msgstr "Propriedade Privada"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110054,7 +113104,7 @@ msgstr "Pneus com Desconto"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Dollar Store"
-msgstr "Loja do dólar"
+msgstr "Loja 1,99"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110064,22 +113114,22 @@ msgstr "ABERTO 24/7!"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "<city> Dump"
-msgstr "<city> Despejo"
+msgstr "Despejo <city>"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "DUMP"
-msgstr "DESCARREGAR"
+msgstr "DEJETOS"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "<city> Area Dump"
-msgstr "<city> Despejo de área"
+msgstr "Despejo de Área de <city>"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "<given_name>'s Tree Farm, call us at 555-8758!"
-msgstr "<given_name> Fazenda da Árvore, ligue para 555-8758!"
+msgstr "Fazenda de Árvores <given_name>, ligue para 555-8758!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110089,7 +113139,7 @@ msgstr "Árvores de Natal disponíveis no início do inverno!"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Welcome to <city> Botanical Garden! Please stay on the path!"
-msgstr "Bem-vindo ao <city> Jardim Botânico! Por favor, fique no caminho!"
+msgstr "Bem-vindo ao Jardim Botânico de <city>! Por favor, não pise na grama!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110104,7 +113154,7 @@ msgstr "PINHO"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "HICKORY"
-msgstr "HICKORY"
+msgstr "NOGUEIRA"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110129,7 +113179,7 @@ msgstr "CAMOMILA"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "POPPY"
-msgstr "PAPOILA"
+msgstr "PAPOULA"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110139,7 +113189,7 @@ msgstr "CACTO"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "DANDELION"
-msgstr "DENTE DE CAMPO"
+msgstr "DENTE DE LEÃO"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110189,7 +113239,7 @@ msgstr "DÁLIA"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "CATTAIL"
-msgstr "CATTAIL"
+msgstr "TABÚAS"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110229,7 +113279,7 @@ msgstr "<city> Jardim Comunitário, cultive seus próprios vegetais!"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "<city> Public Garden"
-msgstr "<city> Jardim público"
+msgstr "Jardim Público de <city>"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110329,7 +113379,7 @@ msgstr "Centrífuga"
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
 msgid "Analyze blood"
-msgstr "Analise o sangue"
+msgstr "Analisar sangue"
 
 #. ~ Computer name
 #: lang/json/mapgen_from_json.py
@@ -110419,7 +113469,7 @@ msgstr ""
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "<city> Landfill"
-msgstr "<city> Aterro"
+msgstr "Aterro <city>"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110439,7 +113489,7 @@ msgstr "LOGS"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "STICKS"
-msgstr "STICKS"
+msgstr "GRAVETOS"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110449,12 +113499,12 @@ msgstr "ARGILA"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "HAY"
-msgstr "Existe"
+msgstr "FENO"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "DIRT"
-msgstr "SUJEIRA"
+msgstr "TERRA"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110474,29 +113524,30 @@ msgstr "FERTILIZANTE"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "ROCKS"
-msgstr "ROCHAS"
+msgstr "PEDRAS"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "BOULDERS and SLABS"
-msgstr "PEDREIROS e SLABS"
+msgstr "ROCHAS E LAJES"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid ""
 "Empty lot, great for your small business! Call <full_name> at 555-2117!"
 msgstr ""
-" Lote vazio, ótimo para o seu pequeno negócio! Ligar <full_name> no555-2117!"
+" Lote vazio, ótimo para o seu pequeno negócio! Ligue para <full_name> no "
+"555-2117!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Empty lot for sale!"
-msgstr "Lote vazio para venda!"
+msgstr "Lote vazio à venda!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Call <family_name> Family Realty at 555-3130!"
-msgstr "Ligar <family_name> Família Realty em 555-3130!"
+msgstr "Ligue para <family_name> Família Realty em 555-3130!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110511,7 +113562,7 @@ msgstr "Leste <city> Realty!"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Lot for sale!"
-msgstr "Lote para venda!"
+msgstr "Lote à venda!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110521,17 +113572,17 @@ msgstr "Ligue para mais informações. 555-7723"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Private Property!"
-msgstr "Propriedade privada!"
+msgstr "Propriedade Privada!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "NO Dumping!"
-msgstr "NÃO Dumping!"
+msgstr "NÃO jogar lixo!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Cheap lot for sale! Call <given_name> at 555-5151!"
-msgstr "Muito barato para venda! Ligar <given_name> em 555-5151!"
+msgstr "Lote barato à venda! Ligue para <given_name> em 555-5151!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110547,12 +113598,13 @@ msgstr "Ligar <given_name> com <family_name> Realty em 555-6288!"
 #: lang/json/mapgen_from_json.py
 msgid "Beautiful lot with some natural privacy! Call <full_name> at 555-3927!"
 msgstr ""
-" Lindo lote com alguma privacidade natural! Ligar <full_name> em 555-3927!"
+"Lindo lote com alguma privacidade natural! Ligue para <full_name> em "
+"555-3927!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Property for sale, call <city> Real Estate at 555-8255!"
-msgstr "Imóvel para venda, ligue <city> Imóveis em 555-8255!"
+msgstr "Imóvel à venda, ligue para a Corretora <city> em 555-8255!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110572,7 +113624,7 @@ msgstr "<given_name><family_name> possuído <full_name> a <city>"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "<given_name>, <given_name>, and <given_name> were here!"
-msgstr "<given_name> , <given_name> e <given_name> estava aqui!"
+msgstr "<given_name> , <given_name> e <given_name> estiveram aqui!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110592,7 +113644,7 @@ msgstr "Controles de Mísseis"
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
 msgid "Launch Missile"
-msgstr "Míssil de lançamento"
+msgstr "Lançar Míssil"
 
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
@@ -110605,8 +113657,8 @@ msgid ""
 "The mortuary name followed by a hastily written message that reads: 'I am "
 "not liable if your loved ones will not stay dead.'"
 msgstr ""
-" O nome do necrotério seguido por uma mensagem escrita às pressas que "
-"diz:\"Não sou responsável se seus entes queridos não ficarem mortos\"."
+"O nome do necrotério seguido por uma mensagem escrita às pressas que diz: "
+"\"Não sou responsável se seus entes queridos não ficarem mortos\"."
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110621,37 +113673,37 @@ msgstr "Acesso a Suprimentos Médicos"
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
 msgid "Unlock Door"
-msgstr "Destrave a porta"
+msgstr "Destravar Porta"
 
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
 msgid "Lock Door"
-msgstr "Porta de trava"
+msgstr "Travar Porta"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Get Apples n Ciders!"
-msgstr "Obter maçãs n Ciders!"
+msgstr "Obtenha Maçãs & Cidras!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Scoop the Poop!"
-msgstr "Scoop the Poop!"
+msgstr "Cate o Cocô!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "DANGER!  Doggy Minefield!"
-msgstr "PERIGO! Minefield Doggy!"
+msgstr "PERIGO! Campo minado de cãezinhos!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Dog Park: Off Leash Area"
-msgstr "Parque do cão: Fora da área da trela"
+msgstr "Parque Canino: Área Sem Coleiras"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Watch your step!"
-msgstr "Assista seu passo!"
+msgstr "Olhe onde pisa!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110661,27 +113713,27 @@ msgstr "Use o parque por sua conta e risco."
 #. ~ Computer name
 #: lang/json/mapgen_from_json.py
 msgid "PolCom OS v1.47 - Supply Room Access"
-msgstr "PolCom OS v1.47 - Acesso à sala de fornecimento"
+msgstr "PolCom OS v1.47 - Acesso à Sala de Fornecimento"
 
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
 msgid "Unlock Supply Room"
-msgstr "Desbloquear sala de suprimentos"
+msgstr "Destrancar Sala de Suprimentos"
 
 #. ~ Computer name
 #: lang/json/mapgen_from_json.py
 msgid "PolCom OS v1.47 - Evidence Locker Access"
-msgstr "PolCom OS v1.47 - Evidência Locker Access"
+msgstr "PolCom OS v1.47 - Acesso ao Armário de Evidências"
 
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
 msgid "Unlock Evidence Locker"
-msgstr "Desbloquear Evidência Locker"
+msgstr "Destrancar Armário de Evidências"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "NO lifeguard on duty, swim at own risk!"
-msgstr "SEM salva-vidas de plantão, nadar por conta e risco!"
+msgstr "SEM salva-vidas de plantão, nadar por sua conta e risco!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110691,12 +113743,12 @@ msgstr "Nenhum salva-vidas trabalhando!"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "NO running!"
-msgstr "NÃO correndo!"
+msgstr "SEM correr!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "MEN"
-msgstr "MAS"
+msgstr "HOMENS"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110716,17 +113768,17 @@ msgstr "Mulheres"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Men"
-msgstr "mas"
+msgstr "Homens"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "NO Running!"
-msgstr "NÃO correndo!"
+msgstr "NÃO correr!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "NO Diving!"
-msgstr "Não mergulhe!"
+msgstr "NÃO mergulhe!"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110781,7 +113833,7 @@ msgstr "<given_name> Reciclagem"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Drop off 7am to 6pm Monday thru Friday"
-msgstr "Saia das 7h às 18h de segunda a sexta"
+msgstr "Coleta das 7h às 18h de segunda a sexta"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110791,7 +113843,7 @@ msgstr "<city> Reciclando"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Drop off 8am to 8pm, weekdays."
-msgstr "Saia das 8h às 20h, nos dias úteis."
+msgstr "Coleta das 8h às 20h, nos dias úteis."
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110800,9 +113852,9 @@ msgid ""
 "eroded beyond usefulness.  There are small holders for tourist maps "
 "attached."
 msgstr ""
-" Este já foi um mapa de informações para o <city> área, mas há muito "
-"tempocorroída além de utilidade. Existem pequenos proprietários para "
-"mapasturísticos em anexo."
+" Este já foi um mapa de informações para a área de <city>, mas o tempo já o "
+"corroeu muito além da utilidade. Existem pequenos nichos para mapas "
+"turísticos em anexo."
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
@@ -110818,8 +113870,7 @@ msgstr "Ampla seleção de baterias de armazenamento! Descontos!"
 #: lang/json/mapgen_from_json.py
 msgid "the name is gone but a slogan remains: 'We'll repair you all the way'"
 msgstr ""
-" o nome desapareceu, mas permanece um slogan:'Vamos consertá-lo por todo o "
-"caminho'"
+"O nome desapareceu, mas permanece um slogan: 'Vamos consertá-lo até o fim'"
 
 #. ~ Computer name
 #: lang/json/mapgen_from_json.py
@@ -110849,7 +113900,7 @@ msgstr "EnviroCom OS v2.03"
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
 msgid "Download Sewer Maps"
-msgstr "Faça o download de mapas de esgoto"
+msgstr "Baixar Mapas do Esgoto"
 
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
@@ -110859,18 +113910,18 @@ msgstr "Divertir amostra"
 #. ~ Computer name
 #: lang/json/mapgen_from_json.py
 msgid "Evac shelter computer"
-msgstr "Evac shelter computer"
+msgstr "Computador do Abrigo de Evacuação"
 
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
 msgid "Emergency Message"
-msgstr "Mensagem de emergência"
+msgstr "Mensagem de Emergência"
 
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py
 #: lang/json/mission_def_from_json.py
 msgid "Disable External Power"
-msgstr "Desativar energia externa"
+msgstr "Desativar Energia Externa"
 
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
@@ -110880,42 +113931,42 @@ msgstr "Contate-Nos"
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "<family_name> Family Shooting Range"
-msgstr "<family_name> Faixa de tiro familiar"
+msgstr "Estande de Tiro da Família<family_name>"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "Open sunrise to sunset, everyday besides Sundays"
-msgstr "Abra o nascer do sol ao pôr do sol, todos os dias, além dos domingos"
+msgstr "Abre do nascer do sol ao pôr do sol, todos os dias exceto domingos"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "5 YARDS"
-msgstr "5 YARDS"
+msgstr "5 JARDAS"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "10 YARDS"
-msgstr "10 YARDS"
+msgstr "10 JARDAS"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "15 YARDS"
-msgstr "15 YARDS"
+msgstr "15 JARDAS"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "20 YARDS"
-msgstr "20 jardas"
+msgstr "20 JARDAS"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "25 YARDS"
-msgstr "25 YARDS"
+msgstr "25 JARDAS"
 
 #. ~ Sign
 #: lang/json/mapgen_from_json.py
 msgid "30 YARDS"
-msgstr "30 YARDS"
+msgstr "30 JARDAS"
 
 #. ~ Computer name
 #: lang/json/mapgen_from_json.py
@@ -112049,7 +115100,7 @@ msgstr ""
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -112092,39 +115143,6 @@ msgid ""
 "Lasts 2 turns."
 msgstr ""
 
-#: lang/json/martial_art_from_json.py
-msgid "Zui Quan"
-msgstr "Zui Quan"
-
-#. ~ Description for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
-msgstr ""
-" AKA 'boxe bêbado', Zui Quan imita o movimento de um bêbado paraconfundir o "
-"inimigo, dando-lhe um bônus de esquiva passivo baseado em suainteligência. O"
-" turno depois de você atacar, você pode evitar qualquernúmero de ataques sem"
-" penalidade, e se esquivar com sucesso de um ataquelhe dá um bônus de dano e"
-" dano baseado em sua inteligência."
-
-#. ~ Description of buff for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "Inteligência aumenta a habilidade de esquiva"
-
-#: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
-msgstr "Contra-ataque"
-
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
-msgstr "Dano extra e dano após a esquiva bem sucedida"
-
 #: lang/json/martial_art_from_json.py
 msgid "Tiger Kung Fu"
 msgstr "Tigre kung fu"
@@ -112146,41 +115164,28 @@ msgstr "Fúria do Tigre"
 
 #. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "+3 Bash / atk"
-
-#: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "Força do Tigre"
-
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
-#: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "Força fornece bônus de dano adicional."
-
-#: lang/json/martial_art_from_json.py
-msgid "Debug Mastery"
-msgstr "Debug Mastery"
-
-#. ~ Description for martial art 'Debug Mastery'
-#: lang/json/martial_art_from_json.py
-msgid "A secret martial art used only by developers and cheaters."
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
 msgstr ""
-" Uma arte marcial secreta usada apenas por desenvolvedores e trapaceiros."
 
 #: lang/json/martial_art_from_json.py
-msgid "Elemental resistance"
-msgstr "Resistência elementar"
+msgid "Tiger's Strength"
+msgstr ""
 
-#. ~ Description of buff 'Elemental resistance' for martial art 'Debug
-#. Mastery'
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
 #: lang/json/martial_art_from_json.py
+#, no-python-format
 msgid ""
-"+Strength bash armor, +Dexterity acid armor, +Intelligence electricity "
-"armor, +Perception fire armor."
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
 msgstr ""
-" + Armadura de força, + Armadura de ácido de destreza, + Armadura "
-"deeletricidade de inteligência, + Armadura de fogo de percepção."
 
 #: lang/json/martial_art_from_json.py
 msgid "Wing Chun"
@@ -112196,15 +115201,124 @@ msgid ""
 "get back to hitting."
 msgstr ""
 
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr ""
+
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
+
 #: lang/json/martial_art_from_json.py
 msgid "Chi-Sao Sensitivity"
 msgstr ""
 
 #. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
 #: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
 msgstr ""
 
+#: lang/json/martial_art_from_json.py
+msgid "Zui Quan"
+msgstr "Zui Quan"
+
+#. ~ Description for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Zui Quan Stance"
+msgstr ""
+
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Advanced Zui Quan"
+msgstr ""
+
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Drunken Stumble"
+msgstr ""
+
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Drunken Dodging"
+msgstr ""
+
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Debug Mastery"
+msgstr "Debug Mastery"
+
+#. ~ Description for martial art 'Debug Mastery'
+#: lang/json/martial_art_from_json.py
+msgid "A secret martial art used only by developers and cheaters."
+msgstr ""
+" Uma arte marcial secreta usada apenas por desenvolvedores e trapaceiros."
+
+#: lang/json/martial_art_from_json.py
+msgid "Elemental resistance"
+msgstr "Resistência elementar"
+
+#. ~ Description of buff 'Elemental resistance' for martial art 'Debug
+#. Mastery'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"+Strength bash armor, +Dexterity acid armor, +Intelligence electricity "
+"armor, +Perception fire armor."
+msgstr ""
+" + Armadura de força, + Armadura de ácido de destreza, + Armadura "
+"deeletricidade de inteligência, + Armadura de fogo de percepção."
+
 #: lang/json/martial_art_from_json.py
 msgid "Bionic Combatives"
 msgstr "Combinações Biônicas"
@@ -112358,13 +115472,11 @@ msgstr "Sapo Kung Fu"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
 msgstr ""
-" Um dos cinco venenos mortais. Masters of Toad Style podem se "
-"concentrarcontra todos os ataques. Você pode meditar fazendo uma pausa, "
-"dando-lhe umaarmadura, mas você perderá o foco quando se mexer."
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -112372,8 +115484,11 @@ msgstr "Pele de Ferro do Sapo"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "Ganhe até +6 de armadura enquanto estiver parado"
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -112382,8 +115497,12 @@ msgstr "Dissipação da pele de ferro"
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
-msgstr "Pele de ferro suaviza quando você se move!"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Viper Kung Fu"
@@ -112392,40 +115511,49 @@ msgstr "Víbora Kung Fu"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
 msgstr ""
-" Um legado dos cinco venenos mortais. O Viper Style tem uma combinação "
-"únicade três partes, que inicia em um dodge, e então conta com um "
-"chopimpressionante e o lendário Viper Strike."
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "Viper Lock"
+msgid "Viper's Patience"
+msgstr ""
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
-msgstr "Você mordeu a verdade! Seu próximo ataque será o Viper Strike!"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "Viper Patience"
+msgid "Viper's Ambush"
+msgstr ""
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
-msgstr "+2 de esquiva. Esquivando-se de um ataque inicia um combo."
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
-msgstr "Viper Emboscada"
+msgid "Viper's Venom"
+msgstr ""
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
-msgstr "Você os atraiu! Seu próximo ataque será um Viper Bite."
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "C.R.I.T Blade-work"
@@ -112806,6 +115934,10 @@ msgstr "Chumbo"
 msgid "Leather"
 msgstr "Couro"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "Laticínio"
@@ -112870,6 +116002,10 @@ msgstr "Superliga"
 msgid "layered carbide"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Tin"
 msgstr ""
@@ -112980,6 +116116,10 @@ msgstr ""
 msgid "Arcane Skin"
 msgstr ""
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr ""
@@ -112989,7 +116129,7 @@ msgid "Sugar"
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
+msgid "Gather bones for the Brigitte.  About 8 should do it."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -113845,20 +116985,20 @@ msgid ""
 "I don't think you're going to find many other survivors who haven't taken up"
 " a faction yet."
 msgstr ""
-" Eu não acho que você vai encontrar muitos outros sobreviventes que aindanão"
+"Eu não acho que você vai encontrar muitos outros sobreviventes que ainda não"
 " tenham assumido uma facção."
 
 #: lang/json/mission_def_from_json.py
 msgid "I'm a pretty good shot with a rifle or pistol."
-msgstr "Eu sou um tiro muito bom com um rifle ou pistola."
+msgstr "Eu vou bem com um rifle ou uma pistola."
 
 #: lang/json/mission_def_from_json.py
 msgid "Any problems boss?"
-msgstr "Qualquer chefe de problemas?"
+msgstr "Algum problema, chefe?"
 
 #: lang/json/mission_def_from_json.py
 msgid "Wait... are you really making me a deputy?"
-msgstr "Espere ... você está realmente me fazendo um vice?"
+msgstr "Espere... você está realmente me tornando um vice?"
 
 #: lang/json/mission_def_from_json.py
 msgid "I don't think so..."
@@ -113898,8 +117038,8 @@ msgid ""
 "Hell ya, we may get ourselves killed but we'll be among the first legends of"
 " the apocalypse."
 msgstr ""
-" Inferno, podemos nos matar, mas estaremos entre as primeiras lendas "
-"doapocalipse."
+"Inferno, podemos nos matar, mas estaremos entre as primeiras lendas do "
+"apocalipse."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -113907,15 +117047,15 @@ msgid ""
 "most of us survivors won't make it unless someone decides to take the "
 "initiative."
 msgstr ""
-" Ei, eu sei que não seria voluntário para isso também ... mas então eulembro"
-" que a maioria de nós, sobreviventes, não vai conseguir, a menos quealguém "
+"Ei, eu sei que não seria voluntário para isso também... mas então eu lembro "
+"que a maioria de nós, sobreviventes, não vai conseguir, a menos que alguém "
 "decida tomar a iniciativa."
 
 #: lang/json/mission_def_from_json.py
 msgid "I'd secure an ammo cache and try to sweep a town in multiple passes."
 msgstr ""
-" Eu protegeria um cache de munição e tentaria varrer uma cidade em "
-"váriospassos."
+"Eu protegeria um cache de munição e tentaria varrer uma cidade em várias "
+"passadas."
 
 #: lang/json/mission_def_from_json.py
 msgid "Got this knocked out?"
@@ -113926,13 +117066,13 @@ msgid ""
 "Man... you're a goddamn machine.  It was a pleasure working with you.  You "
 "know, you may just change our little neck of the world if you keep this up."
 msgstr ""
-" Cara ... você é uma maldita máquina. Foi um prazer trabalhar com você. "
-"Vocêsabe, você pode apenas mudar o nosso pequeno pescoço do mundo se "
-"vocêcontinuar assim."
+"Cara... você é uma maldita máquina. Foi um prazer trabalhar com você. Sabe, "
+"você pode acabar mudando o nosso pequeno canto do mundo se você continuar "
+"assim."
 
 #: lang/json/mission_def_from_json.py
 msgid "I don't think that was quite a hundred dead zeds."
-msgstr "Eu não acho que foram cem zeds mortos."
+msgstr "Eu não acho que foram exatamente cem zeds mortos."
 
 #: lang/json/mission_def_from_json.py
 msgid "Kill Horde Master"
@@ -113942,8 +117082,8 @@ msgstr "Matar o Mestre da Horda"
 msgid ""
 "I've heard some bad rumors so I hope you are up for another challenge..."
 msgstr ""
-" Eu ouvi alguns rumores ruins, então eu espero que você esteja pronto "
-"paraoutro desafio ..."
+"Eu ouvi alguns rumores ruins, então eu espero que você esteja pronto para "
+"outro desafio..."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -113954,12 +117094,12 @@ msgid ""
 "but this thing reeks of trouble.  Do whatever it takes but we can't risk it "
 "getting away."
 msgstr ""
-" Aparentemente, um dos outros sobreviventes pegou uma "
-"hordaextraordinariamente densa de mortos-vivos movendo-se para a área. No "
-"centrodessa multidão havia um 'líder' de algum tipo. O que falta ématar o "
-"filho da puta. Nós não sabemos do que é capaz ou porque é cercadopor outros "
-"zumbis, mas isso é um problema. Faça o que for preciso, mas não podemos nos "
-"arriscar a fugir."
+"Aparentemente, um dos outros sobreviventes descobriu uma horda "
+"extraordinariamente densa de mortos-vivos movendo-se para a área. No centro "
+"dessa multidão havia um 'líder' de algum tipo. A coisa é basicamente matar o"
+" filho da puta. Nós não sabemos do que é capaz ou porque é cercado por "
+"outros zumbis, mas isso essa coisa cheira a problema. Faça o que for "
+"preciso, mas não podemos deixar que aquilo fuja."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -113989,7 +117129,7 @@ msgstr "Eu não acho que nós temos ainda."
 
 #: lang/json/mission_def_from_json.py
 msgid "Kill Jabberwock"
-msgstr "Matar Jabberwock"
+msgstr "Matar Jaguadarte"
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -114101,7 +117241,7 @@ msgstr "Alcançar a casa da fazenda"
 
 #: lang/json/mission_def_from_json.py
 msgid "I just need a place to start over..."
-msgstr "Eu só preciso de um lugar para começar de novo ..."
+msgstr "Eu só preciso de um lugar para começar de novo..."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -116714,8 +119854,8 @@ msgstr ""
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -119612,8 +122752,8 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
 msgstr ""
 
 #: lang/json/mutation_from_json.py
@@ -119623,7 +122763,7 @@ msgstr ""
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
 msgstr ""
 
@@ -119746,7 +122886,7 @@ msgstr ""
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
 msgstr ""
 
@@ -119847,6 +122987,27 @@ msgid ""
 "footing."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr ""
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr ""
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr ""
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "Boa Audição"
@@ -120397,13 +123558,10 @@ msgstr "Psicose Estimulante"
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
-" Você tem uma história única com estimulantes (como café ou "
-"anfetaminas).Você pode tolerar muito mais deles sem overdose, mas se você se"
-" entregardemais, você começa a ver as coisas ..."
 
 #. ~ Description for Stylish
 #: lang/json/mutation_from_json.py
@@ -120559,6 +123717,18 @@ msgid ""
 " Pentjak Silat, or Sōjutsu."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr ""
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
 msgstr "Aroma Fraco"
@@ -121408,11 +124578,9 @@ msgstr "Olhos Mágicos"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
 msgstr ""
-"Seus olhos se tornaram... verdes. É complicado dizer o tom exato já que ele "
-"fica se alterando. O efeito é... Prazeroso."
 
 #: lang/json/mutation_from_json.py
 msgid "Fey Vision"
@@ -122325,11 +125493,8 @@ msgstr "Transportador Marloss"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
+"nose, and you have a strong desire to try some seeds and… sap?"
 msgstr ""
-"Desde que você comeu aquela amora de Marloss, você não consegue tirar o "
-"cheiro dela do seu nariz, e você agora tem um grande apetite para "
-"experimentar sementes e... seiva?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vessel"
@@ -122339,11 +125504,8 @@ msgstr "Embarcação Marloss"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
+"tongue, and you have a strong desire to try some berries and… sap?"
 msgstr ""
-"Desde que você comeu aquela semente de Marloss, você não consegue tirar o "
-"gosto dela da sua língua, e você agora tem um grande apetite para "
-"experimentar amoras e... seiva?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vector"
@@ -122810,12 +125972,9 @@ msgstr "Dentes de Sabre"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
 msgstr ""
-"Suas presas cresceram e se tornaram extremamente grandes e incrivelmente "
-"afiadas. Elas fazem com que seja impossível usar qualquer coisa na boca e "
-"dificulta a alimentação... Mas deixa marcantes machucados quando você morde."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
@@ -124225,11 +127384,9 @@ msgstr "Focinho"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
 msgstr ""
-" Seu rosto e mandíbula começaram ... mudando. Máscaras e tal ajuste OK, "
-"masvocê está visivelmente mutado."
 
 #: lang/json/mutation_from_json.py
 msgid "Bovine Snout"
@@ -124294,7 +127451,7 @@ msgstr "%1$s morde %2$s"
 
 #: lang/json/mutation_from_json.py
 msgid "Rodent Muzzle"
-msgstr "Focinho de roedor"
+msgstr "Focinho de Roedor"
 
 #. ~ Description for Rodent Muzzle
 #: lang/json/mutation_from_json.py
@@ -124316,9 +127473,9 @@ msgid ""
 " look NASTY--as do the bite wounds they can inflict--but prevent wearing "
 "mouthgear."
 msgstr ""
-" Seu rosto e mandíbula são uma versão mais curta daqueles encontrados "
-"emjacarés. Eles parecem DESAGRADÁVEIS - assim como as mordidas que "
-"podemcausar -, mas evitam o uso de aparelhos para a boca."
+"Seu rosto e mandíbula são uma versão mais curta daqueles encontrados em "
+"jacarés. Eles parecem DESAGRADÁVEIS - assim como as mordidas que podem "
+"causar - mas impedem o uso de aparelhos para a boca."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
@@ -124340,12 +127497,12 @@ msgid ""
 "You've gotten rid of that terribly imprecise mouth and now imbibe your food "
 "like a proper person.  Chewing was tiresome anyway."
 msgstr ""
-" Você se livrou dessa boca terrivelmente imprecisa e agora bebe sua "
-"comidacomo uma pessoa adequada. Mastigar era cansativo de qualquer maneira."
+"Você se livrou daquela boca terrivelmente imprecisa e agora bebe sua comida "
+"como uma pessoa adequada. Mastigar era cansativo de qualquer maneira."
 
 #: lang/json/mutation_from_json.py
 msgid "Hollow Bones"
-msgstr "Ossos ocos"
+msgstr "Ossos Ocos"
 
 #. ~ Description for Hollow Bones
 #: lang/json/mutation_from_json.py
@@ -124369,7 +127526,7 @@ msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Vomitous"
-msgstr "vomitosa"
+msgstr "Vomitoso"
 
 #. ~ Description for Vomitous
 #: lang/json/mutation_from_json.py
@@ -124378,21 +127535,21 @@ msgid ""
 "frequently, you have found that you can trigger your vomit reflex on demand,"
 " too."
 msgstr ""
-" Você tem um distúrbio digestivo importante. Embora faça com que você "
-"vomitecom frequência, descobriu que também pode ativar seu reflexo de "
-"vômitoquando necessário."
+"Você tem um distúrbio digestivo grave. Embora isso faça com que você vomite "
+"com frequência, você descobriu que também pode ativar seu reflexo de vômito "
+"quando necessário."
 
 #: lang/json/mutation_from_json.py
 msgid "Fast Metabolism"
-msgstr "Metabolismo acelerado"
+msgstr "Metabolismo Acelerado"
 
 #. ~ Description for Fast Metabolism
 #: lang/json/mutation_from_json.py
 msgid ""
 "You require more food than most people, but recover stamina slightly faster."
 msgstr ""
-" Você precisa de mais comida do que a maioria das pessoas, mas recupera "
-"aresistência um pouco mais rápido."
+"Você precisa de mais comida do que a maioria das pessoas, mas recupera as "
+"energias um pouco mais rápido."
 
 #: lang/json/mutation_from_json.py
 msgid "Rapid Metabolism"
@@ -124404,8 +127561,8 @@ msgid ""
 "You require more resources than most, but heal more rapidly as well.  "
 "Provides weak regeneration even when not asleep."
 msgstr ""
-" Você precisa de mais recursos do que a maioria, mas também se recupera "
-"maisrapidamente. Fornece regeneração fraca mesmo quando não está adormecido."
+"Você precisa de mais recursos do que a maioria, mas também se recupera mais "
+"rapidamente. Fornece regeneração fraca mesmo quando não está adormecido."
 
 #: lang/json/mutation_from_json.py
 msgid "Very Fast Metabolism"
@@ -124447,7 +127604,7 @@ msgstr "Seu corpo seca facilmente; você precisa beber mais água."
 
 #: lang/json/mutation_from_json.py
 msgid "Very Thirsty"
-msgstr "Muita sede"
+msgstr "Muita Sede"
 
 #. ~ Description for Very Thirsty
 #: lang/json/mutation_from_json.py
@@ -124455,12 +127612,12 @@ msgid ""
 "Ugh, out of water already?  You need about twice the fluids of an average "
 "human."
 msgstr ""
-" Ugh, fora da água já? Você precisa de cerca de duas vezes os fluidos de "
-"umser humano médio."
+"Ugh, fora da água já? Você precisa de cerca de duas vezes mais fluídos do "
+"que um ser humano médio."
 
 #: lang/json/mutation_from_json.py
 msgid "Extremely Thirsty"
-msgstr "Extremamente sedento"
+msgstr "Extremamente Sedento"
 
 #. ~ Description for Extremely Thirsty
 #: lang/json/mutation_from_json.py
@@ -124468,8 +127625,8 @@ msgid ""
 "You dry out seriously quickly, requiring three times as much liquid to stay "
 "hydrated."
 msgstr ""
-" Você seca a sério rapidamente, exigindo três vezes mais líquido para "
-"semanter hidratado."
+"Você se desidrata muito rapidamente, exigindo três vezes mais líquido do que"
+" o normal para se manter hidratado."
 
 #: lang/json/mutation_from_json.py
 msgid "Metabolic Rehydration"
@@ -124482,13 +127639,13 @@ msgid ""
 "longer gain hydration from fluids - instead, your thirst will be equal to, "
 "and change with, your hunger."
 msgstr ""
-" Seu corpo recebe tudo o que precisa da comida que você come! Você não "
-"ganhamais a hidratação dos fluidos - em vez disso, sua sede será igual e "
-"mudarácom a sua fome."
+"Seu corpo recebe tudo o que precisa da comida que você come! Você não ganha "
+"mais hidratação de fluidos - em vez disso, sua sede será igual e mudará "
+"junto com a sua fome."
 
 #: lang/json/mutation_from_json.py
 msgid "Very Heavy Sleeper"
-msgstr "Sleeper muito pesado"
+msgstr "Sono Muito Pesado"
 
 #. ~ Description for Very Heavy Sleeper
 #: lang/json/mutation_from_json.py
@@ -124517,8 +127674,8 @@ msgstr "Enfraquecimento"
 msgid ""
 "You feel as though you are slowly weakening and your body heals slower."
 msgstr ""
-" Você sente como se estivesse enfraquecendo lentamente e seu corpo se "
-"curamais lentamente."
+"Você sente como se estivesse enfraquecendo lentamente, e seu corpo se cura "
+"mais lentamente."
 
 #: lang/json/mutation_from_json.py
 msgid "Deterioration"
@@ -124527,7 +127684,7 @@ msgstr "Deterioração"
 #. ~ Description for Deterioration
 #: lang/json/mutation_from_json.py
 msgid "Your body is very slowly wasting away."
-msgstr "Seu corpo está perdendo muito lentamente."
+msgstr "Seu corpo está se desfazendo muito lentamente."
 
 #: lang/json/mutation_from_json.py
 msgid "Disintegration"
@@ -124536,11 +127693,11 @@ msgstr "Desintegração"
 #. ~ Description for Disintegration
 #: lang/json/mutation_from_json.py
 msgid "Your body is slowly wasting away!"
-msgstr "Seu corpo está lentamente perdendo!"
+msgstr "Seu corpo está lentamente se desfazendo!"
 
 #: lang/json/mutation_from_json.py
 msgid "Solar Sensitivity"
-msgstr "Sensibilidade solar"
+msgstr "Sensibilidade Solar"
 
 #. ~ Description for Solar Sensitivity
 #: lang/json/mutation_from_json.py
@@ -124548,7 +127705,7 @@ msgid ""
 "Your skin simply cannot handle ultraviolet radiation, such as sunlight.  It "
 "will seriously burn you."
 msgstr ""
-" Sua pele simplesmente não consegue lidar com a radiação ultravioleta, comoa"
+"Sua pele simplesmente não consegue lidar com a radiação ultravioleta, como a"
 " luz solar. Isso queimará você seriamente."
 
 #: lang/json/mutation_from_json.py
@@ -124561,12 +127718,12 @@ msgid ""
 "Your extremities are covered in painful sores.  The pain is worse when they "
 "are covered in clothing."
 msgstr ""
-" Suas extremidades estão cobertas de feridas dolorosas. A dor é pior "
-"quandoeles estão cobertos de roupas."
+"Suas extremidades estão cobertas de feridas dolorosas. A dor é pior quando "
+"elas estão cobertas por roupas."
 
 #: lang/json/mutation_from_json.py
 msgid "Light Sensitive"
-msgstr "Sensível à luz"
+msgstr "Sensível à Luz"
 
 #. ~ Description for Light Sensitive
 #: lang/json/mutation_from_json.py
@@ -124574,12 +127731,12 @@ msgid ""
 "Sunlight makes you uncomfortable.  If you are outdoors and the weather is "
 "Sunny, you suffer -1 to all stats."
 msgstr ""
-" A luz do sol deixa você desconfortável. Se você estiver ao ar livre e "
-"otempo estiver ensolarado, você sofre -1 de todas as estatísticas."
+"A luz do sol deixa você desconfortável. Se você estiver ao ar livre e o "
+"tempo estiver ensolarado, você sofre -1 em todas as estatísticas."
 
 #: lang/json/mutation_from_json.py
 msgid "Very Light Sensitive"
-msgstr "Muito sensível à luz"
+msgstr "Muito Sensível à Luz"
 
 #. ~ Description for Very Light Sensitive
 #: lang/json/mutation_from_json.py
@@ -124587,9 +127744,9 @@ msgid ""
 "Sunlight makes you very uncomfortable.  If you are outdoors during the day, "
 "you suffer -1 to all stats; -2 if the weather is Sunny."
 msgstr ""
-" A luz do sol deixa você muito desconfortável. Se você estiver ao ar "
-"livredurante o dia, você sofre -1 para todas as estatísticas; -2 se o "
-"tempoestiver ensolarado."
+"A luz do sol deixa você muito desconfortável. Se você estiver ao ar livre "
+"durante o dia, você sofre -1 para todas as estatísticas; e -2 se o tempo "
+"estiver ensolarado."
 
 #. ~ Description for Troglobite
 #: lang/json/mutation_from_json.py
@@ -124597,8 +127754,8 @@ msgid ""
 "Sunlight makes you extremely uncomfortable, resulting in large penalties to "
 "all stats."
 msgstr ""
-" A luz solar faz com que você fique extremamente desconfortável, "
-"resultandoem grandes penalidades para todas as estatísticas."
+"A luz solar faz com que você fique extremamente desconfortável, resultando "
+"em grandes penalidades para todas as estatísticas."
 
 #: lang/json/mutation_from_json.py
 msgid "Webbed Hands"
@@ -124641,9 +127798,9 @@ msgid ""
 "hand encumbrance of 20, serious problems crafting, and no gloves.  But you "
 "can swim more effectively."
 msgstr ""
-" Suas patas são muito maiores agora. A destreza manual é difícil: "
-"oneraçãopermanente de mão de 20, sérios problemas de elaboração e sem luvas."
-" Masvocê pode nadar de forma mais eficaz."
+"Suas patas são muito maiores agora. A destreza manual é difícil: Há um "
+"estorvo de 20 permanente em suas mãos, criar coisas é um sério problema, e "
+"não se pode usar luvas. Mas você pode nadar de forma mais eficaz."
 
 #: lang/json/mutation_from_json.py
 msgid "Beak"
@@ -124656,23 +127813,23 @@ msgid ""
 "enemies, but it is impossible for you to wear mouth gear.  Slightly reduces "
 "wet effects."
 msgstr ""
-" Você tem um bico para a boca. Você pode ocasionalmente usá-lo para "
-"beijarseus inimigos, mas é impossível que você use equipamento de boca. Um "
-"poucoreduz os efeitos molhados."
+"Você tem um bico no lugar da boca. Você pode ocasionalmente usá-lo para "
+"bicar seus inimigos, mas é impossível pra você vestir equipamento de boca. "
+"Reduz um pouco os efeitos molhados."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
 msgid "You peck %s"
-msgstr ""
+msgstr "Você bica %s"
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
 msgid "%1$s pecks %2$s"
-msgstr ""
+msgstr "%1$s bica %2$s"
 
 #: lang/json/mutation_from_json.py
 msgid "Woodpecker Beak"
-msgstr "Bico de pica-pau"
+msgstr "Bico de Pica-pau"
 
 #. ~ Description for Woodpecker Beak
 #: lang/json/mutation_from_json.py
@@ -124680,8 +127837,8 @@ msgid ""
 "Pecking at prey is part of your daily routine now.  Slightly reduces wet "
 "effects."
 msgstr ""
-" Picando a presa faz parte da sua rotina diária agora. Um pouco reduz "
-"osefeitos molhados."
+"Bicar presas faz parte da sua rotina diária agora. Reduz um pouco os efeitos"
+" de se estar molhado."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
@@ -124695,7 +127852,7 @@ msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Hummingbird Beak"
-msgstr "Bico de beija-flor"
+msgstr "Bico de Beija-flor"
 
 #. ~ Description for Hummingbird Beak
 #: lang/json/mutation_from_json.py
@@ -124703,12 +127860,12 @@ msgid ""
 "Though your beak's not suitable for pecking, those flowers out there are a "
 "good source of energy.  Examine them to feed."
 msgstr ""
-" Embora seu bico não seja adequado para bicar, essas flores são uma boafonte"
-" de energia. Examine-os para se alimentar."
+"Embora seu bico não seja adequado para bicar, essas flores são uma boa fonte"
+" de energia. Examine-as para se alimentar."
 
 #: lang/json/mutation_from_json.py
 msgid "Genetically Unstable"
-msgstr "Geneticamente instável"
+msgstr "Geneticamente Instável"
 
 #. ~ Description for Genetically Unstable
 #: lang/json/mutation_from_json.py
@@ -124716,8 +127873,8 @@ msgid ""
 "Your DNA has been damaged in a way that causes you to continually develop "
 "more mutations."
 msgstr ""
-" Seu DNA foi danificado de uma forma que faz com que você "
-"desenvolvacontinuamente mais mutações."
+"Seu DNA foi danificado de uma forma que faz com que você desenvolva "
+"continuamente mais mutações."
 
 #: lang/json/mutation_from_json.py
 msgid "Genetic Chaos"
@@ -124729,8 +127886,8 @@ msgid ""
 "Your body alters itself rapidly, and without your intervention or conscious "
 "control."
 msgstr ""
-" Seu corpo se altera rapidamente e sem sua intervenção ou "
-"controleconsciente."
+" Seu corpo se altera rapidamente, e sem sua intervenção ou controle "
+"consciente."
 
 #: lang/json/mutation_from_json.py
 msgid "Minor Radioactivity"
@@ -124742,8 +127899,8 @@ msgid ""
 "Your body has become radioactive!  You continuously emit low levels of "
 "radiation, which slowly contaminates the world around you."
 msgstr ""
-" Seu corpo se tornou radioativo! Você continuamente emite níveis baixos "
-"deradiação, que lentamente contamina o mundo ao seu redor."
+"Seu corpo se tornou radioativo! Você continuamente emite níveis baixos de "
+"radiação, que lentamente contamina o mundo ao seu redor."
 
 #: lang/json/mutation_from_json.py
 msgid "Radioactivity"
@@ -124755,7 +127912,7 @@ msgid ""
 "Your body has become radioactive!  You continuously emit moderate levels of "
 "radiation, which contaminates the world around you."
 msgstr ""
-" Seu corpo se tornou radioativo! Você continuamente emite níveis moderadosde"
+"Seu corpo se tornou radioativo! Você continuamente emite níveis moderados de"
 " radiação, o que contamina o mundo ao seu redor."
 
 #: lang/json/mutation_from_json.py
@@ -124768,8 +127925,8 @@ msgid ""
 "Your body has become radioactive!  You continuously emit heavy levels of "
 "radiation, making your surroundings unlivable."
 msgstr ""
-" Seu corpo se tornou radioativo! Você emite continuamente altos níveis "
-"deradiação, tornando seu ambiente inabitável."
+" Seu corpo se tornou radioativo! Você emite continuamente altos níveis de "
+"radiação, tornando seu ambiente inabitável."
 
 #: lang/json/mutation_from_json.py
 msgid "Slimy"
@@ -124781,13 +127938,13 @@ msgid ""
 "Your body is coated with a fine slime.  Protects from long term effects of "
 "acid, though not short term ones.  Greatly increases wet benefits."
 msgstr ""
-" Seu corpo está coberto de um bom lodo. Protege contra os efeitos a "
-"longoprazo do ácido, embora não de curto prazo. Aumenta muito os benefícios "
-"domolhado."
+" Seu corpo é coberto de um fino muco. Protege contra os efeitos a longo "
+"prazo do ácido, embora não dos efeitos de curto prazo. Aumenta muito os "
+"benefícios do molhado."
 
 #: lang/json/mutation_from_json.py
 msgid "Viscous"
-msgstr "Viscoso"
+msgstr "Gelatinoso"
 
 #. ~ Description for Viscous
 #: lang/json/mutation_from_json.py
@@ -124795,8 +127952,8 @@ msgid ""
 "Your body's slime output has become sticky and gel-like.  Protects from acid"
 " somewhat.  Greatly increases wet benefits."
 msgstr ""
-" A produção de slime do seu corpo tornou-se pegajosa e gelatinosa. Protegedo"
-" ácido um pouco. Aumenta muito os benefícios do molhado."
+" A produção de muco do seu corpo tornou-se pegajosa e gelatinosa. Protege do"
+" ácido um pouco, e aumenta muito os benefícios do molhado."
 
 #: lang/json/mutation_from_json.py
 msgid "Amorphous Body"
@@ -124808,9 +127965,9 @@ msgid ""
 "Your flesh is a pleasing gel-like consistency.  Your bodily functions seem "
 "to be moving around, and your leg-equivalents flow comfortably."
 msgstr ""
-" Sua carne é uma consistência gelatinosa agradável. Suas funções "
-"corporaisparecem estar se movendo, e seus equivalentes de perna "
-"fluemconfortavelmente."
+" Sua carne é de uma consistência gelatinosa agradável. Suas funções "
+"corporais parecem estar se movendo por aí, e seus equivalentes a pernas "
+"fluem confortavelmente."
 
 #: lang/json/mutation_from_json.py
 msgid "Omnicellular"
@@ -124822,8 +127979,8 @@ msgid ""
 "Your body is more or less one consistent whole: a single, giant, omni-cell "
 "that alters itself as needed."
 msgstr ""
-" Seu corpo é mais ou menos um todo consistente: uma única omni-célulagigante"
-" que se altera quando necessário."
+" Seu corpo é mais ou menos um todo consistente: uma única omni-célula "
+"gigante que se altera quando necessário."
 
 #: lang/json/mutation_from_json.py
 msgid "Herbivore"
@@ -124836,9 +127993,9 @@ msgid ""
 "good chance of making you vomit it back up; even if you manage to keep it "
 "down, its nutritional value is greatly reduced."
 msgstr ""
-" A capacidade do seu corpo de digerir carne é severamente prejudicada. "
-"Comercarne tem uma boa chance de fazer você vomitar de volta; Mesmo se "
-"vocêconseguir mantê-lo baixo, seu valor nutricional é bastante reduzido."
+"A capacidade do seu corpo de digerir carne é severamente prejudicada. Comer "
+"carne tem uma boa chance de fazer você vomitar tudo de volta; Mesmo se você "
+"conseguir manter tudo dentro de si, o valor nutricional é bastante reduzido."
 
 #: lang/json/mutation_from_json.py
 msgid "Carnivore"
@@ -124850,7 +128007,7 @@ msgid ""
 "Your body's ability to digest fruits, vegetables and grains is severely "
 "hampered.  You cannot eat anything besides meat."
 msgstr ""
-" A capacidade do seu corpo para digerir frutas, legumes e grãos éseveramente"
+"A capacidade do seu corpo para digerir frutas, legumes e grãos é severamente"
 " prejudicada. Você não pode comer nada além de carne."
 
 #: lang/json/mutation_from_json.py
@@ -124862,16 +128019,17 @@ msgstr "Ponderoso"
 #, no-python-format
 msgid "Your muscles are generally slow to move.  You move 10% slower."
 msgstr ""
+"Seus músculos são geralmente devagares. Você se move 10% mais lentamente."
 
 #: lang/json/mutation_from_json.py
 msgid "Very Ponderous"
-msgstr "Muito ponderosa"
+msgstr "Muito Ponderoso"
 
 #. ~ Description for Very Ponderous
 #: lang/json/mutation_from_json.py
 #, no-python-format
 msgid "Your muscles are quite slow to move.  You move 20% slower."
-msgstr ""
+msgstr "Seus músculos se movem bem devagar. Você se move 20% mais lentamente."
 
 #: lang/json/mutation_from_json.py
 msgid "Extremely Ponderous"
@@ -124882,10 +128040,11 @@ msgstr "Extremamente Ponderoso"
 #, no-python-format
 msgid "Your muscles are very slow to move.  You move 30% slower."
 msgstr ""
+"Seus músculos se movem muito devagar. Você se move 30% mais lentamente."
 
 #: lang/json/mutation_from_json.py
 msgid "Sunlight Dependent"
-msgstr "Dependente da luz solar"
+msgstr "Dependente da Luz Solar"
 
 #. ~ Description for Sunlight Dependent
 #: lang/json/mutation_from_json.py
@@ -124910,7 +128069,7 @@ msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Vine Limbs"
-msgstr "Vem os membros"
+msgstr "Membros de Videiras"
 
 #. ~ Description for Vine Limbs
 #: lang/json/mutation_from_json.py
@@ -124918,23 +128077,23 @@ msgid ""
 "You've developed the ability to control your vines; they make good lashes.  "
 "You can even rappel down sheer drops using them, but disconnecting HURTS."
 msgstr ""
-" Você desenvolveu a capacidade de controlar suas videiras; eles fazem "
-"bonscílios. Você pode até mesmo descer rapel usando-os, mas "
-"desconectandoHURTS."
+" Você desenvolveu a capacidade de controlar suas videiras; elas dão bons "
+"chicotes. Você pode até mesmo descer em rapel usando-as, mas retirar elas "
+"DÓI."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
 msgid "You lash %s with a vine"
-msgstr ""
+msgstr "Você chicoteia %s com uma videira."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
 msgid "%1$s lashes %2$s with their vines"
-msgstr ""
+msgstr "%1$s chicoteia %2$s com suas videiras."
 
 #: lang/json/mutation_from_json.py
 msgid "Vine Sprouter"
-msgstr "Sprouter da videira"
+msgstr "Brota-Vinhas"
 
 #. ~ Description for Vine Sprouter
 #: lang/json/mutation_from_json.py
@@ -124942,8 +128101,8 @@ msgid ""
 "You have full control of your vines, and can grow new ones and detach old "
 "ones more or less at will."
 msgstr ""
-" Você tem controle total de suas vinhas, e pode cultivar novas e separar "
-"asmais velhas à vontade."
+" Você tem controle total de suas vinhas, e pode cultivar novas e separar as "
+"mais velhas quase que à vontade."
 
 #: lang/json/mutation_from_json.py
 msgid "You detach a vine from your body."
@@ -124959,10 +128118,12 @@ msgid ""
 "Roots have started growing from your leaf like hair, they don't seem to do "
 "much."
 msgstr ""
+"Raízes começaram a crescer do seu cabelo folhoso, por enquanto não parecem "
+"fazer muito."
 
 #: lang/json/mutation_from_json.py
 msgid "Toe Roots"
-msgstr "Raízes do dedo do pé"
+msgstr "Raízes nos Pés"
 
 #. ~ Description for Toe Roots
 #: lang/json/mutation_from_json.py
@@ -124993,7 +128154,7 @@ msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Rooter"
-msgstr "entusiasta"
+msgstr "Enraizador"
 
 #. ~ Description for Rooter
 #: lang/json/mutation_from_json.py
@@ -125001,8 +128162,8 @@ msgid ""
 "You find it difficult not to sink roots when able.  You extract nutrients "
 "and water whenever on diggable terrain, but move more slowly."
 msgstr ""
-" Você acha difícil não criar raízes quando é capaz. Você extrai nutrientes "
-"eágua sempre em terrenos digeríveis, mas se move mais devagar."
+" Você acha difícil não criar raízes quando é capaz. Você sempre extrai "
+"nutrientes e água em terreno digerível, mas se move mais devagar."
 
 #: lang/json/mutation_from_json.py
 msgid "Chloromorphosis"
@@ -125015,9 +128176,9 @@ msgid ""
 "roots.  Sleeping on diggable soil will satisfy any hunger or thirst you "
 "might have."
 msgstr ""
-" Cada centímetro da sua pele está repleto de clorofila e você tem "
-"raízesfortes. Dormir em solo digerível irá satisfazer qualquer fome ou sede "
-"quevocê possa ter."
+"Cada centímetro da sua pele está repleto de clorofila e você tem raízes "
+"fortes. Dormir em solo escavável irá satisfazer qualquer fome ou sede que "
+"você possa ter."
 
 #: lang/json/mutation_from_json.py
 msgid "Mycorrhizal Communion"
@@ -125059,7 +128220,7 @@ msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Cold Blooded"
-msgstr "A sangue frio"
+msgstr "Sangue Frio"
 
 #. ~ Description for Cold Blooded
 #: lang/json/mutation_from_json.py
@@ -125076,18 +128237,16 @@ msgstr "Ectérmica"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
-" Seu corpo se tornou permanentemente de sangue frio. Sua velocidade diminui-"
-" ou aumenta - para cada 2 (1,1) graus abaixo ou acima de 65 F (18,3 C).Você "
-"só precisa comer metade do que um ser humano médio."
 
 #: lang/json/mutation_from_json.py
 msgid "Growling Voice"
-msgstr "Voz Growling"
+msgstr "Voz Grunhidora"
 
 #. ~ Description for Growling Voice
 #: lang/json/mutation_from_json.py
@@ -125095,12 +128254,12 @@ msgid ""
 "You have a growling, rough voice.  Persuading NPCs will be more difficult, "
 "but threatening them will be easier."
 msgstr ""
-" Você tem uma voz rouca e áspera. Persuadir NPCs será mais difícil, "
-"masameaçá-los será mais fácil."
+"Você tem uma voz rouca e áspera. Persuadir NPCs será mais difícil, mas "
+"ameaçá-los será mais fácil."
 
 #: lang/json/mutation_from_json.py
 msgid "Snarling Voice"
-msgstr "Voz Rosnando"
+msgstr "Voz Rosnada"
 
 #. ~ Description for Snarling Voice
 #: lang/json/mutation_from_json.py
@@ -125108,12 +128267,12 @@ msgid ""
 "You have a threatening snarl in your voice.  Persuading NPCs will be near "
 "impossible, but threatening them will be much easier."
 msgstr ""
-" Você tem um grunhido ameaçador em sua voz. Persuadir NPCs será "
-"quaseimpossível, mas ameaçá-los será muito mais fácil."
+" Você tem um rosnar ameaçador em sua voz. Persuadir NPCs será quase "
+"impossível, mas ameaçá-los será muito mais fácil."
 
 #: lang/json/mutation_from_json.py
 msgid "Hissing Voice"
-msgstr "Voz sibilante"
+msgstr "Voz Sibilante"
 
 #. ~ Description for Hissing Voice
 #: lang/json/mutation_from_json.py
@@ -125121,12 +128280,12 @@ msgid ""
 "You hiss when speaking.  Persuading NPCs will be more difficult, but "
 "threatening them will be easier."
 msgstr ""
-" Você assobia quando fala. Persuadir NPCs será mais difícil, mas ameaçá- "
-"losserá mais fácil."
+" Você assobia quando fala. Persuadir NPCs será mais difícil, mas ameaçá-los "
+"será mais fácil."
 
 #: lang/json/mutation_from_json.py
 msgid "Shouter"
-msgstr "Shouter"
+msgstr "Berrador"
 
 #. ~ Description for Shouter
 #: lang/json/mutation_from_json.py
@@ -125144,16 +128303,16 @@ msgstr "Você às vezes grita incontrolavelmente."
 
 #: lang/json/mutation_from_json.py
 msgid "Howler"
-msgstr "Berrador"
+msgstr "Uivador"
 
 #. ~ Description for Howler
 #: lang/json/mutation_from_json.py
 msgid "You frequently let out a piercing howl."
-msgstr "Você freqüentemente deixa escapar um uivo estridente."
+msgstr "Você frequentemente deixa escapar um uivo estridente."
 
 #: lang/json/mutation_from_json.py
 msgid "Feathered Arms"
-msgstr "Braços emplumados"
+msgstr "Braços Emplumados"
 
 #. ~ Description for Feathered Arms
 #: lang/json/mutation_from_json.py
@@ -125162,13 +128321,13 @@ msgid ""
 "waterproof your arms and take the edge off hits, but really get in the way."
 "  They're simply too small to help you in the air."
 msgstr ""
-" Seus braços cresceram em cores vibrantes. Eles efetivamente "
-"impermeabilizamseus braços e aliviam os limites, mas realmente atrapalham. "
-"Eles sãosimplesmente pequenos demais para ajudá-lo no ar."
+"Penas de cores vivas cresceram em seus braços. Elas efetivamente "
+"impermeabilizam seus braços e aliviam os golpes, mas realmente atrapalham.E "
+"são simplesmente pequenas demais para ajudá-lo no ar."
 
 #: lang/json/mutation_from_json.py
 msgid "Insect Limbs"
-msgstr "Membros de insetos"
+msgstr "Membros de Insetos"
 
 #. ~ Description for Insect Limbs
 #: lang/json/mutation_from_json.py
@@ -125176,12 +128335,12 @@ msgid ""
 "You've *finally* sprouted a pair of arms from your midsection.  They flail "
 "more-or-less uncontrollably, making you feel rather larval."
 msgstr ""
-" Você * finalmente * brotou um par de braços de seu meio. Eles se agitammais"
-" ou menos incontrolavelmente, fazendo você se sentir bastante larval."
+" Você * finalmente * brotou um par de braços de seu meio. Eles se agitam "
+"mais ou menos incontrolavelmente, fazendo você se sentir bastante larval."
 
 #: lang/json/mutation_from_json.py
 msgid "Insect Arms"
-msgstr "Braços Insetos"
+msgstr "Braços de Inseto"
 
 #. ~ Description for Insect Arms
 #: lang/json/mutation_from_json.py
@@ -125189,13 +128348,12 @@ msgid ""
 "It's good having all your arms.  Though they're too thin to block or punch, "
 "you can fold them inside human-shaped gear if need be."
 msgstr ""
-" É bom ter todos os seus braços. Embora eles sejam muito finos para "
-"bloquearou perfurar, você pode dobrá-los dentro da engrenagem humana se "
-"fornecessário."
+"É bom ter todos os seus braços. Embora eles sejam muito finos para bloquear "
+"ou socar, você pode dobrá-los dentro de roupas humanas se for necessário."
 
 #: lang/json/mutation_from_json.py
 msgid "Arachnid Limbs"
-msgstr "Membros de aracnídeos"
+msgstr "Membros de Aracnídeo"
 
 #. ~ Description for Arachnid Limbs
 #: lang/json/mutation_from_json.py
@@ -125203,13 +128361,13 @@ msgid ""
 "There's the last two limbs you were expecting.  Unfortunately you still "
 "can't coordinate them, so you're getting in your own way.  A lot."
 msgstr ""
-" Há os dois últimos membros que você esperava. Infelizmente você ainda "
-"nãoconsegue coordená-los, então você está seguindo seu próprio caminho. "
+"Os dois últimos membros que você esperaria. Infelizmente você ainda não "
+"consegue coordená-los, então você acaba entrando em seu próprio caminho. "
 "Muito."
 
 #: lang/json/mutation_from_json.py
 msgid "Arachnid Arms"
-msgstr "Aracnídeos"
+msgstr "Braços de Aracnídeo"
 
 #. ~ Description for Arachnid Arms
 #: lang/json/mutation_from_json.py
@@ -125217,13 +128375,12 @@ msgid ""
 "You have four handsome limbs, and then those mutant 'hand' and 'foot' "
 "things.  They probably aren't worth concealing."
 msgstr ""
-" Você tem quatro membros bonitos, e depois aquelas coisas mutantes "
-"de&#39;mão&#39; e &#39;pé&#39;. Eles provavelmente não valem a pena "
-"esconder."
+" Você tem quatro membros bonitos, e depois aquelas coisas mutantes entre pés"
+" e braços. Eles provavelmente não valem a pena esconder."
 
 #: lang/json/mutation_from_json.py
 msgid "Tentacle Arms"
-msgstr "Braços de tentáculos"
+msgstr "Braços de Tentáculo"
 
 #. ~ Description for Tentacle Arms
 #: lang/json/mutation_from_json.py
@@ -125232,33 +128389,33 @@ msgid ""
 "Dexterity, permanent hand encumbrance of 30, and inability to wear gloves.  "
 "Somewhat decreases wet penalties."
 msgstr ""
-" Seus braços se transformaram em tentáculos, resultando em um bônus de 1para"
-" Destreza, ônus permanente de 30 e incapacidade de usar luvas. Diminuium "
-"pouco as penalidades molhadas."
+" Seus braços se transformaram em tentáculos, resultando em um bônus de 1 "
+"para Destreza, estorvo permanente de 30 para as mãos e incapacidade de usar "
+"luvas. Diminui um pouco as penalidades relacionadas a se molhar."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
 msgid "You slap %s with your tentacle"
-msgstr ""
+msgstr "Você estapeia %s com seu tentáculo"
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
 msgid "%1$s slaps %2$s with their tentacle"
-msgstr ""
+msgstr "%1$s estapeia %2$s com seu tentáculo"
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
 msgid "You rake %s with your tentacle"
-msgstr ""
+msgstr "Você atinge %s com seu tentáculo"
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
 msgid "%1$s rakes %2$s with their tentacle"
-msgstr ""
+msgstr "%1$s atinge %2$s com seu tentáculo"
 
 #: lang/json/mutation_from_json.py
 msgid "4 Tentacles"
-msgstr "4 tentáculos"
+msgstr "4 Tentáculos"
 
 #. ~ Description for 4 Tentacles
 #: lang/json/mutation_from_json.py
@@ -125268,10 +128425,10 @@ msgid ""
 "  You can make up to 3 extra attacks with them.  Somewhat decreases wet "
 "penalties."
 msgstr ""
-" Seus braços se transformaram em quatro tentáculos, resultando em um bônusde"
-" 1 para Destreza, ônus permanente de mão de 30 e incapacidade de usarluvas. "
-"Você pode fazer até 3 ataques extras com eles. Diminui um pouco "
-"aspenalidades molhadas."
+" Seus braços se transformaram em quatro tentáculos, resultando em um bônus "
+"de 1 para Destreza, estorvo permanente de 30 nas mãos e incapacidade de usar"
+" luvas. Você pode fazer até 3 ataques extras com eles. Diminui um pouco as "
+"penalidades relacionadas a se molhar."
 
 #: lang/json/mutation_from_json.py
 msgid "8 Tentacles"
@@ -125285,10 +128442,10 @@ msgid ""
 "gloves.  You can make up to 7 extra attacks with them.  Somewhat decreases "
 "wet penalties."
 msgstr ""
-" Seus braços se transformaram em oito tentáculos, resultando em um bônus de1"
-" para Destreza, ônus permanente das mãos de 30 e incapacidade de usarluvas. "
-"Você pode fazer até 7 ataques extras com eles. Diminui um pouco "
-"aspenalidades molhadas."
+" Seus braços se transformaram em oito tentáculos, resultando em um bônus de "
+"1 para Destreza, estorvo permanente de 30 nas mãos e incapacidade de usar "
+"luvas. Você pode fazer até 7 ataques extras com eles. Diminui um pouco as "
+"penalidades relacionadas a se molhar."
 
 #: lang/json/mutation_from_json.py
 msgid "Shell"
@@ -125301,14 +128458,14 @@ msgid ""
 "You find you can use the empty space as 16 storage space, but cannot wear "
 "anything on your torso.  Somewhat reduces wet effects."
 msgstr ""
-" Você cresceu uma casca grossa sobre o seu torso, proporcionando "
-"umaexcelente armadura. Você acha que pode usar o espaço vazio como 16 "
-"espaçode armazenamento, mas não pode usar nada em seu torso. Algo reduz "
-"osefeitos molhados."
+"Uma concha grossa cresceu sobre o seu torso, proporcionando uma excelente "
+"armadura. Você descobre que pode usar o espaço vazio como 16 espaços de "
+"armazenamento, mas não pode usar vestir em seu torso. Reduz os efeitos "
+"relacionados a se molhar um pouco."
 
 #: lang/json/mutation_from_json.py
 msgid "Roomy Shell"
-msgstr "Concha espaçosa"
+msgstr "Concha Espaçosa"
 
 #. ~ Description for Roomy Shell
 #: lang/json/mutation_from_json.py
@@ -125317,13 +128474,13 @@ msgid ""
 "your whole body.  Activate to pull your head and limbs into your shell, "
 "trading mobility and vision for warmth and shelter."
 msgstr ""
-" Seu escudo protetor cresceu o suficiente para acomodar - se necessário "
-"-todo o seu corpo. Ative para puxar a cabeça e os membros para dentro da "
-"suaconcha, trocando mobilidade e visão por calor e abrigo."
+"Sua concha protetora cresceu o suficiente para acomodar - se necessário "
+"-todo o seu corpo. Ative para puxar a cabeça e os membros para dentro da sua"
+" concha, trocando mobilidade e visão por calor e abrigo."
 
 #: lang/json/mutation_from_json.py
 msgid "Leg Tentacles"
-msgstr "Tentáculos de perna"
+msgstr "Pernas de Tentáculos"
 
 #. ~ Description for Leg Tentacles
 #: lang/json/mutation_from_json.py
@@ -125333,6 +128490,9 @@ msgid ""
 " land by 20%, makes your movement silent, increases your swimming speed, and"
 " reduces wet penalties."
 msgstr ""
+"Suas pernas se transformaram em seis tentáculos. Isso reduz sua velocidade "
+"em terra por 20%, torna seu movimento silencioso, aumenta sua velocidade de "
+"nado, e reduz penalidades de se molhar."
 
 #: lang/json/mutation_from_json.py
 msgid "Tentacle Bracing"
@@ -125344,9 +128504,9 @@ msgid ""
 "Your lower-tentacles have developed suckers.  They make land movement "
 "marginally more tiring, but do a good job of keeping you set in place."
 msgstr ""
-" Seus tentáculos inferiores desenvolveram otários. Eles tornam o movimentode"
-" terras um pouco mais cansativo, mas fazem um bom trabalho em mantê-lo "
-"nolugar."
+"Seus tentáculos inferiores desenvolveram ventosas. Elas tornam o movimento "
+"em terra um pouco mais cansativo, mas fazem um bom trabalho em mantê-lo no "
+"lugar."
 
 #. ~ Description for Lizard
 #: lang/json/mutation_from_json.py
@@ -125376,8 +128536,8 @@ msgid ""
 "Ninety percent of the planet, and it's yours to explore.  And colonize.  And"
 " enjoy.  What was that about a surface?"
 msgstr ""
-" Noventa por cento do planeta, e é seu para explorar. E colonize. "
-"Eaproveitar. O que foi aquilo sobre uma superfície?"
+"Noventa por cento do planeta, e é seu para explorar. E colonizar. E "
+"aproveitar. O que foi aquilo sobre uma superfície?"
 
 #. ~ Description for Beast
 #: lang/json/mutation_from_json.py
@@ -125385,8 +128545,8 @@ msgid ""
 "It's about time you grew out.  Now that you've matured, it is time to make "
 "something of yourself."
 msgstr ""
-" Já é hora de você crescer. Agora que você amadureceu, é hora de fazer "
-"algode si mesmo."
+" Já é hora de você crescer. Agora que você amadureceu, é hora de fazer algo "
+"de si mesmo."
 
 #. ~ Description for Feline
 #: lang/json/mutation_from_json.py
@@ -125394,19 +128554,19 @@ msgid ""
 "Stalking prey, eating well, and lying in the sun.  Mmm, all you could ever "
 "desire."
 msgstr ""
-" Perseguindo a presa, comendo bem e deitado ao sol. Mmm, tudo que "
-"vocêpoderia desejar."
+"Perseguindo presas, comendo bem e deitando ao sol. Mmm, tudo que você "
+"poderia desejar."
 
 #. ~ Description for Wolf
 #: lang/json/mutation_from_json.py
 msgid "You're the perfect candidate to lead a pack."
-msgstr "Você é o candidato perfeito para liderar um bando."
+msgstr "Você é o candidato perfeito para liderar uma alcatéia."
 
 #. ~ Description for Bear
 #: lang/json/mutation_from_json.py
 msgid "So the humans died, what's the worry?  Now they won't ruin the woods."
 msgstr ""
-" Então os humanos morreram, qual é a preocupação? Agora eles não vãoestragar"
+"Então os humanos morreram, qual é a preocupação? Agora eles não vão estragar"
 " a floresta."
 
 #: lang/json/mutation_from_json.py
@@ -125419,17 +128579,17 @@ msgid ""
 "Civilization collapsed?  Great!  You and your kin will never have to worry "
 "about a slaughterhouse again."
 msgstr ""
-" Civilização entrou em colapso? Ótimo! Você e seu parente nunca mais "
-"terãoque se preocupar com um matadouro."
+"A civilização entrou em colapso? Ótimo! Você e seus parentes nunca mais "
+"terão que se preocupar com um matadouro."
 
 #. ~ Description for Insect
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
+"every need… but how would you keep them in line?"
 msgstr ""
-" Seria bom ser uma Rainha, tendo os trabalhadores constantemente atendendo "
-"atodas as suas necessidades ... mas como você os manteria na linha?"
+"Seria bom ser uma Rainha, tendo operários constantemente suprindo todas as "
+"suas necessidades... mas como você manteria eles na linha?"
 
 #. ~ Description for Plant
 #: lang/json/mutation_from_json.py
@@ -125437,8 +128597,8 @@ msgid ""
 "Well, you still have those other walking flowers-and the mushrooms too-to "
 "deal with.  But you'll manage."
 msgstr ""
-" Bem, você ainda tem aquelas outras flores andando - e os cogumelos também "
-"-para lidar. Mas você vai conseguir."
+" Bem, você ainda tem aquelas outras flores ambulantes - e cogumelos também -"
+" para lidar. Mas você vai conseguir."
 
 #: lang/json/mutation_from_json.py
 msgid "Aqueous"
@@ -125447,11 +128607,11 @@ msgstr "Aquoso"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
 msgstr ""
-" Qual era aquele anúncio antigo, 'pintar o planeta'? Isso pode ser um bom "
-"objetivo a longo prazo, mas por enquanto ..."
+"O que dizia aquele anúncio antigo, \"pinte o planeta\"? Talvez fosse um bom "
+"objetivo de longo prazo, mas por enquanto..."
 
 #: lang/json/mutation_from_json.py
 msgid "Subterranean"
@@ -125464,9 +128624,9 @@ msgid ""
 "  Now that you've become accustomed to your new digs, there's the beginnings"
 " of a great empire right here, underground."
 msgstr ""
-" Não há muito sentido em se reconstruir naquela terra árida e "
-"terrivelmentebrilhante. Agora que você se acostumou com suas novas "
-"escavações, há ocomeço de um grande império bem aqui, no subsolo."
+" Não há muito sentido em se reconstruir naquela terra árida, terrivelmente "
+"brilhante e sem teto. Agora que você se acostumou com suas novas escavações,"
+" há o começo de um grande império bem aqui, no subsolo."
 
 #. ~ Description for Cephalopod
 #: lang/json/mutation_from_json.py
@@ -125474,8 +128634,8 @@ msgid ""
 "Strange aeons, true, but Death seems to be slacking and you are doing just "
 "fine."
 msgstr ""
-" Aeons estranhos, verdade, mas a morte parece estar afrouxando e você "
-"estáindo muito bem."
+"Épocas estranhas, verdade, mas a morte parece estar afrouxando e você está "
+"indo muito bem."
 
 #: lang/json/mutation_from_json.py
 msgid "Arachnid"
@@ -126940,7 +130100,7 @@ msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Technomancer"
-msgstr ""
+msgstr "Tecnomante"
 
 #. ~ Description for Technomancer
 #: lang/json/mutation_from_json.py
@@ -126978,7 +130138,7 @@ msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Druid"
-msgstr ""
+msgstr "Druída"
 
 #. ~ Description for Druid
 #: lang/json/mutation_from_json.py
@@ -127161,20 +130321,20 @@ msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Made Of Sugar"
-msgstr ""
+msgstr "De Açúcar"
 
 #. ~ Description for Made Of Sugar
 #: lang/json/mutation_from_json.py
 msgid "You are literally made of sugar."
-msgstr ""
+msgstr "Você é literalmente de açúcar."
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 msgid "Bone Seer"
-msgstr ""
+msgstr "Vidente de Ossos"
 
 #: lang/json/npc_class_from_json.py
 msgid "I wish to sing the song of the Bones"
-msgstr ""
+msgstr "Eu desejo cantar a canção dos Ossos"
 
 #: lang/json/npc_class_from_json.py
 msgid "No class"
@@ -127186,7 +130346,7 @@ msgstr "Eu estou apenas vagando."
 
 #: lang/json/npc_class_from_json.py
 msgid "Debug Dude"
-msgstr "Depurar Cara"
+msgstr "Cara da Depuração"
 
 #: lang/json/npc_class_from_json.py
 msgid "I'm helping you test the game."
@@ -127223,7 +130383,7 @@ msgstr "Negociante"
 
 #: lang/json/npc_class_from_json.py
 msgid "I'm collecting gear and selling it."
-msgstr "Eu estou colecionando equipamento e vendendo isto."
+msgstr "Eu estou colecionando e vendendo equipamento."
 
 #: lang/json/npc_class_from_json.py
 msgid "Ninja"
@@ -127254,12 +130414,12 @@ msgid "Scientist"
 msgstr "Cientista"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
-msgstr "Estou procurando pistas sobre as origens desses monstros ..."
+msgid "I'm looking for clues concerning these monsters' origins…"
+msgstr "Estou procurando por pistas a respeito da origem desses monstros..."
 
 #: lang/json/npc_class_from_json.py
 msgid "Bounty Hunter"
-msgstr "Caçador"
+msgstr "Caçador de Recompensas"
 
 #: lang/json/npc_class_from_json.py
 msgid "I'm a killer for hire."
@@ -127267,7 +130427,7 @@ msgstr "Eu sou um assassino de aluguel."
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 msgid "Thug"
-msgstr "N"
+msgstr "Jagunço"
 
 #: lang/json/npc_class_from_json.py
 msgid "I'm just here for the paycheck."
@@ -127291,7 +130451,7 @@ msgstr "Eu só estou vendo o mundo queimar."
 
 #: lang/json/npc_class_from_json.py
 msgid "I'm tracking game."
-msgstr "Estou acompanhando o jogo."
+msgstr "Estou rastreando caça."
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 msgid "Soldier"
@@ -127315,15 +130475,15 @@ msgstr "Estou com defeito - eu não deveria falar com você."
 
 #: lang/json/npc_class_from_json.py
 msgid "Real Person"
-msgstr ""
+msgstr "Pessoa Real"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
 msgid "Chef"
-msgstr "líder"
+msgstr "Chef"
 
 #: lang/json/npc_class_from_json.py
 msgid "I'm a chef."
@@ -127334,7 +130494,7 @@ msgid "Foodperson"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
@@ -127342,12 +130502,12 @@ msgid "Cyborg"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
 msgid "former cop"
-msgstr ""
+msgstr "ex-policial"
 
 #: lang/json/npc_class_from_json.py
 msgid "I used to be a police officer, but I'm just a survivor now."
@@ -127355,7 +130515,7 @@ msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 msgid "Barry Isherwood"
-msgstr ""
+msgstr "Barry Isherwood"
 
 #: lang/json/npc_class_from_json.py
 msgid "Missing member of the Isherwood family."
@@ -127363,7 +130523,7 @@ msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 msgid "Carlos Isherwood"
-msgstr ""
+msgstr "Carlos Isherwood"
 
 #: lang/json/npc_class_from_json.py
 msgid "I'm Jesse's husband, part of the Isherwood family"
@@ -127486,6 +130646,14 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr ""
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
+msgstr ""
+
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 #: lang/json/npc_from_json.py
 msgid "Captive"
@@ -128150,6 +131318,8 @@ msgid ""
 "Light and heavy industry, including buildings, equipment and parking areas."
 "  "
 msgstr ""
+"Indústria leve e pesada, incluindo construções, equipamento e áreas de "
+"carga."
 
 #: lang/json/overmap_land_use_code_from_json.py
 msgid "Transitional"
@@ -128161,6 +131331,9 @@ msgid ""
 "(if the future land use is at all uncertain).  Formerly identified as Urban "
 "Open."
 msgstr ""
+"Zonas abertas em processo de serem desenvolvidas de um tipo de uso da terra "
+"para outro (se o uso futuro for de qualquer forma incerto). Anteriormente "
+"identificado como Urbana Aberta."
 
 #: lang/json/overmap_land_use_code_from_json.py
 msgid "Transportation"
@@ -128218,7 +131391,7 @@ msgstr ""
 
 #: lang/json/overmap_land_use_code_from_json.py
 msgid "Saltwater Sandy Beach"
-msgstr ""
+msgstr "Praias de Água Salgada Arenosas"
 
 #: lang/json/overmap_land_use_code_from_json.py
 msgid "DEP Wetlands (1:12,000) WETCODEs 1, 2, 3, 6, 10, 13, 17 and 19"
@@ -128266,6 +131439,8 @@ msgid ""
 "Includes the gravestones, monuments, parking lots, road networks and "
 "associated buildings."
 msgstr ""
+"Inclui os lotes de túmulos, monumentos, estacionamentos, redes de estradas e"
+" instalações associadas."
 
 #: lang/json/overmap_land_use_code_from_json.py
 msgid "Orchard"
@@ -128273,7 +131448,7 @@ msgstr "Pomar"
 
 #: lang/json/overmap_land_use_code_from_json.py
 msgid "Fruit farms and associated facilities."
-msgstr ""
+msgstr "Fazendas de frutas e instalações associadas."
 
 #: lang/json/overmap_land_use_code_from_json.py
 msgid "Nursery"
@@ -128296,7 +131471,7 @@ msgstr ""
 
 #: lang/json/overmap_land_use_code_from_json.py
 msgid "Very Low Density Residential"
-msgstr ""
+msgstr "Residenciais de Densidade Muito Baixa"
 
 #: lang/json/overmap_land_use_code_from_json.py
 msgid ""
@@ -128363,7 +131538,7 @@ msgstr "farol"
 
 #: lang/json/overmap_terrain_from_json.py lang/json/snippet_from_json.py
 msgid "island"
-msgstr ""
+msgstr "ilha"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "forest"
@@ -128485,7 +131660,7 @@ msgstr "estacionamento"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "irradiation plant"
-msgstr ""
+msgstr "planta de irradiação"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "field"
@@ -128493,7 +131668,7 @@ msgstr "campo"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "crashed airliner"
-msgstr ""
+msgstr "avião caído"
 
 #: lang/json/overmap_terrain_from_json.py lang/json/terrain_from_json.py
 msgid "open air"
@@ -129080,6 +132255,10 @@ msgstr "telhado megastore"
 msgid "hotel parking"
 msgstr "estacionamento do hotel"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "hotel"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "entrada do hotel"
@@ -129449,7 +132628,7 @@ msgid "spiked trench"
 msgstr "trincheira cravada"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
+msgid "fabrication workshop survey"
 msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
@@ -129464,6 +132643,14 @@ msgstr "loja de ferreiro"
 msgid "livestock survey"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr ""
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr ""
@@ -130149,6 +133336,10 @@ msgstr "faixa de tiro"
 msgid "shooting range roof"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "campo de golfe"
@@ -130815,10 +134006,6 @@ msgstr "centro de expedição de robôs"
 msgid "dense urban"
 msgstr "denso urbano"
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "hotel"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "escola"
@@ -130839,6 +134026,10 @@ msgstr ""
 msgid "mechanics garage"
 msgstr "garagem mecânica"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
 msgstr "tratamento de esgoto"
@@ -135843,6 +139034,36 @@ msgid ""
 "on. This displeases you."
 msgstr ""
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -137246,7 +140467,7 @@ msgstr ""
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Druid"
-msgstr ""
+msgstr "Druída"
 
 #. ~ Profession (male Druid) description
 #: lang/json/professions_from_json.py
@@ -137259,7 +140480,7 @@ msgstr ""
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Druid"
-msgstr ""
+msgstr "Druída"
 
 #. ~ Profession (female Druid) description
 #: lang/json/professions_from_json.py
@@ -138910,11 +142131,6 @@ msgstr "PÉS"
 msgid "MEDICAL"
 msgstr "MEDICAMENTO"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "RECIPIENTES"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -139900,7 +143116,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
 msgstr ""
 
@@ -139957,7 +143173,7 @@ msgstr ""
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
+"grab a pot.  Let's put it in that dining area."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -140689,7 +143905,7 @@ msgid "build 2 wood stoves"
 msgstr ""
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
+msgid "We should build a well.  This will make cooking more convenient."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -141186,6 +144402,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr ""
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -141206,8 +144598,8 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -141312,7 +144704,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
 msgstr ""
 
@@ -141322,7 +144714,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
 msgstr ""
 
@@ -141332,7 +144724,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
 msgstr ""
 
@@ -141764,7 +145156,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
+"Some benches around the outside would be nice.  Build some to the northwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -141773,7 +145165,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
+"Some benches around the outside would be nice.  Build some to the northeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -141782,7 +145174,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
+"Some benches around the outside would be nice.  Build some to the southeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -141791,7 +145183,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
+"Some benches around the outside would be nice.  Build some to the southwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -142033,6 +145425,10 @@ msgstr ""
 msgid "Central Storage Building"
 msgstr ""
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr ""
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
 msgstr ""
@@ -143426,6 +146822,44 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr ""
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr ""
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -143464,7 +146898,7 @@ msgstr ""
 #: lang/json/scenario_from_json.py
 msgctxt "start_name"
 msgid "Candy Shop"
-msgstr ""
+msgstr "Loja de Doces"
 
 #. ~ Name for scenario 'Robots' for a male character
 #: lang/json/scenario_from_json.py
@@ -148619,13 +152053,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
+msgid "Pass some ethanol, I need to power my ethanol burner."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -148633,20 +152061,12 @@ msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
+msgid "I require ethanol for my internal power supply.  Anything on you?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -154993,7 +158413,7 @@ msgstr ""
 #: lang/json/snippet_from_json.py
 #, no-python-format
 msgid "IT'S TRUE - MUTAGEN IS 40% BLEACH, AND HERE'S WHY"
-msgstr ""
+msgstr "É VERDADE - MUTÁGENO É 40% ÁGUA SANITÁRIA, VEJA O PORQUÊ"
 
 #: lang/json/snippet_from_json.py
 msgid "20 EASY WAYS TO ESCAPE A LAB - #4 WILL BLOW YOUR MIND"
@@ -156352,7 +159772,7 @@ msgid "a static hissing sound."
 msgstr "um som de assobio estático."
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156366,11 +159786,11 @@ msgid "\"Hold on, I want to pulp that zombie corpse.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
+msgid "\"Burning… from the inside…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
+msgid "\"This smell…  Don't know…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156382,19 +159802,19 @@ msgid "a scraping noise."
 msgstr "um barulho de raspagem."
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
+msgid "\"No…  Stop the burning!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
+msgid "\"Hunger…  Must eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
+msgid "\"Run…  Chase…  Eat…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156403,11 +159823,11 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "coughing."
-msgstr ""
+msgstr "tossindo."
 
 #: lang/json/speech_from_json.py
 msgid "growling."
-msgstr ""
+msgstr "rosnando."
 
 #: lang/json/speech_from_json.py
 msgid "wheezing."
@@ -156431,19 +159851,19 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "\"STOP!\""
-msgstr ""
+msgstr "\"PARE!\""
 
 #: lang/json/speech_from_json.py
 msgid "indistinct shouting."
-msgstr ""
+msgstr "gritos indistintos."
 
 #: lang/json/speech_from_json.py
 msgid "screaming."
-msgstr ""
+msgstr "gritos."
 
 #: lang/json/speech_from_json.py
 msgid "\"MEAT!\""
-msgstr ""
+msgstr "\"CARNE!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"TEKELI-LI!\""
@@ -156509,7 +159929,7 @@ msgstr "'Não é assim! Vá para a esquerda! \""
 
 #: lang/json/speech_from_json.py
 msgid "\"I told you to let me die.\""
-msgstr ""
+msgstr "\"Eu te disse pra me deixar morrer.\""
 
 #: lang/json/speech_from_json.py
 msgid "\"W-where am I?  Why does it hur-REBOOTING IN 59 SECONDS.\""
@@ -156520,12 +159940,12 @@ msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
+msgid "\"Can't… breathe…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "\"This cannot continue.\""
-msgstr ""
+msgstr "\"Isso não pode continuar.\""
 
 #: lang/json/speech_from_json.py
 msgid "\"USER PASSWORD UNRECOGNIZED.\""
@@ -156533,8 +159953,8 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156546,7 +159966,7 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156554,20 +159974,20 @@ msgid "\"This is a dream.  This has to be a dream.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
+msgid "\"This is my life now… this is my life now… this is my life now…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
-msgstr ""
+msgid "\"Wanna go home…\""
+msgstr "\"Quero ir pra casa...\""
 
 #: lang/json/speech_from_json.py
 msgid "screams of pain."
-msgstr ""
+msgstr "gritos de dor."
 
 #: lang/json/speech_from_json.py
 msgid "muffled sobbing."
-msgstr ""
+msgstr "choro abafado."
 
 #: lang/json/speech_from_json.py
 msgid ""
@@ -156614,7 +160034,7 @@ msgstr ""
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156637,18 +160057,18 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156700,43 +160120,43 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "\"Requesting assistance!\""
-msgstr ""
+msgstr "\"Requisitando assistência!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Requesting supervisor!\""
-msgstr ""
+msgstr "\"Requisitando um supervisor!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Requesting human officer!\""
-msgstr ""
+msgstr "\"Requisitando um oficial humano!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"No officer on scene.  Requesting backup!\""
-msgstr ""
+msgstr "\"Sem oficial no local. Requisitando reforços!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Let me see your hands!\""
-msgstr ""
+msgstr "\"Mostre as suas mãos!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Stop resisting!\""
-msgstr ""
+msgstr "\"Pare de resistir!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Code 10-66.  Copy 10-4.  Possible 10-55.\""
-msgstr ""
+msgstr "\"Código 10-66. Ouço 10-4.  Possível 10-55.\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Probable 10-70.\""
-msgstr ""
+msgstr "\"Provável 10-70.\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Get on the ground!  Now!\""
-msgstr ""
+msgstr "\"No chão! Agora!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Suspected felony!\""
-msgstr ""
+msgstr "\"Possível infração!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Suspected misdemeanor!\""
@@ -156748,15 +160168,15 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "\"Keep your hands up!\""
-msgstr ""
+msgstr "\"Mantenha as mãos pra cima!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Get on your knees!\""
-msgstr ""
+msgstr "\"De joelhos!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Hands in the air!\""
-msgstr ""
+msgstr "\"Mãos ao alto!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Wait for law enforcement officer!\""
@@ -156764,14 +160184,14 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "\"Remain where you are!\""
-msgstr ""
+msgstr "\"Permaneça onde está!\""
 
 #: lang/json/speech_from_json.py
 msgid "\"Police inbound.  Stay where you are!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156785,14 +160205,14 @@ msgstr ""
 #: lang/json/speech_from_json.py
 #, no-python-format
 msgid "\"Our food contains up to 95% real food.\""
-msgstr ""
+msgstr "\"Nossa comida contém até 95% de comida real.\""
 
 #: lang/json/speech_from_json.py
 msgid "\"FoodPlace: It's the Calories.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -156860,8 +160280,8 @@ msgid "You shouldn't have done that."
 msgstr "Você não deveria ter feito isso."
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
-msgstr "Vamos jogar ... roleta russa."
+msgid "Let's play… Russian roulette."
+msgstr "Vamos jogar... Roleta russa."
 
 #: lang/json/speech_from_json.py
 msgid "I hate you."
@@ -156872,8 +160292,8 @@ msgid "Go kill yourself!"
 msgstr "Vá se matar!"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
-msgstr "O Grande Irmão está observando você..."
+msgid "Big Brother is watching you…"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Die for me!"
@@ -156884,12 +160304,12 @@ msgid "Why won't you die?"
 msgstr "Por que você não morre?"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
-msgstr "Sangue ... Delicioso."
+msgid "Blood…  Delicious."
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
-msgstr "Vejo você no inferno!"
+msgid "See you… IN HELL!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "AAAIEEEEEEE!"
@@ -156904,8 +160324,8 @@ msgid "What did you do with my Mommy?"
 msgstr "O que você fez com a minha mãe?"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
-msgstr "Fique comigo para sempre!"
+msgid "Stay with me… forever!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Hey kids.  Want some candy?"
@@ -156929,11 +160349,11 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "YAP!"
-msgstr ""
+msgstr "YAP!"
 
 #: lang/json/speech_from_json.py
 msgid "WOOF!"
-msgstr ""
+msgstr "AU!"
 
 #: lang/json/speech_from_json.py
 msgid "\"Don't make me have ye walk the plank.\""
@@ -158351,9 +161771,13 @@ msgid "Wizard's Secret Basement Study"
 msgstr ""
 
 #: lang/json/start_location_from_json.py
-msgid "Candy Shop"
+msgid "Wizard's lake retreat"
 msgstr ""
 
+#: lang/json/start_location_from_json.py
+msgid "Candy Shop"
+msgstr "Loja de Doces"
+
 #: lang/json/start_location_from_json.py
 msgid "Robot Dispatch Center"
 msgstr "Centro de Despacho de Robôs"
@@ -158388,27 +161812,27 @@ msgstr "Loja de roupas"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Acolyte."
-msgstr ""
+msgstr "Acólito."
 
 #: lang/json/talk_topic_from_json.py
 msgid "You're back. Have you come to listen to the song?"
-msgstr ""
+msgstr "Você está de volta. Veio escutar a canção?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "You there. Quiet down. Can you hear it? The song?"
-msgstr ""
+msgstr "Você aí. Silêncio. Consegue escutar? A canção?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
-msgstr ""
+msgid "What?  What do you mean?  What song?"
+msgstr "O quê? Que quer dizer? Qual canção?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
-msgstr ""
+msgid "So about the songs…"
+msgstr "Então, sobre as canções..."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
 msgstr ""
 
@@ -158425,7 +161849,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158435,11 +161859,11 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
+msgid "What?  Singing bones?  What are you talking about?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158488,7 +161912,7 @@ msgid "I will bear that in mind"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158500,7 +161924,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
+msgid "End the world?  What?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158512,8 +161936,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158528,7 +161952,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
+msgid "I… thank you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158557,28 +161981,28 @@ msgid "That is all for now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgid "A song may yet be sung by you, should you wish to."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
+msgid "There is an additional song you could take on, if you'd like."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
+msgid ""
+"I know of certain bones that could be of use, if you'd like to know more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "A song may yet be sung by you, should you wish to."
+msgid "There are bones to etch, songs to sing. Wish to join me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There is an additional song you could take on, if you'd like."
+msgid "Do you wish to take on more songs?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid ""
-"I know of certain bones that could be of use, if you'd like to know more."
+msgid "Do you believe you can take on the burden of additional bones?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158602,7 +162026,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158610,23 +162034,23 @@ msgid "Not interested."
 msgstr "Não interessado."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
+msgid "Consider it done.  But I also wanted to ask…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Where should I start?"
-msgstr ""
+msgstr "Por onde eu devo começar?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Can you share some equipment to aid me in this?"
-msgstr ""
+msgstr "Você pode me dar algum equipamento para me ajudar com isto?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'm off then."
-msgstr ""
+msgstr "Já vou indo, então."
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158636,7 +162060,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
+msgid "I see.  Very well then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158654,16 +162078,16 @@ msgid "I am glad to hear it. Let's go then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
+msgid "Maybe some other time.  Changing the topic…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alright, but I have to go now."
-msgstr ""
+msgstr "Certo, mas agora eu tenho que ir."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -158680,17 +162104,17 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
 
@@ -158702,6 +162126,10 @@ msgstr ""
 msgid "Skip it, let's get going."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr ""
@@ -158759,13 +162187,25 @@ msgid "What about chit-chatting and your background?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -158789,7 +162229,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Good to know.  What orders can I give?"
-msgstr ""
+msgstr "Bom saber. Que ordens eu posso dar?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -158809,7 +162249,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158832,7 +162274,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158871,8 +162315,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
 
@@ -158880,6 +162324,10 @@ msgstr ""
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -158937,11 +162385,27 @@ msgid ""
 "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -158952,6 +162416,10 @@ msgstr ""
 msgid "Tell me more about the activities you can do now."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -159158,19 +162626,19 @@ msgid "Let's go."
 msgstr "Vamos lá."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
-msgstr "Altere suas regras de engajamento ..."
+msgid "Change your engagement rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
-msgstr "Mude suas regras de pontaria ..."
+msgid "Change your aiming rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
+msgid "Change your bionic power reserve rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
+msgid "Change your bionic power recharge rules…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159182,11 +162650,11 @@ msgid "Stick close to me, no matter what."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
+msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_false_text>"
+msgid "<ally_rule_follow_distance_2_true_text>"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159446,7 +162914,7 @@ msgid "Nah, I'm just kidding."
 msgstr "Estou brincando."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
+msgid "Please go to this location…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -159581,8 +163049,8 @@ msgstr ""
 "desde tudo isso, como você está lidando com tudo isso?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
-msgstr "Oh você sabe, não é ruim, não é ruim ..."
+msgid "Oh you know, not bad, not bad…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "<hallu_dont_trade>"
@@ -159669,14 +163137,14 @@ msgstr ""
 msgid "&Put hands up."
 msgstr "&amp;Ponha as mãos pra cima."
 
-#: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
-msgstr "* Solta sua arma."
-
 #: lang/json/talk_topic_from_json.py
 msgid "*drops_her_weapon."
 msgstr "* drops_her_weapon."
 
+#: lang/json/talk_topic_from_json.py
+msgid "*drops his weapon."
+msgstr "* Solta sua arma."
+
 #: lang/json/talk_topic_from_json.py
 msgid "Now get out of here"
 msgstr "Agora sai daqui"
@@ -159690,12 +163158,12 @@ msgid "Okay, I'm going."
 msgstr "Ok, eu vou"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
-msgstr "Sobre esse trabalho ..."
+msgid "About that job…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
-msgstr "Sobre um desses trabalhos ..."
+msgid "About one of those jobs…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "What's the matter?"
@@ -159714,19 +163182,19 @@ msgid "I don't have any more jobs for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
+msgid "I have another job for you.  Want to hear about it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
+msgid "I just have one job for you.  Want to hear about it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have another job for you.  Want to hear about it?"
+msgid "I have other jobs for you.  Want to hear about them?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I just have one job for you.  Want to hear about it?"
+msgid "I have more jobs for you.  Want to hear about them?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
@@ -159787,8 +163255,8 @@ msgid "Whatever.  Bye."
 msgstr "Tanto faz. Tchau."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
-msgstr "Me desculpe ... eu falhei."
+msgid "I'm sorry…  I failed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not yet."
@@ -159807,8 +163275,8 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "Não. Eu vou voltar para ele, tchau!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
-msgstr "Sim! Aqui está!"
+msgid "Yup!  Here it is!"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "We're here!"
@@ -160065,8 +163533,8 @@ msgid "Alright.  You can lead now."
 msgstr "Tudo bem. Você pode liderar agora."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
-msgstr "Boa. Algo mais..."
+msgid "Good.  Something else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alright, let's go."
@@ -160145,8 +163613,8 @@ msgid "I'd prefer to keep that to myself."
 msgstr "Eu prefiro manter isso para mim mesmo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
-msgstr "Compreendo..."
+msgid "I understand…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "You just asked me for stuff; ask later."
@@ -160169,8 +163637,8 @@ msgid "Because I'm your friend!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
-msgstr "Bem, eu estou te ajudando ..."
+msgid "Well, I am helping you out…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'll give it back!"
@@ -160217,15 +163685,15 @@ msgid "No, I'm keeping it. Try and take it off me, I dare you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
+msgid "Look, I really need this.  Please let me have it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
+msgid "What, this?  It's not the same one, you are mistaken."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
+msgid "I'm sorry.  Look, I already dropped it, okay?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160233,7 +163701,7 @@ msgid "Don't try and talk yourself out of this, drop it now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
+msgid "Okay, I'm dropping it…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160295,8 +163763,8 @@ msgid "Pleasure doing business!"
 msgstr "Prazer fazer negócios!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
-msgstr "Você pode estar vendo mais de mim ..."
+msgid "You might be seeing more of me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey again. *kzzz*"
@@ -160309,21 +163777,21 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
+msgid "Hey.  Let's chat for a second."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
+msgid "That's because I saved you.  Listen, I could use your help…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160335,7 +163803,7 @@ msgid "Come with me. We can help each other out."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
+msgid "We both go our separate ways.  Enjoy your freedom."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160352,8 +163820,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160374,7 +163842,7 @@ msgid "Get out of my sight."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160390,7 +163858,7 @@ msgid "Not if I kill you first!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
+msgid "I'm sorry!  I shouldn't have said that!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160431,18 +163899,37 @@ msgstr "Nada. Vamos voltar ao trabalho."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
-" O sistema de acampamento de facção é projetado para lhe dar maior controle "
-"sobre seus companheiros, permitindo que você os atribua às suas próprias "
-"missões. Essas missões podem variar de coleta e elaboração a eventuais "
-"patrulhas de combate."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
-msgstr "Continue."
+msgid "Give me an overview of how camps work."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Never mind, let's go back to talking about camps."
@@ -160462,92 +163949,120 @@ msgstr "Esqueça. Vamos lá."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
 msgstr ""
-" A comida é necessária ou produzida durante todas as missões. Missões que "
-"são por um período fixo de tempo exigirão que você pague com antecedência, "
-"enquanto as missões repetidas, como a coleta de lenha, são pagas após a "
-"conclusão. Não ter a comida necessária para pagar um acompanhante resultará "
-"em perda de reputação em toda a facção. O que pode levar a coisas muito "
-"ruins se ficar muito baixo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
-msgstr "Espere, repita o que você disse."
+msgid "Wait, we can talk with radios?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
 msgstr ""
-" Depois de escolher um site, você precisará encontrar ou fazer materiais "
-"para atualizar o acampamento para acessar novas missões. As primeiras novas "
-"missões estão concentradas na coleta de materiais para atualizar o "
-"acampamento, para que você não precise fazê-lo. Depois de dois ou três "
-"upgrades, você terá acesso ao <color_yellow> [Trabalho braçal] </color> "
-"missão que lhe permitirá ordenar os companheiros com a classificação de "
-"todos os itens em torno do seu acampamento em categorias. Upgrades "
-"posteriores permitem que você envie companheiros para recrutar novos "
-"membros, construir fortificações de mapa ou até mesmo realizar patrulhas de "
-"combate"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
 msgstr ""
-" Quando você atualiza sua primeira tenda até o fim, você desbloqueará a "
-"capacidade de construir expansões. As expansões permitem que você "
-"especialize cada acampamento criado, concentrando-se nos setores de que você"
-" precisa. UMA <color_light_green> [Fazenda] </color> é recomendado para "
-"jogadores que querem perseguir uma grande facção enquanto um "
-"<color_light_green> [Cozinha] </color> É melhor para jogadores que querem "
-"apenas a melhoria da qualidade de vida de ter um NPC fazendo toda a sua "
-"comida. UMA <color_light_green> [Garagem] </color> é útil para missões do "
-"tipo “chop shop”, que permitem que você troque veículos por grandes "
-"quantidades de peças e recursos. Todos esses recursos podem se transformar "
-"em equipamentos valiosos no <color_light_green> [Blacksmith Shop] </color> ."
-" Você pode construir uma expansão adicional a cada outro nível após o "
-"primeiro ser desbloqueado e quando um acampamento estiver cheio, você pode "
-"facilmente construir outro."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
-msgstr "Obrigado, vamos voltar a falar sobre acampamentos."
+msgid "Got it.  Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -160560,6 +164075,14 @@ msgid ""
 "6.  You can now set up faction camps in select buildings.  The list of available buildings is constantly growing, so you'll have to experiment."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr "Obrigado, vamos voltar a falar sobre acampamentos."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -160661,11 +164184,11 @@ msgid "Well, sure."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
+msgid "I'd… rather not."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160696,7 +164219,7 @@ msgid "Oh, but you already have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
+msgid "Yes… yes I have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160761,7 +164284,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
+msgid "Horrible.  Did you get any pictures yourself?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -160913,8 +164436,8 @@ msgid "This is a npc allies 1 test response."
 msgstr "Esta é uma resposta de teste de aliados npc 1."
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
-msgstr "Isso é um erro! npc aliados 2 resposta de teste."
+msgid "This an error!  npc allies 2 test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a npc engagement rule test response."
@@ -161114,8 +164637,8 @@ msgid "This is a u_has_items beer test response."
 msgstr "Esta é uma resposta do teste de cerveja u_has_items."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
-msgstr "Teste falha! Esta é uma resposta do teste u_has_items."
+msgid "Test failure!  This is a u_has_items test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a u_has_item_category books test response."
@@ -161126,7 +164649,7 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161214,7 +164737,7 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161270,11 +164793,7 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr ""
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
+msgid "Greetings…  Foodperson?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161316,7 +164835,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
+msgid "Ah…  Well, nice to meet you Foodperson."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161344,7 +164863,7 @@ msgid "Sure, whatever."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
+msgid "Ok…  I believe you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161440,15 +164959,15 @@ msgid "That sounds great!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
-msgstr "Ok..."
+msgid "Ok…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I need to think about it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
+msgid "Huh…  No thanks."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -161465,7 +164984,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr ""
 
@@ -162477,8 +165996,8 @@ msgid "Giant bees?  Tell me more."
 msgstr "Abelhas gigantes? Me diga mais."
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
-msgstr "Mas as abelhas não são geralmente agressivas ..."
+msgid "But bees aren't usually aggressive…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -162494,9 +166013,8 @@ msgstr ""
 " como um <swear> frango."
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
 msgstr ""
-" Mas as abelhas não são geralmente agressivas ... Você quer dizer vespas?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -163083,8 +166601,8 @@ msgid "No.  I can't.  Just, no."
 msgstr "Não, não posso. Apenas não."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
-msgstr "Desculpe ... eu vou deixar você ser."
+msgid "Sorry…  I'll let you be."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -163435,8 +166953,8 @@ msgstr ""
 "deixar o reino antes que ele caísse."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
-msgstr "OK..."
+msgid "Okay…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -163948,8 +167466,8 @@ msgid "What do you think happened?"
 msgstr "O que você acha que aconteceu?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
-msgstr "Isso soa um pouco louco ..."
+msgid "That does sound a little crazy…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -164019,8 +167537,8 @@ msgid "What happened to you after that?"
 msgstr "O que aconteceu com você depois disso?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
-msgstr "Não pode ser saudável abandonar o seu passado assim ..."
+msgid "It can't be healthy to abandon your past like that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -164629,8 +168147,8 @@ msgstr ""
 "também, mas suponho que tudo ficará claro a tempo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
-msgstr "Você quer dizer em um sentido religioso, ou ...?"
+msgid "Do you mean in a religious sense, or…?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165077,11 +168595,9 @@ msgstr "O que aconteceu com isso?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
 msgstr ""
-" Se eu consegui a coisa certa, você acha que seria capaz de gostar ... fazer"
-" ciência para isso?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165250,8 +168766,8 @@ msgstr ""
 "casamento."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
-msgstr "Oh, me desculpe..."
+msgid "Oh, I'm sorry…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -165597,7 +169113,7 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
+msgid "I'd like to ask you something else…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -165888,7 +169404,8 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166076,16 +169593,16 @@ msgid "What do you need done?"
 msgstr "O que você precisa fazer?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
-msgstr "Sobre a missão ..."
+msgid "About the mission…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
-msgstr "Sobre uma dessas missões ..."
+msgid "About one of those missions…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
-msgstr "Eu tenho que ir..."
+msgid "I've got to go…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166109,8 +169626,8 @@ msgstr ""
 "operações de recuperação."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
-msgstr "Parece um plano decente ..."
+msgid "Seems like a decent plan…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166137,10 +169654,8 @@ msgstr ""
 "dizem é que toda a pressão da água foi desviada para os níveis mais baixos."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
+msgid "Whatever they did it must have worked since we are still alive…"
 msgstr ""
-" O que quer que tenham feito, deve ter funcionado desde que ainda estamos "
-"vivos ..."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Marshal, I'm rather surprised to see you here."
@@ -166180,8 +169695,8 @@ msgstr ""
 "se tiver alguma dúvida."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
-msgstr "Vou tentar encontrar o seu comandante então ..."
+msgid "I'll try and find your commander then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166250,8 +169765,8 @@ msgstr ""
 " Ei, senhorita, você não acha que seria mais seguro se você ficasse comigo?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
-msgstr "Não se importe comigo ..."
+msgid "Don't mind me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166530,7 +170045,7 @@ msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr "Já te falei de papelão, amigo? Voc ~ e tem algum?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
+msgid "About that shopping list of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166598,8 +170113,8 @@ msgid "Would you like me to give you some cardboard?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
-msgstr "Eu acho que tenho que ir ..."
+msgid "I think I have to get going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166630,7 +170145,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
+msgid "…What were you saying before?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166650,7 +170165,7 @@ msgid "No."
 msgstr "Não."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166742,8 +170257,8 @@ msgid "I found a sample of alien fungus for you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
-msgstr "Ok te vejo por ai."
+msgid "Ok… see ya."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -166844,8 +170359,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166877,7 +170392,7 @@ msgid "You sound more optimistic than usual."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -166997,7 +170512,7 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167107,7 +170622,7 @@ msgstr ""
 "de fome. Ajudar uma pobre alma doentia?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167539,7 +171054,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167605,7 +171120,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "You know me, I gotta be me, right?"
-msgstr ""
+msgstr "Você me conhece, eu tenho que ser eu, certo?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alonso cannot help himself, in the face of someone so fine as you."
@@ -167795,7 +171310,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
+msgid "About that sourdough starter you had me looking for…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -167859,7 +171374,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'm sorry for your loss."
-msgstr ""
+msgstr "Sinto muito pela sua perda."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -168089,7 +171604,7 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
+msgid "Yes, yes I would… you monster."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -168285,6 +171800,10 @@ msgid ""
 "idea of trying it."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr "Continue."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -168539,7 +172058,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -169069,7 +172588,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr ""
 
@@ -169767,7 +173286,7 @@ msgid "Are you looking to buy anything else?"
 msgstr "Você está querendo comprar mais alguma coisa?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
+msgid "Very well… let's talk about something else."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -170113,8 +173632,8 @@ msgid "Have you seen anyone who might be hiding something?"
 msgstr "Você já viu alguém que possa estar escondendo alguma coisa?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
-msgstr "Tchau..."
+msgid "Bye…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170129,16 +173648,16 @@ msgid "Keep your head down and stay out of my way."
 msgstr "Mantenha a cabeça abaixada e fique fora do meu caminho."
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
-msgstr "ESTÁ BEM..."
+msgid "OK…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like what?"
 msgstr "Como o quê?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
-msgstr "Não tenho certeza..."
+msgid "I'm not sure…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like they could be working for someone else?"
@@ -170157,8 +173676,8 @@ msgid "Got something to hide?"
 msgstr "Tem algo a esconder?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
-msgstr "Desculpe, eu não quis te ofender ..."
+msgid "Sorry, I didn't mean to offend you…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170212,7 +173731,7 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr "Senhora, você realmente não deveria estar viajando por aí."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
+msgid "I heard this place was a refugee center…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -170236,8 +173755,8 @@ msgid "Can I do anything for the center?"
 msgstr "Posso fazer alguma coisa pelo centro?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
-msgstr "Eu achei que você poderia estar procurando por alguma ajuda ..."
+msgid "I figured you might be looking for some help…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, I'd better be going.  Bye."
@@ -170292,7 +173811,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
 msgstr ""
 
@@ -170352,8 +173871,8 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr "Desculpe, não é um risco que estamos dispostos a aceitar agora."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
-msgstr "Bem..."
+msgid "Fine…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170368,8 +173887,8 @@ msgstr ""
 "prestes a mutar mais do que apenas o cabelo dele."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
-msgstr "Tudo bem ... * coughupyourscough *"
+msgid "Fine… *coughupyourscough*"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170403,8 +173922,8 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[STR 11] Eu soco as coisas na cara muito bem!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
-msgstr "Eu acho que vou procurar em outro lugar ..."
+msgid "I guess I'll look somewhere else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170430,8 +173949,8 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr "Ouvi falar de algo melhor que o estranho cachê de armas?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
-msgstr "Estava esperando por algo mais ..."
+msgid "Was hoping for something more…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170533,8 +174052,8 @@ msgid "So what are you doing right now?"
 msgstr "Então o que você está fazendo agora?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
-msgstr "Deixa pra lá..."
+msgid "Never mind…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170564,8 +174083,8 @@ msgstr ""
 " sobreviver."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
-msgstr "Boa sorte com isso..."
+msgid "Good luck with that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170613,8 +174132,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
-msgstr "É uma merda..."
+msgid "Sucks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170633,8 +174152,8 @@ msgstr ""
 "construída com o material."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
-msgstr "Bem então..."
+msgid "Well, then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170735,8 +174254,8 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr "Huh, pensei que eu cheirava alguém novo. Posso ajudar?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
-msgstr "Você ... me cheirou?"
+msgid "You… smelled me?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Got anything for sale?"
@@ -170795,8 +174314,8 @@ msgstr ""
 "jantar!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
-msgstr "Ótimo, agora minha boca está molhando ..."
+msgid "Great, now my mouth is watering…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170827,7 +174346,7 @@ msgid ""
 "The Jabberwock is real, don't listen to what anybody else says.  If you see "
 "it, RUN."
 msgstr ""
-" O Jabberwock é real, não ouça o que os outros dizem. Se você ver, corra."
+"O Jaguadarte é real, não ouça o que os outros dizem. Se você ver um, CORRA."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170924,8 +174443,8 @@ msgstr ""
 "campeões."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
-msgstr "Hmmm ..."
+msgid "Hmmm…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -170988,8 +174507,8 @@ msgstr ""
 "mundo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
-msgstr "Eu não fiz nada de errado ..."
+msgid "I haven't done anything wrong…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any tips for surviving?"
@@ -171158,7 +174677,7 @@ msgid "Something to say?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
+msgid "I charge hourly, so be quick…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -171271,7 +174790,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
+msgid "I guess I could help with that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -171382,8 +174901,8 @@ msgid "[$10] I'll get a haircut"
 msgstr "[$ 10] Eu vou cortar o cabelo"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
-msgstr "Talvez outra hora..."
+msgid "Maybe another time…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171402,8 +174921,8 @@ msgid "Stand still while I get my clippers..."
 msgstr "Fique parado enquanto eu pego minha tesoura ..."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
-msgstr "Obrigado..."
+msgid "Thanks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Want a drink?"
@@ -171422,8 +174941,8 @@ msgid "What do you have on tap?"
 msgstr "O que você tem na torneira?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
-msgstr "Eu vou indo ..."
+msgid "I'll be going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171482,8 +175001,8 @@ msgstr ""
 "ele sobre o que precisa ser feito."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
-msgstr "Eu vou falar com ele então ..."
+msgid "I'll talk to him then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171503,8 +175022,8 @@ msgid "I hope you are here to do business."
 msgstr "Espero que você esteja aqui para fazer negócios."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
-msgstr "Estou interessado em investir em agricultura ..."
+msgid "I'm interested in investing in agriculture…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171534,12 +175053,12 @@ msgid "I imagine we might be able to work something out."
 msgstr "Eu imagino que podemos ser capazes de trabalhar em algo."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
-msgstr "Eu queria saber se você poderia instalar um implante cibernético ..."
+msgid "I was wondering if you could install a cybernetic implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
-msgstr "Preciso de ajuda para remover um implante ..."
+msgid "I need help removing an implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'd like to hire your services."
@@ -171588,8 +175107,8 @@ msgstr ""
 "colheita seja um sucesso."
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
-msgstr "Poderia ser pior..."
+msgid "It could be worse…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -171600,8 +175119,8 @@ msgstr ""
 " emprego, procure o capataz ou supervisor de colheita."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
-msgstr "Eu vou falar com eles então ..."
+msgid "I'll talk with them then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Can I help you, marshal?"
@@ -171681,8 +175200,8 @@ msgstr ""
 "e mortos-vivos."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
-msgstr "Esperançosamente sair daqui valeu a pena ..."
+msgid "Hopefully moving out here was worth it…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -172248,12 +175767,12 @@ msgstr "Mordida da víbora"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
+msgid "You lash out at %s with a Viper Bite"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
+msgid "<npcname> lash out at %s with a Viper Bite"
 msgstr ""
 
 #: lang/json/technique_from_json.py
@@ -172262,18 +175781,28 @@ msgstr "Viper Strike"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
+msgid "You hit %s with a spectacular Viper Strike"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr "Víbora Writhe"
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr ""
@@ -172316,6 +175845,34 @@ msgstr ""
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr "Língua do sapo"
@@ -174055,152 +177612,177 @@ msgid "<npcname> double-handed palm strikes %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
-msgstr "Finge bêbado"
+msgid "Tiger Palm"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble and leer at %s"
+msgid "You land a heavy tiger palm on %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles and leers at %s"
+msgid "<npcname> lands a heavy tiger palm on %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk counter"
-msgstr "Contador bêbado"
+msgid "Tiger Takedown"
+msgstr "Tiger Takedown"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
+msgid "You slam %s to the ground"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
+msgid "<npcname> slams %s to the ground"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Tiger Takedown"
-msgstr "Tiger Takedown"
+msgid "Straight Punch"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
+msgid "You deliver a vertical straight punch to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> grabs and grounds %s"
+msgid "<npcname> delivers a vertical straight punch to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "slow strike"
-msgstr "greve lenta"
+msgid "Straight Punch (Knockback)"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You slowly strike %s"
+msgid "You force %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
+msgid "<npcname> forces %s back with a vertical straight punch"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
-msgstr "greve de fase"
+msgid "L-hook"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
+msgid "You deliver a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
+msgid "<npcname> delivers a solid L-hook to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Chain Punch"
+msgid "L-hook (Knockback)"
 msgstr ""
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
+#, python-format
+msgid "You knock %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
+msgid "<npcname> knocks %s back with a solid L-hook"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
+msgid "Your attack misses %s but you don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
+#, python-format
+msgid "<npcname>'s attack misses %s but they don't let up"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
+msgid "Receive and Counter"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "ask the way"
+#, python-format
+msgid "You receive %s's gift of violence, and return it in kind"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You miss but keep striking at %s"
+msgid "<npcname> receives %s's attack, and counters"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Drunken Feint"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
+msgid "You stumble and leer at %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "White Crane stumble"
+#, python-format
+msgid "<npcname> stumbles and leers at %s"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Drunk Counter"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
+msgid "You lurch, and your wild swing hits %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
+msgid "<npcname> lurches, and hits %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Receive and Counter"
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You receive %s's gift of violence, and return it in kind"
+msgid "The %s tries to grab <npcname>, but they stumble away!"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "slow strike"
+msgstr "greve lenta"
+
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> receives %s's attack, and counters"
+msgid "You slowly strike %s"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> slowly strikes %s"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
+msgstr "greve de fase"
+
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
+msgid "You phase-strike %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
+msgid "<npcname> phase-strikes %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
@@ -174839,7 +178421,7 @@ msgstr ""
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr ""
 
@@ -174850,8 +178432,8 @@ msgstr ""
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -174861,7 +178443,7 @@ msgstr ""
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr ""
 
@@ -176077,7 +179659,7 @@ msgstr ""
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
 msgstr ""
 
@@ -176412,7 +179994,7 @@ msgstr ""
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr ""
 
@@ -176761,10 +180343,10 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
 
 #. ~ Description for juniper tree
@@ -176916,7 +180498,7 @@ msgstr ""
 
 #: lang/json/terrain_from_json.py
 msgid "pine tree"
-msgstr "Pinheiro"
+msgstr "pinheiro"
 
 #. ~ Description for pine tree
 #: lang/json/terrain_from_json.py
@@ -177788,10 +181370,11 @@ msgstr "ATM"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -177895,8 +181478,8 @@ msgstr "centrífuga"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -178512,7 +182095,7 @@ msgstr ""
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
 msgstr ""
@@ -178524,7 +182107,7 @@ msgstr ""
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
 msgstr ""
@@ -178618,6 +182201,13 @@ msgid ""
 " were still running."
 msgstr ""
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr ""
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "caixa de areia"
@@ -178684,7 +182274,7 @@ msgstr ""
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr ""
 
@@ -178696,7 +182286,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
 msgstr ""
 
@@ -179586,7 +183176,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr ""
 
@@ -180915,13 +184505,8 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
-"Você acabou de ativar uma granada! Você provavelmente vai querer jogar ela. "
-"Para jogar um item, aperte 't' e selecione o objeto que quer jogar. O "
-"alcance máximo depende da sua força e do peso e tamanho do objeto. Arremesso"
-" não é muito bom na maioria das situações de combate, mas se você tiver "
-"algum poder de fogo..."
 
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
@@ -181026,14 +184611,10 @@ msgstr ""
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr ""
-" ~ é um símbolo do terreno que indica a água. De uma fonte de água como "
-"essa, você pode preencher qualquer contêiner que possa ter. Examine a água "
-"(&#39;e&#39;) e pressione &#39;c&#39; para encher um recipiente, em seguida,"
-" selecione um recipiente à prova d&#39;água para colocar a água."
 
 #: lang/json/vehicle_from_json.py
 msgid "work light"
@@ -181379,6 +184960,10 @@ msgstr ""
 msgid "Rail Motorcycle"
 msgstr ""
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr ""
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "Caminhão"
@@ -182285,7 +185870,7 @@ msgstr ""
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
 msgstr ""
 
 #. ~ Description for shredder
@@ -182795,8 +186380,8 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr ""
 
 #. ~ Description for autoclave
@@ -182994,7 +186579,7 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
 msgstr ""
 
@@ -183635,6 +187220,14 @@ msgstr ""
 msgid "rail wheel (steerable)"
 msgstr ""
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr ""
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "tambor de rolo"
@@ -185411,6 +189004,10 @@ msgstr "Vitamina B12"
 msgid "Vitamin C"
 msgstr "Vitamina C"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr ""
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr "pressione"
@@ -185943,7 +189540,7 @@ msgstr "Você insere um cartucho dentro de %s."
 msgid "You refill the %s."
 msgstr ""
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "Não há nada para iluminar lá."
 
@@ -185961,6 +189558,16 @@ msgstr ""
 " Não há luz solar suficiente para iniciar um incêndio agora. Você para de "
 "tentar."
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr ""
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "Você aprende %s."
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -185971,11 +189578,6 @@ msgstr "Você termina de treinar %s para o nível %d."
 msgid "You get some training in %s."
 msgstr ""
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "Você aprende %s."
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr ""
@@ -186094,14 +189696,21 @@ msgstr ""
 msgid "Your %s is already fully repaired."
 msgstr ""
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
 msgstr ""
 
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr "Você descongela e esquenta a comida."
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr "Você aquece a comida."
+
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
+msgid "You are currently unable to mend the %s."
 msgstr ""
 
 #: src/activity_handlers.cpp
@@ -186404,7 +190013,7 @@ msgstr "Você termina de perfurar."
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr "hsh!"
 
@@ -187025,12 +190634,12 @@ msgstr ""
 " Redução da taxa de movimento. Depressão. Sistema imunológico fraco. Desejos freqüentes."
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
-msgstr "Percepção - 1; Inteligência - 1; Desejos freqüentes."
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
-msgstr "Percepção - 2; Inteligência - 2; Desejos freqüentes."
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
+msgstr ""
 
 #: src/addiction.cpp
 msgid ""
@@ -187216,38 +190825,6 @@ msgstr "src amt peso vol"
 msgid "Name (charges)"
 msgstr "Nome (cargas)"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "Não arrastando nenhum veículo!"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "Nenhum veículo arrastado!"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "Recipiente inválido!"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "Todos os 9 quadrados"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr "<color_white_red> FOGO </color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr "PERIGO"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr "ARMADILHA"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr "AGUA"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -187370,7 +190947,39 @@ msgstr ""
 msgid "The destination is already full!"
 msgstr "O destino já está cheio!"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "Não arrastando nenhum veículo!"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "Nenhum veículo arrastado!"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "Recipiente inválido!"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "Todos os 9 quadrados"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr "<color_white_red> FOGO </color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr "PERIGO"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr "ARMADILHA"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr "AGUA"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "Recipiente inválido"
 
@@ -187496,6 +191105,14 @@ msgstr "Bater:"
 msgid "Cut:"
 msgstr "Cortar:"
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr ""
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr ""
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "De Meio Ambiente:"
@@ -188182,13 +191799,13 @@ msgstr ""
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
+"  Seeing this is a bug!"
 msgstr ""
 
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
 msgstr ""
 
@@ -188215,7 +191832,7 @@ msgstr ""
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr ""
 
 #: src/artifact.cpp
@@ -188978,6 +192595,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr ""
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr ""
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr ""
@@ -189113,12 +192735,14 @@ msgid "The %s must be attached to a gun, it can not be fired separately."
 msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
-msgstr "Você não pode mais disparar."
+#, c-format
+msgid "You can no longer fire your %s."
+msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "Você precisa de um braço livre para dirigir!"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -189126,8 +192750,9 @@ msgid "You need two free hands to fire your %s."
 msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "Você precisa recarregar!"
+#, c-format
+msgid "Your %s is empty!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -189138,16 +192763,18 @@ msgstr ""
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
+"charges to fire the %s!"
 msgstr ""
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
 msgstr ""
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
 msgstr ""
 
@@ -189382,6 +193009,16 @@ msgstr ""
 msgid "Your %s automatically turns off."
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "Você muda de idéia e desliga."
@@ -189499,10 +193136,6 @@ msgstr "Resultados do teste de sangue"
 msgid "No effects."
 msgstr "Sem efeitos."
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr "Não havia umidade suficiente no ar para tirar água!"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr "Sua catraca de torção trava nas juntas."
@@ -189515,10 +193148,6 @@ msgstr ""
 msgid "Start a fire where?"
 msgstr "Comece uma fogueira onde?"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "Você não pode acender um fogo lá."
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -189695,6 +193324,20 @@ msgstr ""
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr ""
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr ""
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -189723,6 +193366,21 @@ msgstr ""
 msgid "You feel your throat open up and air filling your lungs!"
 msgstr "Você sente sua garganta se abrir e ar enchendo seus pulmões!"
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr ""
@@ -190511,8 +194169,12 @@ msgstr "Pesquisa de inclinação e medição de carga"
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
-msgstr "você"
+msgid "You"
+msgstr "Você"
+
+#: src/character.cpp
+msgid "Your"
+msgstr ""
 
 #: src/character.cpp
 msgid "your"
@@ -190747,6 +194409,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr ""
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr "Não pode colocar itens aqui!"
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr "<npcname> não pode colocar itens aqui!"
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -190770,10 +194440,20 @@ msgstr ""
 msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr ""
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr "Líquido do seu inventário vazou no chão."
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr ""
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "Morrendo de sede"
@@ -190843,6 +194523,78 @@ msgstr "Morto de Cansado"
 msgid "Your %s bionic shorts out!"
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "%s sofrerá congelamento nas próximas horas."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "%s sofrerá congelamento em até uma hora!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr ""
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr ""
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr ""
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr ""
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr ""
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr ""
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr ""
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "O vento está fazendo você sentir seu/sua %s um tanto gelado(a)."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr ""
+"O vento está muito forte, você  deveria encontrar alguma roupa mais "
+"resistente ao vento para %s."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr ""
+"Sua roupa não está fornecendo proteção suficiente contra o vendo para %s!"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "Braço Esquerdo"
@@ -191007,8 +194759,8 @@ msgstr ""
 msgid "Big"
 msgstr ""
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "Normal"
 
@@ -191112,6 +194864,32 @@ msgstr ""
 msgid "EXTRA_EXERCISE"
 msgstr ""
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr "Seu corpo se esforça sob o peso!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "Você tosse fortemente."
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "uma tosse seca."
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr ""
@@ -191291,6 +195069,20 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr "Hibernação introduzida."
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr ""
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr ""
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "Sem estilo"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "Nenhum recolhimento automático"
@@ -191335,277 +195127,6 @@ msgid ""
 "this area."
 msgstr ""
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr "Roubo: Não sorteado"
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr ""
-" Lugar para soltar saque não sorteado. Você pode usar \\ 'ordenar out loot "
-"\\' zone-action para ordenar itens dentro. Pode se sobrepor com zonas Loot "
-"de diferentes tipos."
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr "Roubo: Comida"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr ""
-" Destino para comestíveis. Se uma zona alimentar mais específica não for "
-"definida, todos os alimentos são movidos para cá."
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr "Saque: P. Food"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr ""
-" Destino para comestíveis perecíveis. Inclui bebidas perecíveis se essa zona"
-" não for especificada."
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr "Roubo: Beba"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr ""
-" Destino para bebidas. Inclui bebidas perecíveis se essa zona não for "
-"especificada."
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr "Saque: P. Drink"
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr "Destino para bebidas perecíveis."
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr "Roubo: Armas"
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr "Destino de armas, arcos e armas similares."
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr "Roubo: Revistas"
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr "Destino para revistas de armas."
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr "Roubo: Munição"
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr "Destino para munição."
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr "Saque: Armas"
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr "Destino para armas brancas."
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr "Roubo: Ferramentas"
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr "Destino para ferramentas."
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr "Roubo: Vestuário"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr ""
-" Destino para roupas. Inclui roupas imundas se essa zona não for "
-"especificada."
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr "Saque: F. Roupa"
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr "Destino para roupas imundas."
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr "Roubo: Drogas"
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr "Destino de drogas e outros itens médicos."
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr "Roubo: Livros"
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr "Destino para livros e revistas."
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr "Roubo: Mods"
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr "Destino para modificações de arma de fogo e itens semelhantes."
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr "Roubo: Mutagens"
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr "Destino para mutagênicos, soros e purificadores."
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr "Roubo: Biônica"
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr "Destino para Módulos Compact Bionics, também conhecidos como CBMs."
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr "Saque: V. Parts"
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr "Destino para peças de veículos."
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr "Roubo: Outro"
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr "Destino para outros itens diversos."
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr "Roubo: Combustível"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr ""
-" Destino para gasolina, diesel, óleo de lâmpada e outras substâncias usadas "
-"como combustível."
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr "Saque: Sementes"
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr "Destino para sementes, caules e itens semelhantes."
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr "Roubo: Químico"
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr "Destino para produtos químicos."
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr "Saque: S. Parts"
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr "Destino para peças de reposição."
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr "Roubo: Artefatos"
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr "Destino para artefatos"
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr "Roubo: Armadura"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr ""
-" Destino para armadura. Inclui armaduras imundas se essa zona não for "
-"especificada."
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr "Saque: F. Armor"
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr "Destino para armadura imunda."
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr "Roubo: Madeira"
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr "Destino para lenha e itens que podem ser usados como tal."
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr ""
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr "Roubo: Ignorar"
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr ""
-" Os itens dentro desta zona são ignorados pela \\ 'ordenar saquear \\' ação "
-"da zona."
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr ""
@@ -191613,7 +195134,7 @@ msgstr ""
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
 msgstr ""
 
@@ -191673,6 +195194,16 @@ msgstr ""
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr ""
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr ""
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr ""
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
 msgstr ""
@@ -192990,24 +196521,6 @@ msgstr ""
 msgid "<npcname> looks better after eating the %s."
 msgstr ""
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "Seu armazenamento interno de energia está totalmente ligado."
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr "<npcname> O armazenamento interno de energia é totalmente alimentado."
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr ""
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr ""
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr "Isso é muito plutônio. Tem certeza que quer tanto assim?"
@@ -194012,6 +197525,10 @@ msgstr ""
 msgid "Toggle display temperature"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr ""
@@ -194052,6 +197569,10 @@ msgstr ""
 msgid "Print faction info to console"
 msgstr ""
 
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Test weather"
 msgstr ""
@@ -194331,6 +197852,10 @@ msgstr "Janela de status [@]"
 msgid "t[e]leport"
 msgstr "t[e]leporte"
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr "Editar [M]issões (AVISO: Instável!)"
@@ -194914,10 +198439,12 @@ msgstr ""
 msgid "Spell"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
 msgstr ""
@@ -196950,6 +200477,14 @@ msgstr "Gerente do acampamento"
 msgid "%s has abandoned the camp."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr "Expansão"
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr "Recuperar Aliado"
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -196965,59 +200500,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr "Distribuir comida"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr "Redefinir pontos de classificação"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -197052,23 +200534,6 @@ msgid ""
 "Positions: %d/1\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -197231,14 +200696,6 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr "Expansão"
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr "Recuperar Aliado"
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -197320,6 +200777,61 @@ msgid ""
 "Positions: 0/1\n"
 msgstr ""
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr "Distribuir comida"
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -197330,6 +200842,10 @@ msgid ""
 "Companions must be on missions for at least 24 hours before emergency recall becomes available."
 msgstr ""
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr ""
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr ""
@@ -197366,10 +200882,6 @@ msgstr ""
 msgid "departs to search for recruits…"
 msgstr ""
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr ""
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr ""
@@ -197654,7 +201166,7 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
 
@@ -197827,8 +201339,7 @@ msgstr ""
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
+"create a camp food zone, and a camp storage zone."
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -197858,17 +201369,17 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
+msgid ">Travel:  %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
+msgid ">Working: %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
+msgid "Total:    %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -197921,7 +201432,7 @@ msgstr "Precisa de arar:"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
+msgid "Name:     %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -197930,7 +201441,7 @@ msgstr "---- Motores ---- \n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
+msgid "Engine:   %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -197940,7 +201451,7 @@ msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
+msgid ">Fuel:    %s\n"
 msgstr ""
 
 #: src/faction_camp.cpp
@@ -198013,7 +201524,7 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid "The jabberwock grabbed %s by the arm from behind and began to scream."
-msgstr ""
+msgstr "o jaguadarte agarrou %s pelo braço por trás e começou a gritar."
 
 #: src/faction_camp.cpp
 #, c-format
@@ -199409,7 +202920,7 @@ msgstr ""
 msgid "The %s is already full!"
 msgstr ""
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr ""
@@ -199497,6 +203008,19 @@ msgstr "Realmente pisar em %s?"
 msgid "Your %s refuses to move over that ledge!"
 msgstr ""
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr ""
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr ""
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "Não é possível encontrar o objeto agarrado."
@@ -199690,6 +203214,16 @@ msgstr ""
 msgid "There's stuff in the way."
 msgstr "Tem coisas no caminho."
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr ""
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -200015,7 +203549,7 @@ msgstr ""
 "caracteres estranhos (por exemplo, caixas vazias ou pontos de interrogação)."
 " Você foi avisado."
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr "De repente você sente uma dor aguda sem motivo."
 
@@ -200299,10 +203833,6 @@ msgstr "FRESCURA"
 msgid "SPOILS IN"
 msgstr "SPOILS EM"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "Bateria"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "Reator"
@@ -200327,10 +203857,6 @@ msgstr "Não pode beber líquidos derramados"
 msgid "Your biology is not compatible with that item."
 msgstr ""
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr "Você está totalmente carregado"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -200423,10 +203949,6 @@ msgid_plural "Needs at least %d charges"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr ""
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "Usar item"
@@ -200641,11 +204163,6 @@ msgstr ""
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr ""
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr ""
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -201770,8 +205287,8 @@ msgid "Purchase cash card?"
 msgstr "Compre cartão de dinheiro?"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
-msgstr "Você precisa de US $ 1,00 em sua conta para comprar um cartão."
+msgid "You need $10.00 in your account to purchase a card."
+msgstr ""
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -201813,7 +205330,7 @@ msgstr ""
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
 msgstr ""
 
 #: src/iexamine.cpp
@@ -202095,7 +205612,8 @@ msgid "The gun safe stumps your efforts to pick it."
 msgstr "A arma segura seus esforços para pegá-lo."
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
 msgstr ""
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
@@ -202104,6 +205622,16 @@ msgstr ""
 msgid "You attempt to pry open the %1$s using your %2$s…"
 msgstr ""
 
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
+msgstr ""
+
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
 msgstr ""
@@ -202571,6 +206099,10 @@ msgstr ""
 msgid "You weren't able to start a fire."
 msgstr ""
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "Você não pode acender um fogo lá."
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -203270,6 +206802,17 @@ msgstr ""
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr ""
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr ""
@@ -203806,6 +207349,10 @@ msgstr "Conexões de overmap"
 msgid "Overmap specials"
 msgstr "Overmap specials"
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "Overmap locais"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr "Protótipos de veículos"
@@ -203862,6 +207409,10 @@ msgstr "Listas de colheita"
 msgid "Anatomies"
 msgstr "Anatomias"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "Mutações"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "Tileset"
@@ -203906,18 +207457,10 @@ msgstr "Profissões"
 msgid "Scenarios"
 msgstr "Cenários"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "Mutações"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "Categorias de mutação"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "Overmap locais"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr ""
@@ -204283,14 +207826,6 @@ msgstr ""
 msgid "Page %d/%d"
 msgstr ""
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "ITENS VESTADOS"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "ARMA REALIZADA"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -204737,11 +208272,9 @@ msgstr ""
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
 msgstr ""
-" Esta comida começou a <bad> podridão </bad>. <info> Comendo </info> seria "
-"um <bad> muito má ideia </bad> ."
 
 #: src/item.cpp
 #, c-format
@@ -204812,11 +208345,6 @@ msgstr ""
 msgid "This ammo <neutral>starts fires</neutral>."
 msgstr ""
 
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr ""
-
 #: src/item.cpp
 msgid "Skill used: "
 msgstr "Habilidade usada:"
@@ -204959,8 +208487,9 @@ msgid "Used on: "
 msgstr "Usado em:"
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "Localização:"
+#, c-format
+msgid "Location: %s"
+msgstr ""
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -205483,42 +209012,45 @@ msgid ""
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
+msgid "<info>can be upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
+msgid "<info>can be downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
+msgid "<bad>can not be downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
+msgid "<bad>can not be upsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
+#, c-format
+msgid "* This clothing %s."
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
+msgid " and <info>upsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
+msgid " and <info>downsized</info>"
 msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
+msgid " but <bad>not downsized</bad>"
 msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
+msgid " but <bad>not upsized</bad>"
+msgstr ""
+
+#: src/item.cpp
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
 msgstr ""
 
 #: src/item.cpp
@@ -205618,6 +209150,20 @@ msgstr ""
 msgid "This bionic is installed in the following body part(s):"
 msgstr "Este biônico está instalado nas seguintes partes do corpo:"
 
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr ""
+
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr ""
+
 #: src/item.cpp
 msgid "<bold>Encumbrance:</bold> "
 msgstr ""
@@ -205742,6 +209288,11 @@ msgstr "Você poderia usá-lo para criar várias outras coisas."
 msgid "You could use it to craft: %s"
 msgstr ""
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr ""
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -206944,8 +210495,8 @@ msgid "You do not have that item!"
 msgstr "Você não tem esse item!"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
-msgstr "Qual sinal deve ativar o item ?:"
+msgid "Which signal should activate the item?"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "\"Blue\""
@@ -207192,16 +210743,6 @@ msgstr "KXSHHHHRRCRKLKKK!"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr "A raquete infernal morre quando o emissor de ruído se desliga."
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr ""
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr ""
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr "Você tira o poste da cerca."
@@ -207625,18 +211166,27 @@ msgid "Scan the ground"
 msgstr "Escaneie o chão"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "Analise-se"
+msgid "Scan yourself or other person"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "Ativar a varredura contínua"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr ""
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -207704,6 +211254,10 @@ msgstr "Tick!"
 msgid "You've already released the handle, try throwing it instead."
 msgstr "Você já liberou a alça, tente jogá-la em seu lugar."
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "Você precisa de uma fonte de fogo!"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr "Você acende a flecha!"
@@ -208200,10 +211754,6 @@ msgstr "Você move o esfregão, sem saber se está fazendo algum bem."
 msgid "You mop up the spill."
 msgstr "Você enxuga o vazamento."
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr ""
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr "O tecido do espaço parece decair."
@@ -208265,17 +211815,9 @@ msgid "You don't have appropriate food to heat up."
 msgstr "Você não tem comida apropriada para aquecer."
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgid "You start heating up the food."
 msgstr ""
 
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
-msgstr "Você descongela e esquenta a comida."
-
-#: src/iuse.cpp
-msgid "You heat up the food."
-msgstr "Você aquece a comida."
-
 #: src/iuse.cpp
 msgid "There is no fire around, use your integrated toolset instead?"
 msgstr "Não há fogo por perto, use seu conjunto de ferramentas integrado?"
@@ -209276,8 +212818,8 @@ msgid "Your %s is too heavy or bulky for this RC car."
 msgstr ""
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
-msgstr "Você desarmou seu carro RC"
+msgid "You disarmed your RC car."
+msgstr ""
 
 #. ~Sound of a radio controlled car moving around
 #: src/iuse.cpp
@@ -209289,12 +212831,12 @@ msgid "What to do with activated RC car?"
 msgstr "O que fazer com o carro RC ativado?"
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
-msgstr "Você desligou seu carro RC"
+msgid "You turned off your RC car."
+msgstr ""
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
-msgstr "bip."
+#: src/iuse.cpp
+msgid "beep"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Take control of RC car"
@@ -209331,7 +212873,14 @@ msgstr "Você assume o controle do carro RC."
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
+msgstr ""
+
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
 "sending the signal."
 msgstr ""
 
@@ -210198,7 +213747,7 @@ msgstr "Já existe móveis naquele local."
 #: src/iuse_actor.cpp
 #, c-format
 msgid "There isn't anything new on the %s."
-msgstr ""
+msgstr "Não há nada de novo no %s."
 
 #: src/iuse_actor.cpp
 #, c-format
@@ -210271,17 +213820,17 @@ msgstr ""
 #: src/iuse_actor.cpp
 #, c-format
 msgid "Try disassembling the %s instead."
-msgstr ""
+msgstr "Tente desmontar %s ao invés disso."
 
 #: src/iuse_actor.cpp
 #, c-format
 msgid "The %s is made of material that cannot be cut up."
-msgstr ""
+msgstr "O %s é feito de material que não pode ser cortado."
 
 #: src/iuse_actor.cpp
 #, c-format
 msgid "Please empty the %s before cutting it up."
-msgstr ""
+msgstr "Por favor esvazie o %santes de cortá-lo."
 
 #: src/iuse_actor.cpp
 #, c-format
@@ -210342,7 +213891,7 @@ msgstr "É uma nota"
 
 #: src/iuse_actor.cpp
 msgid "(To delete, clear the text and confirm)\n"
-msgstr ""
+msgstr "(Para excluir, limpe o texto e confirme)\n"
 
 #. ~ %1$s: gerund (e.g. carved), %2$s: item name
 #: src/iuse_actor.cpp
@@ -210359,7 +213908,7 @@ msgstr ""
 #: src/iuse_actor.cpp
 #, c-format
 msgid "%s on what?"
-msgstr ""
+msgstr "%s no quê?"
 
 #: src/iuse_actor.cpp
 msgid "The ground"
@@ -210376,7 +213925,7 @@ msgstr "Inscrever qual item?"
 #: src/iuse_actor.cpp
 #, c-format
 msgid "You try to bend your %s, but fail."
-msgstr ""
+msgstr "Você tenta dobrar seu %s, mas não consegue."
 
 #: src/iuse_actor.cpp
 msgid "You cauterize yourself."
@@ -210392,7 +213941,7 @@ msgstr "Coça um pouco."
 
 #: src/iuse_actor.cpp
 msgid "You cannot cauterize while mounted."
-msgstr ""
+msgstr "Você não pode cauterizar enquanto está montado."
 
 #: src/iuse_actor.cpp
 msgid ""
@@ -210405,7 +213954,7 @@ msgstr ""
 #: src/iuse_actor.cpp
 #, c-format
 msgid "You need at least %d charges to cauterize wounds."
-msgstr ""
+msgstr "Você precisa de ao menos %d cargas para cauterizar ferimentos."
 
 #: src/iuse_actor.cpp
 msgid "No suitable corpses"
@@ -210447,11 +213996,11 @@ msgstr "Hsss"
 
 #: src/iuse_actor.cpp
 msgid "You can't play music while mounted."
-msgstr ""
+msgstr "Você não pode tocar música enquanto estiver montado."
 
 #: src/iuse_actor.cpp
 msgid "<npcname> can't play music while mounted."
-msgstr ""
+msgstr "<npcname> não pode tocar música enquanto estiver montado."
 
 #: src/iuse_actor.cpp
 msgid "You can't play music underwater"
@@ -210538,51 +214087,51 @@ msgstr ""
 
 #: src/iuse_actor.cpp
 msgid " (Max)"
-msgstr ""
+msgstr " (Máximo)"
 
 #: src/iuse_actor.cpp
 msgid "Study to Learn"
-msgstr ""
+msgstr "Estude para Aprender"
 
 #: src/iuse_actor.cpp
 msgid "Can't learn!"
-msgstr ""
+msgstr "Não é possível aprender!"
 
 #: src/iuse_actor.cpp
 msgid "You already know everything this could teach you."
-msgstr ""
+msgstr "Você já sabe tudo o que isso podia te ensinar."
 
 #: src/iuse_actor.cpp
 msgid "Study a spell:"
-msgstr ""
+msgstr "Estudar um feitiço:"
 
 #: src/iuse_actor.cpp
 msgid "Spend how long studying?"
-msgstr ""
+msgstr "Passar quanto tempo estudando?"
 
 #: src/iuse_actor.cpp
 msgid "30 minutes"
-msgstr ""
+msgstr "30 minutos"
 
 #: src/iuse_actor.cpp
 msgid "1 hour"
-msgstr ""
+msgstr "1 hora"
 
 #: src/iuse_actor.cpp
 msgid "2 hours"
-msgstr ""
+msgstr "2 horas"
 
 #: src/iuse_actor.cpp
 msgid "4 hours"
-msgstr ""
+msgstr "4 horas"
 
 #: src/iuse_actor.cpp
 msgid "8 hours"
-msgstr ""
+msgstr "8 horas"
 
 #: src/iuse_actor.cpp
 msgid "Until you gain a spell level"
-msgstr ""
+msgstr "Até ganhar um nível de feitiço"
 
 #. ~ %1$s: spell name, %2$i: spell level
 #: src/iuse_actor.cpp
@@ -210592,7 +214141,7 @@ msgstr ""
 
 #: src/iuse_actor.cpp
 msgid "This item never fails."
-msgstr ""
+msgstr "Este item nunca falha."
 
 #: src/iuse_actor.cpp
 #, c-format
@@ -210632,18 +214181,18 @@ msgstr ""
 #: src/iuse_actor.cpp
 #, c-format
 msgid "Draw %s"
-msgstr ""
+msgstr "Sacar %s"
 
 #: src/iuse_actor.cpp src/monexamine.cpp
 #, c-format
 msgid "Use %s"
-msgstr ""
+msgstr "Usar %s"
 
 #: src/iuse_actor.cpp
 msgid "Can be activated to store a suitable item."
 msgid_plural "Can be activated to store suitable items."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pode ser ativado para armazenar um objeto apropriado."
+msgstr[1] "Pode ser ativado para armazenar objetos apropriados."
 
 #: src/iuse_actor.cpp
 msgid "Num items: "
@@ -210660,7 +214209,7 @@ msgstr "Max:"
 #: src/iuse_actor.cpp
 #, c-format
 msgid "<num> %s"
-msgstr ""
+msgstr "<num> %s"
 
 #: src/iuse_actor.cpp
 #, c-format
@@ -210691,21 +214240,21 @@ msgstr ""
 #: src/iuse_actor.cpp src/vehicle_use.cpp
 #, c-format
 msgid "Unload %s"
-msgstr ""
+msgstr "Descarregar %s"
 
 #: src/iuse_actor.cpp
 #, c-format
 msgid "Can be used to assemble: %s"
-msgstr ""
+msgstr "Pode ser usado para montar: %s"
 
 #: src/iuse_actor.cpp
 #, c-format
 msgid "Insufficient ammunition to assemble %s"
-msgstr ""
+msgstr "Munição insuficiente para montar %s"
 
 #: src/iuse_actor.cpp
 msgid "<npcname> can't do that while mounted."
-msgstr ""
+msgstr "<npcname> não pode fazer isso em cima de uma montaria."
 
 #: src/iuse_actor.cpp
 msgid "Your tool does not have enough charges to do that."
@@ -210796,7 +214345,7 @@ msgstr "Praticando"
 #: src/iuse_actor.cpp
 #, c-format
 msgid "Repair %s"
-msgstr ""
+msgstr "Reparar %s"
 
 #: src/iuse_actor.cpp
 msgid "You can't use filthy items for healing."
@@ -210853,7 +214402,7 @@ msgstr "Sua ferida ainda dói."
 #: src/iuse_actor.cpp
 #, c-format
 msgid "You finish using the %s."
-msgstr ""
+msgstr "Você termina de usar %s."
 
 #: src/iuse_actor.cpp
 msgid "That arm is broken.  It needs surgical attention or a splint."
@@ -210865,7 +214414,7 @@ msgstr "Essa perna está quebrada. Precisa de atenção cirúrgica ou uma tala."
 
 #: src/iuse_actor.cpp
 msgid "<npcname>'s biology is not compatible with that item."
-msgstr ""
+msgstr "A biologia de <npcname> não é compatível com esse item."
 
 #: src/iuse_actor.cpp
 msgid "Select a body part for: "
@@ -210942,7 +214491,7 @@ msgstr ""
 #: src/iuse_actor.cpp
 #, c-format
 msgid "You can't place a %s there."
-msgstr ""
+msgstr "Você não pode colocar %s ali."
 
 #: src/iuse_actor.cpp
 #, c-format
@@ -211047,7 +214596,7 @@ msgstr "Tem que ser retirado primeiro."
 
 #: src/iuse_actor.cpp
 msgid "You quiver with anticipation…"
-msgstr ""
+msgstr "Você treme de antecipação..."
 
 #: src/iuse_actor.cpp
 msgid "You suddenly feel dizzy, and collapse to the ground."
@@ -211065,7 +214614,7 @@ msgstr ""
 #: src/iuse_actor.cpp
 #, c-format
 msgid "The %s is in the way."
-msgstr ""
+msgstr "%s está no caminho."
 
 #: src/iuse_actor.cpp
 #, c-format
@@ -211080,7 +214629,7 @@ msgstr ""
 #: src/iuse_actor.cpp
 #, c-format
 msgid "You set up the %s on the ground."
-msgstr ""
+msgstr "Você monta %s no chão."
 
 #: src/iuse_actor.cpp
 msgid "Examine the center square to pack it up again."
@@ -211088,11 +214637,11 @@ msgstr "Examine o quadrado central para empacotá-lo novamente."
 
 #: src/iuse_actor.cpp
 msgid "Use this item to weigh yourself.  Includes everything you are wearing."
-msgstr ""
+msgstr "Use esse objeto para se pesar. Inclui tudo o que estiver vestindo."
 
 #: src/iuse_actor.cpp
 msgid "You cannot weigh yourself while mounted."
-msgstr ""
+msgstr "Você não pode se pesar sobre uma montaria."
 
 #: src/iuse_actor.cpp
 #, c-format
@@ -211116,9 +214665,29 @@ msgstr ""
 msgid "How do you want to modify it?"
 msgstr "Como você deseja modificá-lo?"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
 msgstr ""
 
 #: src/iuse_actor.cpp
@@ -211224,15 +214793,15 @@ msgstr "Eu não sei o que é isso, mas não é gatinho."
 
 #: src/iuse_software_kitten.cpp
 msgid "An empty shopping bag.  Paper or plastic?"
-msgstr ""
+msgstr "Uma sacola de mercado vazia. Papel ou plástico?"
 
 #: src/iuse_software_kitten.cpp
 msgid "Could it be… a big ugly bowling trophy?"
-msgstr ""
+msgstr "Poderia ser... um grande e feio troféu de boliche?"
 
 #: src/iuse_software_kitten.cpp
 msgid "A coat hanger hovers in thin air.  Odd."
-msgstr ""
+msgstr "Um cabide flutua no ar. Estranho."
 
 #: src/iuse_software_kitten.cpp
 msgid "Not kitten, just a packet of Kool-Aid(tm)."
@@ -211410,7 +214979,7 @@ msgstr ""
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a black hole.  Don't fall in!"
-msgstr ""
+msgstr "É um buraco negro. Não caia aí!"
 
 #: src/iuse_software_kitten.cpp
 msgid "Just a big brick wall."
@@ -211473,7 +215042,7 @@ msgstr "É a constelação de Peixes."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a fly on the wall.  Hi, fly!"
-msgstr ""
+msgstr "É uma mosca na parede. Olá, mosca!"
 
 #: src/iuse_software_kitten.cpp
 msgid "This kind of looks like kitten, but it's not."
@@ -211481,7 +215050,7 @@ msgstr "Esse tipo de aparência parece gatinho, mas não é."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a banana!  Oh, joy!"
-msgstr ""
+msgstr "É uma banana! Oh, que alegria!"
 
 #: src/iuse_software_kitten.cpp
 msgid "A helicopter has crashed here."
@@ -211509,11 +215078,11 @@ msgstr "Um gêiser pulveriza água no ar."
 
 #: src/iuse_software_kitten.cpp
 msgid "A toenail?  What good is a toenail?"
-msgstr ""
+msgstr "Uma unha? Pra que serve uma unha?"
 
 #: src/iuse_software_kitten.cpp
 msgid "You've found the fish!  Not that it does you much good in this game."
-msgstr ""
+msgstr "Você encontrou o peixe! Não que isso ajude muito nesse jogo."
 
 #: src/iuse_software_kitten.cpp
 msgid "A Buttertonsils bar."
@@ -211537,7 +215106,7 @@ msgstr "Não é nada além de um G-thang, baby."
 
 #: src/iuse_software_kitten.cpp
 msgid "IT'S ALIVE!  AH HA HA HA HA!"
-msgstr ""
+msgstr "ESTÁ VIVO! AH HAH HAH HAH!"
 
 #: src/iuse_software_kitten.cpp
 msgid "This was no boating accident!"
@@ -211592,7 +215161,7 @@ msgstr ""
 
 #: src/iuse_software_kitten.cpp
 msgid "It's the horizon.  Now THAT'S weird."
-msgstr ""
+msgstr "É o horizonte. Agora ISSO sim é estranho."
 
 #: src/iuse_software_kitten.cpp
 msgid "A vase full of artificial flowers is stuck to the floor here."
@@ -211610,7 +215179,7 @@ msgstr ""
 
 #: src/iuse_software_kitten.cpp
 msgid "It's an ordinary bust of Beethoven… but why is it painted green?"
-msgstr ""
+msgstr "É um busto normal de Beethoven... mas por que foi pintado de verde?"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's TV's lovable wisecracking Crow!  \"Bite me!\", he says."
@@ -211799,7 +215368,7 @@ msgstr "Uma cópia autografada de \\ 'Cores Primárias \\', por Anônimo."
 
 #: src/iuse_software_kitten.cpp
 msgid "Another rabbit?  That's three today!"
-msgstr ""
+msgstr "Mais um coelho? Já são três hoje!"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a segmentation fault.  Core dumped, by the way."
@@ -212522,6 +216091,23 @@ msgstr ""
 msgid "All knowledge of %s leaves you."
 msgstr ""
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr ""
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr ""
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr ""
@@ -212530,6 +216116,10 @@ msgstr ""
 msgid "Popup Distractions"
 msgstr ""
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr ""
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr ""
@@ -212594,6 +216184,15 @@ msgstr ""
 msgid "Casting Cost (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr ""
@@ -212602,6 +216201,10 @@ msgstr ""
 msgid "Casting Time (impeded)"
 msgstr ""
 
+#: src/magic.cpp
+msgid "self"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr ""
@@ -212615,29 +216218,37 @@ msgid "Healing"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Variance"
+msgid "Spell Radius"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spawn"
+msgid "Cone Arc"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Summon"
+msgid "degrees"
 msgstr ""
 
 #: src/magic.cpp
-msgid "Spell Radius"
+msgid "Line Width"
 msgstr ""
 
-#: src/magic.cpp src/veh_interact.cpp
-msgid "Range"
-msgstr "Alcance"
+#: src/magic.cpp
+msgid "Variance"
+msgstr ""
 
 #: src/magic.cpp
-msgid "self"
+msgid "Spawn"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Summon"
 msgstr ""
 
+#: src/magic.cpp src/veh_interact.cpp
+msgid "Range"
+msgstr "Alcance"
+
 #: src/magic.cpp
 msgid "Duration"
 msgstr ""
@@ -212662,18 +216273,22 @@ msgstr ""
 msgid "Damage Type"
 msgstr ""
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr ""
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr ""
@@ -212722,6 +216337,11 @@ msgstr ""
 msgid "No valid targets to teleport."
 msgstr ""
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr ""
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr ""
@@ -212862,6 +216482,10 @@ msgstr ""
 msgid "Unable to make sound directory.  Check permissions."
 msgstr ""
 
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr ""
+
 #: src/main_menu.cpp
 msgid "Really quit?"
 msgstr "Realmente desistiu?"
@@ -213553,7 +217177,7 @@ msgstr ""
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
+msgid "The %1$s is not a valid %2$s weapon."
 msgstr ""
 
 #: src/martialarts.cpp
@@ -213981,11 +217605,6 @@ msgid_plural "%d enemies hit!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr ""
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -216313,17 +219932,43 @@ msgid "You don't have any companions to send out…"
 msgstr ""
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
-msgstr "Quem você quer enviar? [COMBATE: SOBREVIVENCIA: INDÚSTRIA]"
+msgid "Who do you want to send?"
+msgstr ""
 
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
 msgstr ""
 
+#. ~ %1$s: npc name
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
-msgstr "O acompanhante que você selecionou não tem as habilidades!"
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
+msgstr ""
+
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
+msgstr ""
+
+#: src/mission_companion.cpp
+msgid "You choose to send no one…"
+msgstr ""
 
 #: src/mission_companion.cpp
 msgid "You don't have any companions ready to return…"
@@ -218027,6 +221672,11 @@ msgstr ""
 msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr ""
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr ""
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -218227,11 +221877,6 @@ msgstr ""
 msgid "zombie slave"
 msgstr "escravo zumbi"
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr ""
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -218634,22 +222279,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr ""
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr "muito pequeno"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr "pequeno"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr "médio"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr "ampla"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr "imenso"
 
@@ -218714,6 +222364,16 @@ msgstr "massa gelatinosa"
 msgid "wearing %1$s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr ""
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr ""
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -218756,6 +222416,11 @@ msgstr ""
 msgid "Rider: %s"
 msgstr ""
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr ""
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr "Dificuldade"
@@ -219412,8 +223077,8 @@ msgid "Crossed a threshold"
 msgstr "Cruzou um limiar"
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
-msgstr "Oh sim! Essa é a coisa!"
+msgid "Oh, yeah!  That's the stuff!"
+msgstr ""
 
 #: src/mutation_ui.cpp
 msgid "Reassigning."
@@ -220420,7 +224085,7 @@ msgstr "Fúria:"
 msgid "%s disappears."
 msgstr ""
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "%s morreu!"
@@ -221169,6 +224834,16 @@ msgstr "Eu tenho notícias."
 msgid "Yes, let's resume training "
 msgstr "Sim, vamos retomar o treinamento"
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr ""
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr ""
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -221337,10 +225012,6 @@ msgstr ""
 msgid "I need a %s to consume that!"
 msgstr ""
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr "Não parece uma boa ideia consumir isso"
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr "Oferecer o que?"
@@ -221418,6 +225089,11 @@ msgstr ""
 msgid "My current location"
 msgstr ""
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -221450,10 +225126,6 @@ msgstr "Qual biônico você deseja desinstalar?"
 msgid "You decide to hold off…"
 msgstr ""
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr ""
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -221520,6 +225192,11 @@ msgstr ""
 msgid "%s leaves."
 msgstr ""
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -221579,6 +225256,11 @@ msgstr "Mais&gt;"
 msgid "Examine which item?"
 msgstr "Examine qual item?"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr ""
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -221921,12 +225603,9 @@ msgstr "Vira para o modo de reativação automática de segurança"
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
 msgstr ""
-" Número de voltas após o qual o modo de segurança é reativado. Só será "
-"reativado se não houver hostis na 'Distância de proximidade do modo de "
-"segurança'."
 
 #: src/options.cpp
 msgid "Turns to remember ignored monsters"
@@ -222034,12 +225713,9 @@ msgstr "Largar recipientes vazios"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
 msgstr ""
-"Escolha para largar recipientes vazios após o uso.  Não: Não largar nenhum. "
-"- À prova d'água: Todos menos recipientes a prova d'água. - Todos: Largar "
-"todos os recipientes."
 
 #: src/options.cpp
 msgid "Watertight"
@@ -222211,12 +225887,12 @@ msgstr ""
 "Se verdadeiro, automaticamente segue o ponteiro quando atirar/arremessar."
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "Confirmação ao desmontar"
+msgid "Query on disassembly while butchering"
+msgstr ""
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
-msgstr "Se verdadeiro, irá perguntar se quer mesmo desmontar itens."
+msgid "If true, will query before disassembling items while butchering."
+msgstr ""
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -222504,9 +226180,9 @@ msgstr "Letras automáticas para itens"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
 msgstr ""
 
 #: src/options.cpp
@@ -222886,7 +226562,7 @@ msgstr ""
 msgid "Display"
 msgstr "Display"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr ""
@@ -222984,7 +226660,7 @@ msgid "Scaling factor"
 msgstr ""
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
+msgid "Factor by which to scale the display.  Requires restart."
 msgstr ""
 
 #: src/options.cpp
@@ -223283,8 +226959,8 @@ msgstr ""
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
 msgstr ""
 
@@ -223294,9 +226970,9 @@ msgstr ""
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
 msgstr ""
 
 #: src/options.cpp
@@ -223366,11 +227042,9 @@ msgstr "NPCs estáticos"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
 msgstr ""
-" Se for verdade, os NPCs estáticos aparecerão em locais predefinidos. Requer"
-" reinicialização mundial."
 
 #: src/options.cpp
 msgid "Starting NPCs spawn"
@@ -224303,7 +227977,7 @@ msgstr "[ESCAPE / Q] Cancelar"
 
 #: src/overmap_ui.cpp
 msgid "Travel to this point?"
-msgstr ""
+msgstr "Viajar para esse ponto?"
 
 #. ~ First parameter is a terrain name, second parameter is a direction, and
 #. third parameter is a city name.
@@ -224311,14 +227985,14 @@ msgstr ""
 #, c-format
 msgctxt "terrain description"
 msgid "%1$s %2$s from %3$s"
-msgstr ""
+msgstr "%1$s %2$s de %3$s"
 
 #. ~ First parameter is a terrain name, second parameter is a direction, and
 #. third parameter is a city name.
 #: src/overmapbuffer.cpp
 msgctxt "terrain description"
 msgid "%1$s in central %3$s"
-msgstr ""
+msgstr "%1$s no centro de %3$s"
 
 #. ~ First parameter is a terrain name, second parameter is a direction, and
 #. third parameter is a city name.
@@ -224326,14 +228000,14 @@ msgstr ""
 #, c-format
 msgctxt "terrain description"
 msgid "%1$s in %2$s %3$s"
-msgstr ""
+msgstr "%1$s em  %3$s %2$s"
 
 #. ~ First parameter is a terrain name, second parameter is a direction, and
 #. third parameter is a city name.
 #: src/overmapbuffer.cpp
 msgctxt "terrain description"
 msgid "%1$s in %3$s"
-msgstr ""
+msgstr "%1$s em %3$s"
 
 #. ~ First parameter is a terrain name, second parameter is a direction, and
 #. third parameter is a city name.
@@ -224341,7 +228015,7 @@ msgstr ""
 #, c-format
 msgctxt "terrain description"
 msgid "%1$s on the %2$s outskirts of %3$s"
-msgstr ""
+msgstr "%1$snos arredores %2$s de %3$s"
 
 #: src/panels.cpp
 msgid "Str "
@@ -224361,7 +228035,7 @@ msgstr ""
 
 #: src/panels.cpp
 msgid "New moon"
-msgstr ""
+msgstr "Lua nova"
 
 #: src/panels.cpp
 msgid "Waxing crescent"
@@ -224377,7 +228051,7 @@ msgstr ""
 
 #: src/panels.cpp
 msgid "Full moon"
-msgstr ""
+msgstr "Lua cheia"
 
 #: src/panels.cpp
 msgid "Waning gibbous"
@@ -224650,9 +228324,10 @@ msgstr ""
 msgid "Underground"
 msgstr "Subterrâneo"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
-msgstr ""
+msgstr "Vento"
 
 #: src/panels.cpp
 msgid "Stm"
@@ -224711,10 +228386,6 @@ msgstr "Surdo!"
 msgid "Weapon  :"
 msgstr ""
 
-#: src/panels.cpp
-msgid "No Style"
-msgstr "Sem estilo"
-
 #: src/panels.cpp
 msgid "Day "
 msgstr ""
@@ -224727,113 +228398,115 @@ msgstr ""
 msgid "to open sidebar options"
 msgstr ""
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
-msgstr ""
+msgstr "Mana"
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
-msgstr ""
+msgstr "Mana Máx"
 
 #: src/panels.cpp
 msgid "Location"
-msgstr ""
+msgstr "Local"
 
 #: src/panels.cpp
 msgid "Weather"
-msgstr ""
+msgstr "Clima"
 
 #: src/panels.cpp
 msgid "Lighting"
-msgstr ""
+msgstr "Luz"
 
 #: src/panels.cpp
 msgid "Weapon"
-msgstr ""
+msgstr "Arma"
 
 #: src/panels.cpp
 msgid "Time"
-msgstr ""
+msgstr "Tempo"
 
 #: src/panels.cpp
 msgid "Compass"
-msgstr ""
+msgstr "Bússola"
 
 #: src/panels.cpp
 msgid "Log"
-msgstr ""
+msgstr "Registro"
 
 #: src/panels.cpp
 msgid "Map"
-msgstr ""
+msgstr "Mapa"
 
 #: src/panels.cpp
 msgid "Limbs"
-msgstr ""
+msgstr "Membros"
 
 #: src/panels.cpp
 msgid "Sound"
-msgstr ""
+msgstr "Som"
 
 #: src/panels.cpp
 msgid "Stats"
-msgstr ""
+msgstr "Estatísticas"
 
 #: src/panels.cpp
 msgid "Needs"
-msgstr ""
+msgstr "Necessidades"
 
 #: src/panels.cpp
 msgid "Env"
-msgstr ""
+msgstr "Amb"
 
 #: src/panels.cpp
 msgid "Vehicle"
-msgstr ""
+msgstr "Veículo"
 
 #: src/panels.cpp
 msgid "Hint"
-msgstr ""
+msgstr "Dica"
 
 #: src/panels.cpp
 msgid "Movement"
-msgstr ""
+msgstr "Movimento"
 
 #: src/panels.cpp
 msgid "Location Alt"
-msgstr ""
+msgstr "Local Alt"
 
 #: src/panels.cpp
 msgid "compact"
-msgstr ""
+msgstr "compacto"
 
 #: src/panels.cpp
 msgid "labels-narrow"
-msgstr ""
+msgstr "rótulos-estreito"
 
 #: src/panels.cpp
 msgid "labels"
-msgstr ""
+msgstr "rótulos"
 
 #: src/panels.cpp
 msgid "panel options"
-msgstr ""
+msgstr "opções de painel"
 
 #: src/panels.cpp
 msgid "SIDEBAR OPTIONS"
-msgstr ""
+msgstr "OPÇÕES DE BARRA LATERAL"
 
 #: src/panels.cpp
 msgid "Toggle panels on/off"
-msgstr ""
+msgstr "Ligar/desligar painéis"
 
 #: src/panels.cpp
 msgid "Change display order"
-msgstr ""
+msgstr "Trocar ordem do display"
 
 #: src/panels.cpp
 msgid "Exit"
-msgstr ""
+msgstr "Sair"
 
 #: src/pickup.cpp
 #, c-format
@@ -224987,78 +228660,6 @@ msgstr ""
 msgid "You have learned a new style: %s!"
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "%s sofrerá congelamento nas próximas horas."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "%s sofrerá congelamento em até uma hora!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr ""
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr ""
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr ""
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr ""
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr ""
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr ""
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "O vento está fazendo você sentir seu/sua %s um tanto gelado(a)."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr ""
-"O vento está muito forte, você  deveria encontrar alguma roupa mais "
-"resistente ao vento para %s."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr ""
-"Sua roupa não está fornecendo proteção suficiente contra o vendo para %s!"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "Você rola no chão, tentando abafar o fogo!"
@@ -225431,14 +229032,6 @@ msgstr ""
 msgid "There is not enough %s left to siphon it."
 msgstr ""
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "Você tosse fortemente."
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "uma tosse seca."
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "Seu corpo está arruinado com uma dor excruciante!"
@@ -225484,11 +229077,6 @@ msgstr ""
 msgid "Your %s aches."
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr ""
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -225515,427 +229103,6 @@ msgstr "Algo se contorce e dentro de você quando morre."
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "Suas entranhas gorgolejam quando algo dentro delas morre."
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr ""
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "Você está se afogando!"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr "Você derramou um dente!"
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "BZZZZZ"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "De repente você se sente entorpecido."
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "De repente você dorme."
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "Você se sente tonto por um momento."
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "De repente você sente fome."
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "De repente você se sente um pouco cheio."
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "De repente você sente sede."
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "Você se sente fatigado de repente."
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "De repente você se sente muito frio."
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "Você de repente sente frio."
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "De repente você se sente muito quente."
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "De repente você se sente quente."
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr "%1$s diz: \"%2$s\""
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "Você começa a tremer incontrolavelmente."
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr ""
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr "De repente você é superado com o desejo de dormir e desmaiar."
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "Você tem um ataque de asma!"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr "Você usa seu oxigenador para limpá-lo e depois voltar a dormir."
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr "Você usa seu inalador e volta a dormir."
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr ""
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "Você usa sua última carga de inalador."
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "A luz do sol está realmente irritando seus olhos."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr ""
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "A luz do sol queima sua pele!"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "A luz do sol te distrai."
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "Você não suporta a luz do sol!"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "De repente, você não consegue ouvir nada!"
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "De repente, seus olhos param de funcionar!"
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr "Você sente uma sensação anômala vinda de seus sensores de radiação."
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr "Seu peito queima enquanto seus sistemas de energia sobrecarregam!"
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "Você sofre uma descarga elétrica dolorosa!"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr ""
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "Você sofre uma descarga ácida ardente!"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "Suas baterias descarregam um pouco."
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "Um biônico emite um estalo de ruído!"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "Você sente seu tremor biônico defeituoso."
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr "Crackle!"
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "Sua visão pixeliza!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr ""
-"Seu bionic mau funcionamento faz com que você espasmos e caia no chão!"
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr "Sua biônica curto-circuito, fazendo com que você tremer e estremecer."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "Seu mau funcionamento biônico coça!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr ""
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr "Seus músculos se espasam!"
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr "Você vai ao chão!"
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr "Você sente falta de ar."
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr "Você treme descontroladamente."
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr "Você apaga!"
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "Sua respiração acalma."
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr "Você tropeça e cai em cima!"
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr "Você cansadamente esfrega seus olhos."
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr ""
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr "Você solta um pequeno bocejo."
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr "Você estica suas costas."
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr "Você se sente mentalmente cansado."
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr "Você se sente tonta por um momento."
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr "Seus músculos espasmam desconfortavelmente."
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr "Sua visão embaça um pouco."
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr "Sua mente cai em falta de consciência brevemente."
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr "Seus músculos doem de maneira estressante e imprevisível."
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr "Você tem uma dor de cabeça distrativa e dolorosa."
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr "Você sente azia e um gosto ácido em sua boca."
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr ""
-" Sua mente está tão cansada que você sente que não pode mais confiar em seus"
-" olhos."
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr ""
-" Seus músculos entorpecem descontroladamente e você tem dificuldade em "
-"manter o equilíbrio."
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr "Suas pernas trêmulas fazem você tropeçar."
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr ""
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr ""
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr "Você cai!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr ""
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr ""
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr ""
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr ""
@@ -226155,11 +229322,6 @@ msgstr ""
 msgid "You are too weak to wield %s with only one arm."
 msgstr ""
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr ""
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "Mantenha as mãos livres (off)"
@@ -226235,19 +229397,42 @@ msgstr ""
 msgid "Mend which fault?"
 msgstr "Emendar qual falha?"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white> Tempo requerido: </color> \n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr ""
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white> Habilidades: </color> \n"
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr ""
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
+#: src/player.cpp
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "Skills: %s\n"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "You are currently unable to mend the %s this way."
 msgstr ""
 
 #: src/player.cpp
@@ -226366,14 +229551,6 @@ msgstr "Você tira seu %s."
 msgid "<npcname> takes off their %s."
 msgstr ""
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr "Não pode colocar itens aqui!"
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr "<npcname> não pode colocar itens aqui!"
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -226421,20 +229598,6 @@ msgstr ""
 msgid "You can't remove partially depleted plutonium!"
 msgstr "Você não pode remover o plutônio parcialmente esgotado!"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] ""
-msgstr[1] ""
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -226611,10 +229774,6 @@ msgstr "Você tenta esquivar mas não dá!"
 msgid "%s tries to dodge but there's no room!"
 msgstr "%s tenta esquivar mas não consegue!"
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr "Seu corpo se esforça sob o peso!"
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -226668,6 +229827,13 @@ msgstr ""
 msgid "Pain "
 msgstr ""
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr ""
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -226892,46 +230058,56 @@ msgstr "Velocidade atual:"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr ""
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
 msgstr ""
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
 msgstr ""
 
 #: src/player_display.cpp
@@ -227143,8 +230319,8 @@ msgid "\"Oh God, what's happening?\""
 msgstr "'Oh Deus, o que está acontecendo?"
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
-msgstr "'Claro ... é tudo fractais!"
+msgid "\"Of course… it's all fractals!\""
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "\"Huh?  What was that?\""
@@ -227179,8 +230355,8 @@ msgid "You quiver from the cold."
 msgstr "Você tremer de frio."
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
-msgstr "Seu torso está muito frio. Você deve colocar mais algumas camadas."
+msgid "Your torso is freezing cold.  You should put on a few more layers."
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "Your shivering makes you unsteady."
@@ -227568,6 +230744,47 @@ msgstr ""
 msgid "Your alarm went off."
 msgstr ""
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr ""
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -227989,10 +231206,6 @@ msgstr "kerblam!"
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>nenhum</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr ""
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -228228,13 +231441,6 @@ msgstr ""
 msgid "KILLS"
 msgstr ""
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr ""
-" Define qual exibição de vídeo será usada para mostrar o jogo. Requer "
-"reinicialização."
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr ""
@@ -228247,6 +231453,10 @@ msgstr "Seus ouvidos doem repentinamente!"
 msgid "Something is making noise."
 msgstr "Algo está fazendo barulho."
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr ""
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -228262,6 +231472,11 @@ msgstr ""
 msgid "You hear %1$s"
 msgstr "Você escuta %1$s"
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr ""
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "Finalmente você acorda com o despertador."
@@ -228293,6 +231508,415 @@ msgstr ""
 msgid "d: delete history"
 msgstr "d: Apagar histórico"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "Você está se afogando!"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr "De repente você é superado com o desejo de dormir e desmaiar."
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "De repente você se sente entorpecido."
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "De repente você dorme."
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "Você se sente tonto por um momento."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "De repente você sente fome."
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "De repente você se sente um pouco cheio."
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "De repente você sente sede."
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "Você se sente fatigado de repente."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "De repente você se sente muito frio."
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "Você de repente sente frio."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "De repente você se sente muito quente."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "De repente você se sente quente."
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "Você começa a tremer incontrolavelmente."
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr "%1$s diz: \"%2$s\""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "Você tem um ataque de asma!"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr "Você usa seu oxigenador para limpá-lo e depois voltar a dormir."
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr "Você usa seu inalador e volta a dormir."
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "Você usa sua última carga de inalador."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "A luz do sol queima sua pele!"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "A luz do sol te distrai."
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "Você não suporta a luz do sol!"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "A luz do sol está realmente irritando seus olhos."
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr "Você derramou um dente!"
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "BZZZZZ"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "De repente, você não consegue ouvir nada!"
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "De repente, seus olhos param de funcionar!"
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr "Você sente uma sensação anômala vinda de seus sensores de radiação."
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr "Seu peito queima enquanto seus sistemas de energia sobrecarregam!"
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "Você sofre uma descarga elétrica dolorosa!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "Você sofre uma descarga ácida ardente!"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "Suas baterias descarregam um pouco."
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "Um biônico emite um estalo de ruído!"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "Você sente seu tremor biônico defeituoso."
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr "Crackle!"
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "Sua visão pixeliza!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr ""
+"Seu bionic mau funcionamento faz com que você espasmos e caia no chão!"
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr "Sua biônica curto-circuito, fazendo com que você tremer e estremecer."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "Seu mau funcionamento biônico coça!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr "Seus músculos se espasam!"
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr "Você vai ao chão!"
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr "Você sente falta de ar."
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr "Você treme descontroladamente."
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr "Você apaga!"
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "Sua respiração acalma."
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr "Você tropeça e cai em cima!"
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr "Você cansadamente esfrega seus olhos."
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr "Você solta um pequeno bocejo."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr "Você estica suas costas."
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr "Você se sente mentalmente cansado."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr "Você se sente tonta por um momento."
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr "Seus músculos espasmam desconfortavelmente."
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr "Sua visão embaça um pouco."
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr "Sua mente cai em falta de consciência brevemente."
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr "Seus músculos doem de maneira estressante e imprevisível."
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr "Você tem uma dor de cabeça distrativa e dolorosa."
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr "Você sente azia e um gosto ácido em sua boca."
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr ""
+" Sua mente está tão cansada que você sente que não pode mais confiar em seus"
+" olhos."
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr ""
+" Seus músculos entorpecem descontroladamente e você tem dificuldade em "
+"manter o equilíbrio."
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr "Suas pernas trêmulas fazem você tropeçar."
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr ""
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr "Você cai!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr ""
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr ""
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr ""
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr ""
@@ -228442,8 +232066,8 @@ msgstr ""
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "O %s tropeça no berço"
+msgid "The %s stumbles over the cot!"
+msgstr ""
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -228598,11 +232222,6 @@ msgstr "Uma armadilha se fecha em sua perna."
 msgid "A snare closes on <npcname>s leg."
 msgstr "Uma armadilha se fecha <npcname> s perna."
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr ""
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -228832,6 +232451,13 @@ msgstr "<npcname> cai um nível!"
 msgid "You fall down under %s!"
 msgstr ""
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] ""
+msgstr[1] ""
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname> bate as asas e se agita graciosamente."
@@ -228968,6 +232594,10 @@ msgstr ""
 msgid "Select part"
 msgstr "Selecione parte"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white> Tempo requerido: </color> \n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr "<color_white>Habilidades requeridas:</color>\n"
@@ -231405,8 +235035,8 @@ msgstr "@ %d: %s  "
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
-msgstr "Definido '%s para..."
+msgid "Set '%s' to…"
+msgstr ""
 
 #: src/wish.cpp
 msgid " (current)"
diff --git a/lang/po/ru.po b/lang/po/ru.po
index 2f78e1348590d..268f4457e7b1e 100644
--- a/lang/po/ru.po
+++ b/lang/po/ru.po
@@ -14,7 +14,6 @@
 # Леонид Васильев <savidiy@mail.ru>, 2018
 # Еухенио <neuromantra@gmail.com>, 2018
 # Daniel Sanderson <Gab125@yandex.ru>, 2018
-# flin4 <kbzobtr@gmail.com>, 2018
 # Igor Kirpik <thenightquaker@gmail.com>, 2018
 # TechCat <alone.inbox@gmail.com>, 2018
 # Eugene Belousov, 2018
@@ -33,42 +32,46 @@
 # Unknown Unknown <MrROBUST@yandex.ru>, 2019
 # Kiryl Surahatau <kirill.surogatov@gmail.com>, 2019
 # Timofey Kostenko <adeeee6622@gmail.com>, 2019
+# Zhar the Mad <spammers_hell@mail.ru>, 2019
 # Валентин Литовченко <litovchenkov2004@gmail.com>, 2019
 # Darketed <nikitka.vit@gmail.com>, 2019
 # AndyProhor <artypront@yandex.ru>, 2019
-# Victor_U <Victor.Utechenko@softengi.com>, 2019
 # Даниил Шаверов <dsaverov@gmail.com>, 2019
 # Eila Attwood <endless8entropy@gmail.com>, 2019
-# Zhar the Mad <spammers_hell@mail.ru>, 2019
 # Gamp Forest, 2019
-# Alexey Mostovoy <amurkin1988@yandex.ru>, 2019
 # Jin Velddrinn, 2019
 # korick3 korick3 <krb-2011@yandex.ru>, 2019
 # Fran faов <ak02102002@gmail.com>, 2019
 # Александр <aleksval59@gmail.com>, 2019
-# Brett Dong <brett.browning.dong@gmail.com>, 2019
 # Artem Baranov <artemukraine29@gmail.com>, 2019
 # Chor Hung <felargyle@gmail.com>, 2019
-# Anon Anon <foxeke@onemail1.com>, 2019
 # Oleksii Filonenko <brightone@protonmail.com>, 2019
 # Jose <youlold@gmail.com>, 2019
-# WX <wengerx@mail.ru>, 2019
 # Darkon Rabbit, 2019
 # Михаил Семенчин <semenchin_m@mail.ru>, 2019
 # Midas <dd_nk@mail.ru>, 2019
 # Arex <arex@ngs.ru>, 2019
-# Vlasov Vitaly <vnigtha@gmail.com>, 2019
+# Anton Dumov <anton.dumov@gmail.com>, 2019
+# flin4 <kbzobtr@gmail.com>, 2019
 # Aquilo, 2019
+# Anon Anon <foxeke@onemail1.com>, 2019
 # Антон Бурмистров <22.valiant@gmail.com>, 2019
-# Anton Dumov <anton.dumov@gmail.com>, 2019
+# WX <wengerx@mail.ru>, 2019
+# Alexandr Epaneshnikov <aarnaarn2@gmail.com>, 2019
+# Victor_U <Victor.Utechenko@softengi.com>, 2019
+# Vlasov Vitaly <vnigtha@gmail.com>, 2019
+# Brett Dong <brett.browning.dong@gmail.com>, 2019
+# Alexey Mostovoy <amurkin1988@yandex.ru>, 2019
+# Ivan Ivanov <resaye8820@ymail365.com>, 2019
+# Николай Е, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
-"Last-Translator: Anton Dumov <anton.dumov@gmail.com>, 2019\n"
+"Last-Translator: Николай Е, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/cataclysm-dda-translators/teams/2217/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,6 +266,19 @@ msgstr "Высокорадиоактивный шлам. Лучше держат
 msgid "watery plutonium slurry"
 msgstr "водянистый плутониевый шлам"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr "камень"
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr ""
+"Камень размером с бейсбольный мяч. Не самое плохое оружие ближнего боя, но "
+"куда больше подходит для метания во врагов."
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "галька"
@@ -788,11 +804,11 @@ msgstr "шипованная самодельная ракета"
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
+" of this grade of weapon, but packs a fierce punch… if it hits."
 msgstr ""
 "Самодельная ракета, состоящая из шипа, приваренного к трубе, заполненной "
 "кустарным ракетным топливом. Ужасно неточная, как можно ожидать от этого "
-"класса оружия, но наносит мощный удар… если попадёт."
+"класса оружия, но наносит мощный удар… Если попадёт."
 
 #: lang/json/AMMO_from_json.py
 msgid "explosive home-made rocket"
@@ -844,11 +860,11 @@ msgstr "Незаконченный карбид кальция"
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
 msgstr ""
-"Незаконченный процесс преобразования уголь и извести в карбид кальция. "
-"Бесполезен в этом состоянии/"
+"Незаконченный процесс преобразования угля и извести в карбид кальция. "
+"Бесполезен в этом состоянии."
 
 #: lang/json/AMMO_from_json.py
 msgid "chain link"
@@ -976,6 +992,9 @@ msgid ""
 "damage to the target.  Stands a decent chance of remaining intact once "
 "fired."
 msgstr ""
+"Оперённая деревянная стрела с заостренным наконечником. Используется для "
+"нанесения максимального урона цели. Имеет хорошие шансы уцелеть после "
+"выстрела."
 
 #: lang/json/AMMO_from_json.py
 msgid "simple wooden arrow"
@@ -1041,6 +1060,9 @@ msgid ""
 "A fletched aluminum arrow shaft with a bladed tip.  Useful for maximizing "
 "damage to the target.  Stands a good chance of remaining intact once fired."
 msgstr ""
+"Оперённая алюминиевая стрела с заостренным наконечником. Используется для "
+"нанесения максимального урона цели. Имеет хорошие шансы уцелеть после "
+"выстрела."
 
 #: lang/json/AMMO_from_json.py
 msgid "aluminum field point arrow"
@@ -1199,6 +1221,10 @@ msgid ""
 "smoke, that is deadly to bacteria and humans alike, or oxidized to make "
 "paper-bleaching agents."
 msgstr ""
+"Горстка чистой серы. В основном, используется для производства "
+"аккумуляторной кислоты, но иногда сера используется в качестве топлива для "
+"взрывчатых веществ. Можно сжечь для получения кислотного дыма, опасного для "
+"бактерий и людей, или окислить до получения отбеливателя бумаги."
 
 #: lang/json/AMMO_from_json.py
 msgid "chunk of sulfur"
@@ -1361,11 +1387,11 @@ msgstr[3] "оксид цинка"
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
 msgstr ""
-"Горсть оксида цинка. Может быть восстановлен до цинка, или использован в "
-"некоторых реакциях сам по себе."
+"Горстка оксида цинка. Может быть восстановлена до цинка, или использована в "
+"некоторых реакциях."
 
 #: lang/json/AMMO_from_json.py
 msgid "manganese dioxide"
@@ -1378,13 +1404,13 @@ msgstr[3] "диоксид марганца"
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr ""
-"Горсть порошка диоксида марганца. Получающийся естественным образом в "
-"минеральном пиролузите, он коммерчески используется при производстве "
-"щелочных и цинк-углеродных батарей."
+"Горстка порошка диоксида марганца. Добывается из минерального пиролюзита и "
+"используется промышленностью для производства щелочных и марганцево-цинковых"
+" батарей."
 
 #: lang/json/AMMO_from_json.py
 msgid "potassium chloride"
@@ -1397,13 +1423,13 @@ msgstr[3] "хлористый калий"
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr ""
-"Горсть хлористого калия. Хотя он возникает естественным образом в "
-"минеральном сильвите, его можно получить как побочный продукт реакции "
+"Горстка хлористого калия. Хотя хлорид калия образуется естественным путем в "
+"минеральном сильвине, его можно получить как побочный продукт реакции "
 "селитры и соляной кислоты. Годится для приготовления удобрений или "
 "гидроксида калия путем электролиза."
 
@@ -1418,14 +1444,13 @@ msgstr[3] "гидроксид калия"
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
 msgstr ""
-"Горсть гидроокиси калия. Обычно называемый едким калием, он в основном "
-"использовался в промышленности для едкого характера. Он может быть "
-"использован в качестве электролита в щелочных батареях, среди других "
-"применений."
+"Горстка гидроксида калия. Обычно называемый едким калием, он, в основном, "
+"использовался в промышленности из-за едкого характера. Может также быть "
+"использован в качестве электролита в щелочных батареях."
 
 #: lang/json/AMMO_from_json.py
 msgid "sulfuric acid"
@@ -1459,13 +1484,13 @@ msgstr[3] "соляная кислота"
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
 msgstr ""
-"Соляная кислота - сильная кислота с характерным запахом, важный и часто "
-"используемый с момента открытия реагент. Она по-прежнему имеет огромное "
-"множество применений."
+"Хлористоводородная кислота, также известная как соляная кислота. Это сильная"
+" кислота с характерным запахом — важный и часто используемый с момента "
+"открытия реагент. Она по-прежнему имеет огромное множество применений."
 
 #: lang/json/AMMO_from_json.py
 msgid "acetone"
@@ -1527,6 +1552,11 @@ msgid ""
 "CVD machine and a laboratory worth of reagents, they might be able to "
 "produce very durable ceramic layers."
 msgstr ""
+"Горстка оксида хрома. Это вещество, в основном, известно как единственный "
+"стабильный зелёный пигмент для красок, а также является мягким окислителем, "
+"который можно смешать с алюминиевым порошком, чтобы получить термит для "
+"сварки. Если есть доступ к химическому парофазному осадителю и лабораторным "
+"реагентам, можно производить очень прочную многослойную керамику."
 
 #: lang/json/AMMO_from_json.py
 msgid "calcium carbide"
@@ -1545,6 +1575,10 @@ msgid ""
 "and sealed, it will explode with little strength, but with relatively loud "
 "noise and could maybe be used as a decoy."
 msgstr ""
+"Горстка карбида кальция, слабо пахнущая чесноком. Карбид кальция "
+"используется в промышленности для получения ацетилена, а ранее им "
+"заправлялись карбидные лампы. Если смешать с водой и запечатать, будет "
+"небольшой и громкий взрыв, что можно использовать в качестве приманки."
 
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "hexamine"
@@ -1793,8 +1827,8 @@ msgstr[3] "спичечный порошок"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
 msgstr ""
 "Порошок со спичечных головок. Он похож на порох, но немного слабее. Пригоден"
 " для изготовления взрывчатки и запалов, если не нашлось ничего подходящего."
@@ -2246,7 +2280,7 @@ msgstr[3] "огнемётное топливо"
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
 msgstr ""
@@ -2896,7 +2930,7 @@ msgid ""
 "requires a specific barrel, so will not work in a standard M4 or similar "
 "carbine.  This one has been hand-reloaded."
 msgstr ""
-".300 AAC Blackout - промежуточный патрон с баллистическими свойствами, "
+".300 AAC Blackout — промежуточный патрон с баллистическими свойствами, "
 "подобными 7.62x39, однако пригодный для платформы AR-15. Патрон происходит "
 "от суженного 5.56 мм НАТО и подходит к магазину STANAG. Для него требуется "
 "особый ствол, так что им нельзя зарядить стандартную М4 или похожий карабин."
@@ -3829,41 +3863,60 @@ msgid "reloaded .460 Rowland"
 msgstr "переснаряженный .460 Rowland"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr ".50 BMG трассирующий"
+msgid ".50 BMG M17 tracer"
+msgstr "патрон .50 BMG M17 трассирующий"
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M17 tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
 msgstr ""
-"Трассирующий вариант мощного снайперского патрона .50 BMG. Трассирующие "
-"патроны помогают держать направление на цель при стрельбе и могут поджечь "
-"горючие вещества."
+"Трассирующий вариант мощного снайперского патрона 50 калибра BMG. "
+"Трассирующие патроны помогают держать направление на цель при стрельбе и "
+"могут поджечь горючие вещества."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr "патрон .50 BMG"
+msgid ".50 BMG M33 Ball"
+msgstr "патрон .50 BMG M33 Ball"
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-".50 BMG — очень мощный и дальнобойный винтовочный патрон. Его колоссальная "
-"точность и бронебойность делают его одним из самых смертоносных патронов из "
-"всех существующих, к недостаткам которого можно отнести лишь сильную отдачу "
-"и шум."
+".50 BMG боеприпас, начинённый 661 грановой оболочечной пулей FMJ с мягким "
+"стальным сердечником. .50 BMG — очень мощный и дальнобойный винтовочный "
+"патрон, предназначенный для противовоздушных применений, а затем "
+"адаптированный для противотранспортных и противопехотных задач. Его "
+"колоссальная энергия и бронебойность делают его одним из самых смертоносных "
+"доступных снарядов, к недостаткам которого можно отнести лишь сильную отдачу"
+" и шум."
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
-msgstr "патрон .50 BMG ББ"
+msgid ".50 BMG Match"
+msgstr "патрон .50 BMG Match"
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG Match
+#: lang/json/AMMO_from_json.py
+msgid ""
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
+msgstr ""
+".50 BMG FMJ оболочечные боеприпасы со свинцовым сердечником, изготовленные с"
+" более жесткими допусками, для стрельбы на дальние дистанции или для "
+"высокоточных применений."
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG M2 AP"
+msgstr "патрон .50 BMG M2 ББ"
+
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
@@ -3873,6 +3926,32 @@ msgstr ""
 "плотной, закалённой вольфрамовой стали. Проникающая способность увеличена, "
 "но урон меньше."
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr "патрон .50 BMG Raufoss Mk 211"
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+"Этот вариант .50 BMG максимально использует нагрузочную способность калибра "
+"патрона: наконечник загружен инициирующей зажигательной смесью из гексогена "
+"и пентаэритриттетранитрата, которая детонирует при попадании по цели. При "
+"детонации поджигается основной зажигательный состав порошка циркония, "
+"который находится в оболочке из мягкой стали совместно с очень прочным "
+"сердечником из карбида вольфрама. Частицы горящего циркония и оболочки "
+"затягиваются в образованную сердечником пробоину, нанося значительный урон "
+"за броней. Эти редкие, сложные и дорогие патроны вряд ли будут изготовлены "
+"снова. Используйте их с умом."
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
 msgstr "переснаряжённый .50 BMG трассирующий"
@@ -3880,30 +3959,33 @@ msgstr "переснаряжённый .50 BMG трассирующий"
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
 msgstr ""
 "Трассирующий вариант мощного снайперского патрона .50 BMG. Трассирующие "
 "патроны помогают при стрельбе держать направление на цель и могут поджечь "
-"горючие вещества. Эти патроны были переснаряжены."
+"горючие вещества. Это переснаряжённые патроны."
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr "переснаряжённый патрон .50 BMG"
+msgid "reloaded .50 BMG Match"
+msgstr "переснаряжённый патрон .50 BMG Match"
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-".50 BMG — очень мощный и дальнобойный винтовочный патрон. Его колоссальная "
-"точность и бронебойность делают его одним из самых смертоносных патронов из "
-"всех существующих, к недостаткам которого можно отнести лишь сильную отдачу "
-"и шум. Эти патроны переснаряжены."
+".50 BMG боеприпас, начинённый оболочечной пулей FMJ со свинцовым "
+"сердечником. .50 BMG — очень мощный винтовочный патрон, предназначенный для "
+"противовоздушных применений, а затем адаптированный для противотранспортных "
+"и противопехотных задач. Его колоссальная энергия и бронебойность делают его"
+" одним из самых смертоносных доступных снарядов, к недостаткам которого "
+"можно отнести лишь сильную отдачу и шум."
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
@@ -3912,13 +3994,12 @@ msgstr "переснаряжённый патрон .50 BMG ББ"
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
 msgstr ""
-"Вариант патрона .50 BMG, который использует пулю с сердечником из очень "
-"плотной закалённой вольфрамовой стали. Проникающая способность увеличена, но"
-" урон меньше. Эти патроны переснаряжены."
+"Вариант патрона .50 BMG, который использует пулю с сердечником из закалённой"
+" стали. Проникающая способность больше, но урон меньше. Это переснаряжённые "
+"патроны."
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -5056,6 +5137,117 @@ msgstr "Немного грибных спор."
 msgid "fungal flower"
 msgstr "грибной цветок"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr "алюмокалиевые квасцы"
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+"Небольшие водорастворимые белые кристаллы со слабым металлическим запахом, "
+"издавна используемые для самых разных целей. Также известны как квасцы калия"
+" или сульфат алюмокалия. Часто называются просто квасцами, так как это самый"
+" важный член общего класса соединений."
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr "порошок краситель для ткани"
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr ""
+"Это порошкообразный краситель для ткани, который можно использовать для "
+"окрашивания, разведя водой и небольшим количеством растворителя."
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr "стальная пряжка"
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr "Стальная пряжка, которую обычно носят на ремнях."
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr "пластиковая кнопка"
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr "Обычная пластиковая кнопка для одежды."
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr "стальная кнопка"
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr "Обычная стальная кнопка для одежды."
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr "деревянная кнопка"
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr ""
+"Грубая деревянная пуговица, обычно встречающаяся на очень старой одежде."
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr "застежка из стали"
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr "Обычная стальная застежка для одежды."
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr "застежка"
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr ""
+"Это пара полосок ткани: у одной крошечные крючки, а у другой крошечные "
+"петельки. Полезно в качестве застежки для одежды и обуви."
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr "длинная пластиковая молния"
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr "Обычная длинная пластиковая молния для одежды."
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr "короткая пластиковая молния"
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr ""
+"Короткая молния из пластика, которая обычно пришивается на карманы одежды "
+"или на обувь."
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -5235,14 +5427,14 @@ msgstr[3] "цинк"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
 msgstr ""
-"Немного хрупкий металл. Помимо того, что он является важным минералом, в "
-"котором нуждается организм, он легко реагирует с кислотами, щелочами и "
-"другими неметаллами. Он может быть измельчён, чтобы сделать порошок цинка, "
-"используемый в производстве батарей, среди прочего."
+"Ломкий металл. Помимо того, что он является важным минералом, в котором "
+"нуждается организм, он легко реагирует с кислотами, щелочами и другими "
+"неметаллами. Может быть измельчён, чтобы сделать порошок цинка, используемый"
+" в производстве батарей и других вещей."
 
 #: lang/json/AMMO_from_json.py
 msgid "lead"
@@ -5335,11 +5527,11 @@ msgstr "дверная петля"
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
 msgstr ""
-"Небольшой металлический шарнир из двух металлических пластин с отверстиями "
-"для шурупов. Применяется для навески дверей."
+"Две небольшие металлические пластины с отверстиями для крепежа, соединенные "
+"шарниром. Применяется для навески дверей."
 
 #: lang/json/AMMO_from_json.py
 msgid "tin powder"
@@ -5351,6 +5543,8 @@ msgid ""
 "A fine gray powder composed of tin, usable for making solder and lining "
 "containers to prevent corrosion."
 msgstr ""
+"Мелкая серая оловянная пыль, пригодная для изготовления припоя и лужения "
+"ёмкостей во избежание коррозии."
 
 #: lang/json/AMMO_from_json.py
 msgid "solder"
@@ -5398,6 +5592,460 @@ msgstr ""
 "Кусочек запала, достаточно длинный, чтобы вы успели отбежать от большинства "
 "взрывчатки."
 
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr "резиновая подошва"
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr ""
+"Это обычная резиновая подошва. Может быть использована для изготовления "
+"ботинок."
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] "обрезок хлопчатобумажной ткани"
+msgstr[1] "обрезка хлопчатобумажной ткани"
+msgstr[2] "обрезки хлопчатобумажной ткани"
+msgstr[3] "обрезки хлопчатобумажной ткани"
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr ""
+"Маленькие кусочки хлопчатобумажной ткани разной формы, отходы пошива одежды."
+" Не особо полезны и обычно выбрасываются, но, если хотите, можно разорвать "
+"на нитки."
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] "обрезок искусственного меха"
+msgstr[1] "обрезка искусственного меха"
+msgstr[2] "обрезки искусственного меха"
+msgstr[3] "обрезки искусственного меха"
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+"Маленькие кусочки искусственного меха разной формы, отходы пошива одежды. Не"
+" особо полезны и обычно выбрасываются."
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] "войлочный обрезок"
+msgstr[1] "войлочных обрезка"
+msgstr[2] "войлочных обрезка"
+msgstr[3] "войлочные обрезки"
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr ""
+"Маленькие кусочки войлока разной формы, отходы пошива одежды. Не особо "
+"полезны и обычно выбрасываются, но, если хотите, можете переработать их в "
+"шерсть."
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] "меховой обрезок"
+msgstr[1] "меховых обрезка"
+msgstr[2] "меховых обрезка"
+msgstr[3] "меховые обрезки"
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr ""
+"Маленькие кусочки меха разной формы, отходы пошива одежды. Не особо полезны "
+"и обычно выбрасываются."
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] "кевларовый кусочек"
+msgstr[1] "кевларовые кусочки"
+msgstr[2] "кевларовые кусочки"
+msgstr[3] "кевларовые кусочки"
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+"Маленькие кусочки кевлара разной формы, отходы пошива одежды. Обычно их "
+"выбрасывают, но поскольку кевлар очень трудно изготовить в "
+"постапокалиптическом мире, возможно, стоит переработать его в кевларовые "
+"нити."
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] "кожаный обрезок"
+msgstr[1] "кожаных обрезка"
+msgstr[2] "кожаных обрезков"
+msgstr[3] "кожаные обрезки"
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+"Маленькие кусочки кожи разной формы, отходы пошива одежды. Не особо полезны "
+"и обычно выбрасываются."
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] "обрезок лайкры"
+msgstr[1] "обрезка лайкры"
+msgstr[2] "обрезка лайкры"
+msgstr[3] "обрезки лайкры"
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr ""
+"Маленькие кусочки лайкры разной формы, отходы пошива одежды. Не особо "
+"полезны и обычно выбрасываются."
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] "неопреновый обрезок"
+msgstr[1] "неопреновых обрезка"
+msgstr[2] "неопреновых обрезка"
+msgstr[3] "неопреновые обрезки"
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr ""
+"Маленькие кусочки неопрена разной формы, отходы пошива одежды. Не особо "
+"полезны и обычно выбрасываются."
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] "обрезок синтетики"
+msgstr[1] "обрезка синтетики"
+msgstr[2] "обрезка синтетики"
+msgstr[3] "обрезки синтетики"
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr ""
+"Маленькие кусочки синтетической ткани разной формы, отходы пошива одежды. Не"
+" особо полезны и обычно выбрасываются."
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] "обрезок номекса"
+msgstr[1] "обрезка номекса"
+msgstr[2] "обрезков номекса"
+msgstr[3] "обрезки номекса"
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr ""
+"Маленькие кусочки номекса разной формы, отходы пошива одежды. Обычно их "
+"выбрасывают, но поскольку номекс очень трудно изготовить в "
+"постапокалиптическом мире, возможно, стоит переработать его."
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr "отрез хлопчатобумажной ткани"
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr "Отрез из хлопчатобумажной ткани, подходит для пошива одежды."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] "шитый лоскут хлопчатобумажной ткани"
+msgstr[1] "сшитых лоскута хлопчатобумажной ткани"
+msgstr[2] "сшитых лоскута хлопчатобумажной ткани"
+msgstr[3] "сшитые лоскуты хлопчатобумажной ткани"
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+"Мешанина различных кусочков хлопчатобумажной ткани, сшитых вместе.  Подходит"
+" для пошива одежды, хотя по времени получится много дольше, нежели при "
+"использовании цельных отрезов ткани."
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr "отрез искусственного меха"
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr "Отрез крашеного искусственного меха, подходящий для пошива одежды."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] "шитый лоскут искусственного меха"
+msgstr[1] "сшитых лоскута искусственного меха"
+msgstr[2] "сшитых лоскута искусственного меха"
+msgstr[3] "сшитые лоскуты искусственного меха"
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr ""
+"Мешанина сшитых вместе отрезков шуб и воротников из искусственного меха. "
+"Подходит для пошива одежды, хотя получится много дольше по времени, нежели "
+"при использовании цельных отрезов меха."
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr "лист войлока"
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr "Лист войлока, подходящий для пошива одежды."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] "шитые лоскут войлока"
+msgstr[1] "сшитых лоскута войлока"
+msgstr[2] "сшитых лоскутов войлока"
+msgstr[3] "сшитые лоскуты войлока"
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr ""
+"Мешанина сшитых вместе лоскутков и деталей одежды из войлока. Подходит для "
+"пошива одежды, хотя по времени получится много дольше, нежели при "
+"использовании цельных листов войлока."
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr "лист кевлара"
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr ""
+"Лист из кевларовой синтетической ткани, пригодный для изготовления "
+"пуленепробиваемой брони. В этом виде, в отличие от жестких пластин, его "
+"можно прошивать."
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr "отрез лайкры"
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr ""
+"Кусок синтетической ткани, смешанный с эластичными волокнами лайкры, "
+"подходит для создания гибкой, но прочной одежды."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] "шитый лоскут лайкры"
+msgstr[1] "сшитых лоскута лайкры"
+msgstr[2] "сшитых лоскутов лайкры"
+msgstr[3] "сшитые лоскуты лайкры"
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+"Мешанина различных лоскутков лайкры, сшитых вместе. Подходит для пошива "
+"одежды, хотя по времени получится много дольше, нежели при использовании "
+"цельных отрезов лайкры."
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] "лист неопрена"
+msgstr[1] "листа неопрена"
+msgstr[2] "листов неопрена"
+msgstr[3] "лист неопрена"
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr ""
+"Лист из неопрена, синтетического каучука, подходящего для изготовления "
+"подводного снаряжения."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] "шитый лоскут неопрена"
+msgstr[1] "сшитых лоскута неопрена"
+msgstr[2] "сшитых лоскутов неопрена"
+msgstr[3] "сшитые лоскуты неопрена"
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr ""
+"Мешанина различных кусочков неопрена, сшитых вместе, с водонепроницаемыми "
+"швами.  Подходит для пошива одежды, хотя получится много дольше по времени, "
+"нежели при использовании цельных листов неопрена."
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr "лист номекса"
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr ""
+"Лист из синтетической ткани номекс, пригодный для изготовления термостойкой "
+"одежды."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] "шитый лоскут номекса"
+msgstr[1] "сшитых лоскута номекса"
+msgstr[2] "сшитых лоскута номекса"
+msgstr[3] "сшитые лоскуты номекса"
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr ""
+"Мешанина сшитых вместе лоскутков номекса номексовой же нитью. Подходит для "
+"пошива одежды, хотя по времени получится много дольше, нежели при "
+"использовании цельных листов номекса."
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr "отрез синтетической ткани"
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr "Отрез из синтетической ткани, подходит для пошива одежды."
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] "шитый лоскут синтетической ткани"
+msgstr[1] "сшитых лоскута синтетической ткани"
+msgstr[2] "сшитых лоскута синтетической ткани"
+msgstr[3] "сшитые лоскуты синтетической ткани"
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr ""
+"Мешанина различных лоскутков синтетической ткани, сшитых вместе. Подходит "
+"для пошива одежды, хотя по времени получится много дольше, нежели при "
+"использовании цельных отрезов ткани."
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr "кевларовая нить"
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+"Очень прочная кевларовая нить, которая особенно полезна для изготовления "
+"бронежилетов, хотя в, большинстве случаев, её можно использовать и вместо "
+"обычной нити. Для изготовления листов из кевлара, пригодных для брони, "
+"необходим особенно плотный пошив и, поэтому, потребуется специальное "
+"оборудование."
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr "номексная нить"
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr ""
+"Термостойкая номексная нить, которая особенно полезна для изготовления "
+"термозащитного оборудования, хотя, в большинстве случаев, её можно "
+"использовать и вместо обычных ниток."
+
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
 msgid_plural "handloaded .22 CB"
@@ -6064,6 +6712,21 @@ msgstr ""
 "предназначенные для возгорания при ударе, пробивания брони и поджигания "
 "горючих веществ."
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr "орихалковая стрела"
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr ""
+"Стрела, содержащая осколок орихалка. Стрела испускает таинственное свечение."
+" Имеет очень высокий шанс остаться целым при выстреле, однако может быть "
+"запущена только из Ихайвалья."
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -6123,12 +6786,35 @@ msgstr[3] "Кристаллизованная мана"
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
 msgstr ""
 "Немного кристаллизованной маны. Может быть заряжена в перезаряжаемый "
 "кристалл маны, но после этого не может быть извлечена."
 
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr "кусок орихалка"
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr "Тяжёлый кусок странного металла. Используется в некоторых рецептах."
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr "Осколок орихалка"
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
+msgstr ""
+"Осколок странного светящегося металла. Можно использовать в качестве оружия,"
+" но лучше подходит для крафта."
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "fire lance charge"
 msgstr "заряд для «огненного копья»"
@@ -6735,15 +7421,6 @@ msgstr ""
 "Эта смесь различных органических веществ содержит всё необходимое для "
 "здоровья сгустка слизи. Вы думаете…"
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "камень"
-msgstr[1] "камня"
-msgstr[2] "камней"
-msgstr[3] "камень"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -7266,10 +7943,10 @@ msgstr "Очень тяжёлые латы, дающие неплохую защ
 #: lang/json/ARMOR_from_json.py
 msgid "riot armor"
 msgid_plural "riot armors"
-msgstr[0] "Бронежилет спецназа"
-msgstr[1] "Бронежилетов спецназа"
-msgstr[2] "Бронежилетов спецназа"
-msgstr[3] "Бронежилеты спецназа"
+msgstr[0] "бронежилет спецназа"
+msgstr[1] "бронежилета спецназа"
+msgstr[2] "бронежилетов спецназа"
+msgstr[3] "бронежилеты спецназа"
 
 #. ~ Description for riot armor
 #: lang/json/ARMOR_from_json.py
@@ -7409,8 +8086,10 @@ msgstr[3] "перевязи"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "Вы убираете %s."
@@ -8190,6 +8869,56 @@ msgstr ""
 "Подогнанный под себя кольчужный жилет. Представляет собой кольчугу без "
 "рукавов с маленькими ремнями, рассчитанную для лучшего распределения веса."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] "кольчужные поножи"
+msgstr[1] "кольчужных поножи"
+msgstr[2] "кольчужных поножей"
+msgstr[3] "кольчужные поножи"
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr "Подходящая пара кольчужных поножей с носками, которые защищают ноги."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] "кольчужные перчатки"
+msgstr[1] "кольчужные перчатки"
+msgstr[2] "кольчужных перчаток"
+msgstr[3] "кольчужные перчатки"
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr ""
+"Подходящая пара кольчужных перчаток. Они полностью закрывают пальцы и "
+"обеспечивают отличную защиту, но несколько громоздки."
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] "кольчужный костюм фарадея"
+msgstr[1] "кольчужных костюма фарадея"
+msgstr[2] "кольчужных костюмов фарадея"
+msgstr[3] "кольчужные костюмы фарадея"
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+"Кольчужный костюм, который можно одеть поверх обычной одежды. Обладает "
+"хорошей проводимостью, защищая от электричества."
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -8376,6 +9105,32 @@ msgid ""
 msgstr ""
 "Красочный и смешной клоунский костюм. Прилично увеличивает доступное место."
 
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] "клоунский парик"
+msgstr[1] "клоунских парика"
+msgstr[2] "клоунских париков"
+msgstr[3] "клоунские парики"
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr "Красочный и смешной клоунский парик."
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] "клоунский нос"
+msgstr[1] "клоунских носа"
+msgstr[2] "клоунских носов"
+msgstr[3] "клоунские носы"
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr "Красный пластмассовый нос, который вы часто видели у клоунов."
+
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
@@ -8703,6 +9458,28 @@ msgstr[3] "рубашка"
 msgid "A white button-down shirt with long sleeves.  Looks professional!"
 msgstr "Белая рубашка с пуговицами и длинными рукавами. Выглядит официально!"
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] "питьевой наголовник"
+msgstr[1] "питьевых наголовника"
+msgstr[2] "питьевых наголовников"
+msgstr[3] "питьевые наголовники"
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+"Самодельная оснастка, которая может надеваться на головной убор или просто "
+"на голову, сделанная из пары маленьких емкостей, резиновых трубок и "
+"нескольких проволок. Удобное и простое устройство для питья без помощи рук. "
+"Вот только жидкость выльется, если вы положите его в рюкзак."
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -8877,6 +9654,40 @@ msgstr[3] "поясная сумка"
 msgid "Provides a bit of extra storage, with minimal encumbrance."
 msgstr "Увеличивает вместимость при минимальном увеличении скованности."
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] "пластрон"
+msgstr[1] "пластрон"
+msgstr[2] "пластрон"
+msgstr[3] "пластроны"
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr ""
+"Туго накрахмаленный хлопковый нагрудник, который защищает большую часть "
+"тела, плечи и подмышки при фехтовании."
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] "протектор груди"
+msgstr[1] "протектора груди"
+msgstr[2] "протекторов груди"
+msgstr[3] "протекторы груди"
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr ""
+"Жесткий пластиковый нагрудник с формованными чашечками для фехтовальщиц, "
+"применяемый при фехтовании для защиты груди."
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -8895,6 +9706,46 @@ msgstr ""
 "для предотвращения несчастных случаев. Она не предоставляет какого-либо "
 "места для хранения, но она очень удобная."
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] "электрожилет (для рапиры)"
+msgstr[1] "электрожилета (для рапиры)"
+msgstr[2] "электрожилет (для рапиры)"
+msgstr[3] "электрожилеты (для рапиры)"
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr ""
+"Тонкий, легкий проводящий жилет с молнией на спине, используемый "
+"фехтовальщиками для электронного подсчета очков. Его внешний слой "
+"представляет собой стёганную смесь из прочного хлопка и проволоки из "
+"нержавеющей стали."
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] "электрокуртка (для сабли)"
+msgstr[1] "электрокуртки (для сабли)"
+msgstr[2] "электрокурток (для сабли)"
+msgstr[3] "электрокуртки (для сабли)"
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr ""
+"Тонкая, легкая проводящая куртка с молнией на спине, используемая "
+"фехтовальщиками для электронного подсчета очков. Её внешний слой "
+"представляет собой стёганную смесь из прочного хлопка и проволоки из "
+"нержавеющей стали."
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -8923,6 +9774,40 @@ msgid "A pair of reinforced pants used by fencers to prevent injuries."
 msgstr ""
 "Укреплённые штаны, используемые фехтовальщиками для предотвращения травм."
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] "фехтовальная перчатка"
+msgstr[1] "фехтовальные перчатки"
+msgstr[2] "фехтовальных перчаток"
+msgstr[3] "фехтовальные перчатки"
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr ""
+"Перчатка из замши с прочным хлопковым запястьем, мягкой тыльной частью и "
+"хорошо облегающими пальцами."
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] "фехтовальная перчатка (левая)"
+msgstr[1] "фехтовальных перчатки (левых)"
+msgstr[2] "фехтовальных перчаток (левых)"
+msgstr[3] "фехтовальные перчатки (левые)"
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr ""
+"Перчатка из замши с прочным хлопковым запястьем, мягкой тыльной частью и "
+"хорошо облегающими пальцами. Для левшей."
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -9390,24 +10275,6 @@ msgstr[3] "пара меховых перчаток"
 msgid "A pair of warm fur gloves.  They are somewhat cumbersome."
 msgstr "Пара тёплых меховых перчаток. Выглядят немного громоздкими."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] "пара водолазных перчаток выживальщика"
-msgstr[1] "пары водолазных перчаток выживальщика"
-msgstr[2] "пар водолазных перчаток выживальщика"
-msgstr[3] "пара водолазных перчаток выживальщика"
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr ""
-"Пара подогнанных под себя и укреплённых кевларом неопреновых перчаток. "
-"Удобны для ношения и обеспечивают максимальную защиту при экстремальных "
-"условиях."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -9485,6 +10352,25 @@ msgstr ""
 "Пара подогнанных под себя и укреплённых кевларом тканых перчаток. Удобны для"
 " ношения и обеспечивают максимальную защиту при экстремальных условиях."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] "пара перчаток выживальщика без пальцев"
+msgstr[1] "пары перчаток выживальщика без пальцев"
+msgstr[2] "пар перчаток выживальщика без пальцев"
+msgstr[3] "пара перчаток выживальщика без пальцев"
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr ""
+"Пара подогнанных под себя и укреплённых кевларом тканых перчаток без "
+"пальцев. Удобны для ношения и обеспечивают максимальную защиту при "
+"экстремальных условиях."
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -9775,19 +10661,6 @@ msgstr ""
 "Большие очки, полностью изолирующие глаза. Хорошо защищают от опасностей "
 "окружающей среды."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] "очки для плавания"
-msgstr[1] "очков для плавания"
-msgstr[2] "очков для плавания"
-msgstr[3] "очки для плавания"
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "Маленькие очки для плавания."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -9836,24 +10709,6 @@ msgstr ""
 "Тяжёлое шерстяное пальто в полный рост. Громоздкое, но тёплое и с глубокими "
 "карманами."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] "укреплённый гидрокостюм"
-msgstr[1] "укреплённых гидрокостюма"
-msgstr[2] "укреплённых гидрокостюмов"
-msgstr[3] "укреплённый гидрокостюм"
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr ""
-"Самодельная лёгкая броня, сделанная из бронежилета и усиленного комбинезона "
-"из неопрена. Защищает от вредной среды и повреждений."
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -10492,22 +11347,6 @@ msgstr ""
 "Подогнанный под себя укреплённый капюшон из номекса и кевлара. Очень крепкий"
 " и прочный."
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] "укреплённый капюшон гидрокостюма"
-msgstr[1] "укреплённых капюшона гидрокостюма"
-msgstr[2] "укреплённых капюшонов гидрокостюма"
-msgstr[3] "укреплённый капюшон гидрокостюма"
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr ""
-"Подогнанный под себя укреплённый капюшон из неопрена и кевлара. Очень "
-"крепкий и прочный."
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -11412,18 +12251,25 @@ msgstr[2] "кожаных ремней"
 msgstr[3] "кожаный ремень"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "Вы прикрепили %s на %s."
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "Что прикрепить к поясу?"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
 msgstr "Кожаный ремень. Затянутый в штаны, он подгоняет их по фигуре."
 
@@ -11634,6 +12480,25 @@ msgstr ""
 "Набедренный подсумок, используемый военными для сброса пустых магазинов во "
 "время перестрелок."
 
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] "трико"
+msgstr[1] "трико"
+msgstr[2] "трико"
+msgstr[3] "трико"
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr ""
+"Обтягивающая одежда из спандекса, покрывающая тело от паха до плеч. С его "
+"глубоким вырезом на спине и высокими разрезами на талии, эта одежда идеально"
+" подходит для демонстрации вашего телосложения на сцене."
+
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
 msgid_plural "Linux t-shirts"
@@ -12674,41 +13539,6 @@ msgstr ""
 "Большие регулируемые ножны для ношения мечей и других больших клинков. "
 "Активируйте, чтобы вложить/достать оружие."
 
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] "противоакулий костюм"
-msgstr[1] "противоакульих костюма"
-msgstr[2] "противоакульих костюмов"
-msgstr[3] "противоакулий костюм"
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr ""
-"Кольчужный монокостюм, используемый ныряльщиками для защиты от укусов акул. "
-"В комплекте идёт пластиковый шлем и ботинки."
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] "фарадеев противоакулий костюм"
-msgstr[1] "фарадеева противоакульх костюма"
-msgstr[2] "фарадеевых противоакульих костюмов"
-msgstr[3] "фарадеев противоакулий костюм"
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr ""
-"Кольчужный монокостюм, используемый ныряльщиками для защиты от укусов акул. "
-"Он стал электрически взаимосвязан, что дало защиту от электричества."
-
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
 msgid_plural "sheathes"
@@ -12799,6 +13629,23 @@ msgstr ""
 "Джинсовые шорты. Сделанные из толстой и прочной ткани, они обеспечивают "
 "отличную защиту от порезов."
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] "терморубашка"
+msgstr[1] "терморубашки"
+msgstr[2] "терморубашек"
+msgstr[3] "терморубашки"
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr ""
+"Легкая облегающая рубашка из спандекса с длинными рукавами, которая "
+"поддерживает температуру тела."
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
@@ -13377,11 +14224,11 @@ msgstr[3] "костюм подопытного"
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
 msgstr ""
 "Тонкий, с короткими рукавами и штанинами цельный костюм. Если судить по "
-"странному фасону и подгонке… похоже, вам не очень хочется знать, кто мог "
+"странному фасону и подгонке… Похоже, вам не очень хочется знать, кто мог "
 "носить его. Обеспечивает небольшую вместимость и не сильно обременяет вас."
 
 #: lang/json/ARMOR_from_json.py
@@ -13472,6 +14319,7 @@ msgstr[3] "пояс выживальщика"
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "Вложить клинок в ножны"
@@ -13945,19 +14793,6 @@ msgstr ""
 " шляпа промаслена от воды. Если вы «начальник» поселения или капитан "
 "постапокалиптического экипажа, эта шляпа для вас."
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] "плавки"
-msgstr[1] "плавок"
-msgstr[2] "плавок"
-msgstr[3] "плавки"
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "Плавки с сеточкой."
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
@@ -14279,68 +15114,6 @@ msgstr ""
 "Элегантная жилетка. Идеально подходит для тех случаев, когда в одной рубашке"
 " было бы слишком обычно, а костюм будет чересчур."
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] "гидрокостюм"
-msgstr[1] "гидрокостюма"
-msgstr[2] "гидрокостюмов"
-msgstr[3] "гидрокостюм"
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "Гидрокостюм из неопрена."
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] "пара перчаток для плавания"
-msgstr[1] "пары перчаток для плавания"
-msgstr[2] "пар перчаток для плавания"
-msgstr[3] "пара перчаток для плавания"
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr ""
-"Эластичные неопрено-силиконовые резиновые перчатки с перепонками, пригодные "
-"для использования под водой."
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] "капюшон гидрокостюма"
-msgstr[1] "капюшона гидрокостюма"
-msgstr[2] "капюшонов гидрокостюма"
-msgstr[3] "капюшон гидрокостюма"
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr "Неопреновый капюшон. Обычно используется водолазами."
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] "короткий гидрокостюм"
-msgstr[1] "коротких гидрокостюма"
-msgstr[2] "коротких гидрокостюмов"
-msgstr[3] "короткий гидрокостюм"
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr ""
-"Гидрокостюм для сёрфинга с длинными рукавами, оформлен в розовых цветах. "
-"Обеспечивает меньшую защиту по сравнению с обычным гидрокостюмом, зато "
-"меньше сковывает."
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -14753,6 +15526,47 @@ msgstr ""
 "Пластиковое полотно с несколькими кольцами для закрепления при помощи "
 "верёвки или шнура. Пригодится как самодельная защита от дождя."
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] "комбинезон"
+msgstr[1] "комбинезона"
+msgstr[2] "комбинезоны"
+msgstr[3] "комбинезоны"
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+"Обтягивающая одежда из спандекса, напоминающая купальник с круглым вырезом в"
+" сочетании с леггинсами. Комбинезон, обычно используемый гимнастами, "
+"танцорами и конными прыгунами, обеспечивает общее покрытие с отличной "
+"гибкостью."
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] "зентай"
+msgstr[1] "зентай"
+msgstr[2] "зентай"
+msgstr[3] "зентай"
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+"Сокращенно от «zenshin taitsu», зентай — это форма одежды из нейлона и "
+"полиуретана. Полностью закрытый костюм, сильно облегающий, с маской (без "
+"глаз и рта) и перчатками, где нет ни миллиметра обнажённого тела. Имея "
+"парочку таких, совместно с друзьями вы можете устроить кабуки."
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -17012,7 +17826,7 @@ msgid ""
 "cuffs of dress shirts - a must-have for men in formal wear.  You can wear it"
 " if you like, but it won't provide any effects."
 msgstr ""
-"Простая пара серебряных запонок. Запонками защищают петли манжет рубашек - "
+"Простая пара серебряных запонок. Запонками защищают петли манжет рубашек — "
 "это обязательный атрибут официального мужского костюма. Если хотите, можете "
 "их носить, но это ничего вам не даст."
 
@@ -17424,7 +18238,7 @@ msgid ""
 "another rare metal.  You can wear it if you like, but it won't provide any "
 "effects."
 msgstr ""
-"Пара серёжек из чистой платины - если надоело золото, возьмите другой "
+"Пара серёжек из чистой платины — если надоело золото, возьмите другой "
 "драгоценный металл. Вы можете их носить, но это ничего вам не даст."
 
 #: lang/json/ARMOR_from_json.py
@@ -17476,7 +18290,7 @@ msgid ""
 "A platinum necklace, with a small, empty heart frame hanging from a chain.  "
 "You can wear it if you like, but it won't provide any effects."
 msgstr ""
-"Платиновое ожерелье - маленькая рамка в виде сердечка на цепочке. Если "
+"Платиновое ожерелье — маленькая рамка в виде сердечка на цепочке. Если "
 "хотите, можете его носить, но это ничего вам не даст."
 
 #: lang/json/ARMOR_from_json.py
@@ -17517,10 +18331,10 @@ msgstr ""
 #: lang/json/ARMOR_from_json.py
 msgid "purity ring"
 msgid_plural "purity rings"
-msgstr[0] "кольцо чистоты"
-msgstr[1] "кольца чистоты"
-msgstr[2] "колец чистоты"
-msgstr[3] "кольца чистоты"
+msgstr[0] "кольцо целомудрия"
+msgstr[1] "кольца целомудрия"
+msgstr[2] "колец целомудрия"
+msgstr[3] "кольца целомудрия"
 
 #. ~ Description for purity ring
 #: lang/json/ARMOR_from_json.py
@@ -17529,7 +18343,7 @@ msgid ""
 " one bears the inscription, \"Love is patient.\""
 msgstr ""
 "Ещё оно называется кольцо обещания, его носят как знак непорочности. На нём "
-"написано \"Любовь терпелива\"."
+"написано «Любовь терпелива»."
 
 #: lang/json/ARMOR_from_json.py
 msgid "signet ring"
@@ -17564,7 +18378,7 @@ msgid ""
 "A flawless ring, ensnaring a diamond with twists of pure gold.  It's a "
 "constant reminder that the wearer is married."
 msgstr ""
-"Безупречное кольцо - алмаз, охваченный завитками из чистого золота. "
+"Безупречное кольцо — алмаз, охваченный завитками из чистого золота. "
 "Постоянное напоминание, что его обладатель женат."
 
 #: lang/json/ARMOR_from_json.py
@@ -18174,6 +18988,181 @@ msgstr ""
 "силовой броне ДаблТех, системам управления и климат-контроля требуется "
 "прямой контакт с кожей."
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] "плавки"
+msgstr[1] "плавок"
+msgstr[2] "плавок"
+msgstr[3] "плавки"
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "Плавки с сеточкой."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] "гидрокостюм"
+msgstr[1] "гидрокостюма"
+msgstr[2] "гидрокостюмов"
+msgstr[3] "гидрокостюм"
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "Гидрокостюм из неопрена."
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] "капюшон гидрокостюма"
+msgstr[1] "капюшона гидрокостюма"
+msgstr[2] "капюшонов гидрокостюма"
+msgstr[3] "капюшон гидрокостюма"
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr "Неопреновый капюшон. Обычно используется водолазами."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] "укреплённый капюшон гидрокостюма"
+msgstr[1] "укреплённых капюшона гидрокостюма"
+msgstr[2] "укреплённых капюшонов гидрокостюма"
+msgstr[3] "укреплённый капюшон гидрокостюма"
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr ""
+"Подогнанный под себя укреплённый капюшон из неопрена и кевлара. Очень "
+"крепкий и прочный."
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] "укреплённый гидрокостюм"
+msgstr[1] "укреплённых гидрокостюма"
+msgstr[2] "укреплённых гидрокостюмов"
+msgstr[3] "укреплённый гидрокостюм"
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr ""
+"Самодельная лёгкая броня, сделанная из бронежилета и усиленного комбинезона "
+"из неопрена. Защищает от вредной среды и повреждений."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] "пара водолазных перчаток выживальщика"
+msgstr[1] "пары водолазных перчаток выживальщика"
+msgstr[2] "пар водолазных перчаток выживальщика"
+msgstr[3] "пара водолазных перчаток выживальщика"
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr ""
+"Пара подогнанных под себя и укреплённых кевларом неопреновых перчаток. "
+"Удобны для ношения и обеспечивают максимальную защиту при экстремальных "
+"условиях."
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] "короткий гидрокостюм"
+msgstr[1] "коротких гидрокостюма"
+msgstr[2] "коротких гидрокостюмов"
+msgstr[3] "короткий гидрокостюм"
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr ""
+"Гидрокостюм для сёрфинга с длинными рукавами, оформлен в розовых цветах. "
+"Обеспечивает меньшую защиту по сравнению с обычным гидрокостюмом, зато "
+"меньше сковывает."
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] "фарадеев противоакулий костюм"
+msgstr[1] "фарадеева противоакульх костюма"
+msgstr[2] "фарадеевых противоакульих костюмов"
+msgstr[3] "фарадеев противоакулий костюм"
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+"Кольчужный монокостюм, используемый ныряльщиками для защиты от укусов акул. "
+"Он стал электрически взаимосвязан, что дало защиту от электричества."
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] "противоакулий костюм"
+msgstr[1] "противоакульих костюма"
+msgstr[2] "противоакульих костюмов"
+msgstr[3] "противоакулий костюм"
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr ""
+"Кольчужный монокостюм, используемый ныряльщиками для защиты от укусов акул. "
+"В комплекте идёт пластиковый шлем и ботинки."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] "очки для плавания"
+msgstr[1] "очков для плавания"
+msgstr[2] "очков для плавания"
+msgstr[3] "очки для плавания"
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "Маленькие очки для плавания."
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] "пара перчаток для плавания"
+msgstr[1] "пары перчаток для плавания"
+msgstr[2] "пар перчаток для плавания"
+msgstr[3] "пара перчаток для плавания"
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr ""
+"Эластичные неопрено-силиконовые резиновые перчатки с перепонками, пригодные "
+"для использования под водой."
+
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
 msgid_plural "helmet nettings"
@@ -18986,6 +19975,70 @@ msgstr[1] "ружейных патронташа"
 msgstr[2] "ружейных патронташей"
 msgstr[3] "ружейный патронташ"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] "пояс техноманта"
+msgstr[1] "пояса техноманта"
+msgstr[2] "поясов техноманта"
+msgstr[3] "пояса техноманта"
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr ""
+"Специальный кожаный пояс с инструментами, который мгновенно создает любой "
+"инструмент, который вам нужен. Активируйте, чтобы положить/достать орудие."
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] "сапоги-скороходы"
+msgstr[1] "сапога-скорохода"
+msgstr[2] "сапогов-скороходов"
+msgstr[3] "сапоги-скороходы"
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr ""
+"Прочные, но чрезвычайно удобные облегающие сапоги из потёртой кожи и стали. "
+"Выглядят так, как будто ими очень долго пользовались, но, вероятно, выдержат"
+" гораздо дольше. Наделяют способностью передвигаться с большой скоростью."
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] "сапоги спешки"
+msgstr[1] "сапога спешки"
+msgstr[2] "сапогов спешки"
+msgstr[3] "сапоги спешки"
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] "сапоги заземления"
+msgstr[1] "сапога заземления"
+msgstr[2] "сапогов заземления"
+msgstr[3] "сапоги заземления"
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr ""
+"Прочные, но чрезвычайно удобные облегающие сапоги из кожи, гравированные "
+"маленькими резиновыми рунами. При ношении вы невосприимчивы к урону от "
+"электричества."
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -19014,10 +20067,10 @@ msgstr[3] "медные венцы"
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
 msgstr ""
-"Деревянная полоска с медным обрамлением для ношения на голове. Когда вы его "
+"Деревянный обруч с медным обрамлением для ношения на голове. Когда вы его "
 "надеваете и касаетесь висков, то ощущаете невероятное спокойствие."
 
 #: lang/json/ARMOR_from_json.py
@@ -19263,6 +20316,28 @@ msgstr ""
 "щупалец хватают и удерживают всё, что вы положите внутрь. Она движется и "
 "сокращается, чтобы минимизировать скованность."
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -19833,6 +20908,9 @@ msgid ""
 " sensors.  However, this doesn't prevent detection from other means such as "
 "infrared, sonar, etc."
 msgstr ""
+"Эта мощная система при помощи камер и светодиодов помогает слиться с фоном и"
+" делает владельца полностью невидимым для обычного зрения. Однако не мешает "
+"обнаружению при помощи инфракрасного зрения, сонара и т.д."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Close Quarters Battle CBM"
@@ -19963,12 +21041,12 @@ msgstr[3] "КБМ: Сжигатель этанола"
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
 msgstr ""
-"Реактор, сжигающий алкоголь как очень эффективное топливо. Однако обладатель"
-" всё равно будет страдать от воздействия алкоголя на организм."
+"Реактор, сжигающий алкоголь как очень эффективное топливо. Он может вместить"
+" до 500 мл этанола, метанола или денатурата."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Aero-Evaporator CBM"
@@ -19979,8 +21057,7 @@ msgstr[2] "КБМ: Воздушный конденсатор испарений"
 msgstr[3] "КБМ: Воздушный конденсатор испарений"
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -20038,6 +21115,9 @@ msgid ""
 "module lets the user alter their facial structure so as to subtly affect the"
 " reactions of others.  This grants a bonus to all social interactions."
 msgstr ""
+"С помощью направленных электрохимических импульсов этот модуль позволяет "
+"менять структуру лица, незаметно влияя на реакцию окружающих. Это "
+"гарантирует бонусы ко всем социальным взаимодействиям."
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Dielectric Capacitance System CBM"
@@ -20067,10 +21147,10 @@ msgstr[3] "КБМ: Пальцехак"
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
 "Миниатюрный электрохак, хирургически имплантируемый в палец на правой руке. "
 "Это универсальный инструмент для взлома панелей управления и подобных вещей,"
@@ -20560,7 +21640,7 @@ msgstr[3] "КБМ: Интерфейс силовой брони Мк. II"
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
 "Связывает вашу энергосистему с внутренними портами зарядки силовой брони, "
@@ -21292,6 +22372,8 @@ msgid ""
 "You can't recognize what this is supposed to be, but it's a very awkward "
 "thing to have in one's body."
 msgstr ""
+"Вы не можете сообразить, чем это должно быть, но внутри тела ему явно не "
+"место."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Glowy Thing"
@@ -21303,10 +22385,10 @@ msgstr[3] "Светящиеся штуки"
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
 msgstr ""
-"Это… нечто? А ещё оно светится или хотя бы светилось, когда было подключено."
+"Это… Нечто? А ещё оно светится или, по крайне мере, светилось, когда было "
+"подключено."
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Leaky Bionic"
@@ -22050,8 +23132,8 @@ msgstr[3] "«Как приготовить человека»"
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
-msgstr "Это… это поваренная книга!"
+msgid "It's… it's a cookbook!"
+msgstr "Это… Это — поваренная книга!"
 
 #: lang/json/BOOK_from_json.py
 msgid "Cucina Italiana"
@@ -22173,7 +23255,7 @@ msgstr[3] "PE050 «Альфа»: Предварительный доклад"
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
+"\"APPROVED\"…"
 msgstr ""
 "Это пачка документов, описывающих некую новую химическую формулу и её влияние на испытуемых. Имеет штамп «ОДОБРЕНО»… \n"
 "Дата на этих документах была поставлена за две недели до того, как всё это началось."
@@ -22209,12 +23291,12 @@ msgstr[3] "PE065 «Химера»: Эффективное использован
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
 msgstr ""
 "Это пачка документов с подробным описанием новой химической формулы. Также "
 "включает в себя инструкции для её использования в качестве своего рода… "
-"средства борьбы с беспорядками? Здесь что-то не так…"
+"Средства борьбы с беспорядками? Здесь что-то не так…"
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Smythe"
@@ -22229,7 +23311,7 @@ msgstr[3] "лабораторный журнал: Смит"
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
+"look promising but the procurement methods seem awfully vague…"
 msgstr ""
 "Этот журнал группы учёных подробно рассматривает несколько разновидностей "
 "экспериментов с мутагеном, полученном из плоти, заражённой XE037. Результаты"
@@ -22248,10 +23330,10 @@ msgstr[3] "журнал обслуживания коллектора"
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
+"with… a chemical formula?"
 msgstr ""
 "В этой папке собраны материалы планового обслуживания канализационных систем"
-" предприятия. Однако на некоторых листах, похоже, есть… химические формулы?"
+" предприятия. Однако на некоторых листах, похоже, есть… Химические формулы?"
 
 #: lang/json/BOOK_from_json.py
 msgid "chemical reference-CLASSIFIED"
@@ -22307,7 +23389,7 @@ msgstr[3] "PE023 «Медицина»: Применение и результа
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
 msgstr ""
 "Это скоросшиватель, содержащий сугубо специальные документы, описывающие "
 "некую новую химическую формулу и её влияние на испытуемых. Имеет штамп "
@@ -22377,10 +23459,10 @@ msgstr ""
 #: lang/json/BOOK_from_json.py
 msgid "Ye Scots Beuk o Cuikery"
 msgid_plural "copies of Ye Scots Beuk o Cuikery"
-msgstr[0] "Шотландская Поваренная Книга"
-msgstr[1] "Шотландская Поваренная Книга"
-msgstr[2] "Шотландская Поваренная Книга"
-msgstr[3] "Шотландская Поваренная Книга"
+msgstr[0] "шотландская поваренная книга"
+msgstr[1] "шотландские поваренные книги"
+msgstr[2] "шотландских поваренных книг"
+msgstr[3] "шотландская поваренная книга"
 
 #. ~ Description for Ye Scots Beuk o Cuikery
 #: lang/json/BOOK_from_json.py
@@ -22675,7 +23757,7 @@ msgstr[3] "лабораторный журнал: Эррера"
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
+"symbols you've not seen before…"
 msgstr ""
 "Этот массивный скоросшиватель содержит множество чертежей и технических "
 "спецификаций различной электроники. В некоторых чертежах используются "
@@ -22763,13 +23845,13 @@ msgstr[3] "общие чертежи"
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -23218,12 +24300,12 @@ msgstr[3] "«Снаряжение патронов в домашних усло
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
 msgstr ""
-"Всё что вы когда-либо хотели знать о снаряжении патронов в… защищающей от "
-"детей обложке. Правильная мера предосторожности, так как глава о разрывных "
-"патронах имеет очень детальные описания."
+"Всё что вы когда-либо хотели знать о снаряжении патронов в защищённой "
+"оболочке… От детей. Правильная мера предосторожности, так как глава о "
+"разрывных патронах имеет очень детальные описания."
 
 #: lang/json/BOOK_from_json.py
 msgid "Rivtech design binder"
@@ -23882,11 +24964,11 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr ""
 "В этом лабораторном журнале полно коллективных исследований и "
 "усовершенствований касательно ядерной энергетики. Вы пока что не готовы "
-"начать второй Катаклизм, но в целом информация может пригодиться..."
+"начать второй Катаклизм, но в целом информация может пригодиться…"
 
 #: lang/json/BOOK_from_json.py
 msgid "Biodiesel: Renewable Fuel Resource"
@@ -24755,8 +25837,8 @@ msgid ""
 " surprisingly accurate in predicting much of modern society...  Until "
 "recently."
 msgstr ""
-"\"Нейромант\" Гибсона. Книга написана в восьмидесятых и удивительно точно "
-"предсказала современное общество... Ну, до недавнего времени."
+"«Нейромант» Гибсона. Книга написана в восьмидесятых и удивительно точно "
+"предсказала современное общество… Ну, до недавнего времени."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
@@ -24767,7 +25849,7 @@ msgid ""
 "What immortal hand or eye,  \n"
 "Dare frame thy fearful symmetry?"
 msgstr ""
-"\"Звёзды - моя цель\" Альфреда Бестера.\n"
+"«Звёзды — моя цель» Альфреда Бестера.\n"
 "\n"
 "Тигр, Тигр, жгучий страх,\n"
 "Ты горишь в ночных лесах.\n"
@@ -24779,26 +25861,26 @@ msgid ""
 "This is a copy of \"The Lathe of Heaven\" by Ursula Le Guin.  Dirty finger-"
 "stains have smudged the occasional word."
 msgstr ""
-"\"Резец Небесный\" за авторством Урсулы Ле Гуин. Некоторые слова смазаны "
+"«Резец Небесный» за авторством Урсулы Ле Гуин. Некоторые слова смазаны "
 "отпечатками грязных пальцев."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"The Dispossessed\" by Ursula Le Guin."
-msgstr "\"Обделённые\" Урсулы Ле Гуин."
+msgstr "«Обделённые» Урсулы Ле Гуин."
 
 #: lang/json/BOOK_from_json.py
 msgid "This copy of Ray Bradbury's \"Fahrenheit 451\"."
-msgstr "\"451 градус по Фаренгейту\" Рэя Брэдбери."
+msgstr "«451 градус по Фаренгейту» Рэя Брэдбери."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a well-worn copy of \"The Hitchhikers Guide to the Galaxy\" by "
 "Douglas Adams."
-msgstr "Потрёпанный экземпляр \"Автостопом по галактике\" Дугласа Адамса."
+msgstr "Потрёпанный экземпляр «Автостопом по галактике» Дугласа Адамса."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Hyperion\" by Dan Simmons."
-msgstr "\"Гиперион\" Дэна Симмонса."
+msgstr "«Гиперион» Дэна Симмонса."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
@@ -24809,7 +25891,7 @@ msgid ""
 "We are so tired of men \n"
 "And motor-power."
 msgstr ""
-"\"Эндимион\" Дэна Симмонса. В начале книги напечатано стихотворение Д.Г. Лоуренса:\n"
+"«Эндимион» Дэна Симмонса. В начале книги напечатано стихотворение Д.Г. Лоуренса:\n"
 "\n"
 "Дайте нам богов, о дайте нам богов!\n"
 "Мы так устали от людей с их\n"
@@ -24818,52 +25900,52 @@ msgstr ""
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of Philip K. Dick's \"Do Androids Dream of Electric Sheep?\"."
-msgstr "\"Снятся ли андроидам электроовцы?\" Филипа К. Дика."
+msgstr "«Снятся ли андроидам электроовцы?» Филипа К. Дика."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a dog-eared copy of \"Nova Express\" by William Burroughs."
-msgstr "\"Нова Экспресс\" Уильяма Берроуза."
+msgstr "«Нова Экспресс» Уильяма Берроуза."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Foundation\" by Isaac Asimov.  The back cover has been "
 "ripped off."
-msgstr "\"Основание\" Айзека Азимова. У книги оторвана задняя обложка."
+msgstr "«Основание» Айзека Азимова. У книги оторвана задняя обложка."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a dog-eared copy of \"Dune\" by Frank Herbert.  It has sand between "
 "some of its pages.  Weird."
 msgstr ""
-"Изрядно помятая \"Дюна\" Фрэнка Герберта. Между некоторыми страницами песок."
-" Странно."
+"Изрядно помятая «Дюна» Фрэнка Герберта. Между некоторыми страницами песок. "
+"Странно."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"The Trial\" by Franz Kafka.  This book is rather worn."
-msgstr "\"Процесс\" Франца Кафки. Книга довольно помятая."
+msgstr "«Процесс» Франца Кафки. Книга довольно помятая."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"The Handmaid's Tale\" by Margaret Atwood."
-msgstr "\"Рассказ служанки\" Маргарет Этвуд."
+msgstr "«Рассказ служанки» Маргарет Этвуд."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"The Windup Girl\" by Paolo Bacigalupi.  The blurb makes "
 "you wonder how Thailand fared the end of the world."
 msgstr ""
-"\"Заводная\" за авторством Паоло Бачигалупи. Из-за аннотации вам интересно, "
+"«Заводная» за авторством Паоло Бачигалупи. Из-за аннотации вам интересно, "
 "как же Таиланд встретил Конец Света."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Islands in the Net\" by Bruce Sterling."
-msgstr "\"Острова в Сети\" Брюса Стерлинга."
+msgstr "«Острова в Сети» Брюса Стерлинга."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Foundation and Empire\" by Isaac Asimov.  The back page "
 "contains a hand-written grocery list."
 msgstr ""
-"\"Основание и Империя\" Айзека Азимова. Кто-то написал список покупок на "
+"«Основание и Империя» Айзека Азимова. Кто-то написал список покупок на "
 "последней странице."
 
 #: lang/json/BOOK_from_json.py
@@ -24871,15 +25953,15 @@ msgid ""
 "This is an almost new copy of  \"A Scanner Darkly\" by Philip K. Dick.  It "
 "still has the smell of new books within it's pages."
 msgstr ""
-"Совершенно новенький экземпляр \"Помутнения\" Филипа К. Дика. Страницы всё "
-"ещё пахнут свеженапечатанной книгой."
+"Совершенно новенький экземпляр «Помутнения» Филипа К. Дика. Страницы всё ещё"
+" пахнут свеженапечатанной книгой."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Mirrorshades: A Cyberpunk Anthology\" compiled by Bruce "
 "Sterling.  The cover has rings of coffee stains over it."
 msgstr ""
-"Сборник \"Зеркальные очки: Антология киберпанка\" Брюса Стерлинга. Обложка "
+"Сборник «Зеркальные очки: Антология киберпанка» Брюса Стерлинга. Обложка "
 "испачкана кофейными кольцами."
 
 #: lang/json/BOOK_from_json.py
@@ -24887,183 +25969,182 @@ msgid ""
 "This is a copy of \"The World of Null-A\" by A. E. van Vogt.  This copy "
 "looks to have been used to press flowers."
 msgstr ""
-"\"Мир Нуль-А\" за авторством А.Э. ван Вогта. Похоже, в этой книжке "
-"высушивали цветы."
+"«Мир Нуль-А» за авторством А.Э. ван Вогта. Похоже, в этой книжке высушивали "
+"цветы."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Altered Carbon\" by Richard Morgan."
-msgstr "\"Видоизменённый углерод\" Ричарда Моргана."
+msgstr "«Видоизменённый углерод» Ричарда Моргана."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of Mary Shelly's \"Frankenstein\".  Wasn't that the name of "
 "the monster?"
-msgstr "\"Франкенштейн\" Мари Шелли. Вроде так звали монстра, разве нет?"
+msgstr "«Франкенштейн» Мари Шелли. Вроде так звали монстра, разве нет?"
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Wasp\" by Eric Frank Russel.  The futuristic terrorists "
 "handbook."
 msgstr ""
-"\"Оса\" Эрика Фрэнка Рассела. Настоящее руководство для террористов "
-"будущего."
+"«Оса» Эрика Фрэнка Рассела. Настоящее руководство для террористов будущего."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"I Am Legend\" by Richard Matheson.  The sleeve is "
 "covered in dried blood."
-msgstr "\"Я легенда\" Ричарда Мэтисона. Суперобложка покрыта запёкшейся кровью."
+msgstr "«Я легенда» Ричарда Мэтисона. Суперобложка покрыта запёкшейся кровью."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Roadside Picnic\" by Arkady and Boris Strugatsky."
-msgstr "\"Пикник на обочине\" Аркадия и Бориса Стругацких."
+msgstr "«Пикник на обочине» Аркадия и Бориса Стругацких."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"The Forever War\" by Joe Haldeman.  This copy looks as "
 "if it's been slightly chewed by a dog or other large animal."
 msgstr ""
-"\"Вечная война\" Джо Холдемана. Похоже, эту книжку пожевала собака или "
-"другое крупное животное."
+"«Вечная война» Джо Холдемана. Похоже, эту книжку пожевала собака или другое "
+"крупное животное."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"The Moon Is a Harsh Mistress\" by Robert A. Heinlein."
-msgstr "\"Луна — суровая хозяйка\" Роберта А. Хайнлайна."
+msgstr "«Луна — суровая хозяйка» Роберта А. Хайнлайна."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Cat's Cradle\" by Kurt Vonnegut.  You notice there is a "
 "typo in the authors name on the spine of the book."
 msgstr ""
-"\"Колыбель для кошки\" Курта Воннегута. Вы замечаете опечатку в имени автора"
-" на корешке книги."
+"«Колыбель для кошки» Курта Воннегута. Вы замечаете опечатку в имени автора "
+"на корешке книги."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of Samuel R. Delany's \"Nova\".  The cover reads \"Review "
 "Copy.  Not for re-sale.\""
 msgstr ""
-"\"Нова\" Сэмюэля Р. Делани. На обложке написано \"Обзорный Экземпляр. Не для"
-" продажи.\""
+"«Нова» Сэмюэля Р. Делани. На обложке написано «Обзорный Экземпляр. Не для "
+"продажи.»"
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of Vonnegut's \"The Sirens of Titan\"."
-msgstr "\"Сирены Титана\" Воннегута."
+msgstr "«Сирены Титана» Воннегута."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Grass\" by Sheri S. Tepper.  A child has scribbled over "
 "the first pages in crayon."
 msgstr ""
-"\"Трава\" Шери С. Треппер. Первые страницы изрисованы детскими каракулями."
+"«Трава» Шери С. Треппер. Первые страницы изрисованы детскими каракулями."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of William Gibson's \"Count Zero\".  The spine is stamped "
 "with 'Library Copy'.  And a sticker reading 'Science Fiction'."
 msgstr ""
-"\"Граф Ноль\" Уильяма Гибсона. На обложке печать 'Библиотечная копия' и "
-"стикер 'Научная фантастика'."
+"«Граф Ноль» Уильяма Гибсона. На обложке печать «Библиотечная копия» и стикер"
+" «Научная фантастика»."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"The Fifth Season\" by N.K. Jemsin.  It smells faintly of"
 " dirt."
-msgstr "\"Пятый сезон\" Н.К. Джемисин. Книга слегка пахнет землёй."
+msgstr "«Пятый сезон» Н.К. Джемисин. Книга слегка пахнет землёй."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"The Weapon Makers\" by A. E. van Vogt."
-msgstr "\"Оружейники\" А.Э. ван Вогта."
+msgstr "«Оружейники» А.Э. ван Вогта."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Record of a Spaceborn Few\" by Becky Chambers.  It looks"
 " almost brand new."
 msgstr ""
-"\"Хроники рождённых в космосе\" Бекки Чамберс. Книга выглядит почти новой."
+"«Хроники рождённых в космосе» Бекки Чамберс. Книга выглядит почти новой."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Use of Weapons\" by Ian M. Banks.  The spine is cracked "
 "and worn, some pages appear to be loose."
 msgstr ""
-"\"Выбор оружия\" Иэна М. Бэнкса. Истрёпанный корешок покрыт трещинами, "
+"«Выбор оружия» Иэна М. Бэнкса. Истрёпанный корешок покрыт трещинами, "
 "некоторые страницы едва держатся."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of Jean-Baptiste Cousin de Grainville's \"Le Dernier Homme\"."
-msgstr "\"Последний человек\" Жана-Батиста Кузена Де Гренвиля."
+msgstr "«Последний человек» Жана-Батиста Кузена Де Гренвиля."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of Orwells \"Nineteen Eighty-Four\".  The pages are loose and"
 " thin.  You should probably be careful with this copy."
 msgstr ""
-"\"1984\" Оруэлла. Истрёпанные страницы едва держатся на месте. Наверное, с "
+"«1984» Оруэлла. Истрёпанные страницы едва держатся на месте. Наверное, с "
 "этой книжкой нужно быть бережнее."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of Heinlein's \"Stranger in a Strange Land\".  The cover is "
 "dog-eared and worn."
-msgstr "\"Чужак в чужой стране\" Хайнлайна. Обложка измята и истрёпана."
+msgstr "«Чужак в чужой стране» Хайнлайна. Обложка измята и истрёпана."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of Orson Scott Card's \"Ender's Game\"."
-msgstr "\"Игра Эндера\" Орсона Скотта Карда."
+msgstr "«Игра Эндера» Орсона Скотта Карда."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a weather worn copy of \"Brave New World\" by Aldous Huxley."
-msgstr "Помятый и потрёпанный \"О дивный новый мир\" Олдоса Хаксли."
+msgstr "Помятый и потрёпанный «О дивный новый мир» Олдоса Хаксли."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"The Lost World\" by Arthur Conan Doyle."
-msgstr "\"Затерянный мир\" Артура Конан Дойля."
+msgstr "«Затерянный мир» Артура Конан Дойля."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Islands in the Sky\" by Arthur C. Clarke."
-msgstr "\"Острова в небе\" Артура Кларка."
+msgstr "«Острова в небе» Артура Кларка."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of H. G. Wells' \"The Island of Doctor Moreau\"."
-msgstr "\"Остров доктора Моро\" Г.Д. Уэллса."
+msgstr "«Остров доктора Моро» Г.Д. Уэллса."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of Stanislaw Lem's \"His Masters Voice\"."
-msgstr "\"Глас Господа\" Станислава Лема."
+msgstr "«Глас Господа» Станислава Лема."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of Fred Hoyle's \"The Black Cloud\"."
-msgstr "\"Чёрное облако\" Фреда Хойла."
+msgstr "«Чёрное облако» Фреда Хойла."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Last and First Men\" by Olaf Stapeldon."
-msgstr "\"Последние и первые люди\" Олафа Стэплдона."
+msgstr "«Последние и первые люди» Олафа Стэплдона."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of Stanislaw Lem's \"Solaris\"."
-msgstr "\"Солярис\" Станислава Лема."
+msgstr "«Солярис» Станислава Лема."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of Theodore Sturgeon's \"More Than Human\"."
-msgstr "\"Больше, чем люди\" Теодора Старджона."
+msgstr "«Больше, чем люди» Теодора Старджона."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Vurt\" by Jeff Noon."
-msgstr "\"Вирт\" Джеффа Нуна."
+msgstr "«Вирт» Джеффа Нуна."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"A Canticle for Leibowitz\" by Walter M. Miller Jr."
-msgstr "\"Страсти по Лейбовицу\" Уолтера М. Миллера-младшего."
+msgstr "«Страсти по Лейбовицу» Уолтера М. Миллера-младшего."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"The War of The Worlds\" by H.G Wells."
-msgstr "\"Война миров\" Г.Д. Уэллса."
+msgstr "«Война миров» Г.Д. Уэллса."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Iron Sunrise\" by Charles Stross."
-msgstr "\"Железный рассвет\" Чарльза Стросса."
+msgstr "«Железный рассвет» Чарльза Стросса."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
@@ -25071,40 +26152,40 @@ msgid ""
 "blurb reminds you of a Japanese movie you think you once caught on the "
 "television late at night."
 msgstr ""
-"\"Голодные игры\" Сьюзен Коллинз. Чтение аннотации напоминает вам японский "
+"«Голодные игры» Сьюзен Коллинз. Чтение аннотации напоминает вам японский "
 "фильм, на который, вы, кажется, как-то раз наткнулись, смотря телевизор "
 "поздней ночью."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"The Day of the Triffids\" by John Wyndham."
-msgstr "\"День Триффидов\" Джона Уиндема."
+msgstr "«День Триффидов» Джона Уиндема."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"A Clockwork Orange\" by Anthony Burges."
-msgstr "\"Заводной апельсин\" Энтони Бёрджесса."
+msgstr "«Заводной апельсин» Энтони Бёрджесса."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"The Man Who Fell to Earth\" by Walter Tevis."
-msgstr "\"Человек, который упал на землю\" Уолтера Тевиса."
+msgstr "«Человек, который упал на землю» Уолтера Тевиса."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Simulacron-3\" by Daniel F. Galouye."
-msgstr "\"Симулякрон-3\" Даниэля Ф. Галуи."
+msgstr "«Симулякрон-3» Даниэля Ф. Галуи."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"The Glass Bees\" by Ernst Jünger."
-msgstr "\"Стеклянные пчёлы\" Эрнста Юнгера."
+msgstr "«Стеклянные пчёлы» Эрнста Юнгера."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Journey to The Center of the Earth\" by Jules Verne."
-msgstr "\"Путешествие к центру Земли\" Жюля Верна."
+msgstr "«Путешествие к центру Земли» Жюля Верна."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of Larry Niven's \"Ringworld\".  There are a couple of pages "
 "missing from the end of the book.  Luckily only mail-order advertisements."
 msgstr ""
-"\"Мир-Кольцо\" Ларри Нивена. В конце книги вырвано несколько страниц. К "
+"«Мир-Кольцо» Ларри Нивена. В конце книги вырвано несколько страниц. К "
 "счастью, это были всего лишь рекламки заказов по почте."
 
 #: lang/json/BOOK_from_json.py
@@ -25254,14 +26335,14 @@ msgid ""
 "This is a copy of Nietzsche's \"Beyond Good and Evil\".  Its cover is dog-"
 "eared and creased."
 msgstr ""
-"Экземпляр \"По ту сторону добра и зла\" Ницше в мятой и потрёпанной обложке."
+"Экземпляр «По ту сторону добра и зла» Ницше в мятой и потрёпанной обложке."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"The Unique and Its Property\" by Max Stirner.  A modern "
 "translation by Wolfi Landstreicher."
 msgstr ""
-"\"Единственный и его собственность\" Макс Штирнера в современном переводе "
+"«Единственный и его собственность» Макс Штирнера в современном переводе "
 "Вольфи Ландстрейхера."
 
 #: lang/json/BOOK_from_json.py
@@ -25269,7 +26350,7 @@ msgid ""
 "This is a copy of Jean-Paul Sartre's \"Being and Nothingness\".  A key work "
 "in the existentialist tradition."
 msgstr ""
-"\"Бытие и ничто\" Жан-Поля Сартра, ключевая работа в традиции "
+"«Бытие и ничто» Жан-Поля Сартра, ключевая работа в традиции "
 "экзистенциалистов."
 
 #: lang/json/BOOK_from_json.py
@@ -25277,21 +26358,21 @@ msgid ""
 "A large, extended version of \"Madness and Civilisation\" by Michel "
 "Foucault.  The cover features a striking image of a Panopticonic Prison."
 msgstr ""
-"Большое расширенное издание \"Безумия и неразумия\" Мишеля Фуко. На обложке "
+"Большое расширенное издание «Безумия и неразумия» Мишеля Фуко. На обложке "
 "красочно нарисована тюрьма-паноптикум."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"The Postmodern Condition: A Report on Knowledge\" by "
 "Lyotard."
-msgstr "\"Состояние Постмодерна\" Жана-Франсуа Лиотара."
+msgstr "«Состояние Постмодерна» Жана-Франсуа Лиотара."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A collection of texts and essays by Jacques Derrida.  Its pages are loose "
 "and yellowed - you should probably handle it with care."
 msgstr ""
-"Сборник текстов и очерков Жака Деррида. Его страницы дряхлые и пожелтевшие -"
+"Сборник текстов и очерков Жака Деррида. Его страницы дряхлые и пожелтевшие —"
 " вам, вероятно, следует обращаться с ними осторожно."
 
 #: lang/json/BOOK_from_json.py
@@ -25299,14 +26380,14 @@ msgid ""
 "This is a copy of \"Society of the Spectacle\" by Guy Debord.  Its cover "
 "shows rows of adults staring placidly into a screen."
 msgstr ""
-"\"Общество спектакля\" Ги Дебора. На обложке изображены ряды людей, "
-"безмятежно смотрящих на экран."
+"«Общество спектакля» Ги Дебора. На обложке изображены ряды людей, безмятежно"
+" смотрящих на экран."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a split copy of both \"An Ethic of Sexual Difference\" and \"This "
 "Sex Which Is Not One\" by Luce Irigaray."
-msgstr "\"Этика полового различия\" и \"Пол, который не одинок\" Люси Иригарей."
+msgstr "«Этика полового различия» и «Пол, который не одинок» Люси Иригарей."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
@@ -25315,23 +26396,24 @@ msgid ""
 "caption \"Welcome to the Desert of the Real.\".  You think you've seen this "
 "movie."
 msgstr ""
-"\"Симулякры и симуляция\" Бодрийяра. На обложке изображён человек, держащий "
-"по разноцветной таблетке в каждой руке со слоганом \"Добро пожаловать в "
-"Пустыню Реальности\". Вам кажется, вы видели этот фильм."
+"«Симулякры и симуляция» Бодрийяра. На обложке изображён человек, держащий по"
+" разноцветной таблетке в каждой руке со слоганом «Добро пожаловать в Пустыню"
+" Реальности». Вам кажется, вы видели этот фильм."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a small, pocket version of Sartre's \"Existentialism and Humanism\"."
 "  It looks to have been used as a coaster in a past life."
 msgstr ""
-"Маленькая карманная версия \"Экзистенциализма и гуманизма\" Сартра. Похоже, "
-"в прошлой жизни она служила подставкой под кружку."
+"Маленькая карманная версия «Экзистенциализма и гуманизма» Сартра. Похоже, в "
+"прошлой жизни она служила подставкой под кружку."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Practical Ethics\" by Peter Singer.  From the local "
 "university press."
-msgstr "\"Практическая этика\" Питера Сингера. Отпечатано в местном университете."
+msgstr ""
+"«Практическая этика» Питера Сингера. Отпечатано в местном университете."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
@@ -25339,8 +26421,8 @@ msgid ""
 "Future\" by 'Freedom Club'.  The original looks to have been written on a "
 "typewriter before being copied."
 msgstr ""
-"Отксерокопированная книга на пружинке - \"Индустриальное общество и его "
-"будущее\" от \"Клуба Свободы\". Похоже, оригинал был напечатан на пишущей "
+"Отксерокопированная книга на пружинке — «Индустриальное общество и его "
+"будущее» от «Клуба Свободы». Похоже, оригинал был напечатан на пишущей "
 "машинке."
 
 #: lang/json/BOOK_from_json.py
@@ -25349,7 +26431,7 @@ msgid ""
 "Its cover is an image of a hand-crafted wooden box filled with wiring and an"
 " ominous looking metal tube.  Provocative."
 msgstr ""
-"\"Индустриальное общество и его будущее\" Теодора Казински. На обложке "
+"«Индустриальное общество и его будущее» Теодора Казински. На обложке "
 "изображён грубый деревянный ящик с проводами и зловещей металлической "
 "трубой. Провокационно."
 
@@ -25361,18 +26443,18 @@ msgstr "Маленький томик диалетики Гегеля."
 msgid ""
 "This is a copy of \"The State and Revolution\" by Vladimir Lenin.  In "
 "English, thankfully."
-msgstr "\"Государство и революция\" Владимира Ленина. К счастью, на английском."
+msgstr "«Государство и революция» Владимира Ленина. К счастью, на английском."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"In Defense of Marxism\" by Leon Trotsky."
-msgstr "\"В защиту марксизма\" Льва Троцкого."
+msgstr "«В защиту марксизма» Льва Троцкого."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Steal This Book\" by Abbie Hoffman.  There is a security"
 " tag on the back cover.  It appears to still be active."
 msgstr ""
-"\"Укради эту книгу\" Эбби Хоффмана. На задней обложке есть магнитная бирка. "
+"«Укради эту книгу» Эбби Хоффмана. На задней обложке есть магнитная бирка. "
 "Похоже, она ещё работает."
 
 #: lang/json/BOOK_from_json.py
@@ -25380,76 +26462,76 @@ msgid ""
 "This is a copy of \"Walden: Or Life In The Woods\" by Henry David Thoreau.  "
 "It contains a dried and pressed leaf as a bookmark."
 msgstr ""
-"\"Уолден, или Жизнь в лесу\" под авторством Генри Дэвида Торо. Между страниц"
-" заложен высушенный сдавленный листочек."
+"«Уолден, или Жизнь в лесу» под авторством Генри Дэвида Торо. Между страниц "
+"заложен высушенный сдавленный листочек."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"The Female Eunuch\" by Germaine Greer.  A child has "
 "scribbled over the contents page in red crayon."
 msgstr ""
-"\"Женщина-евнух\" Жермен Грир. Какой-то ребёнок изрисовал красным карандашом"
-" страницу с содержанием."
+"«Женщина-евнух» Жермен Грир. Какой-то ребёнок изрисовал красным карандашом "
+"страницу с содержанием."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"An Introduction to Metaphysics\" by Bergson."
-msgstr "\"Введение в метафизику\" Бергсона."
+msgstr "«Введение в метафизику» Бергсона."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"The Four Fundamental Concepts of Psychoanalysis\" by "
 "Jacques Lacan."
-msgstr "\"Четыре основные понятия психоанализа\" Жака Лакана."
+msgstr "«Четыре основные понятия психоанализа» Жака Лакана."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of Machiavelli's \"The Prince\".  With intro by Q. Skinner."
-msgstr "Экземпляр \"Государя\" Макиавелли. Включает вступление К. Скиннера."
+msgstr "Экземпляр «Государя» Макиавелли. Включает вступление К. Скиннера."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"On The Revolution of Everyday Life\" by Raul Vangeigem."
-msgstr "\"Революция повседневной жизни\" Рауля Ванейгема."
+msgstr "«Революция повседневной жизни» Рауля Ванейгема."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a pocket copy of \"An Essay on Liberation\" by Herbert Marcuse.  The"
 " cover contains an image of a pelican."
 msgstr ""
-"Карманный экземпляр \"Эссе об освобождении\" Герберта Маркузе. На обложке "
+"Карманный экземпляр «Эссе об освобождении» Герберта Маркузе. На обложке "
 "нарисован пеликан."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Either-Or\" by Søren Kierkegaard."
-msgstr "\"Или-или\" Сёрена Кьеркегора."
+msgstr "«Или-или» Сёрена Кьеркегора."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Allegory of the Cave\" by Plato."
-msgstr "\"Миф о пещере\" Платона."
+msgstr "«Миф о пещере» Платона."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Leviathan\" by Thomas Hobbes."
-msgstr "\"Левиафан\" Томаса Хоббса."
+msgstr "«Левиафан» Томаса Хоббса."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Critique Of Pure Reason\" by Immanuel Kant."
-msgstr "\"Критика чистого разума\" Иммануила Канта."
+msgstr "«Критика чистого разума» Иммануила Канта."
 
 #: lang/json/BOOK_from_json.py
 msgid "This is a copy of \"Principles of Philosophy\" by Descartes."
-msgstr "\"Первоначала философии\" Декарта."
+msgstr "«Первоначала философии» Декарта."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of both \"On The Genealogy of Morals\" and \"The Gay "
 "Science\" by Friederich Nietzsche."
-msgstr "Собрание из \"К генеалогии морали\" и \"Весёлой науки\" Фридриха Ницше."
+msgstr "Собрание из «К генеалогии морали» и «Весёлой науки» Фридриха Ницше."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"The Myth of Sisyphus\", and other essays, by Albert "
 "Camus.  The cover depicts a bare-chested man and a large boulder."
 msgstr ""
-"\"Миф о Сизифе\" за авторством Альберта Камю. На обложке нарисованы "
+"«Миф о Сизифе» за авторством Альберта Камю. На обложке нарисованы "
 "полуобнажённый мужчина и огромный валун."
 
 #: lang/json/BOOK_from_json.py
@@ -25457,7 +26539,7 @@ msgid ""
 "This is a copy of \"The Sickness Unto Death\" by Søren Kierkegaard.  The "
 "pages are dotted with post-it notes."
 msgstr ""
-"\"Болезнь к смерти\" Сёрена Кьеркегора. На страницах полно липучек с "
+"«Болезнь к смерти» Сёрена Кьеркегора. На страницах полно липучек с "
 "записками."
 
 #: lang/json/BOOK_from_json.py
@@ -25465,16 +26547,16 @@ msgid ""
 "This is a copy of \"The Defence of Terrorism\" by Leon Trotsky.  Despite the"
 " title, it does not actually appear to be defending terrorism."
 msgstr ""
-"\"В защиту терроризма\" Льва Троцкого. Несмотря на название, терроризм в "
-"книге не защищают."
+"«В защиту терроризма» Льва Троцкого. Несмотря на название, терроризм в книге"
+" не защищают."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Enquiry Concerning Political Justice\" by William "
 "Godwin.  This thick book is filled with antiquated phrases."
 msgstr ""
-"\"Исследование о политической справедливости\" Уильяма Голдвина. Толстая "
-"книга в старомодных выражениях."
+"«Исследование о политической справедливости» Уильяма Голдвина. Толстая книга"
+" в старомодных выражениях."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
@@ -25482,15 +26564,15 @@ msgid ""
 "It is likely that \"The Abolition of Work\" is the most famous essay in this"
 " book."
 msgstr ""
-"\"Упразднение работы и другие сочинения\" Боба Блэка. Похоже, \"Упразднение "
-"работы\" - самое знаменитое сочинение в этой книге."
+"«Упразднение работы и другие сочинения» Боба Блэка. Похоже, «Упразднение "
+"работы» — самое знаменитое сочинение в этой книге."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"What is Property?\" by Pierre-Joseph Proudhon.  It looks"
 " like this book has a surprisingly long track record of owners."
 msgstr ""
-"\"Что такое собственность?\" Пьер-Жозефа Прудона. Судя по всему, это книга "
+"«Что такое собственность?» Пьер-Жозефа Прудона. Судя по всему, это книга "
 "сменила удивительно много владельцев."
 
 #: lang/json/BOOK_from_json.py
@@ -25499,7 +26581,7 @@ msgid ""
 "picture of an old philosopher with magnificent beard, instead of bread, on "
 "the cover."
 msgstr ""
-"\"Хлеб и воля\" Петра Кропоткина. На обложке вместо хлеба изображён пожилой "
+"«Хлеб и воля» Петра Кропоткина. На обложке вместо хлеба изображён пожилой "
 "философ с роскошной бородой."
 
 #: lang/json/BOOK_from_json.py
@@ -25508,24 +26590,56 @@ msgid ""
 " might have been printed decades before the cataclysm since the cover is "
 "quite weathered."
 msgstr ""
-"\"Несчастье родиться\" Эмиля Чорана. Должно быть, эту книгу напечатали за "
-"десятилетия до Катаклизма - её обложка довольно истрепалась."
+"«Несчастье родиться» Эмиля Чорана. Должно быть, эту книгу напечатали за "
+"десятилетия до Катаклизма — её обложка довольно истрепалась."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"The World as Will and Representation\" by Arthur "
 "Schopenhauer.  It contains a few undecipherable notes and scribbles."
 msgstr ""
-"\"Мир как воля и представление\" Артура Шопенгауэра. Среди страниц несколько"
-" неразборчивых записей и каракулей."
+"«Мир как воля и представление» Артура Шопенгауэра. Среди страниц несколько "
+"неразборчивых записей и каракулей."
 
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This is a copy of \"Up-Wingers: A Futurist Manifesto\" by FM-2030.  It seems"
 " that the author's real name is Fereidoun M. Esfandiary."
 msgstr ""
-"\"Манифест футурологов\" за авторством FM-2030. Похоже, настоящее имя автора"
-" - Ферейдун М. Эсфендиари."
+"«Манифест футурологов» за авторством FM-2030. Похоже, настоящее имя автора —"
+" Ферейдун М. Эсфендиари."
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr "«Сборник Бастиа», большой сборник сочинений Фредерика Бастиа."
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr ""
+"«Анархия, государство и утопия» Роберта Нозика, одна из самых влиятельных "
+"книг современного либертарианства."
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr "«Социализм» Людвига фон Мизеса, обзор и критика социализма."
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr ""
+"«Азбука коммунизма» Николая Бухарина, одна из самых влиятельных книг раннего"
+" марксизма-ленинизма."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr "«Антикапиталистический менталитет» Людвига фон Мизеса."
 
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
@@ -25621,8 +26735,8 @@ msgstr[3] "бухгалтерская книга корпорации"
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
-msgstr "Она скажет многое, если вы знаете куда смотреть…"
+msgid "If you knew what to look for something might stand out…"
+msgstr "Она скажет многое, если вы не видите фигу, смотря в книгу…"
 
 #: lang/json/BOOK_from_json.py
 msgid "patient treatment records"
@@ -25916,6 +27030,106 @@ msgstr "«Граф Монте-Кристо» Дюма."
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr "«Таинственный сад» Фрэнсис Бёрнетт."
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr "«Лейтенант Хорнблауэр» К.С. Форестера."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr "«Мастер и командир» Патрика О'Брайана."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr "«Страж» Энтони Трололопа."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr "«Обратная сторона света» Патрика О'Брайана."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr "«Фрегат Его Величества «Сюрприз» Патрика О'Брайана."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr "«Башни Барчестера» Энтони Троллопа."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr "«Земляные железные клинки» Г.Д. Уэллса."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr "«Англо-бурская война» Артура Конан Дойля."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr "«Преступления в Конго» Артура Конан Дойля."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr "«Паразит» Артура Конан Дойля."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr "«Ударом шпаги», Эндрю Бальфур."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr "«Тайный агент» Джозефа Конрада."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr "«Лорд Джим» Джозефа Конрада."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr "«Ярмарка тщеславия» Уильяма Мейкписа Теккерея."
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr "«Карьера Барри Линдона» Уильяма Мейкписа Теккерея."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr "«Север и Юг» Элизабет Гаскелл."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr "«Мэр Кастербриджа» Томаса Харди."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr "«Уэссекские рассказы» Томаса Харди."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr "«Вдали от обезумевшей толпы» Томаса Харди."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr "«Отважные капитаны» Редьярда Киплинга."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr "«Кентерберийские рассказы» Джеффри Чосера."
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr "«Гарольд, последний из саксов» Эдуарда Бульвера-Литтона."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr "«Мичман Изи» Фредерика Марриета."
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr "«Питер Симпл» Фредерика Марриета."
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -27150,13 +28364,14 @@ msgstr "Игра, в которой игроки пытаются выяснит
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
 msgstr[0] "Чёрные Драконы: Болотные Руины"
 msgstr[1] "Чёрные Драконы: Болотные Руины"
-msgstr[2] "Чёрные Драконы: Болотные Руины"
+msgstr[2] "Чёрных Драконов: Болотных Руин"
 msgstr[3] "Чёрные Драконы: Болотные Руины"
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -27164,20 +28379,21 @@ msgid ""
 "details how to prepare its hide and craft various armors that make use of "
 "some of its acid resistance."
 msgstr ""
-"В этой книге описываются чёрные драконы - самые злобные из драконов. Обычно "
+"В этой книге описываются чёрные драконы — самые злобные из драконов. Обычно "
 "они живут в руинах на болотах, дышат кислотой и невосприимчивы к ней. В "
 "книге также указано, как приготовить его шкуру и изготовить доспехи, "
 "сохраняющие часть защиты от кислоты."
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
-msgstr[0] "Алхимия для новичков"
-msgstr[1] "Алхимия для новичков"
-msgstr[2] "Алхимия для новичков"
-msgstr[3] "Алхимия для новичков"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
+msgstr[0] "Алхимия для чайников"
+msgstr[1] "Алхимии для чайников"
+msgstr[2] "Алхимий для чайников"
+msgstr[3] "Алхимия для чайников"
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr ""
@@ -27186,13 +28402,14 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
 msgstr[0] "Руководство по Некромантии для Душелова"
-msgstr[1] "Руководство по Некромантии для Душелова"
-msgstr[2] "Руководство по Некромантии для Душелова"
+msgstr[1] "Руководства по Некромантии для Душелова"
+msgstr[2] "Руководств по Некромантии для Душелова"
 msgstr[3] "Руководство по Некромантии для Душелова"
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
@@ -27201,6 +28418,48 @@ msgstr ""
 "Книга в мягкой обложке об искусстве привязывания душ неживых существ к "
 "куклам, а также об эмуляции их исцеляющего фактора."
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] "Магитек с картинками"
+msgstr[1] "Магитека с картинками"
+msgstr[2] "Магитека с картинками"
+msgstr[3] "Магитек с картинками"
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+"Книга в мягкой обложке, описывающее искусство сочетания современных "
+"технологий и магии. На обороте приписка: «Каннит Индастриз не несет "
+"ответственности за неисправности или несчастные случаи, причиняемые "
+"информацией из данной книги»."
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] "«Оружие Асгарда и за его пределами»"
+msgstr[1] "«Оружие Асгарда и за его пределами»"
+msgstr[2] "«Оружие Асгарда и за его пределами»"
+msgstr[3] "копии «Оружие Асгарда и за его пределами»"
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr ""
+"Изысканная книга, написанная скандинавскими рунами. Судя по детальным "
+"иллюстрациям, она содержит информацию о создании многочисленных видов "
+"оружия, используемых различными богами."
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -27222,15 +28481,15 @@ msgid ""
 " I love you,\n"
 " - F. \"."
 msgstr ""
-"Флаер-рекламка какой-то конфеты.  На нём нарисован летящий человечек из сплошной карамели, он в ужасе смотрит на вас.  \"Сахарок - первая в мире конфета размером с человека!  Настоящее ли вы чудовище?  Сумеете ли его съесть?\"\n"
+"Флаер-рекламка какой-то конфеты.  На нём нарисован летящий человечек из сплошной карамели, он в ужасе смотрит на вас. «Сахарок — первая в мире конфета размером с человека!  Настоящее ли вы чудовище?  Сумеете ли его съесть?»\n"
 " На обороте есть несколько наспех нацарапанных слов:\n"
-" \"Здравствуй, дитя моё, и добро пожаловать в этот мир.  Мир, где тебе будет хорошо при следующих условиях: \n"
+" «Здравствуй, дитя моё, и добро пожаловать в этот мир.  Мир, где тебе будет хорошо при следующих условиях: \n"
 "1) Никогда не касайся воды, она растворит тебя!  \n"
 "2) Держись подальше от людей с ясными глазами, они очень опасны! (Не обращай внимания на людей с чёрными глазами, они безвредны.)  \n"
 "3) Научись готовить карамельную мазь, только ею ты сможешь залечить свои раны.\n"
 " Я ещё столько хочу тебе рассказать, но мне пора, пока ещё не слишком поздно. Я сделал тебе друга, чтобы у тебя была компания, будь с ним добр. \n"
 " Я тебя люблю,\n"
-" - Ф. \"."
+" — Ф.»."
 
 #: lang/json/BOOK_from_json.py
 msgid "The Weapons of Asgard"
@@ -27786,11 +29045,11 @@ msgstr "ацетилен"
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr ""
-"Горючий газ, взрывающийся под давлением. В сочетании с кислородом "
-"превращается в отличную смесь для сварки."
+"Очень горючий газ, взрывающийся под давлением. В сочетании с кислородом "
+"превращается в отличную смесь для горелки."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Spice"
@@ -28905,6 +30164,48 @@ msgstr "большой человеческий желудок"
 msgid "The stomach of a large humanoid creature.  It is surprisingly durable."
 msgstr "Желудок большого человекоподобного существа. Он на удивление крепкий."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] "кусок человечьего сала"
+msgstr[1] "куска человечьего сала"
+msgstr[2] "кусков человечьего сала"
+msgstr[3] "куски человечьего сала"
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr "Свежий кусок сала, срезанный с человека."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr "человечий жир"
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr ""
+"Гладкий белый кусок очищенного и вытопленного человечьего сала. Он остаётся "
+"съедобным очень долгое время, а также его можно использовать в различных "
+"рецептах."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr "человечий лярд"
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr ""
+"Гладкий белый кусок человечьего сала сухой вытопки. Он остаётся съедобным "
+"очень долгое время, а также его можно использовать в различных рецептах."
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -28957,6 +30258,81 @@ msgid ""
 "pinch."
 msgstr "Немного сьедобного мяса. Не то чтобы очень, но на крайняк сгодится."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] "кусок мяса мутанта"
+msgstr[1] "куска мяса мутанта"
+msgstr[2] "кусков мяса мутанта"
+msgstr[3] "куски мяса мутанта"
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+"Мясо сильно мутировавшего животного. Имеет странную рыхлую губчатую текстуру"
+" и пахнет… В основном, нормально. В нём есть странные включения и "
+"образования, которые вообще не кажутся естественными: внутри мышц вросли "
+"кусочки костей покрытые волосами, которые словно бы сформировались сами по "
+"себе. Тем не менее это, вроде бы, съедобно, если вы приготовите его и "
+"удалите худшие части."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] "обрезок мяса мутанта"
+msgstr[1] "обрезка мяса мутанта"
+msgstr[2] "обрезков мяса мутанта"
+msgstr[3] "обрезки мяса мутанта"
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+"Крошечные кусочки мяса мутировавшего животного. Они пахнут несколько странно"
+" и в них присутствуют волосы и кусочки костей, которые выглядят так, словно "
+"они выросли внутри самой мышцы. Тем не менее, они кажутся, вроде бы, "
+"съедобными, если вы приготовите и удалите худшие части."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr "мутированное мясо гуманоида"
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+"Только что вырезанный из тела сильно мутировавшего существа, внешне "
+"гуманоидного вида. В нем есть странные кусочки меха и другие ткани, которых "
+"быть не должно. Вы должны быть сумасшедшими или очень голодным, чтобы съесть"
+" это."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr "приготовленный кретин"
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr ""
+"Приготовленное мясо сильно мутировавшего гуманоида. Теперь, когда худшие "
+"части удалены, это, вероятно, съедобно, но не очень аппетитно."
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -28999,6 +30375,29 @@ msgstr[1] "приготовленных мясных обрезка"
 msgstr[2] "приготовленных мясных обрезков"
 msgstr[3] "приготовленные мясные обрезки"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr "приготовленное мясо мутанта"
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr ""
+"Это приготовленный кусок мяса мутировавшего животного. У него странная "
+"губчатая структура, но вкус… В основном, нормальный. Надеюсь, вы вытащили "
+"все волосы и кусочки костей…"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] "приготовленный мясной обрезок мутанта"
+msgstr[1] "приготовленных мясных обрезков мутанта"
+msgstr[2] "приготовленных мясных обрезков мутанта"
+msgstr[3] "приготовленные мясные обрезки мутанта"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "сырые потроха"
@@ -29258,7 +30657,7 @@ msgstr[3] "сырые мозги"
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
 msgstr "Мозг животного. Вы бы не хотели есть это сырым…"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -29320,8 +30719,8 @@ msgstr "приготовленная поджелудочная железа"
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
-msgstr "Вообще это считается деликатесом, только не хватает… чего-нибудь."
+msgid "Normally a delicacy, it needs a little… something."
+msgstr "Вообще это считается деликатесом, только не хватает… Чего-то."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bone"
@@ -29382,6 +30781,97 @@ msgstr ""
 "Гладкий белый кусок животного жира сухой вытопки. Он остаётся съедобным "
 "очень долгое время, а также его можно использовать в различных рецептах."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] "кусок мутантного сала"
+msgstr[1] "куска мутантного сала"
+msgstr[2] "кусков мутантного сала"
+msgstr[3] "куски мутантного сала"
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr ""
+"Свежесрезанное сало сильно мутировавшего животного. Вы можете есть его в "
+"сыром виде, но его лучше использовать в качестве ингредиента для других "
+"продуктов или проектов."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr "мутантный жир"
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+"Гладкий белый кусок очищенного и вытопленного жира животного-мутанта. Он "
+"остаётся съедобным очень долгое время, а также его можно использовать в "
+"различных рецептах."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr "мутантный лярд"
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr ""
+"Гладкий белый кусок сухого жира, полученного от животного-мутанта. Он будет "
+"оставаться съедобным в течение очень долгого времени и может использоваться "
+"в качестве ингредиента для других рецептов."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] "кусок жира мутировавшего гуманоида"
+msgstr[1] "куска жира мутировавшего гуманоида"
+msgstr[2] "кусков жира мутировавшего гуманоида"
+msgstr[3] "куски жира мутировавшего гуманоида"
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr "Свежий жир, вырезанный из сильно мутировавшего гуманоида."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr "сало мутировавшего гуманоида"
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+"Гладкий белый кусок очищенного и обработанного жира, полученного из "
+"мутировавшего гуманоида. Он не гниет очень долго и может использоваться в "
+"качестве ингредиента во многих продуктах и проектах."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr "лярд мутировавшего гуманоида"
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr ""
+"Гладкий белый кусок топлёного жира, полученного из мутировавшего гуманоида. "
+"Он не гниет очень долго и может использоваться в качестве ингредиента во "
+"многих продуктах и проектах."
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
 msgid_plural "chunks of tainted meat"
@@ -29584,7 +31074,7 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
 "Плотная, огромная масса плоти, внешне напоминающая сердце млекопитающего, "
 "покрытая рубчатыми каналами, размером с вашу голову. Оно по-прежнему "
@@ -29607,7 +31097,7 @@ msgstr ""
 "очищенного от крови. Его можно есть, если вы настолько голодны, но выглядит "
 "оно *отвратительно*."
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] "сырое молоко"
@@ -29991,7 +31481,7 @@ msgstr[3] "заваренный цикорий"
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
 msgstr ""
 "Жареный молотый корень цикория, смешанный с кипятком. Этот горький напиток "
@@ -31035,13 +32525,14 @@ msgstr "Консервированные ананасовые кольца в в
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
-msgstr[0] "смесь для лимонада"
-msgstr[1] "смеси для лимонада"
-msgstr[2] "смесей для лимонада"
-msgstr[3] "смесь для лимонада"
+msgid_plural "lemonade drink mix"
+msgstr[0] "лимонадный микс"
+msgstr[1] "лимонадных микса"
+msgstr[2] "лимонадных миксов"
+msgstr[3] "лимонадные миксы"
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -31929,7 +33420,7 @@ msgstr[3] "конфета с арахисовым маслом"
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
+msgid "A handful of peanut butter cups… your favorite!"
 msgstr "Горстка колечек в арахисовом масле… Твои любимые!"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -32070,7 +33561,7 @@ msgstr "Вкусный шоколадный торт. С глазурью. Эт
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr ""
 "Торт, покрытый самым толстым слоем глазури, который вы когда-либо видели. "
 "Кто-то написал глупую фразу на нём…"
@@ -32125,7 +33616,7 @@ msgstr[3] "мятное печенье"
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
 msgstr "Горстка мятных печенек, покрытых шоколадом… Вкуснятина!"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -32659,7 +34150,7 @@ msgid "cracklins"
 msgid_plural "cracklins"
 msgstr[0] "шкварки"
 msgstr[1] "шкварки"
-msgstr[2] "шкварк"
+msgstr[2] "шкварки"
 msgstr[3] "шкварки"
 
 #. ~ Description for cracklins
@@ -32846,6 +34337,17 @@ msgstr ""
 "странно растягивается. Ветчина SPAM достаточно питательна. Крайне "
 "неаппетитно, но вполне сытно."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr ""
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "консервированная сардина"
@@ -33757,6 +35259,9 @@ msgid ""
 "infection.  It's the safest way to cure any infections you might have.  One "
 "dose lasts twelve hours."
 msgstr ""
+"Отпускаемое по рецепту антибактериальное средство, предназначенное для "
+"предотвращения или прекращения развития инфекции. Это самый быстрый и "
+"надёжный способ вылечить любую инфекцию. Одна доза действует 12 часов."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "antifungal drug"
@@ -34762,8 +36267,8 @@ msgstr[3] "тряпки с антисептиком"
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr ""
 "Тряпка, смоченная в антисептике. Поможет с небольшими ранами, но с глубокими"
 " укусами не справится."
@@ -34839,7 +36344,7 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
 "Яблочно-красная гель-капсула размером с ноготь, заполненная густой "
 "маслянистой жидкостью, которая непредсказуемо изменяется от черного до "
@@ -34866,7 +36371,7 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "destragon"
-msgstr ""
+msgstr "дестрагон"
 
 #. ~ Description for destragon
 #: lang/json/COMESTIBLE_from_json.py
@@ -34876,6 +36381,9 @@ msgid ""
 "but can treat any bacterial infections you may encounter.  One dose lasts "
 "twelve hours."
 msgstr ""
+"Отпускаемое по рецепту антибактериальное средство, предназначенное для "
+"предотвращения или прекращения развития инфекции. Это самый быстрый и "
+"надёжный способ вылечить любую инфекцию. Одна доза действует 12 часов."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "MRE entree"
@@ -35296,10 +36804,10 @@ msgstr "мутагенная добавка iv"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
 msgstr ""
-"Высококонцентрированный мутаген. Требуется шприц для инъекции… если вы, "
+"Высококонцентрированный мутаген. Требуется шприц для инъекции… Если вы, "
 "конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35314,10 +36822,10 @@ msgstr "сыворотка альфы"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
+"to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген, цветом напоминающий кровь. Требуется шприц "
-"для инъекции… если вы, конечно, решитесь на это."
+"для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "beast serum"
@@ -35327,10 +36835,10 @@ msgstr "сыворотка зверя"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген. Красный, как плащ матадора. Требуется шприц"
-" для инъекции… если вы, конечно, решитесь на это."
+" для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bird serum"
@@ -35340,10 +36848,10 @@ msgstr "сыворотка птицы"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
+"need a syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген цвета неба до апокалипсиса. Требуется шприц "
-"для инъекции… если вы, конечно, решитесь на это."
+"для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattle serum"
@@ -35353,10 +36861,10 @@ msgstr "сыворотка быка"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
+"inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген цвета травы. Требуется шприц для инъекции… "
-"если вы, конечно, решитесь на это."
+"Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cephalopod serum"
@@ -35366,10 +36874,10 @@ msgstr "сыворотка моллюска"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
+"it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген чернильно-чёрного цвета. Требуется шприц для"
-" инъекции… если вы, конечно, решитесь на это."
+" инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chimera serum"
@@ -35379,10 +36887,10 @@ msgstr "сыворотка химеры"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген, переливающийся радужными цветами. Требуется"
-" шприц для инъекции… если вы, конечно, решитесь на это."
+" шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "elf-a serum"
@@ -35392,10 +36900,10 @@ msgstr "сыворотка эльфа"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген впечатляющего бледно-зелёного цвета. "
-"Требуется шприц для инъекции… если вы, конечно, решитесь на это."
+"Требуется шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "feline serum"
@@ -35405,7 +36913,7 @@ msgstr "сыворотка кошки"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген. Жёлтый и ярко блестящий. Требуется шприц "
 "для инъекции… если вы, конечно, решитесь на это."
@@ -35418,10 +36926,10 @@ msgstr "сыворотка рыбы"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
+"top.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген цвета океана, с белой пеной сверху. "
-"Требуется шприц для инъекции… если вы, конечно, решитесь на это."
+"Требуется шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "insect serum"
@@ -35431,10 +36939,10 @@ msgstr "сыворотка насекомого"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген изумительного янтарного цвета. Требуется "
-"шприц для инъекции… если вы, конечно, решитесь на это."
+"шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lizard serum"
@@ -35444,10 +36952,10 @@ msgstr "сыворотка ящерицы"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген, переливающийся оттенками зелёного. "
-"Требуется шприц для инъекции… если вы, конечно, решитесь на это."
+"Требуется шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lupine serum"
@@ -35457,10 +36965,10 @@ msgstr "сыворотка волка"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
+" inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген. Белый, как полная луна. Требуется шприц для"
-" инъекции… если вы, конечно, решитесь на это."
+" инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "medical serum"
@@ -35470,10 +36978,10 @@ msgstr "сыворотка медицинская"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген, похожий на смесь телесных жидкостей. "
-"Требуется шприц для инъекции… если вы, конечно, решитесь на это."
+"Требуется шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "plant serum"
@@ -35483,10 +36991,10 @@ msgstr "сыворотка растения"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
-"Высококонцентрированный мутаген, похожий на измельчённый шпинат. Требуется "
-"шприц для инъекции… если вы, конечно, решитесь на это."
+"Высококонцентрированный мутаген, по цвету похожий на измельчённый шпинат. "
+"Требуется шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raptor serum"
@@ -35496,10 +37004,10 @@ msgstr "сыворотка раптора"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
+"at it.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген, немного меняющийся каждый раз, как вы на "
-"него посмотрите. Требуется шприц для инъекции… если вы, конечно, решитесь на"
+"него посмотрите. Требуется шприц для инъекции… Если вы, конечно, решитесь на"
 " это."
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -35510,10 +37018,10 @@ msgstr "сыворотка крысы"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген неприятного бежевого оттенка. Требуется "
-"шприц для инъекции… если вы, конечно, решитесь на это."
+"шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "slime serum"
@@ -35523,10 +37031,10 @@ msgstr "сыворотка слизи"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген, весьма напоминающий чёрную слизь в глазах "
-"зомби. Требуется шприц для инъекции… если вы, конечно, решитесь на это."
+"зомби. Требуется шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "spider serum"
@@ -35536,10 +37044,10 @@ msgstr "сыворотка паука"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген с плавающими бледными волокнами. Требуется "
-"шприц для инъекции… если вы, конечно, решитесь на это."
+"шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "troglobite serum"
@@ -35549,10 +37057,10 @@ msgstr "сыворотка троглобита"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген. Похоже, он будто пытается укрыться от "
-"света. Требуется шприц для инъекции… если вы, конечно, решитесь на это."
+"света. Требуется шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "ursine serum"
@@ -35562,10 +37070,10 @@ msgstr "сыворотка медведя"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
+"thick.  You need a syringe to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген, цветом и густотой напоминающий мёд. "
-"Требуется шприц для инъекции… если вы, конечно, решитесь на это."
+"Требуется шприц для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mouse serum"
@@ -35575,10 +37083,10 @@ msgstr "сыворотка мыши"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr ""
 "Высококонцентрированный мутаген, похожий на жидкий металл. Требуется шприц "
-"для инъекции… если вы, конечно, решитесь на это."
+"для инъекции… Если вы, конечно, решитесь на это."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagen"
@@ -35592,7 +37100,7 @@ msgstr "застывшая кровь"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
+"bubble with an intelligence of its own…"
 msgstr ""
 "Вязкая, густая красная жидкость. Выглядит и пахнет отвратительно, и, "
 "кажется, пузырится, словно имеет собственный интеллект…"
@@ -35704,7 +37212,7 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "purifier serum"
-msgstr "сыворотка очистительная"
+msgstr "сыворотка пурификатора"
 
 #. ~ Description for purifier serum
 #: lang/json/COMESTIBLE_from_json.py
@@ -35798,27 +37306,27 @@ msgstr ""
 "вероятно, стало значительно безопасней пить, чем ранее."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
-msgstr[0] "горсть сосновых орехов"
-msgstr[1] "горсти сосновых орехов"
-msgstr[2] "горстей сосновых орехов"
-msgstr[3] "горсти сосновых орехов"
+msgid "pine nuts"
+msgid_plural "pine nuts"
+msgstr[0] "сосновый орешек"
+msgstr[1] "сосновые орехи"
+msgstr[2] "сосновые орехи"
+msgstr[3] "сосновые орехи"
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr "Горсть вкусных хрустящих орехов из сосновой шишки."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
-msgstr[0] "Горсть можжевельника"
-msgstr[1] "Горсти можжевельника"
-msgstr[2] "Горстей можжевельника"
-msgstr[3] "Горсть можжевельника"
+msgid "junipers"
+msgid_plural "junipers"
+msgstr[0] "можжевельник"
+msgstr[1] "можжевельника"
+msgstr[2] "можжевельника"
+msgstr[3] "можжевельники"
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -35828,80 +37336,98 @@ msgstr ""
 "Пряный, на вкус похож на розмарин."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
-msgstr[0] "горсть очищенных фисташек"
-msgstr[1] "горсти очищенных фисташек"
-msgstr[2] "горстей очищенных фисташек"
-msgstr[3] "горсти очищенных фисташек"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
+msgstr[0] "очищенные фисташки"
+msgstr[1] "очищенные фисташки"
+msgstr[2] "очищенные фисташки"
+msgstr[3] "очищенные фисташки"
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
 msgstr "Горсть орехов фисташкового дерева, очищенных от скорлупы."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
-msgstr[0] "горсть жареных фисташек"
-msgstr[1] "горсти жареных фисташек"
-msgstr[2] "горстей жареных фисташек"
-msgstr[3] "горсть жареных фисташек"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
+msgstr[0] "жареные фисташки"
+msgstr[1] "жареные фисташки"
+msgstr[2] "жареные фисташки"
+msgstr[3] "жареные фисташки"
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr "Горсть жареных орехов фисташкового дерева."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
-msgstr[0] "горсть очищенного миндаля"
-msgstr[1] "горсти очищенного миндаля"
-msgstr[2] "горстей очищенного миндаля"
-msgstr[3] "горсти очищенного миндаля"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
+msgstr[0] "очищенный миндаль"
+msgstr[1] "очищенный миндаль"
+msgstr[2] "очищенный миндаль"
+msgstr[3] "очищенный миндаль"
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
 msgstr "Горсть орехов миндального дерева, очищенных от скорлупы."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
-msgstr[0] "горсть жареного миндаля"
-msgstr[1] "горсти жареного миндаля"
-msgstr[2] "горстей жареного миндаля"
-msgstr[3] "горсть жареного миндаля"
+msgid "almond pulp"
+msgid_plural "almond pulp"
+msgstr[0] "миндальная мякоть"
+msgstr[1] "миндальная мякоть"
+msgstr[2] "миндальная мякоть"
+msgstr[3] "миндальная мякоть"
 
-#. ~ Description for handful of roasted almonds
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr ""
+"Мякоть, оставшаяся после приготовления миндального молока. Она шершавая и "
+"невероятно невкусная."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
+msgstr[0] "жареный миндаль"
+msgstr[1] "жареный миндаль"
+msgstr[2] "жареный миндаль"
+msgstr[3] "жареный миндаль"
+
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
 msgstr "Горсть жареных орехов миндального дерева."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
-msgstr[0] "горсть кешью"
-msgstr[1] "горсти кешью"
-msgstr[2] "горстей кешью"
-msgstr[3] "горсти кешью"
+msgid "cashews"
+msgid_plural "cashews"
+msgstr[0] "кешью"
+msgstr[1] "кешью"
+msgstr[2] "кешью"
+msgstr[3] "кешью"
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr "Горстка солёных кешью."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
-msgstr[0] "горсть очищенного пекана"
-msgstr[1] "горсти очищенного пекана"
-msgstr[2] "горстей очищенного пекана"
-msgstr[3] "горсти очищенного пекана"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
+msgstr[0] "очищенный орех пекан"
+msgstr[1] "очищенных ореха пекан"
+msgstr[2] "очищенных орехов пекан"
+msgstr[3] "очищенные орехи пекан"
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -35911,53 +37437,53 @@ msgstr ""
 "скорлупа удалена."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
-msgstr[0] "горсть жареного пекана"
-msgstr[1] "горсти жареного пекана"
-msgstr[2] "горстей жареного пекана"
-msgstr[3] "горсть жареного пекана"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
+msgstr[0] "жареный орех пекан"
+msgstr[1] "жареных ореха пекан"
+msgstr[2] "жареных орехов пекан"
+msgstr[3] "жареные орехи пекан"
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr "Горсть жареных орехов дерева пекан."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
-msgstr[0] "горсть очищенного арахиса"
-msgstr[1] "горсти очищенного арахиса"
-msgstr[2] "горстей очищенного арахиса"
-msgstr[3] "горсть очищенного арахиса"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
+msgstr[0] "очищенный арахис"
+msgstr[1] "очищенный арахис"
+msgstr[2] "очищенный арахис"
+msgstr[3] "очищенный арахис"
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr "Солёный арахис без скорлупы."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
-msgstr[0] "горсть буковых орехов"
-msgstr[1] "горсти буковых орехов"
-msgstr[2] "горстей буковых орехов"
-msgstr[3] "горсти буковых орехов"
+msgid "beech nuts"
+msgid_plural "beech nuts"
+msgstr[0] "буковый орех"
+msgstr[1] "буковых ореха"
+msgstr[2] "буковых орехов"
+msgstr[3] "буковые орехи"
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr "Горсть твёрдых заострённых орехов букового дерева."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
-msgstr[0] "горсть очищенного грецкого ореха"
-msgstr[1] "горсти очищенного грецкого ореха"
-msgstr[2] "горстей очищенного грецкого ореха"
-msgstr[3] "горсть очищенного грецкого ореха"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
+msgstr[0] "очищенный грецкий орех"
+msgstr[1] "очищенных грецких ореха"
+msgstr[2] "очищенных грецких орехов"
+msgstr[3] "очищенные грецкие орехи"
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -35965,27 +37491,28 @@ msgid ""
 msgstr "Горсть сырых твёрдых орехов грецкого дерева, очищенных от скорлупы."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
-msgstr[0] "горсть жареного грецкого ореха"
-msgstr[1] "горсти жареного грецкого ореха"
-msgstr[2] "горстей жареного грецкого ореха"
-msgstr[3] "горсть жареного грецкого ореха"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
+msgstr[0] "жареный грецкий орех"
+msgstr[1] "жареных грецких ореха"
+msgstr[2] "жареных грецких орехов"
+msgstr[3] "жареные грецкие орехи"
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr "Горсть жареных орехов грецкого дерева."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
-msgstr[0] "горсть очищенных каштанов"
-msgstr[1] "горсти очищенных каштанов"
-msgstr[2] "горстей очищенных каштанов"
-msgstr[3] "горсть очищенных каштанов"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
+msgstr[0] "очищенный каштан"
+msgstr[1] "очищенных каштана"
+msgstr[2] "очищенных каштанов"
+msgstr[3] "очищенные каштаны"
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -35994,27 +37521,29 @@ msgstr ""
 "Горсть сырых твёрдых орехов каштанового дерева, очищенных от скорлупы."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
-msgstr[0] "горсть жареных каштанов"
-msgstr[1] "горсти жареных каштанов"
-msgstr[2] "горстей жареных каштанов"
-msgstr[3] "горсть жареных каштанов"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
+msgstr[0] "жареный каштан"
+msgstr[1] "жареные каштаны"
+msgstr[2] "жареные каштаны"
+msgstr[3] "жареные каштаны"
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr "Горсть жареных орехов каштанового дерева."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
-msgstr[0] "горсть очищенной лещины"
-msgstr[1] "горсти очищенной лещины"
-msgstr[2] "горстей очищенной лещины"
-msgstr[3] "горсти очищенной лещины"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
+msgstr[0] "очищенный фундук"
+msgstr[1] "очищенный фундук"
+msgstr[2] "очищенный фундук"
+msgstr[3] "очищенный фундук"
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -36022,53 +37551,55 @@ msgid ""
 msgstr "Горсть сырых твёрдых орехов лещины, очищенных от скорлупы."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
-msgstr[0] "горсть жареных эдамамэ"
-msgstr[1] "горсти жареных эдамамэ"
-msgstr[2] "горстей жареных эдамамэ"
-msgstr[3] "горсти жареных эдамамэ"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
+msgstr[0] "жареные эдамамэ"
+msgstr[1] "жареные эдамамэ"
+msgstr[2] "жареные эдамамэ"
+msgstr[3] "жареные эдамамэ"
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr "Жареные эдамамэ, полезная закуска."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
-msgstr[0] "горсть жареных соевых бобов"
-msgstr[1] "горсти жареных соевых бобов"
-msgstr[2] "горстей жареных соевых бобов"
-msgstr[3] "горсти жареных соевых бобов"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
+msgstr[0] "жареные соевые бобы"
+msgstr[1] "жареные соевые бобы"
+msgstr[2] "жареные соевые бобы"
+msgstr[3] "жареные соевые бобы"
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr "Жареные соевые бобы, иногда называемые соевыми орехами."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
-msgstr[0] "горсть жареной лещины"
-msgstr[1] "горсти жареной лещины"
-msgstr[2] "горстей жареной лещины"
-msgstr[3] "горсть жареной лещины"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
+msgstr[0] "жаренный фундук"
+msgstr[1] "жаренный фундук"
+msgstr[2] "жаренный фундук"
+msgstr[3] "жаренный фундук"
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr "Горсть жареных орехов лещины."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
-msgstr[0] "горсть очищенных орехов гикори"
-msgstr[1] "горсти очищенных орехов гикори"
-msgstr[2] "горстей очищенных орехов гикори"
-msgstr[3] "горсть очищенных орехов гикори"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
+msgstr[0] "очищенный орех гикори"
+msgstr[1] "очищенные орехи гикори"
+msgstr[2] "очищенные орехи гикори"
+msgstr[3] "очищенные орехи гикори"
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -36076,14 +37607,15 @@ msgid ""
 msgstr "Горсть сырых твёрдых орехов дерева гикори, очищенных от скорлупы."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
-msgstr[0] "горсть жареных орехов гикори"
-msgstr[1] "горсти жареных орехов гикори"
-msgstr[2] "горстей жареных орехов гикори"
-msgstr[3] "горсть жареных орехов гикори"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
+msgstr[0] "жареный орех гикори"
+msgstr[1] "жареных ореха гикори"
+msgstr[2] "жареных орехов гикори"
+msgstr[3] "жареные орехи гикори"
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr "Горсть жареных орехов дерева гикори."
@@ -36098,31 +37630,31 @@ msgid "Delicious hickory nut ambrosia.  A drink worthy of the gods."
 msgstr "Вкусная амброзия из орехов гикори. Напиток, достойный богов."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
-msgstr[0] "горсть желудей"
-msgstr[1] "горсти желудей"
-msgstr[2] "горстей желудей"
-msgstr[3] "горсть желудей"
+msgid "acorns"
+msgid_plural "acorns"
+msgstr[0] "жёлудь"
+msgstr[1] "жёлудя"
+msgstr[2] "жёлудей"
+msgstr[3] "жёлуди"
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
 "they're not very good for you to eat in this state."
 msgstr ""
-"Горстка желудей, ещё в скорлупе. Белки их любят, но вам не желательно есть "
+"Горстка жёлудей, ещё в скорлупе. Белки их любят, но вам не желательно есть "
 "их в этом состоянии."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
-msgstr[0] "горсть жареных желудей"
-msgstr[1] "горсти жареных желудей"
-msgstr[2] "горстей жареных желудей"
-msgstr[3] "горсть жареных желудей"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
+msgstr[0] "жареный жёлудь"
+msgstr[1] "жареных жёлудя"
+msgstr[2] "жареных жёлудя"
+msgstr[3] "жареные жёлуди"
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr "Горсть жареных орехов дуба."
@@ -36141,7 +37673,7 @@ msgid ""
 "A serving of acorns that have been hulled, chopped, and boiled in water "
 "before being thoroughly toasted until dry.  Filling and nutritious."
 msgstr ""
-"Порция желудей, которые были очищены от скорлупы, нарезаны и сварены в воде,"
+"Порция жёлудей, которые были очищены от скорлупы, нарезаны и сварены в воде,"
 " прежде чем поджариться до полного высыхания. Сытно и питательно."
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -36804,13 +38336,14 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
-msgstr[0] "порошок зелёного сойлента"
-msgstr[1] "порошка зелёного сойлента"
-msgstr[2] "порошков зелёного сойлента"
-msgstr[3] "порошок зелёного сойлента"
+msgid_plural "soylent green powder"
+msgstr[0] "сойлентовый зеленый порошок"
+msgstr[1] "сойлентовый зеленый порошок"
+msgstr[2] "сойлентовый зеленый порошок"
+msgstr[3] "сойлентовый зеленый порошок"
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -36861,13 +38394,13 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
+msgid_plural "protein powder"
 msgstr[0] "протеиновый порошок"
-msgstr[1] "протеиновых порошка"
+msgstr[1] "протеиновых порошока"
 msgstr[2] "протеиновых порошков"
 msgstr[3] "протеиновый порошок"
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -36943,79 +38476,79 @@ msgid "Very sour citrus.  Can be eaten if you really want."
 msgstr "Очень кислый цитрус. Можно съесть, если и вправду хочется."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
-msgstr[0] "горсть голубики"
-msgstr[1] "горсти голубики"
-msgstr[2] "горстей голубики"
-msgstr[3] "горсть голубики"
+msgid "blueberries"
+msgid_plural "blueberries"
+msgstr[0] "голубика"
+msgstr[1] "голубики"
+msgstr[2] "голубик"
+msgstr[3] "голубики"
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr "Она голубого цвета, но это не значит, что она в печали."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
-msgstr[0] "горсть клубники"
-msgstr[1] "горсть клубники"
-msgstr[2] "горсть клубники"
-msgstr[3] "горсть клубники"
+msgid "strawberries"
+msgid_plural "strawberries"
+msgstr[0] "клубника"
+msgstr[1] "клубники"
+msgstr[2] "клубничек"
+msgstr[3] "клубники"
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr "Сладкая сочная ягода, часто встречается на диких полях."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
-msgstr[0] "горсть клюквы"
-msgstr[1] "горсть клюквы"
-msgstr[2] "горсть клюквы"
-msgstr[3] "горсть клюквы"
+msgid "cranberries"
+msgid_plural "cranberries"
+msgstr[0] "клюква"
+msgstr[1] "клюквы"
+msgstr[2] "клюкв"
+msgstr[3] "клюквы"
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr "Кислые красные ягоды. Полезны для здоровья."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
-msgstr[0] "горсть малины"
-msgstr[1] "горсть малины"
-msgstr[2] "горсть малины"
-msgstr[3] "горсть малины"
+msgid "raspberries"
+msgid_plural "raspberries"
+msgstr[0] "малина"
+msgstr[1] "малина"
+msgstr[2] "малин"
+msgstr[3] "малины"
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "Сладкая красная ягода."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
-msgstr[0] "горсть черники"
-msgstr[1] "горсти черники"
-msgstr[2] "горстей черники"
-msgstr[3] "горсть черники"
+msgid "huckleberries"
+msgid_plural "huckleberries"
+msgstr[0] "люссакия"
+msgstr[1] "люссакии"
+msgstr[2] "люссакий"
+msgstr[3] "люссакии"
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr "Люссакию часто путают с черникой."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
-msgstr[0] "горсть шелковицы"
-msgstr[1] "горсть шелковицы"
-msgstr[2] "горсть шелковицы"
-msgstr[3] "горсть шелковицы"
+msgid "mulberries"
+msgid_plural "mulberries"
+msgstr[0] "шелковица"
+msgstr[1] "шелковицы"
+msgstr[2] "шелковиц"
+msgstr[3] "шелковицы"
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -37026,14 +38559,14 @@ msgstr ""
 "мире."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
-msgstr[0] "горсть бузины"
-msgstr[1] "горсть бузины"
-msgstr[2] "горсть бузины"
-msgstr[3] "горсть бузины"
+msgid "elderberries"
+msgid_plural "elderberries"
+msgstr[0] "бузина"
+msgstr[1] "бузины"
+msgstr[2] "бузин"
+msgstr[3] "бузины"
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr ""
@@ -37041,14 +38574,14 @@ msgstr ""
 " приготовлены."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
-msgstr[0] "горсть шиповника"
-msgstr[1] "горсть шиповника"
-msgstr[2] "горсть шиповника"
-msgstr[3] "горсть шиповника"
+msgid "rose hips"
+msgid_plural "rose hips"
+msgstr[0] "шиповник"
+msgstr[1] "шиповника"
+msgstr[2] "шиповников"
+msgstr[3] "шиповники"
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "Плод опылённого розового цветка шиповника."
@@ -37085,14 +38618,14 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "Цитрус, вкус которого варьируется от кислого до полусладкого."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
-msgstr[0] "горсть вишни"
-msgstr[1] "горсть вишни"
-msgstr[2] "горсть вишни"
-msgstr[3] "горсть вишни"
+msgid "cherries"
+msgid_plural "cherries"
+msgstr[0] "вишня"
+msgstr[1] "вишни"
+msgstr[2] "вишень"
+msgstr[3] "вишни"
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr "Красный сладкий плод, растущий на деревьях."
@@ -37108,14 +38641,14 @@ msgid ""
 msgstr "Несколько крупных фиолетовых слив. Полезные и хорошо усваиваемые."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
-msgstr[0] "горсть винограда"
-msgstr[1] "горсть винограда"
-msgstr[2] "горсть винограда"
-msgstr[3] "горсть винограда"
+msgid "grapes"
+msgid_plural "grapes"
+msgstr[0] "виноград"
+msgstr[1] "винограда"
+msgstr[2] "виноградин"
+msgstr[3] "виноградины"
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr "Гроздь сочного винограда."
@@ -37170,14 +38703,14 @@ msgid "A large and very sweet fruit."
 msgstr "Большой и очень сладкий фрукт."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
-msgstr[0] "горсть ежевики"
-msgstr[1] "горсть ежевики"
-msgstr[2] "горсть ежевики"
-msgstr[3] "горсть ежевики"
+msgid "blackberries"
+msgid_plural "blackberries"
+msgstr[0] "ежевика"
+msgstr[1] "ежевики"
+msgstr[2] "ежевик"
+msgstr[3] "ежевики"
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "Тёмная родственница малины."
@@ -37222,18 +38755,31 @@ msgstr ""
 "восхитительная зелёная мякоть."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
-msgstr[0] "горсть абрикосов"
-msgstr[1] "горсть абрикосов"
-msgstr[2] "горсть абрикосов"
-msgstr[3] "горсть абрикосов"
+msgid "apricots"
+msgid_plural "apricots"
+msgstr[0] "абрикос"
+msgstr[1] "абрикоса"
+msgstr[2] "абрикосов"
+msgstr[3] "абрикосы"
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "Гладкокожий фрукт, похожий на персик."
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr "бутон чоллы"
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr ""
+"Съедобная почка кактуса чолла с удаленными шипиками; деликатес коренных "
+"народов Мохаве. На вкус похожа на спаржу."
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr "росток кактуса"
@@ -37440,13 +38986,13 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] "козлобородник"
 msgstr[1] "козлобородника"
-msgstr[2] "козлобородника"
-msgstr[3] "козлобородник"
+msgstr[2] "козлобородников"
+msgstr[3] "козлобородники"
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -37458,13 +39004,13 @@ msgstr ""
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
-msgstr[0] "горсть цикория"
-msgstr[1] "горсти цикория"
-msgstr[2] "горстей цикория"
-msgstr[3] "горсти цикория"
+msgid_plural "chicory"
+msgstr[0] "цикорий"
+msgstr[1] "цикорий"
+msgstr[2] "цикорий"
+msgstr[3] "цикорий"
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -37598,14 +39144,14 @@ msgstr ""
 " но отлично подходит для готовки."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
-msgstr[0] "пригоршня одуванчиков"
-msgstr[1] "пригоршни одуванчиков"
-msgstr[2] "пригоршней одуванчиков"
-msgstr[3] "пригоршня одуванчиков"
+msgid "dandelions"
+msgid_plural "dandelions"
+msgstr[0] "одуванчик"
+msgstr[1] "одуванчика"
+msgstr[2] "одуванчиков"
+msgstr[3] "одуванчики"
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -37761,14 +39307,14 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr "Сырая неприготовленная чечевица. Её можно приготовить."
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
-msgstr[0] "горсть побегов папоротника"
-msgstr[1] "горсти побегов папоротника"
-msgstr[2] "горстей побегов папоротника"
-msgstr[3] "горсти побегов папоротника"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
+msgstr[0] "побег папоротника"
+msgstr[1] "побега папоротника"
+msgstr[2] "побегов папоротника"
+msgstr[3] "побеги папоротника"
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -39326,7 +40872,7 @@ msgid ""
 "intended for use decorating soft surfaces of sweets.  Like sugar, they are "
 "bad for your teeth and surprisingly not very tasty on their own."
 msgstr ""
-"Нопарель, посыпка, сахарная крошка - разноцветные шарики, палочки и хлопья "
+"Нонпарель, посыпка, сахарная крошка — разноцветные шарики, палочки и хлопья "
 "сахара с крахмалом для украшения мягких кондитерских изделий. Как и сахар, "
 "вредны для зубов и не очень вкусные сами по себе."
 
@@ -39983,8 +41529,8 @@ msgstr[3] "сырые спагетти"
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
 msgstr ""
 "Разновидность пасты, обычно из таких готовят спагетти. Можно съесть сырыми, "
 "если всё совсем плохо, но будет гораздо лучше, если их приготовить."
@@ -40000,7 +41546,7 @@ msgstr[3] "сырые лазаньи"
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
 msgstr ""
 "Лист пасты, из которого готовят лазанью. Можно съесть сырым, если всё совсем"
@@ -40515,7 +42061,7 @@ msgstr "основа зелья"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr ""
 "Крепкий спирт, наполненный маной и концентрированный в жидкость, способную "
 "стабилизировать заклинания в жидкой форме. Если хотите, можете выпить."
@@ -40532,11 +42078,11 @@ msgstr[3] "большие надпочечники"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr ""
 "Орган, расположенный над почками, выделяет адреналин, кортизол и "
-"альдостерон. Этот экземпляр просто огромный по естественным причинам или как"
-" результат мутации."
+"альдостерон. Этот экземпляр просто огромный по естественным причинам или в "
+"результате мутации."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "dragon essence"
@@ -40638,8 +42184,8 @@ msgstr "зомби кукла вуду"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 "На удивление точная фигурка зомби с кусочками костей и органов. Некромантия "
 "задерживает быстрое гниение, но её не хватит навечно. Если пронзить фигурку "
@@ -40653,8 +42199,9 @@ msgstr "костяная кукла вуду"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr ""
 "На удивление точная фигурка покрытого костью зомби с кусочками органов. "
 "Некромантия задерживает быстрое гниение, но её не хватит навечно. Если "
@@ -40668,8 +42215,8 @@ msgstr "кукла вуду пумы"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr ""
 "На удивление точная фигурка зомби-пумы с клочками шерсти, кусочками костей и"
 " органов. Некромантия задерживает быстрое гниение, но её не хватит навечно. "
@@ -40683,8 +42230,8 @@ msgstr "зелье Безумного Исцеления"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
 msgstr ""
 "Эта плохо пахнущая жидкость стимулирует регенерацию нежити ускоряя ваше "
 "сердце до опасных значений. Употребление этого в опасности или критическом "
@@ -40698,9 +42245,9 @@ msgstr "зелье Улучшенного Безумного Исцеления"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
 "Эта плохо пахнущая жидкость стимулирует регенерацию нежити ускоряя ваше "
 "сердце до опасных значений. Употребление этого в опасности или критическом "
@@ -40746,7 +42293,7 @@ msgstr[3] "комки шерсти"
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr ""
 "Крупный мерзкий шарик звериной слюны и вылизанных волос. Не ешьте его."
 
@@ -40765,8 +42312,18 @@ msgid ""
 "same way as other meat, making it obvious that it still retains some magical"
 " properties."
 msgstr ""
-"Мясо поверженного дракона. Похоже что оно не реагирует на готовку так же как"
-" и другое мясо, очевидно что оно сохраняет некоторые магические свойства."
+"Мясо поверженного дракона. Похоже что оно не реагирует на готовку как "
+"обычное мясо, очевидно что оно сохраняет некоторые магические свойства."
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr "гриб крикуна"
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr "Грибы, собранные с мертвого крикуна. Можно использовать для зелий."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
@@ -41563,15 +43120,6 @@ msgstr[3] "рисовая мука"
 msgid "This rice flour is useful for baking."
 msgstr "Эта рисовая мука полезна для выпечки."
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr "бутон чоллы"
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr "Сладость аборигенов пустыни Мохаве."
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr "сыворотка возрождения"
@@ -41938,8 +43486,8 @@ msgstr[3] "картонные пакеты"
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr ""
 "Двухлитровый коробчатый пакет из картона, алюминия и пластиковой выстилки. "
 "Имеется резьбовая пробка для лёгкого закрывания."
@@ -41955,8 +43503,8 @@ msgstr[3] "открытые картонные пакеты"
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
 msgstr ""
 "Двухлитровый коробчатый пакет из картона, алюминия и пластиковой выстилки. "
 "Этот пакет открыт, и его содержимое испортится."
@@ -42616,8 +44164,8 @@ msgstr[3] "коробки от набора выживальщика"
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
 msgstr ""
 "Алюминиевая коробочка, в которой лежал маленький набор для выживания. "
 "Вмещает 1 л жидкости."
@@ -42748,20 +44296,20 @@ msgstr ""
 #: lang/json/CONTAINER_from_json.py
 msgid "endless flask"
 msgid_plural "endless flasks"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "бесконечная фляга"
+msgstr[1] "бесконечные фляги"
+msgstr[2] "бесконечных фляг"
+msgstr[3] "бесконечные фляги"
 
 #. ~ Use action msg for endless flask.
 #: lang/json/CONTAINER_from_json.py
 msgid "You open the flask and discover it full of sweet, sweet, whiskey!"
-msgstr ""
+msgstr "Вы открываете флягу и обнаруживаете, что она полна сладчайшего виски!"
 
 #. ~ Use action not_ready_msg for endless flask.
 #: lang/json/CONTAINER_from_json.py
 msgid "The flask isn't done refilling yet."
-msgstr ""
+msgstr "Фляга еще не заправлена."
 
 #: lang/json/CONTAINER_from_json.py
 msgid "aluminum foil wrap"
@@ -43282,8 +44830,8 @@ msgstr[3] "родонит"
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr ""
 "Кусок родонита. Он покрыт диоксидом марганца, ветвящимся внутрь минерала "
 "множеством жилок. Их можно извлечь при помощи долота."
@@ -43299,10 +44847,10 @@ msgstr[3] "цинкит"
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr ""
-"Кусок цинкита. Может быть переработан в оксид цинка, затем в цинк "
+"Кусок цинкита. Может быть переработан в оксид цинка, затем в цинк, "
 "восстановлением с помощью источника углерода."
 
 #: lang/json/GENERIC_from_json.py
@@ -43319,105 +44867,105 @@ msgid "A root from a hickory tree.  It has an earthy smell."
 msgstr "Корень дерева гикори. Имеет землистый запах."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
-msgstr[0] "горсть орехов гикори"
-msgstr[1] "горсти орехов гикори"
-msgstr[2] "горстей орехов гикори"
-msgstr[3] "горсти орехов гикори"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
+msgstr[0] "орех гикори"
+msgstr[1] "ореха гикори"
+msgstr[2] "орехов гикори"
+msgstr[3] "орехи гикори"
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr "Горсть твёрдых орехов дерева гикори, по-прежнему в своей скорлупе."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
-msgstr[0] "горсть пекана"
-msgstr[1] "горсти пекана"
-msgstr[2] "горстей пекана"
-msgstr[3] "горсти пекана"
+msgid "pecans"
+msgid_plural "pecans"
+msgstr[0] "орех пекан"
+msgstr[1] "ореха пекан"
+msgstr[2] "орехов пекан"
+msgstr[3] "орехи пекан"
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr "Горсть твёрдых орехов дерева пекан, всё ещё в скорлупе."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
-msgstr[0] "горсть фисташек"
-msgstr[1] "горсти фисташек"
-msgstr[2] "горстей фисташек"
-msgstr[3] "горсти фисташек"
+msgid "pistachios"
+msgid_plural "pistachios"
+msgstr[0] "фисташки"
+msgstr[1] "фисташки"
+msgstr[2] "фисташки"
+msgstr[3] "фисташки"
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr "Горсть твёрдых орехов фисташкового дерева, всё ещё в скорлупе."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
-msgstr[0] "горсть миндаля"
-msgstr[1] "горсти миндаля"
-msgstr[2] "горстей миндаля"
-msgstr[3] "горсти миндаля"
+msgid "almonds"
+msgid_plural "almonds"
+msgstr[0] "миндаль"
+msgstr[1] "миндаль"
+msgstr[2] "миндаль"
+msgstr[3] "миндаль"
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
 msgstr "Горсть твёрдых орехов миндального дерева, всё ещё в скорлупе."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
-msgstr[0] "горсть арахиса"
-msgstr[1] "горсти арахиса"
-msgstr[2] "горстей арахиса"
-msgstr[3] "горсти арахиса"
+msgid "peanuts"
+msgid_plural "peanuts"
+msgstr[0] "арахис"
+msgstr[1] "арахис"
+msgstr[2] "арахис"
+msgstr[3] "арахис"
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr "Горсть твёрдых орехов арахисового кустарника, всё ещё в скорлупе."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
-msgstr[0] "горсть лещины"
-msgstr[1] "горсти лещины"
-msgstr[2] "горстей лещины"
-msgstr[3] "горсти лещины"
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
+msgstr[0] "фундук"
+msgstr[1] "фундук"
+msgstr[2] "фундук"
+msgstr[3] "фундук"
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr "Горсть твёрдых орехов лещины, всё ещё в скорлупе."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
-msgstr[0] "горсть каштанов"
-msgstr[1] "горсти каштанов"
-msgstr[2] "горстей каштанов"
-msgstr[3] "горсти каштанов"
+msgid "chestnuts"
+msgid_plural "chestnuts"
+msgstr[0] "каштан"
+msgstr[1] "каштана"
+msgstr[2] "каштанов"
+msgstr[3] "каштаны"
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr "Горсть твёрдых орехов каштанового дерева, всё ещё в скорлупе."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
-msgstr[0] "горсть грецких орехов"
-msgstr[1] "горсти грецких орехов"
-msgstr[2] "горстей грецких орехов"
-msgstr[3] "горсти грецких орехов"
+msgid "walnuts"
+msgid_plural "walnuts"
+msgstr[0] "грецкий орех"
+msgstr[1] "грецких ореха"
+msgstr[2] "грецких орехов"
+msgstr[3] "грецкие орехи"
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr "Горсть твёрдых грецких орехов, всё ещё в скорлупе."
@@ -43587,7 +45135,7 @@ msgstr "Труп, покрытый свернувшейся кровью."
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr ""
 "Труп с пугающим выражением лица. Похоже, его сильно изувечило перед смертью."
@@ -43614,7 +45162,7 @@ msgstr ""
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr ""
 "Верхняя половина трупа, будто бы разорванного невероятной силищей. Часть "
@@ -43736,6 +45284,14 @@ msgstr "мускулатура"
 msgid "wind"
 msgstr "ветер"
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] "метаболизм"
+msgstr[1] "метаболизма"
+msgstr[2] "метаболизмов"
+msgstr[3] "метаболизмы"
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "приспособление для курения и источник огня"
@@ -43760,10 +45316,10 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "INCIDENT REPORT: IMMERSION-27A"
 msgid_plural "INCIDENT REPORT: IMMERSION-27As"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "ИНФОРМАЦИОННЫЙ ОТЧЕТ: ПОГРУЖЕНИЕ-27А"
+msgstr[1] "ИНФОРМАЦИОННЫХ ОТЧЕТА: ПОГРУЖЕНИЕ-27А"
+msgstr[2] "ИНФОРМАЦИОННЫХ ОТЧЕТА: ПОГРУЖЕНИЕ-27А"
+msgstr[3] "ИНФОРМАЦИОННЫЕ ОТЧЕТЫ: ПОГРУЖЕНИЕ-27А"
 
 #. ~ Description for INCIDENT REPORT: IMMERSION-27A
 #: lang/json/GENERIC_from_json.py
@@ -43777,18 +45333,18 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "MATERIAL: T-SUBSTRATE"
 msgid_plural "MATERIAL: T-SUBSTRATEs"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "МАТЕРИАЛ: Т-ПОДЛОЖКА"
+msgstr[1] "МАТЕРИАЛА: Т-ПОДЛОЖКА"
+msgstr[2] "МАТЕРИАЛОВ: Т-ПОДЛОЖКА"
+msgstr[3] "МАТЕРИАЛЫ: Т-ПОДЛОЖКА"
 
 #: lang/json/GENERIC_from_json.py
 msgid "HAADF MICROGRAPH: T-SUBSTRATE"
 msgid_plural "HAADF MICROGRAPH: T-SUBSTRATEs"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "HAADF МИКРОСКОПИЯ: Т-ПОДЛОЖКА"
+msgstr[1] "HAADF МИКРОСКОПИИ: Т-ПОДЛОЖКА"
+msgstr[2] "HAADF МИКРОСКОПИЙ: Т-ПОДЛОЖКА"
+msgstr[3] "HAADF МИКРОСКОПИИ: Т-ПОДЛОЖКА"
 
 #: lang/json/GENERIC_from_json.py
 msgid "foodplace loyalty card"
@@ -43802,7 +45358,7 @@ msgstr[3] "скидочные карты «Сядь-и-поешь»"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr ""
 "Ярко-розовая карта скидок, все пункты проштампованы. Это определенно "
 "доказало бы вашу верность «Сядь-и-поешь», если бы это все еще что-то "
@@ -43981,8 +45537,8 @@ msgstr[3] "сотни керамических дисков"
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr ""
 "Множество маленьких слегка продолговатых дисков из высококачественной "
 "керамики. Они напоминают чешуйки."
@@ -44056,16 +45612,17 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "t-substrate sample"
 msgid_plural "t-substrate samples"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "образец т-подложки"
+msgstr[1] "образца т-подложки"
+msgstr[2] "образцов т-подложки"
+msgstr[3] "образцы т-подложки"
 
 #. ~ Description for t-substrate sample
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "An acrylic cube cast around a small black crystal.  It's tepid to the touch."
 msgstr ""
+"Акриловый кубик, прохладный на ощупь. Внутри маленький черный кристалл."
 
 #: lang/json/GENERIC_from_json.py
 msgid "biollante bud"
@@ -44368,6 +45925,20 @@ msgstr ""
 "Кусок арматуры, может послужить неплохим холодным оружием, а также весьма "
 "полезным строительным инструментом для укрепления стен и прочего."
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] "маленький ж/д путь"
+msgstr[1] "маленьких ж/д пути"
+msgstr[2] "маленьких ж/д путей"
+msgstr[3] "маленькие ж/д пути"
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr "Длинный путь, уложенный из шпал и рельс."
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -44533,10 +46104,8 @@ msgstr[3] "телевизор"
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
-msgstr ""
-"Массивный телевизор с электронно-лучевой трубкой, полон различной вкусной "
-"электроникой."
+msgid "A large LCD television, full of delicious electronics."
+msgstr "Большой ЖК-телевизор, полный вкусной электроники."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -45075,6 +46644,23 @@ msgstr ""
 "Схема предназначена для приёма сигнала. Используется для создания "
 "коммуникационной аппаратуры."
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] "большой ЖК-дисплей"
+msgstr[1] "больших ЖК-дисплея"
+msgstr[2] "больших ЖК-дисплеев"
+msgstr[3] "большие ЖК-дисплеи"
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr ""
+"Большой экран с подсветкой, используемый для отображения изображений. "
+"Используется в некоторых рецептах электроники."
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -45145,9 +46731,9 @@ msgstr ""
 msgid "burnt out bionic"
 msgid_plural "burnt out bionics"
 msgstr[0] "перегоревшая бионика"
-msgstr[1] "перегоревших бионики"
+msgstr[1] "перегоревшие бионики"
 msgstr[2] "перегоревших бионик"
-msgstr[3] "перегоревшая бионика"
+msgstr[3] "перегоревшие бионики"
 
 #. ~ Description for burnt out bionic
 #: lang/json/GENERIC_from_json.py
@@ -45252,8 +46838,8 @@ msgid "electronic scrap"
 msgid_plural "electronic scraps"
 msgstr[0] "электронный компонент"
 msgstr[1] "электронных компонента"
-msgstr[2] "электронных компонентов"
-msgstr[3] "электронный компонент"
+msgstr[2] "электронных компонент"
+msgstr[3] "электронные компоненты"
 
 #. ~ Description for electronic scrap
 #: lang/json/GENERIC_from_json.py
@@ -45593,7 +47179,7 @@ msgstr[3] "SD-карта с научными данными"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
+"encrypted.  Looks *Interesting*, though…"
 msgstr ""
 "Похоже, на этой карте памяти есть информация по «XEDRA». Естественно, всё "
 "зашифровано. Однако всё равно это интересно…"
@@ -45688,14 +47274,15 @@ msgstr ""
 "съедены животными."
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
-msgstr[0] "пригоршня цветков ромашки"
-msgstr[1] "пригоршни цветков ромашки"
-msgstr[2] "пригоршней цветков ромашки"
-msgstr[3] "пригоршни цветков ромашки"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
+msgstr[0] "цветок ромашки"
+msgstr[1] "цветка ромашки"
+msgstr[2] "цветков ромашки"
+msgstr[3] "цветы ромашки"
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -46034,10 +47621,10 @@ msgstr "Пачка купюр по 20 долларов, теперь уже со
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -46096,10 +47683,10 @@ msgstr[3] "окурок сигареты"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr ""
-"То, что раньше было чудесной трубочкой высушенного табачного листа, в настоящее время лишь вонючий кусок мусора. Какая трагедия!\n"
-"Остатки табака в некоторых из них, вероятно, могут быть использованы, чтобы скрутить ещё одну сигарету. Если вы готовы зайти так далеко…"
+"То, что раньше было чудесной трубочкой высушенного табачного листа, в настоящее время лишь вонючая кучка мусора. Какая трагедия!\n"
+"Остатки табака, вероятно, могут быть использованы, чтобы скрутить ещё одну сигаретку. Если вы готовы зайти так далеко…"
 
 #. ~ Use action msg for joint.
 #: lang/json/GENERIC_from_json.py
@@ -46153,13 +47740,13 @@ msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
+msgid_plural "raw tobacco"
 msgstr[0] "сырой табак"
-msgstr[1] "сырого табака"
-msgstr[2] "сырого табака"
+msgstr[1] "сырых табака"
+msgstr[2] "сырой табак"
 msgstr[3] "сырой табак"
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -46225,14 +47812,6 @@ msgstr ""
 "Пропуск является гарантом доступа в определённые места через терминал, если "
 "конечно найти куда его вставлять."
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] "лист неопрена"
-msgstr[1] "листа неопрена"
-msgstr[2] "листов неопрена"
-msgstr[3] "лист неопрена"
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -46838,15 +48417,6 @@ msgstr ""
 "Одноручный топорик. Неплохое оружие ближнего боя. Можно использовать для "
 "рубки или в качестве молотка."
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr ""
-"Камень размером с бейсбольный мяч. Не самое плохое оружие ближнего боя, но "
-"куда больше подходит для метания во врагов."
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -47545,10 +49115,10 @@ msgstr[3] "рессора"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
+" an awful lot like a bow.  You can barely bend it…"
 msgstr ""
 "Большая, мощная листовая рессора. Вероятно, от какого-то автомобиля или "
-"грузовика, сильно напоминает лук. Вы можете едва согнуть её…"
+"грузовика, сильно напоминает лук. Вы едва можете согнуть её…"
 
 #: lang/json/GENERIC_from_json.py
 msgid "hydrangea"
@@ -48346,7 +49916,7 @@ msgstr[3] "атомная кофемашина"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
@@ -48368,7 +49938,9 @@ msgstr[3] "атомная лампа"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "Закрыть крышку"
 
@@ -48403,7 +49975,9 @@ msgstr[3] "атомная лампа (закрыто)"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "Открыть крышку"
 
@@ -48762,11 +50336,11 @@ msgstr[3] "крюк-кошка"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
 msgstr ""
-"Складной крюк, привязанный к прочной десятиметровой верёвке. Полезна для "
-"спасения от падений. В крайнем случае сгодится как замена верёвке при "
+"Складной крюк, привязанный к прочной десятиметровой верёвке. Полезен для "
+"спасения от падений. В крайнем случае, сгодится как замена верёвке при "
 "разделке."
 
 #: lang/json/GENERIC_from_json.py
@@ -49796,12 +51370,8 @@ msgstr[3] "Прекрасная Весна"
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
-msgstr ""
-"Полное руководство по кунг-фу Винь-Чунь. Включает раздел о мечах-бабочках и "
-"использовании длинных шестов."
+msgid "A complete guide to Wing Chun Kung-fu."
+msgstr "Подробное руководство по вин-чун кунг-фу."
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
 #: lang/json/martial_art_from_json.py
@@ -49810,18 +51380,18 @@ msgid_plural "Fior Di Battaglia"
 msgstr[0] "\"Цветок Битвы\""
 msgstr[1] "\"Цветок Битвы\""
 msgstr[2] "\"Цветок Битвы\""
-msgstr[3] "\"Цветок Битвы\""
+msgstr[3] "«Цветок Битвы»"
 
 #. ~ Description for Fior Di Battaglia
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr ""
 "Полностью переведённое средневековое руководство по различным техникам "
 "обращения с древковым оружием, есть глава про различные виды простого "
-"древкового оружия... даже с картинками!"
+"древкового оружия… Даже с картинками!"
 
 #: lang/json/GENERIC_from_json.py
 msgid "Historic European Swordfighting"
@@ -49926,7 +51496,7 @@ msgid ""
 "the air.  When you add flour and water to it, after a few hours it froths "
 "and rises."
 msgstr ""
-"В этой банке - драгоценная смесь из муки, воды, грибков и бактерий из "
+"В этой банке — драгоценная смесь из муки, воды, грибков и бактерий из "
 "воздуха. Она вспучится и поднимется через несколько часов после добавления "
 "муки и воды."
 
@@ -51164,6 +52734,25 @@ msgstr[3] "расписки"
 msgid "This is a slip of paper signed by the issuer."
 msgstr "Листок бумаги, подписанный эминентом."
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] "икона"
+msgstr[1] "иконы"
+msgstr[2] "икон"
+msgstr[3] "иконы"
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr ""
+"Это маленькая картина размером с пластиковую карточку, с изображением "
+"духовного лица. На обороте есть текст, который гласит «Церковное сообщество "
+"Новой Англии»."
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -51562,11 +53151,9 @@ msgstr[3] "вилка"
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
-msgstr ""
-"Вилка, если вы ударите что-то, держа её в руке, то сразу же это и съедите. "
-"Подождите… неважно."
+msgstr "Вилка. Наколол и съел. Подождите… Неважно."
 
 #: lang/json/GENERIC_from_json.py
 msgid "plastic fork"
@@ -53025,14 +54612,14 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
 "Большой молот, выкованный из сердца умирающей звезды. На нём высечена надпись:\n"
 " \n"
 "Всякий, кто держит этот молот,\n"
 "Если будет достоин,\n"
-"Да обретёт силу...\n"
+"Да обретёт силу…\n"
 "СОКРУШАТЬ!"
 
 #: lang/json/GENERIC_from_json.py
@@ -53049,7 +54636,7 @@ msgid ""
 "This is a versatile polearm with an spiked hammer head, a spike, and a hook "
 "attached to a long stick."
 msgstr ""
-"Универсальное древковое оружие - шипастый молот, лезвие и крюк на длинном "
+"Универсальное древковое оружие — шипастый молот, лезвие и крюк на длинном "
 "шесте."
 
 #. ~ Description for lucerne hammer
@@ -53064,10 +54651,10 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "shillelagh"
 msgid_plural "shillelaghs"
-msgstr[0] "Шилейла"
-msgstr[1] "Шилейла"
-msgstr[2] "Шилейла"
-msgstr[3] "Шилейла"
+msgstr[0] "шилейла"
+msgstr[1] "шилейла"
+msgstr[2] "шилейла"
+msgstr[3] "шилейла"
 
 #. ~ Description for shillelagh
 #: lang/json/GENERIC_from_json.py
@@ -53083,10 +54670,10 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "loaded stick"
 msgid_plural "loaded sticks"
-msgstr[0] "Утяжелённая дубина"
-msgstr[1] "Утяжелённая дубина"
-msgstr[2] "Утяжелённая дубина"
-msgstr[3] "Утяжелённая дубина"
+msgstr[0] "yтяжелённая дубина"
+msgstr[1] "yтяжелённые дубины"
+msgstr[2] "утяжелённых дубин"
+msgstr[3] "утяжелённая дубина"
 
 #. ~ Description for loaded stick
 #: lang/json/GENERIC_from_json.py
@@ -53598,8 +55185,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
 msgstr ""
 "Это тонкий колющий меч, напоминающий длинный меч, своего рода предшественник"
 " рапиры. Требует для ношения большую перевязь или ножны, по сравнению с "
@@ -53727,17 +55314,17 @@ msgstr ""
 "стержень и тупой наконечник."
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
+msgid "fencing épée"
+msgid_plural "fencing épées"
 msgstr[0] "фехтовальная шпага"
-msgstr[1] "фехтовальной шпаги"
+msgstr[1] "фехтовальные шпаги"
 msgstr[2] "фехтовальных шпаг"
-msgstr[3] "фехтовальная шпага"
+msgstr[3] "фехтовальные шпаги"
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
 msgstr ""
@@ -53757,11 +55344,73 @@ msgstr[3] "фехтовальная сабля"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
+"is marginally shorter than the foil and épée, but no less effective."
 msgstr ""
 "Оружие для фехтования, благороднейшего из всех видов спорта. Сабля немного "
 "короче рапиры и шпаги, но не менее эффективна."
 
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] "заострённая рапира"
+msgstr[1] "заострённые рапиры"
+msgstr[2] "заострённых рапир"
+msgstr[3] "заострённые рапиры"
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+"У этой некогда безвредной спортивной фехтовальной рапиры была удалена "
+"электрическая кнопка и грубо заточено остриё. Хотя ей по-прежнему не хватает"
+" режущей кромки, теперь она несколько более смертоносна и всё ещё знакома "
+"опытному фехтовальщику."
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] "заострённая шпага"
+msgstr[1] "заострённые шпаги"
+msgstr[2] "заострённых шпаг"
+msgstr[3] "заострённые шпаги"
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+"У этой некогда безвредной спортивной фехтовальной шпаги была удалена "
+"электрическая кнопка и грубо заточен кончик. Хотя ей по-прежнему не хватает "
+"режущей кромки, теперь она несколько более смертоносна и всё ещё знакома "
+"опытному фехтовальщику."
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] "заострённая сабля"
+msgstr[1] "заострённые сабля"
+msgstr[2] "заострённых сабель"
+msgstr[3] "заострённые сабли"
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
+msgstr ""
+"У этой некогда безвредной фехтовальной сабли был грубо заточен скруглённый "
+"кончик. Хотя ей по-прежнему не хватает режущей кромки, теперь она несколько "
+"более смертоносна и всё ещё знакома опытному фехтовальщику."
+
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
 msgid_plural "hollow canes"
@@ -54038,15 +55687,15 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid "mesh screen"
 msgid_plural "mesh screens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "антимоскитная сетка"
+msgstr[1] "антимоскитные сетки"
+msgstr[2] "антимоскитных сеток"
+msgstr[3] "антимоскитные сетки"
 
 #. ~ Description for mesh screen
 #: lang/json/GENERIC_from_json.py
 msgid "A roll of fine mesh screen for bug barriers on porches."
-msgstr ""
+msgstr "Рулон мелкой антимоскитной сетки для защиты от насекомых."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pipe"
@@ -54111,12 +55760,12 @@ msgstr[3] "алюминиевый слиток"
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
+"down to a powder, for more… high-profile applications."
 msgstr ""
 "Маленький алюминиевый слиток, стандартизированный для дальнейшей "
 "переработки. Он лёгок, но прочен, его можно переплавить в различные формы "
-"для строительства или же перемолоть в порошок для применения в более… "
-"высококлассных сферах."
+"для строительства или же перемолоть в порошок и найти ему более… "
+"Высококлассное применение."
 
 #: lang/json/GENERIC_from_json.py
 msgid "scrap copper"
@@ -54148,10 +55797,10 @@ msgstr "Одно- или двуспальный матрас."
 #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py
 msgid "down mattress"
 msgid_plural "down mattresses"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "пуховой матрас"
+msgstr[1] "пуховых матраса"
+msgstr[2] "пуховых матраса"
+msgstr[3] "пуховые матрасы"
 
 #. ~ Description for down mattress
 #: lang/json/GENERIC_from_json.py
@@ -54538,6 +56187,58 @@ msgstr ""
 "Стальное шило с деревянной ручкой, обычно с его помощью работают с кожей. "
 "Также им можно пользоваться как колющим оружием, но оно быстро сломается."
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] "рамочный ткацкий станок"
+msgstr[1] "рамочных ткацких станка"
+msgstr[2] "рамочных ткацких станка"
+msgstr[3] "рамочные ткацкие станки"
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr ""
+"Это довольно громоздкий и примитивный деревянный каркас, который можно "
+"использовать для плетения ткани. О-очень медленно."
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] "деревянная ткацкая палочка"
+msgstr[1] "деревянные ткацкие палочки"
+msgstr[2] "деревянных ткацких палочек"
+msgstr[3] "деревянные ткацкие палочки"
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr ""
+"Это короткая тонкая плоская деревянная палочка, используемая в качестве "
+"инструмента для плетения ткани на рамочном ткацком станке."
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] "набор выкройки"
+msgstr[1] "набора выкройки"
+msgstr[2] "наборов выкройки"
+msgstr[3] "наборы выкройки"
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr ""
+"Это большой набор выкройки из бумаги. Они полезны для создания любого вида "
+"одежды из ткани или кожи с нуля и необходимы для более сложных проектов."
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -54965,10 +56666,10 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "turret control unit"
 msgid_plural "turret control units"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "блок управления турелью"
+msgstr[1] "блока управления турелью"
+msgstr[2] "блоков управления турелью"
+msgstr[3] "блоки управления турелью"
 
 #. ~ Description for turret control unit
 #: lang/json/GENERIC_from_json.py
@@ -54977,6 +56678,9 @@ msgid ""
 "allow for tracking targets, friend-or-foe identification, and firing the "
 "connected turret in full automatic mode."
 msgstr ""
+"Набор из двигателя, камеры и ИИ-блока, соединённых вместе, который позволяет"
+" отслеживать цели, идентифицировать друга или врага и стрелять из "
+"подключенной башни в полностью автоматическом режиме."
 
 #: lang/json/GENERIC_from_json.py
 msgid "massive engine block"
@@ -56287,10 +57991,10 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "programmable autopilot"
 msgid_plural "programmable autopilots"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "программируемый автопилот"
+msgstr[1] "программируемых автопилота"
+msgstr[2] "программируемых автопилота"
+msgstr[3] "программируемые автопилоты"
 
 #. ~ Description for programmable autopilot
 #: lang/json/GENERIC_from_json.py
@@ -56298,6 +58002,8 @@ msgid ""
 "A computer system hooked up to the steering and engine of a vehicle to allow"
 " it to follow simple paths."
 msgstr ""
+"Компьютерная система, подключенная к рулевому управлению и двигателю "
+"автомобиля, которая направляет его по заданному простому пути."
 
 #: lang/json/GENERIC_from_json.py
 msgid "mountable autoclave"
@@ -56389,9 +58095,9 @@ msgstr[3] "средние ступицы"
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr ""
-"Металлическое приспособление, позволяет закрепить колесо на автомобиле. "
+"Металлическое конструкция, позволяющая закрепить колесо на автомобиле. "
 "Подходит для автомобильного колеса."
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -56405,10 +58111,10 @@ msgstr[3] "тяжёлые ступицы"
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr ""
-"Тяжелое металлическое приспособление, позволяет закрепить колесо на "
+"Тяжелая металлическая конструкция, позволяющая закрепить колесо на "
 "автомобиле. Подходит для большого автомобильного колеса."
 
 #: lang/json/GENERIC_from_json.py
@@ -57856,6 +59562,32 @@ msgstr ""
 "Биография военного киборга, подробно описывающая его боевые искусства и "
 "взгляды на жизнь."
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] "железный кнут"
+msgstr[1] "железных кнута"
+msgstr[2] "железных кнутов"
+msgstr[3] "железные кнуты"
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr "Вы сворачиваете кнут в руке, и он мгновенно превращается в пояс."
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr ""
+"Длинный плетёный гибкий стальной кнут, сужающийся к острию. Легко способен "
+"нарезать и покрошить кубиками всё, что попадает на вас. Он превращается "
+"обратно в пояс."
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -58528,21 +60260,187 @@ msgstr[1] "дао +2"
 msgstr[2] "дао +2"
 msgstr[3] "дао +2"
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] "копьё Биоманта"
+msgstr[1] "копья Биоманта"
+msgstr[2] "копий Биоманта"
+msgstr[3] "копья Биоманта"
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr ""
+"Мерзкий костяной наконечник на прочном деревянном древке. У основания "
+"наконечника начертана биомантская руна."
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] "инструмент Техноманта"
+msgstr[1] "инструмента Техноманта"
+msgstr[2] "инструментов Техноманта"
+msgstr[3] "инструменты Техноманта"
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr ""
+"Удобный посох с прочным разводным ключом на одном конце лома и молотком на "
+"другом. На молотке выгравирована техномантская руна."
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] "посох мага"
+msgstr[1] "посоха мага"
+msgstr[2] "посохов мага"
+msgstr[3] "посохи мага"
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr ""
+"Посох с вырезанными рунами и двумя стеклянными баночками, для прочности "
+"закалёнными и напитанными маной и служащими как сосуды для маны. На концах "
+"выгравированы руны Мага."
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] "фламберг Кельвиниста"
+msgstr[1] "фламберга Кельвиниста"
+msgstr[2] "фламбергов Кельвиниста"
+msgstr[3] "фламберги Кельвиниста"
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr ""
+"Меч с волнообразным лезвием, напоминающим пламя. На рукояти выгравирована "
+"руна Кельвиниста."
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] "топор Повелителя бурь"
+msgstr[1] "топора Повелителя бурь"
+msgstr[2] "топоров Повелителя бурь"
+msgstr[3] "топоры Повелителя бурь"
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr ""
+"Кованый медный топор с серебряной окантовкой и деревянным топорищем. Возле "
+"проушины выгравирована руна Повелителя бурь."
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] "атам Анимиста"
+msgstr[1] "атама Анимиста"
+msgstr[2] "атамов Анимиста"
+msgstr[3] "атамы Анимиста"
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr ""
+"Стальной ритуальный нож, которым Анимисты выпускают кровь для призывающих "
+"заклинаний. На гарде выгравирована руна их школы."
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] "жезлопосох (жезл)"
+msgstr[1] "жезлопосоха (жезла)"
+msgstr[2] "жезлопосохов (жезлов)"
+msgstr[3] "жезлопосохи (жезлы)"
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr "Удлинить жезл"
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr "Вы удлинили жезлопосох, теперь это посох, поручик."
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr ""
+"В этом универсальном оружии используются пружины, усиленные техномансией, "
+"для удержания концов посоха, когда он находятся в конфигурации жезла. "
+"Активируйте, чтобы удлинить."
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] "жезлопосох (посох)"
+msgstr[1] "жезлопосоха (посоха)"
+msgstr[2] "жезлопосохов (посохов)"
+msgstr[3] "жезлопосохи (посохи)"
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr "Укоротить посох"
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr "Вы складываете жезлопосох."
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr ""
+"В этом универсальном оружии используются пружины, усиленные техномансией, "
+"для предотвращения складывания посоха. Активируйте, чтобы укоротить."
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "волшебный жетон"
+msgstr[1] "волшебных жетона"
+msgstr[2] "волшебных жетонов"
+msgstr[3] "волшебные жетоны"
 
 #: lang/json/GENERIC_from_json.py
 msgid "longsword token"
 msgid_plural "longsword tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон длинного меча"
+msgstr[1] "жетона длинного меча"
+msgstr[2] "жетонов длинного меча"
+msgstr[3] "жетоны длинного меча"
 
 #. ~ Use action msg for longsword token.
 #: lang/json/GENERIC_from_json.py
@@ -58550,6 +60448,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a shiny pristine longsword!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в блестящий новенький длинный меч!"
 
 #. ~ Description for longsword token
 #: lang/json/GENERIC_from_json.py
@@ -58557,14 +60457,17 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case a longsword."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, "
+"длинный меч."
 
 #: lang/json/GENERIC_from_json.py
 msgid "arming sword token"
 msgid_plural "arming sword tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон меча"
+msgstr[1] "жетона меча"
+msgstr[2] "жетонов меча"
+msgstr[3] "жетоны меча"
 
 #. ~ Use action msg for arming sword token.
 #: lang/json/GENERIC_from_json.py
@@ -58572,6 +60475,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a shiny pristine arming sword!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в сияющий новенький меч!"
 
 #. ~ Description for arming sword token
 #: lang/json/GENERIC_from_json.py
@@ -58579,14 +60484,17 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case an arming sword."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, "
+"меч."
 
 #: lang/json/GENERIC_from_json.py
 msgid "broadsword token"
 msgid_plural "broadsword tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон палаша"
+msgstr[1] "жетона палаша"
+msgstr[2] "жетонов палаша"
+msgstr[3] "жетоны палаша"
 
 #. ~ Use action msg for broadsword token.
 #: lang/json/GENERIC_from_json.py
@@ -58594,6 +60502,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a shiny pristine broadsword!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в блестящий новенький палаш!"
 
 #. ~ Description for broadsword token
 #: lang/json/GENERIC_from_json.py
@@ -58601,14 +60511,17 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case a broadsword."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, "
+"палаш."
 
 #: lang/json/GENERIC_from_json.py
 msgid "battleaxe token"
 msgid_plural "battleaxe tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон боевого топора"
+msgstr[1] "жетона боевого топора"
+msgstr[2] "жетонов боевого топора"
+msgstr[3] "жетоны боевого топора"
 
 #. ~ Use action msg for battleaxe token.
 #: lang/json/GENERIC_from_json.py
@@ -58616,6 +60529,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a shiny pristine battle axe!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в блестящий новенький боевой топор!"
 
 #. ~ Description for battleaxe token
 #: lang/json/GENERIC_from_json.py
@@ -58623,14 +60538,17 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case a battle axe."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, "
+"боевой топор."
 
 #: lang/json/GENERIC_from_json.py
 msgid "pike token"
 msgid_plural "pike tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон пики"
+msgstr[1] "жетона пики"
+msgstr[2] "жетонов пики"
+msgstr[3] "жетоны пики"
 
 #. ~ Use action msg for pike token.
 #: lang/json/GENERIC_from_json.py
@@ -58638,6 +60556,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a shiny pristine pike!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в блестящую новенькую пику!"
 
 #. ~ Description for pike token
 #: lang/json/GENERIC_from_json.py
@@ -58645,14 +60565,17 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case a pike."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, в "
+"пику."
 
 #: lang/json/GENERIC_from_json.py
 msgid "mace token"
 msgid_plural "mace tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон булавы"
+msgstr[1] "жетона булавы"
+msgstr[2] "жетонов булавы"
+msgstr[3] "жетоны булавы"
 
 #. ~ Use action msg for mace token.
 #: lang/json/GENERIC_from_json.py
@@ -58660,6 +60583,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a shiny pristine mace!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в блестящую новенькую булаву!"
 
 #. ~ Description for mace token
 #: lang/json/GENERIC_from_json.py
@@ -58667,14 +60592,17 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case a mace."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, в "
+"булаву."
 
 #: lang/json/GENERIC_from_json.py
 msgid "quarterstaff token"
 msgid_plural "quarterstaff tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон посоха"
+msgstr[1] "жетона посоха"
+msgstr[2] "жетонов посоха"
+msgstr[3] "жетоны посоха"
 
 #. ~ Use action msg for quarterstaff token.
 #: lang/json/GENERIC_from_json.py
@@ -58682,6 +60610,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a pristine quarterstaff!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в блестящий новенький посох!"
 
 #. ~ Description for quarterstaff token
 #: lang/json/GENERIC_from_json.py
@@ -58689,14 +60619,17 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case a quarterstaff."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, в "
+"посох."
 
 #: lang/json/GENERIC_from_json.py
 msgid "hammer token"
 msgid_plural "hammer tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон молота"
+msgstr[1] "жетона молота"
+msgstr[2] "жетонов молота"
+msgstr[3] "жетоны молота"
 
 #. ~ Use action msg for hammer token.
 #: lang/json/GENERIC_from_json.py
@@ -58704,6 +60637,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a shiny pristine hammer!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в блестящий новенький молот!"
 
 #. ~ Description for hammer token
 #: lang/json/GENERIC_from_json.py
@@ -58711,14 +60646,17 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case a hammer."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, в "
+"молот."
 
 #: lang/json/GENERIC_from_json.py
 msgid "screwdriver set token"
 msgid_plural "screwdriver set tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон набора отвёрток"
+msgstr[1] "жетона набора отвёрток"
+msgstr[2] "жетонов набора отвёрток"
+msgstr[3] "жетоны набора отвёрток"
 
 #. ~ Use action msg for screwdriver set token.
 #: lang/json/GENERIC_from_json.py
@@ -58726,6 +60664,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a shiny pristine screwdriver set!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в новенький, с иголочки, набор отвёрток!"
 
 #. ~ Description for screwdriver set token
 #: lang/json/GENERIC_from_json.py
@@ -58733,14 +60673,17 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case a screwdriver."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, в "
+"отвёртки."
 
 #: lang/json/GENERIC_from_json.py
 msgid "toolbox token"
 msgid_plural "toolbox tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон инструментов"
+msgstr[1] "жетона инструментов"
+msgstr[2] "жетонов инструментов"
+msgstr[3] "жетоны инструментов"
 
 #. ~ Use action msg for toolbox token.
 #: lang/json/GENERIC_from_json.py
@@ -58748,6 +60691,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a shiny pristine toolbox!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в набор новеньких, с иголочки, инструментов!"
 
 #. ~ Description for toolbox token
 #: lang/json/GENERIC_from_json.py
@@ -58755,14 +60700,17 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case a toolbox."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, в "
+"инструменты."
 
 #: lang/json/GENERIC_from_json.py
 msgid "crowbar token"
 msgid_plural "crowbar tokens"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "жетон ломика"
+msgstr[1] "жетона ломика"
+msgstr[2] "жетонов ломика"
+msgstr[3] "жетоны ломика"
 
 #. ~ Use action msg for crowbar token.
 #: lang/json/GENERIC_from_json.py
@@ -58770,6 +60718,8 @@ msgid ""
 "You say the command word engraved on the token, and it rapidly grows and "
 "morphs into a shiny pristine crowbar!"
 msgstr ""
+"Вы произносите кодовое слово, выгравированное на монете и она быстро растет,"
+" превращаясь в блестящий новенький ломик!"
 
 #. ~ Description for crowbar token
 #: lang/json/GENERIC_from_json.py
@@ -58777,6 +60727,9 @@ msgid ""
 "A large silver coin that, when activated by uttering the word on the back, "
 "turns into the item pictured on the front, in this case a crowbar."
 msgstr ""
+"Большая серебряная монета, которая, при произношении слова на обороте, "
+"превращается в предмет, изображенный на лицевой стороне, в нашем случае, "
+"ломик."
 
 #: lang/json/GENERIC_from_json.py
 msgid "cestus +1"
@@ -58846,6 +60799,25 @@ msgstr ""
 "Большая блестящая металлическая рукавица, покрытая магическими символами, "
 "которая позволяет наносить поразительно мощные удары."
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] "цестус Повелителя земли"
+msgstr[1] "цестуса Повелителя земли"
+msgstr[2] "цестусов Повелителя земли"
+msgstr[3] "цестусы Повелителя земли"
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr ""
+"Каменная боевая перчатка с вырезанными рунами, защищающая руку и позволяющая"
+" наносить мощные удары. На ладони выгравирована руна Повелителя земли."
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -58957,6 +60929,23 @@ msgstr ""
 "драгоценных металлов и самоцветов, которые медленно слипаются в блестящие "
 "камешки, ценящиеся за красоту и силу."
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] "хоботок кровопийцы"
+msgstr[1] "хоботка кровопийцы"
+msgstr[2] "хоботоков кровопийц"
+msgstr[3] "хоботки кровопийцы"
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr ""
+"Длинный сосущий хоботок, срезанный с туловища кровопийцы. Годится для "
+"создания скверного оружия ближнего боя."
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -58992,129 +60981,6 @@ msgstr ""
 "чешуя, из неё можно изготовить доспех, прочный как сталь и вдвое легче "
 "стали."
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] "копьё Биоманта"
-msgstr[1] "копья Биоманта"
-msgstr[2] "копий Биоманта"
-msgstr[3] "копья Биоманта"
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr ""
-"Мерзкий костяной наконечник на прочном деревянном древке. У основания "
-"наконечника начертана биомантская руна."
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] "инструмент Техноманта"
-msgstr[1] "инструмента Техноманта"
-msgstr[2] "инструментов Техноманта"
-msgstr[3] "инструменты Техноманта"
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr ""
-"Удобный посох с прочным разводным ключом на одном конце лома и молотком на "
-"другом. На молотке выгравирована техномантская руна."
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] "посох мага"
-msgstr[1] "посоха мага"
-msgstr[2] "посохов мага"
-msgstr[3] "посохи мага"
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr ""
-"Посох с вырезанными рунами и двумя стеклянными баночками, для прочности "
-"закалёнными и напитанными маной и служащими как сосуды для маны. На концах "
-"выгравированы руны Мага."
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] "цестус Повелителя земли"
-msgstr[1] "цестуса Повелителя земли"
-msgstr[2] "цестусов Повелителя земли"
-msgstr[3] "цестусы Повелителя земли"
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr ""
-"Каменная боевая перчатка с вырезанными рунами, защищающая руку и позволяющая"
-" наносить мощные удары. На ладони выгравирована руна Повелителя земли."
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] "фламберг Кельвиниста"
-msgstr[1] "фламберга Кельвиниста"
-msgstr[2] "фламбергов Кельвиниста"
-msgstr[3] "фламберги Кельвиниста"
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr ""
-"Меч с волнообразным лезвием, напоминающим пламя. На рукояти выгравирована "
-"руна Кельвиниста."
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] "топор Повелителя бурь"
-msgstr[1] "топора Повелителя бурь"
-msgstr[2] "топоров Повелителя бурь"
-msgstr[3] "топоры Повелителя бурь"
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr ""
-"Кованый медный топор с серебряной окантовкой и деревянным топорищем. Возле "
-"проушины выгравирована руна Повелителя бурь."
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] "атам Анимиста"
-msgstr[1] "атама Анимиста"
-msgstr[2] "атамов Анимиста"
-msgstr[3] "атамы Анимиста"
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr ""
-"Стальной ритуальный нож, которым Анимисты выпускают кровь для призывающих "
-"заклинаний. На гарде выгравирована руна их школы."
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -59210,6 +61076,72 @@ msgstr[3] "жуткие костяные копья"
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr "Жуткая помесь копья и алебарды, полностью состоящая из кости."
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr ""
+"Мьёлнир, молот Тора. Ходят слухи, что одним ударом может сравнять горы с "
+"землёй. Он украшен золотым и серебряным орнаментом."
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] "Гунгнир"
+msgstr[1] "Гунгнира"
+msgstr[2] "Гунгниров"
+msgstr[3] "Гунгнир"
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+"Гунгнир, копьё Одина. Говорят, что это копьё всегда безошибочно бьёт в цель,"
+" независимо от силы или умения его носителя. Оно украшено золотым и "
+"серебряным орнаментом."
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Грам"
+msgstr[1] "Грама"
+msgstr[2] "Грамов"
+msgstr[3] "Грам"
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+"Грам, меч Сигурда. По слухам, этим мечом был убил легендарный дракон Фафнир."
+" Так же говорят, что этот меч расколол наковальню Реджина пополам, лезвие "
+"безупречно."
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] "Леватейн"
+msgstr[1] "Леватейн"
+msgstr[2] "Леватейн"
+msgstr[3] "Леватейн"
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr ""
+"Леватейн, посох Локи. Говорят, что Локи сорвал его у ворот Хель. Пропитан "
+"таинственной магией, магией самого бога-обманщика."
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -59521,8 +61453,8 @@ msgstr[3] "свитки Ослепляющей вспышки"
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
 msgstr ""
 "Резкий сверкающий свет, ненадолго ослепляющий противников. На высоких "
 "уровнях немного разрушительнее."
@@ -59540,7 +61472,7 @@ msgstr[3] "свитки Эфирной хватки"
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr ""
 "Множество призрачных рук вырываются из-под земли и замедляют всех  области "
 "воздействия. На высоких уровнях область выше, а эффект дольше."
@@ -60498,19 +62430,51 @@ msgstr[3] "свитки Семян Очищения"
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
 msgstr ""
 "Вы призываете дар земли, способный очищать воду. На высоких уровнях "
 "призывается больше семян."
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] "Свиток рентгеновского зрения"
+msgstr[1] "Свитка рентгеновского зрения"
+msgstr[2] "Свитков рентгеновского зрения"
+msgstr[3] "Свитки рентгеновского зрения"
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr ""
+"Вы излучаете конусное рентгеновское поле, которое волшебным образом "
+"позволяют вам увидеть эту область на короткое время."
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] "Свиток ясновидения"
+msgstr[1] "Свитка ясновидения"
+msgstr[2] "Свитков ясновидения"
+msgstr[3] "Свитки ясновидения"
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
+msgstr "Вы закрываете глаза и вам покоряются секреты земли."
+
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Lava Bomb"
 msgid_plural "Scroll of Lava Bombs"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Свиток вулканической бомбы"
+msgstr[1] "Свитка вулканической бомбы"
+msgstr[2] "Свитков вулканических бомб"
+msgstr[3] "Свитки вулканических бомб"
 
 #. ~ Description for Scroll of Lava Bomb
 #. ~ Description for Lava Bomb
@@ -60520,6 +62484,22 @@ msgid ""
 "surrounded by hot, solid rock.  It shatters upon impact, spraying shards of "
 "rock and lava everywhere."
 msgstr ""
+"Земля разверзается под вами, чтобы запустить вулканическую бомбу: шар лавы, "
+"окруженный горячей, твёрдой мантией. Он разрушается при попадании, "
+"разбрызгивая лаву и осколки камня повсюду."
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
@@ -61661,14 +63641,6 @@ msgstr ""
 "Копия Мьёлнира, молота Тора. Говорят, что с его помощью можно равнять горы с"
 " землёй одним ударом. Он украшен золотым и серебряным орнаментом."
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] "Гунгнир"
-msgstr[1] "Гунгнира"
-msgstr[2] "Гунгниров"
-msgstr[3] "Гунгнир"
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -62862,6 +64834,11 @@ msgstr "ХИМИКАТЫ"
 msgid "SPARE PARTS"
 msgstr "ЗАПЧАСТИ"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "КОНТЕЙНЕРЫ"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "АРТЕФАКТЫ"
@@ -62872,6 +64849,325 @@ msgstr "АРТЕФАКТЫ"
 msgid "ARMOR"
 msgstr "БРОНЯ"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "НАДЕТЫЕ ВЕЩИ"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "ОРУЖИЕ В РУКАХ"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr "Предметы: несортированное"
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+"Место для несортированной добычи. Вы можете использовать команду «сортировка"
+" предметов» для сортировки вещей внутри. Оно может перекрывать зоны "
+"предметов разных типов."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr "Предметы: еда"
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr ""
+"Место для съестных припасов. Если более конкретная зона для пищи не "
+"определена, вся еда перемещается сюда."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr "Предметы: порт. еда"
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr ""
+"Место для скоропортящихся продуктов. Включает в себя скоропортящиеся "
+"напитки, если для них не указана конкретная зона."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr "Предметы: напитки"
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr ""
+"Место для напитков. Включает в себя скоропортящиеся напитки, если для них не"
+" указана конкретная зона."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr "Предметы: порт. напитки"
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr "Место для скоропортящихся продуктов."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr "Предметы: контейнеры"
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr "Место для пустых контейнеров."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr "Предметы: огнестр. оружие"
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr "Место для оружия, луков и прочих похожих штук."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr "Предметы: магазины"
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr "Место для магазинов к оружию."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr "Предметы: боеприпасы"
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr "Место для патронов."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr "Предметы: оружие"
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr "Место для оружия ближнего боя."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr "Предметы: инструменты"
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr "Место для инструментов."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr "Предметы: одежда"
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr ""
+"Место для одежды. Включает в себя грязную одежду, если для нее не указано "
+"конкретной зоны."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr "Предметы: грязная одежда"
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr "Место для грязной одежды."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr "Предметы: мед. препараты"
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr "Место для лекарств и прочих медицинских вещей."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr "Предметы: книги"
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr "Место для книг и журналов."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr "Предметы: модификации"
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr "Место для оружейных модификаций и похожих вещей."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr "Предметы: мутагены"
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr "Место для мутагенов, сывороток и очистителей."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr "Предметы: бионика"
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr "Место для Компактных Бионических Модулей, аки КБМ."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr "Предметы: детали транспорта"
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr "Место для частей от машин."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr "Предметы: другое"
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr "Место для прочих вещей."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr "Предметы: топливо"
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr ""
+"Место для бензина, дизеля, лампового масла и прочих субстанций, "
+"использующихся как топливо."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr "Предметы: семена"
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr "Место для семян, стеблей и прочих похожих вещей."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr "Предметы: химикаты"
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr "Место для химикатов."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr "Предметы: запчасти"
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr "Место для запасных частей."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr "Предметы: артефакты"
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr "Место для артефактов."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr "Предметы: трупы"
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr "Место для трупов"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr "Предметы: броня"
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr ""
+"Место для брони. Включает в себя грязную брону, если для нее не указана "
+"конкретная зона."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr "Предметы: грязная броня"
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr "Место для грязной брони."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr "Предметы: дерево"
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr ""
+"Место для дров и вещей, которые могут использоваться в этом же смысле."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr "Предметы: Настраиваемое"
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr "Место для предметов с настраиваемым изменяемым фильтром."
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr "Предметы: игнорировать"
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr ""
+"Вещи внутри этой зоны игнорируются при использовании «сортировки предметов» "
+"в зоне."
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -63161,7 +65457,7 @@ msgstr[3] "тяжёлые одноразовые батарейки"
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
 msgstr ""
 "Тяжёлая батарея, совместимая со всем промышленным оборудованием и большими "
@@ -63564,7 +65860,7 @@ msgstr "H&K G3 барабанный магазин"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
+msgid "A 50-round drum magazine for the H&K G3 rifle."
 msgstr ""
 "Барабанный магазин на 50 патронов для использования с винтовкой H&K G3."
 
@@ -63611,7 +65907,7 @@ msgstr "FN SCAR-H барабанный магазин"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
 msgstr ""
 "Барабанный магазин на 50 патронов для использования с винтовкой FN SCAR-H."
 
@@ -63717,17 +66013,6 @@ msgstr "P320 .357 SIG магазин"
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr "Двухрядный коробчатый магазин на 14 патронов для SIG Sauer P320."
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "Taurus .38 магазин"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr ""
-"Компактный стальной коробчатый магазин для использования с пистолетом Taurus"
-" Pro .38."
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr ".38/.357 обойма на 7 патронов"
@@ -63810,6 +66095,18 @@ msgstr "Стальной коробчатый магазин на 8 патрон
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr "Стальной коробчатый магазин на 10 патронов для Hi-Point CF-380."
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr "Taurus Spectrum магазин"
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr ""
+"Компактный стальной коробчатый магазин на 6 патронов для использования с "
+"пистолетом Taurus Spectrum."
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr "M1991 .38 Супер магазин"
@@ -65781,12 +68078,12 @@ msgstr ""
 
 #: lang/json/MOD_INFO_from_json.py
 msgid "Fuji's Military Profession Pack"
-msgstr ""
+msgstr "Пак военных профессий от Fuji"
 
 #. ~ Description for Fuji's Military Profession Pack
 #: lang/json/MOD_INFO_from_json.py
 msgid "Numerous military themed professions"
-msgstr ""
+msgstr "Различные военно-тематические звания и профессии"
 
 #: lang/json/MOD_INFO_from_json.py
 msgid "Fuji's More Buildings"
@@ -66430,7 +68727,7 @@ msgstr "Генерация карты демо"
 #. ~ Description for Mapgen Demo
 #: lang/json/MOD_INFO_from_json.py
 msgid "Demo for JSONized mapgens (megastore, missile silo)."
-msgstr "Демо-версия JSONизированных локаций (гипермаркет, ракетная шахта)."
+msgstr "Демо-версия JSON-изированных локаций (супермаркет, ракетная шахта)."
 
 #: lang/json/MOD_INFO_from_json.py
 msgid "Classes and Scenarios Mod"
@@ -66627,10 +68924,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "goose"
 msgid_plural "geese"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "гусь"
+msgstr[1] "гуся"
+msgstr[2] "гусей"
+msgstr[3] "гуси"
 
 #. ~ Description for {'str': 'goose', 'str_pl': 'geese'}
 #: lang/json/MONSTER_from_json.py
@@ -67014,7 +69311,7 @@ msgstr[3] "дроны-ядерные мини-бомбы"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
+"appears to have a mininuke inside.  If this is targeting you…  Run."
 msgstr ""
 "Автоматический дрон-квадрокоптер во много раз больше обычного, по-видимому с"
 " ядерной мини-бомбой внутри. Если он нацелится на вас… Бегите."
@@ -67022,10 +69319,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "tiny fish"
 msgid_plural "tiny fish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "рыбёшка"
+msgstr[1] "рыбёшки"
+msgstr[2] "рыбёшек"
+msgstr[3] "рыбёшки"
 
 #. ~ Description for {'str': 'tiny fish', 'str_pl': 'tiny fish'}
 #: lang/json/MONSTER_from_json.py
@@ -67035,10 +69332,10 @@ msgstr "Крошечная рыбка."
 #: lang/json/MONSTER_from_json.py
 msgid "small fish"
 msgid_plural "small fish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "рыбка"
+msgstr[1] "рыбки"
+msgstr[2] "рыбок"
+msgstr[3] "рыбки"
 
 #. ~ Description for {'str': 'small fish', 'str_pl': 'small fish'}
 #: lang/json/MONSTER_from_json.py
@@ -67048,10 +69345,10 @@ msgstr "Маленькая рыбка."
 #: lang/json/MONSTER_from_json.py
 msgid "medium fish"
 msgid_plural "medium fish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "рыба"
+msgstr[1] "рыбы"
+msgstr[2] "рыб"
+msgstr[3] "рыбы"
 
 #. ~ Description for {'str': 'medium fish', 'str_pl': 'medium fish'}
 #: lang/json/MONSTER_from_json.py
@@ -67061,10 +69358,10 @@ msgstr "Средняя рыба."
 #: lang/json/MONSTER_from_json.py
 msgid "large fish"
 msgid_plural "large fish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "рыбина"
+msgstr[1] "рыбины"
+msgstr[2] "рыбин"
+msgstr[3] "рыбины"
 
 #. ~ Description for {'str': 'large fish', 'str_pl': 'large fish'}
 #: lang/json/MONSTER_from_json.py
@@ -67074,10 +69371,10 @@ msgstr "Большая рыба."
 #: lang/json/MONSTER_from_json.py
 msgid "huge fish"
 msgid_plural "huge fish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "огромная рыбина"
+msgstr[1] "огромные рыбины"
+msgstr[2] "огромных рыбин"
+msgstr[3] "огромные рыбины"
 
 #. ~ Description for {'str': 'huge fish', 'str_pl': 'huge fish'}
 #: lang/json/MONSTER_from_json.py
@@ -67252,10 +69549,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "whitefish"
 msgid_plural "whitefish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "сиг"
+msgstr[1] "сиги"
+msgstr[2] "сиг"
+msgstr[3] "сиги"
 
 #. ~ Description for {'str': 'whitefish', 'str_pl': 'whitefish'}
 #: lang/json/MONSTER_from_json.py
@@ -67269,10 +69566,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "largemouth bass"
 msgid_plural "largemouth bass"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "большеротый окунь"
+msgstr[1] "большеротых окуня"
+msgstr[2] "большеротых окуней"
+msgstr[3] "большеротые окуни"
 
 #. ~ Description for {'str': 'largemouth bass', 'str_pl': 'largemouth bass'}
 #: lang/json/MONSTER_from_json.py
@@ -67282,10 +69579,10 @@ msgstr "Большеротый окунь. Очень популярен в сп
 #: lang/json/MONSTER_from_json.py
 msgid "smallmouth bass"
 msgid_plural "smallmouth bass"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "малоротый окунь"
+msgstr[1] "малоротых окуня"
+msgstr[2] "малоротых окуней"
+msgstr[3] "малоротые окуни"
 
 #. ~ Description for {'str': 'smallmouth bass', 'str_pl': 'smallmouth bass'}
 #: lang/json/MONSTER_from_json.py
@@ -67299,10 +69596,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "striped bass"
 msgid_plural "striped bass"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "полосатый окунь"
+msgstr[1] "полосатых окуня"
+msgstr[2] "полосатых окуней"
+msgstr[3] "полосатые окуни"
 
 #. ~ Description for {'str': 'striped bass', 'str_pl': 'striped bass'}
 #: lang/json/MONSTER_from_json.py
@@ -67316,10 +69613,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "white bass"
 msgid_plural "white bass"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "белый окунь"
+msgstr[1] "белых окуня"
+msgstr[2] "белых окуней"
+msgstr[3] "белые окуни"
 
 #. ~ Description for {'str': 'white bass', 'str_pl': 'white bass'}
 #: lang/json/MONSTER_from_json.py
@@ -67333,10 +69630,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "perch"
 msgid_plural "perches"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "речной окунь"
+msgstr[1] "речных окуня"
+msgstr[2] "речных окуней"
+msgstr[3] "речные окуни"
 
 #. ~ Description for {'str': 'perch', 'str_pl': 'perches'}
 #: lang/json/MONSTER_from_json.py
@@ -67363,10 +69660,10 @@ msgstr "Зеленовато-коричневая рыба среднего ра
 #: lang/json/MONSTER_from_json.py
 msgid "sunfish"
 msgid_plural "sunfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "солнечник"
+msgstr[1] "солнечника"
+msgstr[2] "солнечников"
+msgstr[3] "солнечники"
 
 #. ~ Description for {'str': 'sunfish', 'str_pl': 'sunfish'}
 #: lang/json/MONSTER_from_json.py
@@ -67376,10 +69673,10 @@ msgstr "Рыба-луна. Маленькая рыбка, родственная
 #: lang/json/MONSTER_from_json.py
 msgid "pumpkinseed sunfish"
 msgid_plural "pumpkinseed sunfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "обыкновенный солнечник"
+msgstr[1] "обыкновенных солнечника"
+msgstr[2] "обыкновенных солнечников"
+msgstr[3] "обыкновенные солнечники"
 
 #. ~ Description for {'str': 'pumpkinseed sunfish', 'str_pl': 'pumpkinseed
 #. sunfish'}
@@ -67406,10 +69703,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "redbreast sunfish"
 msgid_plural "redbreast sunfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "красногрудый солнечник"
+msgstr[1] "красногрудых солнечника"
+msgstr[2] "красногрудых солнечников"
+msgstr[3] "красногрудые солнечники"
 
 #. ~ Description for {'str': 'redbreast sunfish', 'str_pl': 'redbreast
 #. sunfish'}
@@ -67420,10 +69717,10 @@ msgstr "Красногрудый солнечник. Маленькая рыбк
 #: lang/json/MONSTER_from_json.py
 msgid "green sunfish"
 msgid_plural "green sunfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "зелёный солнечник"
+msgstr[1] "зелёных солнечника"
+msgstr[2] "зелёных солнечников"
+msgstr[3] "зелёные солнечники"
 
 #. ~ Description for {'str': 'green sunfish', 'str_pl': 'green sunfish'}
 #: lang/json/MONSTER_from_json.py
@@ -67433,10 +69730,10 @@ msgstr "Зелёный солнечник. Маленькая рыбка, род
 #: lang/json/MONSTER_from_json.py
 msgid "longear sunfish"
 msgid_plural "longear sunfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "длинноухий солнечник"
+msgstr[1] "длинноухих солнечника"
+msgstr[2] "длинноухих солнечников"
+msgstr[3] "длинноухие солнечники"
 
 #. ~ Description for {'str': 'longear sunfish', 'str_pl': 'longear sunfish'}
 #: lang/json/MONSTER_from_json.py
@@ -67446,10 +69743,10 @@ msgstr "Длинноухий солнечник. Маленькая рыбка,
 #: lang/json/MONSTER_from_json.py
 msgid "redear sunfish"
 msgid_plural "redear sunfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "красноухий солнечник"
+msgstr[1] "красноухих солнечника"
+msgstr[2] "красноухих солнечников"
+msgstr[3] "красноухие солнечники"
 
 #. ~ Description for {'str': 'redear sunfish', 'str_pl': 'redear sunfish'}
 #: lang/json/MONSTER_from_json.py
@@ -67459,10 +69756,10 @@ msgstr "Красноухий солнечник. Маленькая рыбка,
 #: lang/json/MONSTER_from_json.py
 msgid "rock bass"
 msgid_plural "rock bass"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "каменный окунь"
+msgstr[1] "каменных окуня"
+msgstr[2] "каменных окуней"
+msgstr[3] "каменные окуни"
 
 #. ~ Description for {'str': 'rock bass', 'str_pl': 'rock bass'}
 #: lang/json/MONSTER_from_json.py
@@ -67476,10 +69773,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "calico bass"
 msgid_plural "calico bass"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "ситцевый окунь"
+msgstr[1] "ситцевых окуня"
+msgstr[2] "ситцевых окуней"
+msgstr[3] "ситцевые окуни"
 
 #. ~ Description for {'str': 'calico bass', 'str_pl': 'calico bass'}
 #: lang/json/MONSTER_from_json.py
@@ -67520,10 +69817,10 @@ msgstr "Сомик, один из типов кошачьих сомов. Оче
 #: lang/json/MONSTER_from_json.py
 msgid "channel catfish"
 msgid_plural "channel catfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "канальный сомик"
+msgstr[1] "канальных сомика"
+msgstr[2] "канальных сомиков"
+msgstr[3] "канальные сомики"
 
 #. ~ Description for {'str': 'channel catfish', 'str_pl': 'channel catfish'}
 #: lang/json/MONSTER_from_json.py
@@ -67533,10 +69830,10 @@ msgstr "Канальный сомик, у этой рыбы раздвоенны
 #: lang/json/MONSTER_from_json.py
 msgid "white catfish"
 msgid_plural "white catfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "белый сомик"
+msgstr[1] "белых сомика"
+msgstr[2] "белых сомиков"
+msgstr[3] "белые сомики"
 
 #. ~ Description for {'str': 'white catfish', 'str_pl': 'white catfish'}
 #: lang/json/MONSTER_from_json.py
@@ -67653,10 +69950,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "fallfish"
 msgid_plural "fallfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "сильный семотилус"
+msgstr[1] "сильных семотилуса"
+msgstr[2] "сильных семотилусов"
+msgstr[3] "сильные семотилусы"
 
 #. ~ Description for {'str': 'fallfish', 'str_pl': 'fallfish'}
 #: lang/json/MONSTER_from_json.py
@@ -67680,25 +69977,25 @@ msgstr[3] "омары"
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
+"off in popularity… and price."
 msgstr ""
 "Когда-то этих животных считали вредителями, которых и есть-то не стоит. Но "
 "затем один гений маркетинга начал продавать их как деликатес, и их "
-"популярность взлетела… как и цена."
+"популярность взлетела… Как и цена."
 
 #: lang/json/MONSTER_from_json.py
 msgid "crayfish"
 msgid_plural "crayfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "рак"
+msgstr[1] "рака"
+msgstr[2] "раков"
+msgstr[3] "раки"
 
 #. ~ Description for {'str': 'crayfish', 'str_pl': 'crayfish'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
+"water, and some spicy seasonings…"
 msgstr ""
 "Если бы вам только удалось найти ещё кучку таких же, здоровую кастрюлю с "
 "кипящей водой и немного пряных приправ…"
@@ -67850,10 +70147,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "giant cockroach"
 msgid_plural "giant cockroaches"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "тараканище"
+msgstr[1] "тараканища"
+msgstr[2] "тараканищ"
+msgstr[3] "тараканищи"
 
 #. ~ Description for {'str': 'giant cockroach', 'str_pl': 'giant cockroaches'}
 #: lang/json/MONSTER_from_json.py
@@ -67876,10 +70173,10 @@ msgstr "Детёныш мутировавшего таракана размер
 #: lang/json/MONSTER_from_json.py
 msgid "pregnant giant cockroach"
 msgid_plural "pregnant giant cockroaches"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "беременный тараканище"
+msgstr[1] "беременных тараканища"
+msgstr[2] "беременных тараканищей"
+msgstr[3] "беременные тараканищи"
 
 #. ~ Description for {'str': 'pregnant giant cockroach', 'str_pl': 'pregnant
 #. giant cockroaches'}
@@ -68185,10 +70482,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "dermatik larva"
 msgid_plural "dermatik larvae"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "личинка дерматика"
+msgstr[1] "личинки дерматика"
+msgstr[2] "личинок дерматика"
+msgstr[3] "личинки дерматиков"
 
 #. ~ Description for {'str': 'dermatik larva', 'str_pl': 'dermatik larvae'}
 #: lang/json/MONSTER_from_json.py
@@ -68234,10 +70531,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "acidic ant larva"
 msgid_plural "acidic ant larvae"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "личинка кислотного муравья"
+msgstr[1] "личинки кислотного муравья"
+msgstr[2] "личинок кислотного муравья"
+msgstr[3] "личинки кислотного муравья"
 
 #. ~ Description for {'str': 'acidic ant larva', 'str_pl': 'acidic ant
 #. larvae'}
@@ -68309,10 +70606,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "ant larva"
 msgid_plural "ant larvae"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "личинка муравья"
+msgstr[1] "личинки муравья"
+msgstr[2] "личинок муравья"
+msgstr[3] "личинки муравья"
 
 #. ~ Description for {'str': 'ant larva', 'str_pl': 'ant larvae'}
 #: lang/json/MONSTER_from_json.py
@@ -68661,10 +70958,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Labrador puppy"
 msgid_plural "Labrador puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок лабрадора"
+msgstr[1] "щенка лабрадора"
+msgstr[2] "щенят лабрадора"
+msgstr[3] "щенки лабрадора"
 
 #. ~ Description for {'str': 'Labrador puppy', 'str_pl': 'Labrador puppies'}
 #: lang/json/MONSTER_from_json.py
@@ -68695,10 +70992,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "bulldog puppy"
 msgid_plural "bulldog puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок бульдога"
+msgstr[1] "щенки бульдога"
+msgstr[2] "щенки бульдога"
+msgstr[3] "щенки бульдога"
 
 #. ~ Description for {'str': 'bulldog puppy', 'str_pl': 'bulldog puppies'}
 #: lang/json/MONSTER_from_json.py
@@ -68712,10 +71009,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "pit bull mix"
 msgid_plural "pit bull mixes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "питбуль"
+msgstr[1] "питбуля"
+msgstr[2] "питбулей"
+msgstr[3] "питбули"
 
 #. ~ Description for {'str': 'pit bull mix', 'str_pl': 'pit bull mixes'}
 #: lang/json/MONSTER_from_json.py
@@ -68731,10 +71028,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "pit bull puppy"
 msgid_plural "pit bull puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок питбуля"
+msgstr[1] "щенка питбуля"
+msgstr[2] "щенков питбуля"
+msgstr[3] "щенки питбуля"
 
 #. ~ Description for {'str': 'pit bull puppy', 'str_pl': 'pit bull puppies'}
 #: lang/json/MONSTER_from_json.py
@@ -68765,10 +71062,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "beagle puppy"
 msgid_plural "beagle puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок бигля"
+msgstr[1] "щенка бигля"
+msgstr[2] "щенят бигля"
+msgstr[3] "щенки бигля"
 
 #. ~ Description for {'str': 'beagle puppy', 'str_pl': 'beagle puppies'}
 #: lang/json/MONSTER_from_json.py
@@ -68800,10 +71097,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "border collie puppy"
 msgid_plural "border collie puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок бордер-колли"
+msgstr[1] "щенка бордер-колли"
+msgstr[2] "щенков бордер-колли"
+msgstr[3] "щенки бордер-колли"
 
 #. ~ Description for {'str': 'border collie puppy', 'str_pl': 'border collie
 #. puppies'}
@@ -68835,10 +71132,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "boxer puppy"
 msgid_plural "boxer puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок боксёра"
+msgstr[1] "щенка боксёра"
+msgstr[2] "щенят боксёра"
+msgstr[3] "щенки боксёра"
 
 #. ~ Description for {'str': 'boxer puppy', 'str_pl': 'boxer puppies'}
 #: lang/json/MONSTER_from_json.py
@@ -68868,10 +71165,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Chihuahua puppy"
 msgid_plural "Chihuahua puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок чихуахуа"
+msgstr[1] "щенка чихуахуа"
+msgstr[2] "щенят чихуахуа"
+msgstr[3] "щенки чихуахуа"
 
 #. ~ Description for {'str': 'Chihuahua puppy', 'str_pl': 'Chihuahua puppies'}
 #: lang/json/MONSTER_from_json.py
@@ -68904,10 +71201,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "dachshund puppy"
 msgid_plural "dachshund puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок таксы"
+msgstr[1] "щенка таксы"
+msgstr[2] "щенят таксы"
+msgstr[3] "щенки таксы"
 
 #. ~ Description for {'str': 'dachshund puppy', 'str_pl': 'dachshund puppies'}
 #: lang/json/MONSTER_from_json.py
@@ -68938,10 +71235,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "German shepherd puppy"
 msgid_plural "German shepherd puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок немецкой овчарки"
+msgstr[1] "щенка немецкой овчарки"
+msgstr[2] "щенят немецкой овчарки"
+msgstr[3] "щенки немецкой овчарки"
 
 #. ~ Description for {'str': 'German shepherd puppy', 'str_pl': 'German
 #. shepherd puppies'}
@@ -68956,10 +71253,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Great Pyrenees"
 msgid_plural "Great Pyrenees"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "пиренейская горная"
+msgstr[1] "пиренейских горных"
+msgstr[2] "пиренейских горных"
+msgstr[3] "пиренейские горные"
 
 #. ~ Description for {'str': 'Great Pyrenees', 'str_pl': 'Great Pyrenees'}
 #: lang/json/MONSTER_from_json.py
@@ -68975,10 +71272,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Great Pyrenees puppy"
 msgid_plural "Great Pyrenees puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок пиренейской горной"
+msgstr[1] "щенка пиренейской горной"
+msgstr[2] "щенят пиренейской горной"
+msgstr[3] "щенки пиренейской горной"
 
 #. ~ Description for {'str': 'Great Pyrenees puppy', 'str_pl': 'Great Pyrenees
 #. puppies'}
@@ -69011,10 +71308,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "rottweiler puppy"
 msgid_plural "rottweiler puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок ротвейлера"
+msgstr[1] "щенка ротвейлера"
+msgstr[2] "щенков ротвейлера"
+msgstr[3] "щенки ротвейлера"
 
 #. ~ Description for {'str': 'rottweiler puppy', 'str_pl': 'rottweiler
 #. puppies'}
@@ -69046,10 +71343,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "cattle dog puppy"
 msgid_plural "cattle dog puppies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "щенок австралийской пастушьей"
+msgstr[1] "щенка австралийской пастушьей"
+msgstr[2] "щенят австралийской пастушьей"
+msgstr[3] "щенки австралийской пастушьей"
 
 #. ~ Description for {'str': 'cattle dog puppy', 'str_pl': 'cattle dog
 #. puppies'}
@@ -69182,10 +71479,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "moose"
 msgid_plural "moose"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "лось"
+msgstr[1] "лося"
+msgstr[2] "лосей"
+msgstr[3] "лоси"
 
 #. ~ Description for {'str': 'moose', 'str_pl': 'moose'}
 #: lang/json/MONSTER_from_json.py
@@ -69370,10 +71667,10 @@ msgstr[3] "канализационные крысы"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
+"makes it sound… hungry."
 msgstr ""
 "Грызун с лысым хвостом и глазами-бусинками. Когда он пищит, звучит как будто"
-" он… голоден."
+" он… Голоден."
 
 #: lang/json/MONSTER_from_json.py
 msgid "lamb"
@@ -69526,7 +71823,7 @@ msgid ""
 " field.  You may be able to hack it to accept you as its pilot.  Like all "
 "mech-suits it can act as a UPS from its large battery."
 msgstr ""
-"Свежая новинка американской армии - РМКЭ (Разведывательный Механический "
+"Свежая новинка американской армии — РМКЭ (Разведывательный Механический "
 "Костюм-Экзоскелет) производства Боинг-Дэу, разработанный для выполнения роли"
 " разведчика и снайпера благодаря мобильности и встроенному лазерному "
 "снайперскому ружью с высококлассной оптикой для определения целей и "
@@ -69553,7 +71850,7 @@ msgid ""
 "You may be able to hack it to accept you as its pilot.  Like all mech-suits "
 "it can act as a UPS from its large battery."
 msgstr ""
-"Свежая новинка американской армии - БМКЭ (Боевой Механический Костюм-"
+"Свежая новинка американской армии — БМКЭ (Боевой Механический Костюм-"
 "Экзоскелет) производства Боинг-Дэу, разработанный для огневой поддержки при "
 "помощи устрашающего встроенного многоствольного лазера. До наступления "
 "Катаклизма массово на вооружение не поступил, хотя несколько прототипов "
@@ -69578,7 +71875,7 @@ msgid ""
 "prototypes in the field.  You may be able to hack it to accept you as its "
 "pilot.  Like all mech-suits it can act as a UPS from its large battery."
 msgstr ""
-"Свежая новинка американской армии - ПМКЭ (Погрузочный Механический Костюм-"
+"Свежая новинка американской армии — ПМКЭ (Погрузочный Механический Костюм-"
 "Экзоскелет) производства Боинг-Дэу, разработанный для погрузки и разгрузки "
 "тяжёлых предметов и ограниченной боевой поддержки. До наступления Катаклизма"
 " массово на вооружение не поступил, хотя несколько прототипов участвовали в "
@@ -69673,10 +71970,10 @@ msgid ""
 "you must assume sensory devices and mouth."
 msgstr ""
 "Инопланетное существо, как и другие ми-го. У этого броня намного тяжелее. "
-"Его тело - бесформенная масса странной плоти, заключённой в переливающийся "
+"Его тело — бесформенная масса странной плоти, заключённой в переливающийся "
 "панцирь. Из панциря торчат несколько отростков, оканчивающихся чем-то вроде "
 "каких-то устройств. Пирамидальная голова покрыта похожей на ракушку бронёй, "
-"открыты только - как вы предполагаете - рот и органы чувств."
+"открыты только — как вы предполагаете — рот и органы чувств."
 
 #: lang/json/MONSTER_from_json.py
 msgid "mi-go myrmidon"
@@ -70003,11 +72300,29 @@ msgstr[3] "огромные бумеры"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
 msgstr ""
 "Этот раздувшийся бумер был готов взорваться, но окреп и затвердел. Желчь, "
-"капающая из его рта, похоже, также изменилась…"
+"капающая из его рта, похоже, также изменилась."
+
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] "развратный пожиратель"
+msgstr[1] "развратных пожирателя"
+msgstr[2] "развратных пожирателей"
+msgstr[3] "развратные пожиратели"
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
+msgstr ""
+"Гигантское раздутое нечто, состоящее из человеческих тел, с торчащими в "
+"разные стороны головами и конечностями. Глядя на это, вы точно не уверены "
+"сколько свинца ему нужно для упокоения, оно постоянно меняется."
 
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
@@ -70068,13 +72383,12 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
-"Человек, слившийся с беспорядочной мешаниной металлических частей и "
-"проводов. Хотя глаза его пусты, вспышки боли пробегают по лицу как "
-"напоминание о личности, запертой в изуродованном теле. При наличии "
-"хирургических навыков вы могли бы вернуть ему человечность. Если вас это "
-"волнует, конечно…"
+"Человек из плоти с беспорядочной мешаниной металлических частей и проводов. "
+"Хотя глаза его пусты, вспышки боли пробегают по лицу как напоминание о "
+"личности, запертой в изуродованном теле. При наличии хирургических навыков "
+"вы могли бы вернуть ему человечность. Если вас это волнует, конечно…"
 
 #: lang/json/MONSTER_from_json.py
 msgid "charred nightmare"
@@ -70359,10 +72673,10 @@ msgid ""
 "machine of a complexity never seen before, Uncanny even hired professional "
 "actors to record its lines.  Examine to befriend."
 msgstr ""
-"Популярное изделие от компании \"Жуть\" - дружелюбный андроид, который будет"
-" носить ваши пакеты или толкать за вас Продуктовую Тележку. Он дружелюбный, "
+"Популярное изделие от компании «Жуть» — дружелюбный андроид, который будет "
+"носить ваши пакеты или толкать за вас Продуктовую Тележку. Он дружелюбный, "
 "потому что его человеческое лицо постоянно вам улыбается. Судя по рекламке, "
-"в него встроен компьютер немыслимой сложности. \"Жуть\" даже наняла "
+"в него встроен компьютер немыслимой сложности. «Жуть» даже наняла "
 "профессиональных актёров для озвучки его реплик. Обследуйте, чтобы "
 "подружиться."
 
@@ -70642,10 +72956,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "giant crayfish"
 msgid_plural "giant crayfish"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "гигантский рак"
+msgstr[1] "гигантских рака"
+msgstr[2] "гигантских раков"
+msgstr[3] "гигантские раки"
 
 #. ~ Description for {'str': 'giant crayfish', 'str_pl': 'giant crayfish'}
 #: lang/json/MONSTER_from_json.py
@@ -70829,10 +73143,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "hound of tindalos"
 msgid_plural "hounds of tindalos"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "гончая Тиндалоса"
+msgstr[1] "гончие Тиндалоса"
+msgstr[2] "гончий Тиндалоса"
+msgstr[3] "гончие Тиндалоса"
 
 #. ~ Description for {'str': 'hound of tindalos', 'str_pl': 'hounds of
 #. tindalos'}
@@ -71130,9 +73444,9 @@ msgstr[3] "Шайя Лабаф"
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
 "Живёт в лесочке людоед, \n"
@@ -71465,18 +73779,20 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "wretched puker"
 msgid_plural "wretched pukers"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "убогая задница"
+msgstr[1] "убогие задницы"
+msgstr[2] "убогих задниц"
+msgstr[3] "убогие задницы"
 
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr ""
+"Выродившийся труп, дрожащий во время ходьбы. Мусор и рухлядь прилипли к его "
+"коже, а раны вокруг пахнут черной липкостью."
 
 #: lang/json/MONSTER_from_json.py
 msgid "acidic zombie"
@@ -71687,15 +74003,15 @@ msgstr[3] "зомби-танцоры"
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
 msgstr ""
-"Зловонье в воздухе висит\n"
-"Все сорок тысяч лет молитв.\n"
+"Зловонье в воздухе висит,\n"
+"Все сорок тысяч лет молитв,\n"
 "И трупы лезут из могилы,\n"
 "Чтоб принести тебе погибель!\n"
 "\n"
@@ -71845,10 +74161,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "gangrenous flesh"
 msgid_plural "gangrenous flesh"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "гангренозная плоть"
+msgstr[1] "гангренозные плоти"
+msgstr[2] "гангренозные плоти"
+msgstr[3] "гангренозные плоти"
 
 #. ~ Description for {'str': 'gangrenous flesh', 'str_pl': 'gangrenous flesh'}
 #: lang/json/MONSTER_from_json.py
@@ -71921,7 +74237,7 @@ msgstr ""
 "Большущее щупальце из мутировавшей плоти и острых костей. Оно прорастает из "
 "трещины в разрушенном полу, сотни человеческих конечностей яростно бьются и "
 "извиваются в попытках вырваться из-под мерзкого панциря. Хотя щупальце и так"
-" довольно велико, вы уверены, что это только часть гигантского существа - "
+" довольно велико, вы уверены, что это только часть гигантского существа — "
 "когда оно движется, всё разрушенное здание содрогается, будто невидимый "
 "гигант извивается в бетонной могиле."
 
@@ -72083,14 +74399,14 @@ msgstr[3] "Триллеры"
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
-"Средь борьбы за свою жизнь\n"
+"Средь борьбы за свою жизнь,\n"
 "Вас охватывает дрожь.\n"
-"Бойся, смертный, берегись\n"
+"Бойся, смертный, берегись,\n"
 "Зла, что триллер принесёт."
 
 #: lang/json/MONSTER_from_json.py
@@ -73744,10 +76060,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "old animatronic fox"
 msgid_plural "old animatronic foxes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "старая аниматронная лиса"
+msgstr[1] "старые аниматронные лисы"
+msgstr[2] "старые аниматронные лисы"
+msgstr[3] "старые аниматронные лисы"
 
 #. ~ Description for {'str': 'old animatronic fox', 'str_pl': 'old animatronic
 #. foxes'}
@@ -73763,10 +76079,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "new animatronic fox"
 msgid_plural "new animatronic foxes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "новая аниматронная лиса"
+msgstr[1] "новые аниматронные лисы"
+msgstr[2] "новые аниматронные лисы"
+msgstr[3] "новые аниматронные лисы"
 
 #. ~ Description for {'str': 'new animatronic fox', 'str_pl': 'new animatronic
 #. foxes'}
@@ -73783,10 +76099,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "wrecked animatronic fox"
 msgid_plural "wrecked animatronic foxes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "сломанная аниматронная лиса"
+msgstr[1] "сломанные аниматронные лисы"
+msgstr[2] "сломанных аниматронных лис"
+msgstr[3] "сломанные аниматронные лисы"
 
 #. ~ Description for {'str': 'wrecked animatronic fox', 'str_pl': 'wrecked
 #. animatronic foxes'}
@@ -73803,10 +76119,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "new animatronic bunny"
 msgid_plural "new animatronic bunnies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "новый аниматронный кролик"
+msgstr[1] "новых аниматронных кролика"
+msgstr[2] "новых аниматронных кроликов"
+msgstr[3] "новые аниматронные кролики"
 
 #. ~ Description for {'str': 'new animatronic bunny', 'str_pl': 'new
 #. animatronic bunnies'}
@@ -73823,10 +76139,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "old animatronic bunny"
 msgid_plural "old animatronic bunnies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "старый аниматронный кролик"
+msgstr[1] "старых аниматронных кролика"
+msgstr[2] "старых аниматронных кроликов"
+msgstr[3] "старые аниматронные кролики"
 
 #. ~ Description for {'str': 'old animatronic bunny', 'str_pl': 'old
 #. animatronic bunnies'}
@@ -74082,12 +76398,12 @@ msgstr ""
 " смерти."
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
+msgstr[0] "аниматронная овца"
+msgstr[1] "аниматронные овцы"
+msgstr[2] "аниматронных овец"
+msgstr[3] "аниматронные овцы"
 
 #. ~ Description for {'str': 'animatronic sheep', 'str_pl': 'animatronic
 #. sheep'}
@@ -74121,10 +76437,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "animatronic child"
 msgid_plural "animatronic children"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "аниматронный ребёнок"
+msgstr[1] "аниматронных ребёнка"
+msgstr[2] "аниматронных ребёнка"
+msgstr[3] "аниматронные дети"
 
 #. ~ Description for {'str': 'animatronic child', 'str_pl': 'animatronic
 #. children'}
@@ -74156,10 +76472,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "animatronic wolf"
 msgid_plural "animatronic wolves"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "аниматронный волк"
+msgstr[1] "аниматронных волка"
+msgstr[2] "аниматронных волков"
+msgstr[3] "аниматронные волки"
 
 #. ~ Description for {'str': 'animatronic wolf', 'str_pl': 'animatronic
 #. wolves'}
@@ -74384,10 +76700,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "minion of skeltal"
 msgid_plural "minions of skeltal"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "приспешник Дудца"
+msgstr[1] "приспешника Дудца"
+msgstr[2] "приспешников Дудца"
+msgstr[3] "приспешники Дудца"
 
 #. ~ Description for {'str': 'minion of skeltal', 'str_pl': 'minions of
 #. skeltal'}
@@ -74415,10 +76731,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Compsognathus"
 msgid_plural "Compsognathus"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "компсогнат"
+msgstr[1] "компсогната"
+msgstr[2] "компсогнатов"
+msgstr[3] "компсогнаты"
 
 #. ~ Description for {'str': 'Compsognathus', 'str_pl': 'Compsognathus'}
 #: lang/json/MONSTER_from_json.py
@@ -74432,10 +76748,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Gallimimus"
 msgid_plural "Gallimimus"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "галлимим"
+msgstr[1] "галлимима"
+msgstr[2] "галлимимов"
+msgstr[3] "галлимимы"
 
 #. ~ Description for {'str': 'Gallimimus', 'str_pl': 'Gallimimus'}
 #: lang/json/MONSTER_from_json.py
@@ -74449,10 +76765,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Titanis"
 msgid_plural "Titanis"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "титанис"
+msgstr[1] "титаниса"
+msgstr[2] "титанисов"
+msgstr[3] "титанисы"
 
 #. ~ Description for {'str': 'Titanis', 'str_pl': 'Titanis'}
 #: lang/json/MONSTER_from_json.py
@@ -74466,10 +76782,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Spinosaurus"
 msgid_plural "Spinosaurus"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "спинозавр"
+msgstr[1] "спинозавра"
+msgstr[2] "спинозавров"
+msgstr[3] "спинозавры"
 
 #. ~ Description for {'str': 'Spinosaurus', 'str_pl': 'Spinosaurus'}
 #: lang/json/MONSTER_from_json.py
@@ -74483,10 +76799,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Tyrannosaurus rex"
 msgid_plural "Tyrannosaurus rex"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "тираннозавр"
+msgstr[1] "тираннозавра"
+msgstr[2] "тираннозавров"
+msgstr[3] "тираннозавры"
 
 #. ~ Description for {'str': 'Tyrannosaurus rex', 'str_pl': 'Tyrannosaurus
 #. rex'}
@@ -74497,10 +76813,10 @@ msgstr "Посмотри какая ПАСТЬ!"
 #: lang/json/MONSTER_from_json.py
 msgid "Triceratops"
 msgid_plural "Triceratops"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "трицератопс"
+msgstr[1] "трицератопса"
+msgstr[2] "трицератопсов"
+msgstr[3] "трицератопсы"
 
 #. ~ Description for {'str': 'Triceratops', 'str_pl': 'Triceratops'}
 #: lang/json/MONSTER_from_json.py
@@ -74514,10 +76830,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Stegosaurus"
 msgid_plural "Stegosaurus"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "стегозавр"
+msgstr[1] "стегозавра"
+msgstr[2] "стегозавров"
+msgstr[3] "стегозавры"
 
 #. ~ Description for {'str': 'Stegosaurus', 'str_pl': 'Stegosaurus'}
 #: lang/json/MONSTER_from_json.py
@@ -74528,10 +76844,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Ankylosaurus"
 msgid_plural "Ankylosaurus"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "анкилозавр"
+msgstr[1] "анкилозавра"
+msgstr[2] "анкилозавров"
+msgstr[3] "анкилозавры"
 
 #. ~ Description for {'str': 'Ankylosaurus', 'str_pl': 'Ankylosaurus'}
 #: lang/json/MONSTER_from_json.py
@@ -74545,10 +76861,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Allosaurus"
 msgid_plural "Allosaurus"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "аллозавр"
+msgstr[1] "аллозавра"
+msgstr[2] "аллозавров"
+msgstr[3] "аллозавры"
 
 #. ~ Description for {'str': 'Allosaurus', 'str_pl': 'Allosaurus'}
 #: lang/json/MONSTER_from_json.py
@@ -74595,10 +76911,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Deinonychus"
 msgid_plural "Deinonychus"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "дейноних"
+msgstr[1] "дейнониха"
+msgstr[2] "дейнонихов"
+msgstr[3] "дейнонихи"
 
 #. ~ Description for {'str': 'Deinonychus', 'str_pl': 'Deinonychus'}
 #: lang/json/MONSTER_from_json.py
@@ -74629,10 +76945,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "Parasaurolophus"
 msgid_plural "Parasaurolophus"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "паразауролоф"
+msgstr[1] "паразауролофа"
+msgstr[2] "паразауролофов"
+msgstr[3] "паразауролофы"
 
 #. ~ Description for {'str': 'Parasaurolophus', 'str_pl': 'Parasaurolophus'}
 #: lang/json/MONSTER_from_json.py
@@ -74659,10 +76975,10 @@ msgstr "Небольшая летающая рептилия, кружащая 
 #: lang/json/MONSTER_from_json.py
 msgid "Dilophosaurus"
 msgid_plural "Dilophosaurus"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "дилофозавр"
+msgstr[1] "дилофозавра"
+msgstr[2] "дилофозавров"
+msgstr[3] "дилофозавры"
 
 #. ~ Description for {'str': 'Dilophosaurus', 'str_pl': 'Dilophosaurus'}
 #: lang/json/MONSTER_from_json.py
@@ -74855,26 +77171,30 @@ msgid "The black pudding burns you with acid!"
 msgstr "Чёрная жижа обжигает вас кислотой!"
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
-msgstr[0] "нотик"
-msgstr[1] "нотика"
-msgstr[2] "нотиков"
-msgstr[3] "нотики"
+msgid "krabgek"
+msgid_plural "krabgeks"
+msgstr[0] "крабгик"
+msgstr[1] "крабгика"
+msgstr[2] "крабгиков"
+msgstr[3] "крабгики"
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
 msgstr ""
 "Зловещий глаз выглядывает из темноты, и его свет намекает на странный ум и "
-"нервирующую недоброжелательность"
+"нервирующую недоброжелательность Глаз сочится какой-то розоватой жидкостью, "
+"а странная гуманоидная фигура покрыта острыми сине-черными треугольными "
+"пластинками."
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
-msgstr "Нотик пристально смотрит на %3$s!"
+msgid "The krabgek gazes at %3$s!"
+msgstr "Крабгик пристально смотрит на %3$s!"
 
 #: lang/json/MONSTER_from_json.py
 msgid "owlbear cub"
@@ -74936,12 +77256,63 @@ msgstr[3] "тролли"
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
 msgstr ""
 "Чудовищный зеленокожий гуманоид. Тролли известны толстой шкурой и "
 "естественной способностью к регенерации."
 
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] "кровопийца"
+msgstr[1] "кровопийцы"
+msgstr[2] "кровопийц"
+msgstr[3] "кровопийцы"
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr ""
+"Это ужасное летающее существо выглядит как нечто среднее между большой "
+"летучей мышью и огромнейшим комаром."
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] "крикун"
+msgstr[1] "крикуна"
+msgstr[2] "крикунов"
+msgstr[3] "крикуны"
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr ""
+"Крикун — это гриб размером с человека, который издает пронзительный визг, "
+"чтобы отогнать существ, которые его беспокоят."
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] "лемур"
+msgstr[1] "лемура"
+msgstr[2] "лемуров"
+msgstr[3] "лемуры"
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
+msgstr ""
+"Лемур напоминает расплавленную массу плоти со слабо выраженной "
+"человекоподобной головой и туловищем."
+
 #: lang/json/MONSTER_from_json.py
 msgid "automated turret"
 msgid_plural "automated turrets"
@@ -75571,10 +77942,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "craftbuddy"
 msgid_plural "craftbuddies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "ремонтный бот"
+msgstr[1] "ремонтных бота"
+msgstr[2] "ремонтных ботов"
+msgstr[3] "ремонтные боты"
 
 #. ~ Description for {'str': 'craftbuddy', 'str_pl': 'craftbuddies'}
 #: lang/json/MONSTER_from_json.py
@@ -76402,10 +78773,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "robote deluxe"
 msgid_plural "robote deluxe"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "робот-делюкс"
+msgstr[1] "робота-делюкс"
+msgstr[2] "роботов-делюкс"
+msgstr[3] "роботы-делюкс"
 
 #. ~ Description for {'str': 'robote deluxe', 'str_pl': 'robote deluxe'}
 #: lang/json/MONSTER_from_json.py
@@ -76462,10 +78833,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py
 msgid "glittering lady"
 msgid_plural "glittering ladies"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "блестящая леди"
+msgstr[1] "блестящие леди"
+msgstr[2] "блестящих дам"
+msgstr[3] "блестящие леди"
 
 #. ~ Description for {'str': 'glittering lady', 'str_pl': 'glittering ladies'}
 #: lang/json/MONSTER_from_json.py
@@ -76641,10 +79012,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py lang/json/TOOL_from_json.py
 msgid "gelatinous mass"
 msgid_plural "gelatinous mass"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "желейная масса"
+msgstr[1] "желейные масса"
+msgstr[2] "желейных масс"
+msgstr[3] "желейные массы"
 
 #. ~ Description for {'str': 'gelatinous mass', 'str_pl': 'gelatinous mass'}
 #. ~ Description for {'str': 'gray mass', 'str_pl': 'gray mass'}
@@ -76659,10 +79030,10 @@ msgstr ""
 #: lang/json/MONSTER_from_json.py lang/json/TOOL_from_json.py
 msgid "gray mass"
 msgid_plural "gray mass"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "серая масса"
+msgstr[1] "серые массы"
+msgstr[2] "серых масс"
+msgstr[3] "серые массы"
 
 #: lang/json/MONSTER_from_json.py
 msgid "giant scorpion"
@@ -77441,8 +79812,8 @@ msgid "Reveals an area around you on the overmap"
 msgstr "Раскрывает глобальную карту вокруг вас."
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
 msgstr "У вас появилось знание об окружающей территории…"
 
 #: lang/json/SPELL_from_json.py
@@ -77651,8 +80022,8 @@ msgstr "Анимистская руна"
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr ""
 "Этот ритуал создаёт маленький камешек, наполненный магией анимистов. Эту "
 "руну можно применять в рецептах как катализатор."
@@ -77692,7 +80063,7 @@ msgstr "Биомантская руна"
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 "Этот ритуал создаёт маленький камешек, наполненный магией биомантов. Эту "
@@ -77745,6 +80116,20 @@ msgstr "Переместить себя"
 msgid "Translocates the user to an attuned gate."
 msgstr "Перемещает заклинателя к назначенным вратам."
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr ""
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr ""
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr "Шаблон заклинания"
@@ -77794,10 +80179,8 @@ msgstr "Тратит немного выносливости"
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr ""
-"У отладочного заклинания [ %s ] нет эффектов. Должно быть отладочное "
-"предупреждение."
 
 #: lang/json/SPELL_from_json.py
 msgid "Debug Fatigue Spell"
@@ -77957,7 +80340,7 @@ msgstr "Друидическая руна"
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr ""
 "Этот ритуал создаёт маленький камешек, наполненный магией друидов. Эту руну "
@@ -77970,11 +80353,11 @@ msgstr "Семя Очищения"
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr ""
-"Вы призываете дар земли, который очистит воду. Быстро деградируется, если не"
-" используется."
+"Вы призываете дар земли, который очистит воду. Быстро деградирует, если не "
+"используется."
 
 #: lang/json/SPELL_from_json.py
 msgid "Stonefist"
@@ -78020,22 +80403,22 @@ msgstr "Земная руна"
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 "Этот ритуал создаёт маленький камешек, наполненный магией повелителей земли."
 " Эту руну можно применять в рецептах как катализатор."
 
 #: lang/json/SPELL_from_json.py
 msgid "Lava Bomb Shrapnel"
-msgstr ""
+msgstr "Вулканическая бомба-шрапнель"
 
 #. ~ Description for Lava Bomb Shrapnel
 #. ~ Description for Lava Bomb Heat
 #. ~ Description for Lava Bomb Terrain
 #: lang/json/SPELL_from_json.py
 msgid "This is a sub spell for the Lava Bomb spell."
-msgstr ""
+msgstr "Это вспомогательное заклинание вулканической бомбы."
 
 #: lang/json/SPELL_from_json.py
 msgid "Lava Bomb Heat"
@@ -78047,7 +80430,11 @@ msgstr ""
 
 #: lang/json/SPELL_from_json.py
 msgid "Lava Bomb"
-msgstr ""
+msgstr "Вулканическая бомба"
+
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr "Ясновидение"
 
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
@@ -78056,13 +80443,13 @@ msgstr "Безумное Исцеление"
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr ""
 "Это заклинание разгоняет ваше сердце, генерируя новую плоть и мышцы. "
-"Неразумно использовать это в прямой опасности, и может быть смертельным, "
-"если сделано в критическом состоянии."
+"Неразумно использовать при прямой опасности и может быть смертельно в "
+"критическом состоянии."
 
 #: lang/json/SPELL_from_json.py
 msgid "Improved Twisted Restoration"
@@ -78071,29 +80458,30 @@ msgstr "Улучшенное Безумное Исцеление"
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr ""
 "Это заклинание разгоняет ваше сердце, генерируя новую плоть и мышцы. "
-"Неразумно использовать это в прямой опасности, и может быть смертельным, "
-"если сделано в критическом состоянии. Улучшенное заваривание смягчает "
-"напряжение заклинания."
+"Неразумно использовать при прямой опасности и может быть смертельно в "
+"критическом состоянии. Улучшенное заваривание смягчает нагрузку заклинания."
 
 #: lang/json/SPELL_from_json.py
 msgid "Conjure Throwing Blade I"
-msgstr ""
+msgstr "Сколдовать метательный клинок I"
 
 #. ~ Description for Conjure Throwing Blade I
 #: lang/json/SPELL_from_json.py
 msgid "conjures 3 throwing knives"
-msgstr ""
+msgstr "сколдовать 3 метательных ножа"
 
 #. ~ Message for SPELL 'Conjure Throwing Blade I'
 #: lang/json/SPELL_from_json.py
 msgid ""
 "You activate your ring and three throwing knives appear, ready to throw!"
 msgstr ""
+"Вы активируете свое кольцо и появляются три метательных ножа, готовых к "
+"броску!"
 
 #: lang/json/SPELL_from_json.py
 msgid "Point Flare"
@@ -78150,7 +80538,7 @@ msgstr "Кельвинистская руна"
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr ""
 "Этот ритуал создаёт маленький камешек, наполненный магией кельвинистов. Эту "
@@ -78195,8 +80583,8 @@ msgstr "Магическая руна"
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr ""
 "Этот ритуал создаёт маленький камешек, наполненный волшебством магов. Эту "
 "руну можно применять в рецептах как катализатор."
@@ -78217,6 +80605,15 @@ msgstr "Сила Огра"
 msgid "Fox's Cunning"
 msgstr "Лисья Хитрость"
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr ""
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr "Разряд"
@@ -78256,8 +80653,8 @@ msgstr "Буревая руна"
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr ""
 "Этот ритуал создаёт маленький камешек, наполненный магией повелителей бури. "
 "Эту руну можно применять в рецептах как катализатор."
@@ -78324,8 +80721,8 @@ msgstr "Техномантская руна"
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr ""
 "Этот ритуал создаёт маленький камешек, наполненный магией техномантов. Эту "
 "руну можно применять в рецептах как катализатор."
@@ -78354,6 +80751,10 @@ msgstr "Оживлённый клинок"
 msgid "Mirror Image"
 msgstr "Зеркальный образ"
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr "Рентгеновское зрение"
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr "Демонический огненный шар"
@@ -78982,6 +81383,58 @@ msgstr ""
 "позволяют комфортно носить его на голове или прикрепить к шлему. Сейчас он "
 "включён и потребляет энергию. Активируйте, чтобы выключить."
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] "атомный налобный фонарь"
+msgstr[1] "атомных налобных фонаря"
+msgstr[2] "атомных налобных фонарей"
+msgstr[3] "атомные налобные фонари"
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr "Вы закрываете крышку налобного фонаря."
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+"Это особый налобный фонарь, работающий на магии ядерного распада, "
+"сфокусированный для большей яркости. Регулируемый ремень позволяет удобно "
+"носить его на голове или прикрепить к шлему. Активируйте, чтобы закрыть "
+"крышкой свет."
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] "атомный налобный фонарь (закрыт)"
+msgstr[1] "атомных налобных фонаря (закрытых)"
+msgstr[2] "атомных налобных фонарей (закрытых)"
+msgstr[3] "атомные налобные фонари (закрыты)"
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr "Вы открываете крышку налобного фонаря."
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+"Это особый налобный фонарь, работающий на магии ядерного распада, "
+"сфокусированный для большей яркости. Регулируемый ремень позволяет удобно "
+"носить его на голове или прикрепить к шлему. Активируйте, чтобы открыть "
+"крышку излучателя света."
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -79036,12 +81489,12 @@ msgstr[3] "5-точечный анкер"
 #: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "A LED light in the %s LED flickers on."
-msgstr ""
+msgstr "Светодиод %s зажигается."
 
 #. ~ Use action need_charges_msg for 5-point anchor.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "It seems like this device needs power."
-msgstr ""
+msgstr "Похоже в устройстве нет питания."
 
 #. ~ Description for 5-point anchor
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -79064,7 +81517,7 @@ msgstr[3] "5-точечный анкер (вкл)"
 #: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "The %s LED light flickers off."
-msgstr ""
+msgstr "Светодиод %s потухает."
 
 #. ~ Description for 5-point anchor (on)
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -79086,15 +81539,18 @@ msgstr[3] "фазовый иммерсионный костюм"
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
+"Инициализация\n"
+"Проводим диагностику целостности костюма...\n"
+"Все системы работают."
 
 #. ~ Use action need_charges_msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "Warning: Operating on minimal power.  Protection compromised."
-msgstr ""
+msgstr "Предупреждение: работа на минимальной мощности. Защита понижена."
 
 #. ~ Description for phase immersion suit
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -79122,7 +81578,7 @@ msgstr[3] "фазовый иммерсионный костюм (вкл)"
 #. ~ Use action msg for phase immersion suit (on).
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "Suit shutting down."
-msgstr ""
+msgstr "Костюм выключается."
 
 #. ~ Description for phase immersion suit (on)
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -80338,12 +82794,15 @@ msgstr "Батареи наушников разряжены."
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
 msgstr ""
-"Пара наушников, используемых стрелками. Наушники выключены. После зарядки "
-"батарейками будут блокировать звуки громче определённого уровня децибел."
+"Наушники, используемых стрелками. Без батарейки или когда выключены, "
+"функционируют как обычные наушники, блокируя весь звук. После включения "
+"будут блокировать звуки громче определённого уровня децибел. Сейчас наушники"
+" выключены."
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -80849,7 +83308,7 @@ msgstr "Выключить броню"
 #. ~ Use action msg for CRIT EM vest (on).
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "C.R.I.T E.M powering off..."
-msgstr "Бронежилет К.Р.И.Т отключается…"
+msgstr "бронежилет К.Р.И.Т отключается…"
 
 #. ~ Description for CRIT EM vest (on)
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -80916,6 +83375,256 @@ msgstr ""
 "подкладкой для защиты и согревания шеи, а также тактический фонарик. Сейчас "
 "фонарик включён и потребляет энергию."
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] "волшебный кожаный ремень"
+msgstr[1] "волшебных кожаных ремня"
+msgstr[2] "волшебных кожаных ремней"
+msgstr[3] "волшебные кожаные ремни"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] "Мегеньльöрð"
+msgstr[1] "Мегеньльöрðа"
+msgstr[2] "Мегеньльöрðов"
+msgstr[3] "Мегеньльöрðы"
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr ""
+"Мифический пояс Тора, бога грома. Ну, вроде бы он. Удваивает базовую силу "
+"владельца."
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] "Малый карманный ремень"
+msgstr[1] "Малых карманных ремня"
+msgstr[2] "Малых карманных ремней"
+msgstr[3] "Малые карманные ремни"
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr ""
+"Широкий облегающий талию пояс, покрыт множеством маленьких кармашков, "
+"которые намного больше, чем выглядят. А вес их содержимого значительно "
+"меньше."
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] "Большой карманный ремень"
+msgstr[1] "Больших карманных ремня"
+msgstr[2] "Больших карманных ремней"
+msgstr[3] "Большие карманные ремни"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr ""
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] "ботинки побега"
+msgstr[1] "ботинка побега"
+msgstr[2] "ботинок побега"
+msgstr[3] "ботинки побега"
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr ""
+"Прочные, но чрезвычайно удобные и хорошо сидящие ботинки из потертой кожи и "
+"стали, эти ботинки можно активировать один раз в день, чтобы сбежать c из "
+"неприятных ситуаций, телепортируют вас на значительное расстояние в "
+"случайном направлении."
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -81319,11 +84028,17 @@ msgstr[3] "бета-вольтаические батарейки"
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
+"Обуздайте мощь радиации у себя дома! Похожа на обычную ёмкую батарейку, но "
+"на самом деле внутри неё слои радиоактивного вещества. Способна несколько "
+"лет вырабатывать электричество со стабильным напряжением… Только его едва "
+"хватит, чтобы зажечь маленький светодиод, причём такая батарейка стоила "
+"сотни долларов. Лучше всего годится, чтоб похвастать перед соседями ядерным "
+"источником энергии у себя дома."
 
 #: lang/json/TOOL_from_json.py
 msgid "radioisotope thermoelectric generator"
@@ -81344,6 +84059,13 @@ msgid ""
 "at only 2 Watts.  Careful!  Curium is great at making heat, and also "
 "releases deadly gamma radiation.  Keep away from cellular life forms."
 msgstr ""
+"Соседи хвастаются своим крутым ночником на бета-радиации? Уделайте их! "
+"Радиоизотопный термоэлектрический генератор КаппаТех 4 — это "
+"трёхкилограммовая железяка (по большей части свинцовая) с заключённым внутри"
+" кусочком кюрия-244. Он способен выдавать примерно 100-150 ватт тепловой "
+"энергии, хотя электроэнергии выйдет около 2 ватт. Осторожно! Кюрий очень "
+"хорошо греет, а ещё испускает смертоносное гамма-излучение. Держите подальше"
+" от клеточных форм жизни."
 
 #: lang/json/TOOL_from_json.py
 msgid "basecamp charcoal smoker"
@@ -81482,8 +84204,8 @@ msgstr[3] "палочка ясновидения"
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr ""
 "Предмет для тестирования флага aep_clairvoyance_plus. Если вдруг вы нашли "
 "его в игре, то это баг."
@@ -81861,7 +84583,7 @@ msgstr "Вы поджигаете фитиль %s."
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr ""
@@ -81887,8 +84609,8 @@ msgstr "Вы уже подожгли фитиль – чего вы ждёте?"
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr ""
 "Грубая и громоздкая самодельная ручная бомба. Сделана из банки, взрывчатки, "
 "гвоздей и запала. Запал подожжён, её следует кинуть."
@@ -81904,7 +84626,7 @@ msgstr[3] "осколочные бомбы"
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
@@ -81924,8 +84646,8 @@ msgstr[3] "осколочные бомбы (активно)"
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr ""
 "Грубая и громоздкая самодельная бомба. Сделана из банки, взрывчатки, "
@@ -81951,11 +84673,11 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr ""
 "Набитая взрывчаткой жестянка с торчащим фитилём. Создаст облако "
-"металлической шрапнели, способной пробить броню ... ну, наверное."
+"металлической шрапнели, способной пробить броню… Ну, наверное."
 
 #: lang/json/TOOL_from_json.py
 msgid "active can bomb"
@@ -81969,33 +84691,33 @@ msgstr[3] "баночные бомбы (активно)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
 "Набитая взрывчаткой жестянка с торчащим фитилём. Создаст облако "
-"металлической шрапнели, способной пробить броню ... ну, наверное. Запал "
+"металлической шрапнели, способной пробить броню… Ну, наверное. Запал "
 "подожжён, её следует кинуть."
 
 #: lang/json/TOOL_from_json.py
 msgid "jack o'lantern"
 msgid_plural "jack o'lanterns"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "фонарь из тыквы"
+msgstr[1] "фонаря из тыквы"
+msgstr[2] "фонарей из тыквы"
+msgstr[3] "фонари из тыквы"
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "Свет"
 
 #. ~ Use action msg for jack o'lantern.
 #: lang/json/TOOL_from_json.py
 msgid "You light the candle in the jack o'lantern."
-msgstr ""
+msgstr "Вы зажгли свечу в фонаре из тыквы."
 
 #. ~ Description for jack o'lantern
 #: lang/json/TOOL_from_json.py
@@ -82005,27 +84727,33 @@ msgid ""
 "doesn't provide very much light, but it can burn for quite a long time.  "
 "You'll need a lighter or matches to light it."
 msgstr ""
+"Это пластиковый крашенный фонарь, выглядит как тыква с лицом. У него есть "
+"свеча, которую можно заменить, когда она сгорела. Он не дает много света, но"
+" может гореть довольно долго. Вам понадобится зажигалка или спички, чтобы "
+"зажечь его."
 
 #: lang/json/TOOL_from_json.py
 msgid "spooky jack o'lantern"
 msgid_plural "jack o'lanterns"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "фонарь из тыквы"
+msgstr[1] "фонаря из тыквы"
+msgstr[2] "фонарей из тыквы"
+msgstr[3] "фонари из тыквы"
 
 #. ~ Use action msg for spooky jack o'lantern.
 #: lang/json/TOOL_from_json.py
 msgid "The candle winks out inside the lantern."
-msgstr ""
+msgstr "Свеча мерцает внутри фонаря."
 
 #. ~ Description for spooky jack o'lantern
 #: lang/json/TOOL_from_json.py
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
+"  The face shifts."
 msgstr ""
+"Внутри тыквы есть толстая светодиодная свеча. Она не дает много света, но "
+"может гореть довольно долго. Свеча горит. Лицо меняется."
 
 #. ~ Description for battle axe
 #: lang/json/TOOL_from_json.py
@@ -82197,6 +84925,32 @@ msgstr ""
 "Это консервная банка, полностью заполненная чёрным порохом, с воткнутым в "
 "неё горящим фитилём."
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] "печь бродяги (зажжена)"
+msgstr[1] "печи бродяги (зажжены)"
+msgstr[2] "печей бродяги (зажжены)"
+msgstr[3] "печь бродяги (зажжена)"
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "Угольки потушены."
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr ""
+"Это маленькая импровизированная дровяная печь, сделанная из металлической "
+"канистры или похожего контейнера подходящего размера. Применяется для "
+"размораживания и разогревания еды, использует простой трут."
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -82482,8 +85236,8 @@ msgstr[3] "водяная мельница"
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
 msgstr ""
 "Небольшая водяная мельница, которая может перемалывать крахмалистые продукты"
 " в муку. Установка производится через строительное меню."
@@ -82499,8 +85253,8 @@ msgstr[3] "ветряная мельница"
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
 msgstr ""
 "Небольшая ветряная мельница, которая может перемалывать крахмалистые "
 "продукты в муку. Установка производится через строительное меню."
@@ -82928,12 +85682,12 @@ msgstr[3] "электрорезка (выкл)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
 msgstr ""
 "Электрорезка для мяса, работающая от батареек. Имеет два зубчатых лезвия, "
 "одновременно вибрирующих, позволяя нарезать всё что угодно, от индейки до "
-"ветчины… даже зомби!"
+"ветчины… Даже зомби!"
 
 #: lang/json/TOOL_from_json.py
 msgid "electric carver (on)"
@@ -83142,18 +85896,22 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "lifestraw"
 msgid_plural "lifestraws"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "водоочиститель"
+msgstr[1] "водоочистителя"
+msgstr[2] "водоочистителей"
+msgstr[3] "водоочистители"
 
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr ""
+"Положите очиститель в подозрительную воду, оставьте на одну минуту, затем "
+"пейте. Двухфазная система фильтрации очистит воду, которую вы пьете. "
+"Довольно полезная вещь, так как вода из рек или других сомнительных "
+"источников может быть грязной."
 
 #: lang/json/TOOL_from_json.py
 msgid "charcoal smoker"
@@ -83731,10 +86489,10 @@ msgstr[3] "электронные наручники"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-"Электронные наручники, используются ботами полиции и осназа для задержания пленников. Их непрерывная сирена чётко определяет во владельце арестованного преступника и оповещает полицейских. Дождитесь их приезда, не пытайтесь бежать или снять наручники — получите удар током.\n"
-"Однако, поскольку единственными полицейскими окажутся зомби, вы можете дожидаться очень долго, если только не подойдёте к проблеме творчески…"
+"Пара электронных наручников, используемых полицией и омоновцами для задержания. Их непрерывная сирена четко идентифицирует владельца как арестованного преступника и предупреждает человеческую полицию. Дождитесь их прибытия, не пытайтесь сбежать или снять манжеты — они нанесут удар током.\n"
+"Однако, поскольку единственная полиция, которая может ответить — это нежить, вы можете дожидаться очень долго, если только не подойдёте к проблеме творчески…"
 
 #: lang/json/TOOL_from_json.py
 msgid "entrenching tool"
@@ -85725,10 +88483,10 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "oxygen cylinder"
 msgid_plural "oxygen cylinders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "кислородный баллон"
+msgstr[1] "кислородных баллона"
+msgstr[2] "кислородных баллонов"
+msgstr[3] "кислородные баллоны"
 
 #. ~ Description for oxygen cylinder
 #: lang/json/TOOL_from_json.py
@@ -85736,6 +88494,8 @@ msgid ""
 "A large steel cylinder used for storing pressurized gas.  It is marked with "
 "a faded, but legible O2 symbol."
 msgstr ""
+"Большой стальной цилиндр для хранения газов под давлением. На нём "
+"полустёртый, но читаемый символ О2."
 
 #: lang/json/TOOL_from_json.py
 msgid "nitrogen tank"
@@ -86211,10 +88971,10 @@ msgstr[3] "губки"
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
 msgstr ""
-"Губка - это чистящий инструмент из мягкого пористого материала. Обычно ею "
+"Губка — это чистящий инструмент из мягкого пористого материала. Обычно ею "
 "моют водооталкивающие поверхности."
 
 #: lang/json/TOOL_from_json.py
@@ -86231,7 +88991,7 @@ msgid ""
 "A combination kit of a washboard and a sponge or rag.  Everything you need "
 "to clean items after the apocalypse."
 msgstr ""
-"Стиральная доска и губка (или тряпка) - то, что надо для мытья вещей после "
+"Стиральная доска и губка (или тряпка) — то, что надо для мытья вещей после "
 "апокалипсиса."
 
 #: lang/json/TOOL_from_json.py
@@ -87361,7 +90121,7 @@ msgstr "Вы зажигаете фитиль порохового заряда.
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr ""
 "Это самодельное взрывное устройство, состоящее из большого пластикового "
 "бидона, наполненного чёрным порохом и металлоломом и оснащённого длинным "
@@ -88039,42 +90799,6 @@ msgstr[1] "печи бродяги"
 msgstr[2] "печей бродяги"
 msgstr[3] "печь бродяги"
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr "Печь бродяги зажжена."
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "Вам нужен источник огня!"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr ""
-"Это маленькая импровизированная дровяная печь, сделанная из металлической "
-"канистры или похожего контейнера подходящего размера. Применяется для "
-"размораживания и разогревания еды, использует простой трут."
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] "печь бродяги (зажжена)"
-msgstr[1] "печи бродяги (зажжены)"
-msgstr[2] "печей бродяги (зажжены)"
-msgstr[3] "печь бродяги (зажжена)"
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "Угольки потушены."
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -88091,7 +90815,7 @@ msgstr "Вы зажигаете трут."
 #. ~ Use action need_charges_msg for ember carrier.
 #: lang/json/TOOL_from_json.py
 msgid "The ember carrier is out of tinder."
-msgstr ""
+msgstr "Контейнер для углей гаснет."
 
 #. ~ Use action need_fire_msg for ember carrier.
 #: lang/json/TOOL_from_json.py
@@ -88302,8 +91026,8 @@ msgstr[3] "Крюк с рукоятью"
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
 msgstr ""
 "Простой стальной крюк с круглой стальной ручкой. Довольно сносное оружие "
 "ближнего боя."
@@ -88753,7 +91477,7 @@ msgstr ""
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -88764,8 +91488,8 @@ msgstr ""
 "Отключённый Мобильный Робототехнический Комплекс TALON с M16A4. Для "
 "использования его нужно активировать и выбрать место на земле для установки,"
 " робот будет заряжен патронами 5.56x45 мм из инвентаря (выложите часть, если"
-" вы НЕ хотите загружать все). Если робот был успешно перепрограммирована, то"
-" он будет идентифицировать вас как дружественный объект и атаковать всех "
+" вы НЕ хотите загружать все). Если робот был успешно перепрограммирован, то "
+"он будет идентифицировать вас как дружественный объект и атаковать всех "
 "врагов из встроенной винтовки."
 
 #: lang/json/TOOL_from_json.py
@@ -88779,7 +91503,7 @@ msgstr[3] "неактивные МРК TALON с M202A1"
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -88790,7 +91514,7 @@ msgstr ""
 "Отключённый Мобильный Робототехнический Комплекс TALON с M202A1. Для "
 "использования его нужно активировать и выбрать место на земле для установки,"
 " робот будет заряжен ракетами M235 из инвентаря (выложите часть, если вы НЕ "
-"хотите загружать все). Если робот был успешно перепрограммирована, то он "
+"хотите загружать все). Если робот был успешно перепрограммирован, то он "
 "будет идентифицировать вас как дружественный объект и атаковать всех врагов "
 "из встроенного реактивного огнемёта M202A1."
 
@@ -88893,9 +91617,9 @@ msgstr "Сломанный киборг испускает агонизирую
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
 "Отключённый сломанный киборг. Последние кусочки его человечности медленно "
 "разлагаются. После использования механическое тело помещается на землю и "
@@ -88961,7 +91685,7 @@ msgstr "Шагобот жужжит и нацеливает оружие пря
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -89001,8 +91725,8 @@ msgstr ""
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
@@ -89036,12 +91760,12 @@ msgstr ""
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
 msgstr ""
-"Неактивный глазобот. После использования помещается на землю и активируется."
-" Если успешно перепрограммировать, будет высматривать нарушителей."
+"Неактивный глазобот. После использования помещается на землю и активируется "
+"БЛА. Если успешно перепрограммировать, будет высматривать нарушителей."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive cleaner bot"
@@ -89064,12 +91788,13 @@ msgstr "Робот-уборщик подаёт сигнал ошибки, но 
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
 msgstr ""
-"Отключённый робот-уборщик. Если успешно перепрограммировать, будет выполнять"
-" ваши команды."
+"Отключённый робот-уборщик. После использования помещается на землю и "
+"активируется. Если успешно перепрограммировать, будет выполнять ваши "
+"команды."
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive miner bot"
@@ -89092,8 +91817,8 @@ msgstr "Робошахтёр выходит из-под контроля и бр
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
 msgstr ""
 "Отключённый робот-шахтёр. После использования помещается на землю и "
@@ -89123,9 +91848,9 @@ msgstr ""
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
 msgstr ""
 "Отключённый робот осназа. После использования помещается на землю и "
 "активируется. Если успешно перепрограммировать, будет нести ордам мир и "
@@ -89152,12 +91877,12 @@ msgstr "Робот-жук осматривается и угрожающе щё
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
 msgstr ""
 "Отключённый робот-жук. После использования помещается на землю и "
-"активируется. Если успешно перепрограммировать, будет бежать навстречу "
+"активируется. Если успешно перепрограммировать, будет ползти навстречу "
 "врагам и бить их током."
 
 #: lang/json/TOOL_from_json.py
@@ -89221,7 +91946,7 @@ msgstr ""
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -89229,7 +91954,7 @@ msgid ""
 " will then identify you as a friendly, roam around or follow you, and attack"
 " all enemies with a built-in firearm and grenade launcher."
 msgstr ""
-"Отключённый минитанк Бигль МРК. При использования его нужно выложить на "
+"Отключённый минитанк Бигль НМР. При использования его нужно выложить на "
 "землю и зарядить фабричными патронами 5.56 мм НАТО и 40-мм гранатами из "
 "инвентаря (выложите часть, если вы НЕ хотите загружать в робота все), а "
 "потом включить. Если танкобот успешно перепрограммирован, то он будет "
@@ -89262,8 +91987,8 @@ msgstr ""
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
@@ -89295,10 +92020,10 @@ msgstr "Прожектор слепит вас яркой вспышкой и н
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
 "Отключённый военный автоматический прожектор. После использования помещается"
@@ -89725,7 +92450,7 @@ msgstr[3] "самодельная боевая коса"
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
+"of a stick.  However it's quite fragile."
 msgstr ""
 "Этот сельскохозяйственный инструмент был переделан в оружие путём разворота "
 "лезвия на 90 градусов, превратив его тем самым в огромное лезвие на конце "
@@ -89858,6 +92583,26 @@ msgstr ""
 "Армейский боевой нож. Лёгкий и чрезвычайно острый, смертельно опасный в "
 "умелых руках или при установке в качестве штыка."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] "модифицированый боевой нож"
+msgstr[1] "модифицированых боевых ножа"
+msgstr[2] "модифицированых боевых ножа"
+msgstr[3] "модифицированые боевые ножи"
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+"Армейский боевой нож. Лёгкий и чрезвычайно острый, смертельно опасный в "
+"умелых руках или при установке в качестве штыка. Был модифицирован и допилен"
+" для установки практически на любое оружие, по желанию, кроме пистолетов."
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -90264,10 +93009,10 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "sword bayonet"
 msgid_plural "sword bayonets"
-msgstr[0] "штык-клинок"
-msgstr[1] "штык-клинка"
-msgstr[2] "штык-клинков"
-msgstr[3] "штык-клинок"
+msgstr[0] "штык-нож"
+msgstr[1] "штык-ножа"
+msgstr[2] "штык-ножей"
+msgstr[3] "штык-ножи"
 
 #. ~ Description for sword bayonet
 #: lang/json/TOOL_from_json.py
@@ -90278,6 +93023,27 @@ msgstr ""
 "Штык-клинок — большое режущее оружие, которое можно прикрепить к стволу "
 "огнестрельного оружия или к арбалету, превратив их таким образом в пику."
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] "модифицированый штык-нож"
+msgstr[1] "модифицированых штык-ножа"
+msgstr[2] "модифицированых штык-ножей"
+msgstr[3] "модифицированые штык-ножи"
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+"Штык-нож — большое режущее оружие, которое можно прикрепить к стволу "
+"огнестрельного оружия или к арбалету, превратив их таким образом в копье. "
+"Был модифицирован и допилен для установки практически на любое оружие, по "
+"желанию, кроме пистолетов и пистолет-пулеметов."
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -90397,6 +93163,81 @@ msgstr ""
 "Огромный изогнутый двуручный меч из Японии. Удивительно лёгок для своего "
 "размера."
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] "электрифицированная рапира"
+msgstr[1] "электрифицированные рапиры"
+msgstr[2] "электрифицированных рапир"
+msgstr[3] "электрифицированные рапиры"
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+"Модификации, сделанные для этой фехтовальной рапиры, могут быть не "
+"спортивными, но они могут дать вам преимущество в этом финальном "
+"соревновании. Дополнительно изолирована рукоять, и электрошокер высокого "
+"напряжения был прикреплен к гарде, подключенный через электронную схему к "
+"наконечнику. Касание заостренного наконечника противника при нажатии кнопки "
+"вызовет болезненный удар током."
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] "электрифицированная шпага"
+msgstr[1] "электрифицированные шпаги"
+msgstr[2] "электрифицированных шпаг"
+msgstr[3] "электрифицированные шпаги"
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+"Модификации, сделанные для этой фехтовальной рапиры, могут быть не "
+"спортивными, но они могут дать вам преимущество в сегодняшнем финальном "
+"соревновании. Была дополнительно изолированна рукоять и электрошокер "
+"высокого напряжения был прикреплен к гарде, подключенный проводом к "
+"наконечнику. Касание заостренного наконечника противника при нажатии кнопки "
+"вызовет болезненный удар током."
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] "электрифицированная сабля"
+msgstr[1] "электрифицированные сабли"
+msgstr[2] "электрифицированных сабель"
+msgstr[3] "электрифицированные сабли"
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+"Модификации, сделанные для этой фехтовальной сабли, могут быть не "
+"спортивными, но они могут дать вам преимущество в сегодняшнем финальном "
+"соревновании. Электрошокер высокого напряжения был прикреплен к гарде и "
+"подключен проводом к острию, а также была дополнительно изолированна "
+"рукоять. Касание заостренного наконечника противника при нажатии кнопки "
+"вызовет болезненный удар током."
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -90829,6 +93670,44 @@ msgstr ""
 "Кусок пластика. Пригоден для изготовления, ремонта или усиления предметов из"
 " пластика."
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] "синтетическая ткань"
+msgstr[1] "синтетические ткани"
+msgstr[2] "синтетических тканей"
+msgstr[3] "синтетическая ткань"
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr ""
+"Это маленький кусок синтетической ткани. В отличие от вас и других природных"
+" материалов, с возрастом он не будет сильно портиться. Может быть, это не "
+"так уж плохо сейчас."
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] "лоскут лайкры"
+msgstr[1] "лоскута лайкры"
+msgstr[2] "лоскутов лайкры"
+msgstr[3] "лоскут лайкры"
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr ""
+"Это маленький кусок синтетической ткани, смешанный с эластичными волокнами "
+"лайкры. Подходит для создания гибкой, но прочной одежды. Стильный, но "
+"вредный для окружающей среды; по крайней мере, вы перерабатываете его."
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -91424,11 +94303,10 @@ msgstr[3] "рация"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
 msgstr ""
 "Это радио с передатчиком. Вы можете использовать его, чтобы связаться с кем-"
-"то, у кого есть такое же. К сожалению, похоже никто не использует их в "
+"то, у кого есть такое же . К сожалению, похоже никто не использует их в "
 "настоящее время…"
 
 #: lang/json/TOOL_from_json.py
@@ -91655,7 +94533,7 @@ msgstr[3] "микроскопы"
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
@@ -91922,7 +94800,7 @@ msgstr[3] "прочный кабель"
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr ""
 "Длинный, толстый, мощный кабель с зажимами на концах. Похоже, вы могли бы "
@@ -92437,15 +95315,15 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid "heat cube"
 msgid_plural "heat cubes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "тепловой кубик"
+msgstr[1] "тепловых кубика"
+msgstr[2] "тепловых кубиков"
+msgstr[3] "тепловые кубики"
 
 #. ~ Use action menu_text for heat cube.
 #: lang/json/TOOL_from_json.py
 msgid "Activate torch mode"
-msgstr ""
+msgstr "Активировать режим факела"
 
 #. ~ Use action msg for heat cube.
 #: lang/json/TOOL_from_json.py
@@ -92453,26 +95331,30 @@ msgid ""
 "You push the torch button and the cube emits a large flame from the top, one"
 " that does radiate heat, but won't burn anything."
 msgstr ""
+"Вы нажимаете кнопку факела, и из куба сверху вырывается большой столб "
+"пламени, который излучает тепло, но ничего не сжигает."
 
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr ""
+"Гладкий стальной кубик размером с кулак. Несколько кнопок по бокам "
+"активируют питание куба."
 
 #: lang/json/TOOL_from_json.py
 msgid "heat cube (torch on)"
 msgid_plural "heat cubes (torch on)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "тепловой кубик (зажжён)"
+msgstr[1] "тепловых кубика (зажжёны)"
+msgstr[2] "тепловых кубиков (зажжёны)"
+msgstr[3] "тепловые кубики (зажжёны)"
 
 #. ~ Use action msg for heat cube (torch on).
 #: lang/json/TOOL_from_json.py
 msgid "The torch flame is extinguished."
-msgstr ""
+msgstr "Потушить факел."
 
 #. ~ Description for heat cube (torch on)
 #: lang/json/TOOL_from_json.py
@@ -92480,6 +95362,8 @@ msgid ""
 "The heat cube in the torch configuration, where it emits warmth and a bright"
 " flame that does not burn."
 msgstr ""
+"Тепловой куб включен в режиме факела, в котором он излучает тепло и яркое "
+"пламя, которое не жжот."
 
 #: lang/json/TOOL_from_json.py
 msgid "skeleton key of opening"
@@ -92492,7 +95376,7 @@ msgstr[3] ""
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -93847,14 +96731,6 @@ msgid ""
 "This is a stick that has been cut into a trigger mechanism for a snare trap."
 msgstr "Палка, врезанная в виде спускового механизма для силковой ловушки."
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] "Леватейн"
-msgstr[1] "Леватейн"
-msgstr[2] "Леватейн"
-msgstr[3] "Леватейн"
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -95356,6 +98232,20 @@ msgstr ""
 "Крепкое железнодорожное колесо. Из-за выступа прочно держится на рельсе, но "
 "ужасно на всём остальном."
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr "пара маленьких железнодорожных колёс"
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr ""
+"Пара маленьких железнодорожных колёс. Они подходят для небольших "
+"железнодорожных рельсов, например, как в парках развлечений. Скорее для "
+"хобби, а не транспортировки."
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "колесо от мотоцикла"
@@ -95762,6 +98652,10 @@ msgstr "разбивание"
 msgid "cranking"
 msgstr "ручное заряжание"
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr "разогревание"
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr "снятие стресса"
@@ -96042,6 +98936,10 @@ msgstr "стрелы"
 msgid "pebbles"
 msgstr "галька"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "камень"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr "картечные патроны"
@@ -96410,7 +99308,7 @@ msgstr "Металлическое покрытие — Руки"
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -96453,7 +99351,7 @@ msgstr "Металлическое покрытие — Ноги"
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -96829,17 +99727,22 @@ msgstr "Сжигатель этанола"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
-msgstr ""
-"Вы можете использовать алкоголь как очень эффективное топливо. Однако вы всё"
-" равно будете страдать от воздействия алкоголя на организм."
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
+msgstr "Вы можете использовать алкоголь как очень эффективное топливо."
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "Воздушный конденсатор испарений"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr ""
+"Это устройство собирает влагу из воздуха, которая медленно втекает прямо в "
+"вашу вену. Может не сработать в сухой обстановке."
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "Алмазная роговица"
@@ -96960,6 +99863,10 @@ msgid ""
 "you to glow and making you visible in the dark without improving how much "
 "you can see in the slightest."
 msgstr ""
+"Вы не уверены, что тот конденсатор *должен* светиться, но он светится, и "
+"обычно в самый неподходящий момент. Неисправная бионика случайным образом "
+"включается и выключается, вызывая свечение и выдавая вас в темноте, при этом"
+" ни капли не помогает вам видеть."
 
 #: lang/json/bionic_from_json.py
 msgid "Integrated Dosimeter"
@@ -97132,10 +100039,10 @@ msgstr ""
 "неприятные побочные эффекты."
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "Мини-огнемёт"
+msgid "Finger Lighter"
+msgstr "Палечная зажигалка"
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -97167,8 +100074,8 @@ msgstr "Электромагнитный агрегат"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
 msgstr ""
 "Мощный электромагнит, хирургически встроенный в правую кисть. Позволяет "
 "беспорядочно притянуть к вам все ближайшие магнитящиеся предметы, способные "
@@ -97242,11 +100149,11 @@ msgstr "Ремонтные наноботы"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
 msgstr ""
-"В вашем теле существует флот крошечных роботов. При активизации они "
-"обследуют ваше тело, залечивают повреждения со скоростью 1 НР/сек и "
+"В вашем теле существует рой крошечных нанороботов. При активизации они "
+"обследуют ваше тело, залечивают повреждения со скоростью 1 ОЗ в минуту и "
 "останавливают кровотечения ценой бионической энергии."
 
 #: lang/json/bionic_from_json.py
@@ -97259,6 +100166,8 @@ msgid ""
 "When active, this bionic eliminates all light within a 2 tile radius through"
 " destructive interference."
 msgstr ""
+"При активации этот модуль посредством разрушительной интерференционной волны"
+" уничтожает весь свет в радиусе 2 клеток."
 
 #: lang/json/bionic_from_json.py
 msgid "Implanted Night Vision"
@@ -97284,11 +100193,11 @@ msgstr "Неисправный биомодуль. Время от времен
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
+"Increases mouth encumbrance by ten."
 msgstr ""
 "Вы действительно не знаете, как этот КБМ оказался в носу, но независимо от "
 "того, как он туда попал, эта бионика затрудняет дыхание. Увеличивает "
-"скованность рта на 1."
+"скованность рта на 10."
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -97324,10 +100233,10 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
+"mild optic neuropathy.  Increases eye encumbrance by ten."
 msgstr ""
 "Из-за неверно установленного диэлектрического зонда вы страдаете от лёгкой "
-"глазной невропатии. Повышает скованность глаз на 1."
+"глазной невропатии. Повышает скованность глаз на 10."
 
 #: lang/json/bionic_from_json.py
 msgid "Power Armor Interface"
@@ -97364,12 +100273,12 @@ msgstr "Доп. аккумулятор"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
 msgstr ""
 "Компактный Бионический Модуль, который увеличивает объём запасаемой энергии "
-"на 100. Чтобы использовать потребляющие энергию имплантаты, требуется "
+"на 100 кДж. Чтобы использовать потребляющие энергию имплантаты, требуется "
 "установить хотя бы один такой модуль. Вам также потребуется установить "
 "бионику с источником питания."
 
@@ -97379,10 +100288,9 @@ msgstr "Доп. аккумулятор Мк. II"
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
 msgstr ""
-"Компактный Бионический Модуль, увеличивающий энергоёмкость на 250 единиц."
+"Компактный Бионический Модуль, увеличивающий энергоёмкость на 250 кДж."
 
 #. ~ Description for Power Overload
 #: lang/json/bionic_from_json.py
@@ -97725,11 +100633,11 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
+" by ten, while failing to improve your ability to hold objects whatsoever."
 msgstr ""
 "Самофиксирующиеся большие пальцы крепко держат (даже если вы этого не "
 "хотите) и не отпускают (даже если вы хотите это сделать). Увеличивают "
-"скованность рук на два, не улучшая вашу способность удерживать объекты."
+"скованность рук на 10, не улучшая вашу способность удерживать объекты."
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -97886,15 +100794,15 @@ msgstr ""
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
 msgstr ""
 "Маленькая бензиновая топливная ячейка, прикреплённая к вашей лопатке. Хотя "
 "выход энергии невелик по сравнению с другими топливными ячейками, это "
-"устройство довольно сильно греется - избыточное тепло рассеивается "
+"устройство довольно сильно греется — избыточное тепло рассеивается "
 "посредством выхлопного клапана на вашей спине. В вашей системе "
 "кровообращения имеется множество пузырьков из биопластика, служащих "
 "хранилищем для топлива."
@@ -97958,7 +100866,7 @@ msgstr "Модификатор вкуса"
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr ""
@@ -98282,11 +101190,11 @@ msgstr "Ближний и дальний бой затруднены."
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "L. Arm"
-msgstr "лРука"
+msgstr "L. Рука"
 
 #: lang/json/bodypart_from_json.py
 msgid "Arms"
-msgstr "пРука"
+msgstr "Руки "
 
 #: lang/json/bodypart_from_json.py
 msgid "L ARM"
@@ -98303,7 +101211,7 @@ msgstr "правая рука"
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "R. Arm"
-msgstr "пРука"
+msgstr "П. Рука"
 
 #: lang/json/bodypart_from_json.py
 msgid "R ARM"
@@ -98333,11 +101241,11 @@ msgstr "Работа руками замедлена."
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "L. Hand"
-msgstr "лЛадонь"
+msgstr "Л. Ладонь"
 
 #: lang/json/bodypart_from_json.py
 msgid "Hands"
-msgstr "лЛадонь"
+msgstr "Ладони"
 
 #: lang/json/bodypart_from_json.py
 msgid "right hand"
@@ -98350,7 +101258,7 @@ msgstr "прав. ладонь"
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "R. Hand"
-msgstr "пЛадонь"
+msgstr "П. Ладонь"
 
 #: lang/json/bodypart_from_json.py
 msgid "left leg"
@@ -98376,11 +101284,11 @@ msgstr "Бег и плавание замедлены."
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "L. Leg"
-msgstr "лНога"
+msgstr "Л. Нога"
 
 #: lang/json/bodypart_from_json.py
 msgid "Legs"
-msgstr "пНога"
+msgstr "Ноги"
 
 #: lang/json/bodypart_from_json.py
 msgid "L LEG"
@@ -98397,7 +101305,7 @@ msgstr "прав. нога"
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "R. Leg"
-msgstr "пНога"
+msgstr "П. Нога"
 
 #: lang/json/bodypart_from_json.py
 msgid "R LEG"
@@ -98423,11 +101331,11 @@ msgstr "стопы"
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "L. Foot"
-msgstr "лСтопа"
+msgstr "Л. Стопа"
 
 #: lang/json/bodypart_from_json.py
 msgid "Feet"
-msgstr "лСтупня"
+msgstr "Стопы"
 
 #: lang/json/bodypart_from_json.py
 msgid "right foot"
@@ -98440,7 +101348,7 @@ msgstr "прав. стопа"
 
 #: lang/json/bodypart_from_json.py src/armor_layers.cpp
 msgid "R. Foot"
-msgstr "пСтопа"
+msgstr "П. Стопа"
 
 #: lang/json/bodypart_from_json.py
 msgid "appendix"
@@ -98700,6 +101608,18 @@ msgstr "Заполнить яму землёй"
 msgid "Make Woodchip Floor"
 msgstr "Сделать пол из древесной стружки"
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr "Сделать гравийную насыпь"
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr "Строить маленький прямой ж/д путь"
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr "Строить маленький диагональный ж/д путь"
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr "Построить деревянный пол"
@@ -98818,11 +101738,11 @@ msgstr "Должно быть поддержано с обеих сторон о
 
 #: lang/json/construction_from_json.py
 msgid "Build Screen Door"
-msgstr ""
+msgstr "Строить сетчатую дверь"
 
 #: lang/json/construction_from_json.py
 msgid "Build Screen Mesh Wall"
-msgstr ""
+msgstr "Строить сетчатую стену"
 
 #: lang/json/construction_from_json.py
 msgid "Build Chickenwire Fence"
@@ -98866,7 +101786,7 @@ msgstr "Поставить книжный шкаф"
 
 #: lang/json/construction_from_json.py
 msgid "Build Entertainment Center"
-msgstr ""
+msgstr "Строить \"стенку\""
 
 #: lang/json/construction_from_json.py
 msgid "Build Locker"
@@ -98902,15 +101822,15 @@ msgstr "Разместить стол"
 
 #: lang/json/construction_from_json.py
 msgid "Build Coffee Table"
-msgstr ""
+msgstr "Собрать кофейный столик"
 
 #: lang/json/construction_from_json.py
 msgid "Build Workbench"
-msgstr "Построить Верстак"
+msgstr "Построить верстак"
 
 #: lang/json/construction_from_json.py
 msgid "Place Workbench"
-msgstr "Установить Верстак"
+msgstr "Установить верстак"
 
 #: lang/json/construction_from_json.py
 msgid "Build Chair"
@@ -99150,7 +102070,7 @@ msgstr "Строить причал/мост на мелководье"
 
 #: lang/json/construction_from_json.py
 msgid "Build Deep River Dock"
-msgstr ""
+msgstr "Строить глубоководный причал"
 
 #: lang/json/construction_from_json.py
 msgid "Place Water Mill"
@@ -99266,7 +102186,7 @@ msgstr "Построить пол из металлолома"
 
 #: lang/json/construction_from_json.py
 msgid "Build Pillow Fort"
-msgstr "Построить Форт из подушек"
+msgstr "Построить форт из подушек"
 
 #: lang/json/construction_from_json.py
 msgid "Build Cardboard Fort"
@@ -99278,7 +102198,7 @@ msgstr "Оборудовать кострище"
 
 #: lang/json/construction_from_json.py
 msgid "Build Rammed Earth Wall"
-msgstr "Строить Земляную Стену"
+msgstr "Строить земляную стену"
 
 #: lang/json/construction_from_json.py
 msgid "Hang Hanging Meathook"
@@ -99286,7 +102206,7 @@ msgstr "Повесить мясницкий крюк"
 
 #: lang/json/construction_from_json.py
 msgid "Build Counter Gate"
-msgstr "Построить Рабочие Ворота"
+msgstr "Строить дверцу стола"
 
 #: lang/json/construction_from_json.py
 msgid "Build Split Rail Fence Gate"
@@ -99302,7 +102222,7 @@ msgstr "Строить дощатую ограду"
 
 #: lang/json/construction_from_json.py
 msgid "Build Privacy Fence"
-msgstr "Строить Ограждающий Забор"
+msgstr "Строить ограждающий забор"
 
 #: lang/json/construction_from_json.py
 msgid "Build Brick Wall from Adobe"
@@ -99360,6 +102280,10 @@ msgstr "Построить радиовышку."
 msgid "Build a radio tower console."
 msgstr "Построить терминал радиовышки."
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr "Строить пенёк"
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr "Переделать питание холодильника"
@@ -100114,6 +103038,51 @@ msgstr ""
 msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr "Вам снится, что пчёлы бьются за ваш сладкий нектар. Ммм."
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr ""
+"Как круто было бы погрузить корни глубоко в почву и наслаждаться сменой "
+"времён года."
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr ""
+"Вы грезите о гигантской корневой системе, питающей вас соками словно сердце "
+"кровью."
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr "Вам снится кошмарный сон о термитах, жрущих всё ваше тело."
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr ""
+"Вы грезите разделить свои корни с огромным лесом, где все растения укрывают "
+"небо кронами, словно навесом, и растут всё выше."
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr "Скопление гусениц обкусывают ваши листочки."
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr ""
+"Огонь бушует вокруг вас, облизывая вашу кору и поглощая саженцы и кусты "
+"возле корней. Некогда шумный лес тих и безжизнен."
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr ""
+"Вам снится древняя сосна. Деревья — настоящие выжившие, поведала она вам."
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -101485,6 +104454,25 @@ msgstr "Ваши руки непрерывно дрожат."
 msgid "You tremble"
 msgstr "Вы дрожите"
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr "Припадок"
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr "Ваши мышцы свело, и вы не можете ничего поделать!"
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr "Вы восстанавливаете контроль над своими мышцами!"
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr "Ваши мышцы не скоординированы!"
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "Кровотечение"
@@ -101657,8 +104645,8 @@ msgstr "Кожные паразиты"
 msgid ""
 "You stop to scratch yourself frequently; high INT helps you resist the urge."
 msgstr ""
-"Вы перестаёте часто чесаться; высокий уровень интеллекта помогает вам "
-"противостоять искушению."
+"Вы часто чешетесь; высокий уровень интеллекта помогает вам противостоять "
+"искушению."
 
 #. ~ Apply message for effect(s) 'Itchy skin, Writhing skin, Bugs in skin'.
 #: lang/json/effects_from_json.py
@@ -101776,7 +104764,7 @@ msgstr "Вакцинирован"
 #. ~ Description of effect 'Vaccinated'.
 #: lang/json/effects_from_json.py
 msgid "You have been vaccinated for the flu recently."
-msgstr "Вы недавно получили прививку от гриппа."
+msgstr "Вы были недавно привиты от гриппа."
 
 #: lang/json/effects_from_json.py
 msgid "RX12 Healing Comedown"
@@ -102423,6 +105411,28 @@ msgstr "Ваш метаболизм стал нестабильным."
 msgid "Your metabolism becomes more stable."
 msgstr "Ваш метаболизм стал более стабильным."
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr "Беспокоящие симптомы"
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr "Ваши мышцы продолжают спазмировать."
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr "Тревожные симптомы"
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr ""
+"Ваша нервная система работает со сбоями, почти как будто она разрывается "
+"изнутри."
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "Освещён"
@@ -102678,6 +105688,17 @@ msgstr "Сверхзаряд"
 msgid "You've been struck by lightning, and feel... different."
 msgstr "В вас ударила молния, и теперь вы чувствуете себя… другим."
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr ""
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr "Религиозное Оскорбление"
@@ -103417,6 +106438,265 @@ msgstr ""
 "безопасности. Пока лежал на земле в ожидании дополнительных сотрудников "
 "полиции, был разорван на куски зомби, привлечёнными шумом."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr ""
+"     После вашей смерти стал охотником и поселился отшельником в лесу. Был "
+"убит во сне и съеден выследившим его каннибалом."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+"     После многих лет выживания стал известным старьёвщиком и открыл "
+"небольшой магазин на аванпосте Свободных Торговцев. Пережив двух сыновей, он"
+" умер после того, как редкий артефакт отравил его кровь кислотой."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+"     Он бродил и очищал землю в течение многих лет после вашей смерти, в "
+"конце концов став квалифицированным механиком. Работая в Свободных "
+"торговцах, он жил комфортной, хотя и довольно небогатой жизнью. Умер от рака"
+" — редкой роскоши в наши дни."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+"     После вашей смерти стал по-настоящему подавленным и ушёл в леса. Если "
+"верить слухам, он провел годы, живя как невменяемый отшельник в далекой "
+"пещере, поклоняясь камням и принося в жертву собак."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+"     После вашей смерти он стал одержим сохранением старых знаний и в конце "
+"концов стал известен как «хранитель знаний». Нанятый старой Гвардией в "
+"качестве библиотекаря, он провёл свою жизнь среди пыльных старых книг, "
+"пытаясь убедить других в их ценности. Он даже изменил свое имя на Фредерика "
+"Бастиа, в честь старого французского философа."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+"     Он стал верующим после вашей смерти и, в конце концов, присоединился к "
+"англиканской общине и стал викарием. Распятие стало его смыслом жизни, пока "
+"он не умер от рук рейдеров мучительной смертью. Он всё ещё молился, когда "
+"его сжигали заживо."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+"     После вашей смерти, потерянный и проклятый, он присоединился к "
+"кровавому культу, который похищал и приносил в жертву юных девственниц. Вся "
+"его группа была убита после обнаружения старой гвардией. Его голова на шесте"
+" стала напоминанием для всех культистов."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr ""
+"     Он не прожил долго после вашей смерти. В старом погребе на "
+"электрическом стуле он перед смертью выкрикнул ваше имя. Его тело так и не "
+"было найдено."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr ""
+"     Пережив вас всего на несколько дней, он утонул, пытаясь сбежать от "
+"орды."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+"     Он бродил в одиночестве в течение нескольких дней, прежде чем наткнулся"
+" на заставу Свободных Торговцев. Он провёл несколько лет в качестве "
+"охранника каравана, часто выпивая до беспамятства и трахая любых доступных "
+"женщин. Пьянство ослабило хватку и, в конце концов, его уволили. Он умер от "
+"отравления алкоголем в тот же день."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+"     Одержимый идеей осёдлости, он, в конце концов, нашёл свою любовь и "
+"построил ферму с нуля. Живя относительно спокойно, без монстров, его семья "
+"процветала годами. Умер, оставив семь сыновей и две дочери."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr ""
+"      Стал знаменитым в пустошах, после того как нашёл старую пивоварню и "
+"повторил рецепт. Его офигенейшее охлаждённое пиво широко продаётся "
+"Свободными Торговцами."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr "      Нашёл целый погреб виски. Напился до смерти."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr "     Через несколько дней после вашей смерти он повесился."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr ""
+"     Бродил месяцами, прежде чем нашёл небольшое сообщество, которое его "
+"приняло. Стал фермером и провел остаток своей безмятежной жизни, ухаживая за"
+" посевами и радуясь, что он больше не один."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr ""
+"     Одержимый поиском «антивируса», он умер несколько недель спустя в "
+"старой лаборатории, разорванный в клочья турелью безопасности."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr ""
+"     Следуя по пути в Центр беженцев, он умер через несколько месяцев."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr ""
+"     Присоединился к рейдерской банде и через несколько недель погиб в "
+"перестрелке, пытаясь ограбить караван Свободных Торговцев."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr ""
+"     Странствуя на север, он, в конце концов, нашёл нетронутое бейсбольное "
+"поле и построил там процветающее фермерское сообщество."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr ""
+"     Он провёл остаток своей короткой жизни в поисках чем бы жахнуться. Умер"
+" от передозировки в заброшенном подвале."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr ""
+"     После путешествия на юг присоединился к небольшой рыбацкой деревне. "
+"Убит несколько лет спустя в рейдерской атаке вместе со своим маленьким "
+"сыном."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr ""
+"     Обезумев от вашей смерти, он удалился в старое убежище последних людей,"
+" пообещав никогда не выходить из него. Умер от голода внутри."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr ""
+"     Он стал очень преуспевающим охотником на диких животных, торгующим "
+"мясом и мехами и обеспечивающим продовольствием многие поселения в обмен на "
+"выпивку и женщин. Он умер спустя годы от венерических заболеваний."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr ""
+"     Уйдя в леса, он отшельником провёл остаток своей жизни в заброшенной "
+"хижине, ловя рыбу и охотясь на диких животных."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr ""
+"     По дороге в Калифорнию, безумно мечтая о лучшей жизни, был убит и "
+"медленно сожран пауками."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr ""
+"     После вашей смерти он безуспешно пытался справиться с одиночеством. Был"
+" до беспамятства пьян, когда группа зомби нашла его укрытие и не оставило "
+"ему шансов."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr ""
+"     Он не выжил долго. Однажды его разбудила орда зомби. Они прорвались "
+"через укрепленные окна, и только последняя пуля помешала ему быть съеденным "
+"заживо."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr ""
+"     Он заболел вскоре после вашей смерти и, не получив медицинскую помощь, "
+"умер. Его последними словами были: «Скорее бы конец...»"
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -103755,6 +107035,228 @@ msgstr ""
 "расходовала имеющиеся припасы. Спустя две недели после заключения она умерла"
 " от обезвоживания."
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr ""
+"     Подстрелена старой гвардией несколько недель спустя, после того как "
+"ограбила большой караван."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr ""
+"     Путешествуя на север, она, в конце концов, нашла там тихое сообщество и"
+" всю оставшуюся жизнь занималась сельским хозяйством. Родила четырёх "
+"дочерей."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+"     Она была на побегушках у старой гвардии и, в конечном итоге, ей было "
+"разрешено присоединиться к ним. Провела остаток своей жизни, охотясь на "
+"рейдеров. Умерла в стычке через несколько лет, пожертвовав своей жизнью, "
+"чтобы позволить своему отряду отступить. Её имя почитается в песнях и "
+"сказаниях."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr ""
+"     Вскоре после вашей смерти она присоединилась к Свободным торговцам, "
+"став охранником каравана, и через несколько месяцев стала новым связным в "
+"Центре беженцев. Умерла несколько лет спустя от загадочной болезни."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr ""
+"     Она была найдена полумёртвой Старой гвардией, которая подобрала её. "
+"Стала известной старьёвщицей, прославившаяся тем, что нашла нетронутый "
+"тайник с экспериментальными антибиотиками."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr ""
+"     Она удалилась в лес, где построила собственную хижину и всю оставшуюся "
+"жизнь рыбачила."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr ""
+"     Захваченная рейдерами, она провела остаток своей несчастной жизни в "
+"рабстве. В безнадёге она перерезала запястья ржавым ножом."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr ""
+"     Подавленная, она присоединилась к протестантской общине и стала "
+"образцом добродетели. Посвятив свою жизнь изучению Библии, она провела "
+"остаток своей жизни в относительном мире."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr ""
+"     Убита и съедена каннибалом всего через несколько дней после вашей "
+"смерти. Была всеми забыта."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr ""
+"     После вашей смерти, она построила свой собственный форпост на западе и "
+"стала известным торговцем. Будучи заядлым коллекционером книг, она создала "
+"большую библиотеку, чтобы поддержать гранит науки."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr ""
+"     После многих месяцев путешествия нашла старую ферму. Она провела "
+"несколько лет, ухаживая за своим урожаем и живя жизнью отшельника, а потом "
+"была убита рейдерами ради забавы."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr ""
+"     Уехала на юга и присоединилась к тамошним поселенцам. Она стала "
+"известным инженером, создавшим самый большой паровой двигатель в Новой "
+"Англии."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr ""
+"     Присоединившись к банде после вашей смерти, она месяцами охотилась на "
+"невинных, прежде чем умерла в поножовщине с таким же отребьем."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr "     Она всегда думала о вас. Даже тогда, когда её растерзали зомби."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr ""
+"     Она нашла заброшенный БТР и много лет путешествовала, выслушивая "
+"различные истории. Написала одну из немногих постапокалиптических книг, "
+"подробно описывающую жизнь после конца."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr ""
+"     Странствовала годами. Её жизнь оборвалась, когда группа рейдеров "
+"использовала её в качестве тренировочной мишени."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr ""
+"     Она стала умелым охотником за дичью, одним из лучших. Спустя годы она "
+"присоединилась к Старой гвардии и получила должность маршала."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr ""
+"     Отчаявшись спасти человечество от вымирания, она организовала свою "
+"собственную группу выживших, чья работа заключалась в том, чтобы охотиться "
+"на бандитов и украшать дороги их изуродованными телами. Она умерла в стычке "
+"несколько месяцев спустя."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr ""
+"     Она стала поджигателем и была сожжена несколько недель спустя в костре,"
+" который сама же и подожгла."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr ""
+"     Она продолжала странствовать несколько недель, но, в конце концов, "
+"умерла после того, как выпила неочищенную воду."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr ""
+"Она уехала на север и присоединилась к тамошней общине. Благодаря своим "
+"навыкам ловли, гарантировала всегда свежее мясо на столах местных жителей."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr ""
+"     Она присоединилась к Свободным торговцам и привела их первый караван в "
+"Канаду. Умерла через несколько лет от дизентерии."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr ""
+"     Она построила лодку и уплыла на восток в Европу, надеясь, что "
+"апокалипсис не затронул её. Больше о ней никто не слышал."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr ""
+"      Несколько лет была жрицей культа конца света. Была принесена в жертву "
+"их богам после ужасного неурожая."
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr ""
+"     Стала наркоманкой и умерла от передозировки через несколько месяцев "
+"после вашей смерти."
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "Ваши союзники"
@@ -103929,10 +107431,10 @@ msgid "A small family surviving on their generational land."
 msgstr "Небольшая семья, выживающая на своей родовой земле."
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
-msgstr "Божья община"
+msgid "New England Church Community"
+msgstr "Сообщество церкви Новой Англии"
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -103977,43 +107479,80 @@ msgstr ""
 msgid "Dusty"
 msgstr "Пыль"
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "It's dusty.  Has no effect - obsolete fault."
+msgstr "Оно пыльное. Эффекта нет — это устаревшая поломка."
+
+#. ~ name of mending method for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "Wipe clean"
+msgstr "Почистить"
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
-msgstr "Оно пыльное. Эффекта нет - это устаревшая поломка."
+#, python-format
+msgid "You clean you %s."
+msgstr "Вы почистили %s."
 
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr "Уже развёрнуто"
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr "Этот модуль нужно вернуть в заводское состояние."
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr "Вернуть заводское состояние"
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr "Вы успешно вернули %s в заводское состояние"
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr "Загрязнение чёрным порохом"
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
-"Чёрный порох загрязняет оружие намного быстрее современных бездымных "
-"боеприпасов - это снижает надёжность и вызывает ржавчину, если оружие не "
-"почистить. Значимый эффект оказывает только сильное загрязнение, однако "
-"чёрный порох забивается очень быстро."
+"Стрельба из черного пороха приводит к загрязнению, что снижает надежность и,"
+" если его не очистить, приводит к образованию ржавчины. Это загрязняет "
+"оружие намного быстрее, чем использование современных бездымных пороховых "
+"патронов. Сильное загрязнение оказывает значительное влияние на надежность, "
+"но загрязнение черным порошком накапливается быстро."
+
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr "Чистить нагар чёрного пороха"
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr "Вы почистили %s."
 
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr "Стреляная гильза в каморе"
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
@@ -104021,70 +107560,142 @@ msgid ""
 msgstr ""
 "В каморе этого оружия лежит пустая гильза. Перед стрельбой её нужно извлечь."
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr ""
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr "Загрязнение"
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
-"Загрязнение возникает в результате постоянной стрельбы, что снижает "
-"надёжность и в конце концов повреждает оружие. Оно накапливается довольно "
-"медленно (не в случае с чёрным порохом) благодаря устройству большинства "
-"патронов с современным бездымным порохом. В целом загрязнение не самая "
-"страшная проблема, только если оно не накопится до значимого предела - для "
-"этого нужно отстрелять тысячи патронов и не почистить оружие."
+"Загрязнение возникает в результате постоянной стрельбы. Оно снижает "
+"надёжность и, в конце концов, повреждает оружие. Благодаря современным "
+"боеприпасам с бездымным порохом, оно накапливается довольно медленно (но не "
+"в случае с чёрным порохом). В целом, загрязнение не самая страшная проблема,"
+" только если оно не накопится до значимого предела — для этого нужно "
+"отстрелять тысячи патронов и не почистить оружие."
+
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr "Почистить оружие"
 
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
 msgstr "Порванный приводной ремень"
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "Требуется для работы подключённого генератора."
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr "Заменить изношенный приводной ремень"
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr "Вы заменили изношенный приводной ремень в %s."
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr "Неисправные запальные свечи"
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr "Помогает запустить двигатель в условиях низких температур."
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr "Заменить неисправные свечи зажигания"
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr "Вы заменили неисправные свечи зажигания в %s."
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr "Работающий иммобилайзер"
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "Не даёт завести двигатель машины без правильного ключа."
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr "Деактивировать иммобилайзер"
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr "Деактивировать иммобилайзер, который препятствует запуску двигателя."
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr "Вы успешно деактивировали иммобилайзер в %s."
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr "Неисправный дизельный насос"
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr ""
 "Требуется для подкачки дизеля из топливного бака автомобиля и нагнетания "
 "давления."
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr "Заменить неисправный дизельный насос"
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr "Вы заменили неисправный дизельный насос в %s"
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr "Забитый воздушный фильтр"
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
@@ -104092,11 +107703,23 @@ msgstr ""
 "Выработавший ресурс фильтр снижает эффективность топлива и увеличивает "
 "количества дыма."
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr "Заменить забившийся воздушный фильтр"
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr "Вы заменили грязный воздушный фильтр в %s."
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr "Забитый топливный фильтр"
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
@@ -104104,33 +107727,81 @@ msgstr ""
 "Выработавший ресурс фильтр снижает производительность двигателя и "
 "увеличивает шанс проскоков пламени."
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr "Заменить засорившийся топливный фильтр"
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr "Вы заменили грязный топливный фильтр в %s."
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr "Неисправный топливный насос"
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr "Требуется для выкачивания бензина из бензобака автомобиля."
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr "Заменить неисправный топливный насос"
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr "Вы заменили неисправный топливный насос в %s."
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr "Неисправный водяной насос"
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr "Требуется для подачи воды на внешний радиатор или теплоотвод."
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr "Заменить неисправную водяную помпу"
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr "Вы заменили неисправную водяную помпу в %s."
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr "Неисправный стартёр"
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "Требуется для запуска двигателя."
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr "Заменить неисправный стартёр"
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr "Вы заменили неисправный стартёр в %s."
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -104617,17 +108288,21 @@ msgstr "густой инсектицидный туман"
 msgid "smoke vent"
 msgstr "дым из вытяжки"
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr "ясновидение"
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
-msgstr ""
+msgstr "ужасное присутствие"
 
 #: lang/json/field_type_from_json.py
 msgid "frightful presense"
-msgstr ""
+msgstr "противное присутствие"
 
 #: lang/json/field_type_from_json.py
 msgid "terrifying presense"
-msgstr ""
+msgstr "ужасающее присутствие"
 
 #: lang/json/furniture_from_json.py
 msgid "mutated cactus"
@@ -104827,11 +108502,11 @@ msgstr "Баррикада. Для перегораживания дорог."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "грохот!"
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "«бум»."
 
@@ -104951,7 +108626,8 @@ msgstr "статуя"
 msgid "A carved statue made of stone."
 msgstr "Скульптура, вырезанная из камня."
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "стук."
 
@@ -104962,7 +108638,7 @@ msgstr "манекен"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
 msgstr ""
 "Нацепи на него одежду, поговори с ним. Кто ж будет против? Погоди… он только"
@@ -105397,7 +109073,7 @@ msgstr ""
 "удобство или тепло."
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "треск!"
 
@@ -105410,7 +109086,7 @@ msgstr "цветок марло"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
+"and… delicious?"
 msgstr ""
 "Этот цветок похож на остальные заражённые грибком цветы, но его стебель "
 "ярко-голубого цвета, а его запах одурманивающий и… аппетитный?"
@@ -105917,9 +109593,9 @@ msgstr "задыхающаяся трубка"
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr ""
 "Мясистый зелёный сталактит с толстой шкурой, похожей на кожу морской звезды,"
 " растущий с пола до потолка. В его середине есть несколько ротоподобных "
@@ -106004,7 +109680,7 @@ msgstr "мясистый алтарь"
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -106193,7 +109869,7 @@ msgstr "беговая дорожка"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
+" taken apart for its… parts."
 msgstr ""
 "Применялась для тренировки ножных мышц. Сейчас это будет трудно провернуть, "
 "без электричества-то. Можно разобрать на части."
@@ -106221,7 +109897,7 @@ msgstr "пианино"
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr ""
 "Старинное чёрное дерево и слоновая кость. Придаёт шик. Вы могли бы разобрать"
 " его на запчасти… вы чудовище."
@@ -106386,6 +110062,19 @@ msgstr "табуретка"
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr "Присядь, выпей чего-нибудь. Можно сложить для удобной переноски."
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr "пенёк"
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr ""
+"Просто отрезанное бревно, с неровными краями. В целом, очень простое "
+"сиденье."
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "доска объявлений"
@@ -106503,12 +110192,12 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "entertainment center"
-msgstr ""
+msgstr "стенка"
 
 #. ~ Description for entertainment center
 #: lang/json/furniture_from_json.py
 msgid "Stores audio visual equipment, books and collectible."
-msgstr ""
+msgstr "Содержит аудио и видео оборудование, книги и другие штуки."
 
 #: lang/json/furniture_from_json.py
 msgid "coffin"
@@ -106890,7 +110579,7 @@ msgstr ""
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
 msgstr ""
 "Маленький металлический складной столик, идеально подходит для туристических"
@@ -106908,7 +110597,7 @@ msgstr "Это стол, за ним едят."
 #. ~ Description for table
 #: lang/json/furniture_from_json.py
 msgid "a low table for livingrooms."
-msgstr ""
+msgstr "низкий столик для гостиных."
 
 #: lang/json/furniture_from_json.py
 msgid "tatami mat"
@@ -106971,11 +110660,11 @@ msgid "This beaded curtain could be pulled aside."
 msgstr "Эту бисерную занавеску можно отодвинуть."
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
-msgstr "клак-щёлк…клак…клак"
+msgid "clickity clack… clack… clack"
+msgstr "клак-щёлк… клак… клак"
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
+msgid "clickity clack… clack"
 msgstr "клак-клак… клак"
 
 #: lang/json/furniture_from_json.py
@@ -106988,7 +110677,7 @@ msgid "This beaded curtain has been pulled aside."
 msgstr "Эта бисерная занавеска сдвинута в сторону."
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
+msgid "clickity clack… clack… clack!"
 msgstr "клак-клак… клак… клак!"
 
 #: lang/json/furniture_from_json.py
@@ -107137,8 +110826,7 @@ msgstr "кучка мусора"
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
 msgstr ""
 "Мусор вперемешку с грязью и травой, гадко пахнет, но кому мусор, а кому…"
 
@@ -107728,6 +111416,15 @@ msgstr ""
 "Простой магический круг, вырезанный в земле и украшенный кровью, свечами и "
 "всякими побрякушками."
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr "большой светящийся валун"
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr "Что-то здесь не так."
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr "краш!"
@@ -107757,7 +111454,7 @@ msgstr "Ворота открыты!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
+msgid "You turn the handle…"
 msgstr "Вы поворачиваете ручку…"
 
 #. ~ 'close' action message of some gate object.
@@ -107777,7 +111474,7 @@ msgstr "Ворота амбара открыты!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
+msgid "You pull the rope…"
 msgstr "Вы тянете за верёвку…"
 
 #. ~ 'close' action message of some gate object.
@@ -107812,7 +111509,7 @@ msgstr "Дверь распахивается!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
+msgid "You throw the lever…"
 msgstr "Вы сдвигаете рычаг…"
 
 #. ~ 'close' action message of some gate object.
@@ -108018,7 +111715,7 @@ msgstr[3] "примитивный лук"
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr ""
 "Лук из цельного куска дерева, используется только тем, кто его и сделал. "
 "Слабый и дико неточный, не так хорош, к сожалению…"
@@ -108267,9 +111964,7 @@ msgstr ""
 "размаха плеч. Сгодится для охоты на мелкую дичь. Болты, выпущенные из него, "
 "имеют хороший шанс уцелеть, и их можно будет повторно использовать"
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "пистолет"
@@ -108485,10 +112180,10 @@ msgstr ""
 #: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgid "sling"
 msgid_plural "slings"
-msgstr[0] "праща"
-msgstr[1] "пращи"
-msgstr[2] "пращей"
-msgstr[3] "праща"
+msgstr[0] "ремень"
+msgstr[1] "ремня"
+msgstr[2] "ремней"
+msgstr[3] "ремень"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -108502,6 +112197,22 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "метательное"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] "посох с пращой"
+msgstr[1] "посоха с пращой"
+msgstr[2] "посохов с пращой"
+msgstr[3] "посохи с пращой"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr ""
+"Кожаная праща, прикрепленная к посоху, проста в использовании и достаточно "
+"точна. Камни в качестве боеприпасов."
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -108607,6 +112318,10 @@ msgstr ""
 "исследовательского центра DARPA. Нагревает водород до появления плазмы. "
 "Мощное, но не очень дальнобойное оружие. Работает от УБП."
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "полуавтомат"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -108618,10 +112333,10 @@ msgstr[3] "ППУ-5"
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 "Портативный Плазменный Ускоритель Модель Пять, разработанный корпорацией "
 "Локхид Мартин. При помощи батарей высокотехнологичных конденсаторов это "
@@ -108648,8 +112363,7 @@ msgstr ""
 " — под патроны для дробовика. Оно сделано из труб и частей двухствольного "
 "дробовика."
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "дробовик"
@@ -108871,6 +112585,10 @@ msgstr ""
 "Водяная пушка с пожарной машины. Установив на машине, её можно использовать "
 "для остановки пожаров или «протестующих»."
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr "очередь"
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -108926,10 +112644,10 @@ msgstr[3] "револьвер"
 #: lang/json/gun_from_json.py
 msgid "cap & ball revolver"
 msgid_plural "cap & ball revolvers"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "капсюльный револьвер"
+msgstr[1] "капсюльных револьвера"
+msgstr[2] "капсюльных револьверов"
+msgstr[3] "капсюльные револьверы"
 
 #: lang/json/gun_from_json.py
 msgid "base rifle"
@@ -109005,6 +112723,9 @@ msgid ""
 "railgun magnetically propels a ferromagnetic projectile using an alternating"
 " current.  Powered by UPS."
 msgstr ""
+"Рельсовое орудие, разработанное в первой четверти XXI века концерном Heckler"
+" & Koch. Разгоняет ферромагнитный снаряд переменным электромагнитным полем. "
+"Работает от УБП."
 
 #: lang/json/gun_from_json.py
 msgid "RM120c shotgun"
@@ -109245,8 +112966,8 @@ msgstr[3] "Walther P22"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 "Walther P22 - полуавтоматический пистолет со свободным затвором. Примерно "
@@ -109369,10 +113090,6 @@ msgstr ""
 "нецелесообразно и отменяет гарантию. На нём нет места для подсоединения "
 "запчастей, не предназначенных специально для этого прототипа."
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "полуавтомат"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -109551,14 +113268,14 @@ msgid ""
 "militaries across the world for over 50 years.  It is a gas operated, "
 "rotating bolt rifle known for its accuracy and controllable recoil."
 msgstr ""
-"М16 - широко распространённая штурмовая винтовка, произошедшая от AR-15. Ею "
+"М16 — широко распространённая штурмовая винтовка, произошедшая от AR-15. Ею "
 "пользовались военные по всему миру более 50 лет. Это винтовка с отводом "
 "пороховых газов и поворотным затвором, знаменитая своей точностью и "
 "подавлением отдачи."
 
 #: lang/json/gun_from_json.py
 msgid "3rd burst"
-msgstr ""
+msgstr "тройной выстрел"
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .223"
@@ -109895,9 +113612,8 @@ msgid ""
 "the civilian version chambered for .300 AAC Blackout."
 msgstr ""
 "Также его называют Микро-Тавор или MTAR. Израильская штурмовая винтовка по "
-"схеме булл-пап, разработанная и изготовленная компанией \"Израильская "
-"Военная Промышленность\". Это гражданская модель под патрон .300 AAC "
-"Blackout."
+"схеме булл-пап, разработанная и изготовленная компанией «Израильская Военная"
+" Промышленность». Это гражданская модель под патрон .300 AAC Blackout."
 
 #: lang/json/gun_from_json.py
 msgid "FN FAL"
@@ -110092,15 +113808,15 @@ msgstr[3] "M24"
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
 "Снайперская винтовка M24 представляет собой военную/полицейскую версию "
 "винтовки Remington Model 700. Была принята на вооружение ВС США как "
 "стандартная снайперская винтовка в 1988 году. M24 считается «оружейной "
 "системой», потому как она включает в себя не только винтовку, но и съёмный "
-"телескопический прицел и другие аксессуары."
+"оптический прицел и другие аксессуары."
 
 #: lang/json/gun_from_json.py
 msgid "HK417 A2"
@@ -110218,6 +113934,9 @@ msgid ""
 "concealment and backup usage.  Despite its extreme light weight and small "
 "size, its .32 ACP chambering makes for good handling and recoil control."
 msgstr ""
+"Старая разработка Kel-tec. Р32 — популярный вариант для запасного оружия "
+"скрытого ношения. Несмотря на очень лёгкий вес и небольшой размер, благодаря"
+" патрону .32 ACP у него хорошая управляемость и низкая отдача."
 
 #: lang/json/gun_from_json.py
 msgid "SIG P226"
@@ -110304,21 +114023,22 @@ msgstr ""
 "развалится."
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
-msgstr[0] "COP .38"
-msgstr[1] "COP .38"
-msgstr[2] "COP .38"
-msgstr[3] "COP .38"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
+msgstr[0] "COP .357 дерринжер"
+msgstr[1] "COP .357 дерринжера"
+msgstr[2] "COP .357 дерринжеров"
+msgstr[3] "COP .357 дерринжеры"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
 msgstr ""
-"COP .38 — небольшой округлый крупнокалиберный пистолет, немного напоминающий"
-" Mossberg Brownie. Имеет четыре квадратно-ориентированных ствола."
+"Небольшой пухленький крупнокалиберный пистолетик-дерринжер, немного "
+"напоминающий Mossberg Brownie. Использует вращающийся боёк для стрельбы из "
+"всех своих четырёх стволов, расположенных квадратом."
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -110361,23 +114081,6 @@ msgstr ""
 "Семизарядный револьвер .38-го калибра производства Смит и Вессон. Оснащён "
 "фиксированными прицельными приспособлениями и усиленной рамкой."
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] "Taurus Pro .38"
-msgstr[1] "Taurus Pro .38"
-msgstr[2] "Taurus Pro .38"
-msgstr[3] "Taurus Pro .38"
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr ""
-"Популярный пистолет 38-го калибра. Сконструирован согласно высоким "
-"стандартам безопасности, изготавливался из прочных и высококачественных "
-"материалов."
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -110473,13 +114176,29 @@ msgstr[3] "Hi-Point CF-380"
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
-"Hi-Point CF-380 - полуавтоматический пистолет со свободным затвором от "
-"компании \"Hi-Point Firearms\", знаменитой своим дешёвым и неудобным "
-"оружием. Затвор сделан из копеечного цинкового сплава, довольно хрупкого по "
-"сравнению со стальным."
+"Hi-Point CF-380 — полуавтоматический пистолет со свободным затвором от "
+"компании «Hi-Point Firearms», знаменитой своим дешёвым и неудобным оружием. "
+"Затвор сделан из копеечного цинкового сплава, довольно хрупкого по сравнению"
+" со стальным."
+
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] "Taurus Spectrum"
+msgstr[1] "Taurus Spectrum"
+msgstr[2] "Taurus Spectrum"
+msgstr[3] "Taurus Spectrum"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr ""
+"Очень компактный пистолет .380 калибра. Предназначен для скрытого ношения и "
+"выполнен из прочных высококачественных материалов."
 
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
@@ -110606,14 +114325,14 @@ msgstr[3] "Browning Hi-Power .40 S&W"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 "Полуавтоматический пистолет, разработанный незадолго до Второй Мировой "
 "Войны. С тех пор был довольно популярен и всё ещё встречается в Индии, "
 "Канаде и Австралии. Это коммерческий вариант калибра .40 S&W производства "
-"\"Browning Arms\"."
+"«Browning Arms»."
 
 #: lang/json/gun_from_json.py
 msgid "Walther PPQ .40 S&W"
@@ -110644,13 +114363,14 @@ msgstr[3] "Hi-Point Model JCP"
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
-"Hi-Point Model JCP - полуавтоматический пистолет со свободным затвором от "
-"компании \"Hi-Point Firearms\", знаменитой своим дешёвым и неудобным "
-"оружием. Затвор сделан из копеечного цинкового сплава, довольно хрупкого по "
-"сравнению со стальным."
+"Hi-Point Model JCP — полуавтоматический пистолет со свободным затвором от "
+"компании «Hi-Point Firearms», знаменитой своим дешёвым и неудобным оружием. "
+"Затвор сделан из копеечного цинкового сплава, довольно хрупкого по сравнению"
+" со стальным."
 
 #: lang/json/gun_from_json.py
 msgid "tube 40mm launcher"
@@ -110914,6 +114634,12 @@ msgid ""
 " is offered in more prevalent .44 caliber.  Despite modern quality "
 "materials, the design is still rather delicate."
 msgstr ""
+"Репродукция редкого и необычного револьвера Ле Ма .44 калибра эпохи "
+"гражданской войны от компании Pietta. В своё время его оригинальный "
+"нестандартный .42 или .35 калибр ограничивал полезность для армии "
+"конфедерации, но эта копия изготовлена в более распространенном .44 калибре."
+" Несмотря на современные качественные материалы, дизайн все же довольно "
+"выверенный."
 
 #: lang/json/gun_from_json.py
 msgid "TDI Vector"
@@ -111107,9 +114833,9 @@ msgid ""
 "walking tank with this in their holster."
 msgstr ""
 "Большущий пистолет, разработанный в качестве основного оружия для особо "
-"отобранных спецназовцев. Про него в шутку говорят \"Единственный пистолет в "
-"мире, которому нужен орудийный расчёт\". Из-за громоздкости, элементов серии"
-" HK USP и сложности доставки патронов .45 ACP в область проведения операций "
+"отобранных спецназовцев. Про него в шутку говорят «Единственный пистолет в "
+"мире, которому нужен орудийный расчёт». Из-за громоздкости, элементов серии "
+"HK USP и сложности доставки патронов .45 ACP в область проведения операций "
 "этот чудовищный пистолет был обречён остаться на вооружении Командования "
 "Специальных Операций США. Подобно USP, у Mk 23 выдающаяся надёжность. "
 "Возможно, обладатель такого пистолета способен в одиночку уничтожить ходячий"
@@ -111144,13 +114870,14 @@ msgstr[3] "Hi-Point Model JHP"
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
-"Hi-Point Model JHP - полуавтоматический пистолет со свободным затвором от "
-"компании \"Hi-Point Firearms\", знаменитой своим дешёвым и неудобным "
-"оружием. Затвор сделан из копеечного цинкового сплава, довольно хрупкого по "
-"сравнению со стальным."
+"Hi-Point Model JHP — полуавтоматический пистолет со свободным затвором от "
+"компании «Hi-Point Firearms», знаменитой своим дешёвым и неудобным оружием. "
+"Затвор сделан из копеечного цинкового сплава, довольно хрупкого по сравнению"
+" со стальным."
 
 #: lang/json/gun_from_json.py
 msgid "Taurus Raging Bull"
@@ -111241,6 +114968,13 @@ msgid ""
 "collectors.  Unlike modern revolvers, the cylinder cannot swing out for "
 "loading, and spent brass must be ejected one at a time."
 msgstr ""
+"Этот 7,5-дюймовый Uberti Cattleman представляет собой современную "
+"репродукцию легендарного армейского Colt Single Action Army или Colt "
+"Peacemaker, одного из первых револьверов, использующих современный унитарный"
+" патрон. Созданный вестернами, он по-прежнему востребован для ковбойской "
+"стрельбы, реконструкторов и коллекторов. В отличие от современных "
+"револьверов, барабан не может откидываться для загрузки, и отработанные "
+"гильзы должны выбрасываться по одной за раз."
 
 #: lang/json/gun_from_json.py
 msgid "H&K MP7A2"
@@ -111435,7 +115169,7 @@ msgid ""
 "accuracy for long range target and high fire rate, this weapon is still "
 "being used by Greek national guard."
 msgstr ""
-"Крупнокалиберная винтовка производства \"Accuracy International\", очень "
+"Крупнокалиберная винтовка производства «Accuracy International», очень "
 "точная, дальнобойная и скорострельная. Она стояла на вооружении греческой "
 "национальной гвардии."
 
@@ -111456,12 +115190,12 @@ msgid ""
 "extreme distances.  It notably holds the longest range confirmed sniper "
 "kill, as well as the 4th and 5th longest."
 msgstr ""
-"Дальнобойная крупнокалиберная снайперская винтовка производства \"McMillan "
-"Firearms\", состоящая на службе канадской армии с 2000 года как С15 и "
-"Морских котиков как Mk 15 Mod 0. Эта винтовка .50 калибра со скользящим "
-"затвором способна уничтожать лёгкую технику, радарные установки и "
-"стационарные орудия на огромном расстоянии. Знаменита рекордом дальности "
-"подтверждённого убийства, равно как 4-го и 5-го по дальности."
+"Дальнобойная крупнокалиберная снайперская винтовка производства «McMillan "
+"Firearms», состоящая на службе канадской армии с 2000 года как С15 и Морских"
+" котиков как Mk 15 Mod 0. Эта винтовка .50 калибра со скользящим затвором "
+"способна уничтожать лёгкую технику, радарные установки и стационарные орудия"
+" на огромном расстоянии. Знаменита рекордом дальности подтверждённого "
+"убийства, равно как 4-го и 5-го по дальности."
 
 #: lang/json/gun_from_json.py
 msgid "Serbu BFG-50"
@@ -111476,8 +115210,8 @@ msgid ""
 "A single-shot, bolt-action rifle made by Serbu Firearms, the BFG-50 is a "
 "very affordable firearm for those wishing to shoot .50 BMG."
 msgstr ""
-"Однозарядная винтовка со скользящим затвором производства \"Serbu "
-"Firearms\", доступная всем желающим пострелять патроном .50 BMG."
+"Однозарядная винтовка со скользящим затвором производства «Serbu Firearms», "
+"доступная всем желающим пострелять патроном .50 BMG."
 
 #: lang/json/gun_from_json.py
 msgid "Big Horn Model 89"
@@ -111651,7 +115385,7 @@ msgid ""
 msgstr ""
 "Американская ракетница, разработанная в 1970-х на замену огнемётам Второй "
 "Мировой Войны, всё ещё использовавшихся во Вьетнаме. У неё четыре ствола "
-"калибра 66 мм - такого же, как у M72 LAW."
+"калибра 66 мм — такого же, как у M72 LAW."
 
 #: lang/json/gun_from_json.py
 msgid "all barrels"
@@ -112162,9 +115896,9 @@ msgid ""
 "offers convenient mounting for aftermarket optics, but precludes the use of "
 "claw mounts."
 msgstr ""
-"PTR 603 - полуавтоматическая копия знаменитой серии МР5, производимая для "
-"рынка США компанией \"PTR Индастриз\" на оригинальном оборудовании \"Хеклер "
-"и Кох\". Как и у МР5, инерционный затвор обеспечивает плавный выстрел и "
+"PTR 603 — полуавтоматическая копия знаменитой серии МР5, производимая для "
+"рынка США компанией «PTR Индастриз» на оригинальном оборудовании «Хеклер и "
+"Кох». Как и у МР5, инерционный затвор обеспечивает плавный выстрел и "
 "точность, что выделяет оружие среди других пистолетов-пулемётов и карабинов "
 "под пистолетный патрон. Эта модель оформлена как пистолет во избежание "
 "недоразумений и дорогостоящих ограничений NFA. Приваренная планка M1913 "
@@ -112424,10 +116158,10 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Glock 18C"
 msgid_plural "Glock 18Cs"
-msgstr[0] "Glock 18C"
-msgstr[1] "Glock 18C"
-msgstr[2] "Glock 18C"
-msgstr[3] "Glock 18C"
+msgstr[0] "Глок 18C"
+msgstr[1] "Глока 18C"
+msgstr[2] "Глоков 18C"
+msgstr[3] "Глоки 18C"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -112486,14 +116220,14 @@ msgstr[3] "Browning Hi-Power 9x19 мм"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 "Полуавтоматический пистолет, разработанный незадолго до Второй Мировой "
 "Войны. С тех пор был довольно популярен и всё ещё встречается в Индии, "
 "Канаде и Австралии. Это коммерческий вариант калибра 9х19 мм Парабеллум "
-"производства \"Browning Arms\"."
+"производства «Browning Arms»."
 
 #: lang/json/gun_from_json.py
 msgid "Walther P38"
@@ -112506,8 +116240,8 @@ msgstr[3] "Walther P38"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -112531,7 +116265,7 @@ msgstr[3] "Walther PPQ 9 мм"
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr ""
 "Полуавтоматический пистолет, разработанный на основе Walther P99QA и "
 "совместимый с его аксессуарами. Эта модель предназначена под патрон 9х19 мм "
@@ -112549,12 +116283,12 @@ msgstr[3] "Hi-Point C-9"
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
-"Hi-Point C-9 - полуавтоматический пистолет со свободным затвором от компании"
-" \"Hi-Point Firearms\", знаменитой своим дешёвым и неудобным оружием. Затвор"
-" сделан из копеечного цинкового сплава, довольно хрупкого по сравнению со "
+"Hi-Point C-9 — полуавтоматический пистолет со свободным затвором от компании"
+" «Hi-Point Firearms», знаменитой своим дешёвым и неудобным оружием. Затвор "
+"сделан из копеечного цинкового сплава, довольно хрупкого по сравнению со "
 "стальным."
 
 #: lang/json/gun_from_json.py
@@ -112568,17 +116302,17 @@ msgstr[3] "CZ-75"
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
-"Чехословацкий полуавтоматический пистолет, один из первых \"вандер-найнов\"."
-" Хотя его предполагалось продавать западным странам, пистолет объявили "
+"Чехословацкий полуавтоматический пистолет, один из первых «вандер-найнов». "
+"Хотя его предполагалось продавать западным странам, пистолет объявили "
 "государственной тайной. Ввиду отсутствия международного патента по всему "
 "миру появились копии и варианты, и только в 90-х его начала производить "
-"чешская компания \"Česká zbrojovka\". Этот пистолет широко популярен на "
+"чешская компания «Česká zbrojovka». Этот пистолет широко популярен на "
 "соревнованиях стрелков."
 
 #: lang/json/gun_from_json.py
@@ -112592,10 +116326,10 @@ msgstr[3] "Walther CCP"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 "Полуавтоматический пистолет со свободным затвором, предназначенный для "
 "скрытого ношения. Внутри он почти идентичен классическому H&K P7. Благодаря "
@@ -113238,7 +116972,7 @@ msgid ""
 "rotating-barrel active-cooled rapid-fire laser system, can spray death "
 "downrange with ease."
 msgstr ""
-"Встроенное оружие экзоскелета БМКЭ - лазерная пушка с вращающимися стволами "
+"Встроенное оружие экзоскелета БМКЭ — лазерная пушка с вращающимися стволами "
 "и активным охлаждением. Сеет смерть на раз-два."
 
 #: lang/json/gun_from_json.py
@@ -113254,7 +116988,7 @@ msgid ""
 "This is the integral weapon system for the RMES exoskeleton mech-suit, a "
 "quiet and accurate marksman laser rifle."
 msgstr ""
-"Встроенное оружие экзоскелета РМКЭ - бесшумное и точное снайперское лазерное"
+"Встроенное оружие экзоскелета РМКЭ — бесшумное и точное снайперское лазерное"
 " ружьё."
 
 #: lang/json/gun_from_json.py
@@ -113474,10 +117208,6 @@ msgstr ""
 " примотать три лазерных пистолета на ручную дрель. Это оружие относительно "
 "легковесное для своего энергопотребления и причиняемых разрушений."
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr "очередь"
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -113779,10 +117509,10 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Modified CW-24"
 msgid_plural "Modified CW-24"
-msgstr[0] "Модифицированная CW-24"
-msgstr[1] "Модифицированные CW-24"
-msgstr[2] "Модифицированных CW-24"
-msgstr[3] "Модифицированная CW-24"
+msgstr[0] "Модифицированая CW-24"
+msgstr[1] "Модифицированые CW-24"
+msgstr[2] "Модифицированых CW-24"
+msgstr[3] "Модифицированые CW-24"
 
 #: lang/json/gun_from_json.py
 msgid ""
@@ -113797,10 +117527,10 @@ msgstr ""
 #: lang/json/gun_from_json.py
 msgid "Modified CW-24M"
 msgid_plural "Modified CW-24M"
-msgstr[0] "Модифицированная CW-24M"
-msgstr[1] "Модифицированные CW-24M"
-msgstr[2] "Модифицированных CW-24M"
-msgstr[3] "Модифицированная CW-24M"
+msgstr[0] "Модифицированая CW-24M"
+msgstr[1] "Модифицированые CW-24M"
+msgstr[2] "Модифицированых CW-24M"
+msgstr[3] "Модифицированые CW-24M"
 
 #: lang/json/gun_from_json.py
 msgid "CWD-63"
@@ -114613,12 +118343,81 @@ msgstr[3] "друидские составные луки"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
 msgstr ""
 "Лук, сделанный из нескольких слоёв разных материалов для повышенной "
 "эффективности. На кончиках выгравированы две друидские руны."
 
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+"Магически зачарованный Phillips & Rodgers M47 Medusa, многокалиберный "
+"револьвер, предназначенного для выживших. В то время как Техномантия "
+"повышает надежность, с меньшими патронами она не так точна, как револьверы "
+"специализированного калибра из-за свободного ствола."
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] "ганблейд"
+msgstr[1] "ганблейда"
+msgstr[2] "ганблейдов"
+msgstr[3] "ганблейды"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr ""
+"Похожий на широкий меч фалькату, этот изогнутый клинок имеет прикрепленный к"
+" обуху короткоствольный помповый дробовик. Предназначен для нанесения как "
+"первого так и добивающих ударов."
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] "силовой цестус"
+msgstr[1] "силовых цестуса"
+msgstr[2] "силовых цестусов"
+msgstr[3] "силовые цестусы"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr ""
+"Металлический цестус с прикреплённым обрезом. Отсутствие ложи для поглощения"
+" отдачи означает, что для стрельбы требуется некоторая сила."
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] "Ихайваль"
+msgstr[1] "Ихайваля"
+msgstr[2] "Ихайвалей"
+msgstr[3] "Ихайвали"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -114771,14 +118570,6 @@ msgstr ""
 "легче натягивать тетиву. Болты, выпущенные из этого оружия, имеют хороший "
 "шанс уцелеть для повторного использования."
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] "Ихайваль"
-msgstr[1] "Ихайваля"
-msgstr[2] "Ихайвалей"
-msgstr[3] "Ихайвали"
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -116154,7 +119945,7 @@ msgstr ""
 msgid "accessories"
 msgstr "аксессуары"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "лук"
@@ -116303,7 +120094,7 @@ msgstr[3] "УБП-тест"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
+"it's a bug.  50x more UPS drain."
 msgstr ""
 "Тест-мод для расходования зарядов УБП на модификации. Он никогда не должен "
 "появляться, если вы видите это, то это сбой. Расход х50 зарядов УБП."
@@ -116496,8 +120287,8 @@ msgstr[3] "фокусирующие линзы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
 msgstr ""
 "Оптический блок для концентрации лазерного луча на меньшей фокусной точке. "
 "Увеличивает дальность и урон, но усложняет прицеливание."
@@ -116531,7 +120322,7 @@ msgstr[3] "эффективные эмиттеры"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
+"energy efficiency.  Decreases power consumption."
 msgstr ""
 "Электронная система для оптимизации рабочего цикла эмиттера и увеличения "
 "общей эффективности расхода энергии. Уменьшает потребление энергии."
@@ -116550,8 +120341,8 @@ msgstr[3] "конденсатор высокой плотности"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
 msgstr ""
 "Конденсатор с высокой плотностью энергии, увеличивает дальность выстрела и "
 "урон ценой значительно возросшего энергопотребления."
@@ -116805,7 +120596,7 @@ msgid_plural "ported barrels"
 msgstr[0] "компенсатор"
 msgstr[1] "компенсатора"
 msgstr[2] "компенсаторов"
-msgstr[3] "компенсатора"
+msgstr[3] "компенсаторы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -116826,16 +120617,35 @@ msgid_plural "muzzle brakes"
 msgstr[0] "дульный тормоз"
 msgstr[1] "дульных тормоза"
 msgstr[2] "дульных тормозов"
-msgstr[3] "дульных тормоза"
+msgstr[3] "дульные тормозы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
 "improving recoil but increasing bulk, noise, and reducing accuracy slightly."
 msgstr ""
-"Дульный тормоз перенаправляет выхлопные газы, чтобы компенсировать дульный "
-"подъём, улучшает отдачу, но увеличивает массу, шум и немного снижает "
-"точность."
+"Дульный тормоз перенаправляет пороховые газы так, чтобы компенсировать "
+"отдачу, но увеличивает массу, шум и немного снижает точность."
+
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] "модифицированый дульный тормоз"
+msgstr[1] "модифицированых дульных тормоза"
+msgstr[2] "модифицированых дульных тормозов"
+msgstr[3] "модифицированые дульные тормозы"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+"Дульный тормоз перенаправляет пороховые газы так, чтобы компенсировать "
+"отдачу, но увеличивает массу, шум и немного снижает точность. Модифицирован "
+"и настроен для установки практически на любое огнестрельное оружие по "
+"желанию, кроме гранатомётов."
 
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
@@ -116843,7 +120653,7 @@ msgid_plural "homemade suppressors"
 msgstr[0] "самодельный глушитель"
 msgstr[1] "самодельных глушителя"
 msgstr[2] "самодельных глушителей"
-msgstr[3] "самодельных глушителя"
+msgstr[3] "самодельные глушители"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -116869,8 +120679,8 @@ msgstr ""
 msgid "'solvent trap' suppressor"
 msgid_plural "'solvent trap' suppressors"
 msgstr[0] "глушитель из фильтра"
-msgstr[1] "глушителя из фильтра"
-msgstr[2] "глушителей из фильтра"
+msgstr[1] "глушителя из фильтров"
+msgstr[2] "глушителей из фильтров"
 msgstr[3] "глушители из фильтра"
 
 #: lang/json/gunmod_from_json.py
@@ -116887,7 +120697,7 @@ msgstr ""
 "как нелегальный незарегистрированный глушитель. Хорошо, что поблизости нет "
 "агентов АТФ, чтоб арестовать вас. Хотя в целом и напоминает настоящий "
 "глушитель, он не рассчитан на высокое давление и постепенно испортится. Этот"
-" фильтр громоздок и при установке будет сильно мешать прицеливанию из "
+" глушитель громоздок и при установке будет сильно мешать прицеливанию из "
 "базовых прицельных приспособлений оружия."
 
 #: lang/json/gunmod_from_json.py
@@ -116922,7 +120732,7 @@ msgid_plural "RK6S34 suppressors"
 msgstr[0] "глушитель RK6S34"
 msgstr[1] "глушителя RK6S34"
 msgstr[2] "глушителей RK6S34"
-msgstr[3] "глушитель RK6S34"
+msgstr[3] "глушители RK6S34"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -116940,7 +120750,7 @@ msgid_plural "shotgun suppressors"
 msgstr[0] "глушитель дробовика"
 msgstr[1] "глушителя дробовика"
 msgstr[2] "глушителей дробовика"
-msgstr[3] "глушитель дробовика"
+msgstr[3] "глушители дробовика"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -116956,7 +120766,7 @@ msgid_plural "suppressors"
 msgstr[0] "глушитель"
 msgstr[1] "глушителя"
 msgstr[2] "глушителей"
-msgstr[3] "глушителя"
+msgstr[3] "глушители"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -116996,7 +120806,7 @@ msgid_plural "compact suppressors"
 msgstr[0] "компактный глушитель"
 msgstr[1] "компактных глушителя"
 msgstr[2] "компактных глушителей"
-msgstr[3] "компактных глушителя"
+msgstr[3] "компактные глушители"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117012,7 +120822,7 @@ msgid_plural "rail-mounted crossbows"
 msgstr[0] "арбалет на планку"
 msgstr[1] "арбалета на планку"
 msgstr[2] "арбалетов на планку"
-msgstr[3] "арбалета на планку"
+msgstr[3] "арбалеты на планку"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117026,13 +120836,33 @@ msgstr ""
 msgid "rail"
 msgstr "планка"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] "модифицированый арбалет на планку"
+msgstr[1] "модифицированых арбалета на планку"
+msgstr[2] "модифицированых арбалетов на планку"
+msgstr[3] "модифицированые арбалеты на планку"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+"Набор для крепления на длинноствольное оружие пары арбалетных плечей и "
+"направляющей. Требует арбалетных болтов для стрельбы. Модифицирован для "
+"установки практически на любое оружие по желанию, кроме пистолетов и "
+"пистолет-пулемётов."
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
-msgstr[0] "смещённый прицел"
-msgstr[1] "смещённых прицела"
-msgstr[2] "смещённых прицелов"
-msgstr[3] "смещённый прицел"
+msgstr[0] "смещённый открытый прицел"
+msgstr[1] "смещённых открытых прицела"
+msgstr[2] "смещённых открытых прицелов"
+msgstr[3] "смещённые открытые прицелы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117042,13 +120872,31 @@ msgstr ""
 "Дополнительный прицел, смещённый на 45°. Используется, когда оптический "
 "прицел или другая модификация ограничивают использование основного прицела."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] "модифицированый смещённый открытый прицел"
+msgstr[1] "модифицированых смещённых открытых прицела"
+msgstr[2] "модифицированых смещённых открытых прицелов"
+msgstr[3] "модифицированые смещённые открытые прицелы"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+"Дополнительный прицел, смещённый на 45°. Используется, когда оптический "
+"прицел или другая модификация ограничивают использование основного прицела. "
+"Модифицирован для установки практически на любое оружие, по желанию."
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
-msgstr[0] "планка для смещённого прицела"
-msgstr[1] "планки для смещённого прицела"
-msgstr[2] "планок для смещённого прицела"
-msgstr[3] "планка для смещённого прицела"
+msgstr[0] "смещённая планка"
+msgstr[1] "смещённые планки"
+msgstr[2] "смещённых планок"
+msgstr[3] "смещённые планки"
 
 #: lang/json/gunmod_from_json.py
 msgid "An additional rail set at 45° for attaching a secondary optic."
@@ -117056,13 +120904,30 @@ msgstr ""
 "Дополнительная планка, установленная под углом в 45°, для установки "
 "вспомогательных прицелов."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] "модифицированая смещённая планка"
+msgstr[1] "модифицированые смещённые планки"
+msgstr[2] "модифицированых смещённых планок"
+msgstr[3] "модифицированые смещённые планки"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+"Дополнительная планка, установленная под углом в 45°, для установки "
+"вспомогательных прицелов. Модифицирована для установки на любое оружие, по "
+"желанию."
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
-msgstr[0] "целеуказатель на RIS планку"
-msgstr[1] "целеуказателя на RIS планку"
-msgstr[2] "целеуказателей на RIS планку"
-msgstr[3] "целеуказателя на RIS планку"
+msgstr[0] "лазерный целеуказатель на планку"
+msgstr[1] "лазерных целеуказателя на планку"
+msgstr[2] "лазерных целеуказателей на планку"
+msgstr[3] "лазерные целеуказатели на планку"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117080,7 +120945,7 @@ msgid_plural "gyroscopic stabilizers"
 msgstr[0] "гироскопический стабилизатор"
 msgstr[1] "гироскопических стабилизатора"
 msgstr[2] "гироскопических стабилизаторов"
-msgstr[3] "гироскопических стабилизатора"
+msgstr[3] "гироскопические стабилизаторы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117088,9 +120953,29 @@ msgid ""
 "vibration, greatly reducing recoil and slightly increasing accuracy."
 msgstr ""
 "Продвинутый блок, который фиксируется на боку вашего огнестрельного оружия и"
-" уменьшает вибрацию, значительно уменьшая отдачу и немного увеличивая "
+" уменьшает вибрацию, также значительно уменьшая отдачу и немного увеличивая "
 "точность."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] "модифицированый гироскопический стабилизатор"
+msgstr[1] "модифицированых гироскопических стабилизатора"
+msgstr[2] "модифицированых гироскопических стабилизаторов"
+msgstr[3] "модифицированые гироскопические стабилизаторы"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+"Продвинутый блок, который фиксируется на боку вашего огнестрельного оружия и"
+" уменьшает вибрацию, также значительно уменьшая отдачу и немного увеличивая "
+"точность. Модифицирован для установки практически на любое оружие по "
+"желанию, кроме пистолетов."
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -117106,10 +120991,10 @@ msgstr "Продвинутый встроенный гироскопически
 #: lang/json/gunmod_from_json.py
 msgid "five pin bow sight"
 msgid_plural "five pin bow sights"
-msgstr[0] "пятиточечный прицел для лука"
-msgstr[1] "пятиточечных прицела для лука"
-msgstr[2] "пятиточечных прицелов для лука"
-msgstr[3] "пятиточечный прицел для лука"
+msgstr[0] "пятипиновый прицел для лука"
+msgstr[1] "пятипиновых прицела для лука"
+msgstr[2] "пятипиновых прицелов для лука"
+msgstr[3] "пятипиновые прицелы для лука"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117147,7 +121032,7 @@ msgid_plural "bow scopes"
 msgstr[0] "оптический прицел для лука"
 msgstr[1] "оптических прицела для лука"
 msgstr[2] "оптических прицелов для лука"
-msgstr[3] "оптический прицел для лука"
+msgstr[3] "оптические прицелы для лука"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117165,7 +121050,7 @@ msgid_plural "holographic sights"
 msgstr[0] "голографический прицел"
 msgstr[1] "голографических прицела"
 msgstr[2] "голографических прицелов"
-msgstr[3] "голографических прицела"
+msgstr[3] "голографические прицелы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117178,10 +121063,10 @@ msgstr ""
 #: lang/json/gunmod_from_json.py
 msgid "iron sights"
 msgid_plural "iron sights"
-msgstr[0] "механический прицел"
-msgstr[1] "механических прицела"
-msgstr[2] "механических прицелов"
-msgstr[3] "механических прицела"
+msgstr[0] "открытый прицел"
+msgstr[1] "открытых прицела"
+msgstr[2] "открытых прицелов"
+msgstr[3] "открытые прицелы"
 
 #: lang/json/gunmod_from_json.py
 msgid "A basic set of iron sights"
@@ -117193,7 +121078,7 @@ msgid_plural "pistol scopes"
 msgstr[0] "пистолетный прицел"
 msgstr[1] "пистолетных прицела"
 msgstr[2] "пистолетных прицелов"
-msgstr[3] "пистолетных прицела"
+msgstr[3] "пистолетные прицелы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117209,7 +121094,7 @@ msgid_plural "red dot sights"
 msgstr[0] "коллиматорный прицел"
 msgstr[1] "коллиматорных прицела"
 msgstr[2] "коллиматорных прицелов"
-msgstr[3] "коллиматорных прицела"
+msgstr[3] "коллиматорные прицелы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117225,7 +121110,7 @@ msgid_plural "rifle scopes"
 msgstr[0] "оптический прицел"
 msgstr[1] "оптических прицела"
 msgstr[2] "оптических прицелов"
-msgstr[3] "оптических прицела"
+msgstr[3] "оптические прицелы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117236,13 +121121,33 @@ msgstr ""
 " 1/10 мрад. Этот прицел удивительно небольшой и лёгкий для такого "
 "увеличения."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] "модифицированый оптический прицел"
+msgstr[1] "модифицированых оптических прицела"
+msgstr[2] "модифицированых оптических прицелов"
+msgstr[3] "модифицированые оптические прицелы"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+"Винтовочный прицел 3-18x44. Поправки на ветер и подъём настраиваются с шагом"
+" 1/10 мрад. Этот прицел удивительно небольшой и лёгкий для такого "
+"увеличения. Модифицирован и настроен для установки практически на любое "
+"оружие, по желанию, кроме пистолетов и пистолет-пулемётов."
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
 msgstr[0] "прицел ACOG"
 msgstr[1] "прицела ACOG"
 msgstr[2] "прицелов ACOG"
-msgstr[3] "прицел ACOG"
+msgstr[3] "прицелы ACOG"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117251,6 +121156,24 @@ msgid ""
 msgstr ""
 "Продвинутый боевой оптический прицел 4x32 TA01 с тритиевым перекрестием."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] "модифицированый прицел ACOG"
+msgstr[1] "модифицированых прицела ACOG"
+msgstr[2] "модифицированых прицелов ACOG"
+msgstr[3] "модифицированые прицелы ACOG"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+"Оптический прицел 4x32 TA01 Advanced Combat Optical Gunsight с перекрестием "
+"с тритиевой подсветкой. Был допилен для установки практически на любое "
+"оружие, кроме пистолетов, если вы этого хотите."
+
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
 msgid_plural "RS1219 scopes"
@@ -117273,10 +121196,10 @@ msgstr ""
 #: lang/json/gunmod_from_json.py
 msgid "telescopic sight"
 msgid_plural "telescopic sights"
-msgstr[0] "телескопический прицел"
-msgstr[1] "телескопических прицела"
-msgstr[2] "телескопических прицелов"
-msgstr[3] "телескопический прицел"
+msgstr[0] "простой оптический прицел"
+msgstr[1] "простых оптических прицела"
+msgstr[2] "простых оптических прицелов"
+msgstr[3] "простые оптические прицелы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117284,22 +121207,25 @@ msgid ""
 "crosshairs.  Not as good as the ones made before the cataclysm.  Increases "
 "weight but improves accuracy."
 msgstr ""
+"Простой самодельный оптический прицел, по сути, маленькая подзорная трубочка"
+" с целиком. Не так хорош, как те, что были сделаны до катаклизма. "
+"Увеличивает вес, но повышает точность."
 
 #: lang/json/gunmod_from_json.py
 msgid "telescopic pistol sight"
 msgid_plural "telescopic pistol sights"
-msgstr[0] "телескопический пистолетный прицел"
-msgstr[1] "телескопических пистолетных прицела"
-msgstr[2] "телескопических пистолетных прицелов"
-msgstr[3] "телескопический пистолетный прицел"
+msgstr[0] "простой оптический пистолетный прицел"
+msgstr[1] "простых оптических пистолетных прицела"
+msgstr[2] "простых оптических пистолетных прицелов"
+msgstr[3] "простые оптические пистолетные прицелы"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A simple telescopic sight intended for use on a handgun.  Increases weight "
 "but improves accuracy greatly."
 msgstr ""
-"Простой телескопический прицел для использования на пистолете. Увеличивает "
-"вес, но улучшает точность."
+"Простой оптический прицел для использования на пистолете. Увеличивает вес, "
+"но улучшает точность."
 
 #: lang/json/gunmod_from_json.py
 msgid "LW red dot sight"
@@ -117307,7 +121233,7 @@ msgid_plural "LW red dot sights"
 msgstr[0] "коллиматорный прицел LW"
 msgstr[1] "коллиматорных прицела LW"
 msgstr[2] "коллиматорных прицелов LW"
-msgstr[3] "коллиматорный прицел LW"
+msgstr[3] "коллиматорные прицелы LW"
 
 #: lang/json/gunmod_from_json.py
 msgid "Built in red-dot sight for the Leadworks weapon."
@@ -117319,7 +121245,7 @@ msgid_plural "LW rifle scopes"
 msgstr[0] "оптический прицел LW"
 msgstr[1] "оптических прицела LW"
 msgstr[2] "оптических прицелов LW"
-msgstr[3] "оптический прицел LW"
+msgstr[3] "оптические прицелы LW"
 
 #: lang/json/gunmod_from_json.py
 msgid "Built in rifle scope for the Leadworks weapon."
@@ -117331,7 +121257,7 @@ msgid_plural "LW ACOG scopes"
 msgstr[0] "прицел ACOG LW"
 msgstr[1] "прицела ACOG LW"
 msgstr[2] "прицелов ACOG LW"
-msgstr[3] "прицел ACOG LW"
+msgstr[3] "прицелы ACOG LW"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117499,6 +121425,28 @@ msgstr ""
 "они могут использоваться только на определённых поверхностях и медленно "
 "разворачиваются."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] "модифицированные сошки"
+msgstr[1] "модифицированные сошки"
+msgstr[2] "модифицированных сошек"
+msgstr[3] "модифицированные сошки"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+"Сошки обычно используются на винтовках и пулемётах, чтобы улучшить контроль "
+"над отдачей. Несмотря на то, что они значительно улучшают контроль отдачи, "
+"они могут использоваться только на определённых поверхностях и медленно "
+"разворачиваются. Были допилены для установки практически на любое оружие, "
+"если вы этого хотите."
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -117547,13 +121495,31 @@ msgstr ""
 "Это передняя рукоять, улучшающая контроль над отдачей. Менее эффективна, чем"
 " сошки, но может использоваться в любой ситуации."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] "модифицированая передняя рукоять"
+msgstr[1] "модифицированых передних рукояти"
+msgstr[2] "модифицированых передних рукоятей"
+msgstr[3] "модифицированые передние рукояти"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+"Это передняя рукоять, улучшающая контроль над отдачей. Менее эффективна, чем"
+" сошки, но может использоваться в любой ситуации. Модифицирована для "
+"установки практически на любое оружие, по желанию."
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
 msgstr[0] "встроенный штык"
 msgstr[1] "встроенных штыка"
 msgstr[2] "встроенных штыков"
-msgstr[3] "встроенных штыка"
+msgstr[3] "встроенные штыки"
 
 #: lang/json/gunmod_from_json.py
 msgid "This is the bayonet integrated in the firearm."
@@ -117566,18 +121532,18 @@ msgstr "штык"
 #: lang/json/gunmod_from_json.py
 msgid "KSG second magazine"
 msgid_plural "KSG second magazines"
-msgstr[0] "KSG second магазин"
-msgstr[1] "KSG second магазина"
-msgstr[2] "KSG second магазинов"
-msgstr[3] "KSG second магазин"
+msgstr[0] "KSG двойной магазин"
+msgstr[1] "KSG двойных магазина"
+msgstr[2] "KSG двойных магазинов"
+msgstr[3] "KSG двойные магазины"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
 "The integrated second shotgun magazine of the Kel-Tec KSG which holds 7 "
 "shots.  It's irremovable."
 msgstr ""
-"Интегрированный магазин для дробовика Kel-Tec KSG на 7 патронов. Эта "
-"модификация несменяема."
+"Интегрированный двойной магазин для дробовика Kel-Tec KSG на 7 патронов. Эта"
+" модификация несменяема."
 
 #: lang/json/gunmod_from_json.py
 msgid "underbarrel laser sight"
@@ -117585,7 +121551,7 @@ msgid_plural "underbarrel laser sights"
 msgstr[0] "подствольный целеуказатель"
 msgstr[1] "подствольных целеуказателя"
 msgstr[2] "подствольных целеуказателей"
-msgstr[3] "подствольных целеуказателя"
+msgstr[3] "подствольные целеуказатели"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117616,10 +121582,10 @@ msgstr ""
 #: lang/json/gunmod_from_json.py
 msgid "M203"
 msgid_plural "M203"
-msgstr[0] "M203"
-msgstr[1] "M203"
-msgstr[2] "M203"
-msgstr[3] "M203"
+msgstr[0] "M203 подствольник"
+msgstr[1] "M203 подствольника"
+msgstr[2] "M203 подствольников"
+msgstr[3] "M203 подствольники"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117631,13 +121597,34 @@ msgstr ""
 "М-16, но сейчас может быть установлен практически на любую винтовку. "
 "Позволяет зарядить 40-мм гранату."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] "модифицированый M203 подствольник"
+msgstr[1] "модифицированых M203 подствольника"
+msgstr[2] "модифицированых M203 подствольников"
+msgstr[3] "модифицированые M203 подствольники"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+"Гранатомёт M203 был первоначально разработан для использования с винтовкой "
+"М-16, но сейчас может быть установлен практически на любую винтовку. "
+"Позволяет зарядить 40-мм гранату. Модифицирован и настроен для установки "
+"практически на любое оружие, по желанию, кроме пистолетов и пистолет-"
+"пулемётов."
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
-msgstr[0] "M320 GLM"
-msgstr[1] "M320 GLM"
-msgstr[2] "M320 GLM"
-msgstr[3] "M320 GLM"
+msgstr[0] "M320 GLM подствольник"
+msgstr[1] "M320 GLM подствольника"
+msgstr[2] "M320 GLM подствольников"
+msgstr[3] "M320 GLM подствольники"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117650,13 +121637,35 @@ msgstr ""
 " очень маленьком корпусе ценой снижения точности. Можно прикрепить к "
 "винтовке или в сочетании с прикладом использовать как отдельное оружие."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
+msgstr[0] "модифицированый M320 GLM подствольник"
+msgstr[1] "модифицированых M320 GLM подствольника"
+msgstr[2] "модифицированых M320 GLM подствольников"
+msgstr[3] "модифицированые M320 GLM подствольники"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+"M320 гранатомётный модуль предлагает функциональность больших гранатомётов в"
+" очень маленьком корпусе ценой снижения точности. Можно прикрепить к "
+"винтовке или в сочетании с прикладом использовать как отдельное оружие. "
+"Модифицирован и настроен для установки практически на любое оружие, по "
+"желанию, кроме пистолетов и дробовиков."
+
 #: lang/json/gunmod_from_json.py
 msgid "masterkey shotgun"
 msgid_plural "masterkey shotguns"
 msgstr[0] "подствольный дробовик"
 msgstr[1] "подствольных дробовика"
 msgstr[2] "подствольных дробовиков"
-msgstr[3] "подствольный дробовик"
+msgstr[3] "подствольные дробовики"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117667,21 +121676,41 @@ msgstr ""
 "Небольшой дробовик, который крепится к стволу большинства винтовок. Магазин "
 "рассчитан на четыре патрона."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] "модифицированый подствольный дробовик"
+msgstr[1] "модифицированых подствольных дробовика"
+msgstr[2] "модифицированых подствольных дробовиков"
+msgstr[3] "модифицированые подствольные дробовики"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+"Небольшой дробовик, который крепится к стволу большинства винтовок. Магазин "
+"рассчитан на четыре патрона. Модифицирован и настроен для установки "
+"практически на любое оружие, по желанию, кроме пистолетов и дробовиков."
+
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
 msgid_plural "40mm pipe launchers"
 msgstr[0] "пусковая труба 40 мм"
 msgstr[1] "пусковые трубы 40 мм"
 msgstr[2] "пусковых труб 40 мм"
-msgstr[3] "пусковая труба 40 мм"
+msgstr[3] "пусковые трубы 40 мм"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
 msgstr ""
 "Это самодельная пусковая труба, которая может быть присоединена к почти "
-"любой винтовке. Позволяет вести стрельбу 40-мм гранатами."
+"любому оружию, за исключением пистолетов. Позволяет вести стрельбу 40-мм "
+"гранатами."
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -117705,7 +121734,7 @@ msgid_plural "RM121 aux shotguns"
 msgstr[0] "подствольный дробовик RM121"
 msgstr[1] "подствольных дробовика RM121"
 msgstr[2] "подствольных дробовиков RM121"
-msgstr[3] "подствольный дробовик RM121"
+msgstr[3] "подствольные дробовики RM121"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117718,13 +121747,34 @@ msgstr ""
 "который крепится под стволом многих моделей винтовок. К нему подходят RMSA10"
 " коробчатые магазины."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] "модифицированый подствольный дробовик RM121"
+msgstr[1] "модифицированых подствольных дробовика RM121"
+msgstr[2] "модифицированых подствольных дробовиков RM121"
+msgstr[3] "модифицированые подствольные дробовики RM121"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
+"Модификация подствольной системы вооружения Ривтех RM121 — это специальный "
+"полуавтоматический магазинный дробовик, оснащённый безгильзовыми патронами, "
+"который крепится под стволом многих моделей винтовок. К нему подходят RMSA10"
+" коробчатые магазины. Модифицирован и настроен для установки практически на "
+"любое оружие, кроме пистолетов."
+
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
 msgid_plural "underslung shotguns"
 msgstr[0] "подствольный дробовик"
 msgstr[1] "подствольных дробовика"
 msgstr[2] "подствольных дробовиков"
-msgstr[3] "подствольный дробовик"
+msgstr[3] "подствольные дробовики"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117735,13 +121785,33 @@ msgstr ""
 "многих винтовок. Стреляет двумя зарядами дроби, после чего нуждается в "
 "перезарядке."
 
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] "модифицированый подствольный дробовик"
+msgstr[1] "модифицированых подствольных дробовика"
+msgstr[2] "модифицированых подствольных дробовиков"
+msgstr[3] "модифицированые подствольные дробовики"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr ""
+"Короткое ружьё с двумя стволами, которое может быть установлено под стволом "
+"многих винтовок. Стреляет двумя зарядами дроби, после чего нуждается в "
+"перезарядке.  Модифицирован и настроен для установки практически на любое "
+"оружие, кроме пистолетов."
+
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
 msgid_plural "LW underbarrel laser sights"
-msgstr[0] "подствольный целеуказатель LW"
-msgstr[1] "подствольных целеуказателя LW"
-msgstr[2] "подствольных целеуказателей LW"
-msgstr[3] "подствольный целеуказатель LW"
+msgstr[0] "подствольный лазерный целеуказатель LW"
+msgstr[1] "подствольных лазерных целеуказателя LW"
+msgstr[2] "подствольных лазерных целеуказателей LW"
+msgstr[3] "подствольные лазерные целеуказатели LW"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117757,7 +121827,7 @@ msgid_plural "LW forward grips"
 msgstr[0] "передняя рукоять LW"
 msgstr[1] "передние рукояти LW"
 msgstr[2] "передних рукоятей LW"
-msgstr[3] "передняя рукоять LW"
+msgstr[3] "передние рукояти LW"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
@@ -117771,7 +121841,7 @@ msgstr ""
 msgid "LW bipod"
 msgid_plural "LW bipods"
 msgstr[0] "сошки LW"
-msgstr[1] "сошек LW"
+msgstr[1] "сошки LW"
 msgstr[2] "сошек LW"
 msgstr[3] "сошки LW"
 
@@ -117784,7 +121854,7 @@ msgstr ""
 "Встроенные сошки от компании Лидворкс, предназначенные для улучшения "
 "контроля над отдачей. Несмотря на то, что они значительно улучшают контроль "
 "отдачи, они могут использоваться только на определённых поверхностях и "
-"медленно разворачиваются."
+"медленно раскладываются."
 
 #: lang/json/gunmod_from_json.py
 msgid "LW underslung shotgun"
@@ -118092,6 +122162,66 @@ msgstr ""
 "снаряд, увеличивая его урон, отдачу и снижая точность. Вместе с тем при "
 "стрельбе она тратит заряды УБП, а оружие больше не может работать без УБП."
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -118328,7 +122458,7 @@ msgid ""
 "visualized, but covered by the \"fog of war\"."
 msgstr ""
 "Места за пределами вашего обзора можно отобразить на экране, если вы их "
-"раньше видели и запомнили, но они будут покрыты \"туманом войны\"."
+"раньше видели и запомнили, но они будут покрыты «туманом войны»."
 
 #: lang/json/help_from_json.py
 msgid "<d|D>: Hunger, thirst, and sleep"
@@ -118350,9 +122480,9 @@ msgid ""
 msgstr ""
 "С течением времени вы начнёте ощущать голод и жажду, желудок вам об этом "
 "напомнит. Когда это случится, появится строка статуса на боковой панели. Не "
-"запутайтесь - в зависимости от вашего состояния она показывает одновременно "
+"запутайтесь — в зависимости от вашего состояния она показывает одновременно "
 "наполненность желудка и силу голода в зависимости от вашей упитанности. Ваша"
-" упитанность - это что-то отдельное от вашего текущего голода. Например, вы "
+" упитанность — это что-то отдельное от вашего текущего голода. Например, вы "
 "можете быть сытым после плотного обеда, но всё ещё истощённым. И вы будете "
 "чувствовать голод, страдая ожирением. С регулярным питанием вы можете не "
 "чувствовать голода и всё равно истощиться, если не потребляете достаточно "
@@ -118515,7 +122645,7 @@ msgid ""
 "Depressants are opposite to stimulants.  They will make you groggy and "
 "sluggish, but may help you in falling asleep."
 msgstr ""
-"Депрессанты - противоположность стимуляторов. Они вызывают сонливость и "
+"Депрессанты — противоположность стимуляторов. Они вызывают сонливость и "
 "заторможенность, но помогают уснуть."
 
 #: lang/json/help_from_json.py
@@ -118608,7 +122738,7 @@ msgid ""
 msgstr ""
 "Если у вас кровотечение, статус раненой части тела сменится на красный. "
 "Раненая часть тела получает урон, пока кровоточит. Самый простой способ "
-"остановить кровотечение - перебинтовать рану, также существуют различные "
+"остановить кровотечение — перебинтовать рану, также существуют различные "
 "специализированные медицинские предметы."
 
 #: lang/json/help_from_json.py
@@ -118945,7 +123075,7 @@ msgid ""
 "-> Fabrication is the generic artisan skill, used for a wide variety of "
 "gear."
 msgstr ""
-"-> Производство - общий ремесленный навык, нужен для очень многих вещей. "
+"-> Производство — общий ремесленный навык, нужен для очень многих вещей. "
 
 #: lang/json/help_from_json.py
 msgid ""
@@ -119043,7 +123173,7 @@ msgid ""
 "remain in place until stepped on or disarmed."
 msgstr ""
 "Для установки ловушки просто используйте её (нажмите <press_apply>) и "
-"укажите направление. Некоторые ловушки требуют инструменты для установки - "
+"укажите направление. Некоторые ловушки требуют инструменты для установки — "
 "лопату, например. Ловушка будет действовать, пока её не активируют или "
 "обезвредят."
 
@@ -119077,7 +123207,7 @@ msgid ""
 "common example of such traps."
 msgstr ""
 "Некоторые ловушки устанавливаются в меню строительства. Самый простой пример"
-" - яма-ловушка."
+" — яма-ловушка."
 
 #: lang/json/help_from_json.py
 msgid "<m|M>: Items overview"
@@ -119177,7 +123307,7 @@ msgstr ""
 "носить только один предмет каждого слоя на части тела без каких-либо штрафов"
 " скованности за слишком много носимых вещей. Любой предмет, помимо первого, "
 "на каждом слое добавит дополнительный штраф к скованности части тела. "
-"Минимальный штраф к скованности за каждый элемент одежды - 2, максимальный -"
+"Минимальный штраф к скованности за каждый элемент одежды — 2, максимальный —"
 " 10."
 
 #: lang/json/help_from_json.py
@@ -119262,7 +123392,7 @@ msgid ""
 "spawns with one such magazine in it."
 msgstr ""
 "Против орд монстров может потребоваться огнестрельное оружие. Для "
-"большинства оружия нужны совместимые магазины - это указано в описании "
+"большинства оружия нужны совместимые магазины — это указано в описании "
 "оружия. К счастью, огнестрельное оружие часто можно найти с уже вставленным "
 "магазином."
 
@@ -119279,7 +123409,7 @@ msgid ""
 msgstr ""
 "Вы можете изъять магазин из оружия, нажав <press_unload>. Вы можете зарядить"
 " этот магазин подходящими боеприпасами, если они имеются у вас в инвентаре. "
-"Для этого нажмите <press_reload> - игра автоматически вытащит магазин, "
+"Для этого нажмите <press_reload> — игра автоматически вытащит магазин, "
 "заполнит его патронами и снова зарядит в оружие. Разумеется, все эти "
 "действия требуют времени, так что постарайтесь не делать этого, если рядом "
 "будут монстры."
@@ -119447,7 +123577,7 @@ msgid ""
 "would you do in a survival situation?"
 msgstr ""
 "В большинстве случаев потребности при выживании располагаются в следующем "
-"порядке: укрытие, огонь, вода, еда. Остальное - попытки найти ответ на "
+"порядке: укрытие, огонь, вода, еда. Остальное — попытки найти ответ на "
 "вопрос, что бы вы делали, если бы вам пришлось выживать?"
 
 #: lang/json/help_from_json.py
@@ -119507,7 +123637,7 @@ msgid ""
 msgstr ""
 "Намного проще сражаться с противниками по одному. Иногда у вас получится "
 "кайтить зомби-одиночек. Пользуйтесь дверным проёмом как узким местом. Стойте"
-" за окном и бейте зомби, пока он медленно перелезает. Осторожно - если зомби"
+" за окном и бейте зомби, пока он медленно перелезает. Осторожно — если зомби"
 " много, они протолкнут друг друга внутрь. Убегайте, если у вас преимущество "
 "в скорости. Двигаясь по пересечённой местности, вы быстро оторвётесь от "
 "преследователей."
@@ -119546,8 +123676,8 @@ msgid ""
 msgstr ""
 "Забивайте инвентарь поплотнее, но не перегружайтесь; никогда не знаешь, что "
 "может пригодиться в пути. Некоторые вещи можно выгодно продать, а любой "
-"ненужный предмет выкинуть. Но отправляйтесь на вылазку с пустыми руками - "
-"случиться может всякое, так что держите при себе самые необходимые вещи."
+"ненужный предмет выкинуть. Но не отправляйтесь на вылазку с пустыми руками —"
+" случиться может всякое, так что держите при себе самые необходимые вещи."
 
 #: lang/json/help_from_json.py
 msgid ""
@@ -119568,7 +123698,7 @@ msgstr ""
 "вытереться после дождя. Если у вас возникли проблемы с сохранением тепла в "
 "течение ночи, сделайте на полу кучу из одежды и спите на ней. Подушка и "
 "одеяло для кровати всегда помогут качественно выспаться. Если ничего "
-"подобного нет, импровизируйте - даже кресло в подвале лучше мокрой земли в "
+"подобного нет, импровизируйте — даже кресло в подвале лучше мокрой земли в "
 "чистом поле. Для выживания крайне важно найти или сделать укрытие с местом "
 "для сна."
 
@@ -120284,12 +124414,12 @@ msgid ""
 " .308 (7.62) - for even more powerful rifles.  Also good long range option.\n"
 "  It should be enough in the beginning.  Or even just grab any shotgun, fill it with buckshot and give them hell!"
 msgstr ""
-"В: В игре слишком много калибров и пушек.  Я запутался - я не понимаю, что к чему подходит.\n"
+"В: В игре слишком много калибров и пушек.  Я запутался — я не понимаю, что к чему подходит.\n"
 "О: Попробуйте запомнить несколько калибров: \n"
-"9x19 (или просто 9мм) - для самых простых пистолетов (например, Глок) и пистолетов-пулемётов, они часто встречаются и полезны против обычных зомби;\n"
-" Дробь 00 - для большинства дробовиков. Наносит очень высокий урон небронированным целям на близкой дистанции;\n"
-" .223 (5.56) - для винтовок. Хороши для стрельбы на дальние дистанции.\n"
-" .308 (7.62) - для винтовок помощнее.  Тоже хороши для дальней дистанции.\n"
+"9x19 (или просто 9мм) — для самых простых пистолетов (например, Глок) и пистолетов-пулемётов, они часто встречаются и полезны против обычных зомби;\n"
+" Дробь 00 — для большинства дробовиков. Наносит очень высокий урон небронированным целям на близкой дистанции;\n"
+" .223 (5.56) — для винтовок. Хороши для стрельбы на дальние дистанции.\n"
+" .308 (7.62) — для винтовок помощнее.  Тоже хороши для дальней дистанции.\n"
 "  Для начала этого достаточно. Или просто возьмите любой дробовик, набейте его дробью и задайте всем жару!"
 
 #: lang/json/help_from_json.py
@@ -120663,8 +124793,9 @@ msgstr "Измерить радиацию"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
 msgstr "…"
 
 #: lang/json/item_action_from_json.py
@@ -121323,6 +125454,13 @@ msgstr "Этот имплант производит энергию."
 msgid "This bionic can provide power to powered armor."
 msgstr "Эта бионика может обеспечивать энергией силовую броню."
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr ""
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -122277,7 +126415,7 @@ msgstr "Осмотреться"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle thief mode"
-msgstr ""
+msgstr "Переключить режим вора"
 
 #: lang/json/keybinding_from_json.py
 msgid "Peek Around Corners"
@@ -122489,7 +126627,7 @@ msgstr "Посмотреть Карту Видимости"
 
 #: lang/json/keybinding_from_json.py
 msgid "View Lighting Map"
-msgstr ""
+msgstr "Посмотреть карту освещения"
 
 #: lang/json/keybinding_from_json.py
 msgid "View Radiation Map"
@@ -122505,7 +126643,7 @@ msgstr "Полноэкранный режим"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Minimap"
-msgstr ""
+msgstr "Переключить миникарту"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Panel Admin"
@@ -122861,6 +126999,7 @@ msgstr "Убрать пользовательский цвет"
 msgid "Load color template"
 msgstr "Загрузить цветовой шаблон"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -124211,7 +128350,7 @@ msgstr "название исчезло, но слоган остался: «М
 #. ~ Computer name
 #: lang/json/mapgen_from_json.py
 msgid "EnviroCom OS v2.03 - Basement Access"
-msgstr "ОС EnviroCom вер. 2.03 - Доступ в подвал"
+msgstr "ОС EnviroCom вер. 2.03 — Доступ в подвал"
 
 #. ~ Computer option
 #: lang/json/mapgen_from_json.py
@@ -124782,7 +128921,7 @@ msgstr ""
 "Вы ощущаете ритм своих движений. Теперь в вас не только сложнее попасть, но и ваши удары намного круче!\n"
 "\n"
 "+1 навык Уклонения.\n"
-"Активирует техники \"Круговой удар\" и \"Размашистый удар\".\n"
+"Активирует техники «Круговой удар» и «Размашистый удар».\n"
 "Длится 3 хода."
 
 #: lang/json/martial_art_from_json.py
@@ -124886,7 +129025,7 @@ msgstr ""
 "Жизнь и бой составляют круг. Атака ведёт за собой блок и ещё одну атаку. Ищите конец этого круга.\n"
 "\n"
 "+1 Точность, +2 Дробящий урон.\n"
-"Активирует \"Вихревой блок Дракона\" и \"Уклонение драконьего крыла\"\n"
+"Активирует «Вихревой блок Дракона» и «Уклонение драконьего крыла»\n"
 "Длится 1 ход."
 
 #: lang/json/martial_art_from_json.py
@@ -125190,7 +129329,7 @@ msgstr ""
 "Вы гордо крадётесь в тенях и готовитесь прыгнуть с безжалостной яростью.\n"
 "\n"
 "+2 точности.\n"
-"Активирует \"Прыжок леопарда\".\n"
+"Активирует «Прыжок леопарда».\n"
 "Длится 1 ход."
 
 #: lang/json/martial_art_from_json.py
@@ -125276,7 +129415,7 @@ msgid ""
 "\n"
 "Blocked damage decreased by 50%% of Strength."
 msgstr ""
-"В Муай Тай сила - это всё, и вы знаете, как ею пользоваться.\n"
+"В Муай Тай сила — это всё, и вы знаете, как ею пользоваться.\n"
 "\n"
 "Блокируемый урон снижается на 50%% Силы."
 
@@ -125292,7 +129431,7 @@ msgid ""
 " silent and does extra damage if on the first attack.  It also provides "
 "small combat bonuses every time you move."
 msgstr ""
-"Ниндзюцу - боевое искусство и тактические приёмы ниндзя феодальной Японии. "
+"Ниндзюцу — боевое искусство и тактические приёмы ниндзя феодальной Японии. "
 "Стиль направлен на точные тихие атаки. Стиль ниндзюцу почти бесшумен и "
 "наносит дополнительный урон при первой атаке. Также каждый раз при "
 "передвижении добавляются небольшие боевые бонусы."
@@ -125324,7 +129463,7 @@ msgid ""
 "\n"
 "+50%% all damage."
 msgstr ""
-"У настоящего синоби первый и последний удар - одно и то же.\n"
+"У настоящего синоби первый и последний удар — одно и то же.\n"
 "\n"
 "+50%% ко всему урону."
 
@@ -125424,7 +129563,7 @@ msgstr ""
 "Тёмной облачной ночью\n"
 "Как взойдёт Луна\n"
 "\n"
-"Активирует \"Рассчитанный удар\".\n"
+"Активирует «Рассчитанный удар».\n"
 "Длится 1 ход."
 
 #: lang/json/martial_art_from_json.py
@@ -125469,7 +129608,7 @@ msgid ""
 "Lasts 1 turn."
 msgstr ""
 "Вы обнаружили брешь в обороне врага.\n"
-"+10%% дробящего урона.  Активирует \"Ближний бой\".\n"
+"+10%% дробящего урона. Активирует «Ближний бой».\n"
 "Длится 1 ход."
 
 #: lang/json/martial_art_from_json.py
@@ -125572,7 +129711,7 @@ msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Sōjutsu"
-msgstr "Сёдзюцу"
+msgstr "Содзюцу"
 
 #. ~ Description for martial art 'Sōjutsu'
 #: lang/json/martial_art_from_json.py
@@ -125582,6 +129721,10 @@ msgid ""
 "to maintain advantage in combat.  Standing still gives you an extra block "
 "attempt but moving will briefly increase your damage."
 msgstr ""
+"Содзюцу, или «Путь копья» — японское боевое искусство сражения с копьём. "
+"Содзюцу делает упор на сохранении дистанции с противником для получения "
+"преимущества над ним. Стоя на месте, вы лучше защищаетесь, но движение на "
+"короткое время увеличивает ваш урон."
 
 #: lang/json/martial_art_from_json.py
 msgid "Sōjutsu Stance"
@@ -125594,10 +129737,13 @@ msgid ""
 "\n"
 "+1 Block attempt."
 msgstr ""
+"Тренировка улучшает вашу защиту при использовании древкового оружия.\n"
+"\n"
+"+1 Попытка блока."
 
 #: lang/json/martial_art_from_json.py
 msgid "Superior Positioning"
-msgstr ""
+msgstr "Превосходное позиционирование"
 
 #. ~ Description of buff 'Superior Positioning' for martial art 'Sōjutsu'
 #: lang/json/martial_art_from_json.py
@@ -125608,6 +129754,10 @@ msgid ""
 "+10%% damage, -1 Block attempts.\n"
 "Lasts 1 turn."
 msgstr ""
+"Вы на мгновение отказались защиты, чтобы увеличить урон атак.\n"
+"\n"
+"+10%% урона, -1 попытка блока.\n"
+"Длится 1 ход."
 
 #: lang/json/martial_art_from_json.py
 msgid "Taekwondo"
@@ -125622,6 +129772,11 @@ msgid ""
 "extra damage and your attacks do more damage if you are not holding "
 "anything."
 msgstr ""
+"Тхэквондо — это национальный корейский вид спорта, он использовался в армии "
+"Южной Кореи в 20-ом веке. Фокусируется на ударах ногами, поэтому не получает"
+" никаких преимуществ от использования любых видов оружия. Также включает "
+"силовые тренировки. Чем вы сильнее, тем больше урона можете заблокировать, а"
+" ваши атаки наносят больше урона, если вы ничего не держите."
 
 #: lang/json/martial_art_from_json.py
 msgid "Taekwondo Stance"
@@ -125646,7 +129801,7 @@ msgstr ""
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -125664,7 +129819,7 @@ msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Tai Chi Stance"
-msgstr ""
+msgstr "Стойка Тайцзи"
 
 #. ~ Description of buff 'Tai Chi Stance' for martial art 'Tai Chi'
 #: lang/json/martial_art_from_json.py
@@ -125689,6 +129844,96 @@ msgid ""
 "Lasts 2 turns."
 msgstr ""
 
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Kung Fu"
+msgstr "Стиль тигра"
+
+#. ~ Description for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
+"attacks above all else.  Your Strength determines your accuracy, and your "
+"attacks do increasing damage as you continue attacking."
+msgstr ""
+"Один из пяти животных стилей Шаолиня. Стиль тигра использует тактику "
+"непрерывных ударов. Сила определяет точность ударов, и урон от ваших атак "
+"растёт, если вы продолжаете наносить удары."
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Fury"
+msgstr "Ярость тигра"
+
+#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger's Strength"
+msgstr ""
+
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Wing Chun"
+msgstr "Винь-Чунь"
+
+#. ~ Description for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
+"learn effective techniques from the various Shaolin animal forms.  It has a "
+"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
+"sensitivity to the opponent's direction of force, and flowing around it to "
+"get back to hitting."
+msgstr ""
+"Винь-Чунь — китайское боевое искусство, начавшееся как подражание наиболее "
+"простым и эффективным шаолиньским животным стилям. В нём применяется высокая"
+" стойка с переносом веса полностью на отставленную назад ногу. Винь-Чунь "
+"делает упор на ощущение направления силы противника и обтекания его для "
+"дальнейшего удара."
+
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr "Цепь ударов"
+
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chi-Sao Sensitivity"
+msgstr "Чутьё Чи-Сао"
+
+#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
+msgstr ""
+
 #: lang/json/martial_art_from_json.py
 msgid "Zui Quan"
 msgstr "Цзуй-цюань"
@@ -125697,62 +129942,64 @@ msgstr "Цзуй-цюань"
 #: lang/json/martial_art_from_json.py
 msgid ""
 "AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
 msgstr ""
-"Цзуй-цюань, известный как «пьяный мастер», даёт пассивный бонус к увороту, "
-"зависящий от уровня вашего интеллекта. В течение хода после вашей атаки, вы "
-"можете увернуться от любого количества ударов без штрафов, и успешное "
-"уклонение даст вам бонус к урону и меткости в зависимости от интеллекта."
 
-#. ~ Description of buff for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "Интеллект увеличивает уклонение"
-
-#: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
-msgstr "Контратака"
+msgid "Zui Quan Stance"
+msgstr ""
 
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
-msgstr "Дополнительные урон и шанс на попадание после успешного уворачивания"
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Kung Fu"
-msgstr "Стиль тигра"
+msgid "Advanced Zui Quan"
+msgstr ""
 
-#. ~ Description for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
+#, no-python-format
 msgid ""
-"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
-"attacks above all else.  Your Strength determines your accuracy, and your "
-"attacks do increasing damage as you continue attacking."
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
 msgstr ""
-"Один из пяти животных стилей Шаолиня. Стиль тигра использует тактику "
-"непрерывных ударов. Сила определяет точность ударов, и урон от ваших атак "
-"растёт, если вы продолжаете наносить удары."
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Fury"
-msgstr "Ярость тигра"
+msgid "Drunken Stumble"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "+3 Удар/атака"
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "Сила тигра"
+msgid "Drunken Dodging"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "Сила даёт дополнительный бонус к урону."
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Debug Mastery"
@@ -125778,34 +130025,6 @@ msgstr ""
 "+Сила дробящая броня, +Ловкость кислотная броня, +Интеллект электрическая "
 "броня, +Восприятие огненная броня."
 
-#: lang/json/martial_art_from_json.py
-msgid "Wing Chun"
-msgstr "Винь-Чунь"
-
-#. ~ Description for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
-"learn effective techniques from the various Shaolin animal forms.  It has a "
-"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
-"sensitivity to the opponent's direction of force, and flowing around it to "
-"get back to hitting."
-msgstr ""
-"Винь-Чунь — китайское боевое искусство, начавшееся как подражание наиболее "
-"простым и эффективным шаолиньским животным стилям. В нём применяется высокая"
-" стойка с переносом веса полностью на отставленную назад ногу. Винь-Чунь "
-"делает упор на ощущение направления силы противника и обтекания его для "
-"дальнейшего удара."
-
-#: lang/json/martial_art_from_json.py
-msgid "Chi-Sao Sensitivity"
-msgstr "Чутьё Чи-Сао"
-
-#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
-msgstr "Восприятие увеличивает уклонение, +1 уклонение за ход"
-
 #: lang/json/martial_art_from_json.py
 msgid "Bionic Combatives"
 msgstr "Бионические приёмы борьбы"
@@ -125870,7 +130089,7 @@ msgid ""
 "-4 move cost.\n"
 "Lasts 3 turns.  Stacks 4 times."
 msgstr ""
-"Ваши атаки - это размытое пятно рук и ног, ускоряющихся всё быстрее, пока вы без устали бьёте ваших врагов.\n"
+"Ваши атаки — это размытое пятно рук и ног, ускоряющихся всё быстрее, пока вы без устали бьёте ваших врагов.\n"
 "\n"
 "-4 стоимость движения.\n"
 "Длится 3 хода. Складывается 4 раза."
@@ -125904,7 +130123,7 @@ msgid ""
 "+2 bash damage.\n"
 "Lasts 4 turns."
 msgstr ""
-"Ваш яд - это растянутая боль, которую противник никогда не забудет.\n"
+"Ваш яд — это растянутая боль, которую противник никогда не забудет.\n"
 "\n"
 "+2 дробящего урона.\n"
 "Длится 4 хода."
@@ -125924,7 +130143,7 @@ msgstr ""
 "При помощи лёгких скольжений, отскоков или отталкиваний от ближайшей стены вы избегаете худших атак ваших противников.\n"
 "\n"
 "+3.0 к навыку Уклонения поблизости от стены.\n"
-"Активирует приёмы \"Хвост ящерицы\" и \"Контрудар ящерицы\" рядом со стеной."
+"Активирует приёмы «Хвост ящерицы» и «Контрудар ящерицы» рядом со стеной."
 
 #: lang/json/martial_art_from_json.py
 msgid "Lizard's Leap"
@@ -125955,10 +130174,10 @@ msgid ""
 "enables a stunning pincer attack.  Critical hits do massive damage and knock"
 " your opponent back along with anyone your opponent comes in contact with."
 msgstr ""
-"Один из Пяти Смертельных Ядов, им владел Гао Цзи. Стиль Скорпиона - "
+"Один из Пяти Смертельных Ядов, им владел Гао Цзи. Стиль Скорпиона — "
 "загадочное искусство, отличающееся сложенными в клешни кистями и ударом "
 "ногой как жалом. Движение активирует оглушающую атаку клешнями. Критические "
-"удары наносят огромный урон и отбрасывают противника назад - как и всё, с "
+"удары наносят огромный урон и отбрасывают противника назад — как и всё, с "
 "чем противник столкнётся."
 
 #: lang/json/martial_art_from_json.py
@@ -125972,7 +130191,7 @@ msgid ""
 "\n"
 "+2 bashing damage."
 msgstr ""
-"Ваш яд - неминуемая угроза, от которой никому не скрыться.\n"
+"Ваш яд — неминуемая угроза, от которой никому не скрыться.\n"
 "\n"
 "+2 дробящего урона."
 
@@ -125994,7 +130213,7 @@ msgstr ""
 "Вперёд, хватай свою жертву!\n"
 "\n"
 "+10% урона.\n"
-"Активирует технику \"Удар клешнями\".\n"
+"Активирует технику «Удар клешнями».\n"
 "Складывается 2 раза.  Длится 2 хода."
 
 #: lang/json/martial_art_from_json.py
@@ -126004,13 +130223,11 @@ msgstr "Стиль жабы"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
 msgstr ""
-"Один из Пяти Смертельных Ядов. Мастера стиля Жабы могут сосредоточиться и "
-"противостоять всем атакам. Вы можете медитировать в ожидании, увеличивая "
-"свою броню, но при этом вы будете терять фокус при движении."
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -126018,8 +130235,11 @@ msgstr "Железная кожа жабы"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "Прибавка +6 к броне, если стоять на месте"
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -126028,8 +130248,12 @@ msgstr "Размягчение железной кожи"
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
-msgstr "Железная кожа размягчается, когда вы двигаетесь!"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Viper Kung Fu"
@@ -126038,40 +130262,49 @@ msgstr "Стиль гадюки"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
 msgstr ""
-"Один из пяти «смертельных ядов». Стиль Гадюки имеет уникальную комбинацию из"
-" трёх действий: сначала уворот, потом контратакующий оглушающий удар и, "
-"наконец, легендарный удар Гадюки."
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "Залом гадюки"
+msgid "Viper's Patience"
+msgstr ""
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
-msgstr "Укус прошёл! Ваша следующая атака будет ударом гадюки!"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "Терпенье гадюки"
+msgid "Viper's Ambush"
+msgstr "Ловушка гадюки"
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
-msgstr "+2 к уклонению. Уклонение от атаки вызывает комбо-атаку."
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
-msgstr "Ловушка гадюки"
+msgid "Viper's Venom"
+msgstr "Яд гадюки"
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
-msgstr "Вы заманили их! Ваша следующая атака будет укусом гадюки."
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "C.R.I.T Blade-work"
@@ -126192,8 +130425,8 @@ msgid ""
 "Panzer Kunst or \"Armor Art\" is a futuristic martial art devised for "
 "cyborgs fighting in zero-gravity environments."
 msgstr ""
-"Panzer Kunst, или \"Броневое искусство\" - футуристичное боевое искусство "
-"для сражений киборгов в условиях невесомости."
+"Panzer Kunst, или «Броневое искусство» — футуристичное боевое искусство для "
+"сражений киборгов в условиях невесомости."
 
 #: lang/json/martial_art_from_json.py
 msgid "Schatten Folgen"
@@ -126208,7 +130441,7 @@ msgid ""
 "\n"
 "+1 Dodge attemps, Dodge Skill increased by 12%% of Perception."
 msgstr ""
-"\"Поиск теней\"\n"
+"«Поиск теней»\n"
 "Вы обучены находиться в слепой зоне вашей цели.\n"
 "\n"
 "+1 попытка Уклонения, навык Уклонения повышается на 12%% Восприятия."
@@ -126225,7 +130458,7 @@ msgid ""
 "+5 bash Armor Penetration.\n"
 "Lasts 2 turns."
 msgstr ""
-"\"Пробивание брони\"\n"
+"«Пробивание брони»\n"
 "Вы входите в ритм со своим противником и можете ударить в самое слабозащищённое место.\n"
 "+5 дробящего пробития брони.\n"
 "Длится 2 хода."
@@ -126475,6 +130708,10 @@ msgstr "свинец"
 msgid "Leather"
 msgstr "кожа"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr "лайкра"
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "молочное"
@@ -126537,7 +130774,11 @@ msgstr "суперсплав"
 
 #: lang/json/material_from_json.py
 msgid "layered carbide"
-msgstr ""
+msgstr "слоистый карбид"
+
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr "синтетическая ткань"
 
 #: lang/json/material_from_json.py
 msgid "Tin"
@@ -126649,6 +130890,10 @@ msgstr "Резина"
 msgid "Arcane Skin"
 msgstr "Загадочная кожа"
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr "Демонический Хитин"
@@ -126658,7 +130903,7 @@ msgid "Sugar"
 msgstr "сахар"
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
+msgid "Gather bones for the Brigitte.  About 8 should do it."
 msgstr "Собрать кости для Бриджит. 8 должно хватить."
 
 #: lang/json/mission_def_from_json.py
@@ -127232,7 +131477,7 @@ msgstr ""
 "Не хочу тебя расстраивать, но я, скорее всего, не смогу ничего сделать с "
 "бухгалтерией. Но у меня есть одно решение: в книге описана ячейка в сейфе на"
 " имя регионального менеджера. И угадай что? Этот тупой неудачник написал там"
-" свой код. Пошли со мной, вскроем ячейку и ты сможешь забрать оттуда всё, "
+" свой код. Пошли со мной, вскроем ячейку, и ты сможешь забрать оттуда всё, "
 "что я не могу использовать как обвинения против этих ублюдков."
 
 #: lang/json/mission_def_from_json.py
@@ -128079,12 +132324,12 @@ msgid ""
 "Prove you're a survivor by surviving for 10 days after the cataclysm, and "
 "then returning to the person who gave you this mission."
 msgstr ""
-"Докажите, что вы выживальщик - проживите 10 дней в постапокалипсисе и "
+"Докажите, что вы выживальщик — проживите 10 дней в постапокалипсисе и "
 "вернитесь к тому, кто дал вам это задание."
 
 #: lang/json/mission_def_from_json.py
 msgid "It's hard to tell who actually has the skills to survive these days..."
-msgstr "Нынче сложно сказать, кто действительно способен выживать..."
+msgstr "Нынче сложно сказать, кто действительно способен выживать…"
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -128109,16 +132354,16 @@ msgid ""
 "I'll see you then...or I won't, and then I'll know I made the right "
 "decision."
 msgstr ""
-"Тогда увидимся... Или не увидимся, и тогда я пойму, что всё было правильно."
+"Тогда увидимся… Или не увидимся, и тогда я пойму, что всё было правильно."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Don't die. If you're asking me for advice, that doesn't bode well for you."
-msgstr "Не умирай. Спрашивать у меня совета - это не в твою пользу."
+msgstr "Не умирай. Спрашивать у меня совета — это не в твою пользу."
 
 #: lang/json/mission_def_from_json.py
 msgid "Well, you're not dead...yet."
-msgstr "Ну, ты пока не мёртв... пока."
+msgstr "Ну, ты пока не мёртв… пока."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -128254,11 +132499,11 @@ msgstr ""
 
 #: lang/json/mission_def_from_json.py
 msgid "I don't feel saved..."
-msgstr "Не думаю, что я спасён..."
+msgstr "Не думаю, что я спасён…"
 
 #: lang/json/mission_def_from_json.py
 msgid "Tell my family that I love them..."
-msgstr "Передай моей семье, что я люблю их..."
+msgstr "Передай моей семье, что я люблю их…"
 
 #: lang/json/mission_def_from_json.py
 msgid "Find an anvil"
@@ -128345,7 +132590,7 @@ msgstr ""
 
 #: lang/json/mission_def_from_json.py
 msgid "I hope he didn't meet Barry's fate..."
-msgstr "Я надеюсь, с ним не случится то же, что с Барри..."
+msgstr "Я надеюсь, с ним не случится то же, что с Барри…"
 
 #: lang/json/mission_def_from_json.py
 msgid "Free Barry from the mysterious structure"
@@ -128396,7 +132641,7 @@ msgstr ""
 
 #: lang/json/mission_def_from_json.py
 msgid "Well it was here..."
-msgstr "Что ж, оно было там..."
+msgstr "Что ж, оно было там…"
 
 #: lang/json/mission_def_from_json.py
 msgid "Gather 50 dandelions"
@@ -128433,7 +132678,7 @@ msgstr ""
 
 #: lang/json/mission_def_from_json.py
 msgid "I wonder if the wildlife ate all the greens..."
-msgstr "Наверно, звери съели все растения..."
+msgstr "Наверно, звери съели все растения…"
 
 #: lang/json/mission_def_from_json.py
 msgid "Find 20 bee balm seeds"
@@ -128461,7 +132706,7 @@ msgid ""
 "You should search through the forest, make sure to check in the underbrush "
 "for beebalm and then harvest its seeds."
 msgstr ""
-"Поищи в лесу, проверяй кустики, а как найдёшь монарду - собирай семена."
+"Поищи в лесу, проверяй кустики, а как найдёшь монарду — собирай семена."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -128473,7 +132718,7 @@ msgstr ""
 
 #: lang/json/mission_def_from_json.py
 msgid "I'll have to find someone more at home in the forest..."
-msgstr "Мне нужно найти кого-то, кто получше знаком с лесом..."
+msgstr "Мне нужно найти кого-то, кто получше знаком с лесом…"
 
 #: lang/json/mission_def_from_json.py
 msgid "Find and capture a cat"
@@ -128499,7 +132744,7 @@ msgstr ""
 
 #: lang/json/mission_def_from_json.py
 msgid "I didn't want to use chemicals on these rats."
-msgstr ""
+msgstr "Я не хочу выгонять крыс химией."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -128528,7 +132773,7 @@ msgstr "Чего?! Ты врёшь, я знаю! Где моя клетка, т
 
 #: lang/json/mission_def_from_json.py
 msgid "Oh no!  I guess they are too nimble for you..."
-msgstr "О нет! Наверно, они слишком ловкие для тебя..."
+msgstr "О нет! Наверно, они слишком ловкие для тебя…"
 
 #: lang/json/mission_def_from_json.py
 msgid "Gather 120 Stones"
@@ -128597,7 +132842,7 @@ msgstr ""
 
 #: lang/json/mission_def_from_json.py
 msgid "I wonder where all the sand went..."
-msgstr "Интересно, и куда делся весь песок..."
+msgstr "Интересно, и куда делся весь песок…"
 
 #: lang/json/mission_def_from_json.py
 msgid "Gather 1000 units of clay"
@@ -128695,7 +132940,7 @@ msgstr "О, ладно. Спасибо, я поищу другого поста
 
 #: lang/json/mission_def_from_json.py
 msgid "I wonder where all the seeds went..."
-msgstr "Интересно, и куда делись все семена..."
+msgstr "Интересно, и куда делись все семена…"
 
 #: lang/json/mission_def_from_json.py
 msgid "Kill monster"
@@ -128811,11 +133056,11 @@ msgstr "Огромное спасибо, мне теперь будет намн
 
 #: lang/json/mission_def_from_json.py
 msgid "I don't see a book...?"
-msgstr "И где же книга...?"
+msgstr "И где же книга…?"
 
 #: lang/json/mission_def_from_json.py
 msgid "At least you escaped with your life..."
-msgstr "Ну, ты хотя бы ещё жив..."
+msgstr "Ну, ты хотя бы ещё жив…"
 
 #: lang/json/mission_def_from_json.py
 msgid "Find a copy of DIY Compendium"
@@ -128835,7 +133080,7 @@ msgstr ""
 
 #: lang/json/mission_def_from_json.py
 msgid "Fantastic, I'm not supposed to leave our land."
-msgstr ""
+msgstr "Потрясно, мне неохота покидать нашу землю."
 
 #: lang/json/mission_def_from_json.py
 msgid "A library, bookstore should have one, schools are another good idea."
@@ -129983,7 +134228,7 @@ msgid ""
 msgstr ""
 "С такой штукой мы сумеем убедить остальных вложиться в коммуну. Спасибо, вот"
 " твои деньги. А ещё мы сумели соорудить ручную зарядку в гараже, так что "
-"пользуйся, не стесняйся - ты оказал нам огромную услугу."
+"пользуйся, не стесняйся — ты оказал нам огромную услугу."
 
 #: lang/json/mission_def_from_json.py
 msgid "Solar Power"
@@ -130400,7 +134645,7 @@ msgid ""
 "investigate the trade route and eliminate the threat."
 msgstr ""
 "Один из Свободных Торговцев загадочно пропал во время сопровождения "
-"каравана. Кто (или что) бы это ни был, он очень быстрый и тихий - осмотрите "
+"каравана. Кто (или что) бы это ни был, он очень быстрый и тихий — осмотрите "
 "торговый путь и устраните угрозу."
 
 #: lang/json/mission_def_from_json.py
@@ -130665,9 +134910,12 @@ msgstr "Вернуть фотонный накопитель"
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr ""
+"Доберитесь до подвала обвалившейся башни и обыщите руины в поисках шаблона "
+"фотонной схемы. Интерком предупредил вас о значительном количестве "
+"противников и наличии опасного окружения."
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -130714,7 +134962,7 @@ msgstr "Найти 200 золота."
 
 #: lang/json/mission_def_from_json.py
 msgid "I could do with some help..."
-msgstr "Мне нужна помощь кое в чём..."
+msgstr "Мне нужна помощь кое в чём…"
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -133549,8 +137797,8 @@ msgstr "Растительность на лице: нет: борода яко
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
 msgstr ""
 "У вас усы и борода, начинающаяся полоской под нижней губой и продолжающаяся "
 "по линии нижней челюсти. Похожа на якорь, поэтому так и называется."
@@ -133562,7 +137810,7 @@ msgstr "Растительность на лице: нет: борода кор
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
 msgstr ""
 "У вас усы и короткая борода с подровненными краями. Их соединяют короткие "
@@ -133696,7 +137944,7 @@ msgstr "Растительность на лице: нет: шейная бор
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
 msgstr "У вас борода из волос, растущих на шее под нижней челюстью. Усов нет."
 
@@ -133811,6 +138059,30 @@ msgstr ""
 "Вы можете двигаться быстрее большинства существ, получая 15% бонус к "
 "скорости на твёрдой поверхности."
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr "Слабый фотофор"
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr ""
+"Фотофор вырос из вашей головы, вы можете заставить его мягко светиться. Это "
+"сделает вас очень заметным в темноте, идеально подходит для привлечения "
+"партнера во время брачного сезона."
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr "Фотофор"
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr "Вы можете заставить ваш фотофор светиться ярко."
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "Хороший слух"
@@ -134364,9 +138636,9 @@ msgstr "Психоз от стимуляторов"
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
 "У вас необычные отношения со стимуляторами (такими как кофе или амфетамины)."
 " Вы можете принять их гораздо больше без риска передозировки, но при большом"
@@ -134530,6 +138802,21 @@ msgid ""
 "Eskrima, Fencing, Fior Di Battaglia, Medieval Swordsmanship, Niten Ichi-Ryu,"
 " Pentjak Silat, or Sōjutsu."
 msgstr ""
+"Вы практиковались бою с оружием. Вы начинаете с одним из стилей: Эскрима, "
+"фехтование, Пентьяк Силат, Цветок битвы, средневековое фехтование, Нитэн "
+"Ити-рю, Пентьяк Силат или Содзюцу."
+
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr "Спортивный фехтовальщик"
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
@@ -135389,11 +139676,11 @@ msgstr "Глаза феи"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
 msgstr ""
-"Ваши глаза стали…зелёными. Трудно назвать точный оттенок, кажется, он "
-"меняется. Этот эффект такой…приятный."
+"Ваши глаза стали… Зелёными. Трудно назвать точный оттенок, кажется, он "
+"меняется. Этот эффект такой… Приятный."
 
 #: lang/json/mutation_from_json.py
 msgid "Fey Vision"
@@ -136312,10 +140599,10 @@ msgstr "Носитель марло"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
+"nose, and you have a strong desire to try some seeds and… sap?"
 msgstr ""
 "С тех пор, как вы отведали ягоду марло, этот запах продолжает витать в носу,"
-" а вам очень хочется попробовать семена и …сок?"
+" а вам очень хочется попробовать семена и… Сок?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vessel"
@@ -136325,10 +140612,10 @@ msgstr "Сосуд для марло"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
+"tongue, and you have a strong desire to try some berries and… sap?"
 msgstr ""
 "С тех пор, как вы отведали семя марло, этот запах продолжает витать в носу, "
-"и вам очень хочется попробовать ягоды и …сок?"
+"а вам очень хочется попробовать ягоды и… Сок?"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vector"
@@ -136785,11 +141072,12 @@ msgstr "Саблезубый"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
 msgstr ""
 "Ваши клыки стали очень большими и невероятно острыми. Вы не можете ничего "
-"надеть на рот, да и есть труднее… но кусая, вы наносите жуткие раны."
+"надеть на рот, да и есть труднее… Но ваши укусы оставляют крайне неприятные "
+"раны."
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
@@ -138198,11 +142486,11 @@ msgstr "Морда"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
 msgstr ""
-"Ваше лицо и челюсти начали… меняться. Вы пока можете носить маски и тому "
-"подобное, но вы уже заметно мутировали."
+"Ваше лицо и челюсти начали… Меняться. Вы пока еще можете носить маски и тому"
+" подобное, но вы уже заметно мутировали."
 
 #: lang/json/mutation_from_json.py
 msgid "Bovine Snout"
@@ -139059,10 +143347,11 @@ msgstr "Эктотермный"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
 "Ваше тело стало полностью холоднокровным. Ваша скорость повышается или "
 "понижается на 1% за каждые 2 (1,1) градуса выше или ниже 65°F (18,3°С). Вам "
@@ -139404,10 +143693,10 @@ msgstr ""
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
+"every need… but how would you keep them in line?"
 msgstr ""
 "Было бы неплохо быть Королевой, чтобы рабочие всегда выполняли каждое "
-"пожелание… но как бы вы управляли ими?"
+"пожелание… Но как бы вы управляли ими?"
 
 #. ~ Description for Plant
 #: lang/json/mutation_from_json.py
@@ -139425,8 +143714,8 @@ msgstr "Студень"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
 msgstr ""
 "Как там было в одной старой рекламе: «раскрась планету»? Это хорошая задача "
 "на будущее, но сейчас…"
@@ -140211,7 +144500,7 @@ msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Wayfarer"
-msgstr ""
+msgstr "Странник"
 
 #. ~ Description for Wayfarer
 #: lang/json/mutation_from_json.py
@@ -140219,6 +144508,9 @@ msgid ""
 "Whether from personal choice or childhood trauma, travelling with vehicles "
 "is off-limits to you, even if your life depended on it."
 msgstr ""
+"То ли по своему хотению, то ли из-за детской травмы, путешествие на "
+"транспортных средствах для вас неприёмлемо, даже если от этого зависит ваша "
+"жизнь."
 
 #: lang/json/mutation_from_json.py
 msgid "Survivor Story"
@@ -141251,7 +145543,7 @@ msgid "Scientist"
 msgstr "Учёный"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
+msgid "I'm looking for clues concerning these monsters' origins…"
 msgstr "Я пытаюсь раскрыть источник происхождения всех этих монстров…"
 
 #: lang/json/npc_class_from_json.py
@@ -141315,7 +145607,7 @@ msgid "Real Person"
 msgstr "Настоящий человек"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr "Я просто гуляю, как полностью настоящий и нормальный НП… Человек!"
 
 #: lang/json/npc_class_from_json.py
@@ -141331,7 +145623,7 @@ msgid "Foodperson"
 msgstr "Поешь-ка"
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
 msgstr "Я ПОЕШЬ-КА. И Я ПРИНОШУ НАСЫЩЕНИЕ!"
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
@@ -141339,8 +145631,8 @@ msgid "Cyborg"
 msgstr "Киборг"
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
-msgstr "Зззззт… Я… я… Ки…БИИИИИП… орг."
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
+msgstr "Зззззт… Я… я… Ки…БИИИИИП… борг."
 
 #: lang/json/npc_class_from_json.py
 msgid "former cop"
@@ -141481,6 +145773,14 @@ msgstr "Я владелец торгового каравана."
 
 #: lang/json/npc_class_from_json.py
 msgid "Operator"
+msgstr "Оператор"
+
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr ""
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
 msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
@@ -143135,15 +147435,15 @@ msgstr "крыша музыкального магазина"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "megastore parking lot"
-msgstr ""
+msgstr "автостоянка супермаркета"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "megastore"
-msgstr "гипермаркет"
+msgstr "супермаркет"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "megastore, second floor"
-msgstr ""
+msgstr "супермаркет, второй этаж"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "megastore roof"
@@ -143153,6 +147453,10 @@ msgstr "крыша супермаркета"
 msgid "hotel parking"
 msgstr "парковка отеля"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "отель"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "вестибюль отеля"
@@ -143175,11 +147479,11 @@ msgstr "крыша мотеля"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "home improvement superstore entrance"
-msgstr "вход в гипермаркет бытовых товаров"
+msgstr "вход в супермаркет бытовых товаров"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "home improvement superstore"
-msgstr "гипермаркет бытовых товаров"
+msgstr "супермаркет бытовых товаров"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "garage - gas station"
@@ -143522,7 +147826,7 @@ msgid "spiked trench"
 msgstr "шипованная траншея"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
+msgid "fabrication workshop survey"
 msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
@@ -143538,9 +147842,17 @@ msgid "livestock survey"
 msgstr "место под загон"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "canteen survey"
+msgid "store house survey"
+msgstr ""
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
 msgstr ""
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "canteen survey"
+msgstr "место под столовую"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "crater"
 msgstr "воронка"
@@ -144222,6 +148534,10 @@ msgstr "стрельбище"
 msgid "shooting range roof"
 msgstr "крыша стрельбища"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "поле для гольфа"
@@ -144888,10 +149204,6 @@ msgstr "центр отправки роботов"
 msgid "dense urban"
 msgstr "плотная застройка"
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "отель"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "школа"
@@ -144912,6 +149224,10 @@ msgstr "общественная библиотека, второй этаж"
 msgid "mechanics garage"
 msgstr "гараж механика"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr "вход супермаркета"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
 msgstr "очистное сооружение"
@@ -149904,6 +154220,44 @@ msgstr ""
 "доставки из бакалеи прекратились, а телевизор больше не включается. Тебя это"
 " раздражает."
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr "Спортивный фехтовальщик"
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+"Вы были заядлым спортивным фехтовальщиком, всегда тренировались в местных "
+"клубах и участвовали в турнирах. Вы как раз были на тренировке, когда "
+"наступил конец света. Теперь у вас самый важный турнир, все рефери мертвы и "
+"никто из ваших оппонентов не следует правилам."
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr "Спортивная фехтовальщица"
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+"Вы были заядлой спортивной фехтовальщицей, всегда тренировались в местных "
+"клубах и участвовали в турнирах. Вы как раз были на тренировке, когда "
+"наступил конец света. Теперь у вас самый важный турнир, все рефери мертвы и "
+"никто из ваших оппонентов не следует правилам."
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -150739,7 +155093,7 @@ msgid ""
 "distraction. Forced to flee, will you have what it takes to survive or will "
 "you join the horde to haunt them for their cardinal sin?"
 msgstr ""
-"Ты был ботаном отряда - боевой медик, обученный встречам с необъяснимым. "
+"Ты был ботаном отряда — боевой медик, обученный встречам с необъяснимым. "
 "Однако твоей главной задачей было беречь товарищей в целости. Несколько "
 "недель ты шастал в аду вдоль и поперёк и следил, чтобы все выжили. Во время "
 "перестрелки между нежитью и взбунтовавшимися роботами правительственного ИИ "
@@ -150764,7 +155118,7 @@ msgid ""
 "distraction. Forced to flee, will you have what it takes to survive or will "
 "you join the horde to haunt them for their cardinal sin?"
 msgstr ""
-"Ты была ботанкой отряда - боевой медик, обученная встречам с необъяснимым. "
+"Ты была ботанкой отряда — боевой медик, обученная встречам с необъяснимым. "
 "Однако твоей главной задачей было беречь товарищей в целости. Несколько "
 "недель ты шастала в аду вдоль и поперёк и следила, чтобы все выжили. Во "
 "время перестрелки между нежитью и взбунтовавшимися роботами "
@@ -151219,7 +155573,7 @@ msgstr ""
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Military Rifleman"
-msgstr ""
+msgstr "Пехотинец"
 
 #. ~ Profession (male Military Rifleman) description
 #: lang/json/professions_from_json.py
@@ -151228,11 +155582,12 @@ msgid ""
 "Frontline infantry, frontline infantry, frontline infantry, frontline "
 "infantry."
 msgstr ""
+"Сми-и-ир…но! Равняйсь! Нале-е-е…во! Отставить! Нале-е-е…во! Шагом марш!"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Military Rifleman"
-msgstr ""
+msgstr "Пехотинец"
 
 #. ~ Profession (female Military Rifleman) description
 #: lang/json/professions_from_json.py
@@ -151241,11 +155596,12 @@ msgid ""
 "Frontline infantry, frontline infantry, frontline infantry, frontline "
 "infantry."
 msgstr ""
+"Сми-и-ир…но! Равняйсь! Нале-е-е…во! Отставить! Нале-е-е…во! Шагом марш!"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Military Marksman"
-msgstr ""
+msgstr "Военный снайпер"
 
 #. ~ Profession (male Military Marksman) description
 #: lang/json/professions_from_json.py
@@ -151254,11 +155610,13 @@ msgid ""
 "You like to think you're a real sniper, but really you're just infantry with"
 " a bigger gun."
 msgstr ""
+"Вам нравится думать, что вы настоящий снайпер, но на самом деле вы просто "
+"пехотинец с большой пушкой."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Military Marksman"
-msgstr ""
+msgstr "Военная снайперша"
 
 #. ~ Profession (female Military Marksman) description
 #: lang/json/professions_from_json.py
@@ -151267,99 +155625,101 @@ msgid ""
 "You like to think you're a real sniper, but really you're just infantry with"
 " a bigger gun."
 msgstr ""
+"Вам нравится думать, что вы настоящая снайперша, но на самом деле вы просто "
+"пехотинец с большой пушкой."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Military Automatic Rifleman"
-msgstr ""
+msgstr "Пулеметчик"
 
 #. ~ Profession (male Military Automatic Rifleman) description
 #: lang/json/professions_from_json.py
 msgctxt "prof_desc_male"
 msgid "S stands for suppressing fire!"
-msgstr ""
+msgstr "В позе зю за пулеметом!"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Military Automatic Rifleman"
-msgstr ""
+msgstr "Пулеметчица"
 
 #. ~ Profession (female Military Automatic Rifleman) description
 #: lang/json/professions_from_json.py
 msgctxt "prof_desc_female"
 msgid "S stands for suppressing fire!"
-msgstr ""
+msgstr "В позе зю за пулеметом!"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Military Grenadier"
-msgstr ""
+msgstr "Гренадер"
 
 #. ~ Profession (male Military Grenadier) description
 #: lang/json/professions_from_json.py
 msgctxt "prof_desc_male"
 msgid "There's no kill like overkill."
-msgstr ""
+msgstr "Что не убийство, то перебор."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Military Grenadier"
-msgstr ""
+msgstr "Гренадерша"
 
 #. ~ Profession (female Military Grenadier) description
 #: lang/json/professions_from_json.py
 msgctxt "prof_desc_female"
 msgid "There's no kill like overkill."
-msgstr ""
+msgstr "Что не убийство, то перебор."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Military Breacher"
-msgstr ""
+msgstr "Террорист"
 
 #. ~ Profession (male Military Breacher) description
 #: lang/json/professions_from_json.py
 msgctxt "prof_desc_male"
 msgid "Doors and windows everywhere dare not speak your name."
-msgstr ""
+msgstr "Никто не смеет произносить ваше имя, даже окна и двери."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Military Breacher"
-msgstr ""
+msgstr "Террористка"
 
 #. ~ Profession (female Military Breacher) description
 #: lang/json/professions_from_json.py
 msgctxt "prof_desc_female"
 msgid "Doors and windows everywhere dare not speak your name."
-msgstr ""
+msgstr "Никто не смеет произносить ваше имя, даже окна и двери."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Operator Recon"
-msgstr ""
+msgstr "Разведчик"
 
 #. ~ Profession (male Operator Recon) description
 #: lang/json/professions_from_json.py
 msgctxt "prof_desc_male"
 msgid "The only easy day was yesterday."
-msgstr ""
+msgstr "Единственный легкий день был вчера."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Operator Recon"
-msgstr ""
+msgstr "Разведчик"
 
 #. ~ Profession (female Operator Recon) description
 #: lang/json/professions_from_json.py
 msgctxt "prof_desc_female"
 msgid "The only easy day was yesterday."
-msgstr ""
+msgstr "Единственный легкий день был вчера."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Operator Sniper"
-msgstr ""
+msgstr "Снайпер спецназначения"
 
 #. ~ Profession (male Operator Sniper) description
 #: lang/json/professions_from_json.py
@@ -151368,11 +155728,13 @@ msgid ""
 "You spent days dueling an enemy sniper, then he just... died.  And then un-"
 "died."
 msgstr ""
+"Вы провели дни, сражаясь с вражеским снайпером, затем он просто… Умер. Но не"
+" совсем."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Operator Sniper"
-msgstr ""
+msgstr "Снайперша спецназначения"
 
 #. ~ Profession (female Operator Sniper) description
 #: lang/json/professions_from_json.py
@@ -151381,11 +155743,13 @@ msgid ""
 "You spent days dueling an enemy sniper, then he just... died.  And then un-"
 "died."
 msgstr ""
+"Вы провели дни, сражаясь с вражеским снайпером, затем он просто… Умер. Но не"
+" совсем."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Operator Hacker"
-msgstr ""
+msgstr "Хакер спецсил"
 
 #. ~ Profession (male Operator Hacker) description
 #: lang/json/professions_from_json.py
@@ -151393,11 +155757,12 @@ msgctxt "prof_desc_male"
 msgid ""
 "You insist you're not a hacker, you're an 'Electronic Warfare Specialist'"
 msgstr ""
+"Вы утверждаете, что вы не хакер, а «Специалист по радиоэлектронной борьбе»."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Operator Hacker"
-msgstr ""
+msgstr "Хакерша спецсил"
 
 #. ~ Profession (female Operator Hacker) description
 #: lang/json/professions_from_json.py
@@ -151405,11 +155770,12 @@ msgctxt "prof_desc_female"
 msgid ""
 "You insist you're not a hacker, you're an 'Electronic Warfare Specialist'"
 msgstr ""
+"Вы утверждаете, что вы не хакер, а «Специалист по радиоэлектронной борьбе»."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Operator Undercover"
-msgstr ""
+msgstr "Боец под прикрытием"
 
 #. ~ Profession (male Operator Undercover) description
 #: lang/json/professions_from_json.py
@@ -151418,11 +155784,13 @@ msgid ""
 "You've been tailing your target for months and now he's a zombie. So much "
 "for that lead."
 msgstr ""
+"Вы преследовали свою цель в течение нескольких месяцев, и теперь он зомби. "
+"Он вас опередил."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Operator Undercover"
-msgstr ""
+msgstr "Боец под прикрытием"
 
 #. ~ Profession (female Operator Undercover) description
 #: lang/json/professions_from_json.py
@@ -151431,11 +155799,13 @@ msgid ""
 "You've been tailing your target for months and now he's a zombie. So much "
 "for that lead."
 msgstr ""
+"Вы преследовали свою цель в течение нескольких месяцев, и теперь он зомби. "
+"Он вас опередил."
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Operator CBRN"
-msgstr ""
+msgstr "Боец CBRN"
 
 #. ~ Profession (male Operator CBRN) description
 #: lang/json/professions_from_json.py
@@ -151444,11 +155814,13 @@ msgid ""
 "Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. "
 "Sounds like the perfect job for you!"
 msgstr ""
+"Химическое оружие? Есть. Биологическая опасность? Есть. Ядерная война? Есть."
+" Похоже, идеальная работа для вас!"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
 msgid "Operator CBRN"
-msgstr ""
+msgstr "Боец CBRN"
 
 #. ~ Profession (female Operator CBRN) description
 #: lang/json/professions_from_json.py
@@ -151457,6 +155829,8 @@ msgid ""
 "Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. "
 "Sounds like the perfect job for you!"
 msgstr ""
+"Химическое оружие? Есть. Биологическая опасность? Есть. Ядерная война? Есть."
+" Похоже, идеальная работа для вас!"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
@@ -151776,7 +156150,7 @@ msgid ""
 msgstr ""
 "Ты был сыном метеоролога и всегда интересовался погодой. Недавно ты понял, "
 "что погодой можно управлять при помощи волшебства! К сожалению, по мере "
-"развития событий ты недолго наслаждался своими способностями..."
+"развития событий ты недолго наслаждался своими способностями…"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
@@ -151794,7 +156168,7 @@ msgid ""
 msgstr ""
 "Ты была дочерью метеоролога и всегда интересовалась погодой. Недавно ты "
 "поняла, что погодой можно управлять при помощи волшебства! К сожалению, по "
-"мере развития событий ты недолго наслаждалась своими способностями..."
+"мере развития событий ты недолго наслаждалась своими способностями…"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
@@ -152168,7 +156542,7 @@ msgid ""
 "You're a human shaped candy brought to life under unknown circumstances.  "
 "You have your whole life ahead of you and it's gonna be sweet!"
 msgstr ""
-"Вы - карамель в форме человека, оживлённая в ходе неясных событий. У вас "
+"Вы — карамель в форме человека, оживлённая в ходе неясных событий. У вас "
 "впереди целая жизнь, и она будет сладкой!"
 
 #: lang/json/professions_from_json.py
@@ -152183,7 +156557,7 @@ msgid ""
 "You're a human shaped candy brought to life under unknown circumstances.  "
 "You have your whole life ahead of you and it's gonna be sweet!"
 msgstr ""
-"Вы - карамель в форме человека, оживлённая в ходе неясных событий. У вас "
+"Вы — карамель в форме человека, оживлённая в ходе неясных событий. У вас "
 "впереди целая жизнь, и она будет сладкой!"
 
 #: lang/json/professions_from_json.py
@@ -153307,11 +157681,6 @@ msgstr "СТУПНИ"
 msgid "MEDICAL"
 msgstr "ЛЕЧЕНИЕ"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "КОНТЕЙНЕРЫ"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -154529,7 +158898,7 @@ msgstr "подготовить кухню"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
 msgstr ""
 "Нам необходимо устроить колодец рядом с той лебёдкой. Колодец сильно "
@@ -154594,7 +158963,7 @@ msgstr "сложить камин"
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
+"grab a pot.  Let's put it in that dining area."
 msgstr ""
 "Теперь у нас есть укрытие, и нам нужно поставить мангал для приготовления "
 "еды и достать кастрюлю, давайте поместим всё это в столовой."
@@ -154897,7 +159266,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "basic water well"
-msgstr ""
+msgstr "колодец"
 
 #: lang/json/recipe_from_json.py
 msgid ""
@@ -155035,7 +159404,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "Garage tool rack"
-msgstr ""
+msgstr "Гаражный инструментальный ящик"
 
 #: lang/json/recipe_from_json.py
 msgid "We should start construction of a roof for the garage."
@@ -155043,7 +159412,7 @@ msgstr "Мы должны начать строительство крыши д
 
 #: lang/json/recipe_from_json.py
 msgid "Garage partial roof"
-msgstr ""
+msgstr "Гаражная не законченная крыша"
 
 #: lang/json/recipe_from_json.py
 msgid "Finishing out the roof will let our mechanics work rain or shine."
@@ -155051,7 +159420,7 @@ msgstr "Завершение крыши позволит нашим механи
 
 #: lang/json/recipe_from_json.py
 msgid "Garage completed roof"
-msgstr ""
+msgstr "Гаражная построенная крыша"
 
 #: lang/json/recipe_from_json.py
 msgid ""
@@ -155063,7 +159432,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "Garage partial expansion"
-msgstr ""
+msgstr "Частичное расширение гаража"
 
 #: lang/json/recipe_from_json.py
 msgid "Finishing the roof will let us park RVs and buses in the garage."
@@ -155071,7 +159440,7 @@ msgstr "Завершение крыши позволит нам парковат
 
 #: lang/json/recipe_from_json.py
 msgid "Garage expanded roof"
-msgstr ""
+msgstr "Гаражная расширенная крыша"
 
 #: lang/json/recipe_from_json.py
 msgid ""
@@ -155082,7 +159451,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "Garage mechanics quarters"
-msgstr ""
+msgstr "Гаражные мастерские"
 
 #: lang/json/recipe_from_json.py
 msgid "Survey land for a kitchen."
@@ -155303,125 +159672,131 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "Survey land for a kitchen and dining area."
-msgstr ""
+msgstr "Обследовать территорию для кухни и столовой."
 
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should build 2 fireplaces for cooking and "
 "grab a pot."
 msgstr ""
+"Теперь у нас есть укрытие, и нам нужно сложить 2 камина для приготовления "
+"еды и достать кастрюлю."
 
 #: lang/json/recipe_from_json.py
 msgid "build 2 fireplaces"
-msgstr ""
+msgstr "сложить 2 камина"
 
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should build 2 stoves for cooking and grab a"
 " pot."
 msgstr ""
+"Теперь у нас есть укрытие, и нам нужно построить 2 печки для приготовления "
+"еды и достать кастрюлю."
 
 #: lang/json/recipe_from_json.py
 msgid "build 2 wood stoves"
-msgstr ""
+msgstr "поставить 2 печки"
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
+msgid "We should build a well.  This will make cooking more convenient."
 msgstr ""
+"Мы должны построить колодец. Это сделает приготовление пищи более удобным."
 
 #: lang/json/recipe_from_json.py
 msgid "Lets build some counters and shelves."
-msgstr ""
+msgstr "Нужно построить несколько столов и полок."
 
 #: lang/json/recipe_from_json.py
 msgid "build kitchen counters"
-msgstr ""
+msgstr "построить кухонные столы"
 
 #: lang/json/recipe_from_json.py
 msgid "build 3 smoking racks and a charcoal kiln"
-msgstr ""
+msgstr "построить 3 стойки для копчения и угольную печь"
 
 #: lang/json/recipe_from_json.py
 msgid "Lets furnish the pantry and build 2 root cellars."
-msgstr ""
+msgstr "Давайте оборудуем кладовую и построим 2 погреба."
 
 #: lang/json/recipe_from_json.py
 msgid "furnish the pantry"
-msgstr ""
+msgstr "оборудовать кладовую"
 
 #: lang/json/recipe_from_json.py
 msgid "Let's make some furniture for the dining hall."
-msgstr ""
+msgstr "Давайте сделаем мебель для столовой."
 
 #: lang/json/recipe_from_json.py
 msgid "furnish the dining room"
-msgstr ""
+msgstr "обставить столовую"
 
 #: lang/json/recipe_from_json.py
 msgid "Let's build some planters to the north for a chef's garden."
-msgstr ""
+msgstr "Давайте построим несколько садовых ящика на севера для шеф-повара."
 
 #: lang/json/recipe_from_json.py
 msgid "build some planters"
-msgstr ""
+msgstr "построить садовые ящики"
 
 #: lang/json/recipe_from_json.py
 msgid "Lets start building the central kitchen log walls."
-msgstr ""
+msgstr "Давайте заложим основные стены кухни."
 
 #: lang/json/recipe_from_json.py
 msgid "build the log wall central kitchen room"
-msgstr ""
+msgstr "построить основные бревенчатые стены кухни"
 
 #: lang/json/recipe_from_json.py
 msgid "Lets finish the central kitchen log walls."
-msgstr ""
+msgstr "Давайте закончим основные стены кухни."
 
 #: lang/json/recipe_from_json.py
 msgid "finish the log wall central kitchen room"
-msgstr ""
+msgstr "достроить основные бревенчатые стены кухни"
 
 #: lang/json/recipe_from_json.py
 msgid ""
 "Lets get this log wall smoking area covered to protect the workers from the "
 "weather."
 msgstr ""
+"Давайте построим бревенчатую курилку, чтобы защитить рабочих от непогоды."
 
 #: lang/json/recipe_from_json.py
 msgid "build a log wall roofed area for smoking racks"
-msgstr ""
+msgstr "построить бревенчатую крытую курилку"
 
 #: lang/json/recipe_from_json.py
 msgid "Lets build a log wall pantry west of the kitchen."
-msgstr ""
+msgstr "Давайте построим бревенчатую кладовку к западу от кухни."
 
 #: lang/json/recipe_from_json.py
 msgid "build a log wall pantry"
-msgstr ""
+msgstr "построить бревенчатую кладовку"
 
 #: lang/json/recipe_from_json.py
 msgid "Lets build the west log wall of the dining hall."
-msgstr ""
+msgstr "Давайте построим западную бревенчатую стену столовой."
 
 #: lang/json/recipe_from_json.py
 msgid "build W log wall"
-msgstr ""
+msgstr "строить западную бревенчатую стену"
 
 #: lang/json/recipe_from_json.py
 msgid "Lets build the east log wall of the dining hall."
-msgstr ""
+msgstr "Давайте построим восточную бревенчатую стену столовой."
 
 #: lang/json/recipe_from_json.py
 msgid "build E log wall"
-msgstr ""
+msgstr "строить восточную бревенчатую стену"
 
 #: lang/json/recipe_from_json.py
 msgid "Lets build the center of the log wall dining hall."
-msgstr ""
+msgstr "Давайте построим центральную бревенчатую стену столовой."
 
 #: lang/json/recipe_from_json.py
 msgid "build center of the log wall dining hall"
-msgstr ""
+msgstr "строить центральные бревенчатые стены столовой"
 
 #: lang/json/recipe_from_json.py
 msgid "Lets start building the central kitchen metal walls."
@@ -155823,6 +160198,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr ""
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -155843,8 +160394,8 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -155937,11 +160488,11 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "Let's build a work bench."
-msgstr ""
+msgstr "Давайте построим верстак."
 
 #: lang/json/recipe_from_json.py
 msgid "build a work bench"
-msgstr ""
+msgstr "построить верстак"
 
 #: lang/json/recipe_from_json.py
 msgid "Let's set up a radio tower to improve our recruitment efforts."
@@ -155949,7 +160500,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
 msgstr ""
 
@@ -155959,7 +160510,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
 msgstr ""
 
@@ -155969,7 +160520,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
 msgstr ""
 
@@ -156401,7 +160952,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
+"Some benches around the outside would be nice.  Build some to the northwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -156410,7 +160961,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
+"Some benches around the outside would be nice.  Build some to the northeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -156419,7 +160970,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
+"Some benches around the outside would be nice.  Build some to the southeast."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -156428,7 +160979,7 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
+"Some benches around the outside would be nice.  Build some to the southwest."
 msgstr ""
 
 #: lang/json/recipe_from_json.py
@@ -156609,11 +161160,11 @@ msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "Survey land for a workshop area."
-msgstr ""
+msgstr "Обследовать территорию для строительства мастерской."
 
 #: lang/json/recipe_from_json.py
 msgid "workshop survey"
-msgstr ""
+msgstr "место под мастерскую"
 
 #: lang/json/recipe_from_json.py
 msgid ""
@@ -156644,11 +161195,11 @@ msgstr "Полевой лагерь"
 
 #: lang/json/recipe_group_from_json.py
 msgid "Firestation Base"
-msgstr ""
+msgstr "Пожарная станция"
 
 #: lang/json/recipe_group_from_json.py
 msgid "Evac Shelter Base"
-msgstr ""
+msgstr "Эвакуационное убежище"
 
 #: lang/json/recipe_group_from_json.py
 msgid "Farm"
@@ -156660,19 +161211,23 @@ msgstr "Гараж"
 
 #: lang/json/recipe_group_from_json.py
 msgid "Canteen"
-msgstr ""
+msgstr "Столовая"
 
 #: lang/json/recipe_group_from_json.py
 msgid "Livestock Area"
-msgstr ""
+msgstr "Животноводческая ферма"
 
 #: lang/json/recipe_group_from_json.py
 msgid "Central Storage Building"
+msgstr "Центральный склад"
+
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
 msgstr ""
 
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
-msgstr ""
+msgstr "Производственная мастерская"
 
 #: lang/json/recipe_group_from_json.py
 msgid " Craft: Tinder"
@@ -157281,7 +161836,7 @@ msgid ""
 " you're on your own..."
 msgstr ""
 "Вы добрались до какого-то безопасного места вдали от живых мертвецов. "
-"Похоже, теперь вы сами за себя..."
+"Похоже, теперь вы сами за себя…"
 
 #. ~ Description for scenario 'Safe Place' for a female character.
 #: lang/json/scenario_from_json.py
@@ -157291,7 +161846,7 @@ msgid ""
 " you're on your own..."
 msgstr ""
 "Вы добрались до какого-то безопасного места вдали от живых мертвецов. "
-"Похоже, теперь вы сами за себя..."
+"Похоже, теперь вы сами за себя…"
 
 #. ~ Starting location for scenario 'Safe Place'.
 #: lang/json/scenario_from_json.py
@@ -157534,6 +162089,8 @@ msgid ""
 "It is the winter after zero hour.  As you were scavenging for food and a "
 "warm place to stay at, you heard the sound of lots of movement nearby."
 msgstr ""
+"Зима после часа ноль. Вы искали еду и тёплый ночлег и услышали, как "
+"поблизости кто-то движется."
 
 #. ~ Description for scenario 'Ambush' for a female character.
 #: lang/json/scenario_from_json.py
@@ -157542,6 +162099,8 @@ msgid ""
 "It is the winter after zero hour.  As you were scavenging for food and a "
 "warm place to stay at, you heard the sound of lots of movement nearby."
 msgstr ""
+"Зима после часа ноль. Вы искали еду и тёплый ночлег и услышали, как "
+"поблизости кто-то движется."
 
 #. ~ Starting location for scenario 'Ambush'.
 #. ~ Starting location for scenario 'The Next Summer'.
@@ -157692,7 +162251,7 @@ msgid ""
 msgstr ""
 "Когда случился катаклизм, вы находились в тюрьме, будучи преступником или "
 "кем-то из работников. Заключённые превратились в безмозглые ходячие ужасы, а"
-" охранные боты стреляют на поражение... Возможно, вам стоит поторопиться с "
+" охранные боты стреляют на поражение… Возможно, вам стоит поторопиться с "
 "вашими планами побега."
 
 #. ~ Description for scenario 'Prison' for a female character.
@@ -157705,7 +162264,7 @@ msgid ""
 msgstr ""
 "Когда случился катаклизм, вы находились в тюрьме, будучи преступницей или "
 "кем-то из работников. Заключённые превратились в безмозглые ходячие ужасы, а"
-" охранные боты стреляют на поражение... Возможно, вам стоит поторопиться с "
+" охранные боты стреляют на поражение… Возможно, вам стоит поторопиться с "
 "вашими планами побега."
 
 #. ~ Starting location for scenario 'Prison'.
@@ -157937,7 +162496,7 @@ msgid ""
 "You were participating in a mining operation when you found... something.  "
 "You're not sure what, but it sure is dark down here."
 msgstr ""
-"Вы участвовали в шахтёрской разработке, как вдруг нашли... что-то. Вы не "
+"Вы участвовали в шахтёрской разработке, как вдруг нашли… что-то. Вы не "
 "уверены, что это такое, но там темно — это точно."
 
 #. ~ Description for scenario 'Bottom of a Mine' for a female character.
@@ -157947,7 +162506,7 @@ msgid ""
 "You were participating in a mining operation when you found... something.  "
 "You're not sure what, but it sure is dark down here."
 msgstr ""
-"Вы участвовали в шахтёрской разработке, как вдруг нашли... что-то. Вы не "
+"Вы участвовали в шахтёрской разработке, как вдруг нашли… что-то. Вы не "
 "уверены, что это такое, но там темно — это точно."
 
 #. ~ Starting location for scenario 'Bottom of a Mine'.
@@ -158141,6 +162700,50 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr "Подвал секретного кабинета волшебника"
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr "Каникулы волшебника"
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr "Каникулы волшебницы"
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+"Вы были учеником волшебника и, находясь в его уединённой башне, долго "
+"грезили об отдыхе. Ваше путешествие к самопознанию прервано катаклизмом. "
+"Теперь вы должны выяснить, как выжить самостоятельно."
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+"Вы были ученицей волшебника и, находясь в его уединённой башне, долго "
+"грезили об отдыхе. Ваше путешествие к самопознанию прервано катаклизмом. "
+"Теперь вы должны выяснить, как выжить самостоятельно."
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr ""
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -158164,7 +162767,7 @@ msgid ""
 "going to make the best of it!"
 msgstr ""
 "Вы впервые открываете глаза и смотрите, как ваша кожа блестит на свету. В "
-"вашей памяти всплывает слово \"сахар\", хотя вы не помните, откуда оно "
+"вашей памяти всплывает слово «сахар», хотя вы не помните, откуда оно "
 "взялось, вообще-то вы совсем ничего не помните. По непонятной причине вы "
 "ощущаете надежду, всё такое новое, и вы справитесь!"
 
@@ -158179,7 +162782,7 @@ msgid ""
 "going to make the best of it!"
 msgstr ""
 "Вы впервые открываете глаза и смотрите, как ваша кожа блестит на свету. В "
-"вашей памяти всплывает слово \"сахар\", хотя вы не помните, откуда оно "
+"вашей памяти всплывает слово «сахар», хотя вы не помните, откуда оно "
 "взялось, вообще-то вы совсем ничего не помните. По непонятной причине вы "
 "ощущаете надежду, всё такое новое, и вы справитесь!"
 
@@ -161124,7 +165727,7 @@ msgid ""
 "While we chat, what say you we open a beer and just... pretend the world "
 "isn't ending, just for a while?"
 msgstr ""
-"Что скажешь, если мы откроем пива, поболтаем и просто... притворимся, что "
+"Что скажешь, если мы откроем пива, поболтаем и просто… притворимся, что "
 "никакого апокалипсиса нет, хотя б на минутку?"
 
 #: lang/json/snippet_from_json.py
@@ -161893,7 +166496,7 @@ msgstr "Я просто пойду спать, <okay>?"
 
 #: lang/json/snippet_from_json.py
 msgid "I just...gotta close my eyes for a bit, okay?"
-msgstr "Я просто... просто прикрою глаза на минутку, лады?"
+msgstr "Я просто… просто прикрою глаза на минутку, лады?"
 
 #: lang/json/snippet_from_json.py
 msgid "Can't remember the last time I had a proper kip."
@@ -162344,7 +166947,7 @@ msgstr "Да, бросай <yrwp>!"
 #: lang/json/snippet_from_json.py
 msgid ""
 "Please put down your weapon. I'll give you to the count of three. One..."
-msgstr "Пожалуйста, брось оружие. Я считаю до трёх. Раз..."
+msgstr "Пожалуйста, брось оружие. Я считаю до трёх. Раз…"
 
 #: lang/json/snippet_from_json.py
 msgid "Let's take it easy now, okay? Put the weapon down."
@@ -162628,7 +167231,7 @@ msgstr "<swear>, я охуеваю, как ты, <swear>, <name_b>, умудри
 
 #: lang/json/snippet_from_json.py
 msgid "you're the reason the gene pool needs a lifeguard"
-msgstr "ты - это причина, почему генофонду нужен охранник"
+msgstr "ты — это причина, почему генофонду нужен охранник"
 
 #: lang/json/snippet_from_json.py
 msgid "Can I get out and walk?  This vehicle is too small."
@@ -163471,41 +168074,23 @@ msgstr ""
 "батареек, чтоб подзарядиться."
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr "Дай мне пива, мне надо заправить сжигатель этанола."
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
-msgstr ""
-"Сжигатели этанола! Источник энергии, который весело заряжать. Дай мне "
-"выпить, пожалуйста!"
+msgid "Pass some ethanol, I need to power my ethanol burner."
+msgstr "Дай мне этанола, мне надо заправить сжигатель алкоголя."
 
 #: lang/json/snippet_from_json.py
 msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr "Официант! Мне надо повторить, у сжигателя этанола кончается топливо!"
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
+msgid "I require ethanol for my internal power supply.  Anything on you?"
 msgstr ""
-"Мне нужно спиртное, чтоб зарядить внутренний генератор. Есть что-нибудь?"
+"Мне нужен этанол, чтоб зарядить внутренний генератор. Есть что-нибудь?"
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
 msgstr ""
-"У тебя не будет алкоголя? Мне надо зарядить батареи. Медовухи, если можно."
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
-msgstr ""
-"Эта этаноловая машинка - лучший имплант, что у меня есть. Кстати говоря, нет"
-" ли бухла, чтоб зарядиться?"
+"У тебя не будет алкоголя? Мне надо зарядить батареи. Метанол подойдёт."
 
 #: lang/json/snippet_from_json.py
 msgid "I need some junk to power my internal furnace."
@@ -163642,11 +168227,11 @@ msgstr "Я хочу спросить тебя о чём-нибудь ещё."
 
 #: lang/json/snippet_from_json.py
 msgid "Moving on..."
-msgstr "Пойдём..."
+msgstr "Пойдём…"
 
 #: lang/json/snippet_from_json.py
 msgid "Anyway..."
-msgstr "Всё равно..."
+msgstr "Всё равно…"
 
 #: lang/json/snippet_from_json.py
 msgid "We should probably get going."
@@ -164216,6 +168801,17 @@ msgid ""
 "\n"
 "Refer to file EXO-I-271 for full report."
 msgstr ""
+"\n"
+"ЖУРНАЛ ПОГРУЖЕНИЯ: 27А\n"
+"\n"
+"ОТЧЁТ ОБ ИНЦИДЕНТЕ:\n"
+"\n"
+"РЕЗЮМЕ:\n"
+"Непредвиденный источник электромагнитных помех вынудил команду остановиться в фазе между пространством и подпространством 27. Участники экспедиции сообщили о наблюдении сфероидального объекта («PE-01»), движущегося под обычно непрозрачной t-подложкой. Уловленные помехи и показания экспедиции подразумевают, что PE-01 был мощным источником помех электромагнитного излучения. Через 30 минут PE-01 исчез и экспедиция была прервана в соответствии с процедурой EMER-12. Во время инцидента экспедиционная группа не пострадала ни от физических, ни от психических травм.\n"
+"\n"
+"Несомненно, мы сильно недооценили риск, связанный с фазовыми погружениями. Инженерам было поручено разработать новый, улучшенный набор средств защиты, который должен быть довольно эффективным. Новые аварийные процедуры находятся в стадии разработки.\n"
+"\n"
+"Обратитесь к файлу EXO-I-271 для полного отчета."
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -164229,6 +168825,15 @@ msgid ""
 "\n"
 "Refer to file EXO-M-312 for full report."
 msgstr ""
+"\n"
+"АНАЛИЗ ТРАНСПЛАНАРНЫХ МАТЕРИАЛОВ\n"
+"\n"
+"Т-ПОДЛОЖКА\n"
+"\n"
+"РЕЗЮМЕ:\n"
+"Материал, именуемый в дальнейшем т-подложкой, является естественным материалом «основания» фазового пространства. Образцы т-подложки были впервые извлечены во время ПОГРУЖЕНИЯ-25A и, по возвращении, насильственно были испытаны [////////], демонстрируют то, что сейчас известно как «анизотропные» физические свойства. В следующем отчёте более подробно.\n"
+"\n"
+"Обратитесь к файлу EXO-M-312 для полного отчёта."
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -164242,6 +168847,15 @@ msgid ""
 "\n"
 "Refer to file EXO-M-312 for full report."
 msgstr ""
+"\n"
+"АНАЛИЗ ТРАНСПЛАНАРНЫХ МАТЕРИАЛОВ\n"
+"\n"
+"Т-ПОДЛОЖКА\n"
+"\n"
+"HAADF МИКРОСКОПИЯ:\n"
+"Фотография атомарного масштаба показывает только полностью гладкую красную поверхность. В левом нижнем углу приписка синими чернилами: «Не из атомов?!».\n"
+"\n"
+"Обратитесь к файлу EXO-M-312 для полного отчёта."
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -164374,7 +168988,7 @@ msgstr ""
 "  Кому: Константин Дворак, замминистра по ядерной безопасности\n"
 "  От: Роберт Шейн, Директор EPA\n"
 "  \n"
-"      С самого начала создания проекта SRCF EPA выступало против него. Мы были в ужасе от того, что эти объекты будут сооружаться очень близко к населённым пунктам. И мы также согласились молчать про проект при условии, что нам будет разрешено осматривать саркофаги. Но это условие не было выполнено. С момента создания DoE использует все средства, чтобы помешать агентам EPA посещать объекты SRCF. В ход идёт военная тайна, резервные ресурсы, внутренние приказы о неразглашении - всё для того, чтобы сильней погрузить проект в дебри бюрократии."
+"      С самого начала создания проекта SRCF EPA выступало против него. Мы были в ужасе от того, что эти объекты будут сооружаться очень близко к населённым пунктам. И мы также согласились молчать про проект при условии, что нам будет разрешено осматривать саркофаги. Но это условие не было выполнено. С момента создания DoE использует все средства, чтобы помешать агентам EPA посещать объекты SRCF. В ход идёт военная тайна, резервные ресурсы, внутренние приказы о неразглашении — всё для того, чтобы сильней погрузить проект в дебри бюрократии."
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -164637,12 +169251,12 @@ msgstr "Пробуждение даётся с боем… и ваше тело
 
 #: lang/json/snippet_from_json.py
 msgid "some <musicgenre>."
-msgstr "музыку - <musicgenre>."
+msgstr "музыку — <musicgenre>."
 
 #: lang/json/snippet_from_json.py
 msgid "some <musicgenre>. The <musicdesc_part> is <musicdesc_evaluation>."
 msgstr ""
-"музыку -<musicgenre>.  <musicdesc_part> звучит <musicdesc_evaluation>."
+"музыку —<musicgenre>.  <musicdesc_part> звучит <musicdesc_evaluation>."
 
 #: lang/json/snippet_from_json.py
 msgid "<musicgenre_adj> <musicgenre_prefix><musicgenre_noun>"
@@ -165509,7 +170123,7 @@ msgstr "Они меня достали-таки!"
 
 #: lang/json/snippet_from_json.py
 msgid "*cough cough* Go on without me..."
-msgstr "*кха-кха* Дальше тебе придётся без меня..."
+msgstr "*кха-кха* Дальше тебе придётся без меня…"
 
 #: lang/json/snippet_from_json.py
 msgid "Am I gonna die?"
@@ -165570,12 +170184,12 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid "You are being watched... by THEM."
-msgstr "За вами наблюдают... ОНИ."
+msgstr "За вами наблюдают… ОНИ."
 
 #: lang/json/snippet_from_json.py
 msgid ""
 "You gain the sudden realization that you are the creator of the universe."
-msgstr "Вы внезапно понимаете, что вы - творец Вселенной."
+msgstr "Вы внезапно понимаете, что вы — творец Вселенной."
 
 #: lang/json/snippet_from_json.py
 msgid "You increase all your skills to level 10."
@@ -165584,7 +170198,7 @@ msgstr "Вы повышаете все навыки до уровня 10."
 #: lang/json/snippet_from_json.py
 msgid ""
 "You feel that this must be a global reality show, in which you are the star."
-msgstr "Вы понимаете, что всё это - глобальное реалити-шоу, а вы его звезда."
+msgstr "Вы понимаете, что всё это — глобальное реалити-шоу, а вы его звезда."
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -165693,7 +170307,7 @@ msgstr "%1$s лжёт вам."
 #: lang/json/snippet_from_json.py
 #, no-python-format
 msgid "%1$s was working for... THEM"
-msgstr "%1$s работал... на НИХ."
+msgstr "%1$s работал… на НИХ."
 
 #: lang/json/snippet_from_json.py
 #, no-python-format
@@ -166130,13 +170744,13 @@ msgid ""
 "water is recommended until further notice."
 msgstr ""
 "Это публичное предупреждение Центра по Контролю Заболеваний. Переведённое на"
-" несколько языков сообщение гласит: \"УГРОЗА ОБЩЕСТВЕННОМУ ЗДОРОВЬЮ: Ввиду "
+" несколько языков сообщение гласит: «УГРОЗА ОБЩЕСТВЕННОМУ ЗДОРОВЬЮ: Ввиду "
 "последних событий ЦКЗ предупреждает избегать общественных мест. "
 "Подозревается, что неизвестный биологический загрязнитель влияет на здоровье"
 " граждан, вероятно, неожиданная мутация штамма вируса гриппа A H3N2. ЦКЗ "
 "напоминает общественности прикрывать нос и рот платком при кашле или "
 "чихании, а также тщательно мыть руки с мылом и по возможности получить "
-"очередную прививку. Рекомендуется кипятить воду до дальнейших указаний.\""
+"очередную прививку. Рекомендуется кипятить воду до дальнейших указаний.»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -166149,12 +170763,12 @@ msgid ""
 "personnel evacuate you to a secured facility. Thank you for your compliance."
 msgstr ""
 "Это публичное предупреждение от Министерства по Чрезвычайным Ситуациям. "
-"Сообщение повторяется на нескольких языках и гласит: \"ОСТАВАЙТЕСЬ В СВОИХ "
+"Сообщение повторяется на нескольких языках и гласит: «ОСТАВАЙТЕСЬ В СВОИХ "
 "ДОМАХ! Всем жителям Области Бедствия Новой Англии рекомендуется оставаться в"
 " любом укрытии. Вооружённые Силы США устанавливают карантин. Если вы можете "
 "безопасно добраться до эвакуационного убежища, сделайте это. В ином случае "
 "оставайтесь дома, пока уполномоченный персонал не доставит вас в безопасное "
-"место. Благодарим за сотрудничество.\""
+"место. Благодарим за сотрудничество.»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -166167,7 +170781,7 @@ msgstr ""
 "Это публичное предупреждение от Министерства по Чрезвычайным Ситуациям. "
 "Сообщение повторяется на нескольких языках и содержит список городов, "
 "превращённых в главные пункты эвакуации из Области Бедствия Новой Англии. "
-"Кто-то зачеркнул названия почти всех городов и подписал \"ЗАХВАЧЕН\" к "
+"Кто-то зачеркнул названия почти всех городов и подписал «ЗАХВАЧЕН» к "
 "каждому, за исключением эвакуационного пункта Такома."
 
 #: lang/json/snippet_from_json.py
@@ -166465,8 +171079,8 @@ msgid ""
 "autoclaving./!\\\""
 msgstr ""
 "Листок с указаниями по процедуре автоклавирования. Вы замечаете одну фразу "
-"\"/!\\Перед автоклавированием обязательно поместите инструменты в сумку для "
-"автоклавирования/!\\\""
+"«/!\\ Перед автоклавированием обязательно поместите инструменты в сумку для "
+"автоклавирования /!\\»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -166597,9 +171211,9 @@ msgid ""
 "unconscious body on that Autodoc and remove the chip that is messing up "
 "their brain!\""
 msgstr ""
-"\"Спасите киборгов! Пожалуйста, кто бы это ни читал, помоги им! Оглуши их "
-"или выключи, всё равно как. Но потом затащи их бессознательное тело на "
-"Автодок и удали чип, портящий им мозги!\""
+"«Спасите киборгов! Пожалуйста, кто бы это ни читал, помоги им! Оглуши их или"
+" выключи, всё равно как. Но потом затащи их бессознательное тело на Автодок "
+"и удали чип, портящий им мозги!»"
 
 #: lang/json/snippet_from_json.py
 #, no-python-format
@@ -166634,7 +171248,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid "\"You want my advice?  Smoke crack, it gets shit done.\""
-msgstr "\"Хочешь совет? Кури крэк, он разрулит всю хуйню.\""
+msgstr "«Хочешь совет? Кури крэк, он разрулит всю хуйню.»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -166867,8 +171481,8 @@ msgid ""
 "\"Killed a giant worm thing, but now I'm only three feet tall. Should've "
 "just left the damn worm alone, now none of my clothes fit!\""
 msgstr ""
-"\"Убил огромного червя, но теперь я метр ростом. Надо было просто держаться "
-"подальше от сраного червя, мне не подходит моя одежда!\""
+"«Убил огромного червя, но теперь я метр ростом. Надо было просто держаться "
+"подальше от сраного червя, мне не подходит моя одежда!»"
 
 #: lang/json/snippet_from_json.py
 msgid "\"I don't have enough time to double tap.  You don't either.\""
@@ -167042,11 +171656,11 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid "\"There's still an evacuation point at Concord, spread the word.\""
-msgstr "\"В Конкорде всё ещё есть пункт эвакуации, расскажите всем.\""
+msgstr "«В Конкорде всё ещё есть пункт эвакуации, расскажите всем.»"
 
 #: lang/json/snippet_from_json.py
 msgid "\"STAY AWAY FROM CONCORD\""
-msgstr "\"ДЕРЖИСЬ ПОДАЛЬШЕ ОТ КОНКОРДА\""
+msgstr "«ДЕРЖИСЬ ПОДАЛЬШЕ ОТ КОНКОРДА»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -167332,7 +171946,7 @@ msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid "\"KASHWAK: NO-FO\""
-msgstr "\"КАШВАК: НЕТ-ТЕЛ\""
+msgstr "«КАШВАК: НЕТ-ТЕЛ»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -167551,16 +172165,16 @@ msgid ""
 "\"WBLF 970 went off-air three days ago. There's nobody left on the radio. "
 "Might as well throw this thing away...\""
 msgstr ""
-"\"Станция WBLF 970 вышла из эфира три дня назад. На радио никого не "
-"осталось. Можно просто выкинуть эту штуку...\""
+"«Станция WBLF 970 ушла из эфира три дня назад. На радио никого не осталось. "
+"Можно просто выкинуть эту штуку…»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
 "\"I've heard it's safer across the Mississippi. Going to start driving "
 "today. If you're reading this, pray for me\""
 msgstr ""
-"\"Слышал, на Миссисипи сейчас спокойно. Хочу уехать сегодня. Если вы это "
-"читаете, помолитесь за меня\""
+"«Слышал, на Миссисипи сейчас спокойно. Хочу уехать сегодня. Если вы это "
+"читаете, помолитесь за меня»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -167680,9 +172294,9 @@ msgid ""
 "people we're having a cold war with! This is an invasion! These aren't "
 "zombies, it's just camoflauge! WAKE UP, SHEEPLE!\""
 msgstr ""
-"\"Во всём виноват Китай. Ну правда, почему никто не подозревает людей, с "
+"«Во всём виноват Китай. Ну правда, почему никто не подозревает людей, с "
 "которыми у нас холодная война! Это вторжение! Зомби вовсе не зомби, это "
-"маскировка! БАРАНЫ, ОЧНИТЕСЬ!\""
+"маскировка! БАРАНЫ, ОЧНИТЕСЬ!»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -167918,8 +172532,8 @@ msgid ""
 "\"Don't mix powders, them books said.  Do Not Mix powders.  Didn't listen "
 "did I.  Blew my goddamn pinky off, near lost my right eye.\""
 msgstr ""
-"\"Книжки говорили мне, не мешай порох. Не Мешай Порох. Но я ж не слушал. Мне"
-" к хуям оторвало мизинец, почти потерял правый глаз.\""
+"«Книжки говорили мне, не мешай порох. Не Мешай Порох. Но я ж не слушал. Мне "
+"к хуям оторвало мизинец, почти потерял правый глаз.»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -167928,10 +172542,10 @@ msgid ""
 "fuckn exploded.  low on crank, good as dead, no gun, no toby.  headed to "
 "montreal real sorry bout the bullets\""
 msgstr ""
-"\"делал всё как напесал тоби. в гильзы могло влесть больше, я напхал больше."
-" почти все обминял у рейдеров за дурь. стрельнул из 38 сегодня и он взрвался"
-" нахуй. дури нет, мне кранты, пушки нет, тоби нет. шол в монреаль очинь "
-"жалею про пули\""
+"«делал всё как напесал тоби. в гильзы могло влесть больше, я напхал больше. "
+"почти все обминял у рейдеров за дурь. стрельнул из 38 сегодня и он взрвался "
+"нахуй. дури нет, мне кранты, пушки нет, тоби нет. шол в монреаль очинь жалею"
+" про пули»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -167982,8 +172596,8 @@ msgid ""
 "There are also reports of infected with acidic and/or electric properties."
 msgstr ""
 "ГЕНЕТИЧЕСКИЕ МОДИФИКАЦИИ?: Свидетели в Области Бедствия Новой Англии "
-"заявляют, что наблюдали нечеловеческие способности у заражённых. \"Клянусь, "
-"один из них был ростом с дерево!\" - сообщает один перепуганный выживший. "
+"заявляют, что наблюдали нечеловеческие способности у заражённых. «Клянусь, "
+"один из них был ростом с дерево!» — сообщает один перепуганный выживший. "
 "Также поступают сведения о заражённых с кислотными и/или электрическими "
 "способностями."
 
@@ -167997,8 +172611,8 @@ msgid ""
 msgstr ""
 "СУПЕРСОЛДАТЫ НА МЕСТЕ: Генерал Вестингауз сегодня выступил с заявлением и "
 "сообщил, что в Область Бедствия Новой Англии вертолётами доставлены элитные "
-"отряды с самыми новейшими экспериментальными боевыми имплантатами. \"Мощью "
-"американской технологии и американских солдат мы справимся с этой бедой!\""
+"отряды с самыми новейшими экспериментальными боевыми имплантами. «Мощью "
+"американской технологии и американских солдат мы справимся с этой бедой!»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -168042,7 +172656,7 @@ msgid ""
 "Please retreat to your nearest evacuation center outside town and await "
 "extraction.\""
 msgstr ""
-"ГОРОДА - ОККУПИРОВАННАЯ ТЕРРИТОРИЯ: Представители МЧС сегодня заявили: «Не "
+"ГОРОДА — ОККУПИРОВАННАЯ ТЕРРИТОРИЯ: Представители МЧС сегодня заявили: «Не "
 "пытайтесь защитить свою собственность в городах: противники могут вас "
 "отследить, возможно по запаху. Пожалуйста, отступите в ближайший "
 "эвакуационный центр за пределами города и ждите эвакуации.»"
@@ -168054,10 +172668,10 @@ msgid ""
 "knife until unrecognizable!  The Geneva Conventions don't apply to "
 "civilians!"
 msgstr ""
-"РЕДАКТОР ГОВОРИТ \"УНИЧТОЖАЙТЕ МЁРТВЫХ\". Лежащие на улице мертвецы могут "
-"быть опасны! Если вы убили противника, разбейте его труп в кашу или "
-"разделайте при помощи ножа, пока его нельзя будет распознать! Женевская "
-"Конвенция не касается гражданских!"
+"РЕДАКТОР ГОВОРИТ «УНИЧТОЖАЙТЕ МЁРТВЫХ». Лежащие на улице мертвецы могут быть"
+" опасны! Если вы убили противника, разбейте его труп в кашу или разделайте "
+"при помощи ножа, пока его нельзя будет распознать! Женевская Конвенция не "
+"касается гражданских!"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -168152,8 +172766,8 @@ msgid ""
 msgstr ""
 "США ИГНОРИРУЕТ ТРЕБОВАНИЯ ООН: Посол США в ООН сегодня отклонил требования "
 "ООН о взаимном ядерном разоружении Соединённых Штатов, Китая и Северной "
-"Кореи. \"У нас есть право защищаться, - настаивает посол. - Мы разоружимся "
-"тогда, когда они сделают это.\""
+"Кореи. «У нас есть право защищаться, — настаивает посол. — Мы разоружимся "
+"тогда, когда они сделают это.»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -168259,9 +172873,9 @@ msgid ""
 msgstr ""
 "ОПРОВЕРЖЕНИЕ СЛУХОВ: Заявления о том, что DARPA тайно проводит эксперименты "
 "по телепортации где-то в окрестностях Вейланда, были отвергнуты в ходе "
-"пресс-конференции сегодня утром. \"Я должен уточнить, что мы не только "
+"пресс-конференции сегодня утром. «Я должен уточнить, что мы не только "
 "никогда не проводили таких экспериментов, но и что телепортация существует "
-"только в фантастических фильмах\", сообщил офицер в ходе пресс-конференции."
+"только в фантастических фильмах», сообщил офицер в ходе пресс-конференции."
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -168384,7 +172998,7 @@ msgid ""
 msgstr ""
 "МУТИРОВАВШАЯ ПРОСТУДА: В районе Новой Англии появился новый вирус простуды. "
 "«По-видимому, она не даёт осложнений, но у многих заболевших выявляются "
-"внезапная мышечная слабость и значительная сонливость», - заявляет врач. "
+"внезапная мышечная слабость и значительная сонливость», — заявляет врач. "
 "«Кроме того, судя по нашим сведениям, заболевание длится до десяти дней.»"
 
 #: lang/json/snippet_from_json.py
@@ -168406,10 +173020,10 @@ msgid ""
 " use teleportation to reach aliens, unless they live on some kind of "
 "parallel world.\""
 msgstr ""
-"КОСМИЧЕСКАЯ ТЕЛЕПОРТАЦИЯ - ПРАВДА ИЛИ ВЫМЫСЕЛ? Учёные отвечают на растущую "
-"теорию заговора: \"Количество потребляемого плутония огромно. Мы никогда не "
+"КОСМИЧЕСКАЯ ТЕЛЕПОРТАЦИЯ — ПРАВДА ИЛИ ВЫМЫСЕЛ? Учёные отвечают на растущую "
+"теорию заговора: «Количество потребляемого плутония огромно. Мы никогда не "
 "сможем добраться до инопланетян при помощи телепортации, если только они не "
-"живут в каком-нибудь параллельном мире.\""
+"живут в каком-нибудь параллельном мире.»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -168433,8 +173047,8 @@ msgid ""
 msgstr ""
 "ПОТРЕБЛЕНИЕ НАРКОТИКОВ ВОЗРАСТАЕТ: Недавняя статистика показала, что "
 "потребление наркотиков в Новой Англии выросло на 20% за последние 2 года. "
-"\"Люди боятся за свою работу, свою страну, даже за свою жизнь... конечно, "
-"некоторые из них обратят свой взор на наркотики\", - говорит эксперт."
+"«Люди боятся за свою работу, свою страну, даже за свою жизнь… конечно, "
+"некоторые из них обратят свой взор на наркотики», — говорит эксперт."
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -168465,10 +173079,10 @@ msgid ""
 "actors, what more does this adorable android hides under its smiling face?  "
 "Our expert got the answer for you!"
 msgstr ""
-"НОВОСТИ МИРА ТЕХНИКИ: Компания \"Жуть\" выпустила новинку - Бакалейный "
-"Робот! Тысячи условий иначе-если, предзаписанный голос профессиональных "
-"актёров, что же ещё скрывается под улыбкой этого милого андроида? У нашего "
-"эксперта есть ответ!"
+"НОВОСТИ МИРА ТЕХНИКИ: Компания «Жуть» выпустила новинку — Бакалейный Робот! "
+"Тысячи условий иначе-если, предзаписанный голос профессиональных актёров, "
+"что же ещё скрывается под улыбкой этого милого андроида? У нашего эксперта "
+"есть ответ!"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -168491,9 +173105,9 @@ msgid ""
 msgstr ""
 "ОТКРЫТА НОВАЯ ЛАБОРАТОРИЯ: Сегодня прошло официальное открытие "
 "Исследовательского Центра Г.Р. Беннета при участии Министерства Энергетики. "
-"По словам заместителя министра Рэндалла Балакришана, \"Этот комплекс - один "
+"По словам заместителя министра Рэндалла Балакришана, «Этот комплекс — один "
 "из самых высокотехнологичных в мире. С открытием Центра Г.Р. Беннета будущее"
-" Новой Англии выглядит ещё ярче, чем раньше.\""
+" Новой Англии выглядит ещё ярче, чем раньше.»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -168503,7 +173117,7 @@ msgid ""
 "and the Philippines.  \"We must pray for the best while preparing for the "
 "worst. We cannot abandon key allies in the face of Chinese bullying.\""
 msgstr ""
-"ПОДДЕРЖАТЬ СТРАНЫ, КОТОРЫЕ ПОДДЕРЖИВАЮТ НАС - ПРЕЗИДЕНТ: Сегодня президент "
+"ПОДДЕРЖАТЬ СТРАНЫ, КОТОРЫЕ ПОДДЕРЖИВАЮТ НАС — ПРЕЗИДЕНТ: Сегодня президент "
 "высказал неожиданное и непопулярное заявление, в котором не исключил "
 "введение военного призыва в мирное время в ответ на возрастающую китайскую "
 "агрессию в отношении Тайваня и Филиппин: «Мы должны молиться за лучшее, пока"
@@ -168591,10 +173205,10 @@ msgid ""
 "uncertain times. After all, remember the clown thing a few years ago?\""
 msgstr ""
 "МИФ ОПРОВЕРГНУТ: МЕРТВЕЦЫ ОСТАЮТСЯ МЕРТВЕЦАМИ: Истории про восставших "
-"мертвецов \"совершенно безосновательны\", - заявил сегодня генерал. \"Это же"
-" очевидная выдумка людей, чтобы найти пять минут славы или напугать "
-"население в непростые времени. В конце концов, вы же помните тот случай с "
-"клоуном пару лет назад?\""
+"мертвецов «совершенно безосновательны», — заявил сегодня генерал. «Это же "
+"очевидная выдумка людей, чтобы найти пять минут славы или напугать население"
+" в непростые времени. В конце концов, вы же помните тот случай с клоуном "
+"пару лет назад?»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -168616,9 +173230,9 @@ msgid ""
 "new street drug.\""
 msgstr ""
 "ВСПЫШКИ НАСИЛИЯ, ВЫЗВАННЫЕ «НОВЫМ НАРКОТИКОМ»: Сегодня были развенчаны слухи"
-" о бунтах. \"Это были отдельные случаи\", — сообщил глава местной полиции. —"
-" \"Беспорядочное и бессмысленное насилие, мы подозреваем, что это примесь в "
-"новом уличном наркотике.\""
+" о бунтах. «Это были отдельные случаи», — сообщил глава местной полиции. — "
+"«Беспорядочное и бессмысленное насилие, мы подозреваем, что это примесь в "
+"новом уличном наркотике.»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -168628,9 +173242,9 @@ msgid ""
 "the water making people zombies!\""
 msgstr ""
 "ЗОМБИ-НАРКОТИК? Блоггер предполагает, что недавние бунты были вызваны "
-"химической атакой со стороны Китая. \"Они завидуют нашему превосходству в "
+"химической атакой со стороны Китая. «Они завидуют нашему превосходству в "
 "кибернетике и поэтому объединились с Гаити, чтобы добавлять вуду-наркотики в"
-" воду, чтобы делать из людей зомби!\""
+" воду, чтобы делать из людей зомби!»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -169227,7 +173841,7 @@ msgid ""
 "destroyed from the inside out, while the former sustained little damage.  I "
 "would like to explore the phenomenon further, but subjects are expensive."
 msgstr ""
-"Во вспомогательной телепортационной лаборатории произошёл инцидент - "
+"Во вспомогательной телепортационной лаборатории произошёл инцидент — "
 "наблюдаемый субъект телепортировался внутрь другого субъекта. Последний был "
 "полностью уничтожен изнутри, а первый получил лёгкие повреждения. Я хочу "
 "исследовать этот феномен и дальше, но субъекты стоят дорого."
@@ -170590,9 +175204,9 @@ msgid ""
 "human candy!  Are you a real monster?  Will you be able to devour it all?\""
 msgstr ""
 "Флаер-рекламка какой-то конфеты. На нём нарисован летящий человечек из "
-"сплошной карамели, он в ужасе смотрит на вас. \"Сахарок - первая в мире "
+"сплошной карамели, он в ужасе смотрит на вас. «Сахарок — первая в мире "
 "конфета размером с человека! Настоящее ли вы чудовище? Сумеете ли его "
-"съесть?\""
+"съесть?»"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -171641,7 +176255,7 @@ msgid "a static hissing sound."
 msgstr "шипение."
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
 msgstr "«Эта жуткая заброшенная лаборатория выглядит безопасно…»"
 
 #: lang/json/speech_from_json.py
@@ -171652,14 +176266,14 @@ msgstr "«Не бойся, непохоже, чтоб что-то могло в
 
 #: lang/json/speech_from_json.py
 msgid "\"Hold on, I want to pulp that zombie corpse.\""
-msgstr "\"Погоди, я хочу разбить труп того зомби.\""
+msgstr "«Погоди, я хочу разбить труп того зомби.»"
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
+msgid "\"Burning… from the inside…\""
 msgstr "«Горю… изнутри…»"
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
+msgid "\"This smell…  Don't know…\""
 msgstr "«Этот запах… Не знаю…»"
 
 #: lang/json/speech_from_json.py
@@ -171671,19 +176285,19 @@ msgid "a scraping noise."
 msgstr "скрежет."
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
+msgid "\"No…  Stop the burning!\""
 msgstr "«Нет… Останови огонь!»"
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
 msgstr "«Грррх… Кровь… Голод…»"
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
+msgid "\"Hunger…  Must eat…\""
 msgstr "«Хочу есть… Надо есть…»"
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
+msgid "\"Run…  Chase…  Eat…\""
 msgstr "«Бежать… Искать… Есть…»"
 
 #: lang/json/speech_from_json.py
@@ -171798,32 +176412,32 @@ msgstr "«Не сюда! Налево!»"
 
 #: lang/json/speech_from_json.py
 msgid "\"I told you to let me die.\""
-msgstr "\"Я просил тебя дать мне умереть.\""
+msgstr "«Я просил тебя дать мне умереть.»"
 
 #: lang/json/speech_from_json.py
 msgid "\"W-where am I?  Why does it hur-REBOOTING IN 59 SECONDS.\""
-msgstr "\"Г-где я? Почему мне так боль-ПЕРЕЗАГРУЗКА ЧЕРЕЗ 59 СЕКУНД.\""
+msgstr "«Г-где я? Почему мне так боль-ПЕРЕЗАГРУЗКА ЧЕРЕЗ 59 СЕКУНД.»"
 
 #: lang/json/speech_from_json.py
 msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
-msgstr "\"ЭТО УСТРОЙСТВО НЕИСПРАВНО. ПОЖАЛУЙСТА, СВЯЖИТЕСЬ С ДЕЖУРНЫМ.\""
+msgstr "«ЭТО УСТРОЙСТВО НЕИСПРАВНО. ПОЖАЛУЙСТА, СВЯЖИТЕСЬ С ДЕЖУРНЫМ.»"
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
-msgstr "\"Не могу... дышать...\""
+msgid "\"Can't… breathe…\""
+msgstr "«Не могу… дышать…»"
 
 #: lang/json/speech_from_json.py
 msgid "\"This cannot continue.\""
-msgstr "\"Так больше нельзя.\""
+msgstr "«Так больше нельзя.»"
 
 #: lang/json/speech_from_json.py
 msgid "\"USER PASSWORD UNRECOGNIZED.\""
-msgstr "\"НЕВЕРНЫЙ ПАРОЛЬ.\""
+msgstr "«НЕВЕРНЫЙ ПАРОЛЬ.»"
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
 msgstr "«Ты не видел моего друга? У него вчера была операция… или позавчера…»"
 
 #: lang/json/speech_from_json.py
@@ -171835,21 +176449,20 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr "«Я сделал, что ты просил. Пожалуйста, отпусти меня!»"
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
-msgstr "\"Я не могу... но так надо. Как это рассчитать?\""
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
+msgstr "«Я не могу… но так надо. Как это рассчитать?»"
 
 #: lang/json/speech_from_json.py
 msgid "\"This is a dream.  This has to be a dream.\""
-msgstr "\"Это всё сон. Это должен быть сон.\""
+msgstr "«Это всё сон. Это должен быть сон.»"
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
-msgstr ""
-"\"Теперь это моя жизнь... теперь это моя жизнь... теперь это моя жизнь...\""
+msgid "\"This is my life now… this is my life now… this is my life now…\""
+msgstr "«Теперь это моя жизнь… Теперь это моя жизнь… Теперь это моя жизнь…»"
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
-msgstr "\"Я хочу домой...\""
+msgid "\"Wanna go home…\""
+msgstr "«Я хочу домой…»"
 
 #: lang/json/speech_from_json.py
 msgid "screams of pain."
@@ -171887,87 +176500,87 @@ msgstr "мягкий электронный голос «Вот так. Прос
 msgid ""
 "a voice say, \"I don't want to go but our time together is drawing to an "
 "end.\""
-msgstr "голос \"Я не хочу уходить, но наше с тобой время истекает.\""
+msgstr "голос «Я не хочу уходить, но наше с тобой время истекает.»"
 
 #: lang/json/speech_from_json.py
 msgid "a cheery voice say, \"Customer?  We'll be friends forever, right?\""
-msgstr "весёлый голос \"Покупатель? Мы же будем друзьями навечно, правда?\""
+msgstr "весёлый голос «Покупатель? Мы же будем друзьями навечно, правда?»"
 
 #: lang/json/speech_from_json.py
 msgid ""
 "a neutral voice say, \"Customer I must inform you that my allocated time "
 "with you will soon come to its end.\""
 msgstr ""
-"нейтральный голос \"Покупатель, я должен сообщить, что выделенное вам время "
-"скоро истечёт.\""
+"нейтральный голос «Покупатель, я должен сообщить, что выделенное вам время "
+"скоро истечёт.»"
 
 #: lang/json/speech_from_json.py
 msgid ""
 "a neutral voice say, \"I'll have to leave you soon.  You can acquire more "
 "friendship through my dedicated interface if you wish for me to stay.\""
 msgstr ""
-"нейтральный голос \"Я скоро вас покину. Вы можете приобрести больше дружбы "
+"нейтральный голос «Я скоро вас покину. Вы можете приобрести больше дружбы "
 "при помощи моего специализированного интерфейса, если хотите, чтобы я "
-"остался.\""
+"остался.»"
 
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr ""
-"обеспокоенный голос \"Покупатель, пожалуйста, не мог бы ты достать ещё "
-"дружбы? Я не хочу уходить...\""
+"обеспокоенный голос «Покупатель, пожалуйста, не мог бы ты достать ещё "
+"дружбы? Я не хочу уходить…»"
 
 #: lang/json/speech_from_json.py
 msgid "a voice say, \"Oh no!  You ran out of friendship!\""
-msgstr "голос \"О нет! Дружба кончилась!\""
+msgstr "голос «О нет! Дружба кончилась!»"
 
 #: lang/json/speech_from_json.py
 msgid "a cheery voice say, \"Well I'm done here.  Have a nice day.\""
-msgstr "весёлый голос \"Что ж, моя работа выполнена. Хорошего дня.\""
+msgstr "весёлый голос «Что ж, моя работа выполнена. Хорошего дня.»"
 
 #: lang/json/speech_from_json.py
 msgid ""
 "a cheery voice say, \"Here are your groceries.  Thank you for shopping with "
 "me today, have a nice day.\""
 msgstr ""
-"весёлый голос \"Вот твои покупки. Спасибо, что сегодня ты был со мной, "
-"хорошего тебе дня.\""
+"весёлый голос «Вот твои покупки. Спасибо, что сегодня ты был со мной, "
+"хорошего тебе дня.»"
 
 #: lang/json/speech_from_json.py
 msgid "a neutral voice say, \"My job here is done.  Have a nice day.\""
-msgstr "нейтральный голос \"Моя работа выполнена. Хорошего дня.\""
+msgstr "нейтральный голос «Моя работа выполнена. Хорошего дня.»"
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
-msgstr "искажённый голос \"Покупатель... Что происходит? Мне нехорошо.\""
+msgstr "искажённый голос «Покупатель… Что происходит? Мне нехорошо.»"
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
-msgstr "искажённый голос \"Что... что ты наделал? Я не чувствую пальцев!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
+msgstr "искажённый голос: «Что… что ты наделал? Я не чувствую пальцев!»"
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
-msgstr "искажённый голос \"Носить пакеты? Не понимаю...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
+msgstr "искажённый голос: «Носить пакеты? Не понимаю…»"
 
 #: lang/json/speech_from_json.py
 msgid ""
 "a robotic voice say, \"IRREGULAR ACTIVITY DETECTED.  THUMBS USAGE DENIED.\""
 msgstr ""
-"электронный голос \"ЗАМЕЧЕНА ПОДОЗРИТЕЛЬНАЯ АКТИВНОСТЬ. ИСПОЛЬЗОВАНИЕ "
-"ПАЛЬЦЕВ ОТКЛОНЕНО.\""
+"электронный голос «ЗАМЕЧЕНА ПОДОЗРИТЕЛЬНАЯ АКТИВНОСТЬ. ИСПОЛЬЗОВАНИЕ ПАЛЬЦЕВ"
+" ОТКЛОНЕНО.»"
 
 #: lang/json/speech_from_json.py
 msgid ""
 "a robotic voice say, \"UNLICENSED USE DETECTED.  CARRYING PROTOCOL "
 "DISABLED.\""
 msgstr ""
-"электронный голос \"ЗАМЕЧЕНО НЕЗАРЕГИСТРИРОВАННОЕ ИСПОЛЬЗОВАНИЕ. ПРОТОКОЛ "
-"ПЕРЕНОСКИ ВЫКЛЮЧЕН.\""
+"электронный голос «ЗАМЕЧЕНО НЕЗАРЕГИСТРИРОВАННОЕ ИСПОЛЬЗОВАНИЕ. ПРОТОКОЛ "
+"ПЕРЕНОСКИ ВЫКЛЮЧЕН.»"
 
 #: lang/json/speech_from_json.py
 msgid "\"Stop where you are!\""
@@ -172078,8 +176691,8 @@ msgid "\"Police inbound.  Stay where you are!\""
 msgstr "«Полиция скоро будет. Оставайтесь на месте!»"
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
-msgstr "Я ПОЕШЬ-КА. И Я ПРИНОШУ НАСЫЩЕНИЕ!"
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
+msgstr "«Я ПОЕШЬ-КА. И Я ПРИНОШУ НАСЫЩЕНИЕ!»"
 
 #: lang/json/speech_from_json.py
 msgid "\"Come to FoodPlace today and buy food!\""
@@ -172099,7 +176712,7 @@ msgid "\"FoodPlace: It's the Calories.\""
 msgstr "«„Сядь-и-поешь“: Всё дело в Калориях.»"
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
 msgstr "«Нужно поесть? Ну так пойдём со мной в СЯДЬ-И-ПОЕШЬ!!»"
 
 #: lang/json/speech_from_json.py
@@ -172167,8 +176780,8 @@ msgid "You shouldn't have done that."
 msgstr "Ты не должен был так делать."
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
-msgstr "Давай сыграем… в русскую рулетку."
+msgid "Let's play… Russian roulette."
+msgstr "Давай сыграем… В русскую рулетку."
 
 #: lang/json/speech_from_json.py
 msgid "I hate you."
@@ -172179,7 +176792,7 @@ msgid "Go kill yourself!"
 msgstr "Убей себя!"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
+msgid "Big Brother is watching you…"
 msgstr "Большой Брат следит за тобой…"
 
 #: lang/json/speech_from_json.py
@@ -172191,11 +176804,11 @@ msgid "Why won't you die?"
 msgstr "Почему ты никак не сдохнешь?"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
-msgstr "Кровь… Прекрасно."
+msgid "Blood…  Delicious."
+msgstr "Кровь… Вкуснятина."
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
+msgid "See you… IN HELL!"
 msgstr "Увидимся… В АДУ!"
 
 #: lang/json/speech_from_json.py
@@ -172211,7 +176824,7 @@ msgid "What did you do with my Mommy?"
 msgstr "Что ты сделал с моей мамочкой?"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
+msgid "Stay with me… forever!"
 msgstr "Будь со мной… всегда!"
 
 #: lang/json/speech_from_json.py
@@ -173546,7 +178159,7 @@ msgstr "Чёрт-те где"
 
 #: lang/json/start_location_from_json.py
 msgid "Experiment Cell"
-msgstr "Экспериментальная Ячейка"
+msgstr "Клетка для экспериментов"
 
 #: lang/json/start_location_from_json.py
 msgid "Science lab"
@@ -173656,6 +178269,10 @@ msgstr "Бункер добытчиков"
 msgid "Wizard's Secret Basement Study"
 msgstr "Подвал секретного кабинета волшебника"
 
+#: lang/json/start_location_from_json.py
+msgid "Wizard's lake retreat"
+msgstr ""
+
 #: lang/json/start_location_from_json.py
 msgid "Candy Shop"
 msgstr "Кондитерская"
@@ -173705,16 +178322,16 @@ msgid "You there. Quiet down. Can you hear it? The song?"
 msgstr "Ты тут. Тихо. Ты слышишь? Песнь?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
-msgstr "Что? Ты о чём? Какая песня?"
+msgid "What?  What do you mean?  What song?"
+msgstr "Что? О чём ты? Какая песня?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
-msgstr "Насчёт песен..."
+msgid "So about the songs…"
+msgstr "Насчёт песен…"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
 msgstr "Ты упоминала какой-то цикл, когда я отдал тебе кости. Что это такое?"
 
@@ -173731,7 +178348,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr "Могу ли я помочь тебе с песней?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr "Мне пора. Береги себя, Провидица."
 
 #: lang/json/talk_topic_from_json.py
@@ -173739,16 +178356,16 @@ msgid ""
 "Listen carefully. The bones... they sing. Can you hear it? The song they "
 "weave? The stories they hold?"
 msgstr ""
-"Слушай внимательно. Кости... они поют. Ты слышишь? Слышишь песню, которую "
-"они плетут? Слышишь истории, которые они хранят?"
+"Слушай внимательно. Кости… они поют. Ты слышишь? Слышишь песню, которую они "
+"выводят? Слышишь истории, которые они хранят?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
-msgstr "Чего? Поющие кости? Ты вообще о чём?"
+msgid "What?  Singing bones?  What are you talking about?"
+msgstr "Чего? Поющие кости? Что за чертовщина?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
-msgstr "Э... да, конечно. Думаю, мне пора идти."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
+msgstr "Э… Да, конечно. Думаю, мне пора идти."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -173759,11 +178376,11 @@ msgid ""
 " taking the bones does the cycle end - their story, their song, their "
 "strength, become yours to use."
 msgstr ""
-"Когда всё произошло, когда случился Катаклизм, что-то... поменялось. Это "
-"видно по всем существам, но главное видно в костях. Они ломаются, меняются, "
+"Когда всё произошло, когда случился Катаклизм, что-то… поменялось. Это видно"
+" по всем существам, но главное видно в костях. Они ломаются, меняются, "
 "восстают в бесконечном цикле. Живые мертвецы ходят. Чудища рвут друг друга "
 "на куски. Видно резонанс, тихое гудение чистой силы, и цикл можно "
-"прекратить, только если забрать кости - их история, их песня, их сила станут"
+"прекратить, только если забрать кости — их история, их песня, их сила станут"
 " твоими."
 
 #: lang/json/talk_topic_from_json.py
@@ -173790,7 +178407,7 @@ msgstr ""
 "только если осмотришь кости. Это и есть история. Что бы ни вызвало "
 "изменения, оно живое, оно движется внутри всех нас, оно неотъемлемая часть "
 "нового мира. Оно содержит силу перемен. Когда мы держим кости, мы держим "
-"силу. Это и есть сила. И вместе... вместе они рождают прекрасную песню."
+"силу. Это и есть сила. И вместе… вместе они рождают прекрасную песню."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I think I understand what you mean, though I am not sure if I agree."
@@ -173809,7 +178426,7 @@ msgid "I will bear that in mind"
 msgstr "Буду иметь в виду."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr "Цели? Так зачем ты собираешь кости?"
 
 #: lang/json/talk_topic_from_json.py
@@ -173820,13 +178437,13 @@ msgid ""
 " or end it. Makes no difference."
 msgstr ""
 "Песню можно плести по-разному. Вырезанные костяные амулеты, оружие и доспехи"
-" - все они хранят неимоверную силу, и в нужное время мы с собратьями соберём"
+" — все они хранят неимоверную силу, и в нужное время мы с собратьями соберём"
 " великую песню и споём её, дабы восстановить мир. Восстановить или "
 "завершить. Без разницы."
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
-msgstr "Завершить мир? Чего?"
+msgid "End the world?  What?"
+msgstr "Конец света? Чего?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -173834,16 +178451,16 @@ msgid ""
 "accelerate it to a time beyond all, ending it all the same. But with the "
 "world looking as is, both options are preferable."
 msgstr ""
-"Мы верим, что достаточная сила в одной песне способна обратить Катаклизм - "
+"Мы верим, что достаточная сила в одной песне способна обратить Катаклизм — "
 "или безмерно его ускорить, что его всё равно завершит. Но с учётом состояния"
 " мира годятся оба варианта."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr ""
-"Звучит немного... апокалиптично, но я полагаю, это просто вера, как и любая "
+"Звучит немного… апокалиптично, но я полагаю, это просто вера, как и любая "
 "другая. У тебя хотя бы цель помочь миру тем или иным способом."
 
 #: lang/json/talk_topic_from_json.py
@@ -173861,8 +178478,8 @@ msgstr ""
 "чувствуй песню."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
-msgstr "Спасибо... спасибо тебе."
+msgid "I… thank you."
+msgstr "Спасибо… Спасибо тебе."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -173883,8 +178500,7 @@ msgid ""
 "The song is... quiet for now. Perhaps with time, more notes will be etched "
 "in the bones of this world."
 msgstr ""
-"Пока что песня... утихла. Возможно, на костях мира будет высечено больше "
-"нот."
+"Пока что песня… утихла. Возможно, на костях мира будет высечено больше нот."
 
 #: lang/json/talk_topic_from_json.py
 msgid "An acolyte should not take on too many songs at once."
@@ -173894,18 +178510,6 @@ msgstr "Послушнику не следует браться за много
 msgid "That is all for now."
 msgstr "Пока что всё."
 
-#: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
-msgstr "Ещё есть невырезанные кости и неспетые песни. Присоединишься ко мне?"
-
-#: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
-msgstr "Ты хочешь взяться за ещё больше песен?"
-
-#: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
-msgstr "Думаешь, ты сможешь взвалить обузу лишних костей?"
-
 #: lang/json/talk_topic_from_json.py
 msgid "A song may yet be sung by you, should you wish to."
 msgstr "Тебе ещё предстоит спеть песню, если желаешь."
@@ -173919,6 +178523,18 @@ msgid ""
 "I know of certain bones that could be of use, if you'd like to know more."
 msgstr "Я знаю несколько полезных костей, если хочешь услышать побольше."
 
+#: lang/json/talk_topic_from_json.py
+msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgstr "Ещё есть невырезанные кости и неспетые песни. Присоединишься ко мне?"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Do you wish to take on more songs?"
+msgstr "Ты хочешь взяться за ещё больше песен?"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Do you believe you can take on the burden of additional bones?"
+msgstr "Думаешь, ты сможешь взвалить обузу лишних костей?"
+
 #: lang/json/talk_topic_from_json.py
 msgid "I see."
 msgstr "Понятно."
@@ -173943,7 +178559,7 @@ msgstr ""
 "кончиков пальцев. Затем принеси мне кости, и я обрежу их для тебя."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr "Ну, мне хочется узнать, что будет дальше. Я в деле."
 
 #: lang/json/talk_topic_from_json.py
@@ -173951,8 +178567,8 @@ msgid "Not interested."
 msgstr "Не интересует."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
-msgstr "Считай, уже сделано. Но я хочу спросить..."
+msgid "Consider it done.  But I also wanted to ask…"
+msgstr "Считай, уже сделано. Но я хочу спросить…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Where should I start?"
@@ -173967,7 +178583,7 @@ msgid "I'm off then."
 msgstr "Тогда я иду."
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr "В общем, существо, которое не зомби и не монстр. Ясно."
 
 #: lang/json/talk_topic_from_json.py
@@ -173979,8 +178595,8 @@ msgstr ""
 "твою песню."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
-msgstr "Ясно. Хорошо."
+msgid "I see.  Very well then."
+msgstr "Ясно. Очень хорошо."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -173999,12 +178615,12 @@ msgid "I am glad to hear it. Let's go then."
 msgstr "Приятно слышать. Тогда пойдём."
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr "Отлично, но прямо сейчас мне нужно идти одному. Может, потом."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
-msgstr "Может, в другой раз. Давай сменим тему..."
+msgid "Maybe some other time.  Changing the topic…"
+msgstr "Может, в другой раз. Давай сменим тему…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alright, but I have to go now."
@@ -174022,35 +178638,33 @@ msgid ""
 "That's why we need to amass the Song. That's why it has to end, even if it "
 "means the destruction, not restoration."
 msgstr ""
-"Дело не в том, что Катаклизм принёс бродячие ужасы и чудовищ. Он начал... "
+"Дело не в том, что Катаклизм принёс бродячие ужасы и чудовищ. Он начал… "
 "цикл, какой-то цикл. Всё повторяется. Это можно видеть только в других, но "
 "это происходит и с нами, даже с тобой и мной. Сколько раз ты умер? Твою "
 "плоть сорвали, твою плоть сожрали. Или, может, то был тихий плач смерти от "
 "замерзания. Но твои кости снова восстали. Другая плоть, другое имя, иногда "
-"даже другие знания, но кости - они те же самые. Мы все застряли в одном "
+"даже другие знания, но кости — они те же самые. Мы все застряли в одном "
 "цикле. Мы просто забываем. И поэтому нам нужно распространить Песню. Вот "
 "поэтому она всё прекратит, даже если это значит разрушение, не "
 "восстановление."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
 msgstr ""
-"Нихрена... нихрена себе вера. Что ж, если тебе так легче справиться, кто я "
+"Нихрена… Нихрена себе вера. Что ж, если тебе так легче справиться, кто я "
 "такой, чтоб спорить."
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr "А я-то раньше думал, ты чокнутая. Я ухожу."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
-"Я сам по себе, но мне бы хотелось пойти за тобой. Я умею кучу всего: драться, учить тебя или учиться у тебя, нести вещи, перевязывать твои раны, строить лагеря, идти куда-нибудь, охранять что-нибудь, ездить на лошадях, пользоваться бионикой, даже просто болтать, давать советы или рассказать о своём прошлом. Ты можешь дать мне указания при разговоре или по радио или крикнуть мне команду.\n"
-"Что бы тебе хотелось обо мне узнать?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Forget I asked."
@@ -174060,6 +178674,10 @@ msgstr "Забудь, что я спрашивал."
 msgid "Skip it, let's get going."
 msgstr "Забей, давай идти дальше."
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr "Что там насчёт указаний?"
@@ -174117,13 +178735,25 @@ msgid "What about chit-chatting and your background?"
 msgstr "Что там про болтовню и твоё прошлое?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
-msgstr "Ещё что-то, что мне следует знать?"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr "Какие-нибудь новые возможности?"
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr "Конечно. Есть ли какой-нибудь простой способ, чтобы тебя кормить?"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -174179,10 +178809,10 @@ msgstr "Можно ли быстро отдавать приказы в бою?"
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
-"Если мой навык выше твоего, я могу помочь тебе поднять его. Но много учиться — скучно, так что я нечасто буду этим заниматься. И я не собираюсь учить тебя, если мы в опасности, или я хочу есть, или устал, или ты за рулём. \n"
-"  Если мы в безопасном месте, а ты читаешь улучшающую навык книгу, я буду слушать, если у меня нет такого навыка. Ты даже можешь читать мне книги по навыкам, которые у тебя уже развиты."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Instead of reading to you, can we just talk?"
@@ -174209,10 +178839,10 @@ msgstr "Расскажи, как давать тебе медицинские п
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
-"Я подсоблю тебе, если ты покажешь, где мне работать.\n"
-"  При помощи менеджера зон (клавиша 'Y') установи зону сортировки для своих вещей, или задай чертежи здания, или определи, где ты хочешь сажать растения, или где нужно срубить деревья, или где ты хочешь разобрать машину. Потом прикажи мне сортировать, строить, рубить деревья, разбирать машину или заниматься грядками, и я уйду делать всё возможное. Если мне понадобятся инструменты, оставь их поближе к рабочему месту - топоры для рубки, лопаты, семена и удобрения для работы с грядками, гаечные ключи и пилы или ящик инструментов для разборки машины. Я умею сортировать предметы без инструментов, но лучше размечай кучи сортированного и несортированного барахла поближе, чтоб мне не пришлось слишком шастать туда-сюда."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Good to know.  Can you perform first aid?"
@@ -174256,18 +178886,19 @@ msgstr "Ты там что-то говорил про перемещение к
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
-"Ты приказываешь мне стоять на страже, я стою на месте и охраняю его — если только я не в машине, тогда я останусь в ней.\n"
-"  Однако я не прирастаю к месту, так что если услышу что-то подозрительное, то пойду посмотреть, чтоб на меня не прыгнули из темноты. Если хочешь, чтоб я стоял как вкопанный, можешь приказать не исследовать шум — но я расстроюсь, если меня подстрелит какой-то бандит, потому что я его не видел, а ты запретил мне его искать.\n"
-"  Ты можешь задать зону запрета исследования (при помощи менеджера зон, по умолчанию «Y»), чтоб я мог игнорировать монстров за дверью, про которых ты в курсе. Ты также можешь задать зону исследования, чтобы я игнорировал весь шум снаружи неё. У зоны не-исследования приоритет выше, если шум происходит в месте перекрытия этих зон. Если где угодно размечена зона исследования (даже очень далеко), я не буду исследовать шум снаружи неё, так что поосторожнее. Так что я не хочу, чтоб меня подстрелил бандит, потому что ты приказал мне не искать его, но ещё не хочу искать, кто это шумит за дверью и обнаружить кошмарную тварь, о которой ты забыл меня предупредить."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr "На всякий случай, как мне сказать тебе стоять на месте?"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -174350,15 +178981,28 @@ msgid ""
 msgstr ""
 "Могу я без крика приказать тебе открывать и закрывать двери или не спать?"
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr "Что-нибудь еще, что я могу сделать в менеджере фракции?"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr "Есть ли способ, как мы можем построить базу для нашей фракции?"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
-"Что ж, тут кое-что новенькое! Но кое-что и поменялось.\n"
-"  Когда-то я умел устанавливать в тебя КБМ и умел носить пассивную бионику. Но теперь я могу пользоваться некоторой активной бионикой и готов пояснить пару деталей насчёт этого.\n"
-"  А ещё я умею ездить на лошадях, и ты можешь приказывать мне заниматься грядками, рубить деревья или даже строить дома по чертежу."
 
 #: lang/json/talk_topic_from_json.py
 msgid "You can ride horses?  Can I ride horses?"
@@ -174368,6 +179012,10 @@ msgstr "Ты можешь ездить на лошадях? А я могу ез
 msgid "Tell me more about the activities you can do now."
 msgstr "Расскажи про работу, которую ты умеешь выполнять."
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -174531,7 +179179,7 @@ msgstr "Охраняй эту позицию."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I want to assign you to work at this camp."
-msgstr ""
+msgstr "Я хочу дать вам работу в этом лагере."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Let's talk about your current activity."
@@ -174582,19 +179230,19 @@ msgid "Let's go."
 msgstr "Пошли."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
+msgid "Change your engagement rules…"
 msgstr "Изменить порядок боевых действий…"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
+msgid "Change your aiming rules…"
 msgstr "Изменить правила прицеливания…"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
-msgstr "Изменить твои правила сберегания бионической энергии…"
+msgid "Change your bionic power reserve rules…"
+msgstr "Изменить твои правила распоряжения бионической энергией…"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
+msgid "Change your bionic power recharge rules…"
 msgstr "Изменить твои правила зарядки бионической энергии…"
 
 #: lang/json/talk_topic_from_json.py
@@ -174605,14 +179253,14 @@ msgstr "Ходи свободно, если нужно."
 msgid "Stick close to me, no matter what."
 msgstr "Держись ближе ко мне, несмотря ни на что."
 
-#: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
-msgstr "<ally_rule_follow_distance_2_true_text>"
-
 #: lang/json/talk_topic_from_json.py
 msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr "<ally_rule_follow_distance_2_false_text>"
 
+#: lang/json/talk_topic_from_json.py
+msgid "<ally_rule_follow_distance_2_true_text>"
+msgstr "<ally_rule_follow_distance_2_true_text>"
+
 #: lang/json/talk_topic_from_json.py
 msgid "Don't use ranged weapons anymore."
 msgstr "Больше не используй стрелковое оружие."
@@ -174882,8 +179530,8 @@ msgid "Nah, I'm just kidding."
 msgstr "Не, я просто пошутил."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
-msgstr "Двигайся в эту локацию…"
+msgid "Please go to this location…"
+msgstr "Пожалуйста, иди вот в это место."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Stay at your current position."
@@ -174895,7 +179543,7 @@ msgstr "Покажи, что нужно сделать в лагере."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'm currently <current_activity>."
-msgstr "Сейчас моё занятие - <current_activity>."
+msgstr "Сейчас моё занятие — <current_activity>."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'm not doing much currently."
@@ -174903,7 +179551,7 @@ msgstr "Я сейчас ничего не делаю."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I meant what are your goals?"
-msgstr ""
+msgstr "Я имел в виду, какова твоя цель?"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Carry on."
@@ -175021,8 +179669,8 @@ msgstr ""
 "этим?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
-msgstr "О, ну типа неплохо, неплохо…"
+msgid "Oh you know, not bad, not bad…"
+msgstr "О, ну, типа, неплохо, неплохо…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "<hallu_dont_trade>"
@@ -175109,14 +179757,14 @@ msgstr "<hands_up>"
 msgid "&Put hands up."
 msgstr "&Поднять руки."
 
-#: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
-msgstr "*бросает своё оружие."
-
 #: lang/json/talk_topic_from_json.py
 msgid "*drops_her_weapon."
 msgstr "*бросает_своё_оружие."
 
+#: lang/json/talk_topic_from_json.py
+msgid "*drops his weapon."
+msgstr "*бросает своё оружие."
+
 #: lang/json/talk_topic_from_json.py
 msgid "Now get out of here"
 msgstr "А теперь убирайся."
@@ -175130,11 +179778,11 @@ msgid "Okay, I'm going."
 msgstr "Ладно, я иду."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
+msgid "About that job…"
 msgstr "По поводу работы…"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
+msgid "About one of those jobs…"
 msgstr "По поводу одного из этих заданий…"
 
 #: lang/json/talk_topic_from_json.py
@@ -175153,14 +179801,6 @@ msgstr "У меня нет работы для тебя."
 msgid "I don't have any more jobs for you."
 msgstr "У меня больше нет для тебя работы."
 
-#: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
-msgstr "У меня для тебя есть и другая работа. Хочешь послушать?"
-
-#: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
-msgstr "У меня для тебя есть ещё работа. Хочешь послушать?"
-
 #: lang/json/talk_topic_from_json.py
 msgid "I have another job for you.  Want to hear about it?"
 msgstr "У меня есть другая работа для тебя. Хочешь послушать?"
@@ -175169,6 +179809,14 @@ msgstr "У меня есть другая работа для тебя. Хоче
 msgid "I just have one job for you.  Want to hear about it?"
 msgstr "У меня есть работа для тебя. Хочешь послушать?"
 
+#: lang/json/talk_topic_from_json.py
+msgid "I have other jobs for you.  Want to hear about them?"
+msgstr "У меня для тебя есть и другая работа. Хочешь послушать?"
+
+#: lang/json/talk_topic_from_json.py
+msgid "I have more jobs for you.  Want to hear about them?"
+msgstr "У меня для тебя есть ещё работа. Хочешь послушать?"
+
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
 #: src/npctalk.cpp
 msgid "Oh, okay."
@@ -175227,8 +179875,8 @@ msgid "Whatever.  Bye."
 msgstr "Неважно. Пока."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
-msgstr "Прости… я облажался."
+msgid "I'm sorry…  I failed."
+msgstr "Прости… Я облажался."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not yet."
@@ -175247,7 +179895,7 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "Нет. Я возвращаюсь за этим, пока!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
+msgid "Yup!  Here it is!"
 msgstr "Ага! Вот оно!"
 
 #: lang/json/talk_topic_from_json.py
@@ -175507,7 +180155,7 @@ msgid "Alright.  You can lead now."
 msgstr "Хорошо. Веди нас."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
+msgid "Good.  Something else…"
 msgstr "Хорошо. Что-нибудь ещё…"
 
 #: lang/json/talk_topic_from_json.py
@@ -175587,7 +180235,7 @@ msgid "I'd prefer to keep that to myself."
 msgstr "Я бы предпочёл, держать это при себе."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
+msgid "I understand…"
 msgstr "Я понимаю…"
 
 #: lang/json/talk_topic_from_json.py
@@ -175611,7 +180259,7 @@ msgid "Because I'm your friend!"
 msgstr "Потому что я твой друг!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
+msgid "Well, I am helping you out…"
 msgstr "Ну, я же тебе помогаю…"
 
 #: lang/json/talk_topic_from_json.py
@@ -175659,15 +180307,15 @@ msgid "No, I'm keeping it. Try and take it off me, I dare you."
 msgstr "Нет, теперь это моё. Только попробуй отобрать."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
-msgstr "Слушай, мне это правда очень нужно. Пожалуйста, отдай."
+msgid "Look, I really need this.  Please let me have it."
+msgstr "Слушай, мне правда очень нужно. Пожалуйста, дай."
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
+msgid "What, this?  It's not the same one, you are mistaken."
 msgstr "Что, вот это? Ты ошибся, это другое."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
+msgid "I'm sorry.  Look, I already dropped it, okay?"
 msgstr "Мне жаль. Слушай, я уже бросаю, лады?"
 
 #: lang/json/talk_topic_from_json.py
@@ -175675,7 +180323,7 @@ msgid "Don't try and talk yourself out of this, drop it now."
 msgstr "Не пытайся заговорить мне зубы, бросай сейчас же."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
+msgid "Okay, I'm dropping it…"
 msgstr "Хорошо, я бросаю…"
 
 #: lang/json/talk_topic_from_json.py
@@ -175739,7 +180387,7 @@ msgid "Pleasure doing business!"
 msgstr "Приятно иметь с тобой дело!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
+msgid "You might be seeing more of me…"
 msgstr "Думаю, мы ещё встретимся…"
 
 #: lang/json/talk_topic_from_json.py
@@ -175755,21 +180403,21 @@ msgstr ""
 "человек, которого я вижу за долгое время."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
-msgstr "Эй. Давай немного поболтаем."
+msgid "Hey.  Let's chat for a second."
+msgstr "Эй, давай немножко поболтаем."
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
-msgstr "Это потому что я спас тебя. Слушай, мне б не помешала твоя помощь…"
+msgid "That's because I saved you.  Listen, I could use your help…"
+msgstr "Это потому, что я спас тебя. Слушай, мне б не помешала твоя помощь…"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
 msgstr "Ну охуеть теперь. Делай, что я скажу, или я запихну тот чип обратно."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
 msgstr "Прости, я никто. Наслаждайся свободой, наверно."
 
 #: lang/json/talk_topic_from_json.py
@@ -175781,7 +180429,7 @@ msgid "Come with me. We can help each other out."
 msgstr "Пойдём со мной. Мы поможем друг другу."
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
+msgid "We both go our separate ways.  Enjoy your freedom."
 msgstr "Наши пути расходятся. Наслаждайся свободой."
 
 #: lang/json/talk_topic_from_json.py
@@ -175801,8 +180449,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
 msgstr ""
 "Чтоб ты знал, да. Пока что я добрый. Лучше надейся, что я буду добрым "
 "подольше."
@@ -175826,8 +180474,8 @@ msgid "Get out of my sight."
 msgstr "Пошёл вон."
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
-msgstr "Нет, *ты* прости, я не хотел тебя обидеть. Иди делай что хочешь."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
+msgstr "Нет, *ты* прости, я не хотел тебя обидеть. Иди, делай что хочешь."
 
 #: lang/json/talk_topic_from_json.py
 msgid "...kill... *ZTZTZT* ...you!"
@@ -175842,7 +180490,7 @@ msgid "Not if I kill you first!"
 msgstr "Только если я не убью тебя первым!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
+msgid "I'm sorry!  I shouldn't have said that!"
 msgstr "Прости! Мне не стоило так говорить!"
 
 #: lang/json/talk_topic_from_json.py
@@ -175883,17 +180531,37 @@ msgstr "Ничего. Давай вернёмся к работе."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
-"Система лагеря позволяет вам с удобством управлять вашими компаньонами и "
-"назначать их на задания, начиная от сбора припасов и производства и "
-"закачивая боевыми патрулями."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
-msgstr "Продолжай."
+msgid "Give me an overview of how camps work."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Never mind, let's go back to talking about camps."
@@ -175913,93 +180581,120 @@ msgstr "Забудь. Пошли."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, we can talk with radios?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
 msgstr ""
-"Пища требуется для выполнения всех заданий, также она может быть добыта в "
-"ходе заданий. Задания с фиксированным временем требуют оплаты вперёд, а "
-"повторяющиеся задания, такие как сбор дров, оплачиваются по факту "
-"выполнения. Если вам нечем будет платить компаньону, то это приведёт к "
-"потере авторитета внутри фракции, что, при очень низких его показателях, "
-"может привести к ОЧЕНЬ плохим последствиям."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
-msgstr "Подожди, повтори еще раз."
+msgid ""
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
 msgstr ""
-"В лагере каждой фракции есть доска объявлений. Вы можете осмотр«е»ть ее, чтобы получить список из требуемых и уже выполненных заданий. Вы можете выбрать задачу и напарника, который начнет ее выполнять.\n"
-"Список заданий показывает задачи для центрального лагеря, если у вас есть расширения лагеря, то используйте клавишу «TAB» для переключения между ними.\n"
-"Если у вас есть двухсторонняя рация, то вы можете удаленно назначать задачи дружественным персонажам, которые так же имеют рацию."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
 msgstr ""
-"Для своего первого лагеря выбери место, окружённое 8 полями с густым лесом неподалёку. Лес — это основной источник стройматериалов на начальной стадии, а на полях можно выращивать растения. Не особо придирайся к месту, так как лагерей можно строить сколько угодно. В лагере должен быть дружественный НПС для выполнения заданий.\n"
-"Хотя можно построить лагерь в чистом поле с нуля, ты можешь занять некоторые здания. Если поговорить с дружественным НПС о лагеря, и НПС стоит в здании, которое можно приспособить под лагерь, появится опция разбить лагерь в этом здании."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
 msgstr ""
-"После выбора места для лагеря вам нужно будет найти или произвести материалы"
-" для его улучшения, чтобы получить доступ к новым заданиям. Первые задания "
-"фокусируются на сборе материалов для улучшения лагеря. После двух-трёх "
-"улучшений у вас появится доступ к заданиям, связанным с "
-"<color_yellow>[черновой работой]</color>, которые позволят вам давать "
-"указания вашим компаньонам по сортировке всех вещей вокруг лагеря по "
-"категориям. Дальнейшие улучшения позволят вам посылать компаньонов на "
-"задания по найму новобранцев, постройке укреплений на глобальной карте или "
-"даже осуществлению боевых патрулей."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
 msgstr ""
-"Когда вы полностью улучшите вашу палатку, вам станет доступно строительство "
-"расширений. Расширения позволяют специализировать каждый лагерь, фокусируя "
-"их деятельность на нужном вам производстве. "
-"<color_light_green>[Ферму]</color> рекомендуется строить игрокам, которые "
-"хотят иметь большое количество людей, а <color_light_green>[кухня]</color>  "
-"подходит для игроков, которые хотят просто облегчить себе жизнь, поручив "
-"готовку неигровым персонажам. В <color_light_green>[гараже]</color> можно "
-"разбирать транспорт на запчасти, которые затем можно пустить в дело в "
-"<color_light_green>[кузнице]</color>. Вы можете строить дополнительные "
-"расширения каждый нечётный уровень после первого. Если же один лагерь "
-"полностью заполнен, вы всегда можете построить ещё один."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
-msgstr "Спасибо, теперь вернемся к разговору о лагерях."
+msgid "Got it.  Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -176019,6 +180714,14 @@ msgstr ""
 "5. Дружественные НПС вблизи лагеря будут брать еду из запасов лагеря и пить воду из колодца, если он есть.\n"
 "6. Теперь можно строить лагеря в некоторых зданиях. Список подходящих зданий растёт, так что придётся экспериментировать."
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr "Спасибо, теперь вернемся к разговору о лагерях."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -176124,11 +180827,11 @@ msgid "Well, sure."
 msgstr "Ну, хорошо."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
-msgstr "Я… пожалуй, воздержусь."
+msgid "I'd… rather not."
+msgstr "Я… Пожалуй, воздержусь."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr "Прости… Мне надо кое-куда."
 
 #: lang/json/talk_topic_from_json.py
@@ -176161,8 +180864,8 @@ msgid "Oh, but you already have."
 msgstr "О, но ты уже."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
-msgstr "Да… да, я уже."
+msgid "Yes… yes I have."
+msgstr "Да… Да, я уже."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Join us then, eat from this meal with us."
@@ -176243,7 +180946,7 @@ msgstr ""
 "кто-то фоткал."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
+msgid "Horrible.  Did you get any pictures yourself?"
 msgstr "Кошмарно. А сам ты не фоткал?"
 
 #: lang/json/talk_topic_from_json.py
@@ -176409,8 +181112,8 @@ msgid "This is a npc allies 1 test response."
 msgstr "Это тестовый ответ npc allies 1."
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
-msgstr "Это ошибка! Тестовый ответ npc allies 2."
+msgid "This an error!  npc allies 2 test response."
+msgstr "Это ошибка! Тестовый ответ НПЦ-союзников 2."
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a npc engagement rule test response."
@@ -176514,11 +181217,11 @@ msgstr "Это тестовый ответ комплексной вложенн
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a true/false true response."
-msgstr ""
+msgstr "Это истинный результат выражения истина/ложь."
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a true/false false response."
-msgstr ""
+msgstr "Это ложный результат выражения истина/ложь."
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a conditional trial response."
@@ -176609,8 +181312,8 @@ msgid "This is a u_has_items beer test response."
 msgstr "Это тестовый ответ u_has_items beer."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
-msgstr "Тест провален! Это тестовый ответ u_has_items."
+msgid "Test failure!  This is a u_has_items test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a u_has_item_category books test response."
@@ -176621,8 +181324,8 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr "Это тестовый ответ u_has_item_category books count 2."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
-msgstr "Ошибка! Это тестовый ответ u_has_item_category books count 3."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a u_add_var test response."
@@ -176709,8 +181412,8 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr "Это тестовый ответ u_has_bionics bio_ads."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
-msgstr "Ошибка! Это тестовый ответ npc_has_bionics bio_ads."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a npc_has_bionics ANY response."
@@ -176766,11 +181469,7 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr "Здравствуй, гражданин, что привело тебя в Дом Поешь-ки?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr "Эй, давай немножко поболтаем."
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
+msgid "Greetings…  Foodperson?"
 msgstr "Привет… Поешь-ка?"
 
 #: lang/json/talk_topic_from_json.py
@@ -176812,7 +181511,7 @@ msgid ""
 msgstr "Великий Поешь-ка во плоти! Такая честь наконец лично вас увидеть!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
+msgid "Ah…  Well, nice to meet you Foodperson."
 msgstr "Э… Ладно, приятно познакомиться, Поешь-ка."
 
 #: lang/json/talk_topic_from_json.py
@@ -176826,7 +181525,7 @@ msgstr "Тише, успокойся, хорошо, я ухожу!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Forgive me, I didn't mean to disrespect you."
-msgstr ""
+msgstr "Прости, я не хотел проявить неуважение."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Oh yeah?  Show me what you can do!"
@@ -176841,7 +181540,7 @@ msgid "Sure, whatever."
 msgstr "Ну хорошо, как скажешь."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
+msgid "Ok…  I believe you."
 msgstr "Хорошо… я тебе верю."
 
 #: lang/json/talk_topic_from_json.py
@@ -176939,15 +181638,15 @@ msgid "That sounds great!"
 msgstr "Звучит классно!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
-msgstr "Ладно…"
+msgid "Ok…"
+msgstr "Хорошо…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I need to think about it."
 msgstr "Мне надо подумать."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
+msgid "Huh…  No thanks."
 msgstr "Хех… Нет уж, спасибо."
 
 #: lang/json/talk_topic_from_json.py
@@ -176964,7 +181663,7 @@ msgstr "То, как ты говоришь, как двигаешься… Ты
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr ""
 "Я… Я не знаю. Наверно, это всё <the_cataclysm>! Что скажешь, если мы "
@@ -177047,7 +181746,7 @@ msgstr "И ЭТО Я!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Wow calm down, it's just a prank bro."
-msgstr ""
+msgstr "Эй-эй, успокойся, бро, я просто шучу."
 
 #: lang/json/talk_topic_from_json.py
 msgid "WAIT!  There might be another way!"
@@ -177120,6 +181819,11 @@ msgid ""
 " them anyway?  I've heard that sort of thing happened.  I don't know if I'll"
 " ever know."
 msgstr ""
+"Я пока их не нашёл. Каждый раз, когда мне попадается <zombie>, частичка меня"
+" боится, что это один из них. Но, хотя, наверно, нет. Может быть, их "
+"эвакуировали, может, они вырывались и пытались дождаться меня, но военные "
+"всё равно их забрали? Я слышал, что такое случалось. Я не знаю, узнаю ли я "
+"вообще когда-нибудь."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -177639,6 +182343,10 @@ msgid ""
 "she's dead now.  I told her about my dreams a week before the world ended.  "
 "Serious!"
 msgstr ""
+"Ладно, это прозвучит дико, но я, типа, я знал, что произойдёт. Ну, типа, "
+"прежде чем всё случилось. Не веришь — спроси мою духовную наставницу, только"
+" она, типа, скорее всего уже мертва. Я рассказал ей про свои сны за неделю "
+"до конца света. Серьёзно!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "What were your dreams?"
@@ -177979,7 +182687,7 @@ msgid "Giant bees?  Tell me more."
 msgstr "Гигантские пчёлы? Расскажи подробнее."
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
+msgid "But bees aren't usually aggressive…"
 msgstr "Но пчёлы обычно неагрессивны…"
 
 #: lang/json/talk_topic_from_json.py
@@ -177995,7 +182703,7 @@ msgstr ""
 "я бежал как, <swear>, ссыкло."
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
 msgstr "Но пчёлы обычно неагрессивны… Может, то были осы?"
 
 #: lang/json/talk_topic_from_json.py
@@ -178566,7 +183274,7 @@ msgid "No.  I can't.  Just, no."
 msgstr "Нет. Не могу. Просто нет."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
+msgid "Sorry…  I'll let you be."
 msgstr "Прости… Я оставлю тебя в покое."
 
 #: lang/json/talk_topic_from_json.py
@@ -178914,8 +183622,8 @@ msgstr ""
 "пало."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
-msgstr "Хорошо…"
+msgid "Okay…"
+msgstr "Ладно…"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -179253,11 +183961,11 @@ msgstr ""
 "стоял полицейская баррикада с полностью бесполезной парой автоматических "
 "турелей, бесцельно наблюдающими за бродячими зомби. Это было ещё до того, "
 "как кто-то переключил их в режим стрельбы по кому угодно. Тогда они стреляли"
-" только по пересекающим запретную зону. Славные времена, всегда можно "
-"положиться, что бюрократия сумеет всё проебать самым впечатляющим способом. "
-"В общем, сам дом наполовину обрушился, в него врезался фургон спецназа. "
-"Наверно, можно было догадаться, что я увижу внутри, но мне пришлось пройти "
-"через многое, и не хотелось поворачивать назад."
+" только по пересекающим запретную зону. Славные времена, всегда можно быть "
+"уверенным в том, что бюрократия сумеет всё просрать самым впечатляющим "
+"способом. В общем, сам дом наполовину обрушился, в него врезался фургон "
+"спецназа. Наверно, можно было догадаться, что я увижу внутри, но мне "
+"пришлось пройти через многое, и не хотелось поворачивать назад."
 
 #: lang/json/talk_topic_from_json.py
 msgid "You must have seen some shit on the way there."
@@ -179427,7 +184135,7 @@ msgid "What do you think happened?"
 msgstr "Как ты думаешь, что случилось?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
+msgid "That does sound a little crazy…"
 msgstr "Звучит слегка безумно…"
 
 #: lang/json/talk_topic_from_json.py
@@ -179497,7 +184205,7 @@ msgid "What happened to you after that?"
 msgstr "Что случилось с тобой потом?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
+msgid "It can't be healthy to abandon your past like that…"
 msgstr "Не совсем нормально вот так бросать своё прошлое…"
 
 #: lang/json/talk_topic_from_json.py
@@ -180087,7 +184795,7 @@ msgstr ""
 "прояснится, наверное."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
+msgid "Do you mean in a religious sense, or…?"
 msgstr "Ты в религиозном смысле, или…?"
 
 #: lang/json/talk_topic_from_json.py
@@ -180517,8 +185225,8 @@ msgstr "Что же из этого вышло?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
 msgstr ""
 "Если я принесу тебе нужные материалы, как ты думаешь, получится ли у тебя, "
 "типа… исследовать их?"
@@ -180683,7 +185391,7 @@ msgstr ""
 "О, это целая история. <the_cataclysm> случился прямо в день моей свадьбы."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
+msgid "Oh, I'm sorry…"
 msgstr "О, прости…"
 
 #: lang/json/talk_topic_from_json.py
@@ -180754,7 +185462,7 @@ msgstr "Эй, <name_g>."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I can't believe my eyes.  Please get my outta here..."
-msgstr "Глазам не верю. Пожалуйста, вытащи меня отсюда..."
+msgstr "Глазам не верю. Пожалуйста, вытащи меня отсюда…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I've come to take you home, lets go."
@@ -180811,6 +185519,8 @@ msgid ""
 "It is coming together.  I want to make our own tools, repair our items and "
 "even create some weapons and ammunition reloading."
 msgstr ""
+"Получается неплохо. Я хочу делать наши собственные инструменты, чинить наши "
+"вещи и даже изготавливать собственное оружие и переснаряжать патроны."
 
 #: lang/json/talk_topic_from_json.py
 msgid "What do you need?"
@@ -180826,6 +185536,9 @@ msgid ""
 "easily kept up with us when we tried to escape, horrifying stuff.  Barry "
 "just dropped to the ground, and the thing swept him away."
 msgstr ""
+"Розовая очень быстрая тварь, куча конечностей, точно не человек. Оно легко "
+"нас преследовало, когда мы пытались спастись, ужасающая хрень. Барри упал "
+"наземь, и тварь его утащила."
 
 #: lang/json/talk_topic_from_json.py
 msgid "You all just gonna leave him out there to his fate?"
@@ -180858,7 +185571,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Go on..."
-msgstr "Продолжай..."
+msgstr "Продолжай…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Is your forge operational?"
@@ -180872,7 +185585,7 @@ msgstr "Где найти Криса?"
 msgid ""
 "I see that badge, You need to leave our land, my relatives have no fondness "
 "for Marshals."
-msgstr ""
+msgstr "Я вижу твой значок. Прочь с нашей земли, мы тут маршалов не любим."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hi, what's up?"
@@ -180900,7 +185613,7 @@ msgid ""
 msgstr ""
 "Ага, они всегда о нас беспокоились, я люблю обхаживать землю и пытаюсь найти"
 " что-то новое. Подумываю привести эту хижину в порядок, чтоб была тишь и "
-"спокойствие..."
+"спокойствие…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Sounds like you are restless, why not leave?"
@@ -180939,7 +185652,7 @@ msgid ""
 msgstr ""
 "В одной долгой вылазке в поисках Барри я что-то видел в поле. Я не "
 "подобрался близко, но клянусь, оттуда выходили невероятные твари. Оно типа "
-"мерцало, будто было не совсем там. Я немного проследовал за тварями..."
+"мерцало, будто было не совсем там. Я немного проследовал за тварями…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "What did you find?"
@@ -181043,7 +185756,7 @@ msgid ""
 msgstr ""
 "На самом деле удача-то и не нужна, если подготовиться и работать сообща. У "
 "нас есть потери, мой зять Барри был лучшим охотником, но нынче всё по-"
-"другому..."
+"другому…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "What happened to Barry?"
@@ -181066,8 +185779,8 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr "Он упомянул, ты делаешь травяные снадобья, они вообще работают?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
-msgstr "Я хочу спросить тебя о чём-нибудь ещё..."
+msgid "I'd like to ask you something else…"
+msgstr "Я хочу спросить тебя кое о чём ещё…"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -181156,7 +185869,7 @@ msgid ""
 "I run this dairy with my son, Luke.  It's been a tough job keeping the herd "
 "together, hasn't left a lot of time for other projects."
 msgstr ""
-"Я тут работаю вместе со своим сыном, Люком. Сгонять стадо в кучу - сложная "
+"Я тут работаю вместе со своим сыном, Люком. Сгонять стадо в кучу — сложная "
 "работёнка, на другое времени не остаётся."
 
 #: lang/json/talk_topic_from_json.py
@@ -181265,6 +185978,9 @@ msgid ""
 "We've always taken disaster preparedness seriously, but we didn't expect "
 "anything like this though."
 msgstr ""
+"У нас были потери… теперь мы держимся поближе к дому и ожидаем худшего. Мы "
+"всегда основательно готовились к неприятностям, но ни о чём подобном и не "
+"думали."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -181273,7 +185989,7 @@ msgid ""
 " with the crops and animals though so we won't have to risk our necks for "
 "supplies."
 msgstr ""
-"Даже здесь на нас нападают и мы видим ... разные вещи. Мы работаем над "
+"Даже здесь на нас нападают и мы видим… разные вещи. Мы работаем над "
 "обороной, но на это нужно время. Однако мы управляемся с полями и скотиной, "
 "так что нам не нужно рисковать шеей ради еды."
 
@@ -181328,10 +186044,12 @@ msgid ""
 "You should get off my land, the government proved its incompetence with this"
 " catastrophe."
 msgstr ""
+"Убирайся с моей земли, правительство показало свою никчёмность этой "
+"катастрофой."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Go on ..."
-msgstr "Продолжай ..."
+msgstr "Продолжай…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Tell me about your wife, is she around?"
@@ -181366,7 +186084,7 @@ msgid ""
 "It would be a lot harder without family.  Keeping the animals safe is "
 "essential to our future."
 msgstr ""
-"Без семьи пришлось бы худо. Безопасность животных - ключ к нашему будущему."
+"Без семьи пришлось бы худо. Безопасность животных — ключ к нашему будущему."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Sounds like you are betting on civilization not coming back."
@@ -181389,7 +186107,7 @@ msgid ""
 " and also help when all the engines fail.  They become very trusting if you "
 "feed them some nice fodder."
 msgstr ""
-"Лошади - отличные спутники. Они пройдут там, где машина застрянет, да и "
+"Лошади — отличные спутники. Они пройдут там, где машина застрянет, да и "
 "вообще выручат, когда двигатели заглохнут. Лошади очень доверчивые, если как"
 " следует покормить."
 
@@ -181408,8 +186126,9 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr "Я поговорю с Карлосом насчёт работы."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
-msgstr "Крис где-то тут? Мне б хотелось знать, что он нашёл в лесу."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
+msgstr "Крис где-то тут? Мне бы хотелось знать, что он нашёл в лесу."
 
 #: lang/json/talk_topic_from_json.py
 msgid "What needs killing?"
@@ -181492,7 +186211,7 @@ msgid ""
 "Sometimes he'll take off for a few days and I end up patching him up so my "
 "parents don't know he left the property."
 msgstr ""
-"Ну, он вообще должен охотиться, но ты уже поговорил с Люком - я уверена, он "
+"Ну, он вообще должен охотиться, но ты уже поговорил с Люком — я уверена, он "
 "упомянул, что Крис хочет больше узнать про конец света. Иногда он уходит на "
 "несколько дней, и мне приходится его прикрывать, чтобы родители не узнали, "
 "что его нет дома."
@@ -181620,15 +186339,15 @@ msgid "What do you need done?"
 msgstr "Что нужно сделать?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
+msgid "About the mission…"
 msgstr "Касательно задания…"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
+msgid "About one of those missions…"
 msgstr "По поводу одного из этих заданий…"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
+msgid "I've got to go…"
 msgstr "Я должен идти…"
 
 #: lang/json/talk_topic_from_json.py
@@ -181652,7 +186371,7 @@ msgstr ""
 "восстановительных работ."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
+msgid "Seems like a decent plan…"
 msgstr "Звучит, как хороший план…"
 
 #: lang/json/talk_topic_from_json.py
@@ -181680,7 +186399,7 @@ msgstr ""
 "система водоснабжения была перенаправлена на нижние уровни."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
+msgid "Whatever they did it must have worked since we are still alive…"
 msgstr ""
 "Что бы они ни сделали это, должно быть, сработало, так как мы все ещё живы…"
 
@@ -181719,7 +186438,7 @@ msgstr ""
 "сказать… если у тебя есть какие-либо вопросы, пойди и найди моего командира."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
+msgid "I'll try and find your commander then…"
 msgstr "Я постараюсь найти командира…"
 
 #: lang/json/talk_topic_from_json.py
@@ -181788,7 +186507,7 @@ msgstr ""
 "Эй мисс, вы не думаете, что будет безопасней вам присоединиться ко мне?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
+msgid "Don't mind me…"
 msgstr "Не обращайте на меня внимания…"
 
 #: lang/json/talk_topic_from_json.py
@@ -181796,7 +186515,7 @@ msgid ""
 "My god, you've got to get me out of here.  The things... the things they've "
 "done... please help."
 msgstr ""
-"Господи, ты пришёл меня спасти. То... то, что они делали... помоги, умоляю."
+"Господи, ты пришёл меня спасти. То… то, что они делали… помоги, умоляю."
 
 #: lang/json/talk_topic_from_json.py
 msgid "Aren't you a little short to be a stormtrooper?"
@@ -181828,7 +186547,7 @@ msgstr "Глазам не верю. Спасибо, спасибо!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "You're... you're actually real!"
-msgstr "Ты... ты настоящий!"
+msgstr "Ты… ты настоящий!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "How are you here?  Are you one of them, somehow?  What's going on?"
@@ -182094,7 +186813,7 @@ msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr "Дружище, говорил ли я тебе про картон? Нет ли у тебя его с собой?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
+msgid "About that shopping list of yours…"
 msgstr "Насчёт твоего списка покупок…"
 
 #: lang/json/talk_topic_from_json.py
@@ -182164,7 +186883,7 @@ msgid "Would you like me to give you some cardboard?"
 msgstr "Хочешь ли получить немного картона?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
+msgid "I think I have to get going…"
 msgstr "Наверное, мне пора…"
 
 #: lang/json/talk_topic_from_json.py
@@ -182201,8 +186920,8 @@ msgstr ""
 "попросить мне помочь."
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
-msgstr "… О чём ты там говорил?"
+msgid "…What were you saying before?"
+msgstr "…О чём ты там говорил?"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -182221,7 +186940,7 @@ msgid "No."
 msgstr "Нет."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
 msgstr "Я… я вижу, ты это носишь. Почему ты это носишь?"
 
 #: lang/json/talk_topic_from_json.py
@@ -182325,7 +187044,7 @@ msgid "I found a sample of alien fungus for you."
 msgstr "Я нашёл для тебя инопланетный гриб."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
+msgid "Ok… see ya."
 msgstr "Ладно… пока-пока."
 
 #: lang/json/talk_topic_from_json.py
@@ -182454,8 +187173,8 @@ msgstr "Мне всё равно, китаец ты или нет. Если хо
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr ""
 "То есть тут и расизм, конечно же… но у тебя здоровье ни к чёрту. Им нужны "
 "сильные выживальщики."
@@ -182497,7 +187216,7 @@ msgid "You sound more optimistic than usual."
 msgstr "Куда оптимистичнее обычного."
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr "Итак, насчёт твоей учёной степени…"
 
 #: lang/json/talk_topic_from_json.py
@@ -182660,7 +187379,7 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr ""
 "Вторжение инопланетных грибов, грибные башни, прочная грибница, "
 "захватывающая землю и деревья, зомби, охваченные агрессивной плесенью… Да, "
@@ -182790,7 +187509,7 @@ msgstr ""
 " голоду. Поможешь несчастному больному бедолаге?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr "Я могу помочь… хочешь чего-нибудь поесть?"
 
 #: lang/json/talk_topic_from_json.py
@@ -183299,7 +188018,7 @@ msgstr ""
 "есть, и даже если б был интернет, все мои подписки на ютубе мертвы."
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr "Ты немного забегаешь вперёд…"
 
 #: lang/json/talk_topic_from_json.py
@@ -183598,7 +188317,7 @@ msgstr ""
 "работать в мой собственный лагерь."
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
+msgid "About that sourdough starter you had me looking for…"
 msgstr "Насчёт той хлебной закваски, за которой ты меня посылала…"
 
 #: lang/json/talk_topic_from_json.py
@@ -183964,7 +188683,7 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr "Наверно, я б поступил так же. Тут ни у кого нет гитары?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
+msgid "Yes, yes I would… you monster."
 msgstr "Да, да, я осужу… ты чудовище."
 
 #: lang/json/talk_topic_from_json.py
@@ -184195,6 +188914,10 @@ msgstr ""
 "правда, закашлялся и скрутил из нормальной бумаги. Слишком едко. Говорю "
 "просто на всякий случай, если тебе захочется попробовать."
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr "Продолжай."
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -184484,7 +189207,7 @@ msgstr ""
 "Немногие сумели выбраться… слишком немногие."
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr "Ты кого-то потерял…"
 
 #: lang/json/talk_topic_from_json.py
@@ -185048,7 +189771,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr "Ты… ты же в курсе, что творится, да? Эвакуация и всё такое?"
 
@@ -185889,7 +190612,7 @@ msgid "Are you looking to buy anything else?"
 msgstr "Вас интересует ещё что-нибудь?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
+msgid "Very well… let's talk about something else."
 msgstr "Очень хорошо… давай поговорим о чём-нибудь ещё."
 
 #: lang/json/talk_topic_from_json.py
@@ -186277,7 +191000,7 @@ msgid "Have you seen anyone who might be hiding something?"
 msgstr "Видел кого-нибудь, кто мог что-нибудь скрывать?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
+msgid "Bye…"
 msgstr "Пока…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186293,7 +191016,7 @@ msgid "Keep your head down and stay out of my way."
 msgstr "Преклони голову и уйди с дороги"
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
+msgid "OK…"
 msgstr "Хорошо…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186301,7 +191024,7 @@ msgid "Like what?"
 msgstr "Какого типа?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
+msgid "I'm not sure…"
 msgstr "Я не уверен…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186323,7 +191046,7 @@ msgid "Got something to hide?"
 msgstr "Есть что скрывать?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
+msgid "Sorry, I didn't mean to offend you…"
 msgstr "Извини, я не хотел тебя обидеть…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186378,7 +191101,7 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr "Мадам, вам действительно не стоит тут гулять."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
+msgid "I heard this place was a refugee center…"
 msgstr "Я слышал, это место было центром для беженцев…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186402,7 +191125,7 @@ msgid "Can I do anything for the center?"
 msgstr "Что я могу сделать для центра?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
+msgid "I figured you might be looking for some help…"
 msgstr "Я подумал, что вам может понадобиться помощь…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186470,7 +191193,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
 msgstr ""
 "[ИНТ 10] Погоди, шесть автобусов и беженцы… сколько людей у вас здесь "
@@ -186538,7 +191261,7 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr "Мне очень жаль, но я не готов сейчас так сильно рисковать."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
+msgid "Fine…"
 msgstr "Хорошо…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186554,7 +191277,7 @@ msgstr ""
 "его волосы."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
+msgid "Fine… *coughupyourscough*"
 msgstr "Ладно… *кашель-кашель*"
 
 #: lang/json/talk_topic_from_json.py
@@ -186591,7 +191314,7 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[СИЛ 11] Я очень круто бью морды!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
+msgid "I guess I'll look somewhere else…"
 msgstr "Думаю, придётся искать где-нибудь ещё…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186618,7 +191341,7 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr "Слышно что-нибудь о заброшенном складе с оружием?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
+msgid "Was hoping for something more…"
 msgstr "Была надежда на что-то ещё…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186748,8 +191471,8 @@ msgid "So what are you doing right now?"
 msgstr "Так чем ты сейчас занимаешься?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
-msgstr "Ничего особенного…"
+msgid "Never mind…"
+msgstr "Неважно…"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -186778,8 +191501,8 @@ msgstr ""
 "долговременная перспектива, но для выживания нужна надежда."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
-msgstr "Удачи тебе."
+msgid "Good luck with that…"
+msgstr "Удачи тебе…"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -186830,7 +191553,7 @@ msgstr ""
 " и спрашивай."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
+msgid "Sucks…"
 msgstr "Отстой…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186850,7 +191573,7 @@ msgstr ""
 "построенные с использованием арматуры."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
+msgid "Well, then…"
 msgstr "Ну ладно…"
 
 #: lang/json/talk_topic_from_json.py
@@ -186949,7 +191672,7 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr "Эй, кажется вы здесь недавно. Могу я вам помочь?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
+msgid "You… smelled me?"
 msgstr "Ты… чуешь меня?"
 
 #: lang/json/talk_topic_from_json.py
@@ -187007,7 +191730,7 @@ msgstr ""
 "сравнится со свежеприготовленным стейком из лося на ужин."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
+msgid "Great, now my mouth is watering…"
 msgstr "Отлично, теперь у меня слюнки текут…"
 
 #: lang/json/talk_topic_from_json.py
@@ -187133,7 +191856,7 @@ msgstr ""
 "защитников."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
+msgid "Hmmm…"
 msgstr "Хммм…"
 
 #: lang/json/talk_topic_from_json.py
@@ -187197,7 +191920,7 @@ msgstr ""
 "оставшихся в этом мире."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
+msgid "I haven't done anything wrong…"
 msgstr "Я не сделал ничего плохого…"
 
 #: lang/json/talk_topic_from_json.py
@@ -187352,9 +192075,9 @@ msgid ""
 "\n"
 "the intercom: Hmm wait, we might not have your size..."
 msgstr ""
-"В текущих условиях мы можем продать наш комплект: противогаз, костюм и снаряжение со значительной скидкой. Цена - две наших монеты.\n"
+"В текущих условиях мы можем продать наш комплект: противогаз, костюм и снаряжение со значительной скидкой. Цена — две наших монеты.\n"
 "\n"
-"интерком: Хммм, погоди, у нас может не найтись твоего размера..."
+"интерком: Хммм, погоди, у нас может не найтись твоего размера…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "[ 2 HGC ] Deal!"
@@ -187381,8 +192104,8 @@ msgid "Something to say?"
 msgstr "Есть что сказать?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
-msgstr "У меня почасовая оплата, так что короче..."
+msgid "I charge hourly, so be quick…"
+msgstr "У меня почасовая оплата, так что короче…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey."
@@ -187412,7 +192135,7 @@ msgstr "Забей, мне всё равно пора."
 msgid ""
 "Same as you.  Some nobody doing dirty work for scraps, I mean, no offense."
 msgstr ""
-"Я тот же, кто и ты - я никто и выполняю грязную работу за объедки, без обид."
+"Я тот же, кто и ты — я никто и выполняю грязную работу за объедки, без обид."
 
 #: lang/json/talk_topic_from_json.py
 msgid "I guess that makes two of us."
@@ -187480,7 +192203,7 @@ msgid ""
 "\n"
 " As far as I know, this place held some experimental computer network before everything went to shit.  What's going on now is anybody's guess."
 msgstr ""
-"Не слишком много. Они недавно посылали меня найти и уничтожить государственные бумаги - конечно, я их сперва прочитал, но там было не на что особо смотреть.\n"
+"Не слишком много. Они недавно посылали меня найти и уничтожить государственные бумаги — конечно, я их сперва прочитал, но там было не на что особо смотреть.\n"
 "\n"
 "Насколько я знаю, в этом месте была какая-то экспериментальная компьютерная сеть, пока все не накрылось. Что там происходит сейчас, остаётся догадываться. "
 
@@ -187503,8 +192226,8 @@ msgstr ""
 "они посылают меня к чёрту на сраные рога искать золотые слитки."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
-msgstr "Я бы смог с этим помочь..."
+msgid "I guess I could help with that…"
+msgstr "Я бы смог с этим помочь…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Now that you mention it, it does seem rather strange."
@@ -187512,11 +192235,11 @@ msgstr "Теперь мне тоже это кажется странноват
 
 #: lang/json/talk_topic_from_json.py
 msgid "Thinking I should go hunt something soon..."
-msgstr "Раздумываю, что мне скоро пора на охоту..."
+msgstr "Раздумываю, что мне скоро пора на охоту…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Wondering if things will get better someday..."
-msgstr "Мне интересно, переменится ли жизнь к лучшему..."
+msgstr "Мне интересно, переменится ли жизнь к лучшему…"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hmm? Nothing, I guess I just like resting in this place."
@@ -187524,7 +192247,7 @@ msgstr "Э? Ничего, мне просто нравится тут отдых
 
 #: lang/json/talk_topic_from_json.py
 msgid "Have you ever noticed how... wait no, never mind."
-msgstr "Ты когда-нибудь замечал, как... стоп, всё, забудь."
+msgstr "Ты когда-нибудь замечал, как… стоп, всё, забудь."
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -187627,7 +192350,7 @@ msgid "[$10] I'll get a haircut"
 msgstr "[$10] Меня нужно постричь"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
+msgid "Maybe another time…"
 msgstr "Возможно, в другой раз…"
 
 #: lang/json/talk_topic_from_json.py
@@ -187647,7 +192370,7 @@ msgid "Stand still while I get my clippers..."
 msgstr "Стой спокойно, пока я орудую своими ножницами…"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
+msgid "Thanks…"
 msgstr "Спасибо…"
 
 #: lang/json/talk_topic_from_json.py
@@ -187667,8 +192390,8 @@ msgid "What do you have on tap?"
 msgstr "Что у вас есть из разливного?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
-msgstr "Я пожалуй пойду…"
+msgid "I'll be going…"
+msgstr "Я, пожалуй, пойду…"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -187727,7 +192450,7 @@ msgstr ""
 "него, что нужно сделать."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
+msgid "I'll talk to him then…"
 msgstr "Я поговорю с ним после…"
 
 #: lang/json/talk_topic_from_json.py
@@ -187747,7 +192470,7 @@ msgid "I hope you are here to do business."
 msgstr "Я надеюсь ты здесь для дела."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
+msgid "I'm interested in investing in agriculture…"
 msgstr "Меня интересуют инвестиции в сельское хозяйство…"
 
 #: lang/json/talk_topic_from_json.py
@@ -187778,11 +192501,11 @@ msgid "I imagine we might be able to work something out."
 msgstr "Думаю, мы сможем что-нибудь придумать."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
+msgid "I was wondering if you could install a cybernetic implant…"
 msgstr "Интересно, смог бы ты установить кибернетический имплант…"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
+msgid "I need help removing an implant…"
 msgstr "Мне нужна помощь в удалении импланта…"
 
 #: lang/json/talk_topic_from_json.py
@@ -187831,7 +192554,7 @@ msgstr ""
 " наши посадки дадут урожай."
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
+msgid "It could be worse…"
 msgstr "Могло быть и хуже…"
 
 #: lang/json/talk_topic_from_json.py
@@ -187843,7 +192566,7 @@ msgstr ""
 "работе, поищите прораба или садовода."
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
+msgid "I'll talk with them then…"
 msgstr "Я поговорю с ними после…"
 
 #: lang/json/talk_topic_from_json.py
@@ -187925,8 +192648,8 @@ msgstr ""
 "сталкивается с голодом и нашествиями нежити."
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
-msgstr "Надеюсь, приезд сюда стоил того."
+msgid "Hopefully moving out here was worth it…"
+msgstr "Надеюсь, приезд сюда стоил того…"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -188489,13 +193212,13 @@ msgstr "укус гадюки"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
-msgstr "Вы кусаете противника (%s)"
+msgid "You lash out at %s with a Viper Bite"
+msgstr "Вы набрасываетесь на %s Укусом гадюки"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
-msgstr "<npcname> кусает противника (%s)"
+msgid "<npcname> lash out at %s with a Viper Bite"
+msgstr "<npcname> набрасывается на %s Укусом гадюки"
 
 #: lang/json/technique_from_json.py
 msgid "Viper Strike"
@@ -188503,18 +193226,28 @@ msgstr "атака гадюки"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
-msgstr "Вы наносите Удар Гадюки %s"
+msgid "You hit %s with a spectacular Viper Strike"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
-msgstr "<npcname> наносит Удар Гадюки %s"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr "гибкость гадюки"
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr "Удар с разворота"
@@ -188557,6 +193290,34 @@ msgstr "Вы оглушаете %s кулаком-клешнёй"
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr "<npcname> бьёт %s клешнёй"
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr "жабий язык"
@@ -189620,12 +194381,12 @@ msgstr "Рука-нож"
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You hit %s with a knifehand strike"
-msgstr "Вы врезаете по %s приёмом \"рука-нож\""
+msgstr "Вы врезаете по %s приёмом «рука-нож»"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> hits %s with a knifehand strike"
-msgstr "<npcname> врезает по %s приёмом \"рука-нож\""
+msgstr "<npcname> врезает по %s приёмом «рука-нож»"
 
 #: lang/json/technique_from_json.py
 msgid "Backfist Strike"
@@ -190052,7 +194813,7 @@ msgstr "<npcname> хватает и бросает %s"
 
 #: lang/json/technique_from_json.py
 msgid "Hamstring"
-msgstr ""
+msgstr "Подсечка"
 
 #: lang/json/technique_from_json.py
 #, python-format
@@ -190178,17 +194939,17 @@ msgstr "<npcname> отталкивает %s прочь"
 
 #: lang/json/technique_from_json.py
 msgid "Shove"
-msgstr ""
+msgstr "Оттолкнуть"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You shove %s back"
-msgstr ""
+msgstr "Вы толкаете %s назад"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> shoves %s back"
-msgstr ""
+msgstr "<npcname> толкает %s назад"
 
 #: lang/json/technique_from_json.py
 #, python-format
@@ -190202,256 +194963,281 @@ msgstr "<npcname> ловко делает подножку %s"
 
 #: lang/json/technique_from_json.py
 msgid "Snatch Weapon"
-msgstr ""
+msgstr "Вырвать оружие"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You snatch %s's weapon"
-msgstr ""
+msgstr "Вы вырываете у %s оружие"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> snatches %s's weapon"
-msgstr ""
+msgstr "<npcname> вырывает у %s оружие"
 
 #: lang/json/technique_from_json.py
 msgid "Axe-kick"
-msgstr ""
+msgstr "Рубящий удар ногой"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You raise your heel and axe-kick %s"
-msgstr ""
+msgstr "Вы сверху вниз бьёте ногой %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> raises their heel and axe-kicks %s"
-msgstr ""
+msgstr "<npcname> бьёт сверху вниз ногой %s"
 
 #: lang/json/technique_from_json.py
 msgid "Side Kick"
-msgstr ""
+msgstr "Боковой удар ногой"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You turn slightly and side-kick %s"
-msgstr ""
+msgstr "Вы слегка поворачиваетесь и сбоку бьете ногой по %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> turns slightly and side-kicks %s"
-msgstr ""
+msgstr "<npcname> слегка поворачивается и наносит боковой удар ногой по %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You crouch low and sweep-kick %s"
-msgstr ""
+msgstr "Вы присядя подсекаете %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> crouches low and sweep-kicks %s"
-msgstr ""
+msgstr "<npcname> вприсядя подсекает %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You gently disarm %s"
-msgstr ""
+msgstr "Вы осторожно разоружаете %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> gently disarms %s"
-msgstr ""
+msgstr "<npcname> осторожно разоружает %s"
 
 #: lang/json/technique_from_json.py
 msgid "Palm Strike"
-msgstr ""
+msgstr "Удар ладонью"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You palm strike %s"
-msgstr ""
+msgstr "Вы бьёте ладонью по %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> palm strikes %s"
-msgstr ""
+msgstr "<npcname> бьёт ладонью по %s"
 
 #: lang/json/technique_from_json.py
 msgid "Grasp the Sparrow's Tail"
-msgstr ""
+msgstr "Захват Хвост воробья"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You divert %s's attack and lead them to the ground"
-msgstr ""
+msgstr "Вы отклоняете атаку %s и швыряете на землю"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> diverts %s's attack and lead them to the ground"
-msgstr ""
+msgstr "<npcname> отклоняет атаку %s и швыряет о земь"
 
 #: lang/json/technique_from_json.py
 msgid "Double Palm Strike"
-msgstr ""
+msgstr "Двойной удар ладонью"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "You double-handed palm strike %s"
-msgstr ""
+msgstr "Вы бьёте обоими ладонями по %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
 msgid "<npcname> double-handed palm strikes %s"
-msgstr ""
+msgstr "<npcname> бьёт обоими ладонями по %s"
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
-msgstr "пьяный финт"
+msgid "Tiger Palm"
+msgstr "Ладонь тигра"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble and leer at %s"
-msgstr "Вы спотыкаетесь и хитро смотрите на %s"
+msgid "You land a heavy tiger palm on %s"
+msgstr "Ваша мощная ладонь тигра пригвождает %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles and leers at %s"
-msgstr "<npcname> спотыкается и хитро смотрит на %s"
+msgid "<npcname> lands a heavy tiger palm on %s"
+msgstr "<npcname> пригвождает %s мощной ладонью тигра"
 
 #: lang/json/technique_from_json.py
-msgid "Drunk counter"
-msgstr "пьяный контрудар"
+msgid "Tiger Takedown"
+msgstr "Захват тигра"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
-msgstr "Вы шатаетесь, и ваш неожиданный боковой удар ранит %s"
+msgid "You slam %s to the ground"
+msgstr "Вы сбиваете %s на землю"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
-msgstr "<npcname> шатается и неожиданно бьёт %s"
+msgid "<npcname> slams %s to the ground"
+msgstr "<npcname> сбивает %s на землю"
 
 #: lang/json/technique_from_json.py
-msgid "Tiger Takedown"
-msgstr "Захват тигра"
+msgid "Straight Punch"
+msgstr "Апперкот"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
-msgstr "Вы хватаете и бросаете %s"
+msgid "You deliver a vertical straight punch to %s"
+msgstr "Вы ударяете вертикальным прямым ударом %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> grabs and grounds %s"
-msgstr "<npcname> хватает и бросает %s"
+msgid "<npcname> delivers a vertical straight punch to %s"
+msgstr "<npcname> вертикально бьёт прямым ударом по %s"
 
 #: lang/json/technique_from_json.py
-msgid "slow strike"
-msgstr "медленный удар"
+msgid "Straight Punch (Knockback)"
+msgstr "Апперкот (отбрасывающий)"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You slowly strike %s"
-msgstr "Вы медленно бьёте %s"
+msgid "You force %s back with a vertical straight punch"
+msgstr "Вы отбрасываете %s вертикальным прямым ударом"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
-msgstr "<npcname> медленно бьёт %s"
+msgid "<npcname> forces %s back with a vertical straight punch"
+msgstr "<npcname> отбрасывает %s вертикальным прямым ударом"
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
-msgstr "фазовый удар"
+msgid "L-hook"
+msgstr "Левый хук"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
-msgstr "Вы наносите фазовый удар по %s"
+msgid "You deliver a solid L-hook to %s"
+msgstr "Вы прописываете крепкий левый хук %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
-msgstr "<npcname> наносит фазовый удар по %s"
+msgid "<npcname> delivers a solid L-hook to %s"
+msgstr "<npcname> прописывает крепкий левый хук %s"
 
 #: lang/json/technique_from_json.py
-msgid "Chain Punch"
-msgstr "Цепь ударов"
+msgid "L-hook (Knockback)"
+msgstr "Левый хук (отбрасывающий)"
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
-msgstr "50% ходов, 66% урона, отбрасывание назад с преследованием"
+#, python-format
+msgid "You knock %s back with a solid L-hook"
+msgstr "Вы отбрасываете %s мощным левым хуком"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
-msgstr "Вы наносите цепь ударов по %s"
+msgid "<npcname> knocks %s back with a solid L-hook"
+msgstr "<npcname> отбрасывает %s мощным левым хуком"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
-msgstr "<npcname> наносит цепь ударов по %s"
+msgid "Your attack misses %s but you don't let up"
+msgstr "Вы промахнулись по %s, но вы не отступаете"
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
-msgstr "Вы принимаете правильную позицию и выскальзываете из захвата"
+#, python-format
+msgid "<npcname>'s attack misses %s but they don't let up"
+msgstr "<npcname> промазал по %s, но он не отступает"
 
 #: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
-msgstr "<npcname> выскальзывает из захвата"
+msgid "Receive and Counter"
+msgstr "Получи и дай сдачи"
 
 #: lang/json/technique_from_json.py
-msgid "ask the way"
-msgstr "Познать Путь"
+#, python-format
+msgid "You receive %s's gift of violence, and return it in kind"
+msgstr "Вы получаете дар жестокости от %s, и возвращаете его сполна"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You miss but keep striking at %s"
-msgstr "Вы промахиваетесь, но продолжаете бить %s"
+msgid "<npcname> receives %s's attack, and counters"
+msgstr "<npcname> атакован %s и наносит ответный удар"
+
+#: lang/json/technique_from_json.py
+msgid "Drunken Feint"
+msgstr "Пьяный финт"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You stumble and leer at %s"
+msgstr "Вы спотыкаетесь и хитро смотрите на %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
-msgstr "<npcname>промахивается, но продолжает бить %s"
+msgid "<npcname> stumbles and leers at %s"
+msgstr "<npcname> спотыкается и хитро смотрит на %s"
 
 #: lang/json/technique_from_json.py
-msgid "White Crane stumble"
-msgstr "Подножка Белого Журавля"
+msgid "Drunk Counter"
+msgstr "Пьяный контрудар"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
-msgstr "Вы спотыкаетесь о %s при атаке"
+msgid "You lurch, and your wild swing hits %s"
+msgstr "Вы шатаетесь, и ваш неожиданный боковой удар ранит %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
-msgstr "<npcname> спотыкается о %s"
+msgid "<npcname> lurches, and hits %s"
+msgstr "<npcname> шатается и неожиданно бьёт %s"
 
 #: lang/json/technique_from_json.py
-msgid "Receive and Counter"
-msgstr "Получи и дай сдачи"
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
+msgstr "%s пытается схватить вас, но вы спотыкаетесь!"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You receive %s's gift of violence, and return it in kind"
-msgstr "Вы получаете дар жестокости от %s, и возвращаете его сполна"
+msgid "The %s tries to grab <npcname>, but they stumble away!"
+msgstr "%s пытается хватануть, но <npcname> спотыкается!"
+
+#: lang/json/technique_from_json.py
+msgid "slow strike"
+msgstr "медленный удар"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> receives %s's attack, and counters"
-msgstr "<npcname> атакован %s и наносит ответный удар"
+msgid "You slowly strike %s"
+msgstr "Вы медленно бьёте %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> slowly strikes %s"
+msgstr "<npcname> медленно бьёт %s"
+
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
+msgstr "фазовый удар"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
-msgstr "Вы обезоруживаете %s"
+msgid "You phase-strike %s"
+msgstr "Вы наносите фазовый удар по %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
-msgstr "<npcname> обезоруживает %s"
+msgid "<npcname> phase-strikes %s"
+msgstr "<npcname> наносит фазовый удар по %s"
 
 #: lang/json/technique_from_json.py
 msgid "Pressure Crunch"
@@ -191124,36 +195910,42 @@ msgstr ""
 
 #: lang/json/terrain_from_json.py
 msgid "deep dock pile"
-msgstr ""
+msgstr "глубоководная свая"
 
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr ""
+"Крепкая деревянная свая, простирающаяся до самого дна реки. Для поддержки "
+"настила потребуется рама."
 
 #: lang/json/terrain_from_json.py
 msgid "deep dock frame"
-msgstr ""
+msgstr "рама причала"
 
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr ""
+"Бревенчатый каркас, закрепленный на деревянных сваях. Добавление деревянного"
+" настила превратит это в настоящий причал для лодок."
 
 #: lang/json/terrain_from_json.py
 msgid "deep dock"
-msgstr ""
+msgstr "причал"
 
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr ""
+"Деревянный настил, удерживаемый длинными деревянными сваями, которые забиты "
+"в дно реки. Очень крепкий и, вероятно, ещё переживет вас."
 
 #: lang/json/terrain_from_json.py
 msgid "shallow bridge"
@@ -191930,12 +196722,12 @@ msgstr ""
 
 #: lang/json/terrain_from_json.py
 msgid "closed screen door"
-msgstr ""
+msgstr "закрытая сетчатая дверь"
 
 #. ~ Description for closed screen door
 #: lang/json/terrain_from_json.py
 msgid "A simple wooden doorway with screen mesh."
-msgstr ""
+msgstr "Простой деревянный дверной проём с антимоскитной сеткой."
 
 #: lang/json/terrain_from_json.py
 msgid "rattle!"
@@ -192017,7 +196809,7 @@ msgstr "металлическое громыхание!"
 
 #: lang/json/terrain_from_json.py
 msgid "screen mesh wall"
-msgstr ""
+msgstr "сетчатая стена"
 
 #. ~ Description for screen mesh wall
 #: lang/json/terrain_from_json.py
@@ -192025,6 +196817,8 @@ msgid ""
 "A rather flimsy tall wall made of 2x4s and screen mesh, suitable for keeping"
 " the bugs out."
 msgstr ""
+"Довольно хлипкая высокая стена, сделанная из стоек и антимоскитной сетки, "
+"предохраняющей от насекомых."
 
 #: lang/json/terrain_from_json.py
 msgid "chickenwire fence post"
@@ -192387,7 +197181,7 @@ msgstr "деревянный пол"
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
 msgstr ""
 "Пол из плотно уложенных сбитых гвоздями деревянных досок. Такие часто бывают"
@@ -192736,7 +197530,7 @@ msgstr "лучевая установка"
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr ""
 "Многофункциональная установка, служащая одновременно хранилищем и "
@@ -193092,10 +197886,10 @@ msgstr "можжевельник"
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
 "Один из видов рода «Можжевельник», растущих в Новой Англии. Растение "
 "поначалу только цветёт и лишь на второй-третий год даёт плоды, после двух "
@@ -194239,10 +199033,11 @@ msgstr "банкомат"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
 "Для удобства ваших банковских расчётов. Этот банкомат полностью способен к "
 "автономной работе даже в условиях полного отказа сети. Вы можете переводить "
@@ -194278,7 +199073,7 @@ msgid ""
 "This machine will provide you access to whatever is beyond it - for the "
 "price of a ticket, of course."
 msgstr ""
-"Этот аппарат пропустит вас к чему бы то ни было - в обмен на билет, конечно."
+"Этот аппарат пропустит вас к чему бы то ни было — в обмен на билет, конечно."
 
 #: lang/json/terrain_from_json.py
 msgid "broken generator"
@@ -194361,8 +199156,8 @@ msgstr "центрифуга"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
 msgstr ""
 "Это центрифуга, прибор для разделения жидкостей вместе с автоматическим "
 "анализатором. С её помощью можно сделать анализ образца медицинской "
@@ -195067,7 +199862,7 @@ msgstr "закрытый смоляной портал"
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
 msgstr ""
@@ -195081,7 +199876,7 @@ msgstr "открытый смоляной портал"
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
 msgstr ""
@@ -195188,6 +199983,15 @@ msgid ""
 " were still running."
 msgstr "Знак, обозначающий пересечение путей. Если б ещё ходили поезда."
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr ""
+"Как ж/д рельсы, только меньше. Вы могли бы, вероятно, по ним запустить "
+"небольшое средство передвижения."
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "песочница"
@@ -195258,10 +200062,10 @@ msgstr "воронка жёлоба"
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr ""
-"Выпускает воду из водосточной трубы на землю. Выглядит не слишком прочно. "
+"Отводит воду из водосточной трубы на землю. Выглядит не слишком прочно. "
 "Отсюда можно забраться наверх."
 
 #: lang/json/terrain_from_json.py
@@ -195272,7 +200076,7 @@ msgstr "водосточная труба"
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
 msgstr ""
 "Длинная водосточная труба, свисающая с крыши до земли, под неё можно "
@@ -195322,7 +200126,7 @@ msgstr "металлическая плоская крыша"
 #. ~ Description for metal flat roof
 #: lang/json/terrain_from_json.py
 msgid "A section of flat, sheet metal rooftop."
-msgstr ""
+msgstr "Участок плоской крыши из листового металла."
 
 #: lang/json/terrain_from_json.py
 msgid "tile flat roof"
@@ -195350,7 +200154,7 @@ msgstr "каменный свод"
 #. ~ Description for rock roof
 #: lang/json/terrain_from_json.py
 msgid "A section of flat natural rock."
-msgstr ""
+msgstr "Плоский свод из природного камня."
 
 #: lang/json/terrain_from_json.py
 msgid "empty space"
@@ -196175,7 +200979,7 @@ msgstr "полупостроенная колонна"
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr ""
 "Пустой деревянный каркас в форме колонны, построенный на железобетонном "
@@ -197519,7 +202323,7 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
 "Вы активировали гранату! Вряд ли стоит тянуть с броском. Чтобы метнуть что-"
 "нибудь, нажмите «t» и выберите нужный предмет. Максимальная дистанция броска"
@@ -197626,7 +202430,7 @@ msgstr ""
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr ""
@@ -197979,6 +202783,10 @@ msgstr "шестиместная мотодрезина"
 msgid "Rail Motorcycle"
 msgstr "рельсовый мотоцикл"
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr ""
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "безбортовый грузовик"
@@ -198741,6 +203549,9 @@ msgid ""
 "the vehicle when turned on.  During installation, you can choose what "
 "direction to point the light."
 msgstr ""
+"Очень яркий направленный прожектор. Когда включён, освещает полукруглую "
+"область снаружи транспортного средства. Во время установки можно выбрать, "
+"куда направить свет."
 
 #: lang/json/vehicle_part_from_json.py
 msgid "headlight"
@@ -198892,7 +203703,7 @@ msgstr "привязанный матрас"
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
 msgstr "Матрас, привязанный к машине. Смягчит любой удар."
 
 #. ~ Description for shredder
@@ -199354,6 +204165,8 @@ msgid ""
 "A computer system hooked up to the steering and engine of the vehicle to "
 "allow it to follow simple paths."
 msgstr ""
+"Компьютерная система, подключенная к рулевому управлению и двигателю "
+"автомобиля, которая направляет его по заданному простому пути."
 
 #: lang/json/vehicle_part_from_json.py
 msgid "swappable storage battery case"
@@ -199402,14 +204215,21 @@ msgid ""
 "you could clean a lot of clothes.  'e'xamine the tile with the washing "
 "machine to use it."
 msgstr ""
+"Маленькая стиральная машина. Затратив моющее средство или мыло, воду и "
+"немного электроэнергии, можно перестирать очень много одежды. Для "
+"использования нажмите [e] и укажите на тайл со стиральной машиной."
 
 #. ~ Description for dishwasher
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr ""
+"Маленькая посудомойка. Затратив моющее средство, воду и немного "
+"электроэнергии, можно помыть тарелки… Или что-то более полезное вроде КБМ, "
+"покрытого внутренностями зомби. Для использования нажмите [e] и укажите на "
+"тайл с посудомойкой."
 
 #. ~ Description for autoclave
 #: lang/json/vehicle_part_from_json.py
@@ -199608,11 +204428,11 @@ msgstr ""
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
 msgstr ""
 "Большой ветряк со стабилизирующими подпорками. Будет заряжать автомобильные "
-"батареи, если на него дует ветер. Ухудшает сопротивление ветра транспорта."
+"батареи, если на него дует ветер. Ухудшает сопротивление ветру транспорта."
 
 #. ~ Description for reinforced solar panel
 #: lang/json/vehicle_part_from_json.py
@@ -200218,6 +205038,10 @@ msgid ""
 "automatic mode.  When installed over the turret, it will enable auto "
 "targeting mode for said turret."
 msgstr ""
+"Набор из двигателя, камеры и ИИ-блока, который позволяет отслеживать цели, "
+"идентифицировать друга или врага и стрелять из подключенной башни в "
+"полностью автоматическом режиме. При установке на башню, открывает режим "
+"автоматического наведения для турели."
 
 #: lang/json/vehicle_part_from_json.py
 msgid "light wheel mount (steerable)"
@@ -200266,6 +205090,16 @@ msgstr ""
 msgid "rail wheel (steerable)"
 msgstr "железнодорожное колесо (управляемое)"
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr ""
+"Пара маленьких ж/д колёс. Хорошо подходят для езды на небольших рельсах, но "
+"ужасны для всего остального. А ещё, вы не можете управлять ими."
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "каток"
@@ -202069,6 +206903,10 @@ msgstr "витамин В12"
 msgid "Vitamin C"
 msgstr "витамин С"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr "Яды"
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr "Нажмите "
@@ -202197,6 +207035,8 @@ msgid ""
 "You need to suspend this corpse to butcher it.  While you have a rope to "
 "lift the corpse, there is no tree nearby to hang it from."
 msgstr ""
+"Вам нужно подвесить эту тушу, чтобы разделать её. У вас есть верёвка, но "
+"поблизости нет подходящего дерева."
 
 #: src/activity_handlers.cpp
 msgid ""
@@ -202563,7 +207403,7 @@ msgstr ""
 #. ~ Sound of a Pickaxe at work!
 #: src/activity_handlers.cpp
 msgid "CHNK!  CHNK!  CHNK!"
-msgstr ""
+msgstr "ТКХХ! ТКХХ! ТКХХ!"
 
 #: src/activity_handlers.cpp
 msgid "You finish digging."
@@ -202614,7 +207454,7 @@ msgstr "Вы вставили патрон в %s."
 msgid "You refill the %s."
 msgstr "Вы налили жидкость в контейнер (%s)."
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "Здесь нечего поджечь."
 
@@ -202632,6 +207472,16 @@ msgstr ""
 "Сейчас не хватает солнечного света, чтобы зажечь огонь. Вы перестаете "
 "пытаться."
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr ""
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "Вы изучили %s."
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -202642,11 +207492,6 @@ msgstr "Вы закончили тренировать %s до уровня %d."
 msgid "You get some training in %s."
 msgstr "Вы немного тренируетесь в %s."
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "Вы изучили %s."
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr "Вы полностью зарядили батарею."
@@ -202771,15 +207616,23 @@ msgstr "Шанс повреждения: <color_light_blue>%.1f</color>%%"
 msgid "Your %s is already fully repaired."
 msgstr "%s уже полностью починен."
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr "В настоящий момент вы не можете исправить %s."
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgstr ""
+"Вы размораживаете еду, но не подогреваете, потому что она вкуснее холодной."
+
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr "Вы разморозили и подогрели еду."
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr "Вы разогреваете пищу."
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
-msgstr "Вы успешно починили %s."
+msgid "You are currently unable to mend the %s."
+msgstr "В настоящий момент вы не можете исправить %s."
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -202846,7 +207699,7 @@ msgstr "Вы закончили ждать."
 #: src/activity_handlers.cpp
 #, c-format
 msgid "%s finishes with you…"
-msgstr ""
+msgstr "%s заканчивает с вами…"
 
 #: src/activity_handlers.cpp
 msgid "You are bored of waiting, so you stop."
@@ -202863,7 +207716,7 @@ msgstr "%s заканчивает болтать с вами."
 
 #: src/activity_handlers.cpp
 msgid "You toss and turn…"
-msgstr ""
+msgstr "Вы ворочаетесь и крутитесь…"
 
 #: src/activity_handlers.cpp
 msgid "You have trouble sleeping, keep trying?"
@@ -202975,7 +207828,7 @@ msgstr ""
 
 #: src/activity_handlers.cpp src/player_hardcoded_effects.cpp
 msgid "You try to sleep, but can't…"
-msgstr ""
+msgstr "Вы пытаетесь поспать, но не можете…"
 
 #: src/activity_handlers.cpp
 msgid ""
@@ -202987,7 +207840,7 @@ msgstr ""
 
 #: src/activity_handlers.cpp
 msgid "a short upbeat jingle: \"Operation successful\""
-msgstr "короткую весёлую мелодию: \"Операция успешно завершена\""
+msgstr "короткую весёлую мелодию: «Операция успешно завершена»"
 
 #: src/activity_handlers.cpp
 msgid ""
@@ -202998,7 +207851,7 @@ msgstr ""
 
 #: src/activity_handlers.cpp
 msgid "a sad beeping noise: \"Operation failed\""
-msgstr "тоскливый писк: \"Операция прошла неудачно\""
+msgstr "тоскливый писк: «Операция прошла неудачно»"
 
 #: src/activity_handlers.cpp
 msgid "The operation is a success."
@@ -203093,7 +207946,7 @@ msgstr "Вы закончили работать с отбойником."
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr "хч!"
 
@@ -203166,7 +208019,7 @@ msgstr "Вы посадили все доступные семена."
 
 #: src/activity_handlers.cpp
 msgid "Target lost.  IFF override failed."
-msgstr ""
+msgstr "Цель потеряна. Подмена сигнала «свой-чужой» не удалась."
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -203187,11 +208040,11 @@ msgstr ""
 
 #: src/activity_handlers.cpp
 msgid "…and turns friendly!"
-msgstr ""
+msgstr "…и становится дружественным!"
 
 #: src/activity_handlers.cpp
 msgid "…but the robot refuses to acknowledge you as an ally!"
-msgstr ""
+msgstr "…но робот отказывается признавать в вас союзника!"
 
 #: src/activity_handlers.cpp
 msgid "The ancient tree spirits answer your call."
@@ -203259,7 +208112,7 @@ msgstr "Слишком темно для чтения."
 
 #: src/activity_handlers.cpp
 msgid "…you finally find the memory banks."
-msgstr ""
+msgstr "…вы наконец находите модуль памяти."
 
 #: src/activity_handlers.cpp
 msgid "The kit makes a copy of the data inside the bionic."
@@ -203496,6 +208349,8 @@ msgstr "Вы разрубили бревно на доски."
 #, c-format
 msgid "%s can't reach the source tile.  Try to sort out loot without a cart."
 msgstr ""
+"%s не может добраться до точки назначения. Попытайтесь отсортировать добычу "
+"без тележки."
 
 #: src/activity_item_handling.cpp
 #, c-format
@@ -203541,7 +208396,7 @@ msgstr "Вам хочется кофеина."
 
 #: src/addiction.cpp
 msgid "Your hands start shaking… you need it bad!"
-msgstr ""
+msgstr "Ваши руки начинают трястись… Трубы горят!"
 
 #: src/addiction.cpp
 msgid "You could use a drink."
@@ -203553,15 +208408,15 @@ msgstr "Вы могли бы принять диазепам."
 
 #: src/addiction.cpp
 msgid "Your hands start shaking… you need a drink bad!"
-msgstr ""
+msgstr "Ваши руки начинают трястись… Ну хоть капельку прибухнуть!"
 
 #: src/addiction.cpp
 msgid "You're shaking… you need some diazepam!"
-msgstr ""
+msgstr "Вас трясёт… Вам нужен диазепам!"
 
 #: src/addiction.cpp
 msgid "Your hands start shaking… you need some painkillers."
-msgstr ""
+msgstr "Ваши руки начинают трястись… Вы нуждаетесь в болеутоляющих."
 
 #: src/addiction.cpp
 msgid "You feel anxious.  You need your painkillers!"
@@ -203573,7 +208428,7 @@ msgstr "Вы чувствуете себя подавленным. Принят
 
 #: src/addiction.cpp
 msgid "Your hands start shaking… you need a pick-me-up."
-msgstr ""
+msgstr "Ваши руки начинают трястись… Вам нужно что-нибудь тонизирующее."
 
 #: src/addiction.cpp
 msgid "You stop suddenly, feeling bewildered."
@@ -203609,7 +208464,7 @@ msgstr "Вы не принимали мутаген достаточно дол
 
 #: src/addiction.cpp
 msgid "You could use some new parts…"
-msgstr ""
+msgstr "Вы бы могли использовать новые части тела…"
 
 #: src/addiction.cpp
 msgid "You daydream about luscious pink berries as big as your fist."
@@ -203756,11 +208611,11 @@ msgstr ""
 "Тяжело бегать. Депрессия. Ослабленная иммунная система. Частые приступы ломки."
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
 msgstr "Восприятие -1; Интеллект -1; Частые приступы ломки."
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
 msgstr "Восприятие -2; Интеллект -2; Частые приступы ломки."
 
 #: src/addiction.cpp
@@ -203947,38 +208802,6 @@ msgstr "где  кол   вес   объ"
 msgid "Name (charges)"
 msgstr "Название (заряды)"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "Вы не тянете никакую машину!"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "Нет машин, которые вы тянете!"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "Неверный контейнер!"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "Все 9 клеток"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr " <color_white_red>ОГОНЬ</color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr " ОПАСНОСТЬ"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr " ЛОВУШКА"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr " ВОДА"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -203999,7 +208822,7 @@ msgstr "[R] Сброс"
 
 #: src/advanced_inv.cpp
 msgid "You look at the items, then your clothes, and scratch your head…"
-msgstr ""
+msgstr "Вы смотрите на предметы, затем на свою одежду, потом чешете голову…"
 
 #: src/advanced_inv.cpp
 msgid "There are no items to be moved!"
@@ -204024,7 +208847,7 @@ msgstr "Пропустить наполненные вёдра, чтобы из
 
 #: src/advanced_inv.cpp
 msgid "Sort by…"
-msgstr ""
+msgstr "Сортировать…"
 
 #: src/advanced_inv.cpp
 msgid "Unsorted (recently added first)"
@@ -204091,24 +208914,56 @@ msgstr "Это слишком тяжело!"
 #: src/advanced_inv.cpp
 #, c-format
 msgid "How many do you want to move?  [Have %d] (0 to cancel)"
-msgstr ""
+msgstr "Сколько нужно перенести? [Имеется %d] (0 — отмена)"
 
 #: src/advanced_inv.cpp
 #, c-format
 msgid "Destination can only hold %d!  Move how many?  [Have %d] (0 to cancel)"
-msgstr ""
+msgstr "Поместится только %d! Сколько переместить? [Есть %d] (0 для отмены) "
 
 #: src/advanced_inv.cpp
 msgid "The destination is already full!"
 msgstr "Место назначения уже заполнено!"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "Вы не тянете никакую машину!"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "Нет машин, которые вы тянете!"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "Неверный контейнер!"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "Все 9 клеток"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr " <color_white_red>ОГОНЬ</color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr " ОПАСНОСТЬ"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr " ЛОВУШКА"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr " ВОДА"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "Неверный контейнер"
 
 #: src/animation.cpp
 msgid "Hang on a bit…"
-msgstr ""
+msgstr "Подождите немного…"
 
 #: src/armor_layers.cpp
 msgid "in your <color_light_blue>personal aura</color>"
@@ -204258,6 +209113,14 @@ msgstr "Ударный:"
 msgid "Cut:"
 msgstr "Режущий:"
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr "Кислота: "
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr "Огонь: "
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "Окружающая среда:"
@@ -204327,7 +209190,7 @@ msgstr "Тип брони"
 #: src/armor_layers.cpp
 #, c-format
 msgid "Press %s for help.  Press %s to change keybindings."
-msgstr ""
+msgstr "Нажмите %s для помощи. Нажмите %s для смены горячих клавиш."
 
 #: src/armor_layers.cpp
 msgid "(Innermost)"
@@ -204397,6 +209260,20 @@ msgid ""
 "The second number is an additional encumbrance penalty caused by wearing multiple items on one of the bodypart's layers or wearing items outside of other items they would normally be work beneath (e.g. a shirt over a backpack).\n"
 "The sum of these values is the effective encumbrance value your character has for that bodypart."
 msgstr ""
+"Используйте стрелки или цифровую клавиатуру для навигации по левому списку.\n"
+"[%s] для изменения порядка выделенной брони.\n"
+"[%s]/[%s] для прокрутки правого списка.\n"
+"[%s] для привязки особой буквы инвентаря к одежде.\n"
+"[%s], чтобы выбрать сторону, на которой будет носиться вещь.\n"
+"[%s], чтобы отсортировать броню в естественном порядке.\n"
+"[%s], чтобы надеть новую вещь.\n"
+"[%s], чтобы надеть выбранную вещь.\n"
+"[%s], чтобы снять с себя выбранную броню.\n"
+"\n"
+"Разъяснение [Скованность и тепло]:\n"
+"Первое число — сумма скованности от всей одежды на этой части тела.\n"
+"Второе число — дополнительная скованность, вызванная ношением множества вещей на одном из четырёх слоёв этой части тела или ношением вещей в неправильном порядке (например футболка поверх рюкзака).\n"
+"Сумма этих чисел — это значение текущей скованности вашего персонажа на этой части тела."
 
 #: src/artifact.cpp
 msgid "smooth sphere"
@@ -204943,7 +209820,7 @@ msgstr "%s Страдания"
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
+"  Seeing this is a bug!"
 msgstr ""
 "%s по неясной причине недоволен, хотя даже ничего не хочет. Если вы это "
 "видите — это баг!"
@@ -204951,7 +209828,7 @@ msgstr ""
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
 msgstr ""
 "%sдоволен, как и должно быть — у него нет стандартов. Если вы это видите — "
@@ -204982,7 +209859,7 @@ msgstr "Вы подносите %s ближе к коже."
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr ""
 "%s озадачен, потому что вы спите во время бодрствования. Если вы это видите "
 "— это баг!"
@@ -205228,6 +210105,18 @@ msgid ""
 "M:copper        matches items made purely of copper\n"
 "M:steel,iron    multiple materials allowed (OR search)"
 msgstr ""
+"* используется для подстановки. Примеры:\n"
+"\n"
+"деревянная стрела совпадает с именем предмета\n"
+"дер* совпадает для всех предметов, начинающихся с дер\n"
+"*рела совпадает для всех предметов, кончающихся на рела\n"
+"строки типа де*я ст*а также разрешены\n"
+"дЕр*Вя*Ая Ст*Ела регистронезависимый поиск\n"
+"\n"
+"Поднимание вещей, основанное на материалах:\n"
+"m:кевлар означает вещь, сделанную из кевлара\n"
+"M:медь подразумевает вещь, сделанную из чистой меди\n"
+"M:сталь,железо разрешено несколько материалов (ИЛИ поиск)"
 
 #: src/auto_pickup.cpp
 msgid "Pickup Rule:"
@@ -205260,7 +210149,7 @@ msgstr "Не отображаются совпадения по содержим
 
 #: src/auto_pickup.cpp
 msgid "Autopickup is not enabled in the options.  Enable it now?"
-msgstr ""
+msgstr "Автоподбор не включён в настройках. Включить его?"
 
 #: src/auto_pickup.cpp
 msgid "autopickup configuration"
@@ -205297,7 +210186,7 @@ msgstr "Не время для обучения! Ваша мораль слиш
 #: src/avatar.cpp
 #, c-format
 msgid "%s %d needed to understand.  You have %d"
-msgstr ""
+msgstr "Нужен навык %s уровня %d, чтобы понять. Ваш навык %d"
 
 #: src/avatar.cpp src/iuse.cpp
 msgid "You're illiterate!"
@@ -205323,7 +210212,7 @@ msgstr "%s неграмотный(ая)!"
 #: src/avatar.cpp
 #, c-format
 msgid "%s %d needed to understand.  %s has %d"
-msgstr ""
+msgstr "Нужен навык %s уровня %d, чтобы понять. У %s навык %d"
 
 #: src/avatar.cpp
 #, c-format
@@ -205348,7 +210237,7 @@ msgstr "%s моральное состояние слишком низкое!"
 #: src/avatar.cpp
 #, c-format
 msgid "%s reads aloud…"
-msgstr ""
+msgstr "%s читает вслух…"
 
 #: src/avatar.cpp
 #, c-format
@@ -205441,7 +210330,7 @@ msgstr "Сейчас изучается %s, для отмены %s"
 
 #: src/avatar.cpp
 msgid "You read aloud…"
-msgstr ""
+msgstr "Вы читаете вслух…"
 
 #: src/avatar.cpp
 #, c-format
@@ -205469,13 +210358,15 @@ msgid ""
 "It's difficult for %s to see fine details right now.  Reading will take "
 "longer than usual."
 msgstr ""
+"При текущем освещении %s с трудом различаешь детали. Чтение займёт больше "
+"времени, чем обычно."
 
 #: src/avatar.cpp
 #, c-format
 msgid ""
 "This book is too complex for %s to easily understand.  It will take longer "
 "to read."
-msgstr ""
+msgstr "Эта книга немного сложновата для %s. Чтение займёт больше времени."
 
 #: src/avatar.cpp
 msgid "You are too exhausted to train martial arts."
@@ -205561,7 +210452,7 @@ msgstr "%s повышает свой %s уровень."
 #: src/avatar.cpp
 #, c-format
 msgid "You learn a little about %s!  (%d%%)"
-msgstr ""
+msgstr "Вы узнали немного про %s!  (%d%%)"
 
 #: src/avatar.cpp
 #, c-format
@@ -205590,7 +210481,7 @@ msgstr "Повторное чтение %s уже не доставит тако
 
 #: src/avatar.cpp
 msgid "Maybe you should find something new to read…"
-msgstr ""
+msgstr "Может быть, вам стоит найти что-то новое, чтобы почитать…"
 
 #: src/avatar.cpp
 #, c-format
@@ -205631,11 +210522,11 @@ msgstr "Вы немного тренируетесь."
 
 #: src/avatar.cpp src/player_hardcoded_effects.cpp
 msgid "It looks like you've slept through your internal alarm…"
-msgstr ""
+msgstr "Похоже, вы проспали ваш встроенный будильник…"
 
 #: src/avatar.cpp src/player_hardcoded_effects.cpp
 msgid "It looks like you've slept through the alarm…"
-msgstr ""
+msgstr "Похоже, вы проспали будильник…"
 
 #: src/avatar.cpp
 msgid "You retched, but your stomach is empty."
@@ -205643,7 +210534,7 @@ msgstr "Вы чувствуете позыв к рвоте, но ваш желу
 
 #: src/avatar.cpp
 msgid "You lost your book!  You stop reading."
-msgstr ""
+msgstr "Вы потеряли книгу, поэтому прекращаете чтение!"
 
 #: src/avatar.cpp
 msgid "Your thick scales get in the way."
@@ -205713,7 +210604,7 @@ msgstr "неправильная характеристика"
 #: src/avatar.cpp
 #, c-format
 msgid "Are you sure you want to raise %s?  %d points available."
-msgstr ""
+msgstr "Вы уверены, что хотите поднять %s?  %dочков доступно."
 
 #: src/avatar.cpp
 msgid "You set your mech's leg power to a loping fast walk."
@@ -205746,7 +210637,7 @@ msgstr "Ваш скакун слишком утомился, чтобы скак
 
 #: src/avatar.cpp
 msgid "You need two functional legs to run."
-msgstr ""
+msgstr "Вам надо иметь здоровые ноги, чтобы бежать."
 
 #: src/avatar.cpp
 msgid "You're too tired to run."
@@ -205772,6 +210663,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr "Достать %1$s из %2$s?"
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr "Что сделать с %s?"
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr ""
@@ -205780,11 +210676,11 @@ msgstr ""
 
 #: src/avatar_action.cpp
 msgid "You cannot pull yourself away from the faultline…"
-msgstr ""
+msgstr "Вы не можете заставить себя отойти от разлома…"
 
 #: src/avatar_action.cpp
 msgid "Monster in the way.  Auto-move canceled."
-msgstr ""
+msgstr "Монстр на пути. Авто-движение отменено."
 
 #: src/avatar_action.cpp
 msgid "Click directly on monster to attack."
@@ -205796,7 +210692,7 @@ msgstr "Ваша сила воли рвётся вперёд, и вы вмест
 
 #: src/avatar_action.cpp src/handle_action.cpp src/handle_action.cpp
 msgid "You're too pacified to strike anything…"
-msgstr ""
+msgstr "Вы слишком мирны, чтобы бить что-нибудь…"
 
 #: src/avatar_action.cpp
 #, c-format
@@ -205878,7 +210774,7 @@ msgstr "Вы тонете как камень!"
 #: src/avatar_action.cpp
 #, c-format
 msgid "You need to breathe!  (%s to surface.)"
-msgstr ""
+msgstr "Вам необходимо вдохнуть! (%s, чтобы всплыть.)"
 
 #: src/avatar_action.cpp
 msgid "You need to breathe but you can't swim!  Get to dry land, quick!"
@@ -205892,6 +210788,7 @@ msgstr "Вы не можете зайти в транспорт верхом."
 #: src/avatar_action.cpp
 msgid "No hostile creature in reach.  Waiting a turn."
 msgstr ""
+"В пределах досягаемости враждебных существ не наблюдается. Ожидаем один ход."
 
 #: src/avatar_action.cpp
 msgid "Your eyes steel, and you raise your weapon!"
@@ -205899,7 +210796,7 @@ msgstr "Ваши глаза полны решимости, и вы вскиды
 
 #: src/avatar_action.cpp
 msgid "You can't fire your weapon, it's too heavy…"
-msgstr ""
+msgstr "Вы не можете стрелять из вашего оружия, оно слишком тяжёлое…"
 
 #: src/avatar_action.cpp
 #, c-format
@@ -205909,12 +210806,14 @@ msgstr ""
 "оружия."
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
-msgstr "Вы больше не можете стрелять."
+#, c-format
+msgid "You can no longer fire your %s."
+msgstr "Вы больше не можете стрелять из %s."
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "Для вождения нужна свободная рука!"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr "Вы не можете использовать %s за рулём!"
 
 #: src/avatar_action.cpp
 #, c-format
@@ -205922,8 +210821,9 @@ msgid "You need two free hands to fire your %s."
 msgstr "Вам нужны две руки, чтобы стрелять из %s."
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "Вам нужно перезарядиться!"
+#, c-format
+msgid "Your %s is empty!"
+msgstr "Ваш %s пуст!"
 
 #: src/avatar_action.cpp
 #, c-format
@@ -205934,20 +210834,24 @@ msgstr "Для огня вашей %s требуется %i зарядов!"
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
+"charges to fire the %s!"
 msgstr ""
-"Для стрельбы вам нужен УБП, как минимум, с %d зарядами или улучшенный УБП, "
-"как минимум, с %d зарядами!"
+"Для стрельбы из %s вам нужен УБП, как минимум, с %d зарядами или улучшенный "
+"УБП, как минимум, с %d зарядами!"
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
-msgstr "У вашего меха села батарея, его оружие не будет стрелять."
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
+msgstr "У вашего меха села батарея, %s не выстрелит."
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
 msgstr ""
+"Для использования %s вы должны стоять рядом с подходящей местностью или "
+"мебелью. Стол, насыпь, разбитое окно и т.д."
 
 #: src/avatar_action.cpp
 #, c-format
@@ -205994,7 +210898,7 @@ msgstr "Вы сильно сконцентрировались, и ваше те
 
 #: src/avatar_action.cpp
 msgid "You can't muster up the effort to throw anything…"
-msgstr ""
+msgstr "У вас не хватает сил бросить что-либо…"
 
 #: src/ballistics.cpp
 #, c-format
@@ -206187,6 +211091,17 @@ msgstr "%s автоматически выключается!"
 msgid "Your %s automatically turns off."
 msgstr "%s автоматически выключается!"
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr "Ваш %s не функционирует из-за сухости."
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr ""
+"Ваш %s предупреждает о низкой влажности. Эффективность будет понижена."
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "Вы передумываете и выключаете."
@@ -206304,10 +211219,6 @@ msgstr "Результаты анализа крови"
 msgid "No effects."
 msgstr "Нет эффекта."
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr "Влажность воздуха недостаточно высока, чтобы собрать из него воду!"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr "Храповики зацепляются за ваши суставы."
@@ -206322,10 +211233,6 @@ msgstr ""
 msgid "Start a fire where?"
 msgstr "Где зажечь огонь?"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "Вы не можете разжечь огонь здесь"
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -206512,6 +211419,24 @@ msgstr "Ваш %s отключается, чтобы не тратить топ
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr "У <npcname> отключается %s во избежание траты топлива."
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr ""
+"Поскольку запас питательных веществ ниже безопасного порога, %s отключается,"
+" чтобы сохранить ваше здоровье."
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr ""
+"Чтобы сохранить здоровье, у <npcname> отключается %s, поскольку его запас "
+"питательных веществ подходит к концу."
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -206541,6 +211466,21 @@ msgid "You feel your throat open up and air filling your lungs!"
 msgstr ""
 "Вы чувствуете, как ваше горло раскрывается, и воздух наполняет ваши лёгкие!"
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr "Недостаточно влажности для функционирования вашего %s."
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr "Ваш %s предупреждает о низкой влажности. Эффективность снижена."
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr "Влажность достаточная. Ваш %s счастливо пиликает."
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr "Удаление провалилось без последствий."
@@ -206603,7 +211543,7 @@ msgstr "<npcname> подготавливается к проведению оп
 #: src/bionics.cpp
 #, c-format
 msgid "A lifetime of augmentation has taught %s a thing or two…"
-msgstr ""
+msgstr "%s всю жизнь занимался имплантами и кое-что умеет…"
 
 #: src/bionics.cpp
 #, c-format
@@ -206620,6 +211560,8 @@ msgstr ""
 msgid ""
 "WARNING: Removing a reactor may leave radioactive material!  Remove anyway?"
 msgstr ""
+"ВНИМАНИЕ: После удаления реактора может остаться радиоактивное вещество! "
+"Удалить все равно?"
 
 #: src/bionics.cpp
 #, c-format
@@ -206671,7 +211613,7 @@ msgid ""
 "You feel a tiny pricking sensation in your right arm, and lose all sensation"
 " before abruptly blacking out."
 msgstr ""
-"Вы чувствуете небольшое покалывание в правой руке, а затем внезапно теряете "
+"Вы чувствуете небольшой укольчик в правую руку, а затем внезапно теряете "
 "сознание."
 
 #: src/bionics.cpp
@@ -206723,6 +211665,8 @@ msgid ""
 "WARNING: %i percent chance of failure that may result in damage, pain, or a "
 "faulty installation!  Continue anyway?"
 msgstr ""
+"ВНИМАНИЕ: %i-процентный шанс повреждений, боли или неудачной установки! Всё "
+"равно продолжить?"
 
 #. ~ %1$s - name of the bionic to be upgraded (inferior), %2$s - name of the
 #. upgraded bionic (superior).
@@ -206864,18 +211808,20 @@ msgstr "кДж"
 #: src/bionics_ui.cpp src/panels.cpp src/units.h
 msgctxt "energy unit: joule"
 msgid "J"
-msgstr ""
+msgstr "Дж"
 
 #: src/bionics_ui.cpp src/panels.cpp src/units.h
 msgctxt "energy unit: millijoule"
 msgid "mJ"
-msgstr ""
+msgstr "мДж"
 
 #: src/bionics_ui.cpp
 #, c-format
 msgid ""
 "Bionic Power: <color_light_blue>%s</color>/<color_light_blue>%ikJ</color>"
 msgstr ""
+"Бионическая энергия: "
+"<color_light_blue>%s</color>/<color_light_blue>%iкДж</color>"
 
 #: src/bionics_ui.cpp
 msgid ""
@@ -206908,22 +211854,22 @@ msgstr ""
 #: src/bionics_ui.cpp
 #, c-format
 msgid "%s act"
-msgstr ""
+msgstr "%s вкл"
 
 #: src/bionics_ui.cpp
 #, c-format
 msgid "%s deact"
-msgstr ""
+msgstr "%s выкл"
 
 #: src/bionics_ui.cpp
 #, c-format
 msgid "%s/turn"
-msgstr ""
+msgstr "%s/ход"
 
 #: src/bionics_ui.cpp
 #, c-format
 msgid "%s/%d turns"
-msgstr ""
+msgstr "%s/%d ходов"
 
 #: src/bionics_ui.cpp src/handle_action.cpp
 msgid "OFF"
@@ -206972,6 +211918,7 @@ msgstr "Нет установленной пассивной бионики."
 #, c-format
 msgid "%s; enter new letter.  Space to clear.  Esc to cancel."
 msgstr ""
+"%s; введите новую букву. Нажмите SPACE для пустого значения, ESC для отмены."
 
 #: src/bionics_ui.cpp
 #, c-format
@@ -206980,6 +211927,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Неверная буква бионики. Только эти символы действительны:\n"
+"\n"
+"%s"
 
 #: src/bionics_ui.cpp
 #, c-format
@@ -206996,7 +211946,7 @@ msgstr "Точности"
 
 #: src/bonuses.cpp src/martialarts.cpp
 msgid "Dodge"
-msgstr "уклонение"
+msgstr "Уклонение"
 
 #: src/bonuses.cpp src/panels.cpp
 msgid "Speed"
@@ -207370,8 +212320,12 @@ msgstr "に坂索トし荷測のンおク妙免イロコヤ梅棋厚れ表幌"
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
-msgstr "ты"
+msgid "You"
+msgstr "Вы"
+
+#: src/character.cpp
+msgid "Your"
+msgstr "Ваш "
 
 #: src/character.cpp
 msgid "your"
@@ -207604,6 +212558,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr "Вы кладёте %1$s себе в %2$s."
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr "Вы не можете положить сюда предметы!"
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr "<npcname> не может положить сюда предметы!"
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -207627,10 +212589,20 @@ msgstr "Вам нужно не менее %1$s для этого %2$s, а у в
 msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr "<npcname> нужно не менее %1$s для этого %2$s, а там %3$s."
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr "Вы не можете выпустить из рук %s."
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr "Жидкость из вашего инвентаря протекает на землю."
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr "Ваше текущее значение здоровья — %d."
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "Иссушение"
@@ -207700,6 +212672,77 @@ msgstr "Устал до смерти"
 msgid "Your %s bionic shorts out!"
 msgstr "Вашу бионику (%s) замкнуло, и она отключается!"
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "Ваш %s замёрзнет через несколько часов."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "Ваша %s замёрзнет в течение часа!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr "Ваша %s замёрзнет в любую минуту!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr "Вы чувствуете, что ваш %s начинает неметь от холода!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr "Вы чувствуете, что ваш %s сильно мёрзнет."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr "Вы чувствуете, что ваш %s бросает в дрожь."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr "Вы чувствуете, как %s краснеет от жары!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr "Вы чувствуете, что ваш %s сильно разгорячён."
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr "Вы чувствуете, что ваш %s бросает в жар."
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "Из-за ветра у вас начинает мёрзнуть %s."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr ""
+"Ветер очень сильный, вы должны найти непродуваемую одежду для вашей %s."
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr ""
+"Ваша одежда не обеспечивает достаточный уровень защиты от ветра для %s!"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "Левая рука"
@@ -207718,7 +212761,7 @@ msgstr "Правая нога"
 
 #: src/character.cpp
 msgid "It is broken.  It needs a splint or surgical attention."
-msgstr ""
+msgstr "Перелом. Необходима шина или хирургическое вмешательство."
 
 #: src/character.cpp
 #, c-format
@@ -207765,6 +212808,8 @@ msgstr "Это не поможет очистить рану."
 msgid ""
 "It has a deep wound that looks infected.  Antibiotics might be required."
 msgstr ""
+"Тут глубокая рана, которая выглядит зараженной. Могут понадобиться "
+"антибиотики."
 
 #: src/character.cpp
 #, c-format
@@ -207864,8 +212909,8 @@ msgstr "Полный"
 msgid "Big"
 msgstr "Упитанный"
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "Обычный"
 
@@ -207979,6 +213024,36 @@ msgstr "ACTIVE_EXERCISE"
 msgid "EXTRA_EXERCISE"
 msgstr "EXTRA_EXERCISE"
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr "Ваше тело напряжено под такой тяжестью!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] "Для %s требуется %d заряд от УБП."
+msgstr[1] "Для %s требуется %d заряда от УБП."
+msgstr[2] "Для %s требуется %d зарядов от УБП."
+msgstr[3] "Для %s требуется %d заряд от УБП."
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] "Ваш %s имеет %d заряд, а нужно как минимум %d."
+msgstr[1] "Ваш %s имеет %d заряда, а нужно как минимум %d."
+msgstr[2] "Ваш %s имеет %d зарядов, а нужно как минимум %d."
+msgstr[3] "Ваш %s имеет %d заряд, а нужно как минимум %d."
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "Вы тяжело кашляете."
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "покашливание."
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr "Вы пытаетесь кричать, но у вас нет лица!"
@@ -207997,7 +213072,7 @@ msgstr "пронзительный крик!"
 
 #: src/character.cpp
 msgid "yourself scream loudly!"
-msgstr "Вы громко кричите!"
+msgstr "вы громко кричите!"
 
 #: src/character.cpp
 msgid "a loud shout!"
@@ -208158,6 +213233,20 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr "Погрузилась в спячку."
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr "Вы выучили %s путём интенсивных тренировок с бионикой ближнего боя."
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr "%s чтобы выбрать стиль боевых искусств."
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "Без стиля"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "Без автоподбора"
@@ -208207,278 +213296,6 @@ msgstr ""
 "Дружественные NPC будут исследовать неясные шумы, только если они исходят из"
 " этой зоны."
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr "Предметы: несортированное"
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr ""
-"Место для выкидывания несортированной добычи. Вы можете использовать команду"
-" «сортировка предметов» для сортировки вещей внутри. Оно может перекрывать "
-"зоны предметов разных типов."
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr "Предметы: еда"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr ""
-"Место для съестных припасов. Если более конкретная зона для пищи не "
-"определена, вся еда перемещается сюда."
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr "Предметы: порт. еда"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr ""
-"Место для скоропортящихся продуктов. Включает в себя скоропортящиеся "
-"напитки, если для них не указана конкретная зона."
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr "Предметы: напитки"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr ""
-"Место для напитков. Включает в себя скоропортящиеся напитки, если для них не"
-" указана конкретная зона."
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr "Предметы: порт. напитки"
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr "Место для скоропортящихся продуктов."
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr "Предметы: огнестр. оружие"
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr "Место для оружия, луков и прочих похожих вооружений."
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr "Предметы: магазины"
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr "Место для магазинов к оружию."
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr "Предметы: боеприпасы"
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr "Место для патронов."
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr "Предметы: оружие"
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr "Место для оружия ближнего боя."
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr "Предметы: инструменты"
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr "Место для инструментов."
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr "Предметы: одежда"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr ""
-"Место для одежды. Включает в себя грязную одежду, если для нее не указано "
-"конкретной зоны."
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr "Предметы: грязная одежда"
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr "Место для грязной одежды."
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr "Предметы: мед. препараты"
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr "Место для лекарств и прочих медицинских вещей."
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr "Предметы: книги"
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr "Место для книг и журналов."
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr "Предметы: модификации"
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr "Место для оружейных модификаций и похожих вещей."
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr "Предметы: мутагены"
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr "Место для мутагенов, сывороток и очистителей."
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr "Предметы: бионика"
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr "Место для Компактных Бионических Модулей aka КБМ."
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr "Предметы: детали транспорта"
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr "Место для частей от машин."
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr "Предметы: другое"
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr "Место для прочих вещей."
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr "Предметы: топливо"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr ""
-"Место для бензина, дизеля, лампового масла и прочих субстанций, "
-"использующихся как топливо."
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr "Предметы: семена"
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr "Место для семян, стеблей и прочих похожих вещей."
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr "Предметы: химикаты"
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr "Место для химикатов."
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr "Предметы: запчасти"
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr "Место для запасных частей."
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr "Предметы: артефакты"
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr "Место для артефактов."
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr "Предметы: трупы"
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr "Место для трупов"
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr "Предметы: броня"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr ""
-"Место для брони. Включает в себя грязную брону, если для нее не указана "
-"конкретная зона."
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr "Предметы: грязная броня"
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr "Место для грязной брони."
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr "Предметы: дерево"
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr ""
-"Место для дров и вещей, которые могут использоваться в этом же смысле."
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr "Предметы: Настраиваемое"
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr "Место назначения для предметов с настраиваемым изменяемым фильтром."
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr "Предметы: игнорировать"
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr ""
-"Вещи внутри этой зоны игнорируются при использовании «сортировки предметов» "
-"в зоне."
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr "Источник: дров"
@@ -208486,13 +213303,12 @@ msgstr "Источник: дров"
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
 msgstr ""
-"Ресурсы в этой зоне, такие как дрова или другие горючие материалы могут быть"
-" использованы для автоматического поддержания огня. Огонь будет "
-"поддерживаться при выполнении длительных задач, например чтении, "
-"изготовлении предметов или ожидании."
+"Дрова или другие горючие материалы из этой зоны будут поддерживать огонь "
+"поблизости. Огонь будет поддерживаться при выполнении длительных задач, "
+"например при готовке, чтении или ожидании."
 
 #: src/clzones.cpp
 msgid "Construction: Blueprint"
@@ -208548,6 +213364,16 @@ msgstr ""
 
 #: src/clzones.cpp
 msgid "Vehicles with an autopilot will patrol in this zone."
+msgstr "Транспортные средства с автопилотом будут патрулировать в этой зоне."
+
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr ""
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
 msgstr ""
 
 #: src/clzones.cpp
@@ -208573,11 +213399,11 @@ msgstr "Нет семян"
 #: src/clzones.cpp
 #, c-format
 msgid "Loot: Custom: %s"
-msgstr ""
+msgstr "Предметы: Настраиваемое: %s"
 
 #: src/clzones.cpp
 msgid "Loot: Custom: No Filter"
-msgstr ""
+msgstr "Предметы: Настраиваемое : Без фильтра"
 
 #: src/clzones.cpp
 msgid "Loot: Custom: "
@@ -208731,7 +213557,7 @@ msgstr "ОШИБКА! Доступ запрещён!"
 #: src/computer.cpp
 #, c-format
 msgid "Logging into %s…"
-msgstr ""
+msgstr "Вход в %s…"
 
 #: src/computer.cpp
 msgid "Access is temporary blocked for security purposes."
@@ -208747,15 +213573,17 @@ msgstr "Обойти систему безопасности?"
 
 #: src/computer.cpp
 msgid "Shutting down… press any key."
-msgstr ""
+msgstr "Выключение… нажмите любую клавишу."
 
 #: src/computer.cpp
 msgid "Maximum login attempts exceeded.  Press any key…"
 msgstr ""
+"Превышено максимальное количество попыток авторизации. Нажмите любую "
+"клавишу…"
 
 #: src/computer.cpp
 msgid "Login successful.  Press any key…"
-msgstr ""
+msgstr "Успешная авторизация. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "Root Menu"
@@ -208779,28 +213607,28 @@ msgstr "Выберите диск:"
 
 #: src/computer.cpp
 msgid "Doors opened.  Press any key…"
-msgstr ""
+msgstr "Двери открыты. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "Lock enabled.  Press any key…"
-msgstr ""
+msgstr "Блокировка включена. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "Lock disabled.  Press any key…"
-msgstr ""
+msgstr "Блокировка отключена. Нажмите любую клавишу…"
 
 #. ~ the sound of a church bell ringing
 #: src/computer.cpp
 msgid "Bohm…  Bohm…  Bohm…"
-msgstr ""
+msgstr "Бом… Бом… Бом…"
 
 #: src/computer.cpp
 msgid "Containment shields opened.  Press any key…"
-msgstr ""
+msgstr "Сдерживающие щиты открыты. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "Subjects terminated.  Press any key…"
-msgstr ""
+msgstr "Субъекты уничтожены. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "WARNING: Resonance cascade carries severe risk!  Continue?"
@@ -208815,34 +213643,42 @@ msgstr "Данные не найдены."
 #: src/computer.cpp
 msgid "Local data-access error logged, alerting helpdesk.  Press any key…"
 msgstr ""
+"Зафиксирована ошибка доступа к данным, служба поддержки оповещена. Нажмите "
+"любую клавишу…"
 
 #: src/computer.cpp
 msgid ""
 "Warning: anomalous archive-access activity detected at this node.  Press any"
 " key…"
 msgstr ""
+"Внимание: С этого терминала обнаружен несанкционированный доступ к архиву. "
+"Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "Warning: resticted data access.  Attempt logged.  Press any key…"
 msgstr ""
+"Внимание: доступ к закрытым данным. Попытка зафиксирована. Нажмите любую "
+"клавишу…"
 
 #: src/computer.cpp
 msgid "Press any key…"
-msgstr ""
+msgstr "Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid ""
 "Surface map data downloaded.  Local anomalous-access error logged.  Press "
 "any key…"
 msgstr ""
+"Карта местности скачана. Все подозрительные ошибки локального доступа "
+"зафиксированы. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "Sewage map data downloaded.  Press any key…"
-msgstr ""
+msgstr "Карта канализации скачана. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "Subway map data downloaded.  Press any key…"
-msgstr ""
+msgstr "Карта подземки скачана. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "Target acquisition canceled."
@@ -208880,14 +213716,14 @@ msgstr "Доступ к модулю — Предупреждение:"
 #, c-format
 msgid "%d OTHER FOUND…"
 msgid_plural "%d OTHERS FOUND…"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "НАЙДЕН ДРУГОЙ %d..."
+msgstr[1] "НАЙДЕНЫ ДРУГИЕ %d..."
+msgstr[2] "НАЙДЕНЫ ДРУГИЕ %d..."
+msgstr[3] "НАЙДЕНЫ ДРУГИЕ %d…"
 
 #: src/computer.cpp
 msgid "Elevator activated.  Press any key…"
-msgstr ""
+msgstr "Лифт активирован. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 #, c-format
@@ -208913,7 +213749,7 @@ msgstr ""
 
 #: src/computer.cpp
 msgid "FILE CORRUPTED, PRESS ANY KEY…"
-msgstr ""
+msgstr "ФАЙЛ ПОВРЕЖДЁН, НАЖМИТЕ ЛЮБУЮ КЛАВИШУ…"
 
 #: src/computer.cpp
 msgid "--ACCESS GRANTED--"
@@ -208929,11 +213765,11 @@ msgstr "ДОСТУП ЗАПРЕЩЁН"
 
 #: src/computer.cpp
 msgid "Repeater mod installed…"
-msgstr ""
+msgstr "Установлен мод-ретранслятор…"
 
 #: src/computer.cpp
 msgid "You do not have a repeater mod to install…"
-msgstr ""
+msgstr "У вас нет мода-ретранслятора, чтобы установить его…"
 
 #: src/computer.cpp
 msgid "Computer couldn't find its mission!"
@@ -208965,15 +213801,15 @@ msgstr "ОШИБКА: Пожалуйста, используйте только
 
 #: src/computer.cpp
 msgid "Result: Human blood, no pathogens found."
-msgstr ""
+msgstr "Результат: человеческая кровь, без патогенов."
 
 #: src/computer.cpp
 msgid "Result: Human blood.  Unknown pathogen found."
-msgstr ""
+msgstr "Результат: человеческая кровь. Найден неизвестный возбудитель."
 
 #: src/computer.cpp
 msgid "Result: Unknown blood type.  Unknown pathogen found."
-msgstr ""
+msgstr "Результат: неизвестный тип крови. Найден неизвестный возбудитель."
 
 #: src/computer.cpp
 msgid "Pathogen bonded to erythrocytes and leukocytes."
@@ -209012,12 +213848,16 @@ msgid ""
 "Memory Bank: Military Hexron Encryption\n"
 "Printing Transcript\n"
 msgstr ""
+"Банк памяти: Военное Шифрование Hexron\n"
+"Печать Расшифровки\n"
 
 #: src/computer.cpp
 msgid ""
 "Memory Bank: Unencrypted\n"
 "Nothing of interest.\n"
 msgstr ""
+"Банк памяти: Незашифровано\n"
+"Ничего интересного.\n"
 
 #: src/computer.cpp
 msgid ""
@@ -209027,10 +213867,15 @@ msgid ""
 "SYSTEM ADMINISTRATOR TO RESOLVE THIS ISSUE.\n"
 "  \n"
 msgstr ""
+"\n"
+"ОШИБКА: ОТКЛЮЧЕНИЕ СЕТИ \n"
+"НЕВОЗМОЖНО ПОДКЛЮЧИТЬСЯ К РОУТЕРУ ИЛИ ПРОКСИ. ПОЖАЛУЙСТА\n"
+"СВЯЖИТЕСЬ С ВАШИМ СИС.АДМИНИСТРАТОРОМ ДЛЯ РЕШЕНИЯ ВОПРОСА.\n"
+"  \n"
 
 #: src/computer.cpp
 msgid "Press any key to continue…"
-msgstr ""
+msgstr "Нажмите любую клавишу для продолжения…"
 
 #: src/computer.cpp
 msgid ""
@@ -209046,6 +213891,18 @@ msgid ""
 "\n"
 "  \n"
 msgstr ""
+"ПРИВЕТСТВУЕМ, ГРАЖДАНИН. ПРОИЗОШЛО БИОЛОГИЧЕСКОЕ НАПАДЕНИЕ\n"
+"И ОБЪЯВЛЕНО ЧРЕЗВЫЧАЙНОЕ ПОЛОЖЕНИЕ. ЭКСТРЕННЫЙ ПЕРСОНАЛ ВСКОРЕ \n"
+"ПРИБУДЕТ НА ПОМОЩЬ. ДЛЯ ОБЕСПЕЧЕНИЯ ВАШЕЙ БЕЗОПАСНОСТИ СЛЕДУЙТЕ\n"
+"СЛЕДУЮЩИМ ПУНКТАМ.\n"
+"\n"
+"1. НЕ ПАНИКУЙТЕ.\n"
+"2. ОСТАВАЙТЕСЬ ВНУТРИ ЗДАНИЯ.\n"
+"3. УКРОЙТЕСЬ В ПОДВАЛЕ.\n"
+"4. ИСПОЛЬЗУЙТЕ ПРЕДОСТАВЛЯЕМЫЕ ПРОТИВОГАЗЫ.\n"
+"5. ОЖИДАЙТЕ ДАЛЬНЕЙШИХ ИНСТРУКЦИЙ. \n"
+"\n"
+"  \n"
 
 #: src/computer.cpp
 msgid ""
@@ -209057,6 +213914,14 @@ msgid ""
 "  \n"
 "  \n"
 msgstr ""
+"  ПРЕДУПРЕЖДЕНИЕ, РАДИОВЫШКА НЕ ОТВЕЧАЕТ. \n"
+"  \n"
+"  РЕЗЕРВНОЙ ЭНЕРГИИ НЕДОСТАТОЧНО ДЛЯ ВЕДЕНИЯ ПЕРЕДАЧИ. \n"
+"  ПРИ ВОЗНИКНОВЕНИИ ЧРЕЗВЫЧАЙНОЙ СИТУАЦИИ ОБРАЩАТЬСЯ В\n"
+"  МЕСТНОЕ ОТДЕЛЕНИЕ НАЦИОНАЛЬНОЙ ГВАРДИИ ДЛЯ ПОЛУЧЕНИЯ\n"
+"  ПРИОРИТЕТА ПРИ УСТАНОВКЕ ГЕНЕРАТОРОВ. \n"
+"  \n"
+"  \n"
 
 #: src/computer.cpp
 msgid "Charges Detonated"
@@ -209102,7 +213967,7 @@ msgstr "ТРЕВОГА [409]: Главные датчики отключены!"
 
 #: src/computer.cpp
 msgid "  >> Initialize secondary sensors: Geiger profiling…"
-msgstr ""
+msgstr "  >> Активация запасных датчиков: запуск счётчика Гейгера…"
 
 #: src/computer.cpp
 msgid "  >> Radiation spike detected!\n"
@@ -209110,7 +213975,7 @@ msgstr "  >> Зарегистрирован радиационный скачо
 
 #: src/computer.cpp
 msgid "WARNING [912]: Catastrophic malfunction!  Contamination detected!"
-msgstr ""
+msgstr "ТРЕВОГА [912]: Критический сбой!  Зарегистрировано загрязнение! "
 
 #: src/computer.cpp
 msgid "EMERGENCY PROCEDURE [1]:  Evacuate.  Evacuate.  Evacuate.\n"
@@ -209118,11 +213983,11 @@ msgstr "АВАРИЙНЫЙ ПРОТОКОЛ [1]:  Эвакуация.  Эвак
 
 #: src/computer.cpp
 msgid "EMERGENCY SHUTDOWN!  Press any key…"
-msgstr ""
+msgstr "АВАРИЙНОЕ ОТКЛЮЧЕНИЕ! Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "PROCESSING…  CYCLE COMPLETE."
-msgstr ""
+msgstr "ОБРАБОТКА… ЦИКЛ ЗАВЕРШЕН."
 
 #: src/computer.cpp
 #, c-format
@@ -209134,6 +213999,7 @@ msgid ""
 "CRITICAL ERROR…  RADIATION PLATFORM UNRESPONSIVE.  COMPLY TO PROCEDURE "
 "RP_M_01_rev.03."
 msgstr ""
+"КРИТИЧЕСКАЯ ОШИБКА… ПЛАТФОРМА НЕ ОТВЕЧАЕТ.  ЗАПУСК ПРОЦЕДУРЫ RP_M_01_rev.03."
 
 #: src/computer.cpp
 msgid "RADIATION MEASUREMENTS:"
@@ -209142,22 +214008,22 @@ msgstr "УРОВНИ РАДИАЦИИ:"
 #: src/computer.cpp
 #, c-format
 msgid "GEIGER COUNTER @ ZONE:… AVG %s mSv/h."
-msgstr ""
+msgstr "СЧЁТЧИК ГЕЙГЕРА @ ЗОНА:… СРЕДН %s мЗв/ч."
 
 #: src/computer.cpp
 #, c-format
 msgid "GEIGER COUNTER @ ZONE:… MAX %s mSv/h."
-msgstr ""
+msgstr "СЧЁТЧИК ГЕЙГЕРА @ ЗОНА:… МАКС %s мЗв/ч."
 
 #: src/computer.cpp
 #, c-format
 msgid "GEIGER COUNTER @ CONSOLE:… %s mSv/h."
-msgstr ""
+msgstr "СЧЁТЧИК ГЕЙГЕРА @ КОНСОЛЬ:… %s мЗв/ч."
 
 #: src/computer.cpp
 #, c-format
 msgid "PERSONAL DOSIMETRY:… %s mSv."
-msgstr ""
+msgstr "ДОЗИМЕТРИЯ ПЕРСОНАЛА:… %s мЗв/ч."
 
 #: src/computer.cpp
 msgid "Conveyor belt malfunction.  Consult maintenance team."
@@ -209181,11 +214047,11 @@ msgstr "Не найдено предметов в: ПОГРУЗКА."
 
 #: src/computer.cpp
 msgid "Conveyor belt cycle complete.  Press any key…"
-msgstr ""
+msgstr "Цикл конвейерной ленты завершён. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "Toggling shutters.  Press any key…"
-msgstr ""
+msgstr "Переключение рольставен. Нажмите любую клавишу…"
 
 #: src/computer.cpp
 msgid "Operation irreversible.  Extract radioactive material?"
@@ -209193,15 +214059,15 @@ msgstr "Необратимая операция. Извлечь радиоакт
 
 #: src/computer.cpp
 msgid "Extraction sequence complete…  Press any key."
-msgstr ""
+msgstr "Процедура извлечения завершена… Нажмите любую клавишу."
 
 #: src/computer.cpp
 msgid "ERROR!  Radiation platform unresponsive…  Press any key."
-msgstr ""
+msgstr "ОШИБКА! Платформа не отвечает…   Нажмите любую клавишу."
 
 #: src/computer.cpp
 msgid "Initiating POWER-DIAG ver.2.34…"
-msgstr ""
+msgstr "Запуск POWER-DIAG ver.2.34…"
 
 #: src/computer.cpp
 msgid "Short circuit detected!"
@@ -209223,6 +214089,7 @@ msgstr "Заземление восстановлено."
 #, c-format
 msgid "Internal power lines status: 85%% OFFLINE.  Reason: DAMAGED."
 msgstr ""
+"Статус резервного источника энергии: 85%% ВЫКЛЮЧЕН. Причина: ПОВРЕЖДЕНИЕ."
 
 #: src/computer.cpp
 #, c-format
@@ -209230,6 +214097,8 @@ msgid ""
 "External power lines status: 100%% OFFLINE.  Reason: NO EXTERNAL POWER "
 "DETECTED."
 msgstr ""
+"Статус резервного источника энергии: 100%% ВЫКЛЮЧЕН. Причина: НЕ НАЙДЕН "
+"ВНЕШНИЙ ИСТОЧНИК ЭНЕРГИИ."
 
 #: src/computer.cpp
 msgid "Backup power status: STANDBY MODE."
@@ -209237,7 +214106,7 @@ msgstr "Статус резервного источника энергии: Р
 
 #: src/computer.cpp
 msgid "Backup power status: OFFLINE.  Reason: UNKNOWN"
-msgstr ""
+msgstr "Статус резервного источника энергии: ВЫКЛЮЧЕН. Причина: НЕИЗВЕСТНО"
 
 #: src/computer.cpp
 msgid "The console shuts down."
@@ -209297,7 +214166,7 @@ msgstr "ОШИБКА: Банк данных уничтожен."
 
 #: src/computer.cpp
 msgid "SEARCHING FOR NEAREST REFUGEE CENTER, PLEASE WAIT…"
-msgstr ""
+msgstr "ПОИСК БЛИЖАЙШЕГО ЦЕНТРА БЕЖЕНЦЕВ, ПОЖАЛУЙСТА ПОДОЖДИТЕ…"
 
 #. ~555-0164 is a fake phone number in the US, please replace it with a number
 #. that will not cause issues in your locale if possible.
@@ -209315,6 +214184,16 @@ msgid ""
 "IF YOU WOULD LIKE TO SPEAK WITH SOMEONE IN PERSON OR WOULD LIKE\n"
 "TO WRITE US A LETTER PLEASE SEND IT TO…\n"
 msgstr ""
+"\n"
+"НАЙДЕН ЦЕНТР БЕЖЕНЦЕВ! МЕСТОПОЛОЖЕНИЕ: %d %s\n"
+"\n"
+"ЕСЛИ У ВАС ЕСТЬ ОТЗЫВ ПО ВАШЕМУ ВИЗИТУ, ПОЖАЛУЙСТА, СВЯЖИТЕСЬ\n"
+"С ОФИСОМ ОБЩЕСТВЕННЫХ ДЕЛ ДЕПАРТАМЕНТА ПО ЧРЕЗВЫЧАЙНЫМ СИТУАЦИЯМ.\n"
+"С МЕСТНЫМ ОФИСОМ МОЖНО СВЯЗАТЬСЯ С 9:00 И\n"
+"ДО 16:00 ПО ТЕЛЕФОНУ 555-0164.\n"
+"\n"
+"ЕСЛИ ВЫ ХОТИТЕ ПОГОВОРИТЬ С КЕМ-ТО ЛИЧНО ИЛИ\n"
+"НАПИСАТЬ НАМ ПИСЬМО, ПОЖАЛУЙСТА ОТПРАВЬТЕ ЕГО…\n"
 
 #: src/construction.cpp
 msgid " Construction "
@@ -209413,7 +214292,7 @@ msgstr "%s помогает вам с работой…"
 #: src/construction.cpp
 #, c-format
 msgid "%s watches you work…"
-msgstr ""
+msgstr "%s наблюдает за вашей работой…"
 
 #: src/construction.cpp
 #, c-format
@@ -209479,7 +214358,7 @@ msgstr "Нельзя разобрать %s, так как над ним есть
 
 #: src/construction.cpp
 msgid "The rock feels much warmer than normal.  Proceed?"
-msgstr ""
+msgstr "Камень теплее, чем обычно. Продолжать?"
 
 #: src/construction.cpp
 msgid "You just tunneled into lava!"
@@ -209645,16 +214524,19 @@ msgid ""
 "feeling that you should prepare for bed, just in case, but… you're hungry "
 "again, and you could eat a whole week's worth of food RIGHT NOW."
 msgstr ""
+"Вы начали накапливать питательные вещества и жидкость для спячки. У вас "
+"появляется чувство, что вы должны подготовиться к постели, на всякий случай,"
+" но… Вы снова голодны и готовы съесть недельный запас пищи ПРЯМО СЕЙЧАС."
 
 #: src/consumption.cpp
 #, c-format
 msgid "Ick, this %s doesn't taste so good…"
-msgstr ""
+msgstr "Фу, %s совсем дрянное на вкус…"
 
 #: src/consumption.cpp
 #, c-format
 msgid "Mmm, this %s tastes delicious…"
-msgstr ""
+msgstr "Ммм, %s имеет восхитительный вкус…"
 
 #: src/consumption.cpp
 #, c-format
@@ -209669,7 +214551,7 @@ msgstr "Вы потребляете %s."
 #: src/consumption.cpp
 #, c-format
 msgid "Ick, this %s (rotten) doesn't taste so good…"
-msgstr ""
+msgstr "Фу, эта протухшая гадость — %s — отвратительна на вкус…"
 
 #: src/consumption.cpp
 #, c-format
@@ -209723,7 +214605,7 @@ msgstr "Вы жадно поглощаете запретное мясо."
 
 #: src/consumption.cpp
 msgid "Meh.  You've eaten worse."
-msgstr ""
+msgstr "Ха. Вы пробовали и похуже."
 
 #: src/consumption.cpp
 msgid ""
@@ -209752,7 +214634,7 @@ msgstr "Грипп мешает вам наслаждаться вкусом."
 
 #: src/consumption.cpp
 msgid "Yuck!  How can anybody eat this stuff?"
-msgstr ""
+msgstr "Фу! Как можно есть эту дрянь?"
 
 #: src/consumption.cpp
 msgid "Mmm, junk food."
@@ -209764,7 +214646,7 @@ msgstr "Даже если весь мир разрушен, всегда ест
 
 #: src/consumption.cpp
 msgid "They may do what they must… you've already won."
-msgstr ""
+msgstr "Они могут делать, что хотят… Вы всё равно в выигрыше."
 
 #: src/consumption.cpp
 msgid "Your stomach begins gurgling and you feel bloated and ill."
@@ -209801,7 +214683,7 @@ msgstr "Они идут за вами."
 
 #: src/consumption.cpp
 msgid "This might've been a bad idea…"
-msgstr ""
+msgstr "Наверно, это была плохая идея…"
 
 #: src/consumption.cpp
 msgid "You've really done it this time, haven't you?"
@@ -209809,7 +214691,7 @@ msgstr "На этот раз вы доигрались."
 
 #: src/consumption.cpp
 msgid "You have to stay vigilant.  They're always watching…"
-msgstr ""
+msgstr "Нужно сохранять бдительность. Они всегда смотрят…"
 
 #: src/consumption.cpp
 msgid "mistake mistake mistake mistake mistake"
@@ -209829,7 +214711,7 @@ msgstr "Что-то дёргается на краю вашего зрения."
 
 #: src/consumption.cpp
 msgid "They know what you've done…"
-msgstr ""
+msgstr "Они знают, что ты наделал…"
 
 #: src/consumption.cpp
 msgid "You're feeling even more paranoid than usual."
@@ -209843,16 +214725,20 @@ msgstr "Вы объелись, готовясь к спячке."
 msgid ""
 "You feel stocked for a day or two.  Got your bed all ready and secured?"
 msgstr ""
+"Вы чувствуете, что запаслись на день или два. У вас есть безопасное место, "
+"где переночевать?"
 
 #: src/consumption.cpp
 msgid ""
 "Mmm.  You can still fit some more in… but maybe you should get comfortable "
 "and sleep."
 msgstr ""
+"Ммм. Вы всё ещё можете съесть немножко еды… но, возможно, вы должны "
+"устроиться поудобнее и заснуть."
 
 #: src/consumption.cpp
 msgid "That filled a hole!  Time for bed…"
-msgstr ""
+msgstr "Вы заморили червячка! Время поспать…"
 
 #: src/consumption.cpp
 msgid "You feel as though you're going to split open!  In a good way?"
@@ -209863,7 +214749,7 @@ msgstr ""
 #. ~of the Rat King's ALL CAPS invective.  Probably shared-brain telepathy.
 #: src/consumption.cpp
 msgid "hey, you look like me!  let's work together!"
-msgstr ""
+msgstr "эй, ты выглядишь как я! давай сотрудничать!"
 
 #: src/consumption.cpp
 #, c-format
@@ -209875,24 +214761,6 @@ msgstr "Вы чувствуете, как %s наполняет вас."
 msgid "<npcname> looks better after eating the %s."
 msgstr "<npcname> выглядит лучше, после того как съел %s."
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "Вашы внутренние запасы энергии полностью заряжены."
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr "Внутренние запасы энергии у <npcname> полностью заряжены."
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr "Вы заряжаете свою систему батарей при помощи %s."
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr "<npcname> заряжает свою систему батарей при помощи %s."
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr "Тут МНОГО плутония. Вам действительно надо так много?"
@@ -210017,6 +214885,7 @@ msgstr ""
 #: src/craft_command.cpp
 msgid "Some components used previously are missing.  Continue?"
 msgstr ""
+"Некоторые ранее использовавшиеся компоненты теперь отсутствуют. Продолжить?"
 
 #: src/craft_command.cpp
 msgid "Item(s): "
@@ -210028,7 +214897,7 @@ msgstr "Инструмент(ы):"
 
 #: src/crafting.cpp
 msgid "Your morale is too low to craft such a difficult thing…"
-msgstr ""
+msgstr "Настроение ни к черту, чтобы делать что-то настолько сложное…"
 
 #: src/crafting.cpp
 msgid "You can't see to craft!"
@@ -210090,6 +214959,8 @@ msgid ""
 "You don't have anything in which to store %s and may have to pour it out or "
 "consume it as soon as it is prepared!  Proceed?"
 msgstr ""
+"Вам не во что налить %s, так что по завершению готовки придётся это выпить "
+"или вылить! Продолжить?"
 
 #: src/crafting.cpp src/pickup.cpp
 #, c-format
@@ -210190,7 +215061,7 @@ msgstr "%s может помочь с серийной сборкой…"
 #: src/crafting.cpp
 #, c-format
 msgid "%s watches you craft…"
-msgstr ""
+msgstr "%s наблюдает за сборкой…"
 
 #: src/crafting.cpp
 #, c-format
@@ -210486,7 +215357,7 @@ msgstr "Экономия времени при серийном изготовл
 #: src/crafting_gui.cpp
 #, c-format
 msgid "Dark craftable?  <color_cyan>%s</color>"
-msgstr ""
+msgstr "Изготовление в темноте: <color_cyan>%s</color>"
 
 #: src/crafting_gui.cpp src/defense.cpp
 msgid "Easy"
@@ -210568,6 +215439,9 @@ msgid ""
 "\n"
 "<color_white>Examples:</color>\n"
 msgstr ""
+"По умолчанию используется поиск по именам. Можно также использовать односимвольные префиксы с двоеточием для поиска по другим параметрам. Дополнительные фильтры разделяются запятыми.\n"
+"\n"
+"<color_white>Примеры:</color>\n"
 
 #: src/crafting_gui.cpp
 msgid "shirt"
@@ -210778,7 +215652,7 @@ msgstr "Дружественные"
 
 #: src/creature.cpp
 msgid "BUG: Behavior unnamed.  (Creature::get_attitude_ui_data)"
-msgstr ""
+msgstr "БАГ: Поведение без имени. (Creature::get_attitude_ui_data)"
 
 #: src/damage.cpp
 msgctxt "damage type"
@@ -210832,7 +215706,7 @@ msgstr "В файле %s можно найти более полную отла
 
 #: src/debug.cpp
 msgid "An error has occurred!  Written below is the error report:"
-msgstr ""
+msgstr "Произошла ошибка! Отчёт об ошибке ниже:"
 
 #: src/debug.cpp
 msgid "Press <color_white>space bar</color> to continue the game."
@@ -210892,7 +215766,7 @@ msgstr "Уровень заклинания"
 
 #: src/debug_menu.cpp
 msgid "Player…"
-msgstr ""
+msgstr "Игрок…"
 
 #: src/debug_menu.cpp
 msgid "Take screenshot"
@@ -210934,13 +215808,17 @@ msgstr "Переключить отображение окружающих за
 msgid "Toggle display temperature"
 msgstr "Переключить отображение температуры"
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr "Переключить оверлей автопилота"
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr "Переключить отображение видимости"
 
 #: src/debug_menu.cpp
 msgid "Toggle display lighting"
-msgstr ""
+msgstr "Переключить отображение света"
 
 #: src/debug_menu.cpp
 msgid "Toggle display radiation"
@@ -210972,7 +215850,11 @@ msgstr "Переключить отображение пути NPC на карт
 
 #: src/debug_menu.cpp
 msgid "Print faction info to console"
-msgstr ""
+msgstr "Вывести информацию по фракции в консоли"
+
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr "Вывести магическую информацию НПС в консоль"
 
 #: src/debug_menu.cpp
 msgid "Test weather"
@@ -210980,7 +215862,7 @@ msgstr "Тест погоды"
 
 #: src/debug_menu.cpp
 msgid "Info…"
-msgstr ""
+msgstr "Информация…"
 
 #: src/debug_menu.cpp
 msgid "Teleport - short range"
@@ -210996,7 +215878,7 @@ msgstr "Телепортироваться в соседнюю карту "
 
 #: src/debug_menu.cpp
 msgid "Teleport…"
-msgstr ""
+msgstr "Телепорт…"
 
 #: src/debug_menu.cpp
 msgid "Spawn an item"
@@ -211024,7 +215906,7 @@ msgstr "Вызвать артефакт ясновидения"
 
 #: src/debug_menu.cpp
 msgid "Spawning…"
-msgstr ""
+msgstr "Спавн…"
 
 #: src/debug_menu.cpp
 msgid "Reveal map"
@@ -211068,7 +215950,7 @@ msgstr "Вызвать Дополнительную Локацию"
 
 #: src/debug_menu.cpp
 msgid "Map…"
-msgstr ""
+msgstr "Карта…"
 
 #: src/debug_menu.cpp
 msgid "Quit to main menu"
@@ -211081,6 +215963,10 @@ msgid ""
 "Taking this shortcut will gain you nothing.  Your victory will be hollow.\n"
 "Nothing will be risked and nothing will be gained."
 msgstr ""
+"Отладочные функции — Если вы их используете, то обманываете не только игру, но и себя.\n"
+"Вы не разовьётесь. Вы не станете лучше.\n"
+"Эта горячая клавиша вам ничего не даст. Ваша победа будет фальшивой.\n"
+"Вы ничем не рискнёте и ничего не получите."
 
 #: src/debug_menu.cpp
 msgid "Debug Functions"
@@ -211253,6 +216139,10 @@ msgstr "[@] Окно состояния"
 msgid "t[e]leport"
 msgstr "[e] телепортироваться"
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr "[M] Редактировать миссии (ВНИМАНИЕ: нестабильно!)"
@@ -211292,7 +216182,7 @@ msgstr "Максимум восприятия"
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set the stat to?  Currently: %d"
-msgstr ""
+msgstr "На сколько установить характеристику?  Текущая: %d"
 
 #: src/debug_menu.cpp
 msgid "Delete all items from the target?"
@@ -211321,12 +216211,12 @@ msgstr "Правая нога"
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set the hitpoints to?  Currently: %d"
-msgstr ""
+msgstr "На сколько установить очки здоровья?  Текущие: %d"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set stamina to?  Current: %d. Max: %d."
-msgstr ""
+msgstr "На сколько установить выносливость?  Текущая: %d. Максимум: %d."
 
 #: src/debug_menu.cpp
 msgid "Target stamina value out of bounds!"
@@ -211335,7 +216225,7 @@ msgstr "Заданное значение выносливости выходи
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set the morale to?  Currently: %d"
-msgstr ""
+msgstr "Какое значение морали установить?  Текущая: %d"
 
 #: src/debug_menu.cpp
 msgid "trust"
@@ -211360,27 +216250,27 @@ msgstr "задолженность"
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set trust to?  Currently: %d"
-msgstr ""
+msgstr "На сколько установить доверие?  Текущее: %d"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set fear to?  Currently: %d"
-msgstr ""
+msgstr "На сколько установить страх?  Текущий: %d"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set value to?  Currently: %d"
-msgstr ""
+msgstr "Какое значение установить?  Текущее: %d"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set anger to?  Currently: %d"
-msgstr ""
+msgstr "На сколько установить гнев?  Текущий: %d"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set owed to?  Currently: %d"
-msgstr ""
+msgstr "На сколько установить задолженность?  Текущая: %d"
 
 #: src/debug_menu.cpp
 msgid "Rename:"
@@ -211392,11 +216282,13 @@ msgid ""
 "NPC:\n"
 "%s\n"
 msgstr ""
+"НПС: \n"
+"%s\n"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Cause how much pain?  pain: %d"
-msgstr ""
+msgstr "Сколько единиц боли вызвать?  Боль: %d"
 
 #: src/debug_menu.cpp
 msgid "Hunger"
@@ -211421,32 +216313,32 @@ msgstr "Сбросить все базовые потребности"
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set hunger to?  Currently: %d"
-msgstr ""
+msgstr "На сколько установить голод?  Текущий: %d"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set stored kCal to?  Currently: %d"
-msgstr ""
+msgstr "Сколько запасённых ккал установить?  Текущие: %d"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set thirst to?  Currently: %d"
-msgstr ""
+msgstr "На сколько установить жажду?  Текущее: %d"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set fatigue to?  Currently: %d"
-msgstr ""
+msgstr "На сколько установить усталость?  Текущая: %d"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set sleep deprivation to?  Currently: %d"
-msgstr ""
+msgstr "На какое значение установить недостаток сна?  Сейчас: %d"
 
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set %s to?  Currently: %d"
-msgstr ""
+msgstr "На сколько установить %s? Сейчас: %d"
 
 #: src/debug_menu.cpp src/panels.cpp
 msgid "Health"
@@ -211463,7 +216355,7 @@ msgstr "Радиация"
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set the value to?  Currently: %d"
-msgstr ""
+msgstr "Какое значение установить? Текущее: %d"
 
 #: src/debug_menu.cpp
 msgid "Choose mission type"
@@ -211586,7 +216478,7 @@ msgstr "Удалить задание без правильной очистки
 #: src/debug_menu.cpp
 #, c-format
 msgid "Drew %d times in %.3f seconds.  (%.3f fps average)"
-msgstr ""
+msgstr "Отрисовано %d раз за %.3f секунд. (%.3f fps, в среднем)"
 
 #: src/debug_menu.cpp
 msgid "Current overmap revealed."
@@ -211743,7 +216635,7 @@ msgstr "Оставить нормальную скорость ветра"
 #: src/debug_menu.cpp
 #, c-format
 msgid "Damage self for how much?  hp: %d"
-msgstr ""
+msgstr "Насколько сильно ранить себя?  ОЗ: %d"
 
 #: src/debug_menu.cpp
 msgid "This binary was not compiled with tiles support."
@@ -211783,7 +216675,7 @@ msgstr "Установить год?"
 
 #: src/debug_menu.cpp
 msgid "Set season to?  (0 = spring)"
-msgstr ""
+msgstr "Установить время года? (0 = весна)"
 
 #: src/debug_menu.cpp
 msgid "Set days to?"
@@ -211800,7 +216692,7 @@ msgstr "Установить минуты?"
 #: src/debug_menu.cpp
 #, c-format
 msgid "Set turn to?  (One day is %i turns)"
-msgstr ""
+msgstr "Установить ход? (Один день равен %i ходов)"
 
 #: src/debug_menu.cpp
 msgid "Enter benchmark length (in milliseconds):"
@@ -211811,6 +216703,8 @@ msgid ""
 "Quit without saving?  This may cause issues such as duplicated or missing "
 "items and vehicles!"
 msgstr ""
+"Выйти без сохранения? Возможно будут проблемы с исчезновением или "
+"клонированием предметов и транспорта!"
 
 #: src/debug_menu.cpp
 #, c-format
@@ -211823,7 +216717,7 @@ msgstr "Произошла ошибка при попытке сохранени
 
 #: src/debug_menu.cpp
 msgid "Report written to debug.log"
-msgstr "Отчет записан в файл debug.log"
+msgstr "Отчет записан в файл debug.log "
 
 #: src/debug_menu.cpp
 msgid " and to the clipboard."
@@ -211847,10 +216741,12 @@ msgstr "Сперва выучите какие-нибудь заклинания
 msgid "Spell"
 msgstr "Заклинание"
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
 msgstr "ЛВЛ"
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
 msgstr "МАКС"
@@ -211876,7 +216772,7 @@ msgstr "Пожалуйста, подождите, создаётся карта
 
 #: src/defense.cpp
 msgid "A caravan approaches!  Press spacebar…"
-msgstr ""
+msgstr "Караван прибыл! Нажмите пробел…"
 
 #: src/defense.cpp
 msgid "You don't need to sleep!"
@@ -212239,7 +217135,7 @@ msgstr "%s из Ада!"
 #: src/defense.cpp
 #, c-format
 msgid "Beware!  %s!"
-msgstr ""
+msgstr "Берегитесь! %s!"
 
 #: src/defense.cpp
 #, c-format
@@ -212437,7 +217333,7 @@ msgstr "ловушка: %s (%d)"
 #: src/editmap.cpp src/game.cpp
 #, c-format
 msgid "There is a %s there.  Parts:"
-msgstr ""
+msgstr "Здесь %s. Части:"
 
 #: src/editmap.cpp
 #, c-format
@@ -212692,7 +217588,7 @@ msgstr "Штамп генерации карт"
 msgid ""
 "The scariest thing in the world would be… if all the air in the world turned"
 " to WOOD!"
-msgstr ""
+msgstr "Самое страшное… если бы весь воздух в мире превратился в ДРЕВЕСИНУ!"
 
 #: src/effect.cpp
 msgid ""
@@ -212709,7 +217605,7 @@ msgstr "Наука иногда лжёт."
 
 #: src/effect.cpp
 msgid "Science is… wait, what was I talking about again?"
-msgstr ""
+msgstr "Наука это… погодите-ка, о чём это я говорил?"
 
 #: src/effect.cpp
 msgid ""
@@ -212734,6 +217630,7 @@ msgstr "Она была хип, хип, хип-леди, чувак."
 #: src/effect.cpp
 msgid "You ever see the back of a twenty dollar bill… on weed?"
 msgstr ""
+"Когда-нибудь смотрел на обратную сторону двадцати баксов… накурившись?"
 
 #: src/effect.cpp
 msgid ""
@@ -212749,15 +217646,16 @@ msgstr "КРАСНЫЕ ВПЕРЁД, КРАСНЫЕ ВПЕРЁД!"
 
 #: src/effect.cpp
 msgid "You have a sudden urge to flip your bible open to Genesis 1:29…"
-msgstr ""
+msgstr "Внезапно вам хочется открыть Библию на Книге Бытия, завет 1:29…"
 
 #: src/effect.cpp
 msgid "That rug really tied the room together…"
-msgstr ""
+msgstr "Этот ковёр действительно украшает комнату…"
 
 #: src/effect.cpp
 msgid "I used to do drugs…  I still do, but I used to, too."
 msgstr ""
+"Когда-то я упарывался наркотой… Я и сейчас упарываюсь, но и раньше тоже."
 
 #: src/effect.cpp
 msgid "The herb reveals you to yourself."
@@ -212768,6 +217666,8 @@ msgid ""
 "Okay, like, the scariest thing in the world would be… if like you went to "
 "grab something and it wasn't there!"
 msgstr ""
+"Ладно, самым страшным было бы… если бы ты хотел схватить что-то, а этого там"
+" не не было!"
 
 #: src/effect.cpp
 msgid "They call them fingers, but I never see them fing."
@@ -212775,7 +217675,7 @@ msgstr "Они называются пальцы, но я не видел, чт
 
 #: src/effect.cpp
 msgid "…oh, there they go."
-msgstr ""
+msgstr "…ох, а вот и они."
 
 #: src/effect.cpp
 msgid ""
@@ -212816,7 +217716,7 @@ msgstr "Ох, иногда в ранне-средне-поздно-ранее у
 
 #: src/effect.cpp
 msgid "…But never at dusk."
-msgstr ""
+msgstr "…Но никогда в сумерках."
 
 #: src/effect.cpp
 msgid "Dave's not here, man."
@@ -212828,11 +217728,11 @@ msgstr "Блин, прям щас бы ОЧЕНЬ не помешал чизбу
 
 #: src/effect.cpp
 msgid "Eh… maybe not."
-msgstr ""
+msgstr "Оу… Может нет."
 
 #: src/effect.cpp
 msgid "I guess, maybe, without the cheese… yeah."
-msgstr ""
+msgstr "Я думаю, может быть, без сыра… Да."
 
 #: src/effect.cpp
 msgid "Walkin' down the hall, by myself, smokin' a j with fifty elves."
@@ -212990,7 +217890,7 @@ msgstr "идеально"
 
 #: src/explosion.cpp
 msgid "force of the explosion"
-msgstr ""
+msgstr "сила взрыва"
 
 #: src/explosion.cpp
 msgid "You're caught in the explosion!"
@@ -213350,21 +218250,21 @@ msgstr "Нажмите Enter, чтобы переименовать этот л
 
 #: src/faction.cpp
 msgid "Direction: to the "
-msgstr ""
+msgstr "Направление: "
 
 #: src/faction.cpp
 #, c-format
 msgid "Location: (%d, %d)"
-msgstr ""
+msgstr "Местонахождение: (%d, %d)"
 
 #: src/faction.cpp
 #, c-format
 msgid "Food Supply: %s %d calories"
-msgstr ""
+msgstr "Запас еды: %s %d калорий"
 
 #: src/faction.cpp
 msgid "Next Upgrade: "
-msgstr ""
+msgstr "Следующее улучшение: "
 
 #: src/faction.cpp
 #, c-format
@@ -213377,53 +218277,53 @@ msgstr "Нажмите Enter, чтобы поговорить с этим пер
 
 #: src/faction.cpp
 msgid "travelling to: "
-msgstr ""
+msgstr "на пути к: "
 
 #: src/faction.cpp
 #, c-format
 msgid "travelling to: (%d, %d)"
-msgstr ""
+msgstr "в пути к: (%d, %d)"
 
 #: src/faction.cpp
 msgid "Current Mission: "
-msgstr ""
+msgstr "Текущее задание: "
 
 #: src/faction.cpp
 msgid "Direction: Nearby"
-msgstr ""
+msgstr "Направление: поблизости"
 
 #: src/faction.cpp
 #, c-format
 msgid "Location: (%d, %d), at camp: %s"
-msgstr ""
+msgstr "Местонахождение: (%d, %d), в лагере: %s"
 
 #: src/faction.cpp
 msgid "Not interactable while on a mission"
-msgstr ""
+msgstr "Недоступно во время задания"
 
 #: src/faction.cpp
 msgid "Within radio range"
-msgstr ""
+msgstr "В пределах радиуса действия"
 
 #: src/faction.cpp
 msgid "Not within radio range"
-msgstr ""
+msgstr "Не в пределах радиуса действия"
 
 #: src/faction.cpp
 msgid "You do not have a radio"
-msgstr ""
+msgstr "У вас нет рации"
 
 #: src/faction.cpp
 msgid "Follower does not have a radio"
-msgstr ""
+msgstr "У ваших спутников нет рации"
 
 #: src/faction.cpp
 msgid "Both you and follower need a radio"
-msgstr ""
+msgstr "Вам и вашему спутнику нужна рация"
 
 #: src/faction.cpp
 msgid "Within interaction range"
-msgstr ""
+msgstr "В пределах радиуса взаимодействия"
 
 #: src/faction.cpp
 msgid "Status: "
@@ -213451,11 +218351,11 @@ msgstr "На страже"
 
 #: src/faction.cpp
 msgid "Basecamp job: "
-msgstr ""
+msgstr "Работа в лагере: "
 
 #: src/faction.cpp
 msgid "Condition: "
-msgstr ""
+msgstr "Состояние: "
 
 #: src/faction.cpp
 msgctxt "needs"
@@ -213464,15 +218364,15 @@ msgstr ""
 
 #: src/faction.cpp
 msgid "Hunger: "
-msgstr ""
+msgstr "Голод: "
 
 #: src/faction.cpp
 msgid "Thirst: "
-msgstr ""
+msgstr "Жажда: "
 
 #: src/faction.cpp
 msgid "Fatigue: "
-msgstr ""
+msgstr "Усталость: "
 
 #: src/faction.cpp src/player.cpp
 msgid "Wielding: "
@@ -213480,12 +218380,12 @@ msgstr "В руках: "
 
 #: src/faction.cpp
 msgid "Best other skills: "
-msgstr ""
+msgstr "Лучшие прочие навыки: "
 
 #: src/faction.cpp
 #, c-format
 msgid "Best combat skill: %s: %d"
-msgstr ""
+msgstr "Лучший боевой навык: %s : %d"
 
 #: src/faction.cpp
 msgid "YOUR FACTION"
@@ -213509,7 +218409,7 @@ msgstr "У вас нет последователей"
 
 #: src/faction.cpp
 msgid "You don't know of any factions."
-msgstr ""
+msgstr "Вы не знаете ни одной фракции."
 
 #: src/faction_camp.cpp
 msgid "Upgrade camp"
@@ -213525,11 +218425,11 @@ msgstr "Снять компаньона с улучшения"
 
 #: src/faction_camp.cpp
 msgid "Emergency Recall"
-msgstr ""
+msgstr "Аварийный отзыв"
 
 #: src/faction_camp.cpp
 msgid "Lost in the ether!\n"
-msgstr ""
+msgstr "Потерян в эфире!\n"
 
 #: src/faction_camp.cpp
 msgid "Craft Item"
@@ -213585,7 +218485,7 @@ msgstr "Черновая работа"
 
 #: src/faction_camp.cpp
 msgid "Performing menial labor…\n"
-msgstr ""
+msgstr "Выполняет черновую работу…\n"
 
 #: src/faction_camp.cpp
 msgid "Recover Menial Laborer"
@@ -213597,7 +218497,7 @@ msgstr "Расширить базу"
 
 #: src/faction_camp.cpp
 msgid "Surveying for expansion…\n"
-msgstr ""
+msgstr "Обследует местность для расширения…\n"
 
 #: src/faction_camp.cpp
 msgid "Recover Surveyor"
@@ -213609,7 +218509,7 @@ msgstr "Валить лес"
 
 #: src/faction_camp.cpp
 msgid "Cutting logs in the woods…\n"
-msgstr ""
+msgstr "Валит лес…\n"
 
 #: src/faction_camp.cpp
 msgid "Recover Log Cutter"
@@ -213621,7 +218521,7 @@ msgstr "Расчистить лес"
 
 #: src/faction_camp.cpp
 msgid "Clearing a forest…\n"
-msgstr ""
+msgstr "Расчистка леса…\n"
 
 #: src/faction_camp.cpp
 msgid "Recover Clearcutter"
@@ -213633,7 +218533,7 @@ msgstr "Установить укрытие"
 
 #: src/faction_camp.cpp
 msgid "Setting up a hide site…\n"
-msgstr ""
+msgstr "Устанавливает укрытие…\n"
 
 #: src/faction_camp.cpp
 msgid "Recover Hide Setup"
@@ -213645,7 +218545,7 @@ msgstr "Сменить укрытие"
 
 #: src/faction_camp.cpp
 msgid "Transferring gear to a hide site…\n"
-msgstr ""
+msgstr "Переносит снаряжение в укрытие…\n"
 
 #: src/faction_camp.cpp
 msgid "Recover Hide Relay"
@@ -213693,7 +218593,7 @@ msgstr "Построить укрепления на карте"
 
 #: src/faction_camp.cpp
 msgid "Constructing fortifications…\n"
-msgstr ""
+msgstr "Строит укрепления…\n"
 
 #: src/faction_camp.cpp
 msgid "Finish Map Fortifications"
@@ -213753,7 +218653,7 @@ msgstr " Разобрать транспорт"
 
 #: src/faction_camp.cpp
 msgid "Working at the chop shop…\n"
-msgstr ""
+msgstr "Разделывает…\n"
 
 #: src/faction_camp.cpp
 msgid " (Finish) Chop Shop"
@@ -213841,10 +218741,13 @@ msgid ""
 "\n"
 "Do you wish to bring your allies back into your party?"
 msgstr ""
+"\n"
+" \n"
+"Вы хотите вернуть назад компаньонов в вашу группу?"
 
 #: src/faction_camp.cpp
 msgid "You choose to wait…"
-msgstr ""
+msgstr "Вы решили подождать…"
 
 #: src/faction_camp.cpp
 msgid "You cannot build a camp here."
@@ -213863,6 +218766,8 @@ msgid ""
 "Warning, you have selected a region with the following issues:\n"
 "\n"
 msgstr ""
+"Внимание, вы выбрали регион со следующими проблемами:\n"
+" \n"
 
 #: src/faction_camp.cpp
 msgid "There are few forests.  Wood is your primary construction material.\n"
@@ -213882,6 +218787,8 @@ msgid ""
 "%s\n"
 "Are you sure you wish to continue?"
 msgstr ""
+"%s \n"
+"Вы уверены, что хотите продолжить?"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -213901,6 +218808,14 @@ msgstr ", управляющий лагерем"
 msgid "%s has abandoned the camp."
 msgstr "%s забрасывает лагерь."
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr "Расширение"
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr "Снять компаньона, "
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -213915,59 +218830,16 @@ msgid ""
 "Time: 3 Hours, Repeated\n"
 "Positions: %d/3\n"
 msgstr ""
-
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr "Распределить еду"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr "Сбросить точки сортировки предметов"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr ""
+"Примечание: \n"
+"Отправить компаньона собирать материалы для улучшения лагеря.\n"
+" \n"
+"Используемый навык: выживание\n"
+"Сложность: Н/Д \n"
+"Возможная добыча:\n"
+"%s\n"
+"Риск: Очень низкий\n"
+"Время: 3 часа, повторяемо\n"
+"Занято: %d/3\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -213986,6 +218858,19 @@ msgid ""
 "Time: 3 Hours, Repeated\n"
 "Positions: %d/3\n"
 msgstr ""
+"Примечание:\n"
+"Отправить компаньона собирать мелкие кустарники и палки.\n"
+" \n"
+"Используемый навык: выживание\n"
+"Сложность: Н/Д\n"
+"Возможная добыча:\n"
+"> тяжёлые палки\n"
+"> увядшие растения\n"
+"> расколотая древесина\n"
+" \n"
+"Риск: Очень низкий\n"
+"Время: 3 часа, Повторяемо\n"
+"Занято: %d/3\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214002,23 +218887,17 @@ msgid ""
 "Time: 3 Hours\n"
 "Positions: %d/1\n"
 msgstr ""
-
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
+"Примечание:\n"
+"Отправить компаньона заниматься простой рутиной и сортировать предметы.\n"
+" \n"
+"Используемый навык: производство\n"
+"Сложность: Н/Д\n"
+"Эффекты:\n"
+"> Предметы в зоне неотсортированных предметов сортируются в определённые зоны.\n"
+" \n"
+"Риск: Нет\n"
+"Время: 3 часа\n"
+"Занято: %d/1\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214037,6 +218916,19 @@ msgid ""
 "Time: 6 Hour Base + Travel Time + Cutting Time\n"
 "Positions: %d/1\n"
 msgstr ""
+"Примечание:\n"
+"Отправить компаньона в ближайший лес нарубить дров.\n"
+" \n"
+"Используемый навык: производство\n"
+"Сложность: 1\n"
+"Эффекты:\n"
+">  50%% деревьев/стволов в лесу будет срублено.\n"
+"> 100%% добытого материала будет доставлено в лагерь.\n"
+"> Повторяемые операции уменьшают количество добытых ресурсов.\n"
+"> Постепенно превращает леса в поля.\n"
+" Риск: отсутствует\n"
+"Время: 6 часов + Путешествие + Время рубки\n"
+"Занято: %d/1\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214056,6 +218948,19 @@ msgid ""
 "Time: 6 Hour Base + Travel Time + Cutting Time\n"
 "Positions: %d/1\n"
 msgstr ""
+"Примечание:\n"
+"Отправить компаньона расчистить ближайший лес.\n"
+" \n"
+"Используемый навык: производство\n"
+"Сложность: 1\n"
+"Эффекты:\n"
+"> 95%% деревьев/стволов в лесу будет срублено.\n"
+"> 0%% добытого материала будет доставлено в лагерь.\n"
+"> Полезно для расчистки местности под следующий лагерь.\n"
+" \n"
+"Риск: Отсутствует\n"
+"Время: 6 часов + Путешествие + Время рубки\n"
+"Занято: %d/1\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214074,6 +218979,19 @@ msgid ""
 "Time: 6 Hour Construction + Travel\n"
 "Positions: %d/1\n"
 msgstr ""
+"Примечание:\n"
+"Отправить компаньона устроить временное укрытие в отдалённом месте и сложить там снаряжение.\n"
+" \n"
+"Используемый навык: выживание\n"
+"Сложность: 3\n"
+"Эффекты:\n"
+"> Полезно для создания точек снабжения или резерва на непредвиденные обстоятельства.\n"
+"> Снаряжение остаётся без присмотра и может быть украдено.\n"
+"> Время зависит от веса отправляемого снаряжения.\n"
+" \n"
+"Риск: Средний\n"
+"Время: 6 часов на Строительство + Путешествие\n"
+"Занято: %d/1\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214092,6 +219010,19 @@ msgid ""
 "Time: 1 Hour Base + Travel\n"
 "Positions: %d/1\n"
 msgstr ""
+"Примечание:\n"
+"Перенести снаряжение в укрытие или вернуть обратно.\n"
+" \n"
+"Используемый навык: выживание\n"
+"Сложность: 1\n"
+"Эффекты:\n"
+"> Полезно для возвращения снаряжения, оставленного в одном из укрытий.\n"
+"> Снаряжение остаётся без присмотра и может быть украдено.\n"
+"> Время зависит от веса отправляемого снаряжения или возвращаемого.\n"
+" \n"
+"Риск: Средний\n"
+"Время: 1 час + Путешествие\n"
+"Занято: %d/1\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214109,6 +219040,18 @@ msgid ""
 "Time: 4 Hours, Repeated\n"
 "Positions: %d/3\n"
 msgstr ""
+"Примечание:\n"
+"Отправить компаньона добывать съедобные растения.\n"
+" \n"
+"Используемый навык: выживание\n"
+"Сложность: Н/Д\n"
+"Возможно добыть:\n"
+"> дикие овощи.\n"
+"> фрукты и орехи в зависимости от сезона.\n"
+"Может добыть меньше еды, чем будет потрачено!\n"
+"Риск: Очень низкий\n"
+"Время: 4 часа, Повторяемо\n"
+"Занято: %d/3\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214125,6 +219068,18 @@ msgid ""
 "Time: 6 Hours, Repeated\n"
 "Positions: %d/2\n"
 msgstr ""
+"Примечание:\n"
+"Отправить компаньона установить ловушки на мелкую дичь.\n"
+" \n"
+"Используемый навык: ловушки\n"
+"Сложность: Н/Д\n"
+"Возможно добыть:\n"
+"> маленькие и крошечные тушки животных.\n"
+"Может добыть меньше еды, чем будет потрачено!\n"
+" \n"
+"Риск: Низкий\n"
+"Время: 6 часов, Повторяемо\n"
+"Занято: %d/2\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214141,6 +219096,18 @@ msgid ""
 "Time: 6 Hours, Repeated\n"
 "Positions: %d/1\n"
 msgstr ""
+"Примечание:\n"
+"Отправить компаньона охотиться на крупных животных.\n"
+" \n"
+"Используемый навык: меткость\n"
+"Сложность: Н/Д\n"
+"Возможно добыть:\n"
+"> маленькие, средние или крупные туши животных.\n"
+"Может добывать меньше еды, чем потребляет!\n"
+" \n"
+"Риск: Средний\n"
+"Время: 6 часов, Повторяемо\n"
+"Занято: %d/1\n"
 
 #: src/faction_camp.cpp
 msgid "Construct Spiked Trench"
@@ -214163,6 +219130,19 @@ msgid ""
 "Time: Travel\n"
 "Positions: %d/3\n"
 msgstr ""
+"Примечание:\n"
+"Отправить компаньона в неизведанное. Для избегания боя нужны высокие навыки выживания, но всё же следует ожидать пару-тройку столкновений с врагом.\n"
+" \n"
+"Используемый навык: выживание\n"
+"Сложность: 3\n"
+"Эффекты:\n"
+"> Выберите контрольные точки для настройки пути.\n"
+"> Открывает местность по пути следования.\n"
+"> Можно двигаться от укрытия к укрытию, чтобы увеличить дальность.\n"
+" \n"
+"Риск: Высокий\n"
+"Время: Путешествие\n"
+"Занято: %d/3\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214181,14 +219161,19 @@ msgid ""
 "Time: Travel\n"
 "Positions: %d/3\n"
 msgstr ""
-
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr "Расширение"
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr "Снять компаньона, "
+"Примечание:\n"
+"Отправьте компаньонов на зачистку пустоши для уничтожения всего враждебного на своём пути. Компаньоны вернутся обратно, если будут тяжело ранены или если шансов на успех будет мало.\n"
+" \n"
+"Используемый навык: выживание\n"
+"Сложность: 4\n"
+"Эффекты:\n"
+"> Вступает в бой с существами, вместо того, чтобы бежать от них.\n"
+"> Выберите контрольные точки для настройки пути.\n"
+"> Можно двигаться от укрытия к укрытию, чтобы увеличить дальность.\n"
+" \n"
+"Риск: Очень высокий\n"
+"Время: Путешествие\n"
+"Занято: %d/3\n"
 
 #: src/faction_camp.cpp
 msgid ""
@@ -214204,6 +219189,17 @@ msgid ""
 "Risk: None\n"
 "Time: 5 days\n"
 msgstr ""
+"Примечание:\n"
+"Отправьте компаньона полностью разобрать транспорт на запчасти.\n"
+" \n"
+"Используемый навык: механика\n"
+"Сложность: 2\n"
+"Эффекты:\n"
+"> Снятые запчасти помещаются в мебели в гараже.\n"
+"> От навыка сильно зависит, какие запчасти удастся получить.\n"
+" \n"
+"Риск: Нет\n"
+"Время: 5 дней\n"
 
 #: src/faction_camp.cpp
 msgid ""
@@ -214211,6 +219207,8 @@ msgid ""
 "Plow any spaces that have reverted to dirt or grass.\n"
 "\n"
 msgstr ""
+"Примечание:\n"
+"Пахать любые участки, которые снова превратились в грязь или заросли травой.\n"
 
 #: src/faction_camp.cpp
 msgid ""
@@ -214226,6 +219224,17 @@ msgid ""
 "Time: 5 Min / Plot\n"
 "Positions: 0/1\n"
 msgstr ""
+"\n"
+" \n"
+"Используемый навык: производство\n"
+"Сложность: Н/Д\n"
+"Эффекты:\n"
+"> Восстанавливает только участки, созданные при последнем улучшении расширений.\n"
+"> Не повреждает существующий урожай.\n"
+" \n"
+"Риск: Отсутствует\n"
+"Время: 5 минут / участок\n"
+"Занято: 0/1 \n"
 
 #: src/faction_camp.cpp
 msgid ""
@@ -214233,6 +219242,9 @@ msgid ""
 "Plant designated seeds in the spaces that have already been tilled.\n"
 "\n"
 msgstr ""
+"Примечание:\n"
+"Сажайте семена в местах, которые уже были вспаханы.\n"
+" \n"
 
 #: src/faction_camp.cpp
 msgid ""
@@ -214249,6 +219261,18 @@ msgid ""
 "Time: 1 Min / Plot\n"
 "Positions: 0/1\n"
 msgstr ""
+"\n"
+" \n"
+"Используемый навык: выживание\n"
+"Сложность: Н/Д\n"
+"Эффекты:\n"
+"> Выбирайте тип семян или все ваши семена.\n"
+"> Останавливается, когда заканчиваются семена или участки под посадку.\n"
+"> Будет сажать во ВСЕХ вспаханных участках в пределах расширения.\n"
+" \n"
+"Риск: Отсутствует\n"
+"Время: 1 минута / участок\n"
+"Занято: 0/1\n"
 
 #: src/faction_camp.cpp
 msgid ""
@@ -214256,6 +219280,9 @@ msgid ""
 "Harvest any plants that are ripe and bring the produce back.\n"
 "\n"
 msgstr ""
+"Примечание:\n"
+"Собирайте созревший урожай и приносите его обратно в лагерь.\n"
+" \n"
 
 #: src/faction_camp.cpp
 msgid ""
@@ -214270,6 +219297,92 @@ msgid ""
 "Time: 3 Min / Plot\n"
 "Positions: 0/1\n"
 msgstr ""
+"\n"
+" \n"
+"Используемый навык: выживание\n"
+"Сложность: Н/Д\n"
+"Эффекты:\n"
+"> В эту локацию будет собираться весь урожай.\n"
+" \n"
+"Риск: Отсутствует\n"
+"Время: 3 минуты / участок\n"
+"Занято: 0/1\n"
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+"Примечание:\n"
+"Ваш лагерь достаточно вырос и может расшириться. Расширения открывают новые возможности, однако требуют много времени и ресурсов. Выбирайте расширения осмотрительно, каждый лагерь можно расширить только 8 раз.\n"
+" \n"
+"Используемый навык: производство\n"
+"Сложность: Н/Д\n"
+"Эффекты:\n"
+"> Выберите любое из доступных расширений. Всегда разумно начать с фермы, поскольку еда требуется для выполнения задач, а для работы фермы многого не нужно. С приложением некоторых усилий в гараже можно быстро разбирать большие автомобили на запчасти, а кузница позволяет производить уголь. \n"
+"\n"
+"ВНИМАНИЕ: Действия, доступные в расширениях, расположены в отдельных вкладках окна Управляющего Лагерем. \n"
+"\n"
+"Риск: Нет\n"
+"Время: 3 часа\n"
+"Расстояние: %d/1\n"
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr "Распределить еду"
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+"Примечания:\n"
+"Назначить повторяющиеся должностные обязанности находящимся здесь людям.\n"
+"Сложность: Н/Д\n"
+"Последствия:\n"
+"\n"
+"\n"
+"Риск: нет\n"
+"Время: постоянно"
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr "Назначить задания"
 
 #: src/faction_camp.cpp
 msgid ""
@@ -214280,66 +219393,72 @@ msgid ""
 "\n"
 "Companions must be on missions for at least 24 hours before emergency recall becomes available."
 msgstr ""
+"Примечания:\n"
+"Отменит текущую миссию и вынудит немедленное возвратиться компаньона. Никакая работа не будет выполнена, и все ресурсы, использованные в задании, будут потеряны.\n"
+"\n"
+"ВНИМАНИЕ: Все ресурсы, использованные в задании, будут потеряны, и никакая работа не будет выполнена. Используйте только для того, чтобы вернуть спутников, которые никак не могут вернуться.\n"
+"\n"
+"Компаньоны должны быть в миссиях по крайне мере 24 часа, прежде чем станет доступен экстренный отзыв."
+
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr "отправляется на обследование местности…"
 
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
-msgstr ""
+msgstr "отправляется на поиск материалов…"
 
 #: src/faction_camp.cpp
 msgid "departs to search for firewood…"
-msgstr ""
+msgstr "отправляется на поиск дров…"
 
 #: src/faction_camp.cpp
 msgid "returns from working in the woods…"
-msgstr ""
+msgstr "возвращается с работы в лесу…"
 
 #: src/faction_camp.cpp
 msgid "returns from working on the hide site…"
-msgstr ""
+msgstr "возвращается с работы по установке укрытия…"
 
 #: src/faction_camp.cpp
 msgid "returns from shuttling gear between the hide site…"
-msgstr ""
+msgstr "возвращается задания по переноске снаряжения между укрытиями…"
 
 #: src/faction_camp.cpp
 msgid "departs to search for edible plants…"
-msgstr ""
+msgstr "отправляется на поиски съедобных растений…"
 
 #: src/faction_camp.cpp
 msgid "departs to set traps for small animals…"
-msgstr ""
+msgstr "отправляется ставить ловушки на мелких животных…"
 
 #: src/faction_camp.cpp
 msgid "departs to hunt for meat…"
-msgstr ""
+msgstr "отправляется охотиться на крупных животных…"
 
 #: src/faction_camp.cpp
 msgid "departs to search for recruits…"
-msgstr ""
-
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr ""
+msgstr "отправляется на поиски новобранцев…"
 
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
-msgstr ""
+msgstr "возвращается к вам, неся кое-что…"
 
 #: src/faction_camp.cpp
 msgid "returns from your farm with something…"
-msgstr ""
+msgstr "возвращается с фермы, неся кое-что…"
 
 #: src/faction_camp.cpp
 msgid "returns from your kitchen with something…"
-msgstr ""
+msgstr "возвращается из кухни, неся кое-что…"
 
 #: src/faction_camp.cpp
 msgid "returns from your blacksmith shop with something…"
-msgstr ""
+msgstr "возвращается из кузницы, неся кое-что…"
 
 #: src/faction_camp.cpp
 msgid "returns from your garage…"
-msgstr ""
+msgstr "возвращается из гаража…"
 
 #: src/faction_camp.cpp
 msgid "You don't have enough food stored to feed your companion."
@@ -214347,7 +219466,7 @@ msgstr "Ваших запасов еды не хватает, чтобы нак
 
 #: src/faction_camp.cpp
 msgid "begins to upgrade the camp…"
-msgstr ""
+msgstr "начинает улучшать лагерь…"
 
 #: src/faction_camp.cpp
 msgid "You don't have the materials for the upgrade."
@@ -214355,20 +219474,20 @@ msgstr "Вам не хватает материалов для улучшени
 
 #: src/faction_camp.cpp
 msgid "There are no npcs stationed here"
-msgstr ""
+msgstr "Здесь нет НПС"
 
 #: src/faction_camp.cpp src/npc.cpp
 msgid "No particular job"
-msgstr ""
+msgstr "Нет конкретной работы"
 
 #: src/faction_camp.cpp
 #, c-format
 msgid "Press %s to change this workers job."
-msgstr ""
+msgstr "Нажмите %s, чтобы сменить задание работнику."
 
 #: src/faction_camp.cpp
 msgid "Assign which job?"
-msgstr ""
+msgstr "Какое задание назначить?"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214390,7 +219509,7 @@ msgstr ""
 
 #: src/faction_camp.cpp
 msgid "departs to cut logs…"
-msgstr ""
+msgstr "отправляется валить лес…"
 
 #: src/faction_camp.cpp
 msgid "Forests are the only valid cutting locations."
@@ -214398,7 +219517,7 @@ msgstr "Рубить деревья можно только в лесу."
 
 #: src/faction_camp.cpp
 msgid "departs to clear a forest…"
-msgstr ""
+msgstr "отправляется на расчистку леса…"
 
 #: src/faction_camp.cpp
 msgid "Forests, swamps, and fields are valid hide site locations."
@@ -214410,11 +219529,11 @@ msgstr "Хотите дать своему компаньону дополнит
 
 #: src/faction_camp.cpp
 msgid "departs to build a hide site…"
-msgstr ""
+msgstr "отправляется строить укрытие…"
 
 #: src/faction_camp.cpp
 msgid "You need equipment to setup a hide site…"
-msgstr ""
+msgstr "Вам нужно снаряжение для установки укрытия…"
 
 #: src/faction_camp.cpp
 msgid "You must select an existing hide site."
@@ -214426,11 +219545,11 @@ msgstr "Вернуть снаряжение обратно?"
 
 #: src/faction_camp.cpp
 msgid "departs for the hide site…"
-msgstr ""
+msgstr "отправляется к укрытию…"
 
 #: src/faction_camp.cpp
 msgid "You need equipment to transport between the hide site…"
-msgstr ""
+msgstr "Вам нужно снаряжение для транспортировки между укрытиями…"
 
 #: src/faction_camp.cpp
 msgid ""
@@ -214460,7 +219579,7 @@ msgstr "Вам не хватает материалов, чтобы постро
 
 #: src/faction_camp.cpp
 msgid "begins constructing fortifications…"
-msgstr ""
+msgstr "начинает строить укрепления…"
 
 #: src/faction_camp.cpp
 msgid ""
@@ -214472,7 +219591,7 @@ msgstr ""
 
 #: src/faction_camp.cpp
 msgid "departs on patrol…"
-msgstr ""
+msgstr "отправляется в патруль…"
 
 #: src/faction_camp.cpp
 msgid "You don't have the materials to craft that"
@@ -214489,19 +219608,19 @@ msgstr "Серия слишком большая!"
 
 #: src/faction_camp.cpp
 msgid "begins to work…"
-msgstr ""
+msgstr "начинает работать…"
 
 #: src/faction_camp.cpp
 msgid "+ more\n"
-msgstr ""
+msgstr "+ больше\n"
 
 #: src/faction_camp.cpp
 msgid "begins to harvest the field…"
-msgstr ""
+msgstr "начинает собирать урожай с поля…"
 
 #: src/faction_camp.cpp
 msgid "You have no additional seeds to give your companions…"
-msgstr ""
+msgstr "У вас нет дополнительных семян, которые вы могли бы дать компаньонам…"
 
 #: src/faction_camp.cpp src/mission_companion.cpp
 msgid "Which seeds do you wish to have planted?"
@@ -214509,11 +219628,11 @@ msgstr "Какие семена вы хотели бы посадить?"
 
 #: src/faction_camp.cpp
 msgid "begins planting the field…"
-msgstr ""
+msgstr "начинает высаживать поле…"
 
 #: src/faction_camp.cpp
 msgid "begins plowing the field…"
-msgstr ""
+msgstr "начинает вскапывать поле…"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214526,15 +219645,15 @@ msgstr ""
 
 #: src/faction_camp.cpp
 msgid "begins working in the garage…"
-msgstr ""
+msgstr "начинает работать в гараже…"
 
 #: src/faction_camp.cpp
 msgid "Your companion seems disappointed that your pantry is empty…"
-msgstr ""
+msgstr "Ваш компаньон выглядит разочарованным видом пустой кладовой…"
 
 #: src/faction_camp.cpp
 msgid "responds to the emergency recall…"
-msgstr ""
+msgstr "реагирует на экстренный отзыв…"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214543,11 +219662,13 @@ msgstr "У %sне получилось улучшить %s."
 
 #: src/faction_camp.cpp
 msgid "returns from upgrading the camp having earned a bit of experience…"
-msgstr ""
+msgstr "возвращается с работы по улучшению лагеря, получив немного опыта…"
 
 #: src/faction_camp.cpp
 msgid "returns from doing the dirty work to keep the camp running…"
 msgstr ""
+"возвращается с грязной работы, благодаря которой в лагере всё идёт своим "
+"чередом…"
 
 #: src/faction_camp.cpp
 msgid "gathering materials"
@@ -214568,48 +219689,52 @@ msgstr "охота на крупных животных"
 #: src/faction_camp.cpp
 #, c-format
 msgid "returns from %s carrying supplies and has a bit more experience…"
-msgstr ""
+msgstr "возвращается из %s вместе с припасами, получив немного опыта…"
 
 #: src/faction_camp.cpp
 msgid "returns from constructing fortifications…"
-msgstr ""
+msgstr "возвращается с постройки укреплений…"
 
 #: src/faction_camp.cpp
 msgid "returns from searching for recruits with a bit more experience…"
-msgstr ""
+msgstr "возвращается после поисков новобранцев, получив немного опыта…"
 
 #: src/faction_camp.cpp
 #, c-format
 msgid "%s encountered %s…"
-msgstr ""
+msgstr "%s встречает %s…"
 
 #: src/faction_camp.cpp
 #, c-format
 msgid "%s didn't find anyone to recruit…"
-msgstr ""
+msgstr "%s не нашёл никого, кто захотел бы присоединиться…"
 
 #: src/faction_camp.cpp
 #, c-format
 msgid "%s convinced %s to hear a recruitment offer from you…"
-msgstr ""
+msgstr "%s убедил %s послушать ваше предложение о найме…"
 
 #: src/faction_camp.cpp
 #, c-format
 msgid "%s wasn't interested in anything %s had to offer…"
-msgstr ""
+msgstr "%s не заинтересовало ничто из того, что смог предложить %s…"
 
 #: src/faction_camp.cpp
 msgid ""
 "NPC Overview:\n"
 "\n"
 msgstr ""
+"Характеристики персонажа:\n"
+" \n"
 
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
+"Имя:  %s\n"
+"\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214632,6 +219757,8 @@ msgid ""
 "Perception:      %10d\n"
 "\n"
 msgstr ""
+"Восприятие:      %10d\n"
+"\n"
 
 #: src/faction_camp.cpp
 msgid "Top 3 Skills:\n"
@@ -214647,6 +219774,8 @@ msgid ""
 "> Food:     %10d days\n"
 "\n"
 msgstr ""
+"> Еда:      %10d дней\n"
+" \n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214654,6 +219783,8 @@ msgid ""
 "Faction Food:%9d days\n"
 "\n"
 msgstr ""
+"Еда фракции:%9d дней\n"
+" \n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214661,6 +219792,8 @@ msgid ""
 "Recruit Chance: %10d%%\n"
 "\n"
 msgstr ""
+"Шанс вербовки: %10d%%\n"
+" \n"
 
 #: src/faction_camp.cpp
 msgid "Select an option:"
@@ -214684,7 +219817,7 @@ msgstr "Не интересует"
 
 #: src/faction_camp.cpp
 msgid "You decide you aren't interested…"
-msgstr ""
+msgstr "Вы решаете, что не заинтересованы…"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214694,25 +219827,27 @@ msgstr "%s соглашается присоединиться!"
 #: src/faction_camp.cpp
 #, c-format
 msgid "%s wasn't interested…"
-msgstr ""
+msgstr "%s отказывается…"
 
 #: src/faction_camp.cpp
 msgid "Your companion hit a river and didn't know how to swim…"
-msgstr ""
+msgstr "Ваш компаньон наткнулся на реку, но не умеет плавать…"
 
 #: src/faction_camp.cpp
 msgid ""
 "Your companion hit a river and didn't know how to swim well enough to cross…"
 msgstr ""
+"Ваш компаньон наткнулся на реку, но не умеет плавать достаточно хорошо, "
+"чтобы её переплыть…"
 
 #: src/faction_camp.cpp
 #, c-format
 msgid "%s didn't return from patrol…"
-msgstr ""
+msgstr "%s не вернулся из патруля…"
 
 #: src/faction_camp.cpp
 msgid "returns from patrol…"
-msgstr ""
+msgstr "возвращается из патруля…"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214752,7 +219887,7 @@ msgstr "возвращается с обследования места под 
 
 #: src/faction_camp.cpp
 msgid "returns from working your fields…"
-msgstr ""
+msgstr "возвращается с работы в полях…"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214782,12 +219917,8 @@ msgstr "У вас недостаточно зон сортировки. Хоти
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
+"create a camp food zone, and a camp storage zone."
 msgstr ""
-"Зоны сортировки изменились. Пожалуйста, создайте зоны сортировки. Для лагеря"
-" требуются зона еды, зона неотсортированных предметов и хотя бы одна зона "
-"назначения."
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214816,18 +219947,18 @@ msgstr ">Преодолено: %15d (м)\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
-msgstr ">Путешествует: %23s\n"
+msgid ">Travel:  %s\n"
+msgstr ">Перемещение: %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
-msgstr ">Работает: %23s\n"
+msgid ">Working: %s\n"
+msgstr ">Работа: %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
-msgstr "Всего:    %23s\n"
+msgid "Total:    %s\n"
+msgstr "Всего:    %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214835,6 +219966,8 @@ msgid ""
 "Food:     %15d (kcal)\n"
 "\n"
 msgstr ""
+"Еда:      %15d (ккал)\n"
+" \n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214868,6 +220001,21 @@ msgid ""
 "Time: 4 Days\n"
 "Positions: %d/1\n"
 msgstr ""
+"Примечание:\n"
+"Привлечение дополнительных компаньонов — опасное и дорогое занятие. Исход сильно зависит от навыка компаньона и привлекательности вашего лагеря.\n"
+" \n"
+"Используемый навык: общение\n"
+"Сложность: 2\n"
+"Базовое значение:            +%3d%%\n"
+"> Бонус расширения:         +%3d%%\n"
+"> Бонус фракции:             +%3d%%\n"
+"> Особый бонус:              +%3d%%\n"
+" \n"
+"Всего: Навык                  +%3d%%\n"
+" \n"
+"Риск: Высокий\n"
+"Время: 4 Дня\n"
+"Занято: %d/1\n"
 
 #: src/faction_camp.cpp
 msgid "Harvestable: "
@@ -214883,8 +220031,8 @@ msgstr "Необходимо вспахать: "
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
-msgstr "Имя:     %25s\n"
+msgid "Name:     %s\n"
+msgstr "Имя:      %s\n"
 
 #: src/faction_camp.cpp
 msgid "----          Engines          ----\n"
@@ -214892,8 +220040,8 @@ msgstr "----          Двигатели          ----\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
-msgstr "Двигатель:  %25s\n"
+msgid "Engine:   %s\n"
+msgstr "Двигатель:%s\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214902,8 +220050,8 @@ msgstr ">Статус:  %24d%%\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
-msgstr ">Топливо:    %25s\n"
+msgid ">Fuel:    %s\n"
+msgstr ">Топливо: %s\n"
 
 #: src/faction_camp.cpp
 msgid "----  Fuel Storage & Battery   ----\n"
@@ -214915,11 +220063,11 @@ msgstr "Время до окончания разборки:         5 дней\
 
 #: src/faction_camp.cpp
 msgid "You do not have a camp food zone.  Aborting…"
-msgstr ""
+msgstr "У вас нет зоны еды. Отмена…"
 
 #: src/faction_camp.cpp
 msgid "No items are located at the drop point…"
-msgstr ""
+msgstr "На точке сброса не найдено никаких предметов…"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214929,7 +220077,7 @@ msgstr "Вы распределяете еду ценностью %d ккал м
 #: src/faction_camp.cpp
 #, c-format
 msgid "While %s, a silent specter approaches %s…"
-msgstr ""
+msgstr "Пока %s, молчаливый призрак приблизился к %s…"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214965,7 +220113,7 @@ msgstr "%s не обнаружил засаду, пока не стало сли
 #: src/faction_camp.cpp
 #, c-format
 msgid "The bull moose charged %s from the tree line…"
-msgstr ""
+msgstr "Лось погнался за %s, выбежав из леса…"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -214987,11 +220135,12 @@ msgid ""
 "Terrified, %s spun around and delivered a massive kick to the creature's "
 "torso…"
 msgstr ""
+"В ужасе, %s оборачивается и наносит сильный удар по туловищу существа…"
 
 #: src/faction_camp.cpp
 #, c-format
 msgid "Collapsing into a pile of gore, %s walked away unscathed…"
-msgstr ""
+msgstr "Превратив существо в кучку мяса, %s уходит без единой царапины…"
 
 #: src/faction_camp.cpp
 msgid "(Sounds like bullshit, you wonder what really happened.)"
@@ -215003,6 +220152,8 @@ msgid ""
 "%s turned to find the hideous black eyes of a giant wasp staring back from "
 "only a few feet away…"
 msgstr ""
+"%s поворачивается и видит перед собой ужасные чёрные глаза гигантской осы, "
+"находящейся всего в нескольких метрах…"
 
 #: src/faction_camp.cpp
 msgid "The screams were terrifying, there was nothing anyone could do."
@@ -215015,7 +220166,7 @@ msgstr "Куски %s валялись по всей округе."
 
 #: src/faction_camp.cpp
 msgid "(You wonder if your companions are fit to work on their own…)"
-msgstr ""
+msgstr "(Интересно, ваши компаньоны вообще способны за себя постоять?..)"
 
 #: src/fungal_effects.cpp src/iuse.cpp
 #, c-format
@@ -215049,7 +220200,7 @@ msgstr "Загрузка основных данных"
 
 #: src/game.cpp
 msgid "Please wait while the world data loads…"
-msgstr ""
+msgstr "Пожалуйста, подождите, загружаются данные мира…"
 
 #: src/game.cpp src/start_location.cpp
 msgid "Please wait as we build your world"
@@ -215086,7 +220237,7 @@ msgstr "Удалять мир"
 #: src/game.cpp
 #, c-format
 msgid "World retained.  Characters remaining:%s"
-msgstr ""
+msgstr "Мир сохранён.  Оставшиеся персонажи:%s"
 
 #: src/game.cpp
 #, c-format
@@ -215095,7 +220246,7 @@ msgstr "%s опасно близко!"
 
 #: src/game.cpp
 msgid "Wait till you wake up…"
-msgstr ""
+msgstr "Ожидайте, пока ваш персонаж не проснётся…"
 
 #: src/game.cpp
 #, c-format
@@ -215271,7 +220422,7 @@ msgstr "У вас в руках нет оружия дальнего боя."
 
 #: src/game.cpp
 msgid "Watch the last moments of your life…?"
-msgstr ""
+msgstr "Смотреть последние минуты вашей жизни?.."
 
 #: src/game.cpp
 msgid "Loading files"
@@ -215321,7 +220472,7 @@ msgstr "Не удалось сохранить данные игры"
 
 #: src/game.cpp
 msgid "       You are forgotten among the billions lost in the cataclysm…"
-msgstr ""
+msgstr "       Вы оказались среди миллиардов других жертв Катаклизма…"
 
 #: src/game.cpp
 msgid ""
@@ -215329,6 +220480,10 @@ msgid ""
 "their resources in a handful of fortified bases along the coast.  Without "
 "the men or material to rebuild, the soldiers that remained lost all hope…"
 msgstr ""
+"    Связанная бесконечным сражением, Старая Гвардия была вынуждена "
+"сосредоточить свои силы в горстке укреплённых опорных пунктов вдоль "
+"побережья. Без человеческих ресурсов и материальной базы для восстановления,"
+" это солдаты, потерявшие всякую надежду…"
 
 #: src/game.cpp
 msgid ""
@@ -215340,6 +220495,13 @@ msgid ""
 "the years past, little materialized from the hopes of rebuilding "
 "civilization…"
 msgstr ""
+"   Упорство некоторых выживальщиков после Катаклизма впечатлило разбросанные"
+" остатки когда-то славного союза. Под вдохновением от небольших успехов было"
+" организовано несколько миссий по зачистке объектов, увенчавшихся скромными "
+"результатами. Старая Гвардия была вынуждена в конечном счёте сосредоточиться"
+" в больших базах и оставить эти объекты в руках горстки выживальщиков. За "
+"минувшие годы из надежд на восстановление цивилизации было воплощено в жизнь"
+" очень немногое…"
 
 #: src/game.cpp
 msgid ""
@@ -215348,6 +220510,10 @@ msgid ""
 "craftsmen dispersed to found new colonies but most became victims of "
 "marauding bandits.  Those who survived never found a place to call home…"
 msgstr ""
+"    Жизнь в центре беженцев осложнилась, нехватка еды и болезни уничтожили "
+"всякую надежду на поддержание очага цивилизации. Торговцы и ремесленники "
+"разошлись основывать новые колонии, но многие пали жертвами мародёров. Те, "
+"кто выжил, так и не нашли места, которое могли назвать домом…"
 
 #: src/game.cpp
 msgid ""
@@ -215357,6 +220523,11 @@ msgid ""
 "stories of the old days when food was abundant and the children were allowed"
 " to play in the sun…"
 msgstr ""
+"    Свободные Торговцы несколько лет изо всех сил пытались прокормить себя, "
+"но их когда-то прибыльные торговые маршруты разграбили бандиты и головорезы."
+" Первые родившиеся после Катаклизма поколения жили в грязи и нищете и лишь "
+"слышали истории о былых деньках, когда еда была в достатке, а детям "
+"разрешали играть на солнце…"
 
 #: src/game.cpp
 msgid ""
@@ -215391,6 +220562,10 @@ msgid ""
 "monstrosities that had adapted to live in their world, those who did survive"
 " lived in dejected poverty and hopelessness…"
 msgstr ""
+"    Количество обособленных групп выживальщиков, скитавшихся по теперь "
+"чуждому для них миру, сократилось в течение нескольких лет. Те, кто выжил, "
+"были неспособны тягаться с растущим числом приспособившихся к этому миру "
+"чудовищ, и влачили существование в унылой нищете и безнадёжности…"
 
 #: src/game.cpp
 msgid ""
@@ -215401,6 +220576,12 @@ msgid ""
 "fringes of where civilization once ended, bands of hunter-gatherers began to"
 " adopt agrarian lifestyles in fortified enclaves…"
 msgstr ""
+"    Добытчики, процветавшие в первые дни Катаклизма, столкнулись с "
+"нарастающей проблемой поисков и обслуживания оборудования из старого мира. "
+"Из-за огромных орд войти в города было нельзя, а возле бывших лабораторий "
+"загадочно появлялись новые сверхъестественные кошмары. Однако на границах, "
+"там, где когда-то кончалась цивилизация, группы охотников-собирателей начали"
+" вести сельскохозяйственный образ жизни в укреплённых поселениях…"
 
 #: src/game.cpp
 msgid ""
@@ -215427,6 +220608,13 @@ msgid ""
 "leadership of the faction.  When only one warlord finally secured control, "
 "there was nothing left to fight for… just endless cities full of the dead."
 msgstr ""
+"    Накачанные наркотиками и яростью, Адские Налётчики изо всех сил пытались"
+" уничтожить последние оплоты Старой Гвардии. Тяжёлые победы принесли "
+"главарям обширные территории и множество рабов, но не привели к "
+"стабильности. Внутренняя борьба и соперничество кланов за лидерство вылились"
+" через несколько недель в гражданскую войну. Когда единственный оставшийся "
+"главарь наконец получил власть, не осталось ничего, за что можно было "
+"сражаться… только бесконечные города, полные мертвецов."
 
 #: src/game.cpp
 #, c-format
@@ -215752,7 +220940,7 @@ msgstr "Неважно"
 
 #: src/game.cpp src/npctalk.cpp
 msgid "You may be attacked!  Proceed?"
-msgstr ""
+msgstr "На вас могут напасть!  Продолжить?"
 
 #: src/game.cpp
 msgid "Examine where?"
@@ -215951,7 +221139,7 @@ msgstr "Здесь что-то есть, но вы не видите, что и
 
 #: src/game.cpp
 msgid "More items here…"
-msgstr ""
+msgstr "Ещё предметы…"
 
 #: src/game.cpp
 #, c-format
@@ -216297,7 +221485,7 @@ msgstr "У вас нет необходимых инструментов для
 #: src/game.cpp
 #, c-format
 msgid "You see %s nearby!  Start butchering anyway?"
-msgstr ""
+msgstr "Вы видите поблизости %s! Всё равно начать разделку?"
 
 #: src/game.cpp
 msgid "Choose corpse to butcher / item to disassemble"
@@ -216398,7 +221586,7 @@ msgstr "Вам требуется как минимум один %s, чтобы
 msgid "The %s is already full!"
 msgstr "%s уже полон!"
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr "Вы не можете перезарядить %s!"
@@ -216448,6 +221636,8 @@ msgid ""
 "Spotted %1$s--safe mode is on!  (%2$s to turn it off, %3$s to ignore "
 "monster%4$s)"
 msgstr ""
+"Замечен %1$s — безопасный режим включён! %2$s, чтобы его отключить; %3$s, "
+"чтобы проигнорировать монстра %4$s."
 
 #: src/game.cpp
 #, c-format
@@ -216486,6 +221676,19 @@ msgstr "Уверены, что хотите зайти в %s?"
 msgid "Your %s refuses to move over that ledge!"
 msgstr "Ваш %s отказывается двигаться по этому выступу!"
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr "Вы не поместитесь здесь."
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr ""
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "Не удаётся найти схваченный объект."
@@ -216657,6 +221860,8 @@ msgid ""
 "You try to quantum tunnel through the barrier but are reflected!  Try again "
 "with more energy!"
 msgstr ""
+"Вы попытались открыть квантовый туннель сквозь препятствие, но вас отразило!"
+" Попробуйте использовать больше энергии!"
 
 #: src/game.cpp
 msgid "It's too dangerous to tunnel that far!"
@@ -216685,6 +221890,16 @@ msgstr "Вы напряглись, пытаясь сдвинуть %s!"
 msgid "There's stuff in the way."
 msgstr "На пути что-то лежит."
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr "%s слишком тяжёлый!"
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr "Вы не можете сдвинуть %s."
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -216744,7 +221959,7 @@ msgstr "Залезть в направлении %s"
 #: src/game.cpp
 #, c-format
 msgid "You try to use the stairs.  Suddenly you are blocked by a %s!"
-msgstr ""
+msgstr "Вы пытаетесь двигаться по лестнице, но %s вам не позволяет!"
 
 #: src/game.cpp
 #, c-format
@@ -216848,7 +222063,7 @@ msgstr "На полпути вниз вы обнаруживаете, что п
 
 #: src/game.cpp
 msgid "There is a sheer drop halfway down.  Web-descend?"
-msgstr ""
+msgstr "На полпути вниз есть выступ.  Слезть по паутине?"
 
 #: src/game.cpp
 msgid ""
@@ -216869,6 +222084,7 @@ msgstr "На полпути вниз есть выступ. Использова
 #: src/game.cpp
 msgid "Detach a vine?  It'll hurt, but you'll be able to climb back up…"
 msgstr ""
+"Отделить лиану? Это будет больно, но вы сможете подняться обратно вверх…"
 
 #: src/game.cpp
 msgid "You descend on your vines, though leaving a part of you behind stings."
@@ -216887,11 +222103,11 @@ msgstr ""
 
 #: src/game.cpp
 msgid "There is a sheer drop halfway down.  Climb your grappling hook down?"
-msgstr ""
+msgstr "На полпути вниз есть выступ.  Слезть с помощью крюка-кошки?"
 
 #: src/game.cpp
 msgid "There is a sheer drop halfway down.  Climb your rope down?"
-msgstr ""
+msgstr "На полпути вниз есть выступ.  Спустить туда верёвку?"
 
 #: src/game.cpp
 msgid "There is a sheer drop halfway down.  Jump?"
@@ -216953,7 +222169,7 @@ msgstr "%s толкает вас назад!"
 #: src/game.cpp
 #, c-format
 msgid "The %s tried to push you back but failed!  It attacks you!"
-msgstr ""
+msgstr "%s попытался оттолкнуть вас, но неудачно атаковал!"
 
 #: src/game.cpp
 #, c-format
@@ -216985,6 +222201,8 @@ msgid ""
 " %dx%d to work properly.  %dx%d just won't do.  Maybe a smaller font would "
 "help?"
 msgstr ""
+"Стоп! Размер окна игры слишком мал! Игра требует минимум %dx%d. Размера окна"
+" %dx%d недостаточно. Может, попробуете шрифт меньшего размера?"
 
 #: src/game.cpp
 #, c-format
@@ -216993,6 +222211,9 @@ msgid ""
 "game requires a minimum terminal size of %dx%d to function.  It just won't "
 "work with only %dx%d.  Can you stretch it out sideways a bit?"
 msgstr ""
+"Ох! Смотри. Окно игры слишком узкое! Игра требует минимум %dx%d. Размер окна"
+" %dx%d не годится для игры. Может, попробуете его немного растянуть по "
+"горизонтали?"
 
 #: src/game.cpp
 #, c-format
@@ -217001,6 +222222,9 @@ msgid ""
 "minimum terminal size of %dx%d to run.  %dx%d isn't quite enough!  Can you "
 "make the terminal just a smidgen taller?"
 msgstr ""
+"Стоп, стоп, у нас слишком мало места. Игра требует размер окна минимум "
+"%dx%d. Размера %dx%d недостаточно для запуска. Может, попробуете увеличить "
+"его высоту?"
 
 #: src/game.cpp
 msgid ""
@@ -217011,7 +222235,7 @@ msgstr ""
 "странные символы (например, пустые квадраты или вопросительные знаки). Вас "
 "предупредили."
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr "Вы чувствуете острую боль, без всякой причины."
 
@@ -217087,7 +222311,7 @@ msgstr "Вам хочется пить."
 
 #: src/game.cpp
 msgid "You feel an evil presence…"
-msgstr ""
+msgstr "Вы чувствуете присутствие зла…"
 
 #: src/game.cpp
 msgid "You feel a tickle of insanity."
@@ -217103,7 +222327,7 @@ msgstr "Ваше генетическое строение деградируе
 
 #: src/game.cpp
 msgid "You feel an otherworldly attention upon you…"
-msgstr ""
+msgstr "Вы чувствуете потустороннее внимание к себе…"
 
 #: src/game.cpp
 msgid "You feel a force pulling you inwards."
@@ -217148,7 +222372,7 @@ msgstr "Вос %s%d! "
 #: src/game.cpp
 #, c-format
 msgid "Speed %s%d!"
-msgstr ""
+msgstr "Скорость %s%d!"
 
 #: src/game_inventory.cpp
 msgid "You don't have the necessary item at hand."
@@ -217283,11 +222507,11 @@ msgstr "СРОК ГОДНОСТИ"
 #: src/game_inventory.cpp
 #, c-format
 msgid "%.2f%s"
-msgstr ""
+msgstr "%.2f%s"
 
 #: src/game_inventory.cpp
 msgid "VOLUME"
-msgstr ""
+msgstr "ОБЪЁМ"
 
 #: src/game_inventory.cpp
 msgid "FRESHNESS"
@@ -217297,10 +222521,6 @@ msgstr "СВЕЖЕСТЬ"
 msgid "SPOILS IN"
 msgstr "ИСПОРТИТСЯ"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "Батарея"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "Реактор"
@@ -217325,10 +222545,6 @@ msgstr "Невозможно выпить пролитые жидкости"
 msgid "Your biology is not compatible with that item."
 msgstr "Ваша биология несовместима с этим предметом."
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr "Ваша энергия на максимуме"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -217423,10 +222639,6 @@ msgstr[1] "Требуется как минимум %d заряда"
 msgstr[2] "Требуется как минимум %d зарядов"
 msgstr[3] "Требуется как минимум %d заряд"
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr ""
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "Использовать"
@@ -217613,6 +222825,7 @@ msgid ""
 "Enter new letter.  Press SPACE to clear a manually assigned letter, ESCAPE "
 "to cancel."
 msgstr ""
+"Введите новую букву. Нажмите SPACE для пустого значения, ESC для отмены."
 
 #: src/game_inventory.cpp
 msgid ""
@@ -217646,11 +222859,6 @@ msgstr "<color_yellow>Доступно комплектов: %i</color>"
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr "<color_yellow>Доступно анестетика: %i мл</color>"
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr "<color_yellow>Доступные деньги: %s</color>"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -217778,11 +222986,11 @@ msgstr "КБМ грязный. Сперва вымойте его."
 
 #: src/game_inventory.cpp
 msgid "You should put this CBM in an autoclave pouch to keep it sterile."
-msgstr ""
+msgstr "Вы должны поместить этот КБМ в автоклав для стерилизации."
 
 #: src/game_inventory.cpp
 msgid "You need at least 2L of water."
-msgstr ""
+msgstr "Вам нужны, как минимум, 2л воды."
 
 #: src/game_inventory.cpp
 msgid "Sterilization"
@@ -217899,7 +223107,7 @@ msgstr "%s сталкивается с %s."
 #: src/handle_action.cpp
 #, c-format
 msgid "Press %s to accept your fate…"
-msgstr ""
+msgstr "Нажмите %s, чтобы принять свою судьбу…"
 
 #: src/handle_action.cpp
 msgid "No radio car connected."
@@ -217912,15 +223120,16 @@ msgstr "звук столкновения с препятствием"
 #. ~ Sound of moving a remote controlled car
 #: src/handle_action.cpp
 msgid "zzz…"
-msgstr ""
+msgstr "бззз…"
 
 #: src/handle_action.cpp
 msgid "You can't drive the vehicle from here.  You need controls!"
-msgstr ""
+msgstr "Здесь нет руля, чтобы управлять транспортом!"
 
 #: src/handle_action.cpp
 msgid "Can't drive this vehicle remotely.  It has no working controls."
 msgstr ""
+"Этим автомобилем нельзя управлять дистанционно. У него нет блока управления."
 
 #: src/handle_action.cpp
 msgid "Open where?"
@@ -218029,11 +223238,11 @@ msgstr "Здесь нечего разбивать!"
 
 #: src/handle_action.cpp
 msgid "You already have an alarm set.  What do you want to do?"
-msgstr ""
+msgstr "У вас есть заведённый будильник. Что вы хотите сделать?"
 
 #: src/handle_action.cpp
 msgid "You have an alarm clock.  What do you want to do?"
-msgstr ""
+msgstr "У вас есть будильник. Что вы хотите сделать?"
 
 #: src/handle_action.cpp
 msgid "Keep the alarm and wait a while"
@@ -218159,10 +223368,12 @@ msgid ""
 "You're engorged to hibernate.  The alarm would only attract attention.  Set "
 "an alarm anyway?"
 msgstr ""
+"Вы впали в спячку. Будильник будет только привлекать лишнее внимание. Всё "
+"равно установить будильник?"
 
 #: src/handle_action.cpp
 msgid "You have an alarm clock.  Set an alarm?"
-msgstr ""
+msgstr "У вас есть будильник. Установить его?"
 
 #: src/handle_action.cpp
 msgid "No, don't set an alarm."
@@ -218196,6 +223407,9 @@ msgid ""
 "zones.  Uses empty space in your inventory or utilizes a cart, if you are "
 "holding one."
 msgstr ""
+"Сортирует предметы из зоны \"Предметы: несортированное\" в ближайшие "
+"подходящие зоны. При перемещении используется свободное пространство в вашем"
+" инвентаре или тележка, если персонаж держит её."
 
 #: src/handle_action.cpp
 msgid "Till farm plots"
@@ -218203,7 +223417,7 @@ msgstr "Вскопать участки"
 
 #: src/handle_action.cpp
 msgid "Till farm plots… you need a tool to dig with"
-msgstr ""
+msgstr "Вскопать участки… для этого вам нужен инструмент."
 
 #: src/handle_action.cpp
 msgid "Tills nearby Farm: Plot zones."
@@ -218211,7 +223425,7 @@ msgstr "Вскапывает ближайшие зоны типа «Фермер
 
 #: src/handle_action.cpp
 msgid "Plant seeds… it is too cold for planting"
-msgstr ""
+msgstr "Посадить семена… слишком холодно для посадки"
 
 #: src/handle_action.cpp
 msgid "Plant seeds"
@@ -218219,13 +223433,16 @@ msgstr "Посадить семена"
 
 #: src/handle_action.cpp
 msgid "Plant seeds… you don't have any"
-msgstr ""
+msgstr "Посадить семена… у вас их нет"
 
 #: src/handle_action.cpp
 msgid ""
 "Plant seeds into nearby Farm: Plot zones.  Farm plot has to be set to "
 "specific plant seed and you must have seeds in your inventory."
 msgstr ""
+"Посадить семена в ближайшие зоны типа «Фермерство: участок». Необходимо "
+"указать, какой участок предназначен для каких семян, также вы должны иметь "
+"семена в инвентаре."
 
 #: src/handle_action.cpp
 msgid "Fertilize plots"
@@ -218233,7 +223450,7 @@ msgstr "Удобрить зоны"
 
 #: src/handle_action.cpp
 msgid "Fertilize plots… you don't have any fertilizer"
-msgstr ""
+msgstr "Удобрить участки… у вас нет удобрений"
 
 #: src/handle_action.cpp
 msgid "Fertilize any nearby Farm: Plot zones."
@@ -218245,31 +223462,35 @@ msgstr "Собрать урожай с зон"
 
 #: src/handle_action.cpp
 msgid "Harvest any full-grown plants from nearby Farm: Plot zones."
-msgstr ""
+msgstr "Собрать готовый урожай с зон типа «Фермерство: участок»"
 
 #: src/handle_action.cpp
 msgid "Construct plots"
-msgstr ""
+msgstr "Построить участки"
 
 #: src/handle_action.cpp
 msgid "Work on any nearby Blueprint: construction zones."
-msgstr ""
+msgstr "Работа над любым близлежащим проектом: зоны строительства"
 
 #: src/handle_action.cpp
 msgid "Farm plots"
-msgstr ""
+msgstr "Грядки"
 
 #: src/handle_action.cpp
 msgid "Till and plant on any nearby farm plots - auto-fetch seeds and tools."
 msgstr ""
+"Вскопать и засадить все ближайшие грядки — автоматически берутся семена и "
+"инструменты."
 
 #: src/handle_action.cpp
 msgid "Chop trees"
-msgstr ""
+msgstr "Вырубка деревьев"
 
 #: src/handle_action.cpp
 msgid "Chop down any trees in the designated zone - auto-fetch tools."
 msgstr ""
+"Вырубить любые деревья в обозначенной зоне — инструменты выбираются "
+"автоматически."
 
 #: src/handle_action.cpp
 msgid "Chop planks"
@@ -218281,19 +223502,23 @@ msgstr ""
 
 #: src/handle_action.cpp
 msgid "Deconstruct vehicle"
-msgstr ""
+msgstr "Разобрать транспорт"
 
 #: src/handle_action.cpp
 msgid "Auto-deconstruct vehicle in designated zone - auto-fetch tools."
 msgstr ""
+"Авто-разборка транспорта в обозначенной зоне. Инструменты применяются "
+"автоматически."
 
 #: src/handle_action.cpp
 msgid "Repair vehicle"
-msgstr ""
+msgstr "Починить транспорт"
 
 #: src/handle_action.cpp
 msgid "Auto-repair vehicle in designated zone - auto-fetch tools."
 msgstr ""
+"Авто-починка транспорта в обозначенной зоне. Инструменты применяются "
+"автоматически."
 
 #: src/handle_action.cpp
 msgid "Butcher corpses"
@@ -218529,7 +223754,7 @@ msgstr "Вы не можете управлять транспортом, нах
 
 #: src/handle_action.cpp
 msgid "You refuse to take control of this vehicle."
-msgstr ""
+msgstr "Вы отказываетесь управлять этим транспортным средством."
 
 #: src/handle_action.cpp
 msgid "Auto travel mode OFF!"
@@ -218545,7 +223770,7 @@ msgstr "Безопасный режим ВЫКЛ!"
 
 #: src/handle_action.cpp
 msgid "Safe mode OFF!  (Auto safe mode still enabled!)"
-msgstr ""
+msgstr "Безопасный режим ВЫКЛЮЧЕН! (Автобезопасный — ещё включён!)"
 
 #: src/handle_action.cpp
 msgid "Auto safe mode OFF!"
@@ -218772,14 +223997,16 @@ msgid ""
 "Welcome to the C.C.B.o.t.T. ATM.  What would you like to do?\n"
 "Your current balance is: %s"
 msgstr ""
+"Добро пожаловать в банкомат C.C.B.o.t.T. Что вы хотите сделать?\n"
+"Ваш текущий баланс: %s"
 
 #: src/iexamine.cpp
 msgid "Purchase cash card?"
 msgstr "Купить кредитную карту?"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
-msgstr "Вам нужно иметь $1.00 на личном счету, чтобы купить кредитную карту."
+msgid "You need $10.00 in your account to purchase a card."
+msgstr ""
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -218821,7 +224048,7 @@ msgstr "Ваш баланс: %s."
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
 msgstr ""
 
 #: src/iexamine.cpp
@@ -218832,10 +224059,10 @@ msgstr "Вы можете пополнить баланс только с кре
 #, c-format
 msgid "Deposit how much?  Max: %d cent.  (0 to cancel) "
 msgid_plural "Deposit how much?  Max: %d cents.  (0 to cancel) "
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "На сколько пополнить? Максимум: %d цент. (0 для отмены)"
+msgstr[1] "На сколько пополнить? Максимум: %d цента. (0 для отмены)"
+msgstr[2] "На сколько пополнить? Максимум: %d цент. (0 для отмены)"
+msgstr[3] "На сколько пополнить? Максимум: %d цент. (0 для отмены)"
 
 #: src/iexamine.cpp
 msgid "You do not have a cash card to withdraw money!"
@@ -218845,10 +224072,10 @@ msgstr "У вас нету кредитки, чтобы снять денег!"
 #, c-format
 msgid "Withdraw how much?  Max: %d cent.  (0 to cancel) "
 msgid_plural "Withdraw how much?  Max: %d cents.  (0 to cancel) "
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Сколько снять? Максимум: %d цент. (0 для отмены)"
+msgstr[1] "Сколько снять? Максимум: %d цента. (0 для отмены)"
+msgstr[2] "Сколько снять? Максимум: %d цент. (0 для отмены)"
+msgstr[3] "Сколько снять? Максимум: %d цент. (0 для отмены)"
 
 #: src/iexamine.cpp
 msgid "The vending machine is empty!"
@@ -218946,7 +224173,7 @@ msgstr "Никто не отвечает."
 
 #: src/iexamine.cpp
 msgid "If only you had a shovel…"
-msgstr ""
+msgstr "Если бы только у вас была лопата…"
 
 #: src/iexamine.cpp
 #, c-format
@@ -218981,7 +224208,7 @@ msgstr "Это препятствие вам не помеха благодар
 
 #: src/iexamine.cpp
 msgid "You slip while climbing and fall down again."
-msgstr "Вы соскальзываете и снова падаете вниз."
+msgstr "Вы соскальзываете и падаете вниз."
 
 #: src/iexamine.cpp
 msgid "Climbing this obstacle is impossible in your current state."
@@ -219051,15 +224278,15 @@ msgstr "Опустить $10?"
 
 #: src/iexamine.cpp
 msgid "Three cherries… you get your money back!"
-msgstr ""
+msgstr "Три вишенки… Возврат денег!"
 
 #: src/iexamine.cpp
 msgid "Three bells… you win $50!"
-msgstr ""
+msgstr "Три колокольчика… Вы выигрываете $50!"
 
 #: src/iexamine.cpp
 msgid "Three stars… you win $200!"
-msgstr ""
+msgstr "Три звёздочки… Вы выигрываете $200!"
 
 #: src/iexamine.cpp
 msgid "JACKPOT!  You win $3000!"
@@ -219075,7 +224302,7 @@ msgstr "Играть снова?"
 
 #: src/iexamine.cpp
 msgid "You mess with the dial for a little bit… and it opens!"
-msgstr ""
+msgstr "Вы немного покрутили диск кодового замка… и он открывается!"
 
 #: src/iexamine.cpp
 msgid "You mess with the dial for a little bit."
@@ -219114,14 +224341,26 @@ msgid "The gun safe stumps your efforts to pick it."
 msgstr "Сейф сопротивляется вашим попыткам взломать его."
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
-msgstr ""
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
+msgstr "%s заперт. Если бы только у вас был подходящий для взлома инструмент…"
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
 #: src/iexamine.cpp
 #, c-format
 msgid "You attempt to pry open the %1$s using your %2$s…"
+msgstr "Вы пытаетесь взломать %1$s при помощи %2$s…"
+
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
 msgstr ""
+"%s заперт. Если бы только у вас был подходящий для вскрытия инструмент…"
+
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr "Вы пытаетесь взломать %1$s при помощи %2$s…"
 
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
@@ -219139,11 +224378,11 @@ msgstr ""
 
 #: src/iexamine.cpp
 msgid "The pedestal sinks into the ground…"
-msgstr ""
+msgstr "Пьедестал проваливается под землю…"
 
 #: src/iexamine.cpp
 msgid "an ominous grinding noise…"
-msgstr ""
+msgstr "зловещий скрежет…"
 
 #: src/iexamine.cpp
 msgid "Place your petrified eye on the pedestal?"
@@ -219192,11 +224431,11 @@ msgstr "Вы слышите грохот движущихся камней."
 
 #: src/iexamine.cpp
 msgid "This flower is dead.  You can't get it."
-msgstr ""
+msgstr "Этот цветок мёртв. Вы ничего не можете получить с него."
 
 #: src/iexamine.cpp
 msgid "This plant is dead.  You can't get it."
-msgstr ""
+msgstr "Это растение мертво. Вы ничего не можете получить с него."
 
 #: src/iexamine.cpp
 msgid "You drink some nectar."
@@ -219232,7 +224471,7 @@ msgstr "У этого цветка пьянящий аромат."
 
 #: src/iexamine.cpp
 msgid "You fall asleep…"
-msgstr ""
+msgstr "Вы засыпаете…"
 
 #: src/iexamine.cpp
 msgid "Your legs are covered in the poppy's roots!"
@@ -219246,6 +224485,7 @@ msgstr "Вы колетесь о колючки кактуса!"
 #, c-format
 msgid "You don't have a digging tool to dig up roots.  Pick %s anyway?"
 msgstr ""
+"У вас нет инструмента для выкапывания корней. Подобрать %s в любом случае?"
 
 #: src/iexamine.cpp
 msgid "Nothing can be harvested from this plant in current season."
@@ -219261,7 +224501,7 @@ msgstr "С этого растения нельзя ничего собрать
 
 #: src/iexamine.cpp
 msgid "This flower is still alive, despite the harsh conditions…"
-msgstr ""
+msgstr "Цветок всё ещё жив, несмотря на ужасные условия…"
 
 #: src/iexamine.cpp
 #, c-format
@@ -219270,7 +224510,7 @@ msgstr "Вы чувствуете себя не в своей тарелке, п
 
 #: src/iexamine.cpp
 msgid "This flower tastes very wrong…"
-msgstr ""
+msgstr "На вкус цветок очень странный…"
 
 #: src/iexamine.cpp
 #, c-format
@@ -219312,7 +224552,7 @@ msgstr "У вас нет семян для посадки."
 
 #: src/iexamine.cpp
 msgid "Something's lying there…"
-msgstr ""
+msgstr "Здесь что-то лежит…"
 
 #: src/iexamine.cpp src/mission_companion.cpp
 msgid "You saved your seeds for later."
@@ -219332,7 +224572,7 @@ msgstr "Семена расцветают! Мы принесли истинну
 
 #: src/iexamine.cpp
 msgid "The seed blossoms rather rapidly…"
-msgstr ""
+msgstr "Семена всходят довольно быстро…"
 
 #: src/iexamine.cpp
 msgid "The seed blossoms into a flower-looking fungus."
@@ -219391,7 +224631,7 @@ msgstr "В печи находится %s, а из этого нельзя сд
 
 #: src/iexamine.cpp
 msgid "This kiln is empty.  Fill it with wood or bone and try again."
-msgstr ""
+msgstr "Печь пуста. Положите в неё дерево или кость и попробуйте ещё раз."
 
 #: src/iexamine.cpp
 msgid "The batch in this kiln is too small to yield any charcoal."
@@ -219417,7 +224657,7 @@ msgstr "Вы зажигаете углевыжигательную печь."
 
 #: src/iexamine.cpp
 msgid "This kiln is empty…"
-msgstr ""
+msgstr "Печь пуста…"
 
 #: src/iexamine.cpp
 msgid "There's a charcoal kiln there."
@@ -219465,6 +224705,8 @@ msgid ""
 "This furance is empty.  Fill it with powdered coke and lime mix, and try "
 "again."
 msgstr ""
+"Дуговая печь пуста. Положите в неё измельчённую смесь кокса и извести и "
+"попробуйте ещё раз."
 
 #: src/iexamine.cpp
 msgid ""
@@ -219493,7 +224735,7 @@ msgstr "Вы включили печь."
 
 #: src/iexamine.cpp
 msgid "This furnace is empty…"
-msgstr ""
+msgstr "Очаг пуст…"
 
 #: src/iexamine.cpp
 msgid "There's an arc furnace there."
@@ -219506,7 +224748,7 @@ msgstr "Обжигание закончилось и принесло %d кар
 
 #: src/iexamine.cpp
 msgid "This autoclave is empty…"
-msgstr ""
+msgstr "Автоклав пуст…"
 
 #: src/iexamine.cpp
 msgid ""
@@ -219569,7 +224811,7 @@ msgstr "Разжечь огонь"
 
 #: src/iexamine.cpp
 msgid "Start a fire… you'll need a fire source."
-msgstr ""
+msgstr "Чтобы разжечь огонь, вам потребуется источник огня."
 
 #: src/iexamine.cpp
 msgid "Use a CBM to start a fire"
@@ -219597,6 +224839,10 @@ msgstr "Вы пытаетесь разжечь огонь с помощью %s
 msgid "You weren't able to start a fire."
 msgstr "Вы не смогли разжечь огонь."
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "Вы не можете разжечь огонь здесь"
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -219773,12 +225019,12 @@ msgstr "%s заполнен!"
 
 #: src/iexamine.cpp
 msgid "You have no tool to dig with…"
-msgstr ""
+msgstr "Вам нечем копать…"
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Dig up %s?  This kills the tree!"
-msgstr ""
+msgstr "Выкопать %s? Это убьёт дерево!"
 
 #: src/iexamine.cpp
 msgid "Which container?"
@@ -219803,7 +225049,7 @@ msgstr ""
 
 #: src/iexamine.cpp
 msgid "No container added.  The sap will just spill on the ground."
-msgstr ""
+msgstr "Не установлен контейнер. Сок потечёт прямо на землю."
 
 #: src/iexamine.cpp
 msgid "Remove tap"
@@ -219950,7 +225196,7 @@ msgstr "%s выглядит слишком опасно. Лучше не тро
 #: src/iexamine.cpp
 #, c-format
 msgid "There is a %s there.  Take down?"
-msgstr ""
+msgstr "Здесь находится %s. Снять?"
 
 #: src/iexamine.cpp
 #, c-format
@@ -220059,11 +225305,11 @@ msgstr "Вы неграмотны и не можете прочитать что
 
 #: src/iexamine.cpp
 msgid "Failure!  No gas pumps found!"
-msgstr ""
+msgstr "Не выполнено! Не найдена топливная колонка!"
 
 #: src/iexamine.cpp
 msgid "Failure!  No gas tank found!"
-msgstr ""
+msgstr "Не выполнено! Не найден топливный бак!"
 
 #: src/iexamine.cpp
 msgid "This station is out of fuel.  We apologize for the inconvenience."
@@ -220120,7 +225366,7 @@ msgstr "Недостаточно денег, пожалуйста, пополн
 #: src/iexamine.cpp
 #, c-format
 msgid "How many liters of gasoline to buy?  Max: %d L.  (0 to cancel)"
-msgstr ""
+msgstr "Сколько литров бензина купить? Макс: %d л. (0 — отмена)"
 
 #: src/iexamine.cpp
 msgid "Glug Glug Glug"
@@ -220189,28 +225435,34 @@ msgstr "Вы не сможете здесь спуститься"
 #, c-format
 msgid "Looks like %d story.  Jump down?"
 msgid_plural "Looks like %d stories.  Jump down?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Похоже, тут %d этаж. Спрыгнуть?"
+msgstr[1] "Похоже, тут %d этажа. Спрыгнуть?"
+msgstr[2] "Похоже, тут %d этажей. Спрыгнуть?"
+msgstr[3] "Похоже, тут %d этаж. Спрыгнуть?"
 
 #: src/iexamine.cpp
 msgid "You probably won't be able to get up and jumping down may hurt.  Jump?"
 msgstr ""
+"Скорее всего, вам не удастся подняться наверх, а прыжок может нанести вам "
+"урон. Прыгнуть?"
 
 #: src/iexamine.cpp
 msgid "You probably won't be able to get back up.  Climb down?"
-msgstr ""
+msgstr "Скорее всего, вам не удастся забраться обратно. Спуститься?"
 
 #: src/iexamine.cpp
 msgid ""
 "You should be able to climb back up easily if you climb down there.  Climb "
 "down?"
 msgstr ""
+"Скорее всего, вы легко сможете забраться обратно, если спуститесь. "
+"Спуститься?"
 
 #: src/iexamine.cpp
 msgid "You may have problems climbing back up.  Climb down?"
 msgstr ""
+"Возможно, у вас возникнут проблемы, когда вы соберётесь забираться обратно. "
+"Спуститься?"
 
 #: src/iexamine.cpp
 msgid "You decided to step back from the ledge."
@@ -220250,6 +225502,9 @@ msgid ""
 "ERROR Bionic Level Assessement: FULL CYBORG.  Autodoc Mk. XI can't opperate."
 "  Please move patient to appropriate facility.  Exiting."
 msgstr ""
+"ОШИБКА Оценка Уровня Бионики: ПОЛНЫЙ КИБОРГ. Автодок Mk. XI не может "
+"провести операцию. Пожалуйста, переведите пациента в подходящее отделение. "
+"Завершение работы."
 
 #: src/iexamine.cpp
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation."
@@ -220310,6 +225565,17 @@ msgstr "Автодок работает над %s."
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr "Автодок Mk. XI. Статус: В работе. Пожалуйста, выберите операцию."
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr "Выберите Компактный Бионический Модуль для установки."
@@ -220540,6 +225806,8 @@ msgstr "Осмотреть мельницу"
 #: src/iexamine.cpp
 msgid "Remove brake and start milling… insert some products for milling first"
 msgstr ""
+"Снять с тормоза и начать перемалывать… сначала положите туда какой-нибудь "
+"продукт"
 
 #: src/iexamine.cpp
 msgid "Remove brake and start milling"
@@ -220551,12 +225819,12 @@ msgstr "Снять с тормоза и начать перемалывать. 
 
 #: src/iexamine.cpp
 msgid "Insert products for milling… mill is full"
-msgstr ""
+msgstr "Положить продукт для перемолки… мельница заполнена"
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Insert products for milling… remaining capacity is %s %s"
-msgstr ""
+msgstr "Положить продукт для перемолки… осталось %s %s"
 
 #: src/iexamine.cpp
 msgid "Fill the mill with starchy products such as wheat, barley or oats."
@@ -220608,7 +225876,7 @@ msgstr "Вы осматриваете содержимое и видите:"
 
 #: src/iexamine.cpp
 msgid "…that it is empty."
-msgstr ""
+msgstr "…что внутри пусто."
 
 #: src/iexamine.cpp
 msgid "You see some grains that are not yet milled to fine flour."
@@ -220637,12 +225905,12 @@ msgstr "Осмотреть коптильню"
 
 #: src/iexamine.cpp
 msgid "Light up and smoke food… insert some food for smoking first"
-msgstr ""
+msgstr "Поджечь и коптить еду… сначала положите туда какую-нибудь еду"
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Light up and smoke food… need extra %d charges of charcoal"
-msgstr ""
+msgstr "Поджечь и коптить еду… нужно ещё %d единиц древесного угля"
 
 #: src/iexamine.cpp
 msgid "Light up and smoke food"
@@ -220652,16 +225920,16 @@ msgstr "Поджечь и коптить еду"
 msgid ""
 "Light up the smoking rack and start smoking.  Smoking will take about 6 "
 "hours."
-msgstr ""
+msgstr "Поджечь коптильню и начать копчение. Это займёт примерно 6 часов."
 
 #: src/iexamine.cpp
 msgid "Insert food for smoking… smoking rack is full"
-msgstr ""
+msgstr "Положить еду для копчения… коптильня заполнена"
 
 #: src/iexamine.cpp
 #, c-format
 msgid "Insert food for smoking… remaining capacity is %s %s"
-msgstr ""
+msgstr "Положить еду для копчения… осталось %s %s"
 
 #: src/iexamine.cpp
 msgid ""
@@ -220685,7 +225953,7 @@ msgstr "Убрать еду из коптильни"
 
 #: src/iexamine.cpp
 msgid "Reload with charcoal… you don't have any"
-msgstr ""
+msgstr "Положить ещё древесного угля… у вас больше нет"
 
 #: src/iexamine.cpp
 msgid "Reload with charcoal"
@@ -220697,6 +225965,8 @@ msgid ""
 "You need %d charges of charcoal for %s %s of food.  Minimal amount of "
 "charcoal is %d charges."
 msgstr ""
+"Вам нужно %d единиц древесного угля для %s %s еды. Минимальное количество "
+"древесного угля, %d единиц."
 
 #: src/iexamine.cpp
 msgid "Quench burning charcoal"
@@ -220759,7 +226029,7 @@ msgstr "Вы останавливаете процесс копчения."
 
 #: src/iexamine.cpp
 msgid "You open the unlocked safe."
-msgstr ""
+msgstr "Вы открываете дверцу отпертого сейфа."
 
 #: src/iexamine.cpp
 #, c-format
@@ -220858,6 +226128,10 @@ msgstr "Соединения глобальной карты"
 msgid "Overmap specials"
 msgstr "Специальные локации глобальной карты"
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "Локации глобальной карты"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr "Прототипы транспорта"
@@ -220914,6 +226188,10 @@ msgstr "Списки добычи"
 msgid "Anatomies"
 msgstr "Анатомия"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "Мутации"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "Тайлсет"
@@ -220958,18 +226236,10 @@ msgstr "Профессии"
 msgid "Scenarios"
 msgstr "Сценарии"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "Мутации"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "Категории мутаций"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "Локации глобальной карты"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr "Доп. локации"
@@ -221000,15 +226270,15 @@ msgstr "Заклинания"
 
 #: src/init.cpp
 msgid "Transformations"
-msgstr ""
+msgstr "Преобразование"
 
 #: src/init.cpp
 msgid "Statistics"
-msgstr ""
+msgstr "Статистика"
 
 #: src/init.cpp
 msgid "Scores"
-msgstr ""
+msgstr "Счёт"
 
 #: src/input.cpp
 msgid "key bindings configuration"
@@ -221336,14 +226606,6 @@ msgstr "%1$d из %2$d"
 msgid "Page %d/%d"
 msgstr "Страница %d/%d"
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "НАДЕТЫЕ ВЕЩИ"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "ОРУЖИЕ В РУКАХ"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -221802,11 +227064,11 @@ msgstr ""
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
 msgstr ""
-"Эта еда начала <bad>портиться</bad>. <info>Есть</info> её — <bad>очень "
-"плохая идея</bad>."
+"Эта еда начала <bad>портиться</bad>. <info>Есть</info> её была бы <bad>очень"
+" плохая идея</bad>."
 
 #: src/item.cpp
 #, c-format
@@ -221882,12 +227144,6 @@ msgstr "Эти патроны <good>никогда не дают осечку</g
 msgid "This ammo <neutral>starts fires</neutral>."
 msgstr "Эти патроны <neutral>могут вызвать огонь</neutral>."
 
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr ""
-"Показаны характеристики активной <info>модификации (%s)</info> оружия."
-
 #: src/item.cpp
 msgid "Skill used: "
 msgstr "Используемый навык: "
@@ -222036,8 +227292,9 @@ msgid "Used on: "
 msgstr "Пригодно для: "
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "Размещение: "
+#, c-format
+msgid "Location: %s"
+msgstr "Локация: %s"
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -222593,51 +227850,46 @@ msgid ""
 msgstr "* Эта одежда <bad>маловата</bad> и вам <bad>не подходит</bad>."
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
-msgstr "* Этой одежде <info>можно увеличить размер</info>."
+msgid "<info>can be upsized</info>"
+msgstr "<info>можно увеличить размер</info>"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
-msgstr "* Этой одежде <info>можно уменьшить размер</info>."
+msgid "<info>can be downsized</info>"
+msgstr "<info>можно ушить</info>"
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
-msgstr "* Этой одежде <bad>нельзя уменьшить размер</bad>."
+msgid "<bad>can not be downsized</bad>"
+msgstr "<bad>нельзя ушить</bad>"
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
-msgstr "* Этой одежде <bad>нельзя увеличить размер</bad>."
+msgid "<bad>can not be upsized</bad>"
+msgstr "<bad>нельзя увеличить размер</bad>"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
-msgstr ""
-"* Эту одежду <info>можно подогнать по фигуре</info> и <info>увеличить по "
-"размеру</info>."
+#, c-format
+msgid "* This clothing %s."
+msgstr "* Эта одежда %s."
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
-msgstr ""
-"* Эту одежду <info>можно подогнать по фигуре</info> и <info>уменьшить по "
-"размеру</info>."
+msgid " and <info>upsized</info>"
+msgstr "и <info>увеличен</info>"
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
-msgstr ""
-"* Эту одежду <info>можно подогнать по фигуре</info>,  но <bad>не уменьшить "
-"по размеру</bad>."
+msgid " and <info>downsized</info>"
+msgstr "и <info>ушит</info>"
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
-msgstr ""
-"* Эту одежду <info>можно подогнать по фигуре</info>,  но <bad>не увеличить "
-"по размеру</bad>."
+msgid " but <bad>not downsized</bad>"
+msgstr "но <bad>не ушит</bad>"
+
+#: src/item.cpp
+msgid " but <bad>not upsized</bad>"
+msgstr "но <bad>не увеличен</bad>"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
-msgstr "* Эту одежду можно <info>подогнать по фигуре</info>."
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
+msgstr "* Эту одежду можно <info>подогнать по фигуре</info>%s."
 
 #: src/item.cpp
 msgid "* This clothing <bad>can not be refitted, upsized, or downsized</bad>."
@@ -222737,6 +227989,22 @@ msgstr ""
 msgid "This bionic is installed in the following body part(s):"
 msgstr "Эта бионика устанавливается в следующие части тела:"
 
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] "* Этот бионика может вырабатывать энергию из следующего топлива:"
+msgstr[1] "* Этот бионика может вырабатывать энергию из следующего топлива:"
+msgstr[2] "* Этот бионика может вырабатывать энергию из следующего топлива:"
+msgstr[3] "* Этот бионика может вырабатывать энергию из следующего топлива:"
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr ""
+
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr "<bold>Мощность:</bold> "
+
 #: src/item.cpp
 msgid "<bold>Encumbrance:</bold> "
 msgstr "<bold>Скованность:</bold>"
@@ -222826,14 +228094,14 @@ msgstr "Будет готово через %s."
 #, c-format
 msgctxt "carving"
 msgid "%1$s on the %2$s is: %3$s"
-msgstr ""
+msgstr "%1$s на %2$s: %3$s"
 
 #. ~ %1$s: inscription text
 #: src/item.cpp
 #, c-format
 msgctxt "carving"
 msgid "Note: %1$s"
-msgstr ""
+msgstr "Примечание: %1$s"
 
 #: src/item.cpp
 msgid "Integrated mod: "
@@ -222869,6 +228137,12 @@ msgstr "Можно использовать для изготовления ра
 msgid "You could use it to craft: %s"
 msgstr "Можно использовать для изготовления: %s"
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr ""
+"Показаны характеристики активной <info>модификации (%s)</info> оружия."
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -222896,7 +228170,7 @@ msgstr "Вы взяли в руки %s."
 
 #: src/item.cpp
 msgid "faulty "
-msgstr "дефект "
+msgstr "дефектн."
 
 #: src/item.cpp
 #, c-format
@@ -222930,7 +228204,7 @@ msgstr "%s в процессе"
 #, c-format
 msgctxt "item name"
 msgid "%1$s of %2$s"
-msgstr "%1$s с %2$s"
+msgstr "%1$s — %2$s"
 
 #. ~ %1$s: item name, %2$s: non-liquid, non-food, non-drink content item name
 #: src/item.cpp
@@ -223554,7 +228828,7 @@ msgstr "Вы уже и так курите %s!"
 
 #: src/iuse.cpp
 msgid "Are you sure you want to drink… this?"
-msgstr ""
+msgstr "Вы уверены, что хотите выпить… это?"
 
 #: src/iuse.cpp
 #, c-format
@@ -223586,7 +228860,7 @@ msgstr "Вы зажгли %s."
 
 #: src/iuse.cpp
 msgid "Ugh, too much smoke… you feel nasty."
-msgstr ""
+msgstr "Ох, слишком много курева… Чувствуете себя ужасно."
 
 #: src/iuse.cpp
 msgid "You take a puff from your electronic cigarette."
@@ -223602,7 +228876,7 @@ msgstr "У вас нет никотиновой жидкости!"
 
 #: src/iuse.cpp
 msgid "Ugh, too much nicotine… you feel nasty."
-msgstr ""
+msgstr "Ох, слишком много никотина… Чувствуете себя ужасно."
 
 #: src/iuse.cpp
 msgid "You take some antibiotics."
@@ -223714,6 +228988,8 @@ msgid ""
 "You start scarfing down the delicious cake.  It tastes a little funny "
 "though…"
 msgstr ""
+"Вы начали с жадностью поедать великолепное пирожное. На вкус оно, правда, "
+"немного смешное…"
 
 #: src/iuse.cpp
 msgid "You snort a bump of coke."
@@ -223745,7 +229021,7 @@ msgstr "Вы больше не боитесь гриппа. Хотя бы на 
 
 #: src/iuse.cpp
 msgid "Are you sure you want to eat this?  It looks poisonous…"
-msgstr ""
+msgstr "Вы уверены, что хотите есть это? Выглядит ядовитым…"
 
 #: src/iuse.cpp
 #, c-format
@@ -223766,7 +229042,7 @@ msgstr "Неожиданно у вас возникает чувство пус
 
 #: src/iuse.cpp
 msgid "You feel very sleepy…"
-msgstr ""
+msgstr "Вас сильно тянет в сон…"
 
 #: src/iuse.cpp
 msgid "You eat the datura seed."
@@ -223888,6 +229164,8 @@ msgid ""
 "You feel a familiar warmth, but suddenly it surges into an excruciating burn"
 " as you convulse, vomiting, and black out…"
 msgstr ""
+"Вы почувствовали знакомое тепло, но неожиданно оно превращается в "
+"мучительнейшее жжение, вас рвёт и трясёт в судорогах, и вы вырубаетесь…"
 
 #: src/iuse.cpp
 msgctxt "memorial_male"
@@ -223904,6 +229182,8 @@ msgid ""
 "You feel a familiar warmth, but suddenly it surges into painful burning as "
 "you convulse and collapse to the ground…"
 msgstr ""
+"Вы почувствовали знакомое тепло, но неожиданно оно превращается в "
+"болезненное жжение, вас трясёт в судорогах, и вы падаете на землю…"
 
 #: src/iuse.cpp src/monattack.cpp
 msgid ""
@@ -223919,10 +229199,12 @@ msgid ""
 "unity.  together we have reached the door.  we provide the final key.  now "
 "to pass through…"
 msgstr ""
+"единство. вместе мы дошли до двери. мы вставили последний ключ. время войти "
+"внутрь…"
 
 #: src/iuse.cpp
 msgid "You feel a strange warmth spreading throughout your body…"
-msgstr ""
+msgstr "Странное тепло разливается по вашему телу…"
 
 #. ~ "Uh-uh" is a sound used for "nope", "no", etc.
 #: src/iuse.cpp
@@ -223942,6 +229224,7 @@ msgstr ""
 #, c-format
 msgid "Sure you want to eat the %s?  You could plant it in a mound of dirt."
 msgstr ""
+"Уверены, что хотите съесть %s? Вы могли бы посадить это в земляную насыпь."
 
 #: src/iuse.cpp
 msgid "It tastes amazing, and you finish it quickly."
@@ -223952,12 +229235,14 @@ msgid ""
 "As it settles in, you feel ecstasy radiating through every part of your "
 "body…"
 msgstr ""
+"Вы доели и почувствовали экстаз, распространяющийся по каждой частичке "
+"вашего тела…"
 
 #: src/iuse.cpp
 msgid ""
 "Your eyes roll back in your head.  Everything dissolves into a blissful "
 "haze…"
-msgstr ""
+msgstr "Вы закатываете глаза. Все растворяется в блаженном тумане…"
 
 #. ~ The Mycus does not use the term (or encourage the concept of) "you".  The
 #. PC is a local/native organism, but is now the Mycus.
@@ -223973,6 +229258,7 @@ msgid ""
 "A sea of white caps, waving gently.  A haze of spores wafting silently over "
 "a forest."
 msgstr ""
+"Море медленно качающихся белых грибов. Облако спор тихо плывёт над лесом."
 
 #: src/iuse.cpp
 msgid "The natives have a saying: \"E Pluribus Unum.\"  Out of many, one."
@@ -223983,6 +229269,8 @@ msgid ""
 "The blazing pink redness of the berry.  The juices spreading across your "
 "tongue, the warmth draping over us like a lover's embrace."
 msgstr ""
+"Яркая краснота ягоды. Соки стекают по вашему языку и тепло накрывает нас, "
+"словно объятия любовника."
 
 #: src/iuse.cpp
 msgid ""
@@ -223990,12 +229278,17 @@ msgid ""
 "unite this world.  Even now, our fruits adapt to better serve local "
 "physiology."
 msgstr ""
+"Мы приветствуем единство наших линий в нашем местном проводнике. Мы будем "
+"процветать и объединим этот мир. Наши фрукты адаптировались, чтобы лучше "
+"подходить нашей местной физиологии."
 
 #: src/iuse.cpp
 msgid ""
 "The sky-blue of the seed.  The nutty, creamy flavors intermingling with the "
 "berry, a memory that will never leave us."
 msgstr ""
+"Голубое, как небо, семя. Ореховый, кремовый вкус, смешивающийся со вкусом "
+"ягоды. Вкус, который мы никогда не забудем."
 
 #: src/iuse.cpp
 msgid ""
@@ -224008,10 +229301,12 @@ msgid ""
 "The amber-yellow of the sap.  Feel it flowing through our veins, taking the "
 "place of the strange, thin red gruel called \"blood.\""
 msgstr ""
+"Янтарно-желтый сок. Мы ощущаем, как он течёт в наших венах, замещая эту "
+"странную красную водянистую жидкость под названием «кровь»."
 
 #: src/iuse.cpp
 msgid "This tastes really weird!  You're not sure it's good for you…"
-msgstr ""
+msgstr "На вкус очень странно! Вы не уверены, что это хорошо…"
 
 #: src/iuse.cpp
 #, c-format
@@ -224102,7 +229397,7 @@ msgid "You do not have that item!"
 msgstr "У вас нет этого предмета!"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
+msgid "Which signal should activate the item?"
 msgstr "Какой сигнал должен активировать этот предмет?"
 
 #: src/iuse.cpp
@@ -224147,7 +229442,7 @@ msgstr "Здесь нельзя рыбачить!"
 
 #: src/iuse.cpp
 msgid "You cast your line and wait to hook something…"
-msgstr ""
+msgstr "Вы забросили удочку и ждёте, пока кто-нибудь клюнет…"
 
 #: src/iuse.cpp
 msgid "Fish are not foolish enough to go in here without bait."
@@ -224351,16 +229646,6 @@ msgstr "«КХ-КХ-КХА-ХРКК-КХ!»"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr "Адский шум замолкает после выключения шумогенератора."
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr "Вы выучили основные элементы %s."
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr "%s чтобы выбрать стиль боевых искусств."
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr "Вы вырываете столб из забора."
@@ -224787,18 +230072,27 @@ msgid "Scan the ground"
 msgstr "Сканировать землю"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "Сканировать себя"
+msgid "Scan yourself or other person"
+msgstr "Сканировать себя или другого человека"
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "Вкл. постоянный скан"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr "Кого сканировать?"
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr "Ваш уровень радиации: %d мЗв (%d мЗв от предметов)"
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr "У %s уровень радиации: %d мЗв (%d мЗв от предметов)"
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -224866,6 +230160,10 @@ msgstr "«Тик!»"
 msgid "You've already released the handle, try throwing it instead."
 msgstr "Вы уже и так отпустили рукоять, попробуйте теперь бросить."
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "Вам нужен источник огня!"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr "Вы поджигаете стрелу!"
@@ -224880,7 +230178,7 @@ msgstr "Вы подожгли упаковку петард."
 
 #: src/iuse.cpp
 msgid "ssss…"
-msgstr ""
+msgstr "шшшш…"
 
 #: src/iuse.cpp
 msgid "You light the firecracker."
@@ -224897,23 +230195,23 @@ msgstr "Вы установили таймер на %s."
 
 #: src/iuse.cpp
 msgid "You squeeze the pheromone ball…"
-msgstr ""
+msgstr "Вы сжали железу с феромоном…"
 
 #: src/iuse.cpp
 msgid "<npcname> squeezes the pheromone ball…"
-msgstr ""
+msgstr "<npcname> сжал железу с феромоном…"
 
 #: src/iuse.cpp
 msgid "…but nothing happens."
-msgstr ""
+msgstr "…но ничего не происходит."
 
 #: src/iuse.cpp
 msgid "…and a nearby zombie becomes passive!"
-msgstr ""
+msgstr "…и зомби поблизости становится пассивным!"
 
 #: src/iuse.cpp
 msgid "…and several nearby zombies become passive!"
-msgstr ""
+msgstr "…и несколько зомби поблизости становятся пассивными!"
 
 #: src/iuse.cpp
 msgid "Shock where?"
@@ -225188,7 +230486,7 @@ msgstr "Для зарядки требуется перезаряжаемая б
 
 #: src/iuse.cpp
 msgid "You cannot do… that while mounted."
-msgstr ""
+msgstr "Во время верховой езды этого делать нельзя."
 
 #: src/iuse.cpp
 msgid "It's waterproof, but oxygen maybe?"
@@ -225210,7 +230508,7 @@ msgstr "Вы берёте %s и начинаете сбрасывать напр
 
 #: src/iuse.cpp
 msgid "Air swirls all over…"
-msgstr ""
+msgstr "Воздух кружится повсюду…"
 
 #: src/iuse.cpp
 msgid "Air swirls around you for a moment."
@@ -225247,7 +230545,7 @@ msgstr "Взять кровь у %s?"
 #: src/iuse.cpp
 #, c-format
 msgid "You drew blood from the %s…"
-msgstr ""
+msgstr "Вы берёте кровь у %s…"
 
 #: src/iuse.cpp
 msgid "Draw your own blood?"
@@ -225255,17 +230553,17 @@ msgstr "Взять свою кровь?"
 
 #: src/iuse.cpp
 msgid "You drew your own blood…"
-msgstr ""
+msgstr "Вы берёте собственную кровь…"
 
 #: src/iuse.cpp
 #, c-format
 msgid "…but acidic blood melts the %s, destroying it!"
-msgstr ""
+msgstr "…но кислотная кровь плавит и уничтожает %s!"
 
 #: src/iuse.cpp
 #, c-format
 msgid "…but acidic blood damages the %s!"
-msgstr ""
+msgstr "…но кислотная кровь повреждает %s!"
 
 #: src/iuse.cpp
 #, c-format
@@ -225365,10 +230663,6 @@ msgstr ""
 msgid "You mop up the spill."
 msgstr "Вы вытерли лужу."
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr ""
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr "Ткани пространства, кажется, распадаются."
@@ -225403,7 +230697,7 @@ msgstr "Что распылить?"
 
 #: src/iuse.cpp
 msgid "(To delete, clear the text and confirm)"
-msgstr ""
+msgstr "(Удалить, очистить текст и подтвердить)"
 
 #: src/iuse.cpp
 msgid "You blur the inscription on the grave."
@@ -225430,17 +230724,8 @@ msgid "You don't have appropriate food to heat up."
 msgstr "У вас нет подходящей еды для разогрева."
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
-msgstr ""
-"Вы размораживаете еду, но не подогреваете, потому что она вкуснее холодной."
-
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
-msgstr "Вы разморозили и подогрели еду."
-
-#: src/iuse.cpp
-msgid "You heat up the food."
-msgstr "Вы разогреваете пищу."
+msgid "You start heating up the food."
+msgstr "Вы начали разогревать еду."
 
 #: src/iuse.cpp
 msgid "There is no fire around, use your integrated toolset instead?"
@@ -225640,12 +230925,12 @@ msgstr "Вы сделали %s более точным."
 #: src/iuse.cpp src/iuse_actor.cpp
 #, c-format
 msgid "You repair your %s!  ( %s-> %s)"
-msgstr ""
+msgstr "Вы починили %s! ( %s-> %s)"
 
 #: src/iuse.cpp src/iuse_actor.cpp
 #, c-format
 msgid "You repair your %s completely!  ( %s-> %s)"
-msgstr ""
+msgstr "Вы полностью починили %s! ( %s-> %s)"
 
 #: src/iuse.cpp
 msgid "Select tool to modify"
@@ -225678,11 +230963,11 @@ msgstr "Вы укрепили ваш %s."
 
 #: src/iuse.cpp
 msgid "Clank!  Clank!"
-msgstr ""
+msgstr "Клац! Клац!"
 
 #: src/iuse.cpp
 msgid "Ring!  Ring!"
-msgstr ""
+msgstr "Дзинь! Дзинь!"
 
 #: src/iuse.cpp
 msgid "You cannot read a computer screen."
@@ -225843,7 +231128,7 @@ msgstr "Пустая трата времени, эти фотографии ни
 
 #: src/iuse.cpp
 msgid "You used to have a dog like this…"
-msgstr ""
+msgstr "Кажется, у вас была похожая собака…"
 
 #: src/iuse.cpp
 msgid "Ha-ha!  An amusing cat photo."
@@ -225855,7 +231140,7 @@ msgstr "Превосходное изображение природы."
 
 #: src/iuse.cpp
 msgid "Food photos… your stomach rumbles!"
-msgstr ""
+msgstr "Фото еды… Ваш желудок урчит!"
 
 #: src/iuse.cpp
 msgid "Some very interesting travel photos."
@@ -226338,12 +231623,12 @@ msgstr "%s оказывается на линии фотографировани
 
 #: src/iuse.cpp
 msgid "Strange… there's nothing in the center of picture?"
-msgstr ""
+msgstr "Странно… В середине фотографии ничего нет?"
 
 #: src/iuse.cpp
 #, c-format
 msgid "Strange… %s's not visible on the picture?"
-msgstr ""
+msgstr "Странно… на фотографии не видно %s?"
 
 #: src/iuse.cpp
 #, c-format
@@ -226472,25 +231757,25 @@ msgid "Your %s is too heavy or bulky for this RC car."
 msgstr "%s слишком тяжело или громоздко для этой машинки на РУ."
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
-msgstr "Вы разрядили свою машинку на РУ"
+msgid "You disarmed your RC car."
+msgstr "Вы разрядили РУ машинку."
 
 #. ~Sound of a radio controlled car moving around
 #: src/iuse.cpp
 msgid "buzzz…"
-msgstr ""
+msgstr "бжжжж…"
 
 #: src/iuse.cpp
 msgid "What to do with activated RC car?"
 msgstr "Что делать с активированной машинкой на РУ?"
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
-msgstr "Вы выключили свою машинку на РУ"
+msgid "You turned off your RC car."
+msgstr "Вы выключили РУ машинку."
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
-msgstr "«бип.»"
+#: src/iuse.cpp
+msgid "beep"
+msgstr "биип"
 
 #: src/iuse.cpp
 msgid "Take control of RC car"
@@ -226527,12 +231812,21 @@ msgstr "Вы управляете машинкой на РУ."
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
-"sending the signal."
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
 msgstr ""
 "%s в вашем инвентаре взорвётся, если послать этот сигнал. Лучше положить на "
 "землю, а уж потом посылать сигнал."
 
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
+"sending the signal."
+msgstr ""
+"%1$s в вашем %2$s взорвётся, если послать этот сигнал. Лучше положить на "
+"землю, перед отправкой сигнала."
+
 #: src/iuse.cpp
 msgid "This vehicle's security system has locked you out!"
 msgstr "Система безопасности автомобиля заперла вас!"
@@ -226604,6 +231898,8 @@ msgid ""
 "Despite using a controller, you still refuse to take control of this "
 "vehicle."
 msgstr ""
+"Несмотря на использование контроллера, вы все еще не способны управлять этим"
+" транспортным средством."
 
 #: src/iuse.cpp
 msgid "You take control of the vehicle."
@@ -226625,7 +231921,7 @@ msgstr ""
 #. ~ Single-spaced & lowercase are intentional, conveying hurried speech-KA101
 #: src/iuse.cpp
 msgid "Are you sure?!  the multi-cooker wants to poison your food!"
-msgstr ""
+msgstr "Вы уверены?! Мультиварка хочет отравить вашу еду!"
 
 #: src/iuse.cpp
 msgid ""
@@ -226673,7 +231969,7 @@ msgstr "Цикл завершится через %s."
 
 #: src/iuse.cpp
 msgid "The multi-cooker should be finishing shortly…"
-msgstr ""
+msgstr "Мультиварка должна скоро закончить работу…"
 
 #. ~ sound of a multi-cooker finishing its cycle!
 #: src/iuse.cpp
@@ -226754,7 +232050,7 @@ msgstr ""
 
 #: src/iuse.cpp
 msgid "Your morale is too low to craft…"
-msgstr ""
+msgstr "Вы не в настроении, что-либо делать…"
 
 #: src/iuse.cpp
 #, c-format
@@ -226885,7 +232181,7 @@ msgstr "Для этого вам понадобится мыло."
 #: src/iuse.cpp
 #, c-format
 msgid "The %s's monitor slowly outputs the data…"
-msgstr ""
+msgstr "Монитор %s медленно выводит данные…"
 
 #: src/iuse.cpp
 #, c-format
@@ -227030,7 +232326,7 @@ msgstr "Вы разломали палку, но одна её половина
 
 #: src/iuse.cpp
 msgid "The throbbing of the infection diminishes.  Slightly."
-msgstr ""
+msgstr "Пульсация инфекции уменьшается. Слегка."
 
 #: src/iuse.cpp
 msgid "You feel much better - almost entirely."
@@ -227054,6 +232350,8 @@ msgid ""
 "Simply taking more magnesium won't help.  You have to go to sleep for it to "
 "work."
 msgstr ""
+"Нет смысла просто принимать побольше магния. Вам нужно пойти поспать, чтобы "
+"это сработало."
 
 #: src/iuse.cpp
 #, c-format
@@ -227325,7 +232623,7 @@ msgstr "С приятным щелчком замок на двери откры
 
 #: src/iuse_actor.cpp
 msgid "The door swings open…"
-msgstr ""
+msgstr "Дверь распахнулась…"
 
 #: src/iuse_actor.cpp
 msgid "The lock stumps your efforts to pick it, and you destroy your tool."
@@ -227441,7 +232739,7 @@ msgstr "Здесь уже зажжён огонь."
 msgid ""
 "There's a brazier there but you haven't set it up to contain the fire.  "
 "Continue?"
-msgstr ""
+msgstr "Здесь есть жаровня, но вы не поставили ее на огонь. Продолжить?"
 
 #: src/iuse_actor.cpp
 msgid "You successfully light a fire."
@@ -227449,7 +232747,7 @@ msgstr "Вы успешно разожгли огонь."
 
 #: src/iuse_actor.cpp
 msgid "You light a fire, but it isn't enough.  You need to light more."
-msgstr ""
+msgstr "Вы зажгли огонь, но недостаточно. Вам нужно зажечь ещё."
 
 #: src/iuse_actor.cpp
 msgid "You happily light a fire."
@@ -227563,7 +232861,7 @@ msgstr "Это заметка"
 
 #: src/iuse_actor.cpp
 msgid "(To delete, clear the text and confirm)\n"
-msgstr ""
+msgstr "(Чтобы удалить, очистите текст и подтвердите)\n"
 
 #. ~ %1$s: gerund (e.g. carved), %2$s: item name
 #: src/iuse_actor.cpp
@@ -227597,7 +232895,7 @@ msgstr "Нанести надпись на что?"
 #: src/iuse_actor.cpp
 #, c-format
 msgid "You try to bend your %s, but fail."
-msgstr ""
+msgstr "Вы пытаетесь согнуть %s, но не получается."
 
 #: src/iuse_actor.cpp
 msgid "You cauterize yourself."
@@ -227648,7 +232946,7 @@ msgstr "Занимайтесь любовью, а не рабством."
 
 #: src/iuse_actor.cpp
 msgid "Well, it's more constructive than just chopping 'em into gooey meat…"
-msgstr ""
+msgstr "Ну, это более конструктивно, чем просто рубить их на липкое мясо…"
 
 #: src/iuse_actor.cpp
 msgid "You feel horrible for mutilating and enslaving someone's corpse."
@@ -227812,7 +233110,7 @@ msgstr "До получения уровня заклинания"
 #: src/iuse_actor.cpp
 #, c-format
 msgid "This item casts %1$s at level %2$i."
-msgstr ""
+msgstr "Этот предмет кастует %1$s на уровне %2$i."
 
 #: src/iuse_actor.cpp
 msgid "This item never fails."
@@ -227952,7 +233250,7 @@ msgstr "%s (починено при помощи %s)"
 #: src/iuse_actor.cpp
 #, c-format
 msgid "You don't have enough %s to do that.  Have: %d, need: %d"
-msgstr ""
+msgstr "Вам не хватает %s для этого. Есть: %d, нужно: %d"
 
 #: src/iuse_actor.cpp
 msgid "That requires gunsmithing tools."
@@ -227976,7 +233274,7 @@ msgstr "Предмет (%s) уже максимально улучшен."
 #: src/iuse_actor.cpp
 #, c-format
 msgid "You damage your %s!  ( %s-> %s)"
-msgstr ""
+msgstr "Вы повреждаете %s! ( %s-> %s)"
 
 #: src/iuse_actor.cpp
 msgid "You destroy it!"
@@ -228169,7 +233467,7 @@ msgstr "<bold>Ходов на использование</bold>: "
 #: src/iuse_actor.cpp
 #, c-format
 msgid "Yeah.  Place the %s at your feet.  Real damn smart move."
-msgstr ""
+msgstr "Ага, разместите %s прямо под ногами. Чертовски умный ход."
 
 #: src/iuse_actor.cpp
 #, c-format
@@ -228279,7 +233577,7 @@ msgstr "Сначала необходимо снять с себя."
 
 #: src/iuse_actor.cpp
 msgid "You quiver with anticipation…"
-msgstr ""
+msgstr "Вы дрожите от нетерпения…"
 
 #: src/iuse_actor.cpp
 msgid "You suddenly feel dizzy, and collapse to the ground."
@@ -228351,10 +233649,30 @@ msgstr ""
 msgid "How do you want to modify it?"
 msgstr "Какую модификацию вы хотите сделать?"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
-msgstr ""
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr "Невозможно %1$s (нужно %2$d нитки)"
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr "Невозможно %1$s (нужно %2$d %3$s)"
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr "Невозможно %1$s (не совместимо с %2$s)"
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
+msgstr "%1$s (%2$d %3$s и %4$d нитки)"
 
 #: src/iuse_actor.cpp
 msgid "Bash"
@@ -228387,7 +233705,7 @@ msgstr "Вы уверены? Вы не сможете получить обра
 #: src/iuse_actor.cpp
 #, c-format
 msgid "You damage your %s trying to modify it!  ( %s-> %s)"
-msgstr ""
+msgstr "В попытке улучшить %s вы повреждаете его! ( %s-> %s)"
 
 #: src/iuse_actor.cpp
 msgid "You fail to modify the clothing, and you waste thread and materials."
@@ -228437,7 +233755,7 @@ msgstr "Это алтарь лошадиного бога."
 
 #: src/iuse_software_kitten.cpp
 msgid "A box of dancing mechanical pencils.  They dance!  They sing!"
-msgstr ""
+msgstr "Коробка танцующих механических карандашей. Они танцуют! Они поют!"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's an old Duke Ellington record."
@@ -228449,7 +233767,7 @@ msgstr "Коробка фумигационных гранул."
 
 #: src/iuse_software_kitten.cpp
 msgid "A digital clock.  It's stuck at 2:17 PM."
-msgstr ""
+msgstr "Цифровые часы. Остановились на 14:17."
 
 #: src/iuse_software_kitten.cpp
 msgid "That's just a charred human corpse."
@@ -228461,15 +233779,15 @@ msgstr "Я не знаю что это, но это не котёнок."
 
 #: src/iuse_software_kitten.cpp
 msgid "An empty shopping bag.  Paper or plastic?"
-msgstr ""
+msgstr "Пустой пакет. Бумажный или пластиковый?"
 
 #: src/iuse_software_kitten.cpp
 msgid "Could it be… a big ugly bowling trophy?"
-msgstr ""
+msgstr "Похоже на… Большой убогий трофей из боулинга?"
 
 #: src/iuse_software_kitten.cpp
 msgid "A coat hanger hovers in thin air.  Odd."
-msgstr ""
+msgstr "Вешалка, парящая в воздухе. Странно."
 
 #: src/iuse_software_kitten.cpp
 msgid "Not kitten, just a packet of Kool-Aid(tm)."
@@ -228493,7 +233811,7 @@ msgstr "Нос Ричарда Никсона!"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's Lucy Ricardo.  \"Aaaah, Ricky!\", she says."
-msgstr ""
+msgstr "Это Люси Рикардо. Она произносит: «Аааах, Рикки!»."
 
 #: src/iuse_software_kitten.cpp
 msgid "You stumble upon Bill Gates' stand-up act."
@@ -228501,11 +233819,11 @@ msgstr "Вы наткнулись на стендап выступление Б
 
 #: src/iuse_software_kitten.cpp
 msgid "Just an autographed copy of the Kama Sutra."
-msgstr "Экземпляр \"Кама-Сутры\" с автографом."
+msgstr "Экземпляр «Кама-Сутры» с автографом."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's the Will Rogers Highway.  Who was Will Rogers, anyway?"
-msgstr ""
+msgstr "Это шоссе имени Уилла Роджерса. Кстати, кто такой Уилл Роджерс?"
 
 #: src/iuse_software_kitten.cpp
 msgid ""
@@ -228569,6 +233887,8 @@ msgstr "Могучий зомби, говорящий о любви и проц
 #: src/iuse_software_kitten.cpp
 msgid "\"Dear robot, you may have already won our 10 MILLION DOLLAR prize…\""
 msgstr ""
+"«Дорогой робот, возможно вы стали победителем в розыгрыше 10 МИЛЛИОНОВ "
+"ДОЛЛАРОВ…»"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's just an object."
@@ -228613,7 +233933,7 @@ msgstr "Это компрометирующие фотографии слони
 #: src/iuse_software_kitten.cpp
 msgid ""
 "A copy of the Weekly World News.  Watch out for the chambered nautilus!"
-msgstr ""
+msgstr "Еженедельник с мировыми новостями. Берегись Наутилус Помпилиуса!"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's the proverbial wet blanket."
@@ -228633,19 +233953,19 @@ msgstr "Галстук Пола Мойер."
 
 #: src/iuse_software_kitten.cpp
 msgid "A haircut and a real job.  Now you know where to get one!"
-msgstr ""
+msgstr "Стрижка и настоящая работа. Теперь вы знаете как её сделать!"
 
 #: src/iuse_software_kitten.cpp
 msgid "An automated robot-hater.  It frowns disapprovingly at you."
-msgstr ""
+msgstr "Автоматический роботоненавистник. Глядит вас крайне неодобрительно."
 
 #: src/iuse_software_kitten.cpp
 msgid "An automated robot-liker.  It smiles at you."
-msgstr ""
+msgstr "Автоматический любитель роботов. Он улыбается вам."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a black hole.  Don't fall in!"
-msgstr ""
+msgstr "Это чёрная дыра. Не провались!"
 
 #: src/iuse_software_kitten.cpp
 msgid "Just a big brick wall."
@@ -228653,7 +233973,7 @@ msgstr "Просто большая кирпичная стена."
 
 #: src/iuse_software_kitten.cpp
 msgid "You found kitten!  No, just kidding."
-msgstr ""
+msgstr "Вы нашли котёнка! Нет, это шутка."
 
 #: src/iuse_software_kitten.cpp
 msgid "Heart of Darkness brand pistachio nuts."
@@ -228708,7 +234028,7 @@ msgstr "Это созвездие рыбы."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a fly on the wall.  Hi, fly!"
-msgstr ""
+msgstr "Это муха на стене. Привет, муха!"
 
 #: src/iuse_software_kitten.cpp
 msgid "This kind of looks like kitten, but it's not."
@@ -228716,7 +234036,7 @@ msgstr "Это выглядит как котёнок, но им не являе
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a banana!  Oh, joy!"
-msgstr ""
+msgstr "Это банан! Эх, хорошо!"
 
 #: src/iuse_software_kitten.cpp
 msgid "A helicopter has crashed here."
@@ -228745,11 +234065,11 @@ msgstr "Фонтан гейзера взмывает в воздух."
 
 #: src/iuse_software_kitten.cpp
 msgid "A toenail?  What good is a toenail?"
-msgstr ""
+msgstr "Ноготь из ноги? Что хорошего в ногте из ноги?"
 
 #: src/iuse_software_kitten.cpp
 msgid "You've found the fish!  Not that it does you much good in this game."
-msgstr ""
+msgstr "Вы нашли рыбу! Это не то, что было бы полезно в этой игре."
 
 #: src/iuse_software_kitten.cpp
 msgid "A Buttertonsils bar."
@@ -228773,7 +234093,7 @@ msgstr "Это не что иное, как G-thang, детка."
 
 #: src/iuse_software_kitten.cpp
 msgid "IT'S ALIVE!  AH HA HA HA HA!"
-msgstr ""
+msgstr "ОНО ОЖИЛО! АХА ХА ХА ХА ХА!"
 
 #: src/iuse_software_kitten.cpp
 msgid "This was no boating accident!"
@@ -228783,10 +234103,11 @@ msgstr "Это не было аварией на лодке!"
 msgid ""
 "Wait!  This isn't the poker chip!  You've been tricked!  DAMN YOU, MENDEZ!"
 msgstr ""
+"Погоди! Это не покерная фишка! Тебя обманули! БУДЬ ТЫ ПРОКЛЯТ, МЭНДЕС!"
 
 #: src/iuse_software_kitten.cpp
 msgid "A livery stable!  Get your livery!"
-msgstr ""
+msgstr "Прокат коней! Возьми коня!"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a perpetual immobility machine."
@@ -228808,7 +234129,7 @@ msgstr "Самый крупный в мире шарик из Мацы!"
 msgid ""
 "A tribe of cannibals lives here.  They eat Malt-O-Meal for breakfast, you "
 "know."
-msgstr ""
+msgstr "Здесь живёт племя каннибалов. Они едят хлопья на завтрак, понимаешь."
 
 #: src/iuse_software_kitten.cpp
 msgid "This appears to be a rather large stack of trashy romance novels."
@@ -228816,7 +234137,7 @@ msgstr "Это большая стопка дрянных любовных ро
 
 #: src/iuse_software_kitten.cpp
 msgid "Look out!  Exclamation points!"
-msgstr ""
+msgstr "Берегись! Восклицательные знаки!"
 
 #: src/iuse_software_kitten.cpp
 msgid "A herd of wild coffee mugs slumbers here."
@@ -228824,11 +234145,11 @@ msgstr "Здесь дремлет стадо диких кружек кофе."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a limbo bar!  How low can you go?"
-msgstr ""
+msgstr "Это планка для лимбо! Насколько низко вы сможете пройти?"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's the horizon.  Now THAT'S weird."
-msgstr ""
+msgstr "Это горизонт. Теперь ЭТО странно."
 
 #: src/iuse_software_kitten.cpp
 msgid "A vase full of artificial flowers is stuck to the floor here."
@@ -228844,17 +234165,19 @@ msgstr "Пара салунных дверок медленно качающих
 
 #: src/iuse_software_kitten.cpp
 msgid "It's an ordinary bust of Beethoven… but why is it painted green?"
-msgstr ""
+msgstr "Это обычный бюст Бетховена… Но почему он покрашен в зелёный цвет?"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's TV's lovable wisecracking Crow!  \"Bite me!\", he says."
-msgstr ""
+msgstr "Это — обожаемый острящий Crow на ТВ! «Укусите меня!», — говорит он."
 
 #: src/iuse_software_kitten.cpp
 msgid ""
 "Hey, look, it's war.  What is it good for?  Absolutely nothing.  Say it "
 "again."
 msgstr ""
+"Эй, смотри, это война. Война – ради чего она? Абсолютно не нужна. Скажу "
+"снова."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's the amazing self-referential thing that's not kitten."
@@ -228862,7 +234185,7 @@ msgstr "Это удивительный самореферентный пред
 
 #: src/iuse_software_kitten.cpp
 msgid "A flamboyant feather boa.  Now you can dress up like Carol Channing!"
-msgstr ""
+msgstr "Яркое перьевое боа. Теперь вы сможете нарядиться как Кэрол Чэннинг!"
 
 #: src/iuse_software_kitten.cpp
 msgid "\"Sure hope we get some rain soon,\" says Farmer Joe."
@@ -228885,6 +234208,7 @@ msgid ""
 "This is a large brown bear.  Oddly enough, it's currently peeing in the "
 "woods."
 msgstr ""
+"Это большой бурый медведь. Крайне странно, что сейчас он мочится в лесу."
 
 #: src/iuse_software_kitten.cpp
 msgid "A team of arctic explorers is camped here."
@@ -228915,6 +234239,7 @@ msgid ""
 "This is a television.  On screen you see a robot strangely similar to "
 "yourself."
 msgstr ""
+"Это телевизор. На экране вы видите робота, подозрительно похожего на вас."
 
 #: src/iuse_software_kitten.cpp
 msgid "This balogna has a first name, it's R-A-N-C-I-D."
@@ -228922,16 +234247,16 @@ msgstr "У этой болонской колбаски есть имя, П-Р-
 
 #: src/iuse_software_kitten.cpp
 msgid "A salmon hatchery?  Look again.  It's merely a single salmon."
-msgstr ""
+msgstr "Косяк лосося? Посмотрите снова. Это просто один лосось."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a rim shot.  Ba-da-boom!"
-msgstr ""
+msgstr "Это римшот. Ба-да-бууум!"
 
 #: src/iuse_software_kitten.cpp
 msgid ""
 "It's creepy and it's kooky, mysterious and spooky.  It's also somewhat ooky."
-msgstr ""
+msgstr "Это страшно и это чудно, таинственно и жутко. А также немного ОКай."
 
 #: src/iuse_software_kitten.cpp
 msgid "This is an anagram."
@@ -228943,7 +234268,7 @@ msgstr "Этот объект обладает свойствами аналог
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a symbol.  You see in it a model for all symbols everywhere."
-msgstr ""
+msgstr "Это символ. Вы видите в нём модель для всех символов во всём мире."
 
 #: src/iuse_software_kitten.cpp
 msgid "The object pushes back at you."
@@ -228951,17 +234276,18 @@ msgstr "Этот объект отталкивает вас."
 
 #: src/iuse_software_kitten.cpp
 msgid "A traffic signal.  It appears to have been recently vandalized."
-msgstr ""
+msgstr "Светофор. Этот, видимо, недавно был подвергнут акту вандализма."
 
 #: src/iuse_software_kitten.cpp
 msgid ""
 "\"There is no kitten!\" cackles the old crone.  You are shocked by her "
 "blasphemy."
 msgstr ""
+"«Здесь нет котёнка!» — кряхтит старая карга. Вы шокированы её богохульством."
 
 #: src/iuse_software_kitten.cpp
 msgid "This is a Lagrange point.  Don't come too close now."
-msgstr ""
+msgstr "Это точка Лагранжа. Не приближайтесь к ней."
 
 #: src/iuse_software_kitten.cpp
 msgid "The dirty old tramp bemoans the loss of his harmonica."
@@ -228981,7 +234307,7 @@ msgstr "Это руководство пользователя к предыду
 
 #: src/iuse_software_kitten.cpp
 msgid "A brain cell.  Oddly enough, it seems to be functioning."
-msgstr ""
+msgstr "Клетка мозга. Крайне странно, но она, похоже, функционирует."
 
 #: src/iuse_software_kitten.cpp
 msgid "Tea and/or crumpets."
@@ -228999,6 +234325,8 @@ msgstr "Это пустая трубка из-под «Овсянки Кваке
 #: src/iuse_software_kitten.cpp
 msgid "This is a remote control.  Being a robot, you keep a wide berth."
 msgstr ""
+"Это пульт дистанционного управления. Поскольку вы робот, вы держитесь "
+"подальше."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a roll of industrial-strength copper wire."
@@ -229006,7 +234334,7 @@ msgstr "Моток промышленного медного провода."
 
 #: src/iuse_software_kitten.cpp
 msgid "Oh boy!  Grub!  Er, grubs."
-msgstr ""
+msgstr "Ох парень! Копай! Рр, рой."
 
 #: src/iuse_software_kitten.cpp
 msgid "A puddle of mud, where the mudskippers play."
@@ -229034,11 +234362,11 @@ msgstr "«Основные цвета», с анонимным автограф
 
 #: src/iuse_software_kitten.cpp
 msgid "Another rabbit?  That's three today!"
-msgstr ""
+msgstr "Ещё кролик? Третий за сегодня!"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a segmentation fault.  Core dumped, by the way."
-msgstr ""
+msgstr "Это ошибка сегментирования. Между прочим, дамп ядра сохранён."
 
 #: src/iuse_software_kitten.cpp
 msgid "A historical marker showing the actual location of /dev/null."
@@ -229046,7 +234374,7 @@ msgstr "Историческая памятка, показывающая тек
 
 #: src/iuse_software_kitten.cpp
 msgid "Thar's Mobius Dick, the convoluted whale.  Arrr!"
-msgstr ""
+msgstr "Это Моби Дик, юркий кит! Аррр!"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a charcoal briquette, smoking away."
@@ -229066,7 +234394,7 @@ msgstr "Неустойчиво качающаяся стопка семидюй
 
 #: src/iuse_software_kitten.cpp
 msgid "It's nothing but a corrupted floppy.  Coaster anyone?"
-msgstr ""
+msgstr "Ничего кроме повреждённой дискеты. Кому-нибудь нужна подставка?"
 
 #: src/iuse_software_kitten.cpp
 msgid "A section of glowing phosphor cells sings a song of radiation to you."
@@ -229110,7 +234438,7 @@ msgstr "Это пропавшая глава «Заводного апельси
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a burrito stand flyer.  \"Taqueria El Ranchito\"."
-msgstr ""
+msgstr "Стенд с рекламой буррито: «Такуэрья Аль Ранчито»."
 
 #: src/iuse_software_kitten.cpp
 msgid "This smiling family is happy because they eat LARD."
@@ -229138,11 +234466,11 @@ msgstr "Забытый оператор телефонного коммутат
 
 #: src/iuse_software_kitten.cpp
 msgid "It's an automated robot-disdainer.  It pretends you're not there."
-msgstr ""
+msgstr "Это автоматический робот-презиратель. Он делает вид, что вас тут нет."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a portable hole.  A sign reads: \"Closed for the winter\"."
-msgstr ""
+msgstr "Это портативная дыра. На её знаке написано: «Закрыто на зиму»."
 
 #: src/iuse_software_kitten.cpp
 msgid "Just a moldy loaf of bread."
@@ -229151,10 +234479,12 @@ msgstr "Просто буханка заплесневелого хлеба."
 #: src/iuse_software_kitten.cpp
 msgid "A little glass tub of Carmex.  ($.89) Too bad you have no lips."
 msgstr ""
+"Маленькая стеклянная банка крема Carnex. ($.89) Жаль, что у вас не губ."
 
 #: src/iuse_software_kitten.cpp
 msgid "A Swiss-Army knife.  All of its appendages are out.  (toothpick lost)"
 msgstr ""
+"Швейцарский армейский нож. Все его детали выдвинуты. (зубочистка утеряна)"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's a zen simulation, trapped within an ASCII character."
@@ -229175,7 +234505,7 @@ msgstr ""
 
 #: src/iuse_software_kitten.cpp
 msgid "A robot comedian.  You feel amused."
-msgstr ""
+msgstr "Это робот-комик. Вы повеселели."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's KITT, the talking car."
@@ -229183,7 +234513,7 @@ msgstr "Это KITT, говорящая машина."
 
 #: src/iuse_software_kitten.cpp
 msgid "Here's Pete Peterson.  His batteries seem to have long gone dead."
-msgstr ""
+msgstr "Здесь Пит Питерсон. Похоже, его батарейки уже давно сели."
 
 #: src/iuse_software_kitten.cpp
 msgid "\"Blup, blup, blup\", says the mud pot."
@@ -229211,7 +234541,7 @@ msgstr "Кусок тыквенного пирога."
 
 #: src/iuse_software_kitten.cpp
 msgid "It's the Bass-Matic '76!  Mmm, that's good bass!"
-msgstr ""
+msgstr "Это Bass-Matic '76! Ммм, хороший бас!"
 
 #: src/iuse_software_kitten.cpp
 msgid "\"Lend us a fiver 'til Thursday\", pleas Andy Capp."
@@ -229220,6 +234550,8 @@ msgstr "«Одолжи пятёрочку до среды», — просит Э
 #: src/iuse_software_kitten.cpp
 msgid "It's a tape of '70s rock.  All original hits!  All original artists!"
 msgstr ""
+"Это рок-записи 70-х годов. Только оригинальные хиты! Только оригинальные "
+"исполнители!"
 
 #: src/iuse_software_kitten.cpp
 msgid "You've found the fabled America Online disk graveyard!"
@@ -229238,10 +234570,12 @@ msgid ""
 "Ed McMahon stands here, lost in thought.  Seeing you, he bellows, \"YES "
 "SIR!\""
 msgstr ""
+"Эд Макмэхон стоит здесь, погрузившись в мысли. Увидев вас, он кричит: «ЕСТЬ,"
+" СЭР!»."
 
 #: src/iuse_software_kitten.cpp
 msgid "…thingy???"
-msgstr ""
+msgstr "…вещица???"
 
 #: src/iuse_software_kitten.cpp
 msgid "It's 1000 secrets the government doesn't want you to know!"
@@ -229254,11 +234588,11 @@ msgstr "Буквы O и R."
 
 #: src/iuse_software_kitten.cpp
 msgid "A magical… magic thing."
-msgstr ""
+msgstr "Волшебная… магическая вещь."
 
 #: src/iuse_software_kitten.cpp
 msgid "That is a moose, a thing of pure evil.  You should \"RUN!\""
-msgstr ""
+msgstr "Это лось, создание чистого зла. Вы должны «БЕЖАТЬ!»"
 
 #: src/iuse_software_kitten.cpp
 msgid "It is SOFTWARE BUG."
@@ -229295,6 +234629,10 @@ msgid ""
 " they are kitten or not.  The game ends when robot finds kitten.  "
 "Alternatively, you may end the game by hitting 'q', 'Q' or the Escape key."
 msgstr ""
+"Ваша задача — найти котёнка. Задача усложняется существованием многих вещей,"
+" не являющихся котёнком. Робот должен осмотреть предмет, чтобы определить, "
+"котёнок ли это. Игра заканчивается, когда робот найдёт котёнка. Либо же вы "
+"можете закончить игру, нажав «q», «Q», или Escape."
 
 #: src/iuse_software_kitten.cpp
 msgid "Press any key to start."
@@ -229306,7 +234644,7 @@ msgstr "Неверная команда: Используйте клавиши 
 
 #: src/iuse_software_kitten.cpp
 msgid "You found kitten!  Way to go, robot!"
-msgstr ""
+msgstr "Вы нашли котёнка! Так держать, робот!"
 
 #: src/iuse_software_lightson.cpp
 msgid "<spacebar or 5> toggle lights"
@@ -229381,7 +234719,7 @@ msgstr "<f> флаг"
 
 #: src/iuse_software_minesweeper.cpp
 msgid "Boom, you're dead!  Better luck next time."
-msgstr ""
+msgstr "Бум, вы погибли! Удачи в следующий раз."
 
 #: src/iuse_software_snake.cpp src/iuse_software_sokoban.cpp
 #, c-format
@@ -229439,6 +234777,8 @@ msgid ""
 "\n"
 "Experience: %d (%d points available)"
 msgstr ""
+"\n"
+"Опыт: %d (%d очков доступно)"
 
 #. ~ abbreviated direction names and long direction names
 #: src/line.cpp
@@ -229659,7 +234999,7 @@ msgstr "снизу"
 
 #: src/live_view.cpp
 msgid "< <color_green>Mouse View</color> >"
-msgstr ""
+msgstr "< <color_green>Осмотр мышью</color> >"
 
 #: src/loading_ui.cpp
 msgid "Loading"
@@ -229768,6 +235108,23 @@ msgstr "Вы не можете выучить это заклинание."
 msgid "All knowledge of %s leaves you."
 msgstr "Вы забываете все о %s."
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr "Выберите новую горячую клавишу."
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr "Эта горячая клавиша уже используется."
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr "Горячая клавиша удалена."
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr "Игнорировать предупреждения"
@@ -229776,6 +235133,10 @@ msgstr "Игнорировать предупреждения"
 msgid "Popup Distractions"
 msgstr "Показывать предупреждения"
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr "Назначить горячую клавишу [=]"
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr "требует концентрации"
@@ -229840,6 +235201,15 @@ msgstr "Стоимость каста"
 msgid "Casting Cost (impeded)"
 msgstr "Стоимость каста (затрудн.)"
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr "Не хватает энергии"
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr "Время каста"
@@ -229848,6 +235218,10 @@ msgstr "Время каста"
 msgid "Casting Time (impeded)"
 msgstr "Время каста (затрудн.)"
 
+#: src/magic.cpp
+msgid "self"
+msgstr "себя"
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr "Достижимые цели"
@@ -229860,6 +235234,22 @@ msgstr "Урон"
 msgid "Healing"
 msgstr "Исцеление"
 
+#: src/magic.cpp
+msgid "Spell Radius"
+msgstr "Радиус заклинания"
+
+#: src/magic.cpp
+msgid "Cone Arc"
+msgstr ""
+
+#: src/magic.cpp
+msgid "degrees"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Line Width"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Variance"
 msgstr "Отклонение"
@@ -229872,18 +235262,10 @@ msgstr "Порождение"
 msgid "Summon"
 msgstr "Призыв"
 
-#: src/magic.cpp
-msgid "Spell Radius"
-msgstr "Радиус заклинания"
-
 #: src/magic.cpp src/veh_interact.cpp
 msgid "Range"
 msgstr "Дальность"
 
-#: src/magic.cpp
-msgid "self"
-msgstr "себя"
-
 #: src/magic.cpp
 msgid "Duration"
 msgstr "Продолжительность"
@@ -229908,18 +235290,22 @@ msgstr "Восстановить"
 msgid "Damage Type"
 msgstr "Тип урона"
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr "Прирост характеристик"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr "ур. 0"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr "за ур."
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr "макс ур."
@@ -229972,13 +235358,18 @@ msgstr ""
 msgid "No valid targets to teleport."
 msgstr "Нет действующей цели для телепортации."
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr ""
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr "Выберите врата транслокатора"
 
 #: src/main.cpp
 msgid "Really Quit?  All unsaved changes will be lost."
-msgstr ""
+msgstr "Действительно выйти? Все несохранённые изменения будут потеряны."
 
 #: src/main_menu.cpp
 msgid "Bugs?  Suggestions?  Use links in MOTD to report them."
@@ -230098,19 +235489,23 @@ msgstr "Цвета"
 
 #: src/main_menu.cpp
 msgid "Unable to make config directory.  Check permissions."
-msgstr ""
+msgstr "Невозможно создать папку с конфигурацией. Проверьте права доступа."
 
 #: src/main_menu.cpp
 msgid "Unable to make save directory.  Check permissions."
-msgstr ""
+msgstr "Невозможно создать папку с сохранениями. Проверьте права доступа."
 
 #: src/main_menu.cpp
 msgid "Unable to make templates directory.  Check permissions."
-msgstr ""
+msgstr "Невозможно создать папку с шаблонами. Проверьте права доступа."
 
 #: src/main_menu.cpp
 msgid "Unable to make sound directory.  Check permissions."
-msgstr ""
+msgstr "Невозможно создать папку для звуков. Проверьте права доступа."
+
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr "Невозможно создать папку с графикой. Проверьте права доступа."
 
 #: src/main_menu.cpp
 msgid "Really quit?"
@@ -230138,7 +235533,7 @@ msgstr "Случайный персонаж"
 #: src/main_menu.cpp
 msgctxt "Main Menu|New Game"
 msgid "Play Now!  (<F|f>ixed Scenario)"
-msgstr ""
+msgstr "Сразу в игру! (фиксированный сценарий)"
 
 #: src/main_menu.cpp
 msgctxt "Main Menu|New Game"
@@ -230190,7 +235585,7 @@ msgstr "Создать мир"
 #: src/map.cpp
 #, c-format
 msgid "weight of %1$s"
-msgstr ""
+msgstr "вес %1$s"
 
 #: src/map.cpp
 #, c-format
@@ -230256,13 +235651,13 @@ msgstr "<npcname> задевает падающий %s!"
 #: src/map.cpp
 #, c-format
 msgid "The %s damages several items!"
-msgstr ""
+msgstr "%s повредил несколько вещей!"
 
 #. ~ %1$s: the cause of damage, %2$s: damaged item name
 #: src/map.cpp
 #, c-format
 msgid "The %1$s damages the %2$s!"
-msgstr ""
+msgstr "%1$s повредил %2$s!"
 
 #: src/map.cpp
 msgid "an alarm go off!"
@@ -230294,7 +235689,7 @@ msgstr "«кераш!»"
 
 #: src/map.cpp
 msgid "laser beam"
-msgstr ""
+msgstr "лазерный луч"
 
 #: src/map.cpp
 msgid "bolt of electricity"
@@ -230306,7 +235701,7 @@ msgstr ""
 
 #: src/map.cpp
 msgid "flying projectile"
-msgstr ""
+msgstr "летящий снаряд"
 
 #: src/map.cpp
 msgid "The metal bars melt!"
@@ -230370,7 +235765,7 @@ msgstr "Что-то вылезло из %s!"
 
 #: src/map_extras.cpp
 msgid "DANGER!  MINEFIELD!"
-msgstr ""
+msgstr "ОПАСНОСТЬ! МИННОЕ ПОЛЕ!"
 
 #: src/map_field.cpp
 #, c-format
@@ -230421,7 +235816,7 @@ msgstr "Растительный сок липнет к <npcname>!"
 
 #: src/map_field.cpp
 msgid "The sludge is thick and sticky.  You struggle to pull free."
-msgstr ""
+msgstr "Грязь густая и липкая. Вам тяжело выбраться."
 
 #: src/map_field.cpp
 msgid "You burn your legs and feet!"
@@ -230809,12 +236204,12 @@ msgstr "%s нельзя использовать с оружием."
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
-msgstr "%s — неподходящее оружие для %s."
+msgid "The %1$s is not a valid %2$s weapon."
+msgstr "%1$s — неподходящее оружие для %2$s."
 
 #: src/martialarts.cpp
 msgid "Block Counter"
-msgstr ""
+msgstr "Блок и контрудар"
 
 #: src/martialarts.cpp
 msgid "Dodge Counter"
@@ -230826,11 +236221,11 @@ msgstr ""
 
 #: src/martialarts.cpp
 msgid "Defensive"
-msgstr ""
+msgstr "Оборонительный"
 
 #: src/martialarts.cpp
 msgid "Offensive"
-msgstr ""
+msgstr "Наступательный"
 
 #: src/martialarts.cpp
 #, c-format
@@ -230952,6 +236347,7 @@ msgstr "* Будет <info>обезоруживать</info> цель"
 msgid ""
 "* Will <info>disarm</info> the target and <info>take their weapon</info>"
 msgstr ""
+"* Будет <info>обезоруживать</info> цель и <info>возьмёт её оружие</info>"
 
 #: src/martialarts.cpp
 msgid ""
@@ -231118,7 +236514,7 @@ msgstr[3] "Указывая в вашу сторону, %s производит
 #. turn.
 #: src/mattack_actors.cpp src/monattack.cpp
 msgid "You're not sure why you've got a laser dot on you…"
-msgstr ""
+msgstr "Вы не уверены, откуда на вас взялась эта лазерная точка…"
 
 #: src/mattack_actors.cpp src/monattack.cpp
 msgid "The "
@@ -231218,17 +236614,17 @@ msgstr "Вы рубанули воздух."
 
 #: src/melee.cpp
 msgid "<npcname> disarms you and takes your weapon!"
-msgstr ""
+msgstr "<npcname> обезоруживает вас и берёт ваше оружие!"
 
 #: src/melee.cpp
 #, c-format
 msgid "You disarm %s and take their weapon!"
-msgstr ""
+msgstr "Вы обезоруживаете %s и берёте оружие!"
 
 #: src/melee.cpp
 #, c-format
 msgid "<npcname> disarms %s and takes their weapon!"
-msgstr ""
+msgstr "<npcname> обезоруживает %s и берёт оружие!"
 
 #: src/melee.cpp
 msgid "<npcname> disarms you!"
@@ -231253,11 +236649,6 @@ msgstr[1] "попадание по %d врагам!"
 msgstr[2] "попадание по %d врагам!"
 msgstr[3] "попадание по %d врагу!"
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr "Вы выучили %s путём интенсивных тренировок с бионикой ближнего боя."
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -231300,7 +236691,7 @@ msgstr "<npcname> блокирует %1$s полученного урона с 
 
 #: src/melee.cpp src/player.cpp
 msgid "You try to counterattack but you are too exhausted!"
-msgstr ""
+msgstr "Вы пытаетесь контратаковать, но вы слишком измотаны!"
 
 #: src/melee.cpp
 #, c-format
@@ -231584,7 +236975,7 @@ msgstr "%s. Критический урон!"
 #: src/melee.cpp
 #, c-format
 msgid "%s for %d damage.  Critical!"
-msgstr ""
+msgstr "%s, нанеся урон %d. Критическое попадание!"
 
 #. ~ NPC hits something
 #: src/melee.cpp
@@ -232935,6 +238326,11 @@ msgid ""
 "  :you pick up: 1\n"
 "  crash!\n"
 msgstr ""
+"Синтаксис: [[TYPE]:]TEXT. Возможные значения TYPE: %s\n"
+"Примеры:\n"
+"  good:мутация\n"
+"  :Вы подняли: 1\n"
+"  хрясь!\n"
 
 #. ~ the 2nd %s is a type name, this is used to format a list of type names
 #: src/messages.cpp
@@ -232983,6 +238379,11 @@ msgid ""
 "\n"
 "Assigning one of your allies to patrol the surrounding wilderness and isolated buildings presents the opportunity to build survival skills while engaging in relatively safe combat against isolated creatures."
 msgstr ""
+"Прибыль: $25-$500\n"
+"Опасность: низкая\n"
+"Время: 10-часовые задания\n"
+" \n"
+"Назначение одного из ваших компаньонов патрулировать окружающую дикую местность и отдельные здания, представляет возможность поднять навыки выживания, участвуя в относительно безопасном бою против отдельных созданий."
 
 #: src/mission_companion.cpp
 msgid "Assign Scavenging Patrol"
@@ -232996,10 +238397,15 @@ msgid ""
 "\n"
 "Patrol Roster:\n"
 msgstr ""
+"Прибыль: $25-$500\n"
+"Опасность: низкая\n"
+"Время: 10-часовые задания\n"
+" \n"
+"Перечень патрулей:\n"
 
 #: src/mission_companion.cpp
 msgid " hours]\n"
-msgstr ""
+msgstr " часов] \n"
 
 #: src/mission_companion.cpp
 msgid "Retrieve Scavenging Patrol"
@@ -233013,6 +238419,11 @@ msgid ""
 "\n"
 "Scavenging raids target formerly populated areas to loot as many valuable items as possible before being surrounded by the undead.  Combat is to be expected and assistance from the rest of the party can't be guaranteed.  The rewards are greater and there is a chance of the companion bringing back items."
 msgstr ""
+"Прибыль: $200-$1000\n"
+"Опасность: средняя\n"
+"Время: 10-часовые задания\n"
+" \n"
+"Целью рейдов по добыче являются ранее населённые территории, для добычи как можно больше ценных вещей, прежде чем быть окружёнными зомби. Бой ожидается, помощь со стороны остальной части группы не гарантируется. Вознаграждение больше и есть шанс компаньону вернуть вещи назад."
 
 #: src/mission_companion.cpp
 msgid "Assign Scavenging Raid"
@@ -233026,6 +238437,11 @@ msgid ""
 "\n"
 "Raid Roster:\n"
 msgstr ""
+"Прибыль: $200-$1000\n"
+"Опасность: средняя\n"
+"Время: 10-часовые задания\n"
+" \n"
+"Перечень рейдов:\n"
 
 #: src/mission_companion.cpp
 msgid "Retrieve Scavenging Raid"
@@ -233045,6 +238461,13 @@ msgid ""
 "\n"
 "Labor Roster:\n"
 msgstr ""
+"Прибыль: $8/час\n"
+"Опасность: минимальная\n"
+"Время: 1 час минимум\n"
+" \n"
+"Назначение одного из ваших спутников на черновую работу — безопасный способ обучить их базовым навыкам и завоевать репутацию в поселении. Однако большой награды не ждите.\n"
+"\n"
+"Список работников:\n"
 
 #: src/mission_companion.cpp
 msgid "Recover Ally from Menial Labor"
@@ -233058,6 +238481,11 @@ msgid ""
 "\n"
 "Carpentry work requires more skill than menial labor while offering modestly improved pay.  It is unlikely that your companions will face combat but there are hazards working on makeshift buildings."
 msgstr ""
+"Прибыль: $12/час\n"
+"Опасность: минимальная\n"
+"Время: 1 час минимум\n"
+" \n"
+"Плотничья работа требует больше навыков, чем черновая работа, оплата немного увеличивается. Маловероятно, что вашим компаньонам придётся вступить в бой, но существует опасность во время работы в самодельных строениях."
 
 #: src/mission_companion.cpp
 msgid "Assign Ally to Carpentry Work"
@@ -233071,6 +238499,11 @@ msgid ""
 "\n"
 "Labor Roster:\n"
 msgstr ""
+"Прибыль: $12/час\n"
+"Опасность: минимальная\n"
+"Время: 1 час минимум\n"
+" \n"
+"Перечень работ:\n"
 
 #: src/mission_companion.cpp
 msgid "Recover Ally from Carpentry Work"
@@ -233093,6 +238526,20 @@ msgid ""
 "\n"
 "We're willing to let you purchase a field at a substantial discount to use for your own agricultural enterprises.  We'll plow it for you so you know exactly what is yours… after you have a field you can hire workers to plant or harvest crops for you.  If the crop is something we have a demand for, we'll be willing to liquidate it."
 msgstr ""
+"Стоимость: $1000\n"
+"\n"
+"\n"
+".........\n"
+".........\n"
+".........\n"
+".........\n"
+".........\n"
+".........\n"
+"..#....**\n"
+"..#Ov..**\n"
+"...O|....\n"
+"\n"
+"Мы готовы продать вам поле со значительной скидкой для использования в ваших собственных сельскохозяйственных целях. Мы вспашем его для вас, чтобы точно указать границы участка. После покупки вы можете нанять рабочих для посадки растений или уборки урожая. Мы готовы купить ваш урожай, если будем заинтересованы."
 
 #: src/mission_companion.cpp
 msgid "Purchase East Field"
@@ -233115,6 +238562,20 @@ msgid ""
 "\n"
 "Protecting your field with a sturdy picket fence will keep most wildlife from nibbling your crops apart.  You can expect yields to increase."
 msgstr ""
+"Стоимость: $5500\n"
+" \n"
+"\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              ..#....**\n"
+"              ..#Ov..**\n"
+"              ...O|....\n"
+" \n"
+"Защита вашего поля крепким забором помешает диким животным поедать ваши посевы. Вы можете рассчитывать на рост урожая."
 
 #: src/mission_companion.cpp
 msgid "Upgrade East Field I"
@@ -233137,6 +238598,20 @@ msgid ""
 "\n"
 "We'll plant the field with your choice of crop if you are willing to finance it.  When the crop is ready to harvest you can have us liquidate it or harvest it for you."
 msgstr ""
+"Стоимость: $3.00/участок\n"
+" \n"
+"\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              ..#....**\n"
+"              ..#Ov..**\n"
+"              ...O|....\n"
+" \n"
+"Мы засеваем поле растениями на ваш выбор, если вы готовы заплатить. Когда настанет пора убирать урожай, мы можем купить его или собрать для вас."
 
 #: src/mission_companion.cpp
 msgid "Plant East Field"
@@ -233159,6 +238634,20 @@ msgid ""
 "\n"
 "You can either have us liquidate the crop and give you the cash or pay us to harvest it for you."
 msgstr ""
+"Стоимость: $2.00/участок\n"
+" \n"
+"\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              .........\n"
+"              ..#....**\n"
+"              ..#Ov..**\n"
+"              ...O|....\n"
+" \n"
+"Вы можете связаться с нами, чтобы продать урожай и выплатить вам наличные или заплатить нам, чтобы убрать его для вас."
 
 #: src/mission_companion.cpp
 msgid "Harvest East Field"
@@ -233172,6 +238661,11 @@ msgid ""
 "\n"
 "Foraging for food involves dispatching a companion to search the surrounding wilderness for wild edibles.  Combat will be avoided but encounters with wild animals are to be expected.  The low pay is supplemented with the odd item as a reward for particularly large hauls."
 msgstr ""
+"Прибыль: $10/час\n"
+"Опасность: низкая\n"
+"Время: 4 часа минимум\n"
+" \n"
+"Добыча продовольствия включает в себя отправление компаньона на поиски еды в окружающую пустошь. Боя можно избежать, но могут встретиться дикие звери. Низкая оплата дополняется редкими предметами в качестве вознаграждения за особо крупную добычу."
 
 #: src/mission_companion.cpp
 msgid "Assign Ally to Forage for Food"
@@ -233185,6 +238679,11 @@ msgid ""
 "\n"
 "Labor Roster:\n"
 msgstr ""
+"Прибыль: $10/час\n"
+"Опасность: низкая\n"
+"Время: 4 часа минимум\n"
+" \n"
+"Перечень работ:\n"
 
 #: src/mission_companion.cpp
 msgid "Recover Ally from Foraging"
@@ -233200,6 +238699,13 @@ msgid ""
 "\n"
 "The commune is sending food to the Free Merchants in the Refugee Center as part of a tax and in exchange for skilled labor."
 msgstr ""
+"Прибыль: $18/час\n"
+"Опасность: высокая\n"
+"Время: неизвестно\n"
+" \n"
+"Добавление компаньонов к каравану увеличивает вероятность успеха. По своей природе, караваны — чрезвычайно привлекательные цели для налётчиков или враждебных групп, поэтому рекомендуется только сильная группа. Вознаграждение значительней для тех, кто в нём участвует, но ещё более важное для фракций их прибыль.\n"
+" \n"
+"Коммуна отправляет продовольствие Свободным торговцам в центр беженцев, как часть налога и в обмен на квалифицированную работу."
 
 #: src/mission_companion.cpp
 msgid "Caravan Commune-Refugee Center"
@@ -233214,18 +238720,23 @@ msgid ""
 "\n"
 "Roster:\n"
 msgstr ""
+"Прибыль: $18/час\n"
+"Опасность: высокая\n"
+"Время: НЕИЗВЕСТНО\n"
+" \n"
+"Перечень:\n"
 
 #: src/mission_companion.cpp
 msgid " [READY]\n"
-msgstr ""
+msgstr " [ГОТОВО] \n"
 
 #: src/mission_companion.cpp
 msgid " [COMPLETE]\n"
-msgstr ""
+msgstr " [ВЫПОЛНЕНО] \n"
 
 #: src/mission_companion.cpp
 msgid " Hours]\n"
-msgstr ""
+msgstr " Часов] \n"
 
 #: src/mission_companion.cpp
 msgid ""
@@ -233233,6 +238744,9 @@ msgid ""
 "\n"
 "The caravan will contain two or three additional members from the commune, are you ready to depart?"
 msgstr ""
+"\n"
+" \n"
+"В состав каравана войдут два или три дополнительных члена коммуны. Вы готовы отбывать?"
 
 #: src/mission_companion.cpp
 msgid "Begin Commune-Refugee Center Run"
@@ -233244,36 +238758,36 @@ msgstr "Восстановить центр Коммуны беженцев"
 
 #: src/mission_companion.cpp
 msgid "There are no missions at this colony.  Press Spacebar…"
-msgstr ""
+msgstr "В этом поселении нет заданий. Нажмите пробел…"
 
 #: src/mission_companion.cpp
 msgid "joins the caravan team…"
-msgstr ""
+msgstr "присоединяется к каравану…"
 
 #: src/mission_companion.cpp
 msgid "departs on the scavenging patrol…"
-msgstr ""
+msgstr "уходит в патруль по добыче…"
 
 #: src/mission_companion.cpp
 msgid "departs on the scavenging raid…"
-msgstr ""
+msgstr "уходит в рейд по добыче…"
 
 #: src/mission_companion.cpp
 msgid "departs to work as a laborer…"
-msgstr ""
+msgstr "уходит работать разнорабочим…"
 
 #: src/mission_companion.cpp
 msgid "departs to work as a carpenter…"
-msgstr ""
+msgstr "уходит работать плотником…"
 
 #: src/mission_companion.cpp
 msgid "departs to forage for food…"
-msgstr ""
+msgstr "уходит собирать еду…"
 
 #: src/mission_companion.cpp
 #, c-format
 msgid "The caravan departs with an estimated total travel time of %d hours…"
-msgstr ""
+msgstr "Караван выходит в путь. Ожидаемое время похода — %d часов…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233300,6 +238814,8 @@ msgstr "Караван вернулся. Ваша доля от полученн
 #: src/mission_companion.cpp
 msgid "The caravan was a disaster and your companions never made it home…"
 msgstr ""
+"Поход каравана обернулся катастрофой, а ваши компаньоны не сумели вернуться "
+"домой…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233330,6 +238846,8 @@ msgid ""
 "After counting your money %s directs a nearby laborer to begin constructing "
 "a fence around your plot…"
 msgstr ""
+"Посчитав ваши деньги, %s даёт указание ближайшему рабочему начать возведение"
+" ограды вокруг вашего участка…"
 
 #: src/mission_companion.cpp
 msgid "You have no seeds to plant!"
@@ -233337,11 +238855,11 @@ msgstr "У вас нет семян для посадки!"
 
 #: src/mission_companion.cpp
 msgid "You have no room to plant seeds…"
-msgstr ""
+msgstr "У вас нет места, куда можно посадить семена…"
 
 #: src/mission_companion.cpp
 msgid "I'm sorry, you don't have enough money to plant those seeds…"
-msgstr ""
+msgstr "Мне жаль, но у вас недостаточно денег, чтобы посадить эти семена…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233359,7 +238877,7 @@ msgstr ""
 
 #: src/mission_companion.cpp
 msgid "There aren't any plants that are ready to harvest…"
-msgstr ""
+msgstr "Здесь нет растений, с которых можно собрать урожай…"
 
 #: src/mission_companion.cpp
 msgid "Which plants do you want to have harvested?"
@@ -233367,13 +238885,15 @@ msgstr "С каких растений вы хотите собрать урож
 
 #: src/mission_companion.cpp
 msgid "You decided to hold off for now…"
-msgstr ""
+msgstr "Вы решили отказаться, пока…"
 
 #: src/mission_companion.cpp
 msgid ""
 "You don't have enough to pay the workers to harvest the crop so you are "
 "forced to sell…"
 msgstr ""
+"У вас недостаточно денег, чтобы заплатить рабочим за сбор урожая, поэтому "
+"вам приходится расплачиваться…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233383,12 +238903,12 @@ msgstr "Вы хотите продать урожай %d %s, получив пр
 #: src/mission_companion.cpp
 #, c-format
 msgid "The %s are sold for $%d…"
-msgstr ""
+msgstr "%s продано за $%d…"
 
 #: src/mission_companion.cpp
 #, c-format
 msgid "You receive %d %s…"
-msgstr ""
+msgstr "Вы получаете %d %s…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233396,6 +238916,8 @@ msgid ""
 "While scavenging, %s's party suddenly found itself set upon by a large mob "
 "of undead…"
 msgstr ""
+"Пока искали добычу, группа %s внезапно обнаружила себя окружённой "
+"многочисленной толпой нежити…"
 
 #: src/mission_companion.cpp
 msgid "Through quick thinking the group was able to evade combat!"
@@ -233404,6 +238926,8 @@ msgstr "Благодаря быстрому принятию решения гр
 #: src/mission_companion.cpp
 msgid "Combat took place in close quarters, focusing on melee skills…"
 msgstr ""
+"Бой произошёл на близких дистанциях, поэтому на первое место вышли навыки "
+"ближнего боя…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233412,12 +238936,12 @@ msgstr "Посредством грубой силы группа разбила
 
 #: src/mission_companion.cpp
 msgid "Unfortunately they were overpowered by the undead…  I'm sorry."
-msgstr ""
+msgstr "К несчастью, нежить задавила их числом… Мне жаль."
 
 #: src/mission_companion.cpp
 #, c-format
 msgid "%s returns from patrol having earned $%d and a fair bit of experience…"
-msgstr ""
+msgstr "%s возвращается из патруля, зарабатывая $%d и немного опыта…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233439,7 +238963,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%s returns from the raid having earned $%d and a fair bit of experience…"
-msgstr ""
+msgstr "%s возвращается из рейда, зарабатывая $%d и немного опыта…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233452,6 +238976,7 @@ msgid ""
 "%s returns from working as a laborer having earned $%d and a bit of "
 "experience…"
 msgstr ""
+"%s возвращается с работы простого рабочего, зарабатывая $%d и немного опыта…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233465,7 +238990,7 @@ msgstr ""
 #: src/mission_companion.cpp
 #, c-format
 msgid "While %s was framing a building one of the walls began to collapse…"
-msgstr ""
+msgstr "Во время строительства на %s обрушилась одна из стен…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233480,7 +239005,7 @@ msgstr "Пулей вылетев из окна, %s умудряется изб
 #: src/mission_companion.cpp
 #, c-format
 msgid "%s didn't make it out in time…"
-msgstr ""
+msgstr "%s не сделал это вовремя…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233490,7 +239015,7 @@ msgstr ""
 
 #: src/mission_companion.cpp
 msgid "Everyone who was trapped under the collapsing roof died…"
-msgstr ""
+msgstr "Все, кто попали под обрушившуюся крышу, погибли…"
 
 #: src/mission_companion.cpp
 msgid "I'm sorry, there is nothing we could do."
@@ -233502,11 +239027,12 @@ msgid ""
 "%s returns from working as a carpenter having earned $%d and a bit of "
 "experience…"
 msgstr ""
+"%s возвращается с работы по плотничеству, зарабатывая $%d и немного опыта…"
 
 #: src/mission_companion.cpp
 #, c-format
 msgid "While foraging, a beast began to stalk %s…"
-msgstr ""
+msgstr "Пока %s добывал продовольствие, его начал преследовать зверь…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233541,10 +239067,12 @@ msgid ""
 "%s was able to hold off the first wolf but the others that were skulking in "
 "the tree line caught up…"
 msgstr ""
+"%s смог удержать первого волка, но другие, которые находились в лесополосе, "
+"достали…"
 
 #: src/mission_companion.cpp
 msgid "I'm sorry, there wasn't anything we could do…"
-msgstr ""
+msgstr "Мне жаль, мы ничего не могли поделать…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233552,6 +239080,8 @@ msgid ""
 "We… we don't know what exactly happened but we found %s's gear ripped and "
 "bloody…"
 msgstr ""
+"Мы… мы не знаем что точно произошло, но мы нашли окровавленные и разорванные"
+" вещи %s…"
 
 #: src/mission_companion.cpp
 msgid "I fear your companion won't be returning."
@@ -233563,6 +239093,8 @@ msgid ""
 "%s returns from working as a forager having earned $%d and a bit of "
 "experience…"
 msgstr ""
+"%s возвращается с работы по добыче продовольствия, зарабатывая $%d и немного"
+" опыта…"
 
 #: src/mission_companion.cpp
 #, c-format
@@ -233594,26 +239126,50 @@ msgstr "Обязательство между %d членами %s %s и %d чл
 
 #: src/mission_companion.cpp
 msgid "You don't have any companions to send out…"
-msgstr ""
+msgstr "У вас нет компаньонов, которых вы могли бы отослать…"
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
-msgstr ""
-"Кого вы хотите послать?                    [ БОЙ : ВЫЖИВАНИЕ : ПРОИЗВОДСТВО "
-"]"
+msgid "Who do you want to send?"
+msgstr "Кого вы хотите послать?"
 
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
 msgstr ""
 
+#. ~ %1$s: npc name
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
-msgstr "Компаньон, которого вы выбрали, не обладает необходимыми навыками!"
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
+msgstr "%1$s (Защищается)"
+
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr "%s [ %4d : %4d : %4d ]"
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr "%1$s %2$d"
+
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
+msgstr "%1$s %2$d/%3$d"
+
+#: src/mission_companion.cpp
+msgid "You choose to send no one…"
+msgstr "Вы решаете никого не отсылать…"
 
 #: src/mission_companion.cpp
 msgid "You don't have any companions ready to return…"
-msgstr ""
+msgstr "У вас нет компаньонов, готовых вернуться…"
 
 #: src/mission_companion.cpp
 msgid "Who should return?"
@@ -233621,7 +239177,7 @@ msgstr "Кто должен вернуться?"
 
 #: src/mission_companion.cpp
 msgid "No one returns to your party…"
-msgstr ""
+msgstr "Никто не возвращается в вашу команду…"
 
 #: src/mission_end.cpp
 #, c-format
@@ -233653,16 +239209,17 @@ msgstr "Скачать программу"
 
 #: src/mission_start.cpp
 msgid "You don't know where the address could be…"
-msgstr ""
+msgstr "Вы не знаете, где находится этот адрес…"
 
 #: src/mission_start.cpp
 msgid "You mark the refugee center and the road that leads to it…"
-msgstr ""
+msgstr "Вы отмечаете центр для беженцев и дорогу к нему…"
 
 #: src/mission_start.cpp
 msgid ""
 "You mark the refugee center, but you have no idea how to get there by road…"
 msgstr ""
+"Вы отмечаете центр для беженцев, но понятия не имеете, как туда добраться…"
 
 #: src/mission_start.cpp
 msgid "Workstation"
@@ -233739,7 +239296,7 @@ msgstr "У вас нет проваленных заданий!"
 #: src/mission_util.cpp
 #, c-format
 msgid "%s also marks the road that leads to it…"
-msgstr ""
+msgstr "%s также отмечает дорогу, которая ведёт к нему…"
 
 #: src/mission_util.cpp
 #, c-format
@@ -234189,7 +239746,7 @@ msgstr "%s пульсирует, и наружу вырывается свежи
 #: src/monattack.cpp
 #, c-format
 msgid "The %s seems to wave you toward the tower…"
-msgstr ""
+msgstr "Вам кажется, будто %s машет в сторону башни…"
 
 #: src/monattack.cpp
 #, c-format
@@ -234204,7 +239761,7 @@ msgstr "%1$s втыкает свой щуп вам в %2$s!"
 
 #: src/monattack.cpp
 msgid "You feel thousands of live spores pumping into you…"
-msgstr ""
+msgstr "Вы чувствуете, как тысячи живых спор вливаются в вас…"
 
 #. ~ 1$s is monster name, 2$s bodypart in accusative
 #: src/monattack.cpp
@@ -234241,7 +239798,7 @@ msgstr "Вас оттолкнула выросшая грибная стена!"
 #: src/monattack.cpp
 #, c-format
 msgid "The %s spreads its tendrils.  It seems as though it's expecting you…"
-msgstr ""
+msgstr "%s расстилает свои усики. Такое ощущение, будто она ждёт вас…"
 
 #: src/monattack.cpp
 msgid ""
@@ -234254,7 +239811,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The %s works several tendrils into your arms, legs, torso, and even neck…"
-msgstr ""
+msgstr "%s втыкает несколько усиков вам в руки, ноги, торс и даже шею…"
 
 #: src/monattack.cpp
 msgid ""
@@ -234279,6 +239836,8 @@ msgid ""
 "assistance, on an arduous quest.  unity.  together we have reached the door."
 "  now to pass through…"
 msgstr ""
+"помощь, в трудном задании. единство. вместе мы дошли до двери. время войти "
+"внутрь…"
 
 #: src/monattack.cpp
 msgid "You're shoved away as a fungal hedgerow grows!"
@@ -234301,7 +239860,7 @@ msgstr "%s прицеливается и протыкает вас огромн
 
 #: src/monattack.cpp
 msgid "You feel millions of live spores pumping into you…"
-msgstr ""
+msgstr "Вы чувствуете, как миллионы живых спор вливаются в вас…"
 
 #: src/monattack.cpp
 #, c-format
@@ -234461,7 +240020,7 @@ msgstr "Вас пытается схватить %s, но вы отшвырив
 #: src/monattack.cpp
 #, c-format
 msgid "The %s tries to grab you…"
-msgstr ""
+msgstr "%s пытается вас схватить…"
 
 #: src/monattack.cpp
 #, c-format
@@ -234516,7 +240075,7 @@ msgstr "%s молодой триффид подрос и стал взросло
 
 #: src/monattack.cpp
 msgid "You feel a strange reverberation accross your body."
-msgstr ""
+msgstr "Вы чувствуете странную дрожь по всему телу."
 
 #: src/monattack.cpp
 #, c-format
@@ -234616,11 +240175,11 @@ msgstr ""
 
 #: src/monattack.cpp
 msgid "Probably some now-obsolete Internal Affairs subroutine…"
-msgstr ""
+msgstr "Вероятно, некая теперь устаревшая подпрограмма Внутренних дел…"
 
 #: src/monattack.cpp
 msgid "Ops used to do that in case you needed backup…"
-msgstr ""
+msgstr "Это на всякий случай, если вам потребуется поддержка…"
 
 #: src/monattack.cpp
 #, c-format
@@ -234656,7 +240215,7 @@ msgstr "%s делает ваш фотоснимок!"
 
 #: src/monattack.cpp
 msgid "…database connection lost!"
-msgstr ""
+msgstr "…потеряна связь с базой данных!"
 
 #: src/monattack.cpp
 #, c-format
@@ -234716,7 +240275,7 @@ msgstr "Да на мне око диавола!"
 #. ~ Potential grenading detected.
 #: src/monattack.cpp
 msgid "Those laser dots don't seem very friendly…"
-msgstr ""
+msgstr "Эти лазерные точки не выглядят очень дружелюбными…"
 
 #: src/monattack.cpp
 msgid "Targeting."
@@ -234764,23 +240323,23 @@ msgstr "полицейская сирена, вуп-вуп-ВУП"
 
 #: src/monattack.cpp
 msgid "\"YOU… ARE FILTH…\""
-msgstr ""
+msgstr "«ТЫ… МЕРЗКИЙ…»"
 
 #: src/monattack.cpp
 msgid "\"VERMIN… YOU ARE VERMIN…\""
-msgstr ""
+msgstr "«ЧЕРВЯК… ТЫ ЧЕРВЯК…»"
 
 #: src/monattack.cpp
 msgid "\"LEAVE NOW…\""
-msgstr ""
+msgstr "«ПРОВАЛИВАЙ…»"
 
 #: src/monattack.cpp
 msgid "\"WE… WILL FEAST… UPON YOU…\""
-msgstr ""
+msgstr "«МЫ… ПОЛАКОМИМСЯ… ТОБОЙ…»"
 
 #: src/monattack.cpp
 msgid "\"FOUL INTERLOPER…\""
-msgstr ""
+msgstr "«ГЛУПЫЙ ЧЕЛОВЕЧИШКА…»"
 
 #. ~ %1$s is the name of the zombie upgrading the other, %2$s is the zombie
 #. being upgraded.
@@ -234981,12 +240540,12 @@ msgstr ""
 #: src/monattack.cpp
 #, c-format
 msgid "The %s slashes at your neck!  You duck!"
-msgstr ""
+msgstr "%s режет вашу шею!  Вы пригибаетесь!"
 
 #: src/monattack.cpp
 #, c-format
 msgid "The %s slashes at <npcname>'s neck!  They duck!"
-msgstr ""
+msgstr "%s режет шею <npcname>!  Он пригибается!"
 
 #: src/monattack.cpp
 #, c-format
@@ -235087,7 +240646,7 @@ msgstr "но вы хватаете его за руку и перекидыва
 
 #: src/monattack.cpp
 msgid "The flip does shock you…"
-msgstr ""
+msgstr "Бросок бьёт вас током…"
 
 #: src/monattack.cpp
 msgid "but you deftly spin out of its grasp!"
@@ -235097,6 +240656,8 @@ msgstr "но вы ловко вырываетесь из хватки!"
 msgid ""
 "Halt and submit to arrest, citizen!  The police will be here any moment."
 msgstr ""
+"Остановитесь и подчинитесь аресту, гражданин! Полиция прибудет в любой "
+"момент."
 
 #: src/monattack.cpp
 msgid "Please stay in place, citizen, do not make any movements!"
@@ -235242,7 +240803,7 @@ msgstr "%1$s швыряет %2$s на землю!"
 #: src/monattack.cpp
 #, c-format
 msgid "The zombie kicks your %1$s for %2$d damage…"
-msgstr ""
+msgstr "Зомби ударил ваш %1$s и нанёс %2$d урона…"
 
 #: src/monattack.cpp
 #, c-format
@@ -235346,6 +240907,11 @@ msgstr "Рука существа (%1$s) попадает в ваш %2$s, но 
 msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr "%1$s попадает в %2$s (<npcname>), но соскальзывает по броне!"
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr ""
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -235457,7 +241023,7 @@ msgstr "%s тает!"
 
 #: src/mondeath.cpp
 msgid "Your obsession with the fault fades away…"
-msgstr ""
+msgstr "Ваше чувство вины проходит…"
 
 #: src/mondeath.cpp
 msgid "As the final light is destroyed, it erupts in a blinding flare!"
@@ -235549,11 +241115,6 @@ msgstr "Брызги кислоты разлетаются по округе п
 msgid "zombie slave"
 msgstr "зомби-раб"
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr "Что сделать с %s?"
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -235737,24 +241298,26 @@ msgid ""
 "Welcome to the %s Friendship Interface.  What would you like to do?\n"
 "Your current friendship will last: %s"
 msgstr ""
+"Добро пожаловать в Интерфейс Дружбы %s. Что вы хотите сделать?\n"
+"Ваша текущая дружба продлится: %s"
 
 #: src/monexamine.cpp
 msgid "Get more friendship.  10 cents/min"
-msgstr ""
+msgstr "Получить больше дружбы. 10 центов/мин"
 
 #: src/monexamine.cpp
 msgid ""
 "Sadly you're not currently able to extend your friendship.  - Quit menu"
-msgstr ""
+msgstr "К сожалению, сейчас вы не можете продлить дружбу. — Выйти из меню"
 
 #: src/monexamine.cpp
 #, c-format
 msgid "How much friendship do you get?  Max: %d minute.  (0 to cancel)"
 msgid_plural "How much friendship do you get?  Max: %d minutes."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Сколько дружбы вы хотите? Макс.: %d минуту."
+msgstr[1] "Сколько дружбы вы хотите? Макс.: %d минуты."
+msgstr[2] "Сколько дружбы вы хотите? Макс.: %d минут."
+msgstr[3] "Сколько дружбы вы хотите? Макс.: %d минуты."
 
 #: src/monexamine.cpp
 #, c-format
@@ -235811,7 +241374,7 @@ msgstr "Нет контейнера на %s, чтобы убрать!"
 #: src/monexamine.cpp
 #, c-format
 msgid "%1$s is overburdened.  You can't transfer your %2$s."
-msgstr ""
+msgstr "%1$s перегружен. Вы не можете перенести %2$s."
 
 #: src/monexamine.cpp
 #, c-format
@@ -235962,22 +241525,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr "%1$s отталкивает транспорт (%2$s) с дороги!"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr "крохотное"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr "небольшое"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr "среднее"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr "большое"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr "огромное"
 
@@ -236042,6 +241610,16 @@ msgstr "плотная желеобразная масса"
 msgid "wearing %1$s"
 msgstr "надето: %1$s"
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr "%s"
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr "%s"
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -236084,6 +241662,11 @@ msgstr "Знает о вашем присутствии!"
 msgid "Rider: %s"
 msgstr "Наездник: %s"
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr " Это %s."
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr "Сложность "
@@ -236315,7 +241898,7 @@ msgstr "Вы отравлены!"
 
 #: src/monster.cpp
 msgid "You feel venom flood your body, wracking you with pain…"
-msgstr ""
+msgstr "Вы чувствуете, как яд течёт по вашему телу, наполняя вас болью…"
 
 #: src/monster.cpp
 msgid "You feel venom enter your body!"
@@ -236454,11 +242037,11 @@ msgstr "Общая мораль:"
 
 #: src/morale.cpp
 msgid "Pain level:"
-msgstr ""
+msgstr "Уровень боли:"
 
 #: src/morale.cpp
 msgid "Fatigue level:"
-msgstr ""
+msgstr "Уровень усталости:"
 
 #: src/morale.cpp
 msgid "Focus trends towards:"
@@ -236542,6 +242125,7 @@ msgstr ""
 #: src/mutation.cpp
 msgid "wow!  you look just like me!  we should look out for each other!"
 msgstr ""
+"ух ты! ты выглядишь прямо как я! мы должны держаться ближе друг к другу!"
 
 #. ~ Usual enthusiastic slimespring small voices! :D
 #: src/mutation.cpp
@@ -236579,6 +242163,7 @@ msgstr "Хранилище бионической энергии увеличе
 #: src/mutation.cpp
 msgid "You feel something straining deep inside you, yearning to be free…"
 msgstr ""
+"Вы чувствуете, как что-то напряглось внутри вас, стремясь освободиться…"
 
 #: src/mutation.cpp
 #, c-format
@@ -236712,7 +242297,7 @@ msgstr "Испытала отравление марло/мутагеном."
 
 #: src/mutation.cpp
 msgid "Something strains mightily for a moment… and then… you're… FREE!"
-msgstr ""
+msgstr "Что-то сильно напряглось на мгновение… и затем… вы… ОСВОБОДИЛИСЬ!"
 
 #: src/mutation.cpp
 msgid "Your appetite for blood fades."
@@ -236731,6 +242316,7 @@ msgstr "Вас зашатало из-за пронзительной голов
 #: src/mutation.cpp
 msgid "Your head throbs with memories of your life, before all this…"
 msgstr ""
+"Ваша голова раскалывается от воспоминаний из вашей жизни, до всего этого…"
 
 #: src/mutation.cpp
 msgid "Images of your past life flash before you."
@@ -236747,7 +242333,7 @@ msgid "Crossed a threshold"
 msgstr "Пересекла порог"
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
+msgid "Oh, yeah!  That's the stuff!"
 msgstr "О, да! Это то, что было нужно!"
 
 #: src/mutation_ui.cpp
@@ -236839,6 +242425,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Неверная буква мутации. Только эти символы действуют:\n"
+"\n"
+"%s"
 
 #: src/mutation_ui.cpp
 #, c-format
@@ -236899,7 +242488,7 @@ msgstr "Свободный режим"
 #: src/newcharacter.cpp src/player.cpp
 #, c-format
 msgid "Select a style.  (press %s for more info)"
-msgstr ""
+msgstr "Выберите стиль. (нажмите %s для получения дополнительной информации)"
 
 #: src/newcharacter.cpp
 msgid "Use this style?"
@@ -237359,6 +242948,8 @@ msgstr[3] "Сценарий «%1$s» стоит %2$d очко"
 msgid ""
 "This scenario is not available in this world due to city size settings."
 msgstr ""
+"Этот сценарий недоступен в этом мире из-за выбранной настройки размера "
+"городов."
 
 #: src/newcharacter.cpp
 msgid "Professions:"
@@ -237531,7 +243122,7 @@ msgstr "_______ИМЯ НЕ ВВЕДЕНО!_______"
 
 #: src/newcharacter.cpp
 msgid "Are you SURE you're finished?  Your name will be randomly generated."
-msgstr ""
+msgstr "Вы УВЕРЕНЫ, что закончили? Ваше имя будет сгенерировано случайно."
 
 #: src/newcharacter.cpp src/worldfactory.cpp
 msgid "Are you SURE you're finished?"
@@ -237570,7 +243161,7 @@ msgstr "%1$s, %2$s"
 #: src/npc.cpp
 #, c-format
 msgid "This %s is not good reading material."
-msgstr "%s - плохое чтиво."
+msgstr "%s — плохое чтиво."
 
 #: src/npc.cpp
 msgid "I'm not smart enough to read this book."
@@ -237782,7 +243373,7 @@ msgstr "Злость: "
 msgid "%s disappears."
 msgstr "%s исчезает."
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "%s погибает!"
@@ -237833,51 +243424,51 @@ msgstr "Унаследованное отношение NPC"
 
 #: src/npc.cpp
 msgid "Cooking and butchering"
-msgstr ""
+msgstr "Готовка и разделка"
 
 #: src/npc.cpp
 msgid "Tidying and cleaning"
-msgstr ""
+msgstr "Уборка и чистка"
 
 #: src/npc.cpp
 msgid "Vehicle work"
-msgstr ""
+msgstr "Работа с транспортом"
 
 #: src/npc.cpp
 msgid "Building"
-msgstr ""
+msgstr "Строительство"
 
 #: src/npc.cpp
 msgid "Crafting"
-msgstr ""
+msgstr "Крафт"
 
 #: src/npc.cpp
 msgid "Guarding and patrolling"
-msgstr ""
+msgstr "Охрана и патрулирование"
 
 #: src/npc.cpp
 msgid "Working the fields"
-msgstr ""
+msgstr "Работа в поле"
 
 #: src/npc.cpp
 msgid "Chopping wood"
-msgstr ""
+msgstr "Рубка леса"
 
 #: src/npc.cpp
 msgid "Caring for the livestock"
-msgstr ""
+msgstr "Уход за скотиной"
 
 #: src/npc.cpp
 msgid "Hunting and fishing"
-msgstr ""
+msgstr "Охота и рыбалка"
 
 #: src/npc.cpp
 msgid "Gathering edibles"
-msgstr ""
+msgstr "Добыча пропитания"
 
 #: src/npc.cpp
 msgid "Unknown job"
-msgstr ""
+msgstr "Неизвестная работа"
 
 #: src/npc.cpp
 msgid "Is trying to kill you."
@@ -237976,7 +243567,7 @@ msgstr "Держись %s, иду на помощь."
 
 #: src/npcmove.cpp
 msgid "Don't move a <swear> muscle…"
-msgstr ""
+msgstr "Не двигай, <swear>, ни одним мускулом…"
 
 #: src/npcmove.cpp
 #, c-format
@@ -238078,7 +243669,7 @@ msgstr "%1$s забирает ваш %2$s."
 #, c-format
 msgid ""
 "From your two-way radio you hear %s reporting in, 'I've arrived, boss!'"
-msgstr "Из рации слышно голос %s: \"Я на месте, босс!\""
+msgstr "Из рации слышно голос %s: «Я на месте, босс!»"
 
 #: src/npcmove.cpp
 #, c-format
@@ -238088,7 +243679,7 @@ msgstr "%s %s<punc>"
 #: src/npcmove.cpp
 #, c-format
 msgid "My %s wound is infected…"
-msgstr ""
+msgstr "Рана у меня на %s заражена…"
 
 #: src/npcmove.cpp
 #, c-format
@@ -238101,7 +243692,7 @@ msgstr "<yawn>"
 
 #: src/npcmove.cpp
 msgid "I'm suffering from radiation sickness…"
-msgstr ""
+msgstr "Я страдаю от радиационного отравления…"
 
 #: src/npcmove.cpp
 msgid "<hungry>"
@@ -238221,7 +243812,7 @@ msgstr "Поговорить с %s"
 
 #: src/npctalk.cpp
 msgid "Talk to…"
-msgstr ""
+msgstr "Поговорить с…"
 
 #: src/npctalk.cpp
 msgid "Yell"
@@ -238246,7 +243837,7 @@ msgstr "Приказать %s следовать за вами"
 
 #: src/npctalk.cpp
 msgid "Tell someone to follow…"
-msgstr ""
+msgstr "Приказать кому-нибудь следовать…"
 
 #: src/npctalk.cpp
 #, c-format
@@ -238255,7 +243846,7 @@ msgstr "Приказать %s охранять позицию"
 
 #: src/npctalk.cpp
 msgid "Tell someone to guard…"
-msgstr ""
+msgstr "Приказать кому-нибудь охранять…"
 
 #: src/npctalk.cpp
 msgid "Tell everyone on your team to wake up"
@@ -238280,7 +243871,7 @@ msgstr ""
 
 #: src/npctalk.cpp
 msgid "Tell everyone on your team to temporarily…"
-msgstr ""
+msgstr "Приказать всем спутникам временно…"
 
 #: src/npctalk.cpp
 msgid "Talk to whom?"
@@ -238382,6 +243973,7 @@ msgstr "&Вы глухи и не можете говорить."
 msgid ""
 "&You are deaf and can't talk.  When you don't respond, %s becomes angry!"
 msgstr ""
+"&Вы глухи и не можете говорить. Когда вы не отвечаете, %s начинает злиться!"
 
 #: src/npctalk.cpp
 #, c-format
@@ -238414,7 +244006,7 @@ msgstr "Извини, но, судя по всему, мне нечему обу
 
 #: src/npctalk.cpp
 msgid "Here's what I can teach you…"
-msgstr ""
+msgstr "Вот чему я могу научить тебя…"
 
 #: src/npctalk.cpp
 #, c-format
@@ -238433,7 +244025,7 @@ msgstr[3] "%d фут."
 #: src/npctalk.cpp
 #, c-format
 msgid "I'm holing up here for safety.  Long term, %s"
-msgstr ""
+msgstr "Я буду здесь в безопасности. Долго, %s"
 
 #: src/npctalk.cpp
 msgid "I run the shop here."
@@ -238442,12 +244034,12 @@ msgstr "У меня здесь магазин."
 #: src/npctalk.cpp
 #, c-format
 msgid "Currently, I'm guarding this location.  Overall, %s"
-msgstr ""
+msgstr "В настоящее время я охраняю эту территорию. В целом, %s"
 
 #: src/npctalk.cpp
 #, c-format
 msgid "Right now, I'm <current_activity>.  In general, %s"
-msgstr ""
+msgstr "Сейчас я <current_activity>. В основном, %s"
 
 #: src/npctalk.cpp
 msgid "&You yell, but can't hear yourself."
@@ -238459,7 +244051,7 @@ msgstr "&Вы кричите."
 
 #: src/npctalk.cpp
 msgid "&You can't make anything out."
-msgstr ""
+msgstr "&Вы не можете ничего сделать."
 
 #: src/npctalk.cpp
 #, c-format
@@ -238541,6 +244133,16 @@ msgstr "У меня есть новости."
 msgid "Yes, let's resume training "
 msgstr "Да, давай продолжим тренировку "
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr "%s: 1 часовой урок (стоимость %s)"
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr ""
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -238557,7 +244159,7 @@ msgstr "%s: %d (%d%%) -> %d (%d%%) (цена $%d)"
 #: src/npctalk.cpp
 #, c-format
 msgid "%s: %d (%d%%) -> %d (%d%%)"
-msgstr ""
+msgstr "%s: %d (%d%%) -> %d (%d%%)"
 
 #: src/npctalk.cpp
 msgid "Okay, thanks."
@@ -238591,7 +244193,7 @@ msgstr "."
 #: src/npctalk.cpp
 msgctxt "punctuation"
 msgid "…"
-msgstr ""
+msgstr "…"
 
 #: src/npctalk.cpp
 msgctxt "punctuation"
@@ -238638,7 +244240,7 @@ msgstr "%s: %s"
 
 #: src/npctalk.cpp
 msgid "You'll be helpless!  Proceed?"
-msgstr ""
+msgstr "Вы будете беззащитны! Продолжать?"
 
 #: src/npctalk.cpp
 #, c-format
@@ -238698,21 +244300,17 @@ msgstr "Вы учитесь, как делать %s."
 
 #: src/npctalk.cpp
 msgid "I don't <swear> trust you enough to eat THIS…"
-msgstr ""
+msgstr "Я не верю тебе настолько, чтобы, <swear>, есть ЭТО…"
 
 #: src/npctalk.cpp
 msgid "It doesn't look like a good idea to consume this…"
-msgstr ""
+msgstr "Не очень хорошая идея — есть это…"
 
 #: src/npctalk.cpp
 #, c-format
 msgid "I need a %s to consume that!"
 msgstr "Мне нужен %s, чтобы употребить это!"
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr "Не очень хорошая идея — есть это…"
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr "Что предложить?"
@@ -238735,7 +244333,7 @@ msgstr "Ты, <swear>, псих?!"
 
 #: src/npctalk.cpp
 msgid "Here we go…"
-msgstr ""
+msgstr "Вот так…"
 
 #: src/npctalk.cpp
 msgid "My current weapon is better than this."
@@ -238761,7 +244359,7 @@ msgstr "Я могу взять только %s %s ещё."
 
 #: src/npctalk.cpp
 msgid "…or to store anything else for that matter."
-msgstr ""
+msgstr "… или хранить что-нибудь ещё, если на то пошло."
 
 #: src/npctalk.cpp
 msgid "It is too heavy for me to carry."
@@ -238790,6 +244388,11 @@ msgstr "%1$s (%2$d, %3$d)"
 msgid "My current location"
 msgstr "Мое текущее местоположение"
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -238812,7 +244415,7 @@ msgstr "Вы начали драться с %s!"
 
 #: src/npctalk_funcs.cpp
 msgid "You don't have any bionics installed…"
-msgstr ""
+msgstr "У вас не установлена никакая бионика…"
 
 #: src/npctalk_funcs.cpp
 msgid "Which bionic do you wish to uninstall?"
@@ -238820,11 +244423,7 @@ msgstr "Какую бионику вы хотели бы удалить?"
 
 #: src/npctalk_funcs.cpp
 msgid "You decide to hold off…"
-msgstr ""
-
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr ""
+msgstr "Вы решили подождать…"
 
 #: src/npctalk_funcs.cpp
 #, c-format
@@ -238846,7 +244445,7 @@ msgstr "Выбор новой бороды и усов"
 
 #: src/npctalk_funcs.cpp
 msgid "Actually…  I've changed my mind."
-msgstr ""
+msgstr "Впрочем… Я передумал."
 
 #: src/npctalk_funcs.cpp
 msgid "You get a trendy new cut!"
@@ -238855,12 +244454,12 @@ msgstr "У вас новая модная стрижка!"
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s gives you a decent haircut…"
-msgstr ""
+msgstr "%s прилично вас постриг…"
 
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s gives you a decent shave…"
-msgstr ""
+msgstr "%s прилично вас побрил…"
 
 #: src/npctalk_funcs.cpp
 #, c-format
@@ -238875,7 +244474,7 @@ msgstr "Было приятно пообщаться с %s."
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s drops the logs off in the garage…"
-msgstr ""
+msgstr "%s выбрасывает брёвна в гараже…"
 
 #: src/npctalk_funcs.cpp
 #, c-format
@@ -238892,6 +244491,11 @@ msgstr "%s обращается в бегство!"
 msgid "%s leaves."
 msgstr "%s уходит."
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr "%s прекращает следование."
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -238952,6 +244556,11 @@ msgstr "Вперёд >"
 msgid "Examine which item?"
 msgstr "Что изучить?"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr ""
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -238984,7 +244593,7 @@ msgstr ""
 
 #: src/npctrade.cpp
 msgid "Looks like a deal!  Accept this trade?"
-msgstr ""
+msgstr "Отлично, по рукам! Совершить сделку?"
 
 #: src/npctrade.h
 msgid ""
@@ -239302,7 +244911,7 @@ msgstr "Ходов до авто-включения безопасного ре
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
 msgstr ""
 "Количество ходов, через которое безопасный режим включается при отсутствии "
@@ -239413,8 +245022,8 @@ msgstr "Выбрасывать пустые ёмкости"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
 msgstr ""
 "Выбрасывать ли пустые контейнеры после использования. Нет: не выбрасывать; "
 "Водонепроницаемые: всё, кроме водонепроницаемых контейнеров; Всё: "
@@ -239589,12 +245198,14 @@ msgstr ""
 "бросках."
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "Запрос перед разборкой предмета"
+msgid "Query on disassembly while butchering"
+msgstr "Запрос на разборку при разделке"
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
-msgstr "Если «да», то перед разборкой предмета будет задаваться вопрос."
+msgid "If true, will query before disassembling items while butchering."
+msgstr ""
+"Если «да», то перед разборкой предметов при разделке будет задаваться "
+"вопрос."
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -239894,9 +245505,9 @@ msgstr "Авто-буквы в инвентаре"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
 msgstr ""
 "Включено: автоматически присваивает буквы всем переносимым предметам, в "
 "которых они отсутствуют. Отключено: не назначать буквы автоматически. "
@@ -240255,7 +245866,7 @@ msgid ""
 "especially in modes other than \"Solid\"."
 msgstr ""
 "Масштабировать пиксельную миникарту согласно окружению. Может привести к "
-"странным результатам, особенно в режимах кроме \"Сплошная\"."
+"странным результатам, особенно в режимах кроме «Сплошная»."
 
 #: src/options.cpp
 msgid "Maintain pixel minimap aspect ratio"
@@ -240289,7 +245900,7 @@ msgstr ""
 msgid "Display"
 msgstr "Дисплей"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr ""
@@ -240386,7 +245997,7 @@ msgid "Scaling factor"
 msgstr "Коэффициент масштабирования"
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
+msgid "Factor by which to scale the display.  Requires restart."
 msgstr ""
 "Указывает, насколько будет увеличено разрешение игры (текст и графика). "
 "Требует перезапуска."
@@ -240513,7 +246124,7 @@ msgstr ""
 
 #: src/options.cpp
 msgid "Vertical range of 3D field of vision"
-msgstr ""
+msgstr "Вертикальный диапазон 3D поля зрения"
 
 #: src/options.cpp
 msgid ""
@@ -240521,6 +246132,9 @@ msgid ""
 "(This many levels up, this many levels down.)  3D vision of the full height "
 "of the world can slow the game down a lot.  Seeing fewer Z-levels is faster."
 msgstr ""
+"Указывает на сколько уровней простирается экспериментальное 3D поле зрения. "
+"(На сколько вверх, на столько же и вниз.) 3D зрение полной высоты мира может"
+" сильно замедлить игру. Чем меньше Z-уровней видно, тем меньше лагов."
 
 #: src/options.cpp
 msgid "Experimental path name encoding conversion"
@@ -240688,12 +246302,13 @@ msgstr "Первый день"
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
 msgstr ""
-"В какой день года случился катаклизм. День 0 — это Весна 1. Параметр может "
-"быть изменён сценариями. Не вызывает порчу продуктов или эволюцию монстров."
+"В какой день года случился катаклизм. День 0 — это первый день весны. "
+"Параметр может быть изменён сценариями. Не вызывает порчу продуктов или "
+"эволюцию монстров."
 
 #: src/options.cpp
 msgid "Spawn delay"
@@ -240701,9 +246316,9 @@ msgstr "Задержка старта"
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
 msgstr ""
 "Через сколько дней после катаклизма появляется игрок. День 0 — это день "
 "катаклизма. Параметр может быть изменён сценариями. Вызовет порчу продуктов "
@@ -240776,11 +246391,11 @@ msgstr "Статические NPC"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
 msgstr ""
-"Если включено, то в начале игры создаются статические NPC-персонажи. Требует"
-" перезагрузка мира."
+"Если включено, то статические NPC создаются в предопределённых локациях. "
+"Требует перезагрузки мира."
 
 #: src/options.cpp
 msgid "Starting NPCs spawn"
@@ -241374,7 +246989,7 @@ msgstr "настройки"
 
 #: src/output.cpp
 msgid "Press any key for more…"
-msgstr ""
+msgstr "Дальше по нажатию любой клавиши…"
 
 #: src/output.cpp
 #, c-format
@@ -241550,6 +247165,8 @@ msgid ""
 "<color_red>LEVEL %i, %d'%d, %d'%d</color>: %s (Distance: "
 "<color_white>%d</color>)"
 msgstr ""
+"<color_red>УРОВЕНЬ %i, %d'%d, %d'%d</color> : %s (Расстояние: "
+"<color_white>%d</color>)"
 
 #: src/overmap_ui.cpp
 #, c-format
@@ -242050,7 +247667,7 @@ msgstr "Темп : %s"
 
 #: src/panels.cpp
 msgid "Wield:"
-msgstr "Оружие   :"
+msgstr "Оружие:"
 
 #: src/panels.cpp
 msgid "Style:"
@@ -242068,6 +247685,7 @@ msgstr "Тепло    :"
 msgid "Underground"
 msgstr "Под землёй"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
 msgstr "Ветер"
@@ -242127,11 +247745,7 @@ msgstr "Глухота!"
 
 #: src/panels.cpp
 msgid "Weapon  :"
-msgstr "Оружие :"
-
-#: src/panels.cpp
-msgid "No Style"
-msgstr "Без стиля"
+msgstr "Оружие:"
 
 #: src/panels.cpp
 msgid "Day "
@@ -242145,10 +247759,12 @@ msgstr "Темп :"
 msgid "to open sidebar options"
 msgstr "для настройки боковой панели"
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
 msgstr "Мана"
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
 msgstr "Макс. мана"
@@ -242405,77 +248021,6 @@ msgstr "<npcname> ставит %1$s на %2$s, чтобы избежать ра
 msgid "You have learned a new style: %s!"
 msgstr "Вы изучили новый стиль: %s!"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "Ваш %s замёрзнет через несколько часов."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "Ваша %s замёрзнет в течение часа!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr "Ваша %s замёрзнет в любую минуту!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr "Вы чувствуете, что ваш %s начинает неметь от холода!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr "Вы чувствуете, что ваш %s сильно мёрзнет."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr "Вы чувствуете, что ваш %s бросает в дрожь."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr "Вы чувствуете, как %s краснеет от жары!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr "Вы чувствуете, что ваш %s сильно разгорячён."
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr "Вы чувствуете, что ваш %s бросает в жар."
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "Из-за ветра у вас начинает мёрзнуть %s."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr ""
-"Ветер очень сильный, вы должны найти непродуваемую одежду для вашей %s."
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr ""
-"Ваша одежда не обеспечивает достаточный уровень защиты от ветра для %s!"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "Вы катаетесь по земле, пытаясь потушить огонь!"
@@ -242661,7 +248206,7 @@ msgstr "Вы врезались в %s!"
 
 #: src/player.cpp
 msgid "…but your shock absorbers negate the damage!"
-msgstr ""
+msgstr "… но ваши кинетические амортизаторы поглотили весь урон!"
 
 #: src/player.cpp
 #, c-format
@@ -242719,7 +248264,7 @@ msgstr "Вы умерли от голода."
 
 #: src/player.cpp
 msgid "Food…"
-msgstr ""
+msgstr "Еды…"
 
 #: src/player.cpp
 msgid "Due to insufficient nutrition, your body is suffering from starvation."
@@ -242730,10 +248275,12 @@ msgid ""
 "Despite having something in your stomach, you still feel like you haven't "
 "eaten in days…"
 msgstr ""
+"Несмотря на то, что у вас что-то есть в желудке, вы все равно чувствуете, "
+"что не ели несколько дней…"
 
 #: src/player.cpp
 msgid "Your stomach feels so empty…"
-msgstr ""
+msgstr "Пустой желудок напоминает о себе…"
 
 #: src/player.cpp
 msgid "You are EMACIATED!"
@@ -242753,7 +248300,7 @@ msgstr "Вы умерли от обезвоживания."
 
 #: src/player.cpp
 msgid "Even your eyes feel dry…"
-msgstr ""
+msgstr "Вы ощущаете сухость даже в глазах…"
 
 #: src/player.cpp
 msgid "You are THIRSTY!"
@@ -242761,7 +248308,7 @@ msgstr "Вас мучает ЖАЖДА!"
 
 #: src/player.cpp
 msgid "Your mouth feels so dry…"
-msgstr ""
+msgstr "Вы ощущаете сухость во рту…"
 
 #: src/player.cpp
 msgid "Survivor sleep now."
@@ -242769,7 +248316,7 @@ msgstr "Выживший засыпает."
 
 #: src/player.cpp
 msgid "Anywhere would be a good place to sleep…"
-msgstr ""
+msgstr "Лечь где угодно, только бы поспать…"
 
 #: src/player.cpp
 msgid "You feel like you haven't slept in days."
@@ -242789,7 +248336,7 @@ msgstr "*зевок* вы действительно должны поспать
 
 #: src/player.cpp
 msgid "Your mind feels tired.  It's been a while since you've slept well."
-msgstr ""
+msgstr "Вы очень устали. Давненько вы не спали как следует."
 
 #: src/player.cpp
 msgid ""
@@ -242804,6 +248351,8 @@ msgid ""
 "Your mind feels weary, and you dread every wakeful minute that passes.  You "
 "crave sleep, and feel like you're about to collapse."
 msgstr ""
+"Вы очень устали и вы страшитесь каждой пройденной минуты. Вы просто жаждете "
+"сна и чувствуете что вот-вот вырубитесь."
 
 #: src/player.cpp
 msgid ""
@@ -242811,6 +248360,8 @@ msgid ""
 " mercy.  It's a miracle that you're still awake, but it just feels like a "
 "curse now."
 msgstr ""
+"Вы не спали уже очень долго, и всё ваше тело молит о пощаде. Это чудо, что "
+"вы до сих пор в сознании. Но сейчас это скорее ощущается как ваше проклятие."
 
 #: src/player.cpp
 msgid ""
@@ -242852,14 +248403,6 @@ msgstr "Продезинфицированные раны на части тел
 msgid "There is not enough %s left to siphon it."
 msgstr "Здесь осталось недостаточно %s."
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "Вы тяжело кашляете."
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "покашливание."
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "Ваше тело охвачено мучительной болью!"
@@ -242905,11 +248448,6 @@ msgstr "Ваш %s причиняет вам боль!"
 msgid "Your %s aches."
 msgstr "У вас болит %s."
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr "Ваше текущее значение здоровья — %d."
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -242936,430 +248474,6 @@ msgstr "Что-то корчится внутри вас, умирая."
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "Ваш кишечник булькает после того, как внутри него что-то сдохло."
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr "Вы слишком истощены, чтобы поддерживать ваш %s."
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr "Вы слишком обезвожены, чтобы поддерживать ваш %s."
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr "Вы слишком устали, чтобы поддерживать ваш %s."
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "Вы тонете!"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr "У вас выпал зуб!"
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "БЗЗЗЗЗ"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "Внезапно вы мёрзнете."
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "Неожиданно, вы чувствуете боль."
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "На мгновение у вас закружилась голова."
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "Внезапно, вы ощущаете голод."
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "Внезапно вы чувствуете тяжесть в желудке."
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "Внезапно, вы ощущаете жажду."
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "На вас неожиданно навалилась усталость."
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "Внезапно, вам стало очень холодно."
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "Внезапно, вам стало холодно."
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "Внезапно, вам стало очень жарко."
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "Внезапно, вам стало жарко."
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr "%1$s сердится!"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr "%1$s говорит: «%2$s»"
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr "Вы улучшили %1$s до уровня %2$d."
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "Вас бросило в озноб."
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr "ваш собственный крик, %s"
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr ""
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr "Внезапно вами овладевает неудержимое желание поспать, и вы засыпаете."
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "У вас приступ астмы!"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr ""
-"Вы используете свой Оксигенатор для очистки крови, а затем снова засыпаете."
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr "Вы воспользовались ингалятором и легли спать дальше."
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr "Вы глубоко вдыхаете из баллона с кислородом и легли спать дальше."
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr "Вы задыхаетесь и не можете сосредоточиться!"
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "Вы используете последний заряд ингалятора."
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] "Вы используете ваш ингалятор, остался только %d заряд."
-msgstr[1] "Вы используете ваш ингалятор, осталось только %d заряда."
-msgstr[2] "Вы используете ваш ингалятор, осталось только %d зарядов."
-msgstr[3] "Вы используете ваш ингалятор, остался только %d заряд."
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr "Вы вдыхаете последний кислород из баллона."
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] "Вы глубоко вдыхаете из баллона с кислородом, остался %d заряд."
-msgstr[1] "Вы глубоко вдыхаете из баллона с кислородом, осталось %d заряда."
-msgstr[2] "Вы глубоко вдыхаете из баллона с кислородом, осталось %d  зарядов."
-msgstr[3] "Вы глубоко вдыхаете из баллона с кислородом, осталось %d зарядов."
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr "%s и другие части тела"
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr "Солнце неприятно раздражает вам %s."
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "Солнечный свет раздражает ваши глаза."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr "Вода повреждает вам %s."
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr "Вода повреждает <npcname> %s."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr "Вода исцеляет вам %s."
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr "Вода исцеляет <npcname> %s."
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "Солнечный свет обжигает вашу кожу!"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "Солнечный свет отвлекает вас."
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "Вы не переносите солнечный свет!"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "Внезапно вы оглохли!"
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "Внезапно вы ослепли!"
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr ""
-"Вы чувствуете аномальные ощущения, поступающие от ваших сенсоров излучения."
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr "Ваша грудь горит, так как ваши энергосистемы перегружены!"
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "Вас пронизывает болезненный электрический разряд!"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr "Похоже, %s разряжены."
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "Вы пострадали от ожога кислотным разрядом!"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "Ваши батарейки слегка разрядились."
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "От бионики исходит треск!"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "Вы чувствуете дрожание вашей дефектной бионики."
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr "треск!"
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "Ваше зрение пикселизируется!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr "Ваша неисправная бионика вызывает спазм, и вы падаете на землю!"
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr "Ваша бионика коротит, заставляя вас дрожать и содрогаться."
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "Ваша неисправная бионика зудит!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr "Ваша неисправная бионика светится!"
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr "Ваши мышцы свело судорогой!"
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr "Вы падаете на землю!"
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr "Вы задыхаетесь."
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr "Вас неконтролируемо трясёт."
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr "Вы вырубаетесь!"
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "Ваше дыхание замедляется."
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr "Вы спотыкаетесь и падаете на землю!"
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr ""
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr "Вы устало трёте свои глаза."
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr "<npcname> устало трёт глаза."
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr "Вы немного зеваете."
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr "<npcname> легонько зевает."
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr "Вы растягиваете свою спину."
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr "<npcname> потягивает спину."
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr "Вы чувствуете себя душевно уставшими."
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr "<npcname> широко зевает."
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr "Вы чувствуете головокружение на мгновение."
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr "У вас неприятные мышечные спазмы."
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr "Ваше зрение немного размывается. "
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr "Ваш разум быстро впадает в неосознанность."
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr "Ваша боль в мускулах развивается непредсказуемым образом."
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr "Вы чувствуете отвлекающую и сильную головную боль. "
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr "Вы чувствуете изжогу и кислотный привкус во рту."
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr ""
-"Ваш разум настолько устал, что вы больше не можете доверять своим глазам."
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr ""
-"Ваши мускульные спазмы неконтролируемы, и вас тяжело держать равновесие."
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr "Ваши трясущиеся ноги заставляют вас спотыкаться."
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr "<npcname> спотыкается."
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr "<npcname> падает!"
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr "Вы падаете!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr "Ваш плёночный дозиметр сменил свой цвет с %1$s на %2$s!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr "Ваша %s начала заживать!"
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr "С %1$sа слышно %2$s"
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr "Вы чувствуете, как вода жжёт вашу кожу."
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr "Ваша маскировка на мгновение мерцает!"
@@ -243562,7 +248676,7 @@ msgstr "Невозможно взять в руки пролитые жидко
 
 #: src/player.cpp
 msgid "You need at least one arm to even consider wielding something."
-msgstr ""
+msgstr "Чтобы что-нибудь взять, вам необходима хотя бы одна рука."
 
 #: src/player.cpp
 msgid "Something you are wearing hinders the use of both hands."
@@ -243578,11 +248692,6 @@ msgstr "%s нельзя держать только одной рукой."
 msgid "You are too weak to wield %s with only one arm."
 msgstr "Вы слишком слабы, чтобы держать %s одной рукой."
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr "Вы не можете выпустить из рук %s."
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "Держать руки свободными (выкл)"
@@ -243657,20 +248766,43 @@ msgstr "В %s нет никаких дефектов."
 msgid "Mend which fault?"
 msgstr "Исправить какой дефект?"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white>Требуется времени:</color>\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr ""
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white>Навыки:</color>\n"
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr "Требуется времени: <color_cyan>%s</color>\n"
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
+#: src/player.cpp
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr "Навыки: <color_cyan>нет</color>\n"
+
+#: src/player.cpp
+#, c-format
+msgid "Skills: %s\n"
+msgstr "Навыки: %s\n"
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
-msgstr "> <color_%1$s>%2$s %3$i</color>\n"
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "You are currently unable to mend the %s this way."
+msgstr "В настоящий момент вы не можете исправить %s таким способом."
 
 #: src/player.cpp
 msgid "You are already wearing that."
@@ -243697,12 +248829,12 @@ msgstr "<npcname> надевает %s."
 #: src/player.cpp
 #, c-format
 msgid "Your %s are very encumbered!  %s"
-msgstr ""
+msgstr "Ваши %s очень скованы!  %s"
 
 #: src/player.cpp
 #, c-format
 msgid "Your %s is very encumbered!  %s"
-msgstr ""
+msgstr "Ваш %s очень скован!  %s"
 
 #: src/player.cpp
 msgid "You're deafened!"
@@ -243712,11 +248844,15 @@ msgstr "Вы оглушены!"
 #, c-format
 msgid "This %s is too big to wear comfortably!  Maybe it could be refitted…"
 msgstr ""
+"%s слишком велик, чтобы его можно было носить с удобством! Возможно, его "
+"можно подогнать по размеру…"
 
 #: src/player.cpp
 #, c-format
 msgid "This %s is too small to wear comfortably!  Maybe it could be refitted…"
 msgstr ""
+"%s слишком мал, чтобы его можно было носить с удобством! Возможно, его можно"
+" подогнать по размеру…"
 
 #: src/player.cpp
 #, c-format
@@ -243788,14 +248924,6 @@ msgstr "Вы сняли %s."
 msgid "<npcname> takes off their %s."
 msgstr "<npcname> снимает %s."
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr "Вы не можете положить сюда предметы!"
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr "<npcname> не может положить сюда предметы!"
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -243843,24 +248971,6 @@ msgstr "Вы получаете %i неиспользованного плуто
 msgid "You can't remove partially depleted plutonium!"
 msgstr "Вы не можете убрать частично обеднённый уран!"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] "Для %s требуется %d заряд от УБП."
-msgstr[1] "Для %s требуется %d заряда от УБП."
-msgstr[2] "Для %s требуется %d зарядов от УБП."
-msgstr[3] "Для %s требуется %d заряд от УБП."
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] "Ваш %s имеет %d заряд, а нужно как минимум %d."
-msgstr[1] "Ваш %s имеет %d заряда, а нужно как минимум %d."
-msgstr[2] "Ваш %s имеет %d зарядов, а нужно как минимум %d."
-msgstr[3] "Ваш %s имеет %d заряд, а нужно как минимум %d."
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -243903,6 +249013,8 @@ msgstr "Невозможно спать в этом горшке на колёс
 #: src/player.cpp
 msgid "The humans' furniture blocks your roots.  You can't get comfortable."
 msgstr ""
+"Людская мебель блокирует ваши корни. Вы не можете комфортно здесь "
+"расположиться."
 
 #: src/player.cpp
 msgid "Your roots scrabble ineffectively at the unyielding surface."
@@ -243918,7 +249030,7 @@ msgstr ""
 
 #: src/player.cpp
 msgid "These thick webs support your weight, and are strangely comfortable…"
-msgstr ""
+msgstr "Эта толстая паутина выдерживает ваш вес и, как ни странно, удобная…"
 
 #: src/player.cpp
 msgid "You try to sleep, but the webs get in the way.  You brush them aside."
@@ -243943,11 +249055,11 @@ msgstr "Возможно, толстые стены помогут вам усн
 #: src/player.cpp
 msgid ""
 "You lay beneath the waves' embrace, gazing up through the water's surface…"
-msgstr ""
+msgstr "Вы лежите под объятиями волн, глядя сквозь поверхность воды…"
 
 #: src/player.cpp
 msgid "You settle into the water and begin to drowse…"
-msgstr ""
+msgstr "Вы ложитесь на воду и начинаете дремать…"
 
 #: src/player.cpp
 msgid "This is a comfortable place to sleep."
@@ -244027,7 +249139,7 @@ msgstr "Время как будто замедлилось и вы инстин
 #: src/player.cpp
 #, c-format
 msgid "%s dodges… so fast!"
-msgstr ""
+msgstr "%s уворачивается… Какой быстрый!"
 
 #: src/player.cpp
 msgid "You try to dodge but there's no room!"
@@ -244038,10 +249150,6 @@ msgstr "Вы пытаетесь увернуться, но не хватает 
 msgid "%s tries to dodge but there's no room!"
 msgstr "%s пытается увернуться, но не хватает места!"
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr "Ваше тело напряжено под такой тяжестью!"
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -244101,6 +249209,13 @@ msgstr "Перекусить бы"
 msgid "Pain "
 msgstr "Боль: "
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr ""
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -244336,47 +249451,57 @@ msgstr "Текущая скорость:"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
-msgstr "Перегружен          %s-%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
+msgstr "Перегруз            -%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
-msgstr "Боль                %s-%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
+msgstr "Боль                -%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
-msgstr "Жажда               %s-%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
+msgstr "Жажда               -%2d%%"
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr "Недоедание"
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
-msgstr "%-20s-%s%d%%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
+msgstr "%s-%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
-msgstr "Недостаток света    %s-%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
+msgstr "Недостаток света    -%2d%%"
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
-msgstr "Хладнокровный        %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
+msgstr "Хладнокровный       %s%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
-msgstr "Быстрый             %s+%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
-msgstr "Бионическ. скорость %s+%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
+msgstr "Бионическ. скорость +%2d%%"
 
 #: src/player_display.cpp
 #, c-format
@@ -244412,12 +249537,16 @@ msgid ""
 "Your body is severely weakened by starvation.  You might die if you don't start eating regular meals!\n"
 "\n"
 msgstr ""
+"Ваше тело сильно ослаблено из-за голодания. Вы можете умереть, если не начнёте регулярно питаться!\n"
+"\n"
 
 #: src/player_display.cpp
 msgid ""
 "Your body is weakened by starvation.  Only time and regular meals will help you recover.\n"
 "\n"
 msgstr ""
+"Ваше тело ослаблено из-за голодания. Только время и регулярное питание помогут вам восстановиться.\n"
+" \n"
 
 #: src/player_display.cpp src/veh_interact.cpp
 msgid "Strength"
@@ -244518,29 +249647,31 @@ msgstr "<npcname> стошнило тысячами живых спор!"
 
 #: src/player_hardcoded_effects.cpp
 msgid "The flesh on your broken arms bulges.  Fungus stalks burst through!"
-msgstr ""
+msgstr "Плоть на ваших сломанных руках вздута. Из неё прорастают грибы!"
 
 #: src/player_hardcoded_effects.cpp
 msgid "<npcname>'s broken arms bulge.  Fungus stalks burst out of the bulges!"
-msgstr ""
+msgstr "Сломанные руки <npcname> вздуты. Из них прорастают грибы!"
 
 #: src/player_hardcoded_effects.cpp
 msgid ""
 "The flesh on your broken and unbroken arms bulge.  Fungus stalks burst "
 "through!"
 msgstr ""
+"Плоть на вашей сломанной и не сломанной руке вздута. Из них прорастают "
+"грибы!"
 
 #: src/player_hardcoded_effects.cpp
 msgid "<npcname>'s arms bulge.  Fungus stalks burst out of the bulges!"
-msgstr ""
+msgstr "Руки <npcname> вздуваются. Из них прорастают грибы!"
 
 #: src/player_hardcoded_effects.cpp
 msgid "Your hands bulge.  Fungus stalks burst through the bulge!"
-msgstr ""
+msgstr "Ваши руки вздуваются. Из них прорастают грибы!"
 
 #: src/player_hardcoded_effects.cpp
 msgid "<npcname>'s hands bulge.  Fungus stalks burst through the bulge!"
-msgstr ""
+msgstr "Руки <npcname> вздуваются. Из них прорастают грибы!"
 
 #: src/player_hardcoded_effects.cpp
 msgid "You feel nauseous!"
@@ -244587,7 +249718,7 @@ msgid "\"Oh God, what's happening?\""
 msgstr "«О, Боже, что происходит?»"
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
+msgid "\"Of course… it's all fractals!\""
 msgstr "«Конечно… это всё фракталы!»"
 
 #: src/player_hardcoded_effects.cpp
@@ -244623,7 +249754,7 @@ msgid "You quiver from the cold."
 msgstr "Вы дрожите от холода."
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
+msgid "Your torso is freezing cold.  You should put on a few more layers."
 msgstr "Ваш торс замерзает. Вы должны надеть больше одежды."
 
 #: src/player_hardcoded_effects.cpp
@@ -244830,7 +249961,7 @@ msgstr "Вас вдруг пробирает дрожь."
 
 #: src/player_hardcoded_effects.cpp
 msgid "Your vision is filled with bright lights…"
-msgstr ""
+msgstr "Ваши глаза заполняются ярким светом…"
 
 #: src/player_hardcoded_effects.cpp
 msgid "You're suddenly covered in ectoplasm."
@@ -245014,6 +250145,48 @@ msgstr "Ваш будильник включился."
 msgid "Your alarm went off."
 msgstr "Зазвенел ваш будильник."
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr "Вы теряете контроль над телом и бьётесь в конвульсиях!"
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr "Вы теряете сознание!"
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr "рука"
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr "ладонь"
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr "нога"
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr "Ваша %s внезапно дергается в неожиданном направлении!"
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr "Тем не менее, вам удается удержать оружие."
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr "Тем не менее, вам удается сохранить равновесие."
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr ""
+"Вы внезапно теряете мышечный тонус и не можете поддерживать собственный вес!"
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr "У вас сильно болит голова."
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -245165,7 +250338,7 @@ msgstr "[%c] Цель на себя; [%c] Центр на цели"
 #: src/ranged.cpp
 #, c-format
 msgid "[%c] to steady your aim.  (10 moves)"
-msgstr ""
+msgstr "[%c], чтобы стабилизировать прицел. (10 ходов)"
 
 #: src/ranged.cpp
 #, c-format
@@ -245331,21 +250504,21 @@ msgstr "0.0 % Шанс провала"
 #: src/ranged.cpp
 #, c-format
 msgid "Effective Spell Radius: %s%s"
-msgstr ""
+msgstr "Радиус действия: %s%s"
 
 #: src/ranged.cpp
 msgid " WARNING!  IN RANGE"
-msgstr ""
+msgstr "ОПАСНО!  В ОБЛАСТИ"
 
 #: src/ranged.cpp
 #, c-format
 msgid "Cone Arc: %s degrees"
-msgstr ""
+msgstr "Радиус конуса: %s градусов"
 
 #: src/ranged.cpp
 #, c-format
 msgid "Line width: %s"
-msgstr ""
+msgstr "Длина линии: %s"
 
 #: src/ranged.cpp
 #, c-format
@@ -245436,10 +250609,6 @@ msgstr "«Ты-Дыщ!»"
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>нет</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr "<color_white>нет</color>"
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -245451,8 +250620,8 @@ msgstr "%s%% на >%s единиц"
 #, c-format
 msgid "%1$d tool with %2$s of %3$d or more."
 msgid_plural "%1$d tools with %2$s of %3$d or more."
-msgstr[0] "%1$d инструмент со значением %2$s%3$d  или выше."
-msgstr[1] "%1$d инструмента со значением %2$s%3$d  или выше."
+msgstr[0] "%1$d инструмент со значением %2$s %3$d или выше."
+msgstr[1] "%1$d инструмента со значением %2$s %3$d или выше."
 msgstr[2] "%1$d инструментов со значением %2$s %3$d или выше."
 msgstr[3] "%1$d инструментов со значением %2$s %3$d или выше."
 
@@ -245559,7 +250728,7 @@ msgstr "Необходимые компоненты:"
 
 #: src/requirements.cpp
 msgid " OR "
-msgstr "ИЛИ "
+msgstr " ИЛИ "
 
 #: src/requirements.cpp
 msgid "Tools required:"
@@ -245601,7 +250770,7 @@ msgstr "Менеджер безопасного режима выключен."
 
 #: src/safemode_ui.cpp
 msgid "Default rules are used.  Add a rule to activate."
-msgstr ""
+msgstr "Используются правила по умолчанию. Добавьте правило, чтобы включить."
 
 #: src/safemode_ui.cpp
 msgid "Press ~ to add a default ruleset to get started."
@@ -245622,6 +250791,14 @@ msgid ""
 "*cid*zo*ie     multiple * are allowed\n"
 "AcI*zO*iE      case insensitive search"
 msgstr ""
+"* используется как групповой символ. Пару примеров:\n"
+"\n"
+"human       ищет любого НПЦ\n"
+"zombie      ищет определённого монстра\n"
+"acidic zo*  ищет монстра, начинающегося с «acidic zo»\n"
+"*mbie        ищет монстра, заканчивающегося на «mbie»\n"
+"*cid*zo*ie  множество * разрешено\n"
+"Acl*zO*iE  регистр не важен в поиске"
 
 #: src/safemode_ui.cpp
 msgid "Safe Mode Rule:"
@@ -245637,7 +250814,7 @@ msgstr "Опция: "
 
 #: src/safemode_ui.cpp
 msgid "No monsters loaded.  Please start a game first."
-msgstr ""
+msgstr "Монстры не загружены. Пожалуйста, сначала начните игру."
 
 #: src/safemode_ui.cpp
 #, c-format
@@ -245654,7 +250831,7 @@ msgstr "Выводит список монстров независимо от 
 
 #: src/safemode_ui.cpp
 msgid "Safe Mode is not enabled in the options.  Enable it now?"
-msgstr ""
+msgstr "Безопасный режим не включён в настройках. Включить его?"
 
 #: src/safemode_ui.cpp
 msgid "safemode configuration"
@@ -245679,13 +250856,15 @@ msgstr "Ограничены"
 
 #: src/scores_ui.cpp
 msgid "This game has no valid scores.\n"
-msgstr ""
+msgstr "Эта игра не имеет действительных результатов.\n"
 
 #: src/scores_ui.cpp
 msgid ""
 "\n"
 "Note that only scores that existed when you started this game and still exist now will appear here."
 msgstr ""
+"\n"
+"Заметьте, что здесь отображаются только те очки, которые записывались от начала текущей игры и до сего момента."
 
 #: src/scores_ui.cpp
 msgid "SCORES"
@@ -245695,12 +250874,6 @@ msgstr "СТАТИСТИКА"
 msgid "KILLS"
 msgstr "УБИТО"
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr ""
-"Выбрать дисплей, на который будет выводиться игра. Требуется перезапуск."
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr "Самый просветлённый навык."
@@ -245713,6 +250886,10 @@ msgstr "Ваши барабанные перепонки неожиданно п
 msgid "Something is making noise."
 msgstr "Что-то издаёт шум."
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr "шум"
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -245728,6 +250905,11 @@ msgstr "Со своего места вы слышите %1$s."
 msgid "You hear %1$s"
 msgstr "Вы слышите %1$s"
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr "С %1$sа слышно %2$s"
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "Ваш будильник наконец-то будит вас."
@@ -245759,9 +250941,421 @@ msgstr ""
 msgid "d: delete history"
 msgstr "d: удалить историю"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr "Вода повреждает вам %s."
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr "Вода повреждает <npcname> %s."
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr "Вода исцеляет вам %s."
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr "Вода исцеляет <npcname> %s."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr "Вы слишком истощены, чтобы поддерживать ваш %s."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr "Вы слишком обезвожены, чтобы поддерживать ваш %s."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr "Вы слишком устали, чтобы поддерживать ваш %s."
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "Вы тонете!"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr "Внезапно вами овладевает неудержимое желание поспать, и вы засыпаете."
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "Внезапно вы мёрзнете."
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "Неожиданно, вы чувствуете боль."
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "На мгновение у вас закружилась голова."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "Внезапно, вы ощущаете голод."
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "Внезапно вы чувствуете тяжесть в желудке."
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "Внезапно, вы ощущаете жажду."
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "На вас неожиданно навалилась усталость."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "Внезапно, вам стало очень холодно."
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "Внезапно, вам стало холодно."
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "Внезапно, вам стало очень жарко."
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "Внезапно, вам стало жарко."
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr "ваше %1$s"
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr "Вы внезапно онемели…"
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "Вас бросило в озноб."
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr "<npcname> бросило в озноб."
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr "%1$s говорит: «%2$s»"
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr "%1$s сердится!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr "Вы улучшили %1$s до уровня %2$d."
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "У вас приступ астмы!"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr ""
+"Вы используете свой Оксигенатор для очистки крови, а затем снова засыпаете."
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr "Вы воспользовались ингалятором и легли спать дальше."
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr "Вы глубоко вдыхаете из баллона с кислородом и легли спать дальше."
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr "Вы задыхаетесь и не можете сосредоточиться!"
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "Вы используете последний заряд ингалятора."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] "Вы используете ваш ингалятор, остался только %d заряд."
+msgstr[1] "Вы используете ваш ингалятор, осталось только %d заряда."
+msgstr[2] "Вы используете ваш ингалятор, осталось только %d зарядов."
+msgstr[3] "Вы используете ваш ингалятор, остался только %d заряд."
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr "Вы вдыхаете последний кислород из баллона."
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] "Вы глубоко вдыхаете из баллона с кислородом, остался %d заряд."
+msgstr[1] "Вы глубоко вдыхаете из баллона с кислородом, осталось %d заряда."
+msgstr[2] "Вы глубоко вдыхаете из баллона с кислородом, осталось %d  зарядов."
+msgstr[3] "Вы глубоко вдыхаете из баллона с кислородом, осталось %d зарядов."
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "Солнечный свет обжигает вашу кожу!"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "Солнечный свет отвлекает вас."
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "Вы не переносите солнечный свет!"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "Солнечный свет раздражает ваши глаза."
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr "%s и другие части тела"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr "Солнце неприятно раздражает вам %s."
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr "У вас выпал зуб!"
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "БЗЗЗЗЗ"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "Внезапно вы оглохли!"
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "Внезапно вы ослепли!"
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr "Ваши зрительные центры должно быть шалят…"
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr ""
+"Вы чувствуете аномальные ощущения, поступающие от ваших сенсоров излучения."
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr "Ваша грудь горит, так как ваши энергосистемы перегружены!"
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "Вас пронизывает болезненный электрический разряд!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr "Похоже, %s разряжены."
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "Вы пострадали от ожога кислотным разрядом!"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "Ваши батарейки слегка разрядились."
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "От бионики исходит треск!"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "Вы чувствуете дрожание вашей дефектной бионики."
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr "треск!"
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "Ваше зрение пикселизируется!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr "Ваша неисправная бионика вызывает спазм, и вы падаете на землю!"
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr "Ваша бионика коротит, заставляя вас дрожать и содрогаться."
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "Ваша неисправная бионика зудит!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr "Ваша неисправная бионика светится!"
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr "Ваши мышцы свело судорогой!"
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr "Вы падаете на землю!"
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr "Вы задыхаетесь."
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr "Вас неконтролируемо трясёт."
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr "Вас тошнит…"
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr "Вы вырубаетесь!"
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "Ваше дыхание замедляется."
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr "Вы спотыкаетесь и падаете на землю!"
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr "Вы чувствуете усталость…"
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr "Вы устало трёте свои глаза."
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr "<npcname> устало трёт глаза."
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr "Вы немного зеваете."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr "<npcname> легонько зевает."
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr "Вы растягиваете свою спину."
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr "<npcname> потягивает спину."
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr "Вы чувствуете себя душевно уставшими."
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr "<npcname> широко зевает."
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr "Вы чувствуете головокружение на мгновение."
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr "У вас неприятные мышечные спазмы."
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr "Ваше зрение немного размывается. "
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr "Ваш разум быстро впадает в неосознанность."
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr "Ваша боль в мускулах развивается непредсказуемым образом."
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr "Вы чувствуете отвлекающую и сильную головную боль. "
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr "Вы чувствуете изжогу и кислотный привкус во рту."
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr ""
+"Ваш разум настолько устал, что вы больше не можете доверять своим глазам."
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr ""
+"Ваши мускульные спазмы неконтролируемы, и вас тяжело держать равновесие."
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr "Ваши трясущиеся ноги заставляют вас спотыкаться."
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr "<npcname> спотыкается."
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr "<npcname> падает!"
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr "Вы падаете!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr "Ваш плёночный дозиметр сменил свой цвет с %1$s на %2$s!"
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr "Ваша %s начала заживать!"
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr "Вы чувствуете, как вода жжёт вашу кожу."
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
-msgstr ""
+msgstr "Вы чувствуете странную внутреннюю силу."
 
 #: src/teleport.cpp
 msgid "You cannot teleport safely."
@@ -245773,11 +251367,11 @@ msgstr "Вы телепортируетесь в сплошную стену и
 
 #: src/teleport.cpp
 msgid "You feel disjointed."
-msgstr ""
+msgstr "Вы чувствуете себя расчленённым."
 
 #: src/teleport.cpp
 msgid "You explode into thousands of fragments."
-msgstr ""
+msgstr "Вы разлетаетесь на тысячи кусочков."
 
 #: src/teleport.cpp
 #, c-format
@@ -245908,8 +251502,8 @@ msgstr "стеклянный хруст!"
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "%s натыкается на раскладушку"
+msgid "The %s stumbles over the cot!"
+msgstr "%s натыкается на раскладушку!"
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -246064,11 +251658,6 @@ msgstr "Силок затягивается у вас на ноге."
 msgid "A snare closes on <npcname>s leg."
 msgstr "Силок затягивается на ноге у <npcname>."
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr "Силок затягивается на ноге у %s"
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -246103,12 +251692,12 @@ msgstr "брррРРММ*ПУМП!*"
 
 #: src/trapfunc.cpp
 msgid "The air shimmers around you…"
-msgstr ""
+msgstr "Воздух мерцает вокруг вас…"
 
 #: src/trapfunc.cpp
 #, c-format
 msgid "The air shimmers around %s…"
-msgstr ""
+msgstr "Воздух мерцает вокруг %s…"
 
 #: src/trapfunc.cpp
 msgid "You step in a puddle of thick goo."
@@ -246124,7 +251713,7 @@ msgstr "Кислотная слизь разъедает ваши ноги."
 
 #: src/trapfunc.cpp
 msgid "BEEPBOOP!  Please remove non-organic object."
-msgstr ""
+msgstr "БИИИПБИП! Пожалуйста, удалите неорганический объект."
 
 #: src/trapfunc.cpp
 msgid "The dissector lights up, and shuts down."
@@ -246227,7 +251816,7 @@ msgstr "Ваш %s обжигается о лаву!"
 
 #: src/trapfunc.cpp
 msgid "You fail to attach it…"
-msgstr ""
+msgstr "Вам не удалось прикрепить это…"
 
 #: src/trapfunc.cpp
 msgid "There's nowhere to pull yourself to, and you sink!"
@@ -246297,6 +251886,15 @@ msgstr "<npcname> провалился на уровень ниже!"
 msgid "You fall down under %s!"
 msgstr "Вы падаете под %s!"
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] "Вы падаете на %d этаж ниже!"
+msgstr[1] "Вы падаете на %d этажа ниже!"
+msgstr[2] "Вы падаете на %d этажей ниже!"
+msgstr[3] "Вы падаете на %d этажей ниже!"
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname> машет крыльями и аккуратно приземляется."
@@ -246347,7 +251945,7 @@ msgstr "Обстановка изменяется!"
 
 #: src/trapfunc.cpp
 msgid "Failed to generate the new map"
-msgstr ""
+msgstr "Не удалось сгенерировать новую карту."
 
 #: src/trapfunc.cpp
 msgid "You feel your life force sapping away."
@@ -246368,20 +251966,22 @@ msgstr "Установить режимы прицеливания туреле
 
 #: src/turret.cpp
 msgid "auto -> manual"
-msgstr ""
+msgstr "автоматический -> ручной"
 
 #: src/turret.cpp
 msgid "manual -> auto"
-msgstr ""
+msgstr "ручной -> автоматический"
 
 #: src/turret.cpp
 msgid "manual (turret control unit required for auto mode)"
-msgstr ""
+msgstr "ручной (для автоматического режима требуется блок управления турелью)"
 
 #: src/turret.cpp
 msgid ""
 "Can't aim turrets: all turrets are offline or set to manual targeting mode."
 msgstr ""
+"Нельзя целиться турелями: все турели в автономном режиме или в режиме "
+"ручного прицеливания."
 
 #: src/turret.cpp
 msgid "Aim which turret?"
@@ -246434,11 +252034,18 @@ msgid ""
 "normal worlds.  Weird things might happen when you load this save.  You have"
 " been warned."
 msgstr ""
+"Вы сохранились при прохождении обучения — в мире обучения отсутствуют "
+"некоторые особенности нормальных миров. Странные вещи могут случиться, если "
+"вы загрузите это сохранение. Вас предупредили."
 
 #: src/veh_interact.cpp
 msgid "Select part"
 msgstr "Выбрать деталь"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white>Требуется времени:</color>\n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr "<color_white>Требуемые навыки:</color>\n"
@@ -246615,11 +252222,11 @@ msgstr "Искать часть"
 
 #: src/veh_interact.cpp
 msgid "Your morale is too low to construct…"
-msgstr ""
+msgstr "Ваше моральное состояние не позволяет что-либо мастерить…"
 
 #: src/veh_interact.cpp
 msgid "It's too dark to see what you are doing…"
-msgstr ""
+msgstr "Слишком темно для того, чтобы видеть, что вы делаете…"
 
 #: src/veh_interact.cpp
 msgid "You can't install parts while driving."
@@ -246627,7 +252234,7 @@ msgstr "Вы не можете устанавливать детали, пока
 
 #: src/veh_interact.cpp
 msgid "Installing this part will make the vehicle unfoldable.  Continue?"
-msgstr ""
+msgstr "Установка этой детали сделает транспорт не складным. Продолжить?"
 
 #: src/veh_interact.cpp
 msgid "Choose shape:"
@@ -246635,7 +252242,7 @@ msgstr "Выбор формы:"
 
 #: src/veh_interact.cpp
 msgid "Your morale is too low to repair…"
-msgstr ""
+msgstr "У вас слишком низкая мораль для ремонта…"
 
 #: src/veh_interact.cpp
 msgid "You can't repair stuff while driving."
@@ -246655,7 +252262,7 @@ msgstr "Эту часть нельзя отремонтировать."
 
 #: src/veh_interact.cpp
 msgid "Your morale is too low to mend…"
-msgstr ""
+msgstr "У вас слишком низкая мораль для исправления дефектов…"
 
 #: src/veh_interact.cpp
 msgid "No faulty parts require mending."
@@ -246833,7 +252440,7 @@ msgstr "Вы не можете перелить из движущейся маш
 
 #: src/veh_interact.cpp
 msgid "Select part to siphon:"
-msgstr ""
+msgstr "Выберите часть для сливания жидкости:"
 
 #: src/veh_interact.cpp
 msgid "The vehicle has no solid fuel left to remove."
@@ -247317,7 +252924,7 @@ msgstr "Потеряно соединение с транспортом из-з
 #: src/vehicle.cpp
 #, c-format
 msgid "the %s emitting a beep and saying \"Obstacle detected!\""
-msgstr ""
+msgstr "%s издаёт звуковой сигнал и произносит: \"Обнаружено препятствие!\""
 
 #. ~ backfire sound
 #: src/vehicle.cpp
@@ -247383,6 +252990,8 @@ msgid ""
 "A part of the vehicle ('%s') has no containing vehicle's name.  It will be "
 "detached from the %s vehicle."
 msgstr ""
+"Часть транспорта (%s) не содержит имени. Она будет отсоединена от транспорта"
+" (%s)."
 
 #: src/vehicle.cpp
 #, c-format
@@ -247491,7 +253100,7 @@ msgstr "%2$s машины (%1$s) уничтожено!"
 
 #: src/vehicle_display.cpp
 msgid "More parts here…"
-msgstr ""
+msgstr "Ещё запчасти…"
 
 #: src/vehicle_display.cpp
 #, c-format
@@ -247889,7 +253498,7 @@ msgstr "дисковый резак"
 #: src/vehicle_use.cpp
 msgctxt "electronics menu option"
 msgid "roadheader"
-msgstr ""
+msgstr "горнопроходчик"
 
 #: src/vehicle_use.cpp
 msgctxt "electronics menu option"
@@ -247968,7 +253577,7 @@ msgstr "Вы могли бы завести его отвёрткой."
 
 #: src/vehicle_use.cpp
 msgid "You destroy the controls…"
-msgstr ""
+msgstr "Вы уничтожаете управление…"
 
 #: src/vehicle_use.cpp
 msgid "You damage the controls."
@@ -247992,25 +253601,27 @@ msgstr "Запомнить положение транспорта"
 
 #: src/vehicle_use.cpp
 msgid "Choose action for the autopilot"
-msgstr ""
+msgstr "Выберите действие для автопилота"
 
 #: src/vehicle_use.cpp
 msgid "Patrol…"
-msgstr ""
+msgstr "Патрулирование…"
 
 #: src/vehicle_use.cpp
 msgid ""
 "Program the autopilot to patrol a nearby vehicle patrol zone.  If no zones "
 "are nearby, you will be prompted to create one."
 msgstr ""
+"Программирует автопилот автомобиля для патрулирования патрульной зоны. Если "
+"поблизости нет ни одной зоны, вам будет предложено ее создать."
 
 #: src/vehicle_use.cpp
 msgid "Stop…"
-msgstr ""
+msgstr "Стоп…"
 
 #: src/vehicle_use.cpp
 msgid "Stop all autopilot related activities."
-msgstr ""
+msgstr "Остановите все действия, связанные с автопилотом."
 
 #: src/vehicle_use.cpp
 msgid "You stop keeping track of the vehicle position."
@@ -248062,7 +253673,7 @@ msgstr "Нажать на гудок"
 
 #: src/vehicle_use.cpp
 msgid "Control autopilot"
-msgstr ""
+msgstr "Управлять автопилотом"
 
 #: src/vehicle_use.cpp
 msgid "Disable cruise control"
@@ -248215,7 +253826,7 @@ msgstr "Вы сигналите, но ничего не происходит."
 #: src/vehicle_use.cpp
 #, c-format
 msgid "Move how many?  [Have %d] (0 to cancel)"
-msgstr ""
+msgstr "Сколько переместить? [Есть %d] (0 — отмена)"
 
 #: src/vehicle_use.cpp
 msgid "a simple melody blaring from the loudspeakers."
@@ -248298,7 +253909,7 @@ msgstr "В автоклаве можно стерилизовать только
 
 #: src/vehicle_use.cpp
 msgid "You should put your CBMs in autoclave pouches to keep them sterile."
-msgstr ""
+msgstr "Вы должны поместить ваши КБМ в автоклав для стерилизации."
 
 #: src/vehicle_use.cpp
 msgid "You turn the autoclave on and it starts its cycle."
@@ -248434,12 +254045,12 @@ msgstr "Вы распрягаете вашего %s."
 
 #: src/vehicle_use.cpp
 msgid "Load a vehicle on the rack"
-msgstr ""
+msgstr "Погрузить транспорт на стойку"
 
 #: src/vehicle_use.cpp
 #, c-format
 msgid "Remove the %s from the rack"
-msgstr ""
+msgstr "Снять %s со стойки"
 
 #: src/vehicle_use.cpp
 msgid "Examine vehicle"
@@ -248562,7 +254173,7 @@ msgstr "Силовая броня защищает вас от кислотно
 
 #: src/weather.cpp
 msgid "The acid rain stings, but is mostly harmless for now…"
-msgstr ""
+msgstr "Капли кислотного дождя слегка обжигают, но пока в основном безвредны…"
 
 #: src/weather.cpp
 msgid "Your umbrella protects you from the acid rain."
@@ -248650,7 +254261,7 @@ msgstr "%s Ночь"
 #: src/weather.cpp
 #, c-format
 msgid "%s… %s. Highs of %s. Lows of %s. "
-msgstr ""
+msgstr "%s… %s. От %s до %s. "
 
 #: src/weather.cpp
 #, c-format
@@ -248867,13 +254478,15 @@ msgstr ""
 #: src/wish.cpp
 #, c-format
 msgid "Spawned %d monsters, choose another or [%s] to quit."
-msgstr ""
+msgstr "Создано %d монстров, выберите другого или жмите [%s] для выхода."
 
 #: src/wish.cpp
 msgid ""
 "\n"
 "Target location is not suitable for placing this kind of monster.  Choose a different target or [i]ncrease the groups size."
 msgstr ""
+"\n"
+"Выбранное местоположение не подходит для размещения такого монстра. Выберите другую цель или увеличьте [i] размер группы."
 
 #: src/wish.cpp
 msgid "Add which flag?  Use UPPERCASE letters without quotes"
@@ -248905,6 +254518,7 @@ msgstr "Сколько?"
 #, c-format
 msgid "Wish granted.  Wish for more or hit [%s] to quit."
 msgstr ""
+"Желаемое получено. Выберите ещё что-нибудь или нажмите «%s» для выхода."
 
 #: src/wish.cpp
 msgid "Select a skill to modify"
@@ -248912,7 +254526,7 @@ msgstr "Выберите навык для изменения"
 
 #: src/wish.cpp
 msgid "Modify all skills…"
-msgstr ""
+msgstr "Подправить все навыки…"
 
 #: src/wish.cpp
 #, c-format
@@ -248921,7 +254535,7 @@ msgstr "@ %d: %s "
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
+msgid "Set '%s' to…"
 msgstr "Установить «%s» на…"
 
 #: src/wish.cpp
@@ -249021,7 +254635,7 @@ msgstr "Порядок загрузки модов"
 #: src/worldfactory.cpp
 #, c-format
 msgid "…%s = View full description "
-msgstr ""
+msgstr "… %s= Полное описание "
 
 #: src/worldfactory.cpp
 msgid "--NO AVAILABLE MODS--"
@@ -249060,6 +254674,7 @@ msgstr "________ИМЯ НЕ ВВЕДЕНО!________"
 #: src/worldfactory.cpp
 msgid "Are you SURE you're finished?  World name will be randomly generated."
 msgstr ""
+"Вы УВЕРЕНЫ, что закончили? Будет сгенерировано случайное название мира."
 
 #: src/worldfactory.cpp
 #, c-format
@@ -249067,6 +254682,8 @@ msgid ""
 "%s = Save Load Order as default.  %s = Controls %s/%s = Prev/Next Option.  "
 "%s/%s = Prev/Next Tab."
 msgstr ""
+"%s = сохранить порядок загрузки модов. %s = помощь. %s/%s = "
+"предыдущая/следующая настройка. %s/%s = предыдущая/следующая вкладка."
 
 #: src/worldfactory.cpp
 msgid "World Mods"
diff --git a/lang/po/zh_CN.po b/lang/po/zh_CN.po
index 61a7cd1155fd2..b458204fdcb6f 100644
--- a/lang/po/zh_CN.po
+++ b/lang/po/zh_CN.po
@@ -11,7 +11,6 @@
 # Howlaind <jinghaotian94@126.com>, 2018
 # Hua Liang <kissoul@gmail.com>, 2018
 # 等离子 坦克 <plasmatank@163.com>, 2019
-# zao lv <glacias3183@gmail.com>, 2019
 # ShenMian <shenmian000@outlook.com>, 2019
 # iopop, 2019
 # Alan Zk <488872@qq.com>, 2019
@@ -35,25 +34,28 @@
 # Mizu Izumi, 2019
 # Silencess Shakespeare <deng_xiang_x@126.com>, 2019
 # fei li <busizhe0715@gmail.com>, 2019
-# Middo Miku <18119928570@163.com>, 2019
 # Jerry Shell <calljerryli@outlook.com>, 2019
-# 何方神圣 何 <1366003560@qq.com>, 2019
 # D Laboratory <inactive+dlaboratory@transifex.com>, 2019
 # L rient <1972308206@qq.com>, 2019
 # JeffChen <timercrack@gmail.com>, 2019
 # Aloxaf <aloxafx@gmail.com>, 2019
 # ehnuhc <ehnuhc@gmail.com>, 2019
-# cainiao <cainiaowu@hotmail.com>, 2019
-# Jianxiang Wang <qrox@sina.com>, 2019
 # Amans Tofu <kwl01skz@gmail.com>, 2019
+# zao lv <glacias3183@gmail.com>, 2019
+# 何方神圣 何 <1366003560@qq.com>, 2019
+# Jianxiang Wang <qrox@sina.com>, 2019
+# Middo <18119928570@163.com>, 2019
+# Mein Führer <851000914@qq.com>, 2019
+# 鑫 江 <779384468@qq.com>, 2019
+# cainiao <cainiaowu@hotmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
-"Last-Translator: Amans Tofu <kwl01skz@gmail.com>, 2019\n"
+"Last-Translator: cainiao <cainiaowu@hotmail.com>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -236,13 +238,24 @@ msgstr "钚浆"
 msgid ""
 "Highly radioactive slurry.  It is probably best to get far away from this."
 msgstr ""
-"一些呈浆液状、具有高放射性的液态核材料，不宜接近。\n"
+"一些呈浆液状、具有高放射性的液态核材料，不宜接近，更不能直接饮用。\n"
 "\"使酒鬼真正成为鬼。\""
 
 #: lang/json/AMMO_from_json.py
 msgid "watery plutonium slurry"
 msgstr "液态钚浆"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr "石头"
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr "一个棒球大小的岩石。可以当一个凑合的近战武器，也可以当作投掷武器。"
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "石子"
@@ -741,7 +754,7 @@ msgstr "土制尖刺火箭"
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
+" of this grade of weapon, but packs a fierce punch… if it hits."
 msgstr ""
 "一支用一根钢管里面装满代用的火箭燃料，然后再在前端焊上一条尖刺的自制火箭，毕竟是土制武器，精准度不佳，但是还是能造成一定的伤害。\n"
 "\"一切的前提是能打的中……\""
@@ -794,8 +807,8 @@ msgstr "电石（未反应完全）"
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
 msgstr "煤炭和石灰反应生成电石的中间态，当前状态下无法投入应用。"
 
 #: lang/json/AMMO_from_json.py
@@ -1207,8 +1220,8 @@ msgstr[0] "氧化锌"
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
 msgstr "一捧氧化锌粉末。可以被还原成锌，或者将其用于其他的化学反应。"
 
 #: lang/json/AMMO_from_json.py
@@ -1219,7 +1232,7 @@ msgstr[0] "二氧化锰"
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr "一捧二氧化锰粉末。在自然状况下一般存在于软锰矿中，在商业上常被用来生产碱和碳锌电池。"
@@ -1232,10 +1245,10 @@ msgstr[0] "氯化钾"
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr ""
 "一捧氯化钾粉末。尽管它在自然状况下存在于钾盐矿中，但它又会在硝石和盐酸反应中作为副产品产生。它本身可以用来制造化肥，或用电解法制造氢氧化钾。"
 
@@ -1247,8 +1260,8 @@ msgstr[0] "氢氧化钾"
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
 msgstr "一捧氢氧化钾。俗称苛性钾，由于其腐蚀性很强，在工业上用途很多。除其他应用外，它还可以用作碱性电池的电解液。"
 
@@ -1275,9 +1288,9 @@ msgstr[0] "盐酸"
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
 msgstr "氢氯酸，又称盐酸。它是一种强酸，具有独特的气味，自从被发现以来就被广泛使用。迄今为止它仍有大量用途。"
 
 #: lang/json/AMMO_from_json.py
@@ -1510,8 +1523,8 @@ msgstr[0] "火柴火药"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
 msgstr "一些取自火柴头的火柴火药，特性类似黑火药，但威力略弱。当你缺少其他更合适的物品时，可以勉强用它来制造爆炸物和引信。"
 
 #: lang/json/AMMO_from_json.py
@@ -1865,7 +1878,7 @@ msgstr[0] "火焰喷射器燃料"
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
 msgstr "由等量的汽油和柴油混合而成。特殊的燃烧性质使其无法再像汽油或柴油一样使用，但是可以用作火焰喷射器的燃料。"
@@ -3241,36 +3254,49 @@ msgid "reloaded .460 Rowland"
 msgstr ".460 罗兰德弹（复装）"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr ".50 BMG 曳光弹"
+msgid ".50 BMG M17 tracer"
+msgstr ".50 BMG M17 曳光弹"
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M17 tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
-msgstr "一些.50 BMG 狙击弹的曳光弹改进型，曳光弹种可帮助保持对射击目标的瞄准，但同时也有引燃可燃物的危险。"
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
+msgstr ".50 BMG 弹的曳光弹型号。曳光弹种可帮助保持对射击目标的瞄准，但同时也有引燃可燃物的危险。"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr ".50 BMG 普通弹"
+msgid ".50 BMG M33 Ball"
+msgstr ".50 BMG M33 普通弹"
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-".50 BMG "
-"普通弹是非常强大的步枪弹，设计用于长距离使用。它所拥有的惊人精度和穿甲力使它成为有史以来最致命的弹药之一，但缺点是其巨大的后坐力以及发射噪声。"
+"661格令的.50 BMG M33 普通弹型号，使用软钢芯全金属被甲弹弹头。.50 "
+"口径弹药是非常强大的步枪弹，原本设计用于防空，但后来也被改用于反载具和反步兵用途。它所拥有的惊人威力和穿甲力使它成为有史以来最致命的弹药之一，但缺点是其巨大的后坐力以及发射噪声。"
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Match"
+msgstr ".50 BMG 竞赛弹"
+
+#. ~ Description for .50 BMG Match
+#: lang/json/AMMO_from_json.py
+msgid ""
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
+msgstr ".50 BMG 的竞赛用型号，采用铅芯全金属被甲弹头。制造标准更严苛，用于长距离射击竞赛或供其他精确步枪使用。"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
-msgstr ".50 BMG 穿甲弹"
+msgid ".50 BMG M2 AP"
+msgstr ".50 BMG M2 穿甲弹"
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
@@ -3279,6 +3305,25 @@ msgstr ""
 "一种相对比较少见的.50 "
 "勃朗宁机枪弹，它的弹头中原本灌铅的地方，换成了一个极为坚硬的钨钢穿甲弹芯，这大大改善了它的穿甲能力，但是高穿甲的代价是伤害比铅芯子弹要小一些。"
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr ".50 BMG 诺霍斯 Mk 211 弹"
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+"这款 .50 BMG "
+"弹型号充分利用了自身口径的潜在载荷发射能力：弹尖内装入了特殊的燃烧剂，会在撞击时点燃，并引爆RDX或PETN装药。此外还会点燃环绕在碳化钨穿甲弹头周围的锆粉，两者被同时密封在软钢杯中。钢杯碎片和燃烧的金属粉末跟随着穿甲弹头穿过装甲目标，增加了杀伤力。这种罕见复杂且昂贵的弹药几乎不可能再次被制造出来；慎重使用。"
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
 msgstr ".50 BMG 曳光弹（复装）"
@@ -3286,25 +3331,26 @@ msgstr ".50 BMG 曳光弹（复装）"
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
-msgstr "一些.50 BMG 狙击弹的曳光弹改进型，曳光弹种可帮助保持对射击目标的瞄准，但同时也有引燃可燃物的危险。这是手工复装的型号。"
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
+msgstr ".50 BMG 弹的曳光弹型号。曳光弹种可帮助保持对射击目标的瞄准，但同时也有引燃可燃物的危险。这是手工复装的型号。"
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr ".50 BMG 普通弹（复装）"
+msgid "reloaded .50 BMG Match"
+msgstr ".50 BMG 竞赛弹（复装）"
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-".50 BMG "
-"普通弹是非常强大的步枪弹，设计用于长距离使用。它所拥有的惊人精度和穿甲力使它成为有史以来最致命的弹药之一，但缺点是其巨大的后坐力以及发射噪声。这是手工复装的型号。"
+".50 BMG 弹，使用铅芯全金属被甲弹弹头。.50 "
+"口径弹药是非常强大的步枪弹，原本设计用于防空，但后来也被改用于反载具和反步兵用途。它所拥有的惊人威力和穿甲力使它成为有史以来最致命的弹药之一，但缺点是其巨大的后坐力以及发射噪声。这是手工复装的型号。"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
@@ -3313,12 +3359,11 @@ msgstr ".50 BMG 穿甲弹（复装）"
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
 msgstr ""
-"一种相对比较少见的.50 BMG "
-"弹，它弹头中原本灌铅的地方换成了一个极为坚硬的钨钢穿甲弹芯，这大大改善了它的穿甲能力，但是高穿甲的代价是伤害比铅芯子弹要小一些。这是手工复装的型号。"
+"一种相对比较少见的 .50 BMG "
+"弹，它弹头中原本灌铅的地方换成了一个极为坚硬的钢质穿甲弹芯，这大大改善了它的穿甲能力，但是高穿甲的代价是伤害比铅芯子弹要小一些。这是手工复装的型号。"
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -3404,7 +3449,7 @@ msgid ""
 "feature."
 msgstr ""
 "31格令的5.7x28mm SS190 全金属被甲穿甲弹。5.7x28mm口径子弹是由FN "
-"Herstal公司设计，计划用来在北约中取代9x19mm口径子弹的弹种。尽管弹种取代计划被最终取消了，5.7x28mm口径子弹也已经在许多地区冲突中得到了使用，并证明了它的可靠性能。该种弹药的后坐力很低，并且穿甲性能不俗。"
+"Herstal公司设计，计划用来在北约中取代9x19mm鲁格弹的弹种。尽管弹种取代计划被最终取消了，5.7x28mm口径子弹也已经在许多地区冲突中得到了使用，并证明了它的可靠性能。该种弹药的后坐力很低，并且穿甲性能不俗。"
 
 #: lang/json/AMMO_from_json.py
 msgid "5.7x28mm blackpowder"
@@ -3423,7 +3468,7 @@ msgid ""
 "projectiles."
 msgstr ""
 "31格令的5.7x28mm SS190 全金属被甲穿甲弹。5.7x28mm口径子弹是由FN "
-"Herstal公司设计，计划用来在北约中取代9x19mm口径子弹的弹种。尽管弹种取代计划被最终取消了，5.7x28mm口径子弹也已经在许多地区冲突中得到了使用，并证明了它的可靠性能。该种弹药的后坐力很低，但由于使用的是简单的铅芯而不是正规的工厂制造的穿甲弹芯，因此没有常规弹药的对于装甲的穿透力。"
+"Herstal公司设计，计划用来在北约中取代9x19mm鲁格弹的弹种。尽管弹种取代计划被最终取消了，5.7x28mm口径子弹也已经在许多地区冲突中得到了使用，并证明了它的可靠性能。该种弹药的后坐力很低，但由于使用的是简单的铅芯而不是正规的工厂制造的穿甲弹芯，因此没有常规弹药的对于装甲的穿透力。"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 5.7x28mm"
@@ -3856,8 +3901,7 @@ msgid ""
 "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the "
 "Makarov PM.  As the designation implies, it is a bit shorter in case length "
 "compared to 9mm Parabellum.  This one has been hand-reloaded."
-msgstr ""
-"9x18mm口径马卡洛夫手枪弹，主要用于马卡洛夫PM手枪的前苏联制式子弹。正如其名所示，弹壳长度略短于9mm口径帕拉贝姆手枪弹。这是手工复装的型号。"
+msgstr "9x18mm口径马卡洛夫手枪弹，主要用于马卡洛夫PM手枪的前苏联制式子弹。正如其名所示，弹壳长度略短于9mm鲁格弹。这是手工复装的型号。"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded 9x18mm +P+"
@@ -4288,6 +4332,113 @@ msgstr "一些真菌种子。"
 msgid "fungal flower"
 msgstr "真菌花"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr "钾矾"
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+"颗粒状的水溶性白色晶体，散发出淡淡的金属气味，在历史上有许多不同的用途。也被称为钾明矾或硫酸铝钾；通常也简称为明矾，因为它是明矾类化合物中最重要的一员。"
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr "染布染料粉"
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr "一些粉状的彩色染布染料，如果与水和媒染剂结合在一起，可用于多种织物的染色。"
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr "钢制带扣"
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr "一个钢制带扣，就是在皮带上缝着的那种。"
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr "塑料纽扣"
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr ""
+"一颗塑料纽扣，就是在衣服上缝着的那种。\n"
+"“临行密密缝，回来重新缝。”"
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr "钢制纽扣"
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr ""
+"一颗钢制纽扣，就是在衣服上缝着的那种。\n"
+"“就是这颗钢制纽扣保护了我的心脏不被子弹击中，可我头都被打爆了。”"
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr "木制纽扣"
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr ""
+"一颗粗糙的木质纽扣，基本只能在非常古老的衣物上面才能找到了。\n"
+"“古风cosplay？你这是叫我头上插羽毛当印第安酋长？你的性癖很怪耶”"
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr "钢制按扣"
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr "一颗钢制按扣，就是在一般衣物上缝着的那些。"
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr "魔术贴"
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr "一对布条，其中一条表面有许多小钩子，另一条表面有许多小环。通常用作服装和鞋类的扣件。"
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr "长塑料拉链"
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr "一条用塑料制成的长拉链，就是在衣服上缝着的那种。"
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr "短塑料拉链"
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr "一条用塑料制成的短拉链，就是在鞋类和衣袋上缝着的那种。"
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -4432,7 +4583,7 @@ msgstr[0] "锌"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
 msgstr "一种稍微有些易碎的金属。除了是人体必需的微量元素之一外，它和酸、碱或其他非金属也很容易发生反应，因此可以打碎成锌粉用于电池等物品的制造。"
@@ -4511,7 +4662,7 @@ msgstr "门铰链"
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
 msgstr "由两个带螺孔的金属板组成的小金属铰链。用来制造活页门。"
 
@@ -4562,6 +4713,343 @@ msgid ""
 "explosions."
 msgstr "一小段导火索，长度足够让你有时间逃离爆炸。"
 
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr "橡胶鞋底"
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr "一个由橡胶制成的鞋底，就是在靴子底部的那种。可以用来做一双真正的靴子。"
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] "棉布碎片"
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr "形状奇特的小块棉布，某次裁剪产生的废料。没什么大用途，通常会被丢弃，但如果你实在想的话，可以从其中回收些缝衣线。"
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] "人造毛皮碎片"
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr "形状奇特的小块人造毛皮，某次裁剪产生的废料。没什么大用途，通常会被丢弃。"
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] "毛毡碎片"
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr "形状奇特的小块毛毡，某次裁剪产生的废料。没什么大用途，通常会被丢弃，但如果你实在想的话，可以从其中回收些毛线。"
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] "毛皮碎片"
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr "形状奇特的小块毛皮，某次裁剪产生的废料。没什么大用途，通常会被丢弃。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] "凯夫拉碎片"
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+"形状奇特的小块凯夫拉片，某次裁剪产生的废料。没什么大用途，通常会被丢弃，但由于凯夫拉材料在末日废土上很罕见，它还是值得你花些时间回收成凯夫拉纤维的。"
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] "皮革碎片"
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr "形状奇特的小块皮革，某次裁剪产生的废料。没什么大用途，通常会被丢弃。"
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] "莱卡碎片"
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr "形状奇特的小块莱卡面料，某次裁剪产生的废料。没什么大用途，通常会被丢弃。"
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] "氯丁橡胶碎片"
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr "形状奇特的小块氯丁橡胶，某次裁剪产生的废料。没什么大用途，通常会被丢弃。"
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] "化纤碎片"
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr "形状奇特的小块化纤面料，某次裁剪产生的废料。没什么大用途，通常会被丢弃。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] "芳纶碎片"
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr "形状奇特的小块防火芳纶，某次裁剪产生的废料。没什么大用途，通常会被丢弃，但由于芳纶材料在末日废土上很罕见，它还是值得你花些时间回收的。"
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr "棉布面料"
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr "一卷棉布面料，可以用来制作衣物。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] "棉布拼布"
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr "各类衣物部件，由棉布片采用拼布工艺缝制而成。可以用于制作大多数衣物，但比起使用正规材料来要花费更多时间。"
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr "人造毛皮面料"
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr "一卷颜色华丽的人造毛皮面料。可以用来制作保暖的衣物。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] "人造毛皮拼布"
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr "各类衣物部件，由人造毛皮片采用拼布工艺缝制而成。可以用于制作大多数衣物，但比起使用正规材料来要花费更多时间。"
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr "毛毡面料"
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr "一卷毛毡面料，可以用来制作衣物。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] "毛毡拼布"
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr "各类衣物部件，由毛毡片采用拼布工艺缝制而成。可以用于制作大多数衣物，但比起使用正规材料来要花费更多时间。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr "凯夫拉面料"
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr "一卷凯夫拉合成纤维面料，可以用于制造防弹装甲。这种形态和刚性装甲板不同，可以被用于缝制。"
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr "莱卡面料"
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr "一卷掺入了可拉伸的莱卡纤维的合成纤维面料。可以用来制作具有弹性而坚韧的衣物。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] "莱卡拼布"
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr "各类衣物部件，由莱卡片采用拼布工艺缝制而成。可以用于制作大多数衣物，但比起使用正规材料来要花费更多时间。"
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] "氯丁橡胶面料"
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr "一卷人工合成的氯丁橡胶。可以用来制作水下作业的衣物。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] "氯丁橡胶拼布"
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr "各类衣物部件，由氯丁橡胶片采用拼布工艺缝制而成。可以用于制作大多数衣物，但比起使用正规材料来要花费更多时间。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr "芳纶面料"
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr "一卷芳纶化纤面料，可以用来制作防火衣物。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] "芳纶拼布"
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr "各类衣物部件，由芳纶片采用拼布工艺缝制而成。可以用于制作大多数衣物，但比起使用正规材料来要花费更多时间。"
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr "化纤面料"
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr "一卷化纤面料，可以用来制作衣物。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] "化纤拼布"
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr "各类衣物部件，由化纤片采用拼布工艺缝制而成。可以用于制作大多数衣物，但比起使用正规材料来要花费更多时间。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr "凯夫拉纤维"
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+"一些非常耐用的凯夫拉纤维，在制作防弹装甲时特别有用，不过在大多数情况下也能用来替代普通的缝衣线。制作盔甲级的凯夫拉面料需要特别紧密编织，因此需要专门机器才能制作。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr "芳纶纤维"
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr "一些防火的芳纶纤维，在制作防火装甲时特别有用，不过在大多数情况下也能用来替代普通的缝衣线。"
+
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
 msgid_plural "handloaded .22 CB"
@@ -5056,6 +5544,18 @@ msgid ""
 "burn hotly upon impact, piercing armor and igniting flammable substances."
 msgstr "重型通用燃烧弹，重机枪和军用设施使用，弹头受撞击会剧烈燃烧，造成穿甲效果并点燃易燃材料。"
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr "山铜箭"
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr "由山铜制成的箭，正发出神秘的光芒。射击后有很大概率可以保持完好，但是只能从神弓伊奇巴尔上射出。"
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -5099,10 +5599,35 @@ msgstr[0] "魔力水晶"
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
 msgstr "一些结晶化的魔力。可以注入魔力进行充能，但无法再抽取出来。"
 
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr "山铜块"
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr ""
+"一块沉重的奇特金属块，可以用于制造物品。\n"
+"\"亚特兰蒂斯传说中的稀有金属——奥利哈康\""
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr "山铜片"
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
+msgstr ""
+"一块发出神秘光芒的金属片。可以当作武器，但是更适合用于制造物品。\n"
+"\"亚特兰蒂斯传说中的稀有金属——奥利哈康\""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "fire lance charge"
 msgstr "火枪药"
@@ -5602,12 +6127,6 @@ msgstr ""
 "包含了各种有机材料的混合物，提供变形怪健康成长所需要的所有营养。\n"
 "\"可爱变形怪专用热销饲料。\""
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "石头"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -6112,8 +6631,10 @@ msgstr[0] "大刀鞘（肩）"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "你将%s收鞘"
@@ -6713,6 +7234,43 @@ msgid ""
 "small straps designed to better distribute the weight."
 msgstr "一件自制的锁链胸甲，这件无袖胸甲由多条带子连结，均匀地分散装甲的重量。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] "锁环镫靴"
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr "经过特别定制的锁环镫靴，覆盖了整个腿部，如同锁环制成的长筒女靴一样。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] "锁环手套"
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr "经过特别定制的锁环手套。完全覆盖了手指并提供极好的保护，但有点累赘。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] "法拉第锁环服"
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr "一套特别定制的锁环甲套装，可以穿在你正常的衣服上。衣服内各个部件是导电连接的，有效防护电击。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -6857,6 +7415,26 @@ msgstr ""
 "一件五颜六色的滑稽搞笑的小丑装扮服。\n"
 "\"丧尸没有小丑恐惧症。\""
 
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] "小丑假发"
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr "一顶五颜六色的滑稽搞笑的小丑假发。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] "小丑鼻"
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr "一个小丑常戴的红色乳胶假鼻子。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
@@ -7102,6 +7680,22 @@ msgstr ""
 "一件白色纽扣领的长袖衬衫。\n"
 "\"穿着像个专业人士！\""
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] "饮水帽"
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+"这套简单的自制装置由两个小型容器、一根塑胶管、一捆铁线和一些绳索制成，戴在头上之后不需要用手就可以方便地喝水。不过，如果你把它放进背包，里面的水就会洒掉。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -7234,6 +7828,30 @@ msgstr[0] "腰包"
 msgid "Provides a bit of extra storage, with minimal encumbrance."
 msgstr "一件固定在腰间的小包，以极小的累赘换取一点额外的储存空间。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] "腋下护甲"
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr "一件结实的棉质胸甲，能在击剑时保护大部分躯干、肩膀主要部分和腋下。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] "塑料胸甲"
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr "一件硬质塑料胸甲，有模制的胸罩，可供女子击剑运动员佩带，以在击剑时提供保护。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -7246,6 +7864,32 @@ msgid ""
 "accidents.  It doesn't have any storage room, but it is very comfortable."
 msgstr "一件拉链在背后、设计用于助于防止击剑等运动时发生意外击剑上衣。它没有储存空间，但相当舒适。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] "导电服（花剑）"
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr "一件轻薄的导电背心，背部有拉链，用于在击剑时电子计分。它的最外层是由结实的棉布和不锈钢丝交织而成的。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] "导电服（佩剑）"
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr "一件轻薄的导电夹克，用于在击剑时电子计分。它的最外层是由结实的棉布和不锈钢丝交织而成的。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -7266,6 +7910,30 @@ msgstr[0] "击剑裤"
 msgid "A pair of reinforced pants used by fencers to prevent injuries."
 msgstr "一条内有导电金属网加固的，防止击剑等运动时发生意外的击剑防护裤。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] "击剑护手"
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr "一只单面绒面手套，有着结实的棉制手腕，带衬垫的手背和合身的指套。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] "击剑护手（左）"
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr "一只单面绒面手套，有着结实的棉制手腕，带衬垫的手背和合身的指套。这只是左手用的。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -7612,18 +8280,6 @@ msgstr[0] "毛皮手套"
 msgid "A pair of warm fur gloves.  They are somewhat cumbersome."
 msgstr "一双包裹着重重毛皮的手套，非常暖和但有点累赘。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] "幸存者手套（潜水）"
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr "一双自制的凯夫拉-氯丁橡胶复合手套，更易于穿戴，即使在极端情况下也能提供最大防护。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -7680,6 +8336,19 @@ msgid ""
 "wear while providing maximum protection under extreme conditions."
 msgstr "一双自制的凯夫拉-布手套，更易于穿戴，旨在极端情况下也能提供最大防护。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] "无指幸存者手套"
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr "一双自制的无指凯夫拉-布手套，更易于穿戴，旨在极端情况下也能提供最大防护。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -7890,16 +8559,6 @@ msgid ""
 "excellent protection from environmental dangers."
 msgstr "一副特别针对恶劣的气候和有害物质、可为眼睛提供全方位的防护的大型护目镜。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] "游泳护目镜"
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "一副符合光学和医用标准，水下视物清晰、视野宽阔的游泳镜。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -7934,19 +8593,6 @@ msgid ""
 "A heavy, full-length wool coat.  Cumbersome, but warm and with deep pockets."
 msgstr "一件覆盖全身的、相当保暖的厚重羊毛大衣，提供比较可观的储存空间。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] "幸存者套装（潜水）"
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr "一件自制的轻型复合防护服，由防弹背心和强化橡胶潜水服组合而成，可以提供环境和伤害防护。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -8421,17 +9067,6 @@ msgstr[0] "幸存者兜帽（防火）"
 msgid "A customized armored Nomex and Kevlar hood, very strong and durable."
 msgstr "一件自制的凯夫拉-芳纶纤维防火兜帽，非常结实耐用。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] "幸存者兜帽（潜水）"
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr "一件自制的凯夫拉-氯丁橡胶复合兜帽，非常结实、耐用。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -9105,18 +9740,25 @@ msgid_plural "leather belts"
 msgstr[0] "皮带"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "你将%s放进你的%s。"
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "把什么放到腰带上？"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
 msgstr "一条常用于穿插在裤子上的皮带。"
 
@@ -9270,6 +9912,19 @@ msgid ""
 "variety is favored by the military."
 msgstr "一组扣绑在大腿上的小包，多功能战术包的一个种，可以用来放置随身物品，比如地图、指南针、防风火柴等等。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] "紧身连衣裤"
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr "一件紧身的氨纶连体服，覆盖了从腹股沟到肩膀的身体。它背后的圆低领和底部高腰的剪裁，能够在舞台上完美的展示出你的体型。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
 msgid_plural "Linux t-shirts"
@@ -10046,31 +10701,6 @@ msgid ""
 "Activate to sheathe/draw a weapon."
 msgstr "一个巨大的、用来放置大型刀剑类武器的可调整剑鞘。使用它来收拔武器。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] "防鲨服"
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr "一件潜水员用来防止被鲨鱼咬伤、覆及全身的一体链甲套装。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] "法拉第防鲨服"
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr "一件潜水员用来防止被鲨鱼咬伤、覆及全身的一体链甲套装。内部有电传导系统，有效防护电击。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
 msgid_plural "sheathes"
@@ -10138,6 +10768,18 @@ msgid ""
 "from cuts."
 msgstr "一件有着两个口袋的蓝色牛仔裤，又称\"坚固呢裤\"，很耐用，一种男女穿用的紧身便裤，这条是短裤款式。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] "保暖衬衫"
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr "一件轻便而合身的长袖氨纶底衫，有助于保持体温。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
@@ -10567,9 +11209,9 @@ msgstr[0] "研究样本服"
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
-msgstr "薄薄的、短袖和短腿的单件西装。由奇怪的剪裁和拼接来看…也许你不想知道是谁穿的了。提供了一定的储存空间，也不是很累赘。"
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
+msgstr "一件薄薄的、短袖和短腿的连体服。由奇怪的剪裁和拼接来看……也许你不想知道它之前被谁穿过。提供了一定的储存空间，也不是很累赘。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "suit"
@@ -10637,6 +11279,7 @@ msgstr[0] "幸存者腰带"
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "收刀"
@@ -10991,16 +11634,6 @@ msgstr ""
 "一顶经典设计的三角帽。帽檐做了防水设计，是以前加勒比一带海盗船长的标准装备。\n"
 "\"喔～～～～是谁住在深海的大菠萝里？！\""
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] "泳裤"
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "一件男性平角泳裤，有绳子可以绑。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
@@ -11240,52 +11873,6 @@ msgid ""
 "would be too casual and a suit would be just overdoing it."
 msgstr "一件优雅的背心。当穿衬衫太随意，穿正装又太过的时候，就选择它吧。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] "潜水服"
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "一件全身氯丁橡胶潜水服。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] "潜水手套"
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr "一双高延展性的氯丁橡胶手套，适合水下使用。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] "潜水服兜帽"
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr "一个橡胶的兜帽，通常是潜水员穿的。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] "连身泳衣"
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr ""
-"一件长袖的保暖潜水衣，上面有着粉红色的点缀。流线型的贴身设计充分彰显出你前凸后翘的傲人身材。虽然这件衣服安全性上没有全身潜水服好，但是其胜在轻便不勒身。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -11591,6 +12178,35 @@ msgid ""
 "Useful for improvised rain protection."
 msgstr "用绳子或线固定的塑料片，还算有效的临时防雨措施。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] "全身紧身衣"
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+"一件紧身的氨纶全身服，看上去像是由水手领的紧身连衣裤和长裤合体而成。通常由体操运动员，舞者和马戏演员穿着，全身紧身衣提供全面覆盖而又不影响灵活性。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] "全包紧身衣"
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+"又被称为\"ゼンタイ\"，全包紧身衣是一种由尼龙和氨纶制成的包裹全身的连体服。虽然它遮住了你的脸，但你可以通过其集成的兜帽看到外界。有几件这样的衣服，再找来一些朋友，你就可以办一场歌舞伎表演了。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -14101,6 +14717,133 @@ msgstr ""
 "一个DoubleTech制造的Mk. II-L型动力装甲，在Mk. "
 "I的基础上做出了很多改进，其中最为显著的是减轻了重量。和其他DoubleTech动力装甲相同，它的控制与温度调节系统只在与皮肤直接接触时启动。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] "泳裤"
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "一件男性平角泳裤，有绳子可以绑。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] "潜水服"
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "一件全身氯丁橡胶潜水服。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] "潜水服兜帽"
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr "一个橡胶的兜帽，通常是潜水员穿的。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] "幸存者兜帽（潜水）"
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr "一件自制的凯夫拉-氯丁橡胶复合兜帽，非常结实、耐用。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] "幸存者套装（潜水）"
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr "一件自制的轻型复合防护服，由防弹背心和强化橡胶潜水服组合而成，可以提供环境和伤害防护。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] "幸存者手套（潜水）"
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr "一双自制的凯夫拉-氯丁橡胶复合手套，更易于穿戴，即使在极端情况下也能提供最大防护。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] "连身泳衣"
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr ""
+"一件长袖的保暖潜水衣，上面有着粉红色的点缀。流线型的贴身设计充分彰显出你前凸后翘的傲人身材。虽然这件衣服安全性上没有全身潜水服好，但是其胜在轻便不勒身。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] "法拉第防鲨服"
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr "一件潜水员用来防止被鲨鱼咬伤、覆及全身的一体链甲套装。内部有电传导系统，有效防护电击。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] "防鲨服"
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr "一件潜水员用来防止被鲨鱼咬伤、覆及全身的一体链甲套装。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] "游泳护目镜"
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "一副符合光学和医用标准，水下视物清晰、视野宽阔的游泳镜。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] "潜水手套"
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr "一双高延展性的氯丁橡胶手套，适合水下使用。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
 msgid_plural "helmet nettings"
@@ -14679,6 +15422,50 @@ msgid "shotgun bandolier"
 msgid_plural "shotgun bandoliers"
 msgstr[0] "霰弹枪子弹带"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] "科技法师工具腰带"
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr "一条自制的皮革工具带，能够瞬间变出你所想要的任何工具。激活它来收拔武器。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] "七里靴"
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr "一双十分坚固却又非常舒适合身的旧钢头皮靴，看上去已经用了很久，而且能继续用上更久。穿上它让你移动变得轻松了不少。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] "加速靴"
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] "立地靴"
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr "一双十分坚固却又非常舒适合身的旧皮靴，上面雕刻着些似乎充满了橡胶的小型符文。穿上它能让你免疫电击。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -14699,9 +15486,9 @@ msgstr[0] "铜头环"
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
-msgstr "镶有铜边的木质头环，带上它的时候会接触你的太阳穴，这让你感到非常平静。"
+msgstr "镶有铜边的木质头环。在戴上它时按摩太阳穴会使你感到非常平静。"
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of black dragonscale boots"
@@ -14805,7 +15592,7 @@ msgstr[0] "迅捷绑带"
 #: lang/json/ARMOR_from_json.py
 msgid "wizard hat"
 msgid_plural "wizard hats"
-msgstr[0] "法师帽"
+msgstr[0] "魔法师帽"
 
 #. ~ Description for wizard hat
 #: lang/json/ARMOR_from_json.py
@@ -14879,6 +15666,22 @@ msgid ""
 "minimize encumbrance."
 msgstr "你的背上长出了一个坚硬的肉袋子，里面有细小的触手，可以抓住你放在里面的任何东西。它们不断改变和调整自己，以减少累赘。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] "防酸光环"
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr "一个覆盖全身的肉眼无法看见的防酸光环。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] "高等防酸光环"
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -15373,10 +16176,10 @@ msgstr[0] "酒精锅炉CBM"
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
-msgstr "一个生化酒精反应炉，燃烧效率极高。然而受体还是会受到醉酒的不良影响。"
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
+msgstr "一个生化酒精反应炉，燃烧效率极高。可以储存 500 毫升乙醇、甲醇或者改性酒精作为燃料。"
 
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid "Aero-Evaporator CBM"
@@ -15384,8 +16187,7 @@ msgid_plural "Aero-Evaporator CBMs"
 msgstr[0] "湿气凝水器CBM"
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -15449,10 +16251,10 @@ msgstr[0] "指端黑客仪CBM"
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
 "一台微型电子黑客仪，通过手术植入到右手的一根手指中。这种通用黑客单元可以用于重载控制面板及类似的系统，但是不能用于电脑。使用者的计算机学技能对成功至关重要，失败的尝试有可能造成身体损伤。"
 
@@ -15795,7 +16597,7 @@ msgstr[0] "Mk.II 型动力装甲接口CBM"
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
 "受体可以使用自身的生化能量供给动力装甲使用，而不再需要外接电源。这个型号比Mk. I型号的效率高了一倍，由DoubleTech设计以满足Mk. "
@@ -16323,8 +17125,7 @@ msgstr[0] "发光物质"
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
 msgstr "这是……某种东西，插上电源后会发光的东西。"
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
@@ -16855,9 +17656,9 @@ msgstr[0] "人类烹饪大全"
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
+msgid "It's… it's a cookbook!"
 msgstr ""
-"一本没有作者署名与标注发行出版社的奇怪烹饪书，内容包含一些令人感到恐怖的食人文化文章与大量\"做\"人配方。\n"
+"一本没有作者署名与标注发行出版社的奇怪烹饪书，内容包含一些令人感到恐怖的食人文化文章与大量\"做\"人方法。\n"
 "\"或是由食人族文化份子编著。\""
 
 #: lang/json/BOOK_from_json.py
@@ -16945,8 +17746,8 @@ msgstr[0] "PE050 \"Alpha\"：初步报告"
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
-msgstr "这叠文件上的日期是距大灾变发生两周前，详细分析了很多化学配方以及这些反应对于人体的影响。上面盖了一个鲜红的图章\"同意\"…"
+"\"APPROVED\"…"
+msgstr "这叠文件上的日期是距大灾变发生两周前，详细分析了很多化学配方以及这些反应对于人体的影响。上面盖了一个鲜红的图章\"同意\"……"
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Dionne"
@@ -16970,9 +17771,9 @@ msgstr[0] "PE065 \"Chimera\"：最佳实践报告"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
-msgstr "本文献对一种新的化学公式作了详细的描述，并对其的应用提供了指导。\"群体事件控制催化剂\"？天哪，这是怎么回事？"
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
+msgstr "这篇文献对一种新的化学公式作了详细的描述，并称其可以用作……\"群体事件控制催化剂\"？看起来不太妙……"
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Smythe"
@@ -16984,7 +17785,7 @@ msgstr[0] "研究日志-Smythe"
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
+"look promising but the procurement methods seem awfully vague…"
 msgstr "这本团队日志详尽记录了几类变异实验，研究样本是那些被XE037感染的活体组织。研究结果看起来很有希望，但样本获取方法却语焉不详……"
 
 #: lang/json/BOOK_from_json.py
@@ -16997,8 +17798,8 @@ msgstr[0] "管道维护日志"
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
-msgstr "这个日志内有标明如何定期维护好管道，然而，一些记录表中似乎充满了…化学式？"
+"with… a chemical formula?"
+msgstr "这个日志内详细列出了机构内的数套管道系统的维护计划。不过，有几页记录表上似乎写着一道……化学式？"
 
 #: lang/json/BOOK_from_json.py
 msgid "chemical reference-CLASSIFIED"
@@ -17038,8 +17839,8 @@ msgstr[0] "PE023 \"Medical\"：应用及结果"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
-msgstr "这些尖端技术论文描述了一些全新的化学配方以及他们在人类实验者身上的效果。上面盖着\"通过\"的印章。"
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
+msgstr "这些尖端技术论文描述了一些全新的化学配方以及他们在人类实验者身上的效果。上面盖着\"通过\"的印章……"
 
 #: lang/json/BOOK_from_json.py
 msgid "PE070 \"Raptor\": Proposal"
@@ -17301,7 +18102,7 @@ msgstr[0] "研究日志-埃雷拉"
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
+"symbols you've not seen before…"
 msgstr "这个沉重的活页夹里装满了各种图表，以及许多电子仪器的技术要点。有些图表上的符号你还是第一次见到……"
 
 #: lang/json/BOOK_from_json.py
@@ -17364,13 +18165,13 @@ msgstr[0] "泛用原理图"
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -17689,8 +18490,8 @@ msgstr[0] "复装弹药大全"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
 msgstr ""
 "这本书介绍了关于手工复装弹药的一切知识，而且封面上还有个……儿童锁，显然是为了让发行商免责而设置的，因为关于爆炸弹的章节描写的也太过于详细了。"
 
@@ -18159,7 +18960,7 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr "这本团队日志记满了一个核能研究团队对核能技术的发现和改良内容。你并不想用核平带来另一个大灾变，但是上面一些通用的技术信息也许会派上用场……"
 
 #: lang/json/BOOK_from_json.py
@@ -18421,11 +19222,7 @@ msgid ""
 "A book that embodies the main beliefs of the Church of the Flying Spaghetti "
 "Monster.  It seems to involve a lot of pirates and some sort of invisible "
 "drunken monster made of pasta."
-msgstr ""
-"飞天意面神教（英文：Flying Spaghetti "
-"Monster，缩写：FSM，又译飞面大神，简称面神），是讽刺性的虚构宗教飞行面条怪物信仰（英文：Church of the Flying "
-"Spaghetti "
-"Monster，或称Pastafarianism，又译飞面神教）信奉的神祇，此虚构宗教的讽刺对象主要是某些宗教教派所宣称的智能设计论（生物并非出于演化，而是源自某种超自然智能的设计）。该教声称\"飞行面条怪物\"创造了世间万物，因而尊奉其为上帝。借助互联网，这个\"宗教\"现象很快获得了媒体关注，知名度蹿升，并吸引众多的追随者。很多无神论和不可知论者也借此现象阐释自己的观点。总而言之，就是群无厘头的宗教。"
+msgstr "一本描写了飞天意面神教的主要信仰的书籍。这本书里面似乎包含了大量有关海盗和某种酗酒的隐身意面怪物的描写。RAmen！"
 
 #: lang/json/BOOK_from_json.py
 msgid "Quran"
@@ -19486,6 +20283,34 @@ msgstr ""
 "FM-2030所著的《UpWingers: A Futurist Manifesto（上翼：未来主义宣言）》。看上去作者的真名好像是Fereidoun "
 "M. Esfandiary（费雷登·伊斯凡迪亚里）"
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr "一本《巴斯夏文集》，19世纪法国的古典自由主义理论家弗雷德里克·巴斯夏的大型文集。"
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr "一本《无政府、国家和乌托邦》，罗伯特·诺齐克著，这是现代自由主义最具影响力的著作之一。"
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr "一本《社会主义》，路德维希·冯·米塞斯著，一部对社会主义的批判性分析著作。"
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr "一本《共产主义ABC》，尼古拉·布哈林著，这是马列主义早期最具影响力的著作之一。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr "路德维希·冯·米塞斯所著的《反资本主义的心态》。"
+
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
 msgid_plural "phone books"
@@ -19557,8 +20382,8 @@ msgstr[0] "公司会计总账"
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
-msgstr "一册账本，某笔交易显得尤为突出。"
+msgid "If you knew what to look for something might stand out…"
+msgstr "一册账本，如果你看懂的话，某笔交易显得尤为突出…..."
 
 #: lang/json/BOOK_from_json.py
 msgid "patient treatment records"
@@ -19798,6 +20623,106 @@ msgstr "大仲马所著的《基督山伯爵》。"
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr "弗朗西丝·霍奇森·伯内特所著的《秘密花园》。"
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr "英国作家西索·史考特·佛瑞斯特所著的《海军上尉霍恩布洛尔》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr "一本《怒海争锋》，英国作家帕特里克·奥布赖恩所著。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr "这是一本英国作家安东尼·特罗洛普的代表作《巴塞特郡养老院》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr "一本《极地远征》，英国作家帕特里克·奥布赖恩所著。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr "一本《惊奇号》，英国作家帕特里克·奥布赖恩所著。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr "这是一本英国作家安东尼·特罗洛普的代表作《巴彻斯特教堂尖塔》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr "这是一本由世界知名小说家、政治家H·G·威尔斯所创作的科幻著作《陆上铁甲》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr "这是一本由著名推理小说家、福尔摩斯之父阿瑟·柯南·道尔所著的《伟大的布尔战争》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr "这是一本由著名推理小说家、福尔摩斯之父阿瑟·柯南·道尔所著的纪实文学《在刚果的罪行》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr "这是一本由著名推理小说家、福尔摩斯之父阿瑟·柯南·道尔所著的《寄生虫》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr "一本《一剑之下》，英国作家安德鲁·贝尔福所著。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr "约瑟夫·康拉德所著的《密探》，书中预言了20世纪恐怖主义、无政府主义以及英国军情五处这样的秘密机构的兴起。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr "约瑟夫·康拉德所著长篇小说《吉姆爷》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr "维多利亚时代的英国小说家威廉·梅克比斯·萨克雷所著的讽刺小说《名利场》。"
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr "维多利亚时代的英国小说家威廉·梅克比斯·萨克雷所著的《巴里·林登的遭遇》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr "这是一本由伊丽莎白·盖斯凯尔创作的《南方与北方》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr "这是一本由英国小说家、诗人托马斯·哈代创作的长篇小说《卡斯特桥市长》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr "这是一本由英国小说家、诗人托马斯·哈代创作的故事集《韦塞克斯故事集》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr "这是一本由英国小说家、诗人托马斯·哈代最早成书的长篇小说《远离尘嚣》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr "至今为止最年轻的诺贝尔文学奖得主鲁德亚德·吉卜林所著的《怒海余生》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr "英国中世纪最杰出的诗人杰弗里·乔叟所创作的一部诗体短篇小说集《坎特伯雷故事集》。"
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr "一本《哈罗德：最后的撒克逊王》，爱德华·布尔沃·利顿所著。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr "弗雷德里克·马里亚特所著的《海军候补生伊齐先生》。"
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr "弗雷德里克·马里亚特所著的《彼得·辛普》。"
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -20690,10 +21615,11 @@ msgstr "一个玩家试图找出杀害管家的凶手的游戏。"
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
 msgstr[0] "黑龙：沼泽遗迹"
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -20705,26 +21631,58 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
 msgstr[0] "炼金术入门指南"
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr "一本关于将魔法装进液体里的技艺的平装书，酒精需要自行购买。"
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
 msgstr[0] "附魂者的死灵法术指南"
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
 "along with emulating their healing factor."
 msgstr "一本有关死灵法术的平装版典籍，介绍了将不死生物的灵魂依附到玩偶上的法术，以及模拟它们的恢复能力的方法。"
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] "魔法科技图解"
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+"一本平装本书籍，主题是将现代科技和魔法结合的技术。书背上有一段免责声明：“坎尼斯工业对使用本书所涉及的任何产品所引发的故障或事故不负任何责任”。"
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] "阿斯加德之武"
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr "一本精美华丽的古书，似乎是用北欧符文写的。从书中详细的插图来看，它似乎包含了关于制造北欧众神所使用的各种武器的信息。"
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -21175,7 +22133,7 @@ msgstr "乙炔"
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr "可燃性气体，在高压下会爆炸。与氧气混合后可以作为优良的焊接气。"
 
@@ -21968,7 +22926,7 @@ msgstr "啤酒原汁"
 msgid ""
 "Unfermented homebrew beer.  A boiled and chilled mash of malted barley, "
 "spiced with some fine hops."
-msgstr "未发酵的家酿啤酒。里面有煮熟的和冷冻的捣碎的大麦麦芽，加入一些细啤酒花。"
+msgstr "未发酵的家酿啤酒。里面有煮熟并冷却的捣碎的大麦麦芽，并加入了品质不错的啤酒花调味。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "moonshine mash"
@@ -22060,6 +23018,40 @@ msgstr "大型人胃"
 msgid "The stomach of a large humanoid creature.  It is surprisingly durable."
 msgstr "大型人型生物的胃囊，令人意外的耐磨。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] "人脂肪块"
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr "一份从人身上切下来的新鲜肥肉块。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr "人油"
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr "一块清洗后熬制的白色人类脂肪。可以保存很久并食用，而且在很多食物和物品的制作中会用到。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr "干炼人油"
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr "一块干法炼制的白色人类脂肪。可以保存很久并食用，而且在很多食物和物品的制作中会用到。"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -22092,7 +23084,7 @@ msgstr[0] "肉块"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Freshly butchered meat.  You could eat it raw, but cooking it is better."
-msgstr "一份经过屠宰的肉，可以直接食用，烹饪加工后更美味也更加安全。"
+msgstr "屠宰动物得到的肉，可以直接食用，但烹饪加工后更美味并且更加安全。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "scrap of meat"
@@ -22104,7 +23096,62 @@ msgstr[0] "碎肉"
 msgid ""
 "This is a tiny scrap of edible meat.  It's not much, but it'll do in a "
 "pinch."
-msgstr "一小块尚可食用的碎肉。虽然量不多，但是作为一道应急配菜还行。"
+msgstr "一小块尚可食用的碎肉。虽然量不多，但是应急用也足够了。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] "变异肉块"
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+"从变异生物身上切下的肉块。这块肉有着恶心的海绵般的松散质感，不过闻起来……还算正常。肉的内部有着一些明显不自然的杂乱组织：骨头和毛发堆积在肌肉组织之间，就像是要生长出另一只生物一般。至少它看起来还能被消化，前提是你得把它烹饪加工并处理掉那些不好的部分。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] "变异碎肉"
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+"一小块变异生物身上的肉。闻起来有点奇怪，里面混着不少毛发和骨头，像是直接从肉里长出来的。至少它看起来还能被消化，前提是你得把它烹饪加工并处理掉那些不好的部分。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr "变异人肉"
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr "从一只严重变异的人形生物身上取得的肉块，内部散布着小块毛皮和其它显然不该长出来的组织。除非你疯了，否则在饿死之前你不会考虑吃这个。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr "煮白痴"
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr "一块煮熟的变异人肉。里面不好的部分已经被处理干净，虽然倒人胃口，不过大概是可以食用了。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
@@ -22137,6 +23184,23 @@ msgid "cooked scrap of meat"
 msgid_plural "cooked scraps of meat"
 msgstr[0] "熟碎肉"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr "变异熟肉"
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr "一块煮熟的变异肉块。这块肉有着恶心的海绵般的松散质感，不过尝起来……还算正常。但愿你已经把里面的毛发和骨头全部清理干净了……"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] "变异熟碎肉"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "生内脏"
@@ -22335,7 +23399,7 @@ msgstr[0] "生脑"
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
 msgstr "一块来自某种动物的大脑。你可不想生吃这玩意……"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -22387,7 +23451,7 @@ msgstr "熟杂碎"
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
+msgid "Normally a delicacy, it needs a little… something."
 msgstr "一份由来自某种动物的胸腺或胰腺组成的杂碎。通常可以用来制作美味食物，这份还需要一点点额外的……东西。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -22411,7 +23475,7 @@ msgstr[0] "肥肉块"
 msgid ""
 "Freshly butchered fat.  You could eat it raw, but it is better used as an "
 "ingredient in other foods or projects."
-msgstr "一块从动物等尸体中屠宰下来新鲜脂肪，可以用来充饥，但最好经过加工，与其他食材一同使用。"
+msgstr "一块屠宰得到的新鲜脂肪，可以用来充饥，但最好经过加工，与其他食材一同使用。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "tallow"
@@ -22423,11 +23487,11 @@ msgid ""
 "A smooth white block of cleaned and rendered animal fat.  It will remain "
 "edible for a very long time, and can be used as an ingredient in many foods "
 "and projects."
-msgstr "一块熬制干净的白色动物脂肪。可以保存很久并食用，而且在很多食物和物品的制作中会用到。"
+msgstr "一块清洗后熬制的白色动物脂肪。可以保存很久并食用，而且在很多食物和物品的制作中会用到。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lard"
-msgstr "干油脂"
+msgstr "干炼油脂"
 
 #. ~ Description for lard
 #: lang/json/COMESTIBLE_from_json.py
@@ -22435,7 +23499,77 @@ msgid ""
 "A smooth white block of dry-rendered animal fat.  It will remain edible for "
 "a very long time, and can be used as an ingredient in many foods and "
 "projects."
-msgstr "一块熬制干化的白色动物脂肪。可以保存很久并食用，而且在很多食物和物品的制作中会用到。"
+msgstr "一块干法炼制的白色动物脂肪。可以保存很久并食用，而且在很多食物和物品的制作中会用到。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] "变异脂肪块"
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr "屠宰变异生物尸体得到的新鲜脂肪，可以用来充饥，但最好经过加工，与其他食材一同使用。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr "变异油脂"
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr "一块清洗后熬制的白色变异生物脂肪。可以保存很久并食用，而且在很多食物和物品的制作中会用到。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr "干炼变异油脂"
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr "一块干法炼制的白色变异生物脂肪。可以保存很久并食用，而且在很多食物和物品的制作中会用到。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] "变异人脂肪块"
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr "从一只严重变异的人形生物身上切下的肥肉。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr "变异人油"
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr "一块清洗后熬制的白色变异人脂肪。可以保存很久并食用，而且在很多食物和物品的制作中会用到。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr "干炼变异人油"
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr "一块干法炼制的白色变异人脂肪。可以保存很久并食用，而且在很多食物和物品的制作中会用到。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
@@ -22471,7 +23605,7 @@ msgstr "被感染的脂肪"
 msgid ""
 "A watery yellow glob of fat from some unnatural creature or other.  You "
 "could eat it, but it will poison you."
-msgstr "一团黄色的浆糊状脂肪，源自某些非自然生物或者其他家伙。你可以吃，但是会让你中毒。"
+msgstr "一团黄色的浆糊状脂肪，源自某种非自然生物。你可以吃，但是会让你中毒。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "tainted tallow"
@@ -22483,7 +23617,7 @@ msgid ""
 "A smooth grayish block of cleaned and rendered monster fat.  It will remain "
 "'fresh' for a very long time, and can be used as an ingredient in many "
 "projects.  You could eat it, but it will poison you."
-msgstr "一块熬制干净的灰色怪物脂肪。它会保持\"新鲜\"很长一段时间，可以作为原料制造许多东西。虽然可以吃，但它会让你中毒。"
+msgstr "一块清洗后熬制的灰色怪物脂肪。它会保持\"新鲜\"很长一段时间，可以作为原料制造许多东西。虽然可以吃，但它会让你中毒。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "large boiled stomach"
@@ -22608,7 +23742,7 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
 "一个巨大而沉重的肉块，看上去外形和哺乳动物的心脏一个样，上面布满了凸起的纹路，无疑比你的头还要大。它仍然充满了伽步沃克体内，呃，能被称作血的物质，摸在你手中沉甸甸的。在见识过最近所发生的这一切景象后，你不禁地想起那个吃下敌人心脏的传说……"
 
@@ -22624,7 +23758,7 @@ msgid ""
 "looks *disgusting*."
 msgstr "一个巨大的肉块——这是将一颗腐化之心割开放血后所残存的部分。如果你实在是饿得发慌的话可以吃掉它，但是看上去*真的*很恶心。"
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] "生牛奶"
@@ -22794,14 +23928,14 @@ msgstr "一份由新鲜苹果压榨而成的果汁，美味且营养。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "almond milk"
-msgstr "杏仁乳"
+msgstr "扁桃仁乳"
 
 #. ~ Description for almond milk
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Milk some almonds?  Not quite, but blend them with water, yes!  A dairy-free"
 " alternative strong in calcium!  Rival to soy milk."
-msgstr "杏仁也会产奶吗？并不是，它们是将杏仁和水混合打浆而成的。富含钙质的乳制品替代品，可以和豆乳相媲美。"
+msgstr "扁桃仁也会产奶吗？并不是，它们是将扁桃仁和水混合打浆而成的。富含钙质的乳制品替代品，可以和豆乳相媲美。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soy milk"
@@ -22812,7 +23946,7 @@ msgstr "豆乳"
 msgid ""
 "Milk some soybeans?  Not quite, but blend them with water, yes!  A dairy-"
 "free alternative strong in protein!  Rival to almond milk."
-msgstr "大豆也会产奶吗？并不是，它们是将大豆和水混合打浆而成的。富含蛋白质的乳制品替代品，可以和杏仁乳相媲美。"
+msgstr "大豆也会产奶吗？并不是，它们是将大豆和水混合打浆而成的。富含蛋白质的乳制品替代品，可以和扁桃仁乳相媲美。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "atomic coffee"
@@ -22915,7 +24049,7 @@ msgstr[0] "菊苣酿"
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
 msgstr "将经过烘烤的菊苣根，浸泡在沸水中。这种苦酿被用作咖啡替代品，尽管它尝起来一点也不像咖啡。"
 
@@ -23290,7 +24424,7 @@ msgstr "番茄沙司"
 #. ~ Description for red sauce
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A minimally seasoned sauce of cooked tomatoes."
-msgstr "一种由煮熟的西红柿制成的酱汁，除此之外没加入其他调味料。"
+msgstr "一种由煮熟的番茄制成的酱汁，除此之外没加入其他调味料。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "maple sap"
@@ -23762,10 +24896,11 @@ msgstr "糖水菠萝罐头，蛮好吃的。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
+msgid_plural "lemonade drink mix"
 msgstr[0] "速溶柠檬粉"
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -24463,7 +25598,7 @@ msgstr[0] "奶油花生糖"
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
+msgid "A handful of peanut butter cups… your favorite!"
 msgstr "一把你最喜欢的奶油花生糖。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -24576,7 +25711,7 @@ msgstr "一块美味的巧克力蛋糕，糖霜都在，应有尽有。"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr "这个蛋糕上的糖霜厚得让你看一眼就恶心。有人在上面写了些什么，看起来像是在胡说八道……"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -24617,7 +25752,7 @@ msgstr[0] "薄荷饼"
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
 msgstr "一把被软巧克力包裹着的薄荷馅饼，味道好极了！"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -25207,6 +26342,17 @@ msgid ""
 "filling."
 msgstr "一个呈怪异粉红色的猪肉罐头制品，味道糟糕而且难咬动，完全无法引起食欲，但是量很大。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr "调试用午餐肉"
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr "一块神秘的午餐肉，包含了你一天里需要的所有卡路里和维生素。上面写着：调试专享。"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "罐装沙丁鱼"
@@ -26792,8 +27938,8 @@ msgstr[0] "抗菌布条"
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr "浸过抗菌剂的布条。对于轻微的伤口很有用，但对于严重的咬伤可能就没用了。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -26849,7 +27995,7 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
 "一颗红如苹果的胶囊，和你拇指甲差不多大小，内部充满了一种厚厚的油状液体，这种液体毫无规律地从黑色变成紫色，上面布满了灰色小点。从你获得它的地方看来，它要么有特别的药效，要么就是实验用品。那怕只是将它握在手中一瞬间，你都觉得一切痛苦仿佛消失了一般……"
 
@@ -27241,7 +28387,7 @@ msgstr "虚拟IV诱变剂风味"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
 msgstr "超浓缩的诱变剂。你需要针管注射器来将其注入体内……如果你真的想用的话。"
 
@@ -27257,7 +28403,7 @@ msgstr "新人类诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
+"to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，看上去就像鲜血一样。你需要一个针管来注射……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27268,8 +28414,8 @@ msgstr "野兽诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
-msgstr "超浓缩诱变剂，像斗牛士的斗篷一样红。你需要一根针管来注射它……如果你真的想用的话。"
+" to inject it… if you really want to?"
+msgstr "超浓缩的诱变剂，像斗牛士的斗篷一样红。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bird serum"
@@ -27279,7 +28425,7 @@ msgstr "鸟类诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
+"need a syringe to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，那种蓝色让你想起了大灾变之前的天空。你需要一个针管来注射……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27290,7 +28436,7 @@ msgstr "家畜诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
+"inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，有着一种青草的颜色。你需要一个针管来注射……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27301,8 +28447,8 @@ msgstr "章鱼诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
-msgstr "超浓缩诱变剂，像墨水一样黑。你需要一根针管来注射它……如果你真的想用的话。"
+"it… if you really want to?"
+msgstr "超浓缩的诱变剂，像墨水一样黑。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chimera serum"
@@ -27312,8 +28458,8 @@ msgstr "奇美拉诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
-msgstr "超浓缩诱变剂，呈现出搅动在一起的彩虹色。你需要一根针管来注射它……如果你真的想用的话。"
+"syringe to inject it… if you really want to?"
+msgstr "超浓缩的诱变剂，呈现出搅动在一起的彩虹色。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "elf-a serum"
@@ -27323,8 +28469,8 @@ msgstr "精灵诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
-msgstr "超浓缩诱变剂，呈现出惹人注目的森林绿色。你需要一根针管来注射它……如果你真的想用的话。"
+"syringe to inject it… if you really want to?"
+msgstr "超浓缩的诱变剂，呈现出惹人注目的森林绿色。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "feline serum"
@@ -27334,8 +28480,8 @@ msgstr "猫科诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
-msgstr "超浓缩诱变剂，呈现黄色并且高度反光。你需要一根针管来注射它……如果你真的想用的话。"
+"syringe to inject it… if you really want to?"
+msgstr "超浓缩的诱变剂，呈现黄色并且高度反光。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "fish serum"
@@ -27345,7 +28491,7 @@ msgstr "鱼类诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
+"top.  You need a syringe to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，有着大海一般深邃的蓝色，顶部浮着些白色泡沫。你需要一个针管来注射……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27356,8 +28502,8 @@ msgstr "昆虫诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
-msgstr "超浓缩诱变剂，呈现出美丽的琥珀色。你需要一根针管来注射它……如果你真的想用的话。"
+"syringe to inject it… if you really want to?"
+msgstr "超浓缩的诱变剂，呈现出美丽的琥珀色。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lizard serum"
@@ -27367,7 +28513,7 @@ msgstr "蜥蜴诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，在不同深浅的绿色之间变幻。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27378,8 +28524,8 @@ msgstr "狼类诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
-msgstr "超浓缩诱变剂，如满月一般皎白。你需要一根针管来注射它……如果你真的想用的话。"
+" inject it… if you really want to?"
+msgstr "超浓缩的诱变剂，如满月一般皎白。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "medical serum"
@@ -27389,7 +28535,7 @@ msgstr "医用诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
+"You need a syringe to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，看上去像是各种体液的混合物。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27400,7 +28546,7 @@ msgstr "植物诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，看上去像是一堆菠菜糊糊。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27411,7 +28557,7 @@ msgstr "迅猛龙诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
+"at it.  You need a syringe to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，每次当你看它时似乎都会有所变化。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27422,7 +28568,7 @@ msgstr "大鼠诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
+"syringe to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，看上去呈现出毫无吸引力的米黄色。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27433,7 +28579,7 @@ msgstr "变形怪诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，看起来就像丧尸眼睛里黑色的粘液。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27444,7 +28590,7 @@ msgstr "蜘蛛诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，里面隐约悬浮着一些白色的丝状物。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27455,7 +28601,7 @@ msgstr "穴居诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
+"a syringe to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，看起来有点畏惧光线。你需要一个针管来注射……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27466,8 +28612,8 @@ msgstr "熊科诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
-msgstr "超浓缩诱变剂，蜂蜜一样的颜色，蜂蜜一般的浓稠。你需要一根针管来注射它……如果你真的想用的话。"
+"thick.  You need a syringe to inject it… if you really want to?"
+msgstr "超浓缩的诱变剂，蜂蜜一样的颜色，蜂蜜一般的浓稠。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mouse serum"
@@ -27477,7 +28623,7 @@ msgstr "小鼠诱变血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
+" to inject it… if you really want to?"
 msgstr "超浓缩的诱变剂，看上去就像液态金属一样。你需要一根针管来注射它……如果你真的想用的话。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27492,7 +28638,7 @@ msgstr "凝结之血"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
+"bubble with an intelligence of its own…"
 msgstr "浓稠黏糊的红色液体。看着闻着都恶心，而且仿佛有生命一般地冒着泡……"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -27679,21 +28825,21 @@ msgid ""
 msgstr "饥渴变异者的绝佳饮品，尝起来就像腌大便一样不过至少比直接喝原料安全得多。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
-msgstr[0] "松子"
+msgid "pine nuts"
+msgid_plural "pine nuts"
+msgstr[0] "松籽"
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr "一把从松果里剥出来的松籽，又香又脆。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
+msgid "junipers"
+msgid_plural "junipers"
 msgstr[0] "杜松子"
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -27701,62 +28847,75 @@ msgid ""
 msgstr "杜松子，用于制作杜松子酒和土调料。辛辣，味道类似迷迭香。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
 msgstr[0] "去壳开心果"
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
 msgstr "一把开心果，已经去壳了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
 msgstr[0] "烤开心果"
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr "一把开心果，已经烤熟了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
-msgstr[0] "去壳杏仁"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
+msgstr[0] "去壳扁桃仁"
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
-msgstr "一把杏仁，已经去壳了。"
+msgstr "一把扁桃仁，已经去壳了。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "almond pulp"
+msgid_plural "almond pulp"
+msgstr[0] "扁桃渣"
+
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr "制作扁桃仁乳剩下的残渣。口感像沙子，而且味同嚼蜡。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
-msgstr[0] "烤杏仁"
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
+msgstr[0] "烤扁桃仁"
 
-#. ~ Description for handful of roasted almonds
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
-msgstr "一把杏仁，已经烤熟了。"
+msgstr "一把扁桃仁，已经烤熟了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
+msgid "cashews"
+msgid_plural "cashews"
 msgstr[0] "腰果"
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr "一把盐焗腰果。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
 msgstr[0] "去壳美洲山核桃"
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -27764,41 +28923,41 @@ msgid ""
 msgstr "一把美洲山核桃，山核桃的亚种，已经去壳了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
 msgstr[0] "烤美洲山核桃"
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr "一把美洲山核桃，已经烤熟了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
 msgstr[0] "去壳花生"
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr "一把去壳盐煮花生。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
+msgid "beech nuts"
+msgid_plural "beech nuts"
 msgstr[0] "榉实"
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr "一把美洲山毛榉树的带刺果实。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
 msgstr[0] "去壳核桃"
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -27806,21 +28965,22 @@ msgid ""
 msgstr "一把核桃，已经去壳了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
 msgstr[0] "烤核桃"
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr "一把核桃，已经烤熟了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
 msgstr[0] "去壳栗子"
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -27828,21 +28988,23 @@ msgid ""
 msgstr "一把栗子，已经去壳了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
 msgstr[0] "烤栗子"
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr "一把栗子，已经烤熟了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
-msgstr[0] "带壳榛子"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
+msgstr[0] "去壳榛子"
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -27850,41 +29012,43 @@ msgid ""
 msgstr "一把榛子，已经去壳了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
 msgstr[0] "烤毛豆"
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr "烤毛豆，一种有益心脏健康的零食。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
 msgstr[0] "烤大豆"
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr "烤大豆，通常被称为烤豆子。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
 msgstr[0] "烤榛子"
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr "一把榛子，已经烤熟了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
 msgstr[0] "去壳山核桃"
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -27892,11 +29056,12 @@ msgid ""
 msgstr "一把山核桃，已经去壳了。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
 msgstr[0] "烤山核桃"
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr "一把山核桃，已经烤熟了。"
@@ -27911,11 +29076,11 @@ msgid "Delicious hickory nut ambrosia.  A drink worthy of the gods."
 msgstr "美味的山核桃酿。神的饮品。（原文Ambrosia意为神的食物）"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
+msgid "acorns"
+msgid_plural "acorns"
 msgstr[0] "橡实"
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
@@ -27923,11 +29088,11 @@ msgid ""
 msgstr "一把橡子，还带着壳。松鼠的挚爱，当然你不是松鼠，所以吃的时候悠着点。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
 msgstr[0] "烤橡实"
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr "一把橡实，已经烤熟了。"
@@ -28341,7 +29506,7 @@ msgstr "蜂蜜，蜜蜂制作。这种蜂蜜叫做\"蜜饯蜂蜜\"，一种浓
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned tomato"
 msgid_plural "canned tomatoes"
-msgstr[0] "罐装西红柿"
+msgstr[0] "罐装番茄"
 
 #. ~ Description for canned tomato
 #: lang/json/COMESTIBLE_from_json.py
@@ -28452,10 +29617,11 @@ msgstr "精制人体蛋白质粉与水的混合稀浆，虽然很有营养，但
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
+msgid_plural "soylent green powder"
 msgstr[0] "Soylent Green人造蛋白粉"
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -28499,10 +29665,10 @@ msgstr "少量蛋白质粉与水的混合物，虽然很有营养，但味道并
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
+msgid_plural "protein powder"
 msgstr[0] "蛋白粉"
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -28574,11 +29740,11 @@ msgid "Very sour citrus.  Can be eaten if you really want."
 msgstr "一个芸香科柑橘属植物果实，富含维生素C，但是非常得酸。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
+msgid "blueberries"
+msgid_plural "blueberries"
 msgstr[0] "蓝莓"
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr ""
@@ -28586,51 +29752,51 @@ msgstr ""
 "\"适合在蓝色的天空下的蓝色小屋里听着蓝调布鲁斯吃着蓝莓。\""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
+msgid "strawberries"
+msgid_plural "strawberries"
 msgstr[0] "草莓"
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr "一把在野外常见的草莓灌木所结出的果实，鲜红的果肉，多汁又美味。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
+msgid "cranberries"
+msgid_plural "cranberries"
 msgstr[0] "蔓越莓"
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr "一把蔓越莓灌木所结出的红色浆果，很酸，但对健康有益。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
+msgid "raspberries"
+msgid_plural "raspberries"
 msgstr[0] "树莓"
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "一把树莓灌木所结出的红色浆果，酸甜可口。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
+msgid "huckleberries"
+msgid_plural "huckleberries"
 msgstr[0] "越橘"
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr "一把美洲越橘，经常会和蓝莓混淆。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
+msgid "mulberries"
+msgid_plural "mulberries"
 msgstr[0] "桑椹"
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -28638,21 +29804,21 @@ msgid ""
 msgstr "一把北美桑椹，这种红色品种是北美东部所独有的，并被认为是世界上所有品种中风味最浓的一个品种。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
+msgid "elderberries"
+msgid_plural "elderberries"
 msgstr[0] "接骨木果"
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr "一把接骨木果，生吃有毒，但煮熟后很美味。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
+msgid "rose hips"
+msgid_plural "rose hips"
 msgstr[0] "玫瑰果"
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "一把玫瑰果，是经过授粉后的玫瑰花所结的果实。"
@@ -28687,11 +29853,11 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "一个柑橘类水果，有酸味和甘味，成熟时果皮一般呈不均匀的橙色或红色，果肉淡红白色。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
+msgid "cherries"
+msgid_plural "cherries"
 msgstr[0] "樱桃"
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr "一把樱桃树结出的红色果实，很甜。"
@@ -28707,11 +29873,11 @@ msgid ""
 msgstr "一个紫色的大李子，饱满圆润，玲珑剔透，形态美艳，口味甘甜，是人们最喜欢的水果之一。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
+msgid "grapes"
+msgid_plural "grapes"
 msgstr[0] "葡萄"
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr ""
@@ -28767,11 +29933,11 @@ msgid "A large and very sweet fruit."
 msgstr "一个又大又甜的瓜，又称香瓜等，含有苹果酸、葡萄糖、氨基酸、甜菜茄、维生素C等丰富营养。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
+msgid "blackberries"
+msgid_plural "blackberries"
 msgstr[0] "黑莓"
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "一些原产地北美洲的黑莓，有着非常丰富的营养价值。"
@@ -28816,15 +29982,26 @@ msgid ""
 msgstr "一个大大的，有着棕色纹装外皮的水果，绿色的果肉有着奇异的味道。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
+msgid "apricots"
+msgid_plural "apricots"
 msgstr[0] "杏子"
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "一把杏子，表皮很光滑，有着味甜多汁的暗黄色果肉，是桃子的近亲。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr "仙人掌花蕾"
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr "可食用的仙人掌花蕾，刺已经去掉了，是莫哈维沙漠土著的最爱。尝起来有点像芦笋。"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr "食用仙人掌"
@@ -28997,10 +30174,10 @@ msgstr "大丽花的大块根。它闻起来挺辣，但是由于含有太多淀
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] "蒜叶婆罗门参"
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -29010,10 +30187,10 @@ msgstr "一种开紫色小花的草本植物。根部营养丰富，但在煮熟
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
+msgid_plural "chicory"
 msgstr[0] "菊苣菜"
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -29129,11 +30306,11 @@ msgstr ""
 "\"不~给~脑~就~捣~蛋~——儿童丧尸\""
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
+msgid "dandelions"
+msgid_plural "dandelions"
 msgstr[0] "蒲公英"
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -29184,7 +30361,7 @@ msgstr[0] "番茄"
 msgid ""
 "Juicy red tomato.  It gained popularity in Italy after being brought back "
 "from the New World."
-msgstr "鲜美多汁的西红柿，从新大陆引入之后就在意大利广泛被食用。"
+msgstr "鲜美多汁的番茄，从新大陆引入之后就在意大利广泛被食用。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "plant marrow"
@@ -29259,11 +30436,11 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr "生扁豆，可以煮熟用以果腹。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
 msgstr[0] "蕨菜"
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -29586,7 +30763,7 @@ msgstr "一些树莓种子。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raspberry"
-msgstr "木莓"
+msgstr "树莓"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "strawberry seeds"
@@ -30367,7 +31544,7 @@ msgstr "番茄汤"
 msgid ""
 "It smells of tomatoes.  Not very filling, but it goes well with grilled "
 "cheese."
-msgstr "闻起来像是西红柿煮出来的。不太饱肚子，但加上烤奶酪就能当午餐了。"
+msgstr "闻起来像是番茄煮出来的。不太饱肚子，但加上烤奶酪就能当午餐了。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chicken and dumplings"
@@ -31015,26 +32192,26 @@ msgstr "一些生小麦，直接食用不佳。"
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw spaghetti pasta"
 msgid_plural "raw spaghetti pasta"
-msgstr[0] "生意大利面面团"
+msgstr[0] "生意大利面"
 
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
-msgstr "准备制作成意大利面的面团，当你饿得不行时，生吃也没什么影响，当然，弄熟了再吃最好不过。"
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
+msgstr "一种用来做意大利面的面条。当你饿的不行时，生吃也不是不可以，但是弄熟了之后会好吃得多。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw lasagne pasta"
 msgid_plural "raw lasagne pasta"
-msgstr[0] "生千层面面团"
+msgstr[0] "生千层面"
 
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
-msgstr "准备制作成千层面的面团，当你饿得不行时，生吃也没什么影响，当然，弄熟了再吃最好不过。"
+msgstr "一片用来做千层面的生面。当你饿的不行时，生吃也不是不可以，但是弄熟了之后会好吃得多。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "boiled noodles"
@@ -31482,7 +32659,7 @@ msgstr "基础药剂"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr "烈性酒精之中注入了魔力并浓缩成液体，能够用来使法术稳定为液体形式。如果你愿意的话，你可以直接喝它。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31494,7 +32671,7 @@ msgstr[0] "大肾上腺"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr "位于肾脏上方的负责分泌肾上腺素、皮质醇和醛固酮的器官。这块肾上腺非常巨大，不知道是自然存在的还是突变产生的。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31591,8 +32768,8 @@ msgstr "丧尸巫毒娃娃"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr "一只特别逼真的丧尸人偶，有着逼真的骨头和器官。死灵法术暂时阻止了它的腐坏，但是不会长久。用附带的针刺它会让它为你服务。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31603,8 +32780,9 @@ msgstr "骨片巫毒娃娃"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr "一只特别逼真的丧尸人偶，覆盖着骨片，里面有逼真的器官。死灵法术暂时阻止了它的腐坏，但是不会长久。用附带的针刺它会让它为你服务。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31615,8 +32793,8 @@ msgstr "美洲狮巫毒娃娃"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr "一只特别逼真的不死美洲狮人偶，有着逼真的皮毛、骨头和器官。死灵法术暂时阻止了它的腐坏，但是不会长久。用附带的针刺它会让它为你服务。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31627,9 +32805,9 @@ msgstr "扭曲恢复药剂"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
-msgstr "这瓶闻起来恶心的液体通过将心跳加速至危险的水平来模拟不死生物的恢复能力。在危险或濒死状态下使用可能会致命。"
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
+msgstr "这瓶闻起来就恶心的液体通过将心跳加速至危险的水平来模拟不死生物的恢复能力。在危险或濒死状态下使用可能会致命。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "potion of Improved Twisted Restoration"
@@ -31639,11 +32817,11 @@ msgstr "改良扭曲恢复药剂"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
-"这瓶闻起来恶心的液体通过将心跳加速至危险的水平来模拟不死生物的恢复能力。在危险或濒死状态下使用可能会致命。改进的浸提技术减小了药剂对身体的负担。"
+"这瓶闻起来就恶心的液体通过将心跳加速至危险的水平来模拟不死生物的恢复能力。在危险或濒死状态下使用可能会致命。改进的浸提技术减小了药剂对身体的负担。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "owlbear egg"
@@ -31677,7 +32855,7 @@ msgstr[0] "毛团"
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr "一大团恶心的动物唾沫和舔掉的毛的混合物。不要吞下它。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31695,6 +32873,16 @@ msgstr ""
 "龙肉，它不能像普通动物肉一样被烹饪，显然还残留着一些魔法性质。\n"
 "“天上龙肉，地下驴肉。咦？”"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr "尖叫蘑菇"
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr "从尖叫蘑菇怪身上获得的蘑菇。可以用来炼制药剂。"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
 msgstr "树脂线"
@@ -32319,15 +33507,6 @@ msgstr[0] "米粉"
 msgid "This rice flour is useful for baking."
 msgstr "用米磨成的粉，可以用来做成面包。"
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr "仙人掌花蕾"
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr "莫哈韦土著人的糖果。"
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr "复活药水"
@@ -32598,8 +33777,8 @@ msgstr[0] "纸桶"
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr "由纸，铝和塑料层压制成的纸板盒，容积为半加仑。附带一个螺纹盖子以便封装。"
 
 #: lang/json/CONTAINER_from_json.py
@@ -32610,9 +33789,9 @@ msgstr[0] "纸桶（开）"
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
-msgstr "由纸，铝和塑料层压制成的纸板盒，容积为半加仑。它已经被打开了，内容物会正常腐坏。"
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
+msgstr "由纸，铝和塑料层压制成的纸板盒，容积为半加仑。它已经被打开了，内容物会开始变质。"
 
 #: lang/json/CONTAINER_from_json.py
 msgid "vacuum-packed bag"
@@ -33086,8 +34265,8 @@ msgstr[0] "生存工具箱（开）"
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
 msgstr "一个曾经装过小型生存工具套装的铝箱，可以装1升液体。"
 
 #: lang/json/CONTAINER_from_json.py
@@ -33146,14 +34325,14 @@ msgstr "一只用来装液体或气体的小型金属罐，可用于制造其他
 #: lang/json/CONTAINER_from_json.py lang/json/overmap_terrain_from_json.py
 msgid "basin"
 msgid_plural "basins"
-msgstr[0] "钢盆"
+msgstr[0] "简易钢盆"
 
 #. ~ Description for basin
 #: lang/json/CONTAINER_from_json.py
 msgid ""
 "A wide, shallow basin used to hold liquid, hammered from a piece of sheet "
 "metal.  Ideal for collecting water."
-msgstr "一个用钢板敲成、用来收集液体的宽口浅盆，非常适合拿来收集雨水。"
+msgstr "一个用薄钢板敲成、用来收集液体的浅口钢盆，非常适合收集雨水。"
 
 #: lang/json/CONTAINER_from_json.py
 msgid "hazardous waste drum"
@@ -33611,8 +34790,8 @@ msgstr[0] "蔷薇辉石"
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr "一大块蔷薇辉石。二氧化锰纹路覆盖和贯通其中，可以用凿子采集。"
 
 #: lang/json/GENERIC_from_json.py
@@ -33623,7 +34802,7 @@ msgstr[0] "红锌矿"
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr "一大块红锌矿，可以被提炼成氧化锌，再用碳来还原成锌。"
 
@@ -33638,81 +34817,81 @@ msgid "A root from a hickory tree.  It has an earthy smell."
 msgstr "山核桃树的根，尚带着泥土的芬芳。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
 msgstr[0] "山核桃"
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr "一把山核桃，还没去壳。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
+msgid "pecans"
+msgid_plural "pecans"
 msgstr[0] "美洲山核桃"
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr "一把美洲山核桃，山核桃的亚种，还没去壳。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
+msgid "pistachios"
+msgid_plural "pistachios"
 msgstr[0] "开心果"
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr "一把开心果，还没去壳。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
-msgstr[0] "杏仁"
+msgid "almonds"
+msgid_plural "almonds"
+msgstr[0] "扁桃仁"
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
-msgstr "一把杏仁，还没去壳。"
+msgstr "一把扁桃仁，还没去壳。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
+msgid "peanuts"
+msgid_plural "peanuts"
 msgstr[0] "花生"
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr "一把花生，还没去壳。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
 msgstr[0] "榛子"
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr "一把榛子，还没去壳。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
+msgid "chestnuts"
+msgid_plural "chestnuts"
 msgstr[0] "栗子"
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr "一把栗子，还没去壳。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
+msgid "walnuts"
+msgid_plural "walnuts"
 msgstr[0] "核桃"
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr "一把核桃，还没去壳。"
@@ -33847,7 +35026,7 @@ msgstr "一具沾满了凝固的血液的尸体。"
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr "一具表情恐怖的尸体，看起来在死前身体就受到了严重的损害。"
 
@@ -33871,7 +35050,7 @@ msgstr "一具尸体，额头上有一个巨大的子弹入射伤口，后脑勺
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr "一具尸体的上半截，像是被蛮力撕开的一样。一些器官从里面漏了出来。"
 
@@ -33966,6 +35145,11 @@ msgstr "肌肉"
 msgid "wind"
 msgstr "风"
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] "新陈代谢"
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "一个吸食用具和一个火源"
@@ -34013,7 +35197,7 @@ msgstr[0] "美食广场会员卡"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr "一张亮粉色的会员积分卡，所有的积分都加盖了印戳。这肯定能证明你对美食之城的忠诚，如果这还有意义的话……"
 
 #: lang/json/GENERIC_from_json.py
@@ -34143,8 +35327,8 @@ msgstr[0] "陶瓷盘套件"
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr "一套略微椭圆的圆盘，由高级陶瓷制成，让你想起鳞片。"
 
 #: lang/json/GENERIC_from_json.py
@@ -34424,6 +35608,17 @@ msgid ""
 "constructing tougher walls and such."
 msgstr "一个长方形的螺纹钢棍，可以用来制作成房子的墙壁等等。"
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] "窄轨轨道"
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr "一段窄轨铁路轨道，由一些木板和铁轨制成。"
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -34545,10 +35740,8 @@ msgstr[0] "电视机"
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
-msgstr ""
-"一个老式的显像管电视，接收不到电视信号所以无法用其观看电视节目，可以使用工具进行拆解以获得其中的零件。\n"
-"\"有着令人怀念的电子的味道。\""
+msgid "A large LCD television, full of delicious electronics."
+msgstr "一台大屏幕液晶电视，接收不到信号无法观看电视节目，可以使用工具拆解以获得其中零件。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -34933,6 +36126,18 @@ msgid ""
 "communications equipment."
 msgstr "一个用来接收多种形式信号的模块。用于制造通讯设备。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] "大型LCD屏幕"
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr "一个大型背光式屏幕，用于显示图像。用于制造某些电子设备。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -35302,8 +36507,8 @@ msgstr[0] "科学SD存储卡"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
-msgstr "这张存储卡看起来和'XEDRA'有关，而且还被加密了。嗯，有点意思……"
+"encrypted.  Looks *Interesting*, though…"
+msgstr "这张存储卡看起来和 XEDRA 有关，而且还被加密了。嗯，有点意思……"
 
 #: lang/json/GENERIC_from_json.py
 msgid "hand mirror"
@@ -35371,11 +36576,12 @@ msgid ""
 msgstr "一朵向日葵的花蕾，有黄色的花瓣和一些尚未被动物吃掉的种子。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
 msgstr[0] "洋甘菊"
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -35631,10 +36837,10 @@ msgstr ""
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -35684,7 +36890,7 @@ msgstr[0] "烟蒂"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr "曾经令人着迷的烟叶卷现在只剩下了一小片有味道的垃圾。如果你烟瘾实在无法解决，可以尝试用多个这东西里边剩下的烟草，应该可以卷成一个新的香烟。"
 
 #. ~ Use action msg for joint.
@@ -35726,10 +36932,10 @@ msgstr "一种致幻植物，源自中亚及印度次大陆。传统用途包括
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
-msgstr[0] "生烟草束"
+msgid_plural "raw tobacco"
+msgstr[0] "生烟草"
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -35775,11 +36981,6 @@ msgid ""
 "panel, if you can find one."
 msgstr "这张身份卡曾经是某个高级工程师用的。它的背面描述了使用方法，如果你找的到一个控制面板的话，可以在上面使用获得一次访问授权。"
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] "橡胶薄片"
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -36211,13 +37412,6 @@ msgid ""
 "chopping things and for use as a hammer."
 msgstr "一柄单手的短斧，是一件不错的近战武器，也可以用于砍柴与捶打。"
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr "一个棒球大小的岩石。可以当一个凑合的近战武器，也可以当作投掷武器。"
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -36725,8 +37919,8 @@ msgstr[0] "板簧"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
-msgstr "一个巨大而坚固的重型板簧，也许是来自某些汽车或者货车，看起来很像一张弓。你勉强能拉开它……"
+" an awful lot like a bow.  You can barely bend it…"
+msgstr "一个巨大而坚固的重型板簧，也许是来自某些汽车或者货车，看起来很像一张弓。你几乎不能掰动它……"
 
 #: lang/json/GENERIC_from_json.py
 msgid "hydrangea"
@@ -37330,7 +38524,7 @@ msgstr[0] "原子咖啡机"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
@@ -37345,7 +38539,9 @@ msgstr[0] "原子提灯"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "关上灯罩"
 
@@ -37373,7 +38569,9 @@ msgstr[0] "原子提灯（关）"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "打开灯罩"
 
@@ -37643,9 +38841,9 @@ msgstr[0] "抓钩"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
-msgstr "可折叠的精钢抓钩，系在一根30英尺长的尼龙绳上.有效保护你从高处落下时的安全。足以吊起大型尸体以便屠宰。"
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
+msgstr "可折叠的精钢抓钩，系在一根30英尺长的尼龙绳上。有效保护你从高处落下时的安全。足以吊起大型尸体以便屠宰。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "sealed jar of pickles"
@@ -38415,10 +39613,8 @@ msgstr[0] "咏春"
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
-msgstr "一本咏春拳的秘籍。书的最后一段还记载了使用蝴蝶剑和长杖的技巧。"
+msgid "A complete guide to Wing Chun Kung-fu."
+msgstr "一本完整的咏春秘籍。"
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
 #: lang/json/martial_art_from_json.py
@@ -38430,8 +39626,8 @@ msgstr[0] "战斗之花"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr "一本完全翻译的中世纪长杆武器作战指南，其中一章详解了常见长杆武器的技巧差异，甚至附有图片。"
 
 #: lang/json/GENERIC_from_json.py
@@ -39400,6 +40596,19 @@ msgstr[0] "欠条"
 msgid "This is a slip of paper signed by the issuer."
 msgstr "这是某个人签的欠条。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] "圣像"
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr "一张画着图的小卡片，大小和一张ID卡差不多，上面的图案象征着某个宗教人物。在背面，隐约地写着\"新英格兰教会社区\"的文字。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -39724,9 +40933,9 @@ msgstr[0] "叉子"
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
-msgstr "一把叉子，你可以用它叉起你想吃的任何食物放进你的嘴里，但目前为止还是更直接的方式去吃要好一些。"
+msgstr "一把叉子，叉了东西之后就可以送进嘴里。等等……现在这么说好像不太对。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "plastic fork"
@@ -40817,14 +42026,14 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
-"一把名为妙尔尼尔（Mjölnir）的神锤，用垂死恒星（白矮星）的星核打造。铭文上写着：\n"
+"一把名为妙尔尼尔的神锤，用白矮星的星核打造。上面有着一道铭文：\n"
 " \n"
 "执此锤者，\n"
 "如其适格，\n"
-"当承神威… \n"
+"当承神威以……\n"
 "摧毁！！"
 
 #: lang/json/GENERIC_from_json.py
@@ -41240,9 +42449,10 @@ msgstr "这是一把细长的类似于长剑的剑，是西洋刺剑的前身。
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
-msgstr "这是一把细长的类似于长剑的剑，是西洋刺剑的前身。它看起来很容易折断。相较于其他较小的剑，它需要刀鞘（背）或刀鞘（肩）来收起。"
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
+msgstr ""
+"这是一把细长的类似于长剑的剑，是西洋刺剑的前身。它看起来很容易折断。相较于其他较小的剑，它需要刀鞘（背）或刀鞘（肩）来收起。这把看起来似乎很容易弯折。"
 
 #. ~ Description for estoc
 #: lang/json/GENERIC_from_json.py
@@ -41331,17 +42541,17 @@ msgid ""
 msgstr "击剑运动用的武器，很高级。但是在大灾变后，这把剑身软又平尖的剑没什么用。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
+msgid "fencing épée"
+msgid_plural "fencing épées"
 msgstr[0] "击剑重剑"
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
-msgstr "击剑运动用的武器，很高级。这把硬身的重剑可能是击剑运动的各种比赛用剑中打丧尸最有力的了。"
+msgstr "击剑运动用的武器，很高级。这种剑是各种比赛用剑中最为沉重和坚固的一种，因此在实战中可能最为有用。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "fencing saber"
@@ -41352,8 +42562,53 @@ msgstr[0] "击剑佩剑"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
-msgstr "击剑运动用的武器，很高级。这把有开锋的佩剑可能比重剑和花剑要短，但是也有一定的威力。"
+"is marginally shorter than the foil and épée, but no less effective."
+msgstr "击剑运动用的武器，很高级。这把有开锋的佩剑比重剑和花剑要稍微短一些，但是威力不减。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] "磨尖花剑"
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+"这把曾经人畜无害的花剑的压力感应器已经被移除，末端被粗糙地磨尖。虽然它还是没有剑刃，但磨尖的末端已经使它带有一定程度的致命性，对于熟悉击剑的人来说还是比较有用的。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] "磨尖重剑"
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+"这把曾经人畜无害的重剑的压力感应器已经被移除，末端被粗糙地磨尖。虽然它还是没有剑刃，但磨尖的末端已经使它带有相当程度的致命性，对于熟悉击剑的人来说还是比较有用的。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] "磨尖佩剑"
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
+msgstr ""
+"这把曾经人畜无害的佩剑的钝尖已经被折断，末端被粗糙地磨尖。虽然它还是没有剑刃，但磨尖的剑尖已经使它带有相当程度的致命性，对于熟悉击剑的人来说还是比较有用的。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
@@ -41611,7 +42866,7 @@ msgstr[0] "铝锭"
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
+"down to a powder, for more… high-profile applications."
 msgstr "一个小型铝锭，已经按后续要求标准化。轻巧而结实，它可以被用在各种建筑中或者研成粉末，用于更加……高调的行动中。"
 
 #: lang/json/GENERIC_from_json.py
@@ -41916,6 +43171,43 @@ msgid ""
 " can also serve as an improvised stabbing weapon, but will break quickly."
 msgstr "一个带着木头手柄的钢锥，一般用于制作皮革物品。它也能够当作一把简易的刺击武器，但会很快损坏。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] "织布架"
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr "一个巨大且原始的织布用的木架，织布效率极低。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] "木制分纱杆"
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr "这是一根细短的扁平木棍，和织布架一起用于织布。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] "缝纫用模板"
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr "这是一大套纸制的缝纫用模板，可以用来从头制作布料或者皮革衣物，在更复杂的裁缝工作中更是必不可少。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -43247,7 +44539,7 @@ msgstr[0] "中型轮毂"
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr "一种可以用螺栓把轮子固定在汽车上的金属组件。适合汽车轮子。"
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -43258,8 +44550,8 @@ msgstr[0] "重型轮毂"
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr "一种可以用螺栓把轮子固定在汽车上的重型金属部件。适合大型车轮。"
 
 #: lang/json/GENERIC_from_json.py
@@ -44323,6 +45615,26 @@ msgid ""
 "art."
 msgstr "一位战斗改造人特工的传记，详述了他的哲学和武术。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] "铁鞭"
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr "你把鞭子在手中缠绕，使其在瞬间卷曲回皮带形状。"
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr "一条编织而成、柔软灵活的钢铁长鞭，末端变成锋利的刀刃。能够轻易切割任何向你袭来的物品。使用它能够将其变回皮带。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -44743,6 +46055,130 @@ msgid "dao +2"
 msgid_plural "dao +2s"
 msgstr[0] "中式刀 +2"
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] "生化术士之矛"
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr "一根造型怪异的骨制矛头，固定在一根短粗的木棍之上。在矛头的底部镶有一个生化术士符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] "科技法师之杖"
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr "这根法杖由一根撬棍在两端加上月牙形扳手和锤子构成，方便携带。锤头上镶嵌着一个科技法师符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] "魔术师之杖"
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr "这根长棍上镶嵌了符文，并附有两只钢化玻璃罐，注入了魔力以提高耐久度，用于吸收魔力。棍尖上镶嵌有两个魔术师符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] "炽霜法师焰形剑"
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr "带有形似火焰的起伏刀刃的剑。剑柄头上镶嵌着一个炽霜法师符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] "风暴塑造者之斧"
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr "一把镶银边的铸造铜斧，装在一根木柄上面。斧柄洞里镶嵌着一个风暴塑造者符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] "泛灵师献祭短刀"
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr "一把仪式用钢刀，泛灵师用它来放血进行召唤。剑格上面镶嵌着一个泛灵师符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] "弹簧长杖（甩棍）"
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr "展开"
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr "你将弹簧长杖展开成长杖模式。"
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr "这种多用途武器使用科技魔法附魔增强过的弹簧制成，以保持长杖两端在甩棍模式时收回。激活以展开。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] "弹簧长杖（长杖）"
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr "折叠"
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr "你将弹簧长杖折叠成甩棍模式。"
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr "这种多用途武器使用科技魔法附魔增强过的弹簧制成，以保持长杖两端在长杖模式时展开。激活以折叠。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
@@ -45003,6 +46439,20 @@ msgid ""
 "to land astoundingly powerful blows."
 msgstr "一对闪闪发光的金属护手，上面覆盖着魔法符文，使你可以使出威力无穷的拳击。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] "塑地者拳套"
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr "一个石制手套，上面围绕手的四周刻着符文，保护手的同时增强打击力量。手套的掌心镶嵌着塑地者符文。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -45079,6 +46529,18 @@ msgid ""
 "prized for their beauty and power."
 msgstr "当一只鲨蜥兽钻入地球时，它的鳃会收集微量的贵金属和宝石，这些金属和宝石慢慢聚集成有光泽的珍宝，这些宝石因其美丽和力量而倍受珍视。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] "蚊蝠喙"
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr "一根从蚊蝠尸体上收获所得的长喙，可以勉强当成武器使用。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -45103,93 +46565,6 @@ msgid ""
 "scales could make a suit of armor as hard as steel and half as heavy."
 msgstr "黑龙的优质龙皮，坚固、耐酸，具有很多鳞片，用它制造的盔甲如钢铁般坚固，重量却只有钢的一半。"
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] "生化术士之矛"
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr "一根造型怪异的骨制矛头，固定在一根短粗的木棍之上。在矛头的底部镶有一个生化术士符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] "科技法师之杖"
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr "这根法杖由一根撬棍在两端加上月牙形扳手和锤子构成，方便携带。锤头上镶嵌着一个科技法师符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] "魔术师之杖"
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr "这根长棍上镶嵌了符文，并附有两只钢化玻璃罐，注入了魔力以提高耐久度，用于吸收魔力。棍尖上镶嵌有两个魔术师符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] "塑地者拳套"
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr "一个石制手套，上面围绕手的四周刻着符文，保护手的同时增强打击力量。手套的掌心镶嵌着塑地者符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] "炽霜法师焰形剑"
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr "带有形似火焰的起伏刀刃的剑。剑柄头上镶嵌着一个炽霜法师符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] "风暴塑造者之斧"
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr "一把镶银边的铸造铜斧，装在一根木柄上面。斧柄洞里镶嵌着一个风暴塑造者符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] "泛灵师献祭短刀"
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr "一把仪式用钢刀，泛灵师用它来放血进行召唤。剑格上面镶嵌着一个泛灵师符文。"
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -45258,6 +46633,54 @@ msgstr[0] "恶毒骨矛"
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr "这是一柄邪恶的长矛，完全是由骨头组成的。"
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr "妙尔尼尔，传说中雷神索尔使用的锤子。据传只要一击就能把整座大山夷为平地。你能通过锤子感受到来自仙宫阿斯加德的力量。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] "Gungnir，永恒之枪"
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+"冈格尼尔，传说中北欧众神之父奥丁使用的长矛。据传它是完美的长矛，无论持用者的力量或技能如何，它都能完美地击中任何目标。拿着它让你有种被奥丁守护的感觉。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Gram，胜利之剑"
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr "古拉姆，传说中英雄齐格鲁德使用的魔剑。据传是斩杀传说中恶龙法夫尼尔的剑。据说曾将侏儒雷金的铁砧劈成两半，它的剑刃无懈可击。"
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] "Laevateinn，灾厄之杖"
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr "列瓦汀，传说中火神洛基使用的长杖。据说是由洛基从冥界海拉城门上拔出来的。它充满了神秘的魔力，来自欺诈之神自己的魔力。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -45484,8 +46907,8 @@ msgstr[0] "致盲闪光卷轴"
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
 msgstr "爆发耀眼的光芒以致盲敌人，等级越高伤害越高。"
 
 #: lang/json/GENERIC_from_json.py
@@ -45498,7 +46921,7 @@ msgstr[0] "幽影攫抓卷轴"
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr "从地面伸出无数幽影手，减慢范围内的一切。等级越高，作用范围越大，作用时间越长。"
 
 #: lang/json/GENERIC_from_json.py
@@ -46211,10 +47634,34 @@ msgstr[0] "净化之种卷轴"
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
 msgstr "召唤大地的馈赠，可用于净水。等级越高，获得的种子数量就越多。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] "X光卷轴"
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr "你发射出一道X光，并通过魔法来短暂地看清X光所及区域。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] "透视卷轴"
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
+msgstr "你闭上双眼，大地随即向你透露了它的秘密。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Lava Bomb"
 msgid_plural "Scroll of Lava Bombs"
@@ -46231,6 +47678,16 @@ msgstr ""
 "你撕裂脚下的地面，发射出一个熔岩炸弹：一个被炽热的固体岩石包围的熔岩球。它撞击物体时会粉碎，朝四周射出大量碎岩石和熔岩。\n"
 " "
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] "防酸术卷轴"
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr "这法术能产生一个肉眼无法看见的防酸光环保护你。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
@@ -46256,7 +47713,7 @@ msgstr "你可能会说这更像是一本宣传册子，而不是一本魔法书
 #: lang/json/GENERIC_from_json.py
 msgid "Wizarding Guide to Backpacking"
 msgid_plural "Wizarding Guide to Backpackings"
-msgstr[0] "巫师背包指南"
+msgstr[0] "魔法师背包指南"
 
 #. ~ Description for Wizarding Guide to Backpacking
 #: lang/json/GENERIC_from_json.py
@@ -47039,11 +48496,6 @@ msgid ""
 "ornaments."
 msgstr "北欧战争农业之神索尔所使用的Mjölnir，雷神之锤的复制品。据说这玩意能一击打平一座山。但这件上面点缀了许多金银饰品。"
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] "Gungnir，永恒之枪"
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -47916,6 +49368,11 @@ msgstr "化学制品"
 msgid "SPARE PARTS"
 msgstr "零件"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "容器"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "神器"
@@ -47926,6 +49383,307 @@ msgstr "神器"
 msgid "ARMOR"
 msgstr "装备"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "穿戴物品"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "手持武器"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr "战利品：待整理"
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr "待整理的战利品所在区域。你可以使用\"整理战利品\"指令自动将该区域内的物品分类。可以与其他战利品区域叠加。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr "战利品：食物"
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr "所有消耗品的分类放置区域。如果未定义专用食品区，则食品也会被分类至该区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr "战利品：易腐食物"
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr "所有易腐消耗品的分类放置区域。如果未定义专用易腐饮料区，则易腐饮料也会被分类至该区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr "战利品：饮料"
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr "所有饮料的分类放置区域。如果未定义专用易腐饮料区，则易腐饮料也会被分类至该区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr "战利品：易腐饮料"
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr "所有易腐饮料的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr "战利品：容器"
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr "所有空容器的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr "战利品：枪械"
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr "所有枪械弓弩和远程武器的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr "战利品：弹匣"
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr "所有弹匣的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr "战利品：弹药"
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr "所有弹药的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr "战利品：武器"
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr "所有近战武器的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr "战利品：工具"
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr "所有工具的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr "战利品：服装"
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr "所有衣物的分类放置区域。如果未定义专用肮脏衣物区，则肮脏衣物也会被分类至该区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr "战利品：肮脏服装"
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr "所有肮脏衣物的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr "战利品：药品"
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr "所有药品和其他医疗用品的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr "战利品：书籍"
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr "所有书籍杂志的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr "战利品：模组"
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr "所有枪械模组和类似物品的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr "战利品：诱变剂"
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr "所有诱变剂、血清、净化剂的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr "战利品：生化插件"
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr "所有生化插件CBM的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr "战利品：载具部件"
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr "所有载具部件的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr "战利品：其他"
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr "所有其他物品的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr "战利品：燃料"
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr "所有汽油、柴油、灯油和其他燃料的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr "战利品：种子"
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr "所有种子、块茎及类似物品的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr "战利品：化学品"
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr "所有化学制品的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr "战利品：零件"
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr "所有零件的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr "战利品：神器"
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr "所有神器的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr "战利品：尸体"
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr "所有尸体的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr "战利品：装备"
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr "所有装备的分类放置区域。如果未定义专用肮脏装备区，则肮脏装备也会被分类至该区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr "战利品：肮脏装备"
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr "所有肮脏装备的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr "战利品：木材"
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr "所有柴火和类似物品的分类放置区域。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr "战利品：自定义"
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr "自定义物品的分类放置区域。你可以编辑具体的筛选条件。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr "战利品：已忽略区"
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr "使用\"整理战利品\"指令将不会整理该区域内的物品。"
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -48134,7 +49892,7 @@ msgstr[0] "一次性电池（重型）"
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
 msgstr "这是一种大型电池，适用于各种工业级设备和大型电动工具。电池的化学特性意味着它有很高的容量，但它不能被再次充电。"
 
@@ -48491,7 +50249,7 @@ msgstr "H&K G3 步枪弹鼓"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
+msgid "A 50-round drum magazine for the H&K G3 rifle."
 msgstr "50发弹鼓，可用于H&K G3步枪。"
 
 #: lang/json/MAGAZINE_from_json.py
@@ -48532,8 +50290,8 @@ msgstr "FN SCAR-H 步枪弹鼓"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
-msgstr "一个装弹为50发的 FN SCAR-H步枪钢制弹鼓。"
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
+msgstr "50发弹鼓，可用于FN SCAR-H步枪。"
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "FN SCAR-H magazine"
@@ -48627,15 +50385,6 @@ msgstr ".357 西格 P320 弹匣"
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr "为西格&绍尔 P320 手枪设计的14发双排盒式弹匣。"
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "陶鲁斯 Pro .38手枪弹匣"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr "一个紧凑的钢制盒式弹匣，可用于陶鲁斯 Pro .38手枪。"
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr "7发快速装弹器 （.38/.357）"
@@ -48709,6 +50458,16 @@ msgstr "一个 8 发钢制盒式弹匣，可用于 Hi-Point CF-380 手枪。"
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr "一个 10 发钢制盒式弹匣，可用于 Hi-Point CF-380 手枪。"
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr "陶鲁斯\"光谱\"手枪弹匣"
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr "一个紧凑的钢制盒式弹匣，可用于陶鲁斯\"光谱\"手枪。"
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr "M1911 .38超级弹匣"
@@ -51436,7 +53195,7 @@ msgstr[0] "微型核弹无人机"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
+"appears to have a mininuke inside.  If this is targeting you…  Run."
 msgstr "一只体积数倍于普通型号的无人机，这台正在飞行的四轴无人机体内装载了一枚微型核弹。如果它瞄准了你……快跑！"
 
 #: lang/json/MONSTER_from_json.py
@@ -51922,8 +53681,8 @@ msgstr[0] "龙虾"
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
-msgstr "这些东西曾被认为是不堪食用的害虫，直到某些营销天才把美味的螯虾料理卖给消费者后，这玩意儿的知名度——还有价格——开始蹭蹭地飞涨。"
+"off in popularity… and price."
+msgstr "这些东西曾被认为是不堪食用的害虫，直到某些营销天才把它们当作美食来宣传，从此这玩意儿的知名度……还有价格……开始蹭蹭地飞涨。"
 
 #: lang/json/MONSTER_from_json.py
 msgid "crayfish"
@@ -51934,8 +53693,8 @@ msgstr[0] "螯虾"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
-msgstr "淡水小龙虾。形似虾而甲壳坚硬，因肉味鲜美广受人们欢迎。因其杂食性、生长速度快、适应能力强而在当地生态环境中形成绝对的竞争优势。"
+"water, and some spicy seasonings…"
+msgstr "如果你能多搞到一点这些，一口大锅，和一些辣椒和香料的话……"
 
 #: lang/json/MONSTER_from_json.py
 msgid "Blinky"
@@ -53113,8 +54872,8 @@ msgstr[0] "变异鼠"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
-msgstr "一只有着蠕虫一样尾巴的啮齿动物，眼睛像鹰一般锐利，它的叫声听起来像是充斥着饥饿的哀叫。"
+"makes it sound… hungry."
+msgstr "一只有着蠕虫一样尾巴的啮齿动物，眼睛像鹰一般锐利，它的尖叫声听起来像是它已经……饿了。"
 
 #: lang/json/MONSTER_from_json.py
 msgid "lamb"
@@ -53557,9 +55316,21 @@ msgstr[0] "巨型爆汁丧尸"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
-msgstr "一只全身即将爆炸的爆汁丧尸，表皮已经变异得比较坚硬了，嘴中溢出的胆汁颜色似乎在进行变化。"
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
+msgstr "和一般的爆汁丧尸不同，这只爆汁丧尸的表皮已经变异得更加坚硬，嘴中溢出的胆汁颜色似乎也产生了变化……"
+
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] "放荡吞噬者"
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
+msgstr "由人类躯体融合而成的巨型怪物，膨胀的身体上伸出好几个头颅和肢体。你无法确切判断它的生命力，它的能力也可能会随时改变。"
 
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
@@ -53607,7 +55378,7 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
 "与零件、电缆融在一起的\"人\"，虽然眼睛空洞，但转瞬即逝的痛苦表情能让人想起被困在这具怪诞身体里的曾经是人类。掌握足够的外科手术技巧，就可以为他们找回一些人性，但愿他们还在乎……"
 
@@ -54354,9 +56125,9 @@ msgstr[0] "真食人族 希亚拉博夫"
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
 "独居森林中！~（嘘，嘘）\n"
@@ -54602,7 +56373,7 @@ msgstr[0] "可怖呕吐者"
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr "一具蹒跚移动的腐化尸体。许多垃圾和废弃材料已经融入了它的皮肤，周围的伤口渗出黑色粘液并散发出臭味。"
@@ -54758,9 +56529,9 @@ msgstr[0] "舞者丧尸"
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
@@ -54768,7 +56539,7 @@ msgstr ""
 "恶臭在空气里散发，\n"
 "四千年的怖妖，\n"
 "坟堆里的尸鬼，\n"
-"就将来完结你的性命！--迈克尔杰克逊《Thriller》\n"
+"就将来完结你的性命！——迈克尔杰克逊《Thriller》\n"
 "\n"
 "舞者丧尸根本没留意到你，它似乎被邻近的某个东西操纵着。"
 
@@ -55041,15 +56812,15 @@ msgstr[0] "战栗丧尸"
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
 "虽然你为了生存而战，\n"
 "你的身体开始颤抖。\n"
 "凡人不能抵挡，\n"
-"颤栗的邪恶--迈克尔杰克逊《Thriller》"
+"颤栗的邪恶——迈克尔杰克逊《Thriller》"
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie snapper"
@@ -56456,9 +58227,9 @@ msgid ""
 msgstr "一只双足站立的机械电动模型猪，体型大约是你的两倍。虽然是个机器兽，却散发着尸臭。"
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
-msgstr[0] "str_pl"
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
+msgstr[0] "模型羊"
 
 #. ~ Description for {'str': 'animatronic sheep', 'str_pl': 'animatronic
 #. sheep'}
@@ -56992,7 +58763,7 @@ msgid ""
 "ravenous eaters, aggressive hunters, and evil tempered at all times.  They "
 "attack prey on sight and will fight to the death."
 msgstr ""
-"这只可怕的枭熊兽可能是某个疯狂的巫师进行基因实验的结果。这些生物生活在温带气候中错综复杂的森林地区里，以及地下迷宫之中。它们是贪婪的食尸者，好斗的猎手，而且总是脾气暴躁。它们一看见猎物就攻击，并且会战斗到死。"
+"这只可怕的枭熊兽可能是某个疯狂的魔法师进行基因实验的结果。这些生物生活在温带气候中错综复杂的森林地区里，以及地下迷宫之中。它们是贪婪的食尸者，好斗的猎手，而且总是脾气暴躁。它们一看见猎物就攻击，并且会战斗到死。"
 
 #: lang/json/MONSTER_from_json.py
 msgid "black pudding"
@@ -57012,21 +58783,24 @@ msgid "The black pudding burns you with acid!"
 msgstr "黑布丁怪喷出酸液灼烧你！"
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
-msgstr[0] "诺斯克"
+msgid "krabgek"
+msgid_plural "krabgeks"
+msgstr[0] "魔眼怪"
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
-msgstr "一只邪恶的眼珠在黑暗中向外窥探，眼睛的闪光显示出它怪异的智慧和令人不安的恶意。"
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
+msgstr ""
+"一只邪恶的巨眼在黑暗中向外窥探，眼睛的闪光显示出它怪异的智慧和令人不安的恶意。巨眼中渗出某种粉色的液体，其人形的身体覆盖着诡异的蓝黑色尖锐三角甲板。"
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
-msgstr "诺斯克盯向了%3$s！"
+msgid "The krabgek gazes at %3$s!"
+msgstr "魔眼怪朝%3$s凝视！"
 
 #: lang/json/MONSTER_from_json.py
 msgid "owlbear cub"
@@ -57047,7 +58821,7 @@ msgid ""
 " flesh.  The stupid bulette is irascible and always hungry, and they fear "
 "nothing."
 msgstr ""
-"鲨蜥兽是一个疯狂巫师的实验结果，他将啮龟和犰狳进行杂交并注入了恶魔的灵液。它们生活在温带地区，以马、人和大多数其他动物为食。愚蠢的鲨蜥兽脾气暴躁，总是饥肠辘辘，它们什么也不怕。"
+"鲨蜥兽是一个某个疯狂的魔法师的实验结果，他将啮龟和犰狳进行杂交并注入了恶魔的灵液。它们生活在温带地区，以马、人和大多数其他动物为食。愚蠢的鲨蜥兽脾气暴躁，总是饥肠辘辘，它们什么也不怕。"
 
 #: lang/json/MONSTER_from_json.py
 msgid "will-o-wisp"
@@ -57070,10 +58844,46 @@ msgstr[0] "巨魔"
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
 msgstr "一只体型庞大的绿色皮肤的类人生物。巨魔以其厚皮和自然再生能力而闻名。"
 
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] "蚊蝠"
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr "这只可怕的飞行生物看起来就像一只大蝙蝠和一只超大蚊子的杂交。"
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] "尖叫蘑菇怪"
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr "尖叫蘑菇怪是一种和人一样大的蘑菇，通过发出刺耳的尖叫声来驱赶打扰它的生物。"
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] "劣魔"
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
+msgstr "劣魔就像一团融化的血肉，勉强能看出它有着人形的头部和躯干。"
+
 #: lang/json/MONSTER_from_json.py
 msgid "automated turret"
 msgid_plural "automated turrets"
@@ -58980,8 +60790,8 @@ msgid "Reveals an area around you on the overmap"
 msgstr "获得你附近的大地图视野。"
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
 msgstr "你感觉到自己看清了周边地区的地图……"
 
 #: lang/json/SPELL_from_json.py
@@ -59187,8 +60997,8 @@ msgstr "泛灵师符文"
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr "这仪式会创造出一块与泛灵师共鸣的小石块。你可以将符文作为催化剂用于制造其它物品。"
 
 #: lang/json/SPELL_from_json.py
@@ -59226,7 +61036,7 @@ msgstr "生化术士符文"
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr "这仪式会创造出一块与生化术士共鸣的小石块。你可以将符文作为催化剂用于制造其它物品。"
 
@@ -59275,6 +61085,20 @@ msgstr "自我传送"
 msgid "Translocates the user to an attuned gate."
 msgstr "将使用者传送到一个已经开启的易位门。"
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr "防酸术"
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr "让施法者不受酸液侵蚀。"
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr "高等防酸术"
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr "法术模板"
@@ -59324,7 +61148,7 @@ msgstr "使用一点耐力。"
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr "调试用法术 [ %s ] 没有效果。将会出现调试警告。"
 
 #: lang/json/SPELL_from_json.py
@@ -59482,7 +61306,7 @@ msgstr "德鲁伊符文"
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr "这仪式会创造出一块与德鲁伊共鸣的小石块。你可以将符文作为催化剂用于制造其它物品。"
 
@@ -59493,8 +61317,8 @@ msgstr "净化之种"
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr "你召唤了大地的馈赠，可用于净水。若不及时使用很快就会变质。"
 
 #: lang/json/SPELL_from_json.py
@@ -59541,8 +61365,8 @@ msgstr "塑地者符文"
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr "这仪式会创造出一块与塑地者共鸣的小石块。你可以将符文作为催化剂用于制造其它物品。"
 
 #: lang/json/SPELL_from_json.py
@@ -59568,6 +61392,10 @@ msgstr "熔岩炸弹地形"
 msgid "Lava Bomb"
 msgstr "熔岩炸弹"
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr "透视"
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr "扭曲恢复"
@@ -59575,7 +61403,7 @@ msgstr "扭曲恢复"
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr "这个法术会超载加速你的心脏，以再生皮肤和肌肉。这个法术不应在危险来临时使用，否则可能会造成致命性后果。"
@@ -59587,9 +61415,9 @@ msgstr "改良扭曲恢复"
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr ""
 "这个法术会超载加速你的心脏，以再生皮肤和肌肉。这个法术不应在危险来临时使用，否则可能会造成致命性后果。改良的制药方式降低了法术对身体的负担。"
 
@@ -59663,7 +61491,7 @@ msgstr "炽霜法师符文"
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr "这仪式会创造出一块与炽霜法师共鸣的小石块。你可以将符文作为催化剂用于制造其它物品。"
 
@@ -59706,8 +61534,8 @@ msgstr "魔术师符文"
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr "这仪式会创造出一块与魔术师共鸣的小石块。你可以将符文作为催化剂用于制造其它物品。"
 
 #: lang/json/SPELL_from_json.py lang/json/effects_from_json.py
@@ -59726,6 +61554,15 @@ msgstr "巨魔之力"
 msgid "Fox's Cunning"
 msgstr "狐之狡黠"
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr "吸血"
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr "从一个敌人身上吸血。"
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr "震颤电击"
@@ -59765,8 +61602,8 @@ msgstr "风暴塑造者符文"
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr "这仪式会创造出一块与风暴塑造者共鸣的小石块。你可以将符文作为催化剂用于制造其它物品。"
 
 #: lang/json/SPELL_from_json.py
@@ -59827,8 +61664,8 @@ msgstr "科技法师符文"
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr "这仪式会创造出一块与科技法师共鸣的小石块。你可以将符文作为催化剂用于制造其它物品。"
 
 #: lang/json/SPELL_from_json.py
@@ -59855,6 +61692,10 @@ msgstr "召唤魔法长剑"
 msgid "Mirror Image"
 msgstr "召唤镜像"
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr "X光视觉"
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr "恶魔火球"
@@ -60345,6 +62186,46 @@ msgstr ""
 "这是一个自制的 LED "
 "头灯，它经过强化比一般型号更耐用、更光亮、耗能更低，也能容纳更多的电池。头灯上的带子可以调整，让你可以把它穿在头上或者系在头盔上。它已经被开启，不断耗电来产生光亮。激活它来关闭。"
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] "原子头灯"
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr "你关上了头灯的灯罩。"
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+"这是一个自制的强化头灯，使用原子能衰变放出的能量照明，光线经过聚焦以达到能用的亮度。头灯上的带子可以调整，让你可以把它穿在头上或者系在头盔上。激活它来关上灯罩。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] "原子头灯（关）"
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr "你打开了头灯的灯罩。"
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+"这是一个自制的强化头灯，使用原子能衰变放出的能量照明，光线经过聚焦以达到能用的亮度。头灯上的带子可以调整，让你可以把它穿在头上或者系在头盔上。激活它来打开灯罩。"
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -60421,8 +62302,8 @@ msgstr[0] "相位沉浸服"
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
 "正在初始化\n"
@@ -61337,10 +63218,11 @@ msgstr "护耳的电池耗尽了。"
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
-msgstr "一对备由射手青睐的护耳。现在处于关闭状态。它们能阻挡超过一定分贝的声音，前提是有电。"
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
+msgstr "一对备由射手青睐的护耳。没有电池或关闭时，它们就像普通耳罩，阻挡任何声音。现在处于关闭状态。它们能阻挡超过一定分贝的声音，前提是有电。"
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -61774,6 +63656,198 @@ msgid ""
 "power."
 msgstr "C.R.I.T标准版头盔。保护头部，有一段绝缘钢网，用于颈部的保暖和防护。战术手电筒已经开启，正在消耗着电量并散发出昏暗的光芒。"
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] "魔法腰带"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] "迅捷绑带"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] "索尔的神奇腰带"
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr "传说中雷神索尔的神奇腰带，至少看起来是这样的。它能使佩戴者的基础力量加倍。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] "次级口袋腰带"
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr "一条很适合你腰部的宽腰带，上面覆盖着许多小口袋，能装下超出它们体积的物品，而且口袋中的物品重量大大减少。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] "高级口袋腰带"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] "武器腰带"
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr "一条很适合你腰部的宽腰带，你可以在眨眼之间将任何武器收入其中，收入的物品似乎被存放在其他空间之中。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] "铁鞭腰带"
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr "你抓起腰带，它瞬间在你手中舒展开，变成一根灵活的铁鞭子！"
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr "一根看上去似由金属编织而成但又十分灵活的皮带。你可以激活它，把它变成鞭子，然后切碎你的敌人。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] "逃脱之靴"
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr "一双十分坚固却又非常舒适合身的旧钢头皮靴，这双靴子能够每日激活一次，将你带出任何糟糕的对局，会让你朝一个随机方向传送出一大段距离。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] "钢制护腕"
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr "一对源自中世纪的手臂防护的完整集合。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] "钢制护腕"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] "次级防御护腕"
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr "一个轻巧而坚固的钢制护腕，顶部刻着华丽的盾牌图案，并用白银突出其错综复杂的设计。它能散发出一道微弱光环保护你全身，减少你所受到的伤害。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] "高级防御护腕"
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr "一个轻巧而坚固的钢制护腕，顶部刻着华丽的盾牌图案，并用黄金突出其错综复杂的设计。它能散发出一道强力光环保护你全身，减少你所受到的伤害。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] "次级闪电护腕"
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+"一个轻巧而坚固的钢制护腕，顶部刻着华丽的闪电图案，并用白银突出其错综复杂的设计。它能散发出一道微弱光环保护你全身，减少你所受到的电击伤害，并且能够每日施放三次震颤电击法术。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] "高级闪电护腕"
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+"一个轻巧而坚固的钢制护腕，顶部刻着华丽的闪电图案，并用黄金突出其错综复杂的设计。它能散发出一道强力光环保护你全身，减少你所受到的电击伤害，并且能够每日施放三次闪电束法术。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] "魔法面具"
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr "一个普通的魔法面具。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] "消失面具"
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr "一个除了眼孔和口孔之外没有任何面部特征的面具，激活后，它会使其他生物在一段时间内忽略你的存在。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] "完美视觉面具"
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr "一个有着明显的蒸汽朋克风的半面具，覆盖在眼部附近，外部有着体积巨大的镜头，能够纠正并大大提高佩戴者的视力。"
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -62090,9 +64164,9 @@ msgstr[0] "核能贝塔电池"
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
 "在家中就能轻易使用的核能辐射电池！它看起来像一个一号电池，但实际上包含了很多层放射性物质，能在稳定的电压下使用很多年。问题在于，它最多只能驱动一个小型 "
@@ -62215,8 +64289,8 @@ msgstr[0] "透视棒"
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr "用于测试透视功能的调试道具。不应该在正常游戏中出现。"
 
 #: lang/json/TOOL_from_json.py
@@ -62510,7 +64584,7 @@ msgstr "你点燃了%s的导火索。"
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr "一个粗糙而笨重的自制破片手雷，容器内装满了炸药和铁钉，还有一根引信。使用来点燃引信，你将有五回合时间去扔掉它。"
@@ -62530,8 +64604,8 @@ msgstr "你已经点燃了引信，你在等什么！"
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr "一个粗糙而笨重的自制破片手雷，容器内装满了炸药和铁钉，还有一根引信。引信已经被点燃了，你最好在手没掉之前扔出去。"
 
 #: lang/json/TOOL_from_json.py
@@ -62542,7 +64616,7 @@ msgstr[0] "破片炸弹"
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
@@ -62556,8 +64630,8 @@ msgstr[0] "破片炸弹（无保险）"
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr "一个粗糙而笨重的自制破片手雷，容器内装满了炸药和碎金属，还有一根引信。引信已经被点燃了，你最好在手没掉之前扔出去。"
 
@@ -62576,8 +64650,8 @@ msgstr "你点燃了锡罐炸弹的引信。赶紧在你的脸被炸掉之前扔
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr "一个炸药装到了脖子根儿的锡罐。从里面伸出了一点点引线。也许能够产生足以穿透装甲的金属破片吧……至少你是这么认为的。"
 
 #: lang/json/TOOL_from_json.py
@@ -62589,8 +64663,8 @@ msgstr[0] "锡罐炸弹（无保险）"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
 "一个炸药装到了脖子根儿的锡罐。从里面伸出了一点点引线。也许能够产生足以穿透装甲的金属破片吧……至少你是这么认为的。引信已经被点燃了，你最好在手没掉之前扔出去。"
 
@@ -62601,9 +64675,9 @@ msgstr[0] "万圣节南瓜"
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "点亮"
 
@@ -62637,7 +64711,7 @@ msgstr "灯笼内的蜡烛熄灭了。"
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
+"  The face shifts."
 msgstr "这个带鬼脸的塑料南瓜里面有一大根蜡烛。它无法提供多少亮光，但是能够烧很久。它的蜡烛已经点燃，上面的鬼脸随着蜡烛的火焰晃动。"
 
 #. ~ Description for battle axe
@@ -62767,6 +64841,26 @@ msgid ""
 "fuse stuck inside of it."
 msgstr "一个黑火药装到了脖子根儿的锡罐。里面插着一截点着的引线。"
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] "流浪汉火炉 （点燃）"
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "余烬熄灭了。"
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr "小型的流浪汉火炉，用金属罐或大小合适的类似容器制成。只能用于解冻和加热，用火绒做燃料。"
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -62986,8 +65080,8 @@ msgstr[0] "水力碾磨机"
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
 msgstr "小型水动力磨，可将含淀粉的物品加工成面粉。通过建造菜单放置。"
 
 #: lang/json/TOOL_from_json.py lang/json/furniture_from_json.py
@@ -62998,8 +65092,8 @@ msgstr[0] "风力碾磨机"
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
 msgstr "小型风动力磨，可将含淀粉的物品加工成面粉。通过建造菜单放置。"
 
 #: lang/json/TOOL_from_json.py
@@ -63322,7 +65416,7 @@ msgstr[0] "电动切肉刀（关）"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
 msgstr "一把使用电池供电的切肉刀。一副共同振动的锯齿状刀刃从火鸡到火腿都能轻松切开……甚至丧尸！"
 
@@ -63486,7 +65580,7 @@ msgstr[0] "生命饮管"
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr "将生命饮管放入污水中，静置一分钟之后即可饮用。它内置的双重过滤系统将会将水净化至可饮用状态。从河流之类的不明水源取得的水有可能被污染。"
@@ -63906,9 +66000,9 @@ msgstr[0] "电子手铐"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-"一副电子手铐，警察和机器人用来限制嫌疑人行动的常用工具。它会持续的发出警报并且不停地呼叫警官过来将犯人带回警局关押。如果试图挣脱或者逃跑，手铐将主动电击疑犯。\n"
+"一副电子手铐，警察和机器人用来限制嫌疑人行动的常用工具。它会持续的发出警报并且不停的呼叫警官过来将犯人带回警局关押。如果试图挣脱或者逃跑，手铐将主动电击疑犯。\n"
 "\"鉴于目前的治安情况，请在被电击和被吃掉脑子之间选择一个吧，亲。\""
 
 #: lang/json/TOOL_from_json.py
@@ -65718,8 +67812,8 @@ msgstr[0] "海绵"
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
 msgstr "海绵由多孔的软材料制成，可以拿来做清洁。通常用于清洁不透水的表面。"
 
 #: lang/json/TOOL_from_json.py
@@ -66582,7 +68676,7 @@ msgstr "你点燃了黑火药药包的导火索，好吧，赶紧找个地处理
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr "这是一个土制的爆炸装置，由一个装满了黑火药和废金属的大塑料罐制成，有根长长的引线。使用来点燃导火索。几分钟内就该爆炸了……"
 
 #: lang/json/TOOL_from_json.py
@@ -67081,36 +69175,6 @@ msgid "hobo stove"
 msgid_plural "hobo stoves"
 msgstr[0] "流浪汉火炉"
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr "流浪汉火炉被点燃了。"
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "你需要一个火源！"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr "小型的流浪汉火炉，用金属罐或大小合适的类似容器制成。只能用于解冻和加热，用火绒做燃料。"
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] "流浪汉火炉 （点燃）"
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "余烬熄灭了。"
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -67279,8 +69343,8 @@ msgstr[0] "挂肉钩"
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
 msgstr "简单的金属肉钩 + 圆把手 = 还算凑合的近战武器。"
 
 #: lang/json/TOOL_from_json.py
@@ -67619,7 +69683,7 @@ msgstr "你把安防机器人的程序设置错了，然后它就把枪对准了
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -67627,8 +69691,8 @@ msgid ""
 "will then identify you as a friendly, roam around or follow you, and attack "
 "all enemies with its rifle."
 msgstr ""
-"这是一架未激活的\"鹰爪\"型无人车，配有一把 M16A4 步枪。使用它时将会打开它然后将其放置在地上，并装填你物品栏内的原装 5.56x45mm "
-"口径弹药（如果你只想装填部分弹药，请先把不需装填的弹药移出物品栏）。如果重新编程成功，无人车会将你识别为友军，随处游荡或跟随你，并攻击所有在其步枪攻击范围内的敌人。"
+"一台未激活的\"鹰爪\"型无人车，配有一把 M16A4 步枪。使用该物品以将它放置在地上并打开它，并装填你物品栏内的原装 5.56x45mm "
+"口径弹药（如果你只想装填部分弹药，请先把不需装填的弹药移出物品栏）。如果重新编程成功，无人车会将你识别为友军，自主行动或跟随你，并攻击所有在其步枪攻击范围内的敌人。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive M202A1 TALON UGV"
@@ -67638,7 +69702,7 @@ msgstr[0] "M202A1 \"鹰爪\"型无人车（关）"
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -67646,8 +69710,8 @@ msgid ""
 "you as a friendly, roam around or follow you, and attack all enemies with "
 "its M202A1."
 msgstr ""
-"这是一架未激活的\"鹰爪\"型无人车，配有一把 M202A1 火箭筒。使用它时将会打开它然后将其放置在地上，并装填你物品栏内的 M235 "
-"火箭弹（如果你只想装填部分弹药，请先把不需装填的弹药移出物品栏）。如果重新编程成功，无人车会将你识别为友军，随处游荡或跟随你，并攻击所有在其 "
+"一台未激活的\"鹰爪\"型无人车，配有一把 M202A1 火箭筒。使用该物品以将它放置在地上并打开它，并装填你物品栏内的 M235 "
+"火箭弹（如果你只想装填部分弹药，请先把不需装填的弹药移出物品栏）。如果重新编程成功，无人车会将你识别为友军，自主行动或跟随你，并攻击所有在其 "
 "M202A1 火箭筒攻击范围内的敌人。"
 
 #: lang/json/TOOL_from_json.py
@@ -67729,11 +69793,11 @@ msgstr "破损的改造人发出痛苦的嚎叫并攻击你！"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
-"这是一个未激活的破损改造人，它最后依然残留着几分人性。使用这个物品需要把它放在地上，重新激活它。如果重新编程成功，改造人将跟随你攻击敌人（你这个魔鬼）。"
+"一台未激活的破损改造人，它最后依然残留着几分人性。使用这个物品需要把它放在地上，重新激活它。如果重新编程成功，改造人将跟随你攻击敌人（你这个魔鬼）。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive prototype cyborg"
@@ -67783,7 +69847,7 @@ msgstr "双足机器人发出呜呜声瞄准了你。快找掩护！"
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -67791,7 +69855,8 @@ msgid ""
 "will then identify you as a friendly, roam around or follow you, and attack "
 "all enemies with a built-in firearm and grenade launcher."
 msgstr ""
-"这是一个未激活的双足机器人。使用该物品时需要将其放在地面上，它会从你的物品栏装载5.56发子弹和40毫米弹榴弹（如果你想分割你的弹药，把你不想给机器人的弹药放在一边），然后激活它。如果重新编程成功，双足机器人将识别你为友军，四处游荡或跟随你，并用内置的火器和榴弹发射器攻击所有敌人。"
+"一台未激活的双足机器人。使用该物品以将它放置在地上并打开它，并装填你物品栏内的原装 5.56mm 口径子弹和 40mm "
+"口径榴弹（如果你只想装填部分弹药，请先把不需装填的弹药移出物品栏）。如果重新编程成功，无人车会将你识别为友军，自主行动或跟随你，并攻击所有在其步枪和榴弹发射器攻击范围内的敌人。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive police bot"
@@ -67812,12 +69877,12 @@ msgstr "警笛响亮，警灯闪烁……警用机器人正准备逮捕你！"
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
-"一个未激活的警用机器人。使用它以将它开启并放在地面上。如果重新编程和布线成功，该警用机器人会将你识别为执法人员，开始四处游荡并跟随你，并试图拘捕违法者。"
+"一台未激活的警用机器人。使用该物品以将它放置在地上并打开它，如果重新编程和布线成功，该警用机器人会将你识别为执法人员，自主行动或跟随你，并试图拘捕违法者。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive eyebot"
@@ -67841,10 +69906,10 @@ msgstr ""
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
-msgstr "一个未激活的眼球无人机。使用该物品以将它开启并运行无人机，如果重新编程和布线成功，眼球机器人会开始寻找入侵者。"
+msgstr "一台未激活的眼球无人机。使用该物品以将它开启并运行无人机，如果重新编程和布线成功，眼球机器人会开始寻找入侵者。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive cleaner bot"
@@ -67864,10 +69929,10 @@ msgstr "清洁机器人发出运行错误的提示音，开始到处乱擦。"
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
-msgstr "一个未激活的清洁机器人。使用该物品以将它放置在地上并打开它，如果重新编程和布线成功，它将会遵守你发出的指令。"
+msgstr "一台未激活的清洁机器人。使用该物品以将它放置在地上并打开它，如果重新编程和布线成功，它将会遵守你发出的指令。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive miner bot"
@@ -67887,10 +69952,10 @@ msgstr "钻掘机器人旋转着钻头——失控了，它向你冲来，快让
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
-msgstr "未激活的钻掘机器人。使用此物品以将其放在地上并开启，如果重新编程和布线成功，它将会遵守你发出的指令。"
+msgstr "一台未激活的钻掘机器人。使用该物品以将它放置在地上并打开它，如果重新编程和布线成功，它将会遵守你发出的指令。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive riot control bot"
@@ -67911,10 +69976,10 @@ msgstr "防暴机器人喷射着催眠瓦斯，带着一副手铐向你靠近。
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
-msgstr "一个未激活的防暴机器人。使用该物品以将它放置在地上并打开它，如果重新编程和布线成功，它将会给这儿带来秩序与和平。"
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
+msgstr "一台未激活的防暴机器人。使用该物品以将它放置在地上并打开它，如果重新编程和布线成功，它将会给尸潮带去秩序与和平。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive skitterbot"
@@ -67934,10 +69999,10 @@ msgstr "掠行机器人在你周围飞来飞去，并发出威胁性的咔嗒声
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
-msgstr "一个未激活的掠行机器人，使用该物品以将它放置在地面上并打开它，如果重新编程和布线成功，它将会冲向敌人并攻击它们。"
+msgstr "一台未激活的掠行机器人，使用该物品以将它放置在地面上并打开它，如果重新编程和布线成功，它将会冲向敌人并攻击它们。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive lab defense bot"
@@ -67987,7 +70052,7 @@ msgstr "坦克无人机旋转炮塔，直接瞄准了你。穿上裤子快跑！
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -67995,7 +70060,8 @@ msgid ""
 " will then identify you as a friendly, roam around or follow you, and attack"
 " all enemies with a built-in firearm and grenade launcher."
 msgstr ""
-"这是一部未激活的\"猎兔犬\"型无人坦克车。使用该物品需要打开它并将其放在地面上，同时会装填你物品栏内的对应5.56口径子弹和40毫米口径榴弹（如果你想分割你的弹药，把你不想给机器人的弹药放在一边）。如果重新编程和布线成功，坦克无人机会将你识别为友军，随处游荡或跟随你，并用内置的火器和榴弹发射器攻击所有敌人。"
+"一台未激活的\"猎兔犬\"型无人坦克车。使用该物品以将它放置在地上并打开它，并装填你物品栏内的原装 5.56mm 口径子弹和 40mm "
+"口径榴弹（如果你只想装填部分弹药，请先把不需装填的弹药移出物品栏）。如果重新编程成功，无人车会将你识别为友军，自主行动或跟随你，并攻击所有在其步枪和榴弹发射器攻击范围内的敌人。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive tripod"
@@ -68017,13 +70083,13 @@ msgstr "三足机器人锁定了你，开启了它的喷火器，散发出凝固
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
 msgstr ""
-"一台未激活的三足机器人。使用这个物品需要将它放置在地上，为它的火焰喷射器提供燃料并打开它。如果重新编程和布线成功，它会将你识别为友军，开始四处游荡并跟随你，用其带刺的电缆武器刺穿敌人。"
+"一台未激活的三足机器人。使用该物品以将它放置在地上并打开它，你无法知道它是怎么为火焰喷射器提供燃料。如果重新编程和布线成功，它会将你识别为友军，开始四处游荡并跟随你，用其带刺的电缆武器刺穿敌人。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive milspec searchlight"
@@ -68044,13 +70110,13 @@ msgstr "当探照灯拒绝转离你时，明亮的灯光会使你失明。"
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
-"这是一个未激活的军用级自动探照灯。使用这个物品需要将其放在地上并打开。如果重新编程和布线成功，探照灯会将你识别为友军，调查该区域，并照亮接近的敌人。它似乎对你有一种不健康的迷恋。"
+"一台未激活的军用级自动探照灯。使用该物品以将它放置在地上并打开它。如果重新编程和布线成功，探照灯会将你识别为友军，调查该区域，并照亮接近的敌人。它似乎对你有一种不健康的迷恋。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive dispatch"
@@ -68359,7 +70425,7 @@ msgstr[0] "简易战斗镰刀"
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
+"of a stick.  However it's quite fragile."
 msgstr "这种农用镰刀的刀刃旋转了90度，被改造成一种简易的武器，巨大而致命。但是它很脆弱。"
 
 #: lang/json/TOOL_from_json.py
@@ -68454,6 +70520,20 @@ msgid ""
 " be deadly in either the right hands or when attached as a bayonet."
 msgstr "一把轻而锋利的军用战斗匕首，用于近战搏斗和近战突袭，可以当作刺刀使用。"
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] "改装战术匕首"
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr "一把轻而锋利的军用战斗匕首，用于近战搏斗和近战突袭，可以当作刺刀使用。这把匕首经过了改装，可以装在除手枪外的几乎任何武器上。"
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -68763,6 +70843,21 @@ msgid ""
 " of a firearm or crossbow converting it into a pike."
 msgstr "长刺刀是一种安装在枪械或弩前端的大型斩击武器。可以让你的武器变成近战长矛。"
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] "改装长刺刀"
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+"长刺刀是一种安装在枪械或弩前端的大型斩击武器。可以让你的武器变成近战长矛。这把刺刀经过了改装，可以装在除了手枪和冲锋枪之外的几乎任何武器上。"
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -68863,6 +70958,57 @@ msgid ""
 "light for its size."
 msgstr "一柄起源于日本镰仓时代后的野太刀，多用于武士骑马作战，亦是一种勇武的象征，长约五尺（≈160厘米），刀身并不宽阔但极为锋利，极具致命性。"
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] "电击花剑"
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+"这把花剑的改装可以说毫无体育精神，但是能够给你在这场末日比赛中带来一点优势。这把花剑的把手经过了充分绝缘改装，剑格上接上了一把高压电击枪，并通过电子计分器的电路连到了花剑末端。如果你在击打敌人时按下电击开关，就可以释放出一道强烈的电击。"
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] "电击重剑"
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+"这把重剑的改装可以说毫无体育精神，但是能够给你在这场末日比赛中带来一点优势。这把重剑的把手经过了充分绝缘改装，剑格上接上了一把高压电击枪，并通过电子计分器的电路连到了重剑末端。如果你在击打敌人时按下电击开关，就可以释放出一道强烈的电击。"
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] "电击佩剑"
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+"这把佩剑的改装可以说毫无体育精神，但是能够给你在这场末日比赛中带来一点优势。这把佩剑的把手经过了充分绝缘改装，剑格上接上了一把高压电击枪，并沿着佩剑的血槽连到了剑的末端。如果你在击打敌人时按下电击开关，就可以释放出一道强烈的电击。"
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -69192,6 +71338,32 @@ msgid ""
 "reinforce plastic items."
 msgstr "一块塑料。可以用来制作，修复或者强化塑料制品。"
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] "化纤布片"
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr "一小束合成化纤。与你和其他天然材料不同，它不会随着年龄的增长而衰老退化。不过也许现在这不算什么坏事了。"
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] "莱卡布片"
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr "一小束掺入了可拉伸的莱卡纤维的合成纤维。可以用来制作具有弹性而坚韧的衣物。时尚，但不环保；但至少现在你会回收它了。"
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -69628,8 +71800,7 @@ msgstr[0] "双向无线电"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
 msgstr "这是一个有数据传输模块的无线电手台，你可以用它和另一个有这个手台的人联系。只是，在这个年头，好像没有人用这个了……"
 
 #: lang/json/TOOL_from_json.py
@@ -69789,12 +71960,12 @@ msgstr[0] "显微镜"
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
 msgstr ""
-"一个经典的工具！这件笨重耐用的实验室设备让你更清晰地看到小东西。没有电，光就不能工作，但其余的功能却令人惊讶。不幸的是，它目前没有太多用处。"
+"一个经典的工具！这件笨重耐用的实验室设备能让你更清晰地看到小东西。由于没有电，它的灯泡不能工作，但其余的功能却非常完好。不幸的是，事到如今它也没有太多用处了。"
 
 #: lang/json/TOOL_from_json.py
 msgid "dissecting microscope"
@@ -69979,7 +72150,7 @@ msgstr[0] "重型电缆"
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr "一条又粗又长，两端还镀铅的重型电缆。看来你可以用它来连接两部载具，不过线路损耗不可小觑。也可以用来连接其它电力系统。"
 
@@ -70364,7 +72535,7 @@ msgstr "你按下火炬按钮，热立方上方随即喷出了一道巨大的火
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr "一个有你拳头大的光滑钢制立方体，上面有数个按钮，能够启动热立方的不同功能。"
 
@@ -70393,7 +72564,7 @@ msgstr[0] "魔法万能钥匙"
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr "一把金制万能钥匙。你可以用它来开锁。"
 
 #: lang/json/TOOL_from_json.py
@@ -71370,11 +73541,6 @@ msgid ""
 "This is a stick that has been cut into a trigger mechanism for a snare trap."
 msgstr "一只木棍被削成木制的机关，用于制作捕猎陷阱。"
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] "列瓦汀"
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -72488,6 +74654,17 @@ msgid ""
 " terribly when not on a rail."
 msgstr "坚固的铁路车轮。轮缘有助于将它保持在轨道上，但如果不在轨道上，它会表现得非常糟糕。"
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr "窄轨轨道轮"
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr "一对窄轨火车车轮。它适合用在游乐园等地的观光窄轨铁路上。主要是为了观光游乐，而不是运输货物。"
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "摩托车轮"
@@ -72852,6 +75029,10 @@ msgstr "打砸"
 msgid "cranking"
 msgstr "转动把手"
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr "加热"
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr "减压"
@@ -73132,6 +75313,10 @@ msgstr "箭"
 msgid "pebbles"
 msgstr "小石子"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "石头"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr "纸壳弹"
@@ -73486,7 +75671,7 @@ msgstr "合金装甲-手臂"
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr "你的手臂的皮肤被手术替换成了合金装甲，提供防护并可用于生化武术。"
@@ -73521,7 +75706,7 @@ msgstr "合金装甲-腿部"
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr "你的腿部的皮肤被手术替换成了合金装甲，提供防护并可用于生化武术。"
@@ -73823,15 +76008,20 @@ msgstr "酒精锅炉"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
-msgstr "你通过一种极其高效的转换方式燃烧酒精产生能量。然而你还是会受到醉酒的不良影响。"
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
+msgstr "你通过一种极其高效的转换方式燃烧酒精产生能量。"
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "湿气凝水器"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr "这个插件可以从周围的空气中吸收水蒸气，逐渐将其直接注入血液之中。在非常干燥的地区，此仪器可能效果不佳。"
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "钻石角膜"
@@ -74075,10 +76265,10 @@ msgid ""
 msgstr "你安装了刺激造血功能的生化系统，让你可以消耗储能来加速白细胞的生产。它应当保持持续运行，开启后再关闭可能会导致不愉快的副作用。"
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "迷你火焰发射器"
+msgid "Finger Lighter"
+msgstr "指尖打火机"
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -74105,9 +76295,9 @@ msgstr "掌心电磁铁"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
-msgstr "你的右手被手术植入了一个强力电磁铁，使你能够无差别的吸引周围所有磁性物品。不明真相的围观群众可能会被到处乱飞的物品击伤甚至击毙。"
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
+msgstr "你的右手被手术植入了一个强力电磁铁，使你能够使用自身力量吸引周围所有磁性物品。不明真相的围观群众可能会被到处乱飞的物品击伤甚至击毙。"
 
 #: lang/json/bionic_from_json.py
 msgid "Nictating Membrane"
@@ -74166,9 +76356,9 @@ msgstr "医疗纳米机器人"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
-msgstr "你体内有一群微型纳米机器人。开启时会不断消耗能量，并绕行你的周身，以 1 HP 每秒的速度修复伤害以及止血。"
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
+msgstr "你体内有一群微型纳米机器人。开启时会不断消耗能量，绕行你的周身，并通过消耗额外能量和卡路里来以每分钟 1 HP 的速度修复伤害以及止血。"
 
 #: lang/json/bionic_from_json.py
 msgid "Artificial Night Generator"
@@ -74203,8 +76393,8 @@ msgstr "一个出现故障的生化插件。它偶尔会发出一阵滋滋滋的
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
-msgstr "你真的不知道它是怎么到你鼻子你去的，但不管怎样它严重的干扰了你的呼吸，你不得不用嘴来呼吸。嘴部累赘+1。"
+"Increases mouth encumbrance by ten."
+msgstr "你真的不知道它是怎么到你鼻子你去的，但不管怎样它严重的干扰了你的呼吸，你不得不用嘴来呼吸。嘴部累赘+10。"
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -74234,8 +76424,8 @@ msgstr "你的神经系统经过生化改造，可让你大幅度抑制痛苦及
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
-msgstr "由于一次严重的生化插件安装失误，你现在患有轻度视神经病变。眼部累赘+1。"
+"mild optic neuropathy.  Increases eye encumbrance by ten."
+msgstr "由于一次严重的生化插件安装失误，你现在患有轻度视神经病变。眼部累赘+10。"
 
 #: lang/json/bionic_from_json.py
 msgid "Power Armor Interface"
@@ -74267,12 +76457,12 @@ msgstr "储能模块"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
 msgstr ""
 "小型生化电池插件，可以为你增加 100 "
-"点生化能量储备上限。你至少需要一个储能模块才能使用耗能型生化插件，同时你还需要至少一种供能型生化插件，为自己充能。"
+"千焦的生化能量储备上限。你至少需要一个储能模块才能使用耗能型生化插件，同时你还需要至少一种供能型生化插件，为自己充能。"
 
 #: lang/json/bionic_from_json.py
 msgid "Power Storage Mk. II"
@@ -74280,9 +76470,8 @@ msgstr "储能模块Mk.II型"
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
-msgstr "小型生化电池插件，可以为你增加 250 点生化能量储备上限。"
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
+msgstr "小型生化电池插件，可以为你增加 250 千焦的生化能量储备上限。"
 
 #. ~ Description for Power Overload
 #: lang/json/bionic_from_json.py
@@ -74556,8 +76745,8 @@ msgstr ""
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
-msgstr "会自锁的手指紧紧抓住（尽管你不想这么做）并且坚决不松开（尽管你很想放手）。手掌累赘+2，但是并不能让你能把手里的物品抓得更牢。"
+" by ten, while failing to improve your ability to hold objects whatsoever."
+msgstr "会自锁的手指紧紧抓住（尽管你不想这么做）并且坚决不松开（尽管你很想放手）。手掌累赘+10，但是并不能让你能把手里的物品抓得更牢。"
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -74688,8 +76877,8 @@ msgstr "你的掌心经过手术被植入了纳米管，允许你从任何尸体
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
@@ -74745,7 +76934,7 @@ msgstr "味觉调节"
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr "你的嘴里被安装了一套高度敏感的传感器，头骨腔中安装了一个小而精密的分析仪。开启后将消耗生化能量使所有难吃的食物不再具有负面心情效果。"
@@ -75437,6 +77626,18 @@ msgstr "用泥土填坑"
 msgid "Make Woodchip Floor"
 msgstr "建造碎木地板"
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr "建造碎石地板"
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr "建造直线窄轨轨道"
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr "建造对角窄轨轨道"
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr "建造木地板"
@@ -76088,6 +78289,10 @@ msgstr "建造无线发射塔"
 msgid "Build a radio tower console."
 msgstr "建造无线电控制台"
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr "建造圆木凳"
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr "改造冰箱电源"
@@ -76366,7 +78571,7 @@ msgstr "在梦里，你看见了自己奇怪的像野兽般的身影。"
 
 #: lang/json/dream_from_json.py
 msgid "You dream of foraging in the woods... mouth-first?"
-msgstr "你梦见自己在丛林中搜寻草料……还用的嘴？"
+msgstr "你梦见自己在丛林中采集草料……还用的嘴？"
 
 #: lang/json/dream_from_json.py
 msgid "Your dream-reflection is rather bearish."
@@ -76786,6 +78991,42 @@ msgstr "你梦到一株奇形怪状的植物，其花蜜如同琼浆玉露，超
 msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr "你梦到一群蜜蜂为了你甘甜的花蜜而争斗。感觉真好。"
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr "你梦见自己把根深深地浸入土壤中，四季随之流逝，多么伟大啊。"
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr "你梦见一颗巨大的根结，像一颗心一样跳动。"
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr "你做了一个令人不安的梦，梦中白蚁在你全身上下咀嚼着你。"
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr "你梦见自己与一片广袤的森林共同分享根部，当树冠不断向上生长时，所有的植物都得到了满足。"
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr "你梦见一群毛毛虫啃食着你的叶子。"
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr "你梦见火焰在你四周肆虐，舔舐你的树皮，吞没你根旁的幼苗和灌木。曾经喋喋不休的森林也随之安静。"
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr "你梦见和一棵古老的松树交流。它告诉你，树木才是这个世界真正的幸存者。"
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -78067,6 +80308,25 @@ msgstr "你的手不受控制的颤抖。"
 msgid "You tremble"
 msgstr "你剧烈颤抖"
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr "癫痫发作"
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr "你的肌肉不停抽搐，而你无法控制它们！"
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr "你现在能重新控制你的肌肉了！"
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr "你的肌肉不受控制了！"
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "流血"
@@ -78978,6 +81238,26 @@ msgstr "你的新陈代谢变得不稳定。"
 msgid "Your metabolism becomes more stable."
 msgstr "你的新陈代谢稳定下来了。"
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr "令人担忧的症状"
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr "你的肌肉一直在奇怪地抽搐。"
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr "令人不安的症状"
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr "你的神经系统失灵了，就像从内部被撕裂了一样。"
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "被照亮"
@@ -79226,6 +81506,17 @@ msgstr "超级充能"
 msgid "You've been struck by lightning, and feel... different."
 msgstr "你最近被闪电击中过，感觉很……奇特。"
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr "融合成长"
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr "AI专用效果：在吸收了其他怪物后增加属性。每一层表示吸收了max_hp的血量。"
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr "冒犯信仰"
@@ -79855,6 +82146,207 @@ msgid ""
 msgstr ""
 "因为被仅存的安防系统跟踪并记录下了数次抢劫以及破坏行为，一台警用机器人抓住了他并将他铐了起来。在被机器人压在地上等待更多的警察快速反应部队来支援时，他被因为警报而引来的周围的丧尸给撕成了碎片。"
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr "     在你死后成为了一位独自居住在森林深处的猎人。被人跟踪到他的小屋，他在睡梦中被一个真正的食人者杀害并吞食。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+"     "
+"活了不少年，成了一名远近闻名的拾荒者，最终在一处自由商会的前哨站里开了一间小店。他有两个儿子活了下来，而自己被一件罕见的神器用酸液腐蚀血液而毒死了。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+"     "
+"在你死后，他在这片土地上四处游荡拾荒了好几年，最终成为一名熟练的技工。受雇于自由商会，他过着舒适而平淡的生活，最终死于癌症，在这种年代相当罕见且奢侈。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+"     在你死后变得相当抑郁，独自隐居在森林之中。如果谣言可信的话，他多年以来都是个精神错乱的隐士，住在一处偏僻的洞穴之中，崇拜石头，并用狗做祭品。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+"     "
+"在你死后，他痴迷于保存旧日知识，最终获得\"博学者\"的尊称。他被旧日守护者雇为图书管理员，一生都在尘土飞扬的旧书中度过，试图说服其他人相信它们的价值。为了纪念一位法国老哲学家，他甚至改名为弗雷德里克·巴斯夏。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+"     "
+"你死后，他找到了信仰，最终加入了圣公会，成为了一名教区牧师。十字架给了他存在的意义感，直到他在掠夺者的手中可怕地死去。在被掠夺者们活活烧死之前，他仍在祈祷。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+"     "
+"在你死后，他加入了一个血腥的邪教，绑架年轻女子并将其作为祭品牺牲。他的团伙成员在被旧日守护者发现后都被杀了。他的头被钉在一根竖起来的尖刺上，警告人们任何邪教徒都不会被容忍。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr "     在你死后，他没能活多久。他在一个旧地窖中触电身亡，死前不停地尖叫着你的名字。他的尸体从没被任何人找到。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr "     只比你多活了几天，然后就在逃离尸潮时被淹死了。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+"     "
+"他独自乱逛了几天，然后找到了一个自由商会的前哨站。他当了几年的商队警卫，经常喝得半死不活，享受他付得起价钱的每一个女人。酒精使他经常握不住枪，最后他被解雇了。在那天，他死于酒精中毒。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+"     "
+"一直痴迷于找个地方安顿下来，他最终找到了自己的真爱，并引退到一所偏僻的农场之中。相对免受怪物打扰，他过了许多年的好日子。最后还生了七个儿子和两个女儿。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr "     在发现了一间老啤酒厂并抄袭了配方之后，他成为了废土世界中的名人。他的冰镇啤酒，成为众所周知的美食，并被自由商会广泛交易。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr "     找到了满满一个地窖的整瓶麦芽威士忌。喝得烂醉如泥死掉了。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr "     在你死后他很抑郁，几天后上吊自杀了。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr "     四处徘徊了几个月，才找到一个愿意接纳他的小型社区。他成了一名农民，平平安安地度过了余生，照料庄稼，庆幸他不再是孤身一人。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr "     他痴迷于寻找\"解药\"，几周后死在一所旧实验室里，被防御炮塔撕成了碎片。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr "     成为难民中心的一名送信员，几个月后就死了。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr "     几周后，他加入了一伙掠夺者，并在试图抢劫自由商会商队的交火中丧生。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr "     去了北方，最终他找到了一个完好无损的棒球场，并在那里建立了一个繁荣的农耕社区。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr "     在其后短短的一生中，他一直都在寻找新的解决办法。最后在一个废弃地下室中死于吸毒过量。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr "     南下并加入了一个小渔村。几年后，他和他的小儿子一同死于一次掠夺者的袭击中。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr "     他被你的死吓得魂不附体，隐退在一所旧LMOE避难所之中，发誓永不离开。最后饿死在了里面。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr "     他成为了一个非常成功的猎人，交易肉类和皮毛，并为许多定居点提供食物，以换取酒类和男性同伴。几年后他死于性病。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr "     隐退在森林之中，他在一间荒凉的小木屋里钓鱼和打猎，很少和其他人交往。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr "     他死在前往加利福尼亚的路上，在被蜘蛛慢慢吞噬的同时，他还在疯狂地梦想着过上更好的生活。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr "     你死后他试图应付孤独，但失败了。一群丧尸发现了他的藏身之处，而他却恰好喝得烂醉，毫无机会。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr "     他没能活多久，被尸潮所惊醒。它们在紧要关头砸破了防御工事的窗户，最后他只有用一发子弹阻止自己被丧尸们活活吃掉。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr "     你死后不久他就生病了，没能获得任何治疗就死了。他的临终遗言是：\"为什么还要让我活着忍受这样的痛苦呢？\""
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -80093,6 +82585,169 @@ msgid ""
 msgstr ""
 "因为被仅存的安防系统跟踪并记录下了数次抢劫以及破坏行为，一台警用机器人抓住了她并将她关了起来。独自被困在牢房中等待永不到来的警局复审，她在这几周内不断大声喊叫求救，而随身补给也渐渐消耗光了。在被拖进牢房的两周之后，她死于脱水。"
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr "     几个星期后，旧日守护者枪毙了她，他们在她抢劫了一队重要的商队之后抓住了她。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr "     去了北方，她终于在那里找到了一个安静的社区，在那里度过了她的余生。她还生了四个女儿。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+"     "
+"她成为了旧日守护者的一名送信员，并最终获准加入。她余生都在四处猎杀掠夺者。几年后，她死于一场小规模战斗中，为了让她的部队撤退，她牺牲了自己的生命。她的名字在歌曲和铭文中被人称颂。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr "     你死后不久，她加入了自由商会，成为一名商队警卫，几个月后成为难民中心的新联络员。几年后，她死于一种神秘的疾病。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr "     旧日守护者收留了她，他们发现她时她正半死未死。她成了著名的拾荒者，而且因为找到了一箱完整的实验性抗生素而远近闻名。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr "     她隐退在森林深处，在那里她建立了自己的小屋，并捕鱼度过了她的余生。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr "     被掠夺者俘虏后，她作为奴隶度过了痛苦的余生。因为没有任何希望，她用一把生锈小刀割腕自杀了。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr "     她郁郁寡欢，加入了一个新教社区，并成为了美德典范。她毕生致力于研究圣经，在相对平静的环境中度过了余生。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr "     就在你死后几天，被一个食人者杀死并吞食，几乎没有人记得她的名字。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr "     你死后她成了著名的商人，她在西方建立了自己的基地。作为一位狂热的图书收藏家，她建立了一所大图书馆，以保证知识的火焰能继续燃烧。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr "     在你死后四处周游了几个月才找到一所旧农场定居下来。她花了几年时间照料她的庄稼，过着隐士的生活，最终被掠夺者取乐并杀死。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr "     南下并加入了那里的一个定居点。她成为了一名著名的工程师，建造了新英格兰最大的蒸汽机。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr "     在你死后加入了一伙强盗，她花了几个月的时间捕食无辜的人，然后和一个同伴的争执中被杀死。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr "     她被一群丧尸活活吞下，她死前还一直想着你。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr "     她发现了一辆废弃的装甲运兵车，花了几年时间四处旅行，收集个人故事。她写了为数不多的灾变后的书之一，详细描述了末日之后的生活。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr "     在你死后又四处游荡了许多年。最后被一群掠夺者当作活靶子练枪法，她的生命就此终结。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr "     她成为了一名熟练的猎手，也是废土上最好的枪手之一。几年后，她加入了旧日守护者，被授予执法官的职位。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr "     为了拯救人类免于灭绝，她组织了自己的幸存者小队，他们的工作是追杀土匪，用他们残缺的身体装饰道路。几个月后，她死于一场遭遇战。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr "     她成了一名纵火员，几周后在一场自己点燃的大火中被活活烧死。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr "     她又四处游荡了几个星期，但最终在喝了未经处理的水后死亡。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr "     她北上并加入了当地的一个社区。她以她的陷阱技巧而远近闻名，总能确保当地人的餐桌上总是有新鲜的肉可吃。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr "     她加入了自由商会，并组织了他们首支前往加拿大的商队。几年后她死于痢疾。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr "     她建造了一艘船，尝试向东驶向欧洲，并希望那里没受到大灾变的影响。之后就再也没有她的消息了。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr "     她花了数年时间组织了一个末日崇拜邪教，最后在某一年特别糟糕的收成之后，她被同伙们当作祭品献给了他们的邪神。"
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr "     沉迷于各种化学合成毒品，并在你死后几个月死于吸毒过量。"
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "你的追随者"
@@ -80244,10 +82899,10 @@ msgid "A small family surviving on their generational land."
 msgstr "一个世代生存在同一片土地的小家族。"
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
-msgstr "神之社团"
+msgid "New England Church Community"
+msgstr "新英格兰教会社区"
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -80285,145 +82940,313 @@ msgstr ""
 msgid "Dusty"
 msgstr "进灰"
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
+msgid "It's dusty.  Has no effect - obsolete fault."
 msgstr "它进灰了，但是没有其他实际效果：已废弃的故障。"
 
+#. ~ name of mending method for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "Wipe clean"
+msgstr "擦净"
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean you %s."
+msgstr "你清理了 %s。"
+
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr "已安装过"
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr "这个生化插件需要被恢复到出厂设置。"
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr "恢复出厂设置"
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr "你成功将%s恢复了出厂设置。"
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr "黑火药残渣"
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
 "枪械发射黑火药弹药会残留残渣，降低枪械可靠性并且若不及时清理会使得枪械生锈。黑火药会比现代无烟火药更快的污染枪膛。残渣只会在堆积过高时影响枪械可靠性，但使用黑火药会在枪管中迅速堆积残渣。"
 
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr "清理黑火药污垢"
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr "你清理了 %s。"
+
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr "弹壳卡膛"
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr "这把枪的枪膛里有一颗废弹壳，需要在再次开火前移除。"
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr "退出弹壳"
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr "你从 %s 中退出空弹壳。"
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr "枪膛残渣"
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
 "枪械发射弹药时会残留残渣，降低枪械可靠性并且若不及时清理最终会损害枪膛。残渣只会在枪膛中缓慢堆积（除非使用黑火药弹药）。由于现代大部分在售弹药都采用无烟火药因此残渣堆积不是大问题，除非你发射上千发弹药而且从不清理枪膛导致残渣过多。"
 
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr "清理枪械"
+
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
-msgstr "磨损的传送带"
+msgstr "磨损的传动皮带"
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "一个交流发电机保障正常运转的必需配件。"
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr "更换传动皮带"
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr "你换掉了%s的磨损的传动皮带。"
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr "故障的电热塞"
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr "帮助你在低温环境下启动引擎。"
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr "更换电热塞"
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr "你换掉了%s的故障的电热塞。"
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr "启动的防盗装置"
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "防止在没有插入正确钥匙的情况下发动车辆。"
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr "解除防盗装置"
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr "解除掉载具的防盗装置以便启动载具。"
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr "你成功解除了%s的防盗装置。"
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr "故障的柴油泵"
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr "将柴油从油箱中泵出并加压的必需品。"
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr "更换柴油泵"
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr "你换掉了%s的故障的柴油泵。"
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr "老旧的空气滤清器"
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
 msgstr "老旧的过滤器会降低燃料的效率，并产生更多的烟雾。"
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr "更换空气滤清器"
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr "你换掉了%s的老旧的空气滤清器。"
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr "老旧的燃料滤清器"
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
 msgstr "老旧的滤清器会降低性能并提高逆火的概率。"
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr "更换燃料滤清器"
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr "你换掉了%s的老旧的燃料滤清器。"
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr "故障的汽油泵"
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr "将汽油从油箱中泵出的必需品。"
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr "更换汽油泵"
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr "你换掉了%s的故障的汽油泵。"
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr "故障的水泵"
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr "将水泵入外部散热器或散热片的必需品。"
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr "更换水泵"
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr "你换掉了%s的故障的水泵。"
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr "故障的启动电机"
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "用于启动引擎的必需品。"
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr "更换启动电机"
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr "你换掉了%s的故障的启动电机。"
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -80910,6 +83733,10 @@ msgstr "杀虫剂浓雾"
 msgid "smoke vent"
 msgstr "烟雾涌出"
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr "透视"
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
 msgstr "恐怖存在"
@@ -81097,11 +83924,11 @@ msgstr "一块用于截断交通的路障。"
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "咔嚓！"
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "哐嘡。"
 
@@ -81214,7 +84041,8 @@ msgstr "雕像"
 msgid "A carved statue made of stone."
 msgstr "一个冰冷的石雕。"
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "重击声。"
 
@@ -81225,9 +84053,9 @@ msgstr "人体模型"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
-msgstr "帮它穿上衣服，跟它说说话。还会有谁来评判你？等等……它刚动了吗？"
+msgstr "帮它穿上衣服，跟它说说话。又不会有谁看到。等等……它刚动了吗？"
 
 #: lang/json/furniture_from_json.py
 msgid "birdbath"
@@ -81615,7 +84443,7 @@ msgid ""
 msgstr "一大堆树叶，如果你不在乎舒适和温暖，你可以睡在上面。"
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "嘎嚓！"
 
@@ -81628,8 +84456,8 @@ msgstr "马洛斯花"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
-msgstr "这朵花和其它长在蘑菇上的花一样，但它的球茎是一种鲜艳的青色，它散发出一种令人难以抗拒的香味，闻起来很好吃。"
+"and… delicious?"
+msgstr "这朵花和其它被真菌吞噬的花很相似，但是它的球茎是一种鲜艳的青色，并且散发着刺鼻的香味。不过这香味却让你觉得它……会很好吃？"
 
 #: lang/json/furniture_from_json.py
 msgid "poof."
@@ -82066,9 +84894,9 @@ msgstr "肉质钟乳石"
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr "这是一种多肉的绿色钟乳石，有像海星一样加厚的皮，从地板一直延伸到天花板。中心是很多像嘴巴一样的的开口，从这些开口中喷出阵阵难闻的气体。"
 
 #: lang/json/furniture_from_json.py
@@ -82138,7 +84966,7 @@ msgstr "血肉祭坛"
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -82304,7 +85132,7 @@ msgstr "跑步机"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
+" taken apart for its… parts."
 msgstr "用于训练腿部肌肉。如果没有外部电源的话，它会难以启动。可以拆开它获得它的……零件。"
 
 #: lang/json/furniture_from_json.py
@@ -82330,7 +85158,7 @@ msgstr "钢琴"
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr "乌木和象牙制成。提高了整个地方的情调。如果你想的话，你可以把它拆掉……你这个魔鬼。"
 
 #: lang/json/furniture_from_json.py
@@ -82489,6 +85317,17 @@ msgstr "凳子"
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr "坐下，喝一杯。这张椅子可以折叠方便携带。"
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr "圆木凳"
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr "一块立在地上的圆木，粗糙的边缘已经被削掉，基本上就是一个简单的凳子。"
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "公告牌"
@@ -82957,7 +85796,7 @@ msgstr "一种由纤维材料编织而成的大垫子，可代替野餐毯，但
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
 msgstr "一个小型金属可折叠餐桌，适合野外郊游时使用。紧急情况下可以当作工作台。"
 
@@ -83031,11 +85870,11 @@ msgid "This beaded curtain could be pulled aside."
 msgstr "这珠子门帘可以拉到一边。"
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
+msgid "clickity clack… clack… clack"
 msgstr "咔哒…咔哒…咔哒…"
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
+msgid "clickity clack… clack"
 msgstr "咔哒…咔哒…"
 
 #: lang/json/furniture_from_json.py
@@ -83048,7 +85887,7 @@ msgid "This beaded curtain has been pulled aside."
 msgstr "这珠子门帘已经拉到一边了。"
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
+msgid "clickity clack… clack… clack!"
 msgstr "咔哒…咔哒…咔哒！"
 
 #: lang/json/furniture_from_json.py
@@ -83192,9 +86031,8 @@ msgstr "垃圾碎砾"
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
-msgstr "一堆垃圾和泥土青草混在一起，味道很让人恶心，不过常言道：\"一个人的垃圾是……\"（注：另一个人的财富）"
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
+msgstr "一堆垃圾和泥土青草混在一起，味道很让人恶心，不过常言道：\"一个人的垃圾是……\""
 
 #: lang/json/furniture_from_json.py
 msgid "metal wreckage"
@@ -83701,6 +86539,15 @@ msgid ""
 "blood, candles, and other small knick-knacks."
 msgstr "这是一个刻在地上的魔法阵，上面装饰着血液、蜡烛以及其它小物件。"
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr "发光的巨石"
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr "它看上去不太对劲。"
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr "咔嚓！"
@@ -83730,7 +86577,7 @@ msgstr "大门被打开了！"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
+msgid "You turn the handle…"
 msgstr "你转动了把手……"
 
 #. ~ 'close' action message of some gate object.
@@ -83750,7 +86597,7 @@ msgstr "谷仓的门打开了！"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
+msgid "You pull the rope…"
 msgstr "你拉了把绳子……"
 
 #. ~ 'close' action message of some gate object.
@@ -83785,7 +86632,7 @@ msgstr "门打开了！"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
+msgid "You throw the lever…"
 msgstr "你扳下开关……"
 
 #. ~ 'close' action message of some gate object.
@@ -83968,7 +86815,7 @@ msgstr[0] "简易弓"
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr "由一块木头粗制滥造的简易弓，只能自己用用。不过不幸的是，它的威力低命中率很差，和想象的差很多……"
 
 #: lang/json/gun_from_json.py
@@ -84133,9 +86980,7 @@ msgid ""
 "this weapon have a good chance of remaining intact for re-use."
 msgstr "一个小巧的单手弩。由于其体型小，故威力及拉力均不高，不过相当适用于猎杀小动物。手弩射出的弩矢不易损坏，有很高的几率回收。"
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "手枪"
@@ -84297,6 +87142,17 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "投掷"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] "投石棒"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr "将一根皮革带固定到长木棍上制作而成的投石棒，易于使用和拥有一定的准确度。它使用小石子作为弹药。"
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -84371,6 +87227,10 @@ msgid ""
 msgstr ""
 "波音公司和美国国防部高级研究计划局一起研发了这种等离子武器。它通过加热固态氢来产生等离子态物质，用特制的聚合材料束缚使之不会在枪管里爆炸。威力惊人，可惜射程偏短。这种武器从你携带的UPS电源中获取能量。"
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "半自动"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -84379,10 +87239,10 @@ msgstr[0] "PPA-5 等离子炮"
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 "便携式等离子加速器5型（PPA-5），由洛克希德·马丁公司研发。这种设备通过高度先进的电容器组产生一个环状的过热氢等离子体，并且将其加速到难以置信的速度。它被设计用于破坏重型载具，本来预计在大灾变前不久开始在美军中大规模部署。"
 
@@ -84398,8 +87258,7 @@ msgid ""
 " a double barrel shotgun."
 msgstr "一把手工制作的三管枪，一条枪管用来发射.30-06 口径步枪子弹，另两条则用来发射霰弹。用从双管猎枪上拆下来的部件和铁管制作出来的。"
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "霰弹枪"
@@ -84555,6 +87414,10 @@ msgid ""
 " stop fires or \"protesters\"."
 msgstr "从消防车上拆下来的高压水炮。装在车上就可以用来救火或者\"维稳\"。"
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr "连发"
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -84812,8 +87675,8 @@ msgstr[0] "瓦尔特 P22 手枪"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 "瓦尔特 P22 手枪是一种采用反冲式枪机的半自动手枪，和其他瓦尔特手枪相比只有一半的大小。基本由塑料制造，只有套筒和一些关键部件由锌合金压铸而成。"
@@ -84900,10 +87763,6 @@ msgid ""
 msgstr ""
 "Leadworks有限公司的L523无托平台通过多种方式利用普遍的5.56北约弹，它的设计是可以在不同配置间快速安全且有效地更换组件。\"理论上\"这个基础件可以单独使用，但是这是不推荐用法，更会导致保修无效——虽然你也找不到保修点了。有趣的是，这个光秃秃的原型武器并没有给市场上乱七八糟的枪械配件留什么空间。"
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "半自动"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -85406,8 +88265,8 @@ msgstr[0] "M24 狙击步枪"
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
 "M24 狙击步枪是雷明顿 700 步枪的军用及警用版本。该型号的命名源自美国陆军于1988年将其作为标准狙击步枪使用。M24 "
@@ -85557,16 +88416,18 @@ msgstr ""
 "\"哈哈搞到一把双管霰……手、手枪？\""
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
-msgstr[0] "COP .38 德林加手枪"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
+msgstr[0] "COP .357德林加手枪"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
-msgstr "COP .38德林加手枪是一把小型的肥嘟嘟的德林加手枪，外观有着莫斯伯格\"布朗宁\"德林加手枪的痕迹。它有着四根按照正方形排列的枪管。"
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
+msgstr ""
+"COP "
+".357德林加手枪是一把小型的肥嘟嘟的德林加手枪，外观有着莫斯伯格\"布朗尼\"德林加手枪的痕迹。它使用一根旋转的发火针来触发排列成方形阵列的四根枪管内的独立击锤。"
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -85595,17 +88456,6 @@ msgid ""
 " sight and a reinforced frame."
 msgstr "由史密斯威森公司发布的这款装弹量为7发的.38口径左轮手枪，最大的特点是修正过的后准星和加固后的构架。"
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] "陶鲁斯 Pro .38 手枪"
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr "这款.38口径的手枪在设计时极力强调各个部件的安全和耐用性，在制造时更是选用了高质量、有保障的新型材料。"
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -85675,12 +88525,23 @@ msgstr[0] "Hi-Point CF-380 手枪"
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 "Hi-Point CF-380 手枪是一种采用反冲式枪机的半自动手枪，由 Hi-Point 设计。Hi-Point "
 "以制造廉价武器而知名，其生产的武器常常体积巨大且使用不便。Hi-Point 制造的枪械的套筒由锌合金制成，相比钢制套筒来说比较脆弱。"
 
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] "陶鲁斯\"光谱\"手枪"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr "一把体积紧凑的 .38 口径手枪，在设计时极力强调隐蔽携带性能，在制造时更是选用了高质量、有保障的新型材料。"
+
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
 msgid_plural "M1911A1s"
@@ -85767,9 +88628,9 @@ msgstr[0] "勃朗宁大威力 .40 S&W 手枪"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 "勃朗宁大威力手枪是一种二战前不久研制的半自动手枪。当时被广泛使用，而目前仍有在印度、加拿大和澳大利亚使用。这把属于勃朗宁武器公司开发的发射 .40 "
 "S&W 弹的商业型号。"
@@ -85795,8 +88656,9 @@ msgstr[0] "Hi-Point JCP 型手枪"
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 "Hi-Point JCP 型手枪是一种采用反冲式枪机的半自动手枪，由 Hi-Point 设计。Hi-Point "
 "以制造廉价武器而知名，其生产的武器常常体积巨大且使用不便。Hi-Point 制造的枪械的套筒由锌合金制成，相比钢制套筒来说比较脆弱。"
@@ -86151,8 +89013,9 @@ msgstr[0] "Hi-Point JHP 型手枪"
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 "Hi-Point JHP 型手枪是一种采用反冲式枪机的半自动手枪，由 Hi-Point 设计。Hi-Point "
 "以制造廉价武器而知名，其生产的武器常常体积巨大且使用不便。Hi-Point 制造的枪械的套筒由锌合金制成，相比钢制套筒来说比较脆弱。"
@@ -87112,9 +89975,9 @@ msgstr[0] "勃朗宁大威力 9x19mm 手枪"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 "勃朗宁大威力手枪是一种二战前不久研制的半自动手枪。当时被广泛使用，而目前仍有在印度、加拿大和澳大利亚使用。这把属于勃朗宁武器公司开发的发射 9x19mm"
 " 鲁格弹的商业型号。"
@@ -87127,8 +89990,8 @@ msgstr[0] "瓦尔特 P38 手枪"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -87145,7 +90008,7 @@ msgstr[0] "瓦尔特 PPQ 9mm 手枪"
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr "瓦尔特 PPQ 手枪是基于瓦尔特 P99QA 手枪研制的半自动手枪，保留了一些对其部件的兼容性。这个型号发射的是 9x19mm 鲁格弹。"
 
 #: lang/json/gun_from_json.py
@@ -87157,7 +90020,7 @@ msgstr[0] "Hi-Point C-9 手枪"
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 "Hi-Point C-9 手枪是一种采用反冲式枪机的半自动手枪，由 Hi-Point 设计。Hi-Point "
@@ -87171,10 +90034,10 @@ msgstr[0] "CZ-75 手枪"
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
 "CZ-75 "
@@ -87188,10 +90051,10 @@ msgstr[0] "瓦尔特 CCP 手枪"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 "瓦尔特 CCP 手枪是一种采用气体延迟反冲式枪机、适合隐藏携带的民用半自动手枪，其内部设计几乎与与 H&K P7 "
 "手枪相同。固定的枪管使其理论上比其它手枪更为精确，但是由于其本身扳机的质量和小瞄具半径，可能很难察觉到任何精度提升。"
@@ -87797,10 +90660,6 @@ msgid ""
 "and destruction it can cause."
 msgstr "内部研发尝试的一款试验型武器，这把武器将三只 .5 激光手枪用胶带固定在一个手持电钻上，它可以造成大量的伤害以及消耗较少的UPS能量。"
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr "连发"
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -88575,10 +91434,60 @@ msgstr[0] "德鲁伊复合弓"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
 msgstr "一把采用多种材料复合制成以增加储能效率的弓。弓背两端镶嵌着两个德鲁伊符文。"
 
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] "M47A1 科技魔法\"美杜莎\"左轮手枪"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+"一把经过魔法增强的菲利普斯和罗杰斯公司出品的 M47 "
+"\"美杜莎\"左轮手枪，这把手枪是一把多口径左轮手枪，专为生存主义者定制。虽然科技魔法提高了手枪发射小口径子弹时的可靠性，但由于是滑膛发射，和对应口径的左轮手枪相比命中率还是略低。"
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] "枪刃"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr "它的结构类似于一把伊比利亚短剑，这把向前倾斜的短刀上有一把短筒泵动式霰弹枪，连接在刀背上，以终结对手或先发打击。"
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] "霰弹拳套"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr "一把安装在金属拳套上的锯短双管霰弹枪。由于没有吸收后坐力的枪托，这意味着需要一些力量才能开火。"
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] "神弓伊奇巴尔"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr "伊奇巴尔，传说中北欧众神之父奥丁使用的神弓。据说每次拉弦能够射出 10 只箭。这件上面覆盖满了金银饰品，以及一只装饰华丽的渡鸦。"
+
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
 msgid_plural "Woodbows"
@@ -88682,17 +91591,12 @@ msgid ""
 msgstr ""
 "一个手工制造的简易弩，可以看出是依据瑞典斯科讷风格制作的。有一个木制的弦钮，从下往上拉让弓弦射出。没有其它的弩威力大，但是更容易把弓拉回来。这把弩射出来的箭很高概率会保持完好，可以再次使用。"
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] "Ichaival，神圣之弓"
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
 "to fire 10 arrows with every pull of the string.  It has gold and silver "
 "ornaments on it."
-msgstr "北欧众神之父奥丁所使用的Ichaival，神圣之弓的复制品。传说每次拉弦能够射出10只箭。这件上面覆盖满了金银饰品。"
+msgstr "北欧众神之父奥丁所使用的神弓伊奇巴尔的复制品。传说每次拉弦能够射出 10 只箭。这件上面覆盖满了金银饰品。"
 
 #: lang/json/gun_from_json.py
 msgid "integral nailgun"
@@ -89623,7 +92527,7 @@ msgstr "一个装在握柄上的小小扩件，在你瞄准时将弓箭固定在
 msgid "accessories"
 msgstr "配件"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "弓"
@@ -89741,7 +92645,7 @@ msgstr[0] "ups测试"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
+"it's a bug.  50x more UPS drain."
 msgstr "用来测试 UPS 消耗的枪械模组，它不会被正常生成。增加 50 倍 UPS 消耗。"
 
 #: lang/json/gunmod_from_json.py
@@ -89886,8 +92790,8 @@ msgstr[0] "聚焦透镜"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
 msgstr "一套光学透镜，用于将激光束聚焦成更小的点。这增加了射程和伤害，但是使瞄准更加复杂。"
 
 #: lang/json/gunmod_from_json.py
@@ -89911,7 +92815,7 @@ msgstr[0] "高效发射器"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
+"energy efficiency.  Decreases power consumption."
 msgstr "一套用于优化发射器工作循环的电子设备，能增加整体能量效率并降低能量消耗。"
 
 #: lang/json/gunmod_from_json.py
@@ -89925,8 +92829,8 @@ msgstr[0] "高密度电容"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
 msgstr "一个使用了高能量密度材质制成的电容器，能够增加激光武器的射程和伤害，但同时也极大的增加了射击时的能量消耗。"
 
 #: lang/json/gunmod_from_json.py
@@ -90128,6 +93032,20 @@ msgid ""
 "improving recoil but increasing bulk, noise, and reducing accuracy slightly."
 msgstr "枪口制退器通过提供枪管制退机构来降低枪口上扬的幅度，改善了后坐力但是增大了噪音并且轻微的降低了精度。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] "改装枪口制退器"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+"枪口制退器通过提供枪管制退机构来降低枪口上扬的幅度，改善了后坐力但是增大了噪音并且轻微的降低了精度。这个制退器经过了改装，可以装在除了发射器之外的几乎任何枪械上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
 msgid_plural "homemade suppressors"
@@ -90144,7 +93062,7 @@ msgid ""
 "when attached, will interfere with your ability to aim down the base sights "
 "of the gun."
 msgstr ""
-"一个用钢管和抹布拼凑而成的自制消音器。只要抹布还在，就能减弱火药武器发射时所产生的噪音和枪口火焰。子弹发射时如果没有防护的状态下，发出的噪音甚至可以伤害听力。消音器可以把枪声在输出后降低到一个可以接受的范围内。消音器会减少后坐力但是降低枪口初速度。由于自制消音器体型巨大，安装后会遮挡枪械原本的瞄具的视线。"
+"一个用钢管和简易消音材料拼凑而成的自制消音器。只要消音材料还在，就能减弱火药武器发射时所产生的噪音和枪口火焰。子弹发射时如果没有防护的状态下，发出的噪音甚至可以伤害听力。消音器可以把枪声在输出后降低到一个可以接受的范围内。消音器会减少后坐力但是降低枪口初速度。由于自制消音器体型巨大，安装后会遮挡枪械原本的瞄具的视线。"
 
 #: lang/json/gunmod_from_json.py
 msgid "'solvent trap' suppressor"
@@ -90190,18 +93108,18 @@ msgid ""
 "A suppressor reduces the amount of noise and muzzle flash generated by the "
 "report of a firearm.  This RK6S34 Mustela is a rather advanced version "
 "integral to the RM11B rifle system."
-msgstr "消声器可有效抑制枪械在射击时所发出的噪声与枪口焰光。这支消声器 RK6S34 代号\"鼬\"，是RM11B射击系统替换内置配件的高级配件。"
+msgstr "消音器可有效抑制枪械在射击时所发出的噪声与枪口焰光。这支消音器 RK6S34 代号\"鼬\"，是 RM11B 射击系统替换内置配件的高级配件。"
 
 #: lang/json/gunmod_from_json.py
 msgid "shotgun suppressor"
 msgid_plural "shotgun suppressors"
-msgstr[0] "霰弹枪消声器"
+msgstr[0] "霰弹枪消音器"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A suppressor designed to work with shotguns.  It's a lot more complex than a"
 " suppressor for a pistol or rifle."
-msgstr "霰弹枪用消声器，相比手枪和步枪消声器更复杂。"
+msgstr "霰弹枪用消音器，相比手枪和步枪消音器更复杂。"
 
 #: lang/json/gunmod_from_json.py
 msgid "suppressor"
@@ -90258,6 +93176,19 @@ msgstr "一套包括弩臂和导轨的组件，可安装在长枪的枪管上，
 msgid "rail"
 msgstr "导轨"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] "改装劲弩组件"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr "一套包括弩臂和导轨的组件，可安装在长枪的枪管上，发射弩矢。这个组件经过了改装，可以装在除了手枪和冲锋枪的几乎任何武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
@@ -90270,6 +93201,19 @@ msgid ""
 msgstr ""
 "一组以垂直枪械平面45度角安装到枪械侧面上的机械瞄具，方便在枪械安装了瞄准镜等必须遮挡标准机械瞄具的改装件之后还可以正常利用机械瞄具来瞄准射击的一个枪械用改装件。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] "改装侧面机械瞄具"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+"一组以垂直枪械平面45度角安装到枪械侧面上的机械瞄具，方便在枪械安装了瞄准镜等必须遮挡标准机械瞄具的改装件之后还可以正常利用机械瞄具来瞄准射击的一个枪械用改装件。这个瞄具经过了改装，能够装在几乎所有武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
@@ -90279,6 +93223,17 @@ msgstr[0] "侧面瞄具导轨"
 msgid "An additional rail set at 45° for attaching a secondary optic."
 msgstr "一组以垂直枪械平面45度角安装到枪械侧面上的导轨，让你能够安装一个额外瞄具。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] "改装侧面瞄具导轨"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr "一组以垂直枪械平面45度角安装到枪械侧面上的瞄具导轨。这个导轨经过了改装，能够装在几乎所有武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
@@ -90302,6 +93257,19 @@ msgid ""
 "vibration, greatly reducing recoil and slightly increasing accuracy."
 msgstr "一个安装在枪械侧面的高级模组，可减轻枪械震动，极大降低后坐力，略为提升命中率。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] "改装稳定陀螺仪"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr "一个安装在枪械侧面的高级模组，可减轻枪械震动，极大降低后坐力，略为提升命中率。这个模组经过了改装，可以装在除手枪外的几乎任何武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -90403,16 +93371,44 @@ msgid ""
 " mrad increments and is remarkably small and light for its magnification."
 msgstr "一个 3-18x44 步枪瞄准器。它可以按 1/10 毫弧度增量调节风量和仰角，并且相对它的放大倍数而言非常小巧轻便。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] "改装步枪瞄准镜"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+"一个 3-18x44 步枪瞄准镜。它可以按 1/10 "
+"毫弧度增量调节风量和仰角，并且相对它的放大倍数而言非常小巧轻便。这个瞄准镜经过了改装，可以装在除了手枪和冲锋枪之外的几乎任何武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
-msgstr[0] "ACOG瞄准镜"
+msgstr[0] "ACOG 瞄准镜"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
 "crosshair."
-msgstr "一个 4x32 TA01 型先进战斗光学瞄准器（ACOG）带有一个氚发光十字准星。"
+msgstr "一个 4x32 TA01 型先进战斗光学瞄准镜（ACOG），带有一个氚发光十字准星。"
+
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] "改装 ACOG 瞄准镜"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+"一个 4x32 TA01 型先进战斗光学瞄准镜（ACOG），带有一个氚发光十字准星。这个瞄准镜经过了改装，可以装在除手枪外的几乎任何武器上。"
 
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
@@ -90589,6 +93585,21 @@ msgid ""
 msgstr ""
 "双脚架是步枪与机枪上广泛使用的可提供枪械前端稳定性与减少摆动的泛用组件之一。尽管可以极大地提高后座的可控度，它只能放置在坚实的平台上使用，并需要较长时间来架设。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] "改装双脚架"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+"双脚架是步枪与机枪上广泛使用的可提供枪械前端稳定性与减少摆动的泛用组件之一。尽管可以极大地提高后座的可控度，它只能放置在坚实的平台上使用，并需要较长时间来架设。这个双脚架经过了改装，能够装在几乎所有武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -90622,6 +93633,19 @@ msgid ""
 "effective as a bipod but usable under all conditions."
 msgstr "包覆安装到前部枪管的水平握把能够让你更好的掌控枪械，虽说没有双脚架那么有效，但可用于全地形作战。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] "改装前置握把"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+"包覆安装到前部枪管的水平握把能够让你更好的掌控枪械，虽说没有双脚架那么有效，但可用于全地形作战。这个握把经过了改装，能够装在几乎所有武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
@@ -90681,6 +93705,20 @@ msgid ""
 "and fired."
 msgstr "M203最初为M16设计的，但如今它发展成能够适配几乎所有步枪的榴弹发射器组件。该榴弹发射器组件每次装填一发40mm榴弹。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] "改装 M203 榴弹发射器"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+"M203最初为M16设计的，但如今它发展成能够适配几乎所有步枪的榴弹发射器组件。该榴弹发射器组件每次装填一发40mm榴弹。这个榴弹发射器经过了改装，可以装在除了手枪和泵动式枪械之外的几乎任何武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
@@ -90695,6 +93733,21 @@ msgid ""
 msgstr ""
 "M320榴弹发射器模组采用非常小的封装就达到了大体积发射器才能实现的功能，但是射击精度相比有所下降。它可以被安装在多种步枪的枪管下，也可以安个枪托独立使用。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
+msgstr[0] "改装 M320 榴弹发射器"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+"M320榴弹发射器模组采用非常小的封装就达到了大体积发射器才能实现的功能，但是射击精度相比有所下降。它可以被安装在多种步枪的枪管下，也可以安个枪托独立使用。这个榴弹发射器经过了改装，可以装在除了手枪和泵动式枪械之外的几乎任何武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "masterkey shotgun"
 msgid_plural "masterkey shotguns"
@@ -90707,6 +93760,20 @@ msgid ""
 "fired."
 msgstr "极度简化的泵动式霰弹枪，它可以被安装在多种步枪的枪管下。一次能装填四发霰弹。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] "改装多用霰弹副枪"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+"极度简化的泵动式霰弹枪，它可以被安装在多种步枪的枪管下。一次能装填四发霰弹。这把霰弹枪经过了改装，可以装在除了手枪和泵动式枪械之外的几乎任何武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
 msgid_plural "40mm pipe launchers"
@@ -90714,9 +93781,9 @@ msgstr[0] "自制 40mm 榴弹发射器"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
-msgstr "一个自制的简易发射器，可以安装到几乎任何步枪上。每次装填一发40mm榴弹。"
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
+msgstr "一个自制的简易发射器，可以安装到除了手枪外的几乎任何武器上。每次装填一发 40mm 榴弹。"
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -90741,6 +93808,21 @@ msgid ""
 "Accepts RMSA10 box magazines."
 msgstr "Rivtech RM121 辅助武器系统是一把弹匣供弹的半自动无壳弹霰弹枪，可以被安装在许多枪械的导轨上。使用RMSA10弹匣。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] "改装 RM121 副枪"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
+"Rivtech RM121 "
+"辅助武器系统是一把弹匣供弹的半自动无壳弹霰弹枪，可以被安装在许多枪械的导轨上。使用RMSA10弹匣。这把霰弹枪经过了改装，可以装在除手枪外的几乎任何武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
 msgid_plural "underslung shotguns"
@@ -90752,6 +93834,19 @@ msgid ""
 "many rifles.  It allows two shotgun shells to be loaded and fired."
 msgstr "枪管很短的双管霰弹枪，它可以被安装在多种步枪的枪管下。一次能装填两发霰弹。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] "改装下挂式霰弹副枪"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr "枪管很短的双管霰弹枪，它可以被安装在多种步枪的枪管下。一次能装填两发霰弹。这把霰弹枪经过了改装，可以装在除手枪外的几乎任何武器上。"
+
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
 msgid_plural "LW underbarrel laser sights"
@@ -91000,6 +94095,56 @@ msgid ""
 msgstr ""
 "电磁加速系统是固定在枪管前部外表面的一个电磁铁阵列，可以加速任何的金属弹药到更高的速度，可以增加伤害，但也会提高后座力和降低命中率。但它需要使用UPS供电使用，并且进行了改装之后，枪械本身也一定要用UPS提供电能来使用，没电就不能用了。"
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] "\"静风\"消音器"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr "除了消音材料之外，这个消音器还含有一个小范围静音法术，能够把枪声降低到对听力安全的水平。"
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] "魔法激光瞄具（导轨）"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+"小型可见激光发射器，使用魔力水晶发射激光，可安装在枪械上，增加命中率与瞄准速度。完全没有缺点——除了增加一点点重量。你可以旋转导轨将其变成管下瞄具。"
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] "魔法激光瞄具（管下）"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+"小型可见激光发射器，使用魔力水晶发射激光，可安装在枪械上，增加命中率与瞄准速度。完全没有缺点——除了增加一点点重量。你可以旋转导轨将其变成导轨瞄具。"
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] "魔法蓝点瞄准镜"
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr "在你的枪上安装一个使用魔力水晶发光的战术魔法蓝点瞄具以取代机械瞄准具。提高命中率，增加重量。"
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -93069,9 +96214,10 @@ msgstr "测量辐射"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
-msgstr "……"
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
+msgstr "…"
 
 #: lang/json/item_action_from_json.py
 msgid "Control an RC car"
@@ -93649,6 +96795,13 @@ msgstr "这个生化插件是个动力源。"
 msgid "This bionic can provide power to powered armor."
 msgstr "这个生化插件能够为动力装甲供能。"
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr "此食物让人<bad>倒胃口</bad>，大多数烹饪方式都<bad>无法改善口味</bad>。"
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -94822,7 +97975,7 @@ msgstr "切换自动挖矿"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Auto Foraging"
-msgstr "切换自动搜寻"
+msgstr "切换自动采集"
 
 #: lang/json/keybinding_from_json.py
 msgid "Toggle Auto Pickup"
@@ -95150,6 +98303,7 @@ msgstr "移除自定义配色"
 msgid "Load color template"
 msgstr "读取配色模板"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -97867,11 +101021,11 @@ msgstr "空手"
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 "你在空手攻击时伤害更高。\n"
 "\n"
-"未手持武器时钝击伤害 +33%。"
+"未手持武器时钝击伤害 +33%%。"
 
 #: lang/json/martial_art_from_json.py
 msgid "Tai Chi"
@@ -97921,6 +101075,105 @@ msgstr ""
 "命中率按感知的 20%% 增加，钝击护甲穿透按感知的 50%% 增加。\n"
 "持续 2 回合。"
 
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Kung Fu"
+msgstr "虎形拳"
+
+#. ~ Description for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
+"attacks above all else.  Your Strength determines your accuracy, and your "
+"attacks do increasing damage as you continue attacking."
+msgstr "少林五形拳之一。虎拳一气相贯，连绵不绝。力量将取代敏捷决定你的命中，且连续攻击将逐步增加伤害。"
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Fury"
+msgstr "虎之怒"
+
+#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
+msgstr ""
+"你的攻击无穷无尽。你的命中得越多，你就会越强。\n"
+"\n"
+"+10%% 伤害。\n"
+"持续 3 回合。可叠加 4 次。"
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger's Strength"
+msgstr "虎之力"
+
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
+msgstr ""
+"你不需要防御。你不需要计划。你只需要力量。力量会击溃对手的防御，并完全压倒他们。\n"
+"\n"
+"力量将代替敏捷增加命中率。\n"
+"\n"
+"命中按力量的 25%% 增加，同时按敏捷的 25%% 减少。"
+
+#: lang/json/martial_art_from_json.py
+msgid "Wing Chun"
+msgstr "咏春"
+
+#. ~ Description for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
+"learn effective techniques from the various Shaolin animal forms.  It has a "
+"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
+"sensitivity to the opponent's direction of force, and flowing around it to "
+"get back to hitting."
+msgstr ""
+"咏春是一门中国武术，传说起源于南少林鹤拳，也有从蛇鹤相斗获得灵感的说法。它的站立姿势很高，重心完全放在后腿上。咏春专注于对对手发力方向的准确感知，并借此还击。"
+
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr "子午连环捶"
+
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
+"你每次出拳都恰到好处，不会给你的对手任何喘息机会。\n"
+"\n"
+"移动耗时 -10%%。\n"
+"持续 1 回合。可叠加 3 次。"
+
+#: lang/json/martial_art_from_json.py
+msgid "Chi-Sao Sensitivity"
+msgstr "咏春黐手"
+
+#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
+msgstr ""
+"你对平衡和技巧有更深的理解。这让你能更好地躲开你的对手的攻击。\n"
+"\n"
+"闪避技能按感知的 15%% 增加。格挡伤害按感知的 50%% 减少。"
+
 #: lang/json/martial_art_from_json.py
 msgid "Zui Quan"
 msgstr "醉拳"
@@ -97929,56 +101182,79 @@ msgstr "醉拳"
 #: lang/json/martial_art_from_json.py
 msgid ""
 "AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
 msgstr ""
-"\"醉拳\"以醉酒步伐迷惑对手，提供基于智力的被动躲避补正。你在攻击之后能够躲避任意次攻击而没有的行动力惩罚，成功躲避后还能获得的攻击力加成以及发动基于智力的反击技能。"
-
-#. ~ Description of buff for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "智力增加闪避能力"
+"\"醉拳\"以醉酒步伐迷惑对手，提供基于智力的被动闪避和命中加成。持续移动会为你提供额外的闪避次数，而每次闪避成功都会在下个回合之前为你反击提供更多伤害。"
 
 #: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
-msgstr "反击"
+msgid "Zui Quan Stance"
+msgstr "醉拳步法"
 
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
-msgstr "闪避成功后获得额外伤害及命中"
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
+msgstr ""
+"其他人可能会认为你四处乱撞，但你自己更清楚。每一次移动都经过精心计算以避免伤害。\n"
+"\n"
+"闪避技能按智力的 15%% 提升。"
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Kung Fu"
-msgstr "虎形拳"
+msgid "Advanced Zui Quan"
+msgstr "高级醉拳"
 
-#. ~ Description for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
+#, no-python-format
 msgid ""
-"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
-"attacks above all else.  Your Strength determines your accuracy, and your "
-"attacks do increasing damage as you continue attacking."
-msgstr "少林五形拳之一。虎拳一气相贯，连绵不绝。力量将取代敏捷决定你的命中，且连续攻击将逐步增加伤害。"
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
+msgstr ""
+"你对醉拳有着更深的了解。因此你在闪避和命中攻击方面的技巧提升了。\n"
+"\n"
+"闪避次数 +1，命中按智力的 15%% 增加。 "
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Fury"
-msgstr "虎之怒"
+msgid "Drunken Stumble"
+msgstr "醉拳滑步"
 
-#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "+3 钝击/每次攻击"
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
+"只需少许碎步，你就可以完全改变方向，并闪开多次攻击。\n"
+"\n"
+"闪避次数 +2。\n"
+"持续 3 回合。"
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "虎之力"
+msgid "Drunken Dodging"
+msgstr "醉拳闪避"
 
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "力量提供额外的伤害加成。"
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
+"每次闪避后，你对你的对手的位置优势都会增加。每次成功的闪避都会使你的攻击更猛烈。\n"
+"\n"
+"护甲穿透按智力的 25%% 增加。\n"
+"持续 1 回合。可叠加 4 次。"
 
 #: lang/json/martial_art_from_json.py
 msgid "Debug Mastery"
@@ -98001,30 +101277,6 @@ msgid ""
 "armor, +Perception fire armor."
 msgstr "+力量 钝击防护，+敏捷 酸液防护，+智力 电击防护，+感知 火焰防护。"
 
-#: lang/json/martial_art_from_json.py
-msgid "Wing Chun"
-msgstr "咏春"
-
-#. ~ Description for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
-"learn effective techniques from the various Shaolin animal forms.  It has a "
-"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
-"sensitivity to the opponent's direction of force, and flowing around it to "
-"get back to hitting."
-msgstr ""
-"咏春是一门中国武术，传说起源于南少林鹤拳，也有从蛇鹤相斗获得灵感的说法。它的站立姿势很高，重心完全放在后腿上。咏春专注于对对手发力方向的准确感知，并借此还击。"
-
-#: lang/json/martial_art_from_json.py
-msgid "Chi-Sao Sensitivity"
-msgstr "咏春黐手"
-
-#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
-msgstr "感知提高闪避能力，每回合闪避次数+1"
-
 #: lang/json/martial_art_from_json.py
 msgid "Bionic Combatives"
 msgstr "生化格斗术"
@@ -98210,10 +101462,12 @@ msgstr "蛤蟆功"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
-msgstr "五毒教神功之一。蛤蟆功大师能在任何攻击面前保持冷静。当你停止行动时，你将获得防御加成，但稍稍移动都将让你没法专心防御。"
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
+msgstr ""
+"五毒教神功之一。蛤蟆功大师能在任何攻击面前保持冷静。你有强大的物理防护，但当你移动时你会分心。你可以停下来冥想，在短时间内给自己提供更多的护甲。"
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -98221,8 +101475,14 @@ msgstr "蛤蟆铁布衫"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "静立不动时护甲+6"
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
+"你的身体和铁一样强壮，但前提是你不动。\n"
+"\n"
+"+6 钝击/斩击/刺击防护。"
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -98231,8 +101491,16 @@ msgstr "铁布衫失效"
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
-msgstr "铁布衫随着你移动失效了！"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
+msgstr ""
+"移动会使你失去铁布衫。\n"
+"\n"
+"-1 钝击/斩击/刺击防护。\n"
+"持续 6 回合。可叠加 6 次。"
 
 #: lang/json/martial_art_from_json.py
 msgid "Viper Kung Fu"
@@ -98241,37 +101509,60 @@ msgstr "毒蛇功"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
-msgstr "五毒教神功之一，毒蛇功最出名的就是它的\"夺命三招\"：先闪开对方攻击，之后一个手刀抽晕对方，再以传说中的\"诸蛇灭世\"终结对手。"
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
+msgstr "五毒教神功之一，毒蛇功最出名的就是它的\"夺命三招\"：先闪开对方攻击，之后一记\"毒蛇疯咬\"击晕对手，再以传说中的\"毒蛇猛击\"终结对手。"
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "毒蛇锁喉"
+msgid "Viper's Patience"
+msgstr "蛇之耐心"
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
-msgstr "你准备好了！下一击便是传说中的\"诸蛇灭世\"！"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
+msgstr ""
+"每条蛇都在等待完美时刻的到来。把对手的错误转化为攻击的机会！\n"
+"\n"
+"闪避技能 +1。"
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "毒蛇蓄势"
+msgid "Viper's Ambush"
+msgstr "蛇之伏击"
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
-msgstr "+2闪避。闪避一次攻击将触发连击。"
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
+msgstr ""
+"你的闪避能力使你的对手很容易受到痛苦的伤害。\n"
+"\n"
+" 解锁\"毒蛇疯咬\"。\n"
+"持续 1 回合。"
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
-msgstr "毒蛇伏击"
+msgid "Viper's Venom"
+msgstr "蛇之毒"
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
-msgstr "你引诱住对手了！下一击便是毒蛇疯咬！"
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
+msgstr ""
+"你的毒液是一次严厉的提醒，永远不要戏弄捕食者。\n"
+"\n"
+"+2 钝击伤害。\n"
+"持续 3 回合。"
 
 #: lang/json/martial_art_from_json.py
 msgid "C.R.I.T Blade-work"
@@ -98660,6 +101951,10 @@ msgstr "铅"
 msgid "Leather"
 msgstr "皮革"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr "莱卡"
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "乳制品"
@@ -98724,6 +102019,10 @@ msgstr "超合金"
 msgid "layered carbide"
 msgstr "层叠碳化物"
 
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr "化纤"
+
 #: lang/json/material_from_json.py
 msgid "Tin"
 msgstr "锡"
@@ -98834,6 +102133,10 @@ msgstr "橡胶"
 msgid "Arcane Skin"
 msgstr "奥术皮肤"
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr "山铜"
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr "恶魔甲壳"
@@ -98843,7 +102146,7 @@ msgid "Sugar"
 msgstr "糖"
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
+msgid "Gather bones for the Brigitte.  About 8 should do it."
 msgstr "收集些骨头带给布丽吉特。8根应该就够了。"
 
 #: lang/json/mission_def_from_json.py
@@ -100535,7 +103838,7 @@ msgstr "收集 1000 单位黏土"
 
 #: lang/json/mission_def_from_json.py
 msgid "I do have some resource gathering I could use help if you have time."
-msgstr "我确实需要有人帮我搜寻资源，如果你有空的话。"
+msgstr "如果你有空的话，我的确需要有人帮我搜集一些资源。"
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -100565,7 +103868,7 @@ msgstr "收集 20 个3L玻璃罐"
 
 #: lang/json/mission_def_from_json.py
 msgid "I could use some help scavenging."
-msgstr "我需要有人帮我搜寻东西。"
+msgstr "我需要有人帮我找点东西。"
 
 #: lang/json/mission_def_from_json.py
 msgid ""
@@ -102224,8 +105527,8 @@ msgstr "恢复照明"
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr "前往倒塌大楼的地下室废墟并搜寻光子电路模板。对讲机警告过你那里有大量的敌人，并且环境恶劣。"
 
 #: lang/json/mission_def_from_json.py
@@ -104868,8 +108171,8 @@ msgstr "胡须：锚胡"
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
 msgstr "你有一个小胡子，胡须从下唇开始，沿着下颚线向下延伸。它看起来有点像一个锚，因此得名。"
 
 #: lang/json/mutation_from_json.py
@@ -104879,7 +108182,7 @@ msgstr "胡须：短箱式胡"
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
 msgstr "你留着小胡子和短胡须，旁边修剪过。薄胡茬将两者连接起来，在嘴唇周围形成一个\"盒子\"，因此得名。"
 
@@ -105002,9 +108305,9 @@ msgstr "胡须：垂颈胡"
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
-msgstr "你的胡须是由脖子上的头发在下巴线以下形成的。不包括胡子。"
+msgstr "你留着下巴到脖子之间的胡须，但是没有小胡子。"
 
 #: lang/json/mutation_from_json.py
 msgid "Facial hair: pencil moustache"
@@ -105105,6 +108408,27 @@ msgid ""
 "footing."
 msgstr "你的腿部肌肉与协调能力更加出色，可以比别人走、跑得更快，俗称\"健步如飞\"。你步行的速度增加15%。"
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr "弱发光器"
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr "从你的额头上长出一个发光器官，你可以使它发出微光。这将使你在黑暗中非常明显，很适合在交配季节吸引伴侣。"
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr "发光器"
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr "你额头上的发光器官现在能发出强光。"
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "听觉发达"
@@ -105576,11 +108900,11 @@ msgstr "兴奋剂精神病"
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
-"你和兴奋剂（如咖啡因或安非他明）之间有过一段独特的经历。你比普通人能够承受更高剂量的兴奋剂而不过量，但如果你吸入过多，你开始看见一些奇怪的事情发生……"
+"你有着一段关于兴奋剂（如咖啡因或安非他明）的独特经历。你比普通人能够承受更高剂量的兴奋剂而不过量，但如果你摄入过多兴奋剂，你会开始看见奇怪的事情发生……"
 
 #. ~ Description for Stylish
 #: lang/json/mutation_from_json.py
@@ -105715,6 +109039,19 @@ msgid ""
 " Pentjak Silat, or Sōjutsu."
 msgstr "你曾经接受过一套近身武器训练。你在开始的时候可以选择菲律宾剑棍术、击剑术、战斗之花、中世纪剑术、二天一流剑术、班卡苏拉刀术或日本枪术之一。"
 
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr "竞技击剑运动员"
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
+"你是一个狂热的击剑运动员，从花剑开始，然后进入佩剑，最后是重剑。你参加了全国比赛，还接触了欧洲历史武术流行所提供的一些历史上的传统击剑武器。"
+
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
 msgstr "体味微弱"
@@ -106441,8 +109778,8 @@ msgstr "精灵之眼"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
 msgstr "你的眼睛发生了变异，眼睛颜色变成了莹绿色。瞳孔似乎在不断地转动，你很难描述出它的形状，这效果棒极了。"
 
 #: lang/json/mutation_from_json.py
@@ -107220,8 +110557,8 @@ msgstr "马洛斯携带者"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
-msgstr "自从你吃了马洛斯变异莓后，你永远无法忘怀它的气味，你十分想再吃一次，或者去试试种子和……蜜浆？"
+"nose, and you have a strong desire to try some seeds and… sap?"
+msgstr "自从你吃了马洛斯变异莓后，你始终无法忘怀它的气味，你十分想再吃一次，或者去试试种子和……蜜浆？"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vessel"
@@ -107231,8 +110568,8 @@ msgstr "马洛斯化身"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
-msgstr "自从你吃了马洛斯种子后，你永远无法忘怀它的味道，你十分想再吃一次，或者去试试变异莓和……蜜浆？"
+"tongue, and you have a strong desire to try some berries and… sap?"
+msgstr "自从你吃了马洛斯种子后，你始终无法忘怀它的味道，你十分想再吃一次，或者去试试变异莓和……蜜浆？"
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vector"
@@ -107623,8 +110960,8 @@ msgstr "刃牙"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
 msgstr "你的牙又长又尖，以至于你不能带口罩，吃东西也很不方便……不过你的尖牙在咬人会留下可怕的伤口。"
 
 #: lang/json/mutation_from_json.py
@@ -108858,9 +112195,9 @@ msgstr "猪鼻子"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
-msgstr "你的脸和下巴发生了变化，你的鼻子变的像猪鼻子一样，带个口罩还是可以的。"
+msgstr "你的脸和下巴发生了……变化。你仍然可以戴上面具一类的东西，但是你的变异已经十分明显。"
 
 #: lang/json/mutation_from_json.py
 msgid "Bovine Snout"
@@ -109603,13 +112940,14 @@ msgstr "变温动物"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
-"你完全变异为冷血动物。你的速度在低于/高于18.3℃ "
-"（65F）时，按照每1.1℃（2F）一档降低/提高。但你缓慢的新陈代谢能够帮助你减少食物消耗，只需要普通人食量的一半。"
+"你已经完全变异为冷血动物。在温度低于/高于18.3℃（65F）时，每 1.1℃（2F）的变化会使你的速度降低/提高 "
+"1%。但你缓慢的新陈代谢能够帮助你减少食物消耗，只需要普通人食量的一半。"
 
 #: lang/json/mutation_from_json.py
 msgid "Growling Voice"
@@ -109897,8 +113235,8 @@ msgstr "文明崩溃？太棒了！你和你的亲属将永远不用再担心屠
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
-msgstr "成为皇后，让无数仆人服侍你的感觉非常好……但怎样让它们排好队呢？"
+"every need… but how would you keep them in line?"
+msgstr "要是你能够成为王虫，让其它虫子每时每刻服侍着你，不是很好吗……但是怎样才能让虫群顺从呢？"
 
 #. ~ Description for Plant
 #: lang/json/mutation_from_json.py
@@ -109914,9 +113252,9 @@ msgstr "液态人"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
-msgstr "看看那句古老的宣传口号，\"改造地球，支配地球\"，真是一个远大的目标啊，不过现在嘛……"
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
+msgstr "以前有个宣传是怎么说的，\"绿色地球\"？听起来是个不错的远大目标，不过现在嘛……"
 
 #: lang/json/mutation_from_json.py
 msgid "Subterranean"
@@ -111268,7 +114606,7 @@ msgid ""
 "powers gross and disturbing, but no one can question the potency of their "
 "abilities, and certainly not their adaptability to any situation."
 msgstr ""
-"生化术士着重于操纵甚至吸收自己的肉体，以及其他活物或者死尸。大多数巫师认为他们的法术令人恶心与不安，但没人敢质疑它们的威力，当然也没有人敢质疑他们对各种情况的适应力。"
+"生化术士着重于操纵甚至吸收自己的肉体，以及其他活物或者死尸。大多数魔法师认为他们的法术令人恶心与不安，但没人敢质疑它们的威力，当然也没有人敢质疑他们对各种情况的适应力。"
 
 #: lang/json/mutation_from_json.py
 msgid "Druid"
@@ -111549,7 +114887,7 @@ msgid "Scientist"
 msgstr "科学家"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
+msgid "I'm looking for clues concerning these monsters' origins…"
 msgstr "我在找关于这些怪物起源的线索……"
 
 #: lang/json/npc_class_from_json.py
@@ -111613,7 +114951,7 @@ msgid "Real Person"
 msgstr "真人"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr "我只是在徘徊，就像一个完全真实和正常的NP……人！"
 
 #: lang/json/npc_class_from_json.py
@@ -111629,7 +114967,7 @@ msgid "Foodperson"
 msgstr "美食家"
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
 msgstr "我是美食家，我带来了食物！"
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
@@ -111637,8 +114975,8 @@ msgid "Cyborg"
 msgstr "改造人"
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
-msgstr "（滋滋滋）我…我是一个…改…造造造…人。"
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
+msgstr "滋滋滋……我…我是一个…改…造造造…人。"
 
 #: lang/json/npc_class_from_json.py
 msgid "former cop"
@@ -111781,6 +115119,14 @@ msgstr "我是商队的老板。"
 msgid "Operator"
 msgstr "特种兵"
 
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr "魔法测试员"
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
+msgstr "我是个流浪的魔法测试员。"
+
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 #: lang/json/npc_from_json.py
 msgid "Captive"
@@ -113325,7 +116671,7 @@ msgstr "购物广场（停车场）"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "megastore"
-msgstr "大型购物广场"
+msgstr "购物广场"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "megastore, second floor"
@@ -113339,6 +116685,10 @@ msgstr "购物广场（屋顶）"
 msgid "hotel parking"
 msgstr "酒店停车场"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "旅馆"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "酒店大堂"
@@ -113708,8 +117058,8 @@ msgid "spiked trench"
 msgstr "尖刺堑壕"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
-msgstr "储物间选址"
+msgid "fabrication workshop survey"
+msgstr "工坊选址"
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "blacksmith survey"
@@ -113723,6 +117073,14 @@ msgstr "铁匠铺"
 msgid "livestock survey"
 msgstr "牧场选址"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr "储物间选址"
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr "盐场选址"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr "食堂选址"
@@ -114408,6 +117766,10 @@ msgstr "射击场"
 msgid "shooting range roof"
 msgstr "射击场（屋顶）"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr "微缩铁路"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "高尔夫球场"
@@ -115074,10 +118436,6 @@ msgstr "机器人调度中心"
 msgid "dense urban"
 msgstr "密集城区"
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "旅馆"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "学校"
@@ -115098,6 +118456,10 @@ msgstr "公共图书馆（二楼）"
 msgid "mechanics garage"
 msgstr "机械师车库"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr "购物广场（入口）"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
 msgstr "污水处理站"
@@ -119304,6 +122666,38 @@ msgid ""
 msgstr ""
 "你是城里一道怪异的风景，常常梳着滑稽的发型，总是穿着某种浴衣。有人说你是降临的日本神灵，你不太关心那些。问题是上周杂货店停业，现在连电视都打不开，这就让你很不开心了。"
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr "竞技击剑运动员"
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+"你是个热衷于击剑运动的运动员，总是在当地的俱乐部练习，参加各种锦标赛。当世界末日来临的时候，你正准备去俱乐部玩几次呢。现在你将面对自己生涯中最重要的一次锦标赛，不过裁判都是死人，而你的对手也不会遵守任何规则。"
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr "竞技击剑运动员"
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+"你是个热衷于击剑运动的运动员，总是在当地的俱乐部练习，参加各种锦标赛。当世界末日来临的时候，你正准备去俱乐部玩几次呢。现在你将面对自己生涯中最重要的一次锦标赛，不过裁判都是死人，而你的对手也不会遵守任何规则。"
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -120868,7 +124262,7 @@ msgid ""
 "You always had to hide your magic, as it was generally not an acceptable "
 "type of magic in the wizarding world, but with the cataclysm you need to "
 "pull every trick out of the book."
-msgstr "你以前总是不得不隐藏自己的魔法，因为它在巫师世界中不被大多数人所接受，但现在面对大灾变时，你需要使出浑身解数利用好每一个法术。"
+msgstr "你以前总是不得不隐藏自己的魔法，因为它在魔法师世界中不被大多数人所接受，但现在面对大灾变时，你需要使出浑身解数利用好每一个法术。"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
@@ -120882,7 +124276,7 @@ msgid ""
 "You always had to hide your magic, as it was generally not an acceptable "
 "type of magic in the wizarding world, but with the cataclysm you need to "
 "pull every trick out of the book."
-msgstr "你以前总是不得不隐藏自己的魔法，因为它在巫师世界中不被大多数人所接受，但现在面对大灾变时，你需要使出浑身解数利用好每一个法术。"
+msgstr "你以前总是不得不隐藏自己的魔法，因为它在魔法师世界中不被大多数人所接受，但现在面对大灾变时，你需要使出浑身解数利用好每一个法术。"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
@@ -121437,7 +124831,7 @@ msgctxt "prof_desc_male"
 msgid ""
 "A wise student of ancient and forbidden knowledge; you are a wizard, a "
 "mystical practitioner of the (bionic) arcane arts."
-msgstr "古代禁忌知识来者不拒的好学生；你就是巫师，秘法的操控者。"
+msgstr "古代禁忌知识来者不拒的好学生；你就是魔法师，秘法的操控者。"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_female"
@@ -121450,7 +124844,7 @@ msgctxt "prof_desc_female"
 msgid ""
 "A wise student of ancient and forbidden knowledge; you are a wizard, a "
 "mystical practitioner of the (bionic) arcane arts."
-msgstr "古代禁忌知识来者不拒的好学生；你就是巫师，秘法的操控者。"
+msgstr "古代禁忌知识来者不拒的好学生；你就是魔法师，秘法的操控者。"
 
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
@@ -122223,11 +125617,6 @@ msgstr "脚部"
 msgid "MEDICAL"
 msgstr "医疗"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "容器"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -123213,7 +126602,7 @@ msgstr "准备厨房区"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
 msgstr "我们应该在绞盘附近打一口井。这将使我们未来在这里更加安全。"
 
@@ -123270,7 +126659,7 @@ msgstr "建造壁炉"
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
+"grab a pot.  Let's put it in that dining area."
 msgstr "既然我们有了庇护所，我们应该搭建一个火盆来做饭，还需要拿一个锅。让我们把它放在就餐区。"
 
 #: lang/json/recipe_from_json.py
@@ -123939,7 +127328,7 @@ msgid "build 2 wood stoves"
 msgstr "建造两个火炉"
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
+msgid "We should build a well.  This will make cooking more convenient."
 msgstr "我们应该打一口井。这将使烹饪更加便捷。"
 
 #: lang/json/recipe_from_json.py
@@ -124436,6 +127825,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr "我们需要一个马厩来养更大的牲畜，所以请在牧场西南侧建造一间带屋顶的木板小屋。"
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr "为修建盐场勘测土地。"
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr "盐场选址"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr "我们可以升级酿酒厂的工作区，增加蒸馏器，火炉以及工作台。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr "西南酿酒厂蒸馏器"
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr "我们可以用一些酒桶和储物架填满剩余的空间。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr "西南酿酒厂酒桶"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr "我们可以从附近的沼泽地调水，搭建一所原木小屋，创造稳定的食盐供应以满足我们的需求。"
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr "东北原木墙盐田"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr "我们需要一个储物间来储藏化学用品和工具，所以请在盐场东南侧建造一间带屋顶的原木小屋。"
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr "东南原木墙储物间"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr "我们可以利用这块区域建造一所原木墙酿酒厂。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr "西南原木墙酿酒厂"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr "我们可以从附近的沼泽地调水，搭建一所金属棚屋，创造稳定的食盐供应以满足我们的需求。"
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr "东北金属墙盐田"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr "我们需要一个储物间来储藏化学用品和工具，所以请在盐场东南侧建造一间带屋顶的金属小屋。"
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr "东南金属墙储物间"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr "我们可以利用这块区域建造一所金属墙酿酒厂。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr "西南金属墙酿酒厂"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr "我们可以从附近的沼泽地调水，搭建一所石头小屋，创造稳定的食盐供应以满足我们的需求。"
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr "东北石头墙盐田"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr "我们需要一个储物间来储藏化学用品和工具，所以请在盐场东南侧建造一间带屋顶的石头小屋。"
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr "东南石头墙储物间"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr "我们可以利用这块区域建造一所石头墙酿酒厂。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr "西南石头墙酿酒厂"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr "我们可以从附近的沼泽地调水，搭建一所木骨泥屋，创造稳定的食盐供应以满足我们的需求。"
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr "东北木骨泥墙盐田"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr "我们需要一个储物间来储藏化学用品和工具，所以请在盐场东南侧建造一间带屋顶的木骨泥屋。"
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr "东南木骨泥墙储物间"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr "我们可以利用这块区域建造一所木骨泥墙酿酒厂。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr "西南木骨泥墙酿酒厂"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr "我们可以从附近的沼泽地调水，搭建一所木板小屋，创造稳定的食盐供应以满足我们的需求。"
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr "东北木板墙盐田"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr "我们需要一个储物间来储藏化学用品和工具，所以请在盐场东南侧建造一间带屋顶的木板小屋。"
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr "东南木板墙储物间"
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr "我们可以利用这块区域建造一所木板墙酿酒厂。"
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr "西南木板墙酿酒厂"
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -124456,8 +128021,8 @@ msgstr "我们应该搭建一个火炉来做饭，还需要拿一个锅。让我
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
 msgstr "我们应该在工作台附近打一口井。这将使我们未来在这里更加安全。"
 
 #: lang/json/recipe_from_json.py
@@ -124562,7 +128127,7 @@ msgstr "让我们建立一个无线电发射塔来提升我们的招募能力。
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
 msgstr "让我们建一些生活区，这样我们就可以扩大规模了。我们从东南角开始。"
 
@@ -124572,7 +128137,7 @@ msgstr "建造东南卧室原木墙"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
 msgstr "让我们建一些生活区，这样我们就可以扩大规模了。继续沿着之前墙面建造。"
 
@@ -124582,7 +128147,7 @@ msgstr "建造东侧卧室原木墙"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
 msgstr "让我们建一些生活区，这样我们就可以扩大规模了。继续沿着另一面墙建造。"
 
@@ -125014,7 +128579,7 @@ msgstr "桌子（中央）"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
+"Some benches around the outside would be nice.  Build some to the northwest."
 msgstr "在外面建一些长椅听起来挺好的，在西北侧建一些吧。"
 
 #: lang/json/recipe_from_json.py
@@ -125023,7 +128588,7 @@ msgstr "长椅（西北）"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
+"Some benches around the outside would be nice.  Build some to the northeast."
 msgstr "在外面建一些长椅听起来挺好的，在东北侧建一些吧。"
 
 #: lang/json/recipe_from_json.py
@@ -125032,7 +128597,7 @@ msgstr "长椅（东北）"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
+"Some benches around the outside would be nice.  Build some to the southeast."
 msgstr "在外面建一些长椅听起来挺好的，在东南侧建一些吧。"
 
 #: lang/json/recipe_from_json.py
@@ -125041,7 +128606,7 @@ msgstr "长椅（东南）"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
+"Some benches around the outside would be nice.  Build some to the southwest."
 msgstr "在外面建一些长椅听起来挺好的，在西南侧建一些吧。"
 
 #: lang/json/recipe_from_json.py
@@ -125283,6 +128848,10 @@ msgstr "牧场区"
 msgid "Central Storage Building"
 msgstr "中央区仓库"
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr "盐场区域"
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
 msgstr "工坊"
@@ -126593,13 +130162,13 @@ msgstr "教堂"
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
 msgid "The Wizard's Apprentice"
-msgstr "巫师学徒"
+msgstr "魔法师学徒"
 
 #. ~ Name for scenario 'The Wizard's Apprentice' for a female character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_female"
 msgid "The Wizard's Apprentice"
-msgstr "巫师学徒"
+msgstr "魔法师学徒"
 
 #. ~ Description for scenario 'The Wizard's Apprentice' for a male character.
 #: lang/json/scenario_from_json.py
@@ -126611,7 +130180,7 @@ msgid ""
 "teleported his insides into his outsides.  Now you have to figure out how to"
 " survive on your own.  At least he left his notebook..."
 msgstr ""
-"你现在已经是一个巫师的学徒一段时间了，正在研制一种可以用来逃离大灾变的原型设备。不过，处女航出了点问题，你的老师把他的内脏传送到了体外。现在你要想办法靠自己生存。至少他忘了把笔记本带上……"
+"自从你成为一名魔法师的学徒已经有一段时间了，正在研制一种可以用来逃离大灾变的原型设备。不过，处女航出了点问题，你的老师把他的内脏传送到了体外。现在你要想办法靠自己生存。至少他忘了把笔记本带上……"
 
 #. ~ Description for scenario 'The Wizard's Apprentice' for a female
 #. character.
@@ -126624,7 +130193,7 @@ msgid ""
 "teleported his insides into his outsides.  Now you have to figure out how to"
 " survive on your own.  At least he left his notebook..."
 msgstr ""
-"你现在已经是一个巫师的学徒一段时间了，正在研制一种可以用来逃离大灾变的原型设备。不过，处女航出了点问题，你的老师把他的内脏传送到了体外。现在你要想办法靠自己生存。至少他忘了把笔记本带上……"
+"自从你成为一名魔法师的学徒已经有一段时间了，正在研制一种可以用来逃离大灾变的原型设备。不过，处女航出了点问题，你的老师把他的内脏传送到了体外。现在你要想办法靠自己生存。至少他忘了把笔记本带上……"
 
 #. ~ Starting location for scenario 'The Wizard's Apprentice'.
 #: lang/json/scenario_from_json.py
@@ -126632,6 +130201,46 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr "魔法师秘密地下研究室"
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr "魔法假期"
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr "魔法假期"
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+"自从你成为一名魔法师的学徒已经有一段时间了，你已经储蓄多年，梦想能在一座僻静的法师塔里中度假。你的自我发现之旅被突如其来的大灾变打断了。现在你得自己想办法活下去。"
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+"自从你成为一名魔法师的学徒已经有一段时间了，你已经储蓄多年，梦想能在一座僻静的法师塔里中度假。你的自我发现之旅被突如其来的大灾变打断了。现在你得自己想办法活下去。"
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr "魔法师度假地"
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -126909,7 +130518,7 @@ msgid ""
 "Your skill in creating, setting, finding and disarming traps safely and "
 "effectively.  This skill does not affect the evasion of traps that are "
 "triggered."
-msgstr "你的技能令你安全有效的制造、 设置、 搜寻和解除陷阱。该技能并不影响触发陷阱时的规避能力。"
+msgstr "安全有效地制造、设置、发现和解除陷阱的技能。 这个技能并不影响逃避触发陷阱的几率。"
 
 #. ~ Description for driving
 #: lang/json/skill_from_json.py
@@ -131403,35 +135012,21 @@ msgid ""
 msgstr "如果我不能尽快拿到些电池充能的话，这些生化插件很快就要变成一堆没用的金属垃圾了。"
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr "来杯啤酒，我需要用我的酒精锅炉充电。"
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
-msgstr "酒精锅炉！能给你带来快乐的充能方式。请给我拿杯酒来！"
+msgid "Pass some ethanol, I need to power my ethanol burner."
+msgstr "来点酒精 ，我需要为我的酒精锅炉充电。"
 
 #: lang/json/snippet_from_json.py
 msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr "服务员！我需要续杯，我的酒精锅炉快空了！"
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
-msgstr "我需要一些酒精饮料来给我的内部电源供能。你身上有吗？"
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
-msgstr "你有多余的酒吗？我需要给我的生化插件充能。最好是蜂蜜酒，如果你有的话。"
+msgid "I require ethanol for my internal power supply.  Anything on you?"
+msgstr "我需要一些酒精来给我的生化插件供能。你身上有吗？"
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
-msgstr "这些燃烧酒精的电源是我用过的最好生化插件。那么，你能给我点酒帮我充能吗？"
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
+msgstr "你有多余的酒吗？我需要给我的生化插件充能。实在不行甲醇也行。"
 
 #: lang/json/snippet_from_json.py
 msgid "I need some junk to power my internal furnace."
@@ -135653,7 +139248,7 @@ msgid ""
 "assaults on funeral homes in the last few weeks.  Described as highly "
 "strange but not especially dangerous, Homeland Security is \"looking at the "
 "connections now.\""
-msgstr "《挖坟生意》过去几个星期盗墓的案例层出不穷，虽然盗墓行为无法理解，但幸好不太会对人造成伤害。地方保安“正在调查这些事件之间的关联”。"
+msgstr "《挖坟生意》过去几个星期盗墓的案例层出不穷，虽然盗墓行为无法理解，但幸好不太会对人造成伤害。国土安全部正在\"调查案件之间的关联\"。"
 
 #: lang/json/snippet_from_json.py
 msgid ""
@@ -138447,7 +142042,7 @@ msgid "a static hissing sound."
 msgstr "电流的滋滋声。"
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
 msgstr "\"那个诡异的废弃末日实验室看起来还挺安全的嘛……\""
 
 #: lang/json/speech_from_json.py
@@ -138461,11 +142056,11 @@ msgid "\"Hold on, I want to pulp that zombie corpse.\""
 msgstr "\"等一下，我要去捣碎那个丧尸。\""
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
-msgstr "\"燃烧……从内心深处……\""
+msgid "\"Burning… from the inside…\""
+msgstr "\"从内心深处……燃烧……\""
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
+msgid "\"This smell…  Don't know…\""
 msgstr "\"这气味……不懂……\""
 
 #: lang/json/speech_from_json.py
@@ -138477,19 +142072,19 @@ msgid "a scraping noise."
 msgstr "一阵刮擦声。"
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
+msgid "\"No…  Stop the burning!\""
 msgstr "\"不……别烧了！\""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
 msgstr "\"噶啊……血……饿……\""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
+msgid "\"Hunger…  Must eat…\""
 msgstr "\"饿……要吃……\""
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
+msgid "\"Run…  Chase…  Eat…\""
 msgstr "\"跑……追……吃……\""
 
 #: lang/json/speech_from_json.py
@@ -138611,7 +142206,7 @@ msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
 msgstr "\"本 设 备 已 损 坏。 请 联 系 维 护 人 员。\""
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
+msgid "\"Can't… breathe…\""
 msgstr "\"没法……呼吸……\""
 
 #: lang/json/speech_from_json.py
@@ -138624,8 +142219,8 @@ msgstr "\"密 码 错 误。\""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
 msgstr "\"你有没有看到我的朋友？他昨天做了手术……也许是前天……\""
 
 #: lang/json/speech_from_json.py
@@ -138637,7 +142232,7 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr "\"我已经按你的要求做了。请放我走！\""
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
 msgstr "\"我不能……但我必须这样。这怎么算得出来？\""
 
 #: lang/json/speech_from_json.py
@@ -138645,11 +142240,11 @@ msgid "\"This is a dream.  This has to be a dream.\""
 msgstr "\"我在做梦，我肯定在做梦。\""
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
+msgid "\"This is my life now… this is my life now… this is my life now…\""
 msgstr "\"我以后就是这样了……我以后就是这样了……我以后就是这样了……\""
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
+msgid "\"Wanna go home…\""
 msgstr "\"我要回家……\""
 
 #: lang/json/speech_from_json.py
@@ -138705,7 +142300,7 @@ msgstr "一个无感情的声音说：\"我马上就该离开您了。如果您
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr "一个担忧的声音说：\"顾客朋友，你能获取更多友谊吗？我不想离开……\""
 
 #: lang/json/speech_from_json.py
@@ -138728,18 +142323,18 @@ msgstr "一个无感情的声音说：\"我的工作完成了。祝您愉快。\
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
 msgstr "一个扭曲的声音说：\"顾客……发生了什么？我感觉不太好。\""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
 msgstr "一个扭曲的声音说：\"你……做了什么？我的大拇指没反应了！\""
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
 msgstr "一个扭曲的声音说：\"携带包裹？我不明白……\""
 
 #: lang/json/speech_from_json.py
@@ -138862,7 +142457,7 @@ msgid "\"Police inbound.  Stay where you are!\""
 msgstr "\"警察来了，待在原地！\""
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
 msgstr "\"我是美食家。我带来了食物！\""
 
 #: lang/json/speech_from_json.py
@@ -138883,7 +142478,7 @@ msgid "\"FoodPlace: It's the Calories.\""
 msgstr "\"美食广场：这全是卡路里。\""
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
 msgstr "\"你需要食物，不是吗？那就跟我去美食广场吧！\""
 
 #: lang/json/speech_from_json.py
@@ -138951,8 +142546,8 @@ msgid "You shouldn't have done that."
 msgstr "你不应该那样做。"
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
-msgstr "让我们玩点……俄罗斯轮盘赌。"
+msgid "Let's play… Russian roulette."
+msgstr "让我们来玩……俄罗斯轮盘赌。"
 
 #: lang/json/speech_from_json.py
 msgid "I hate you."
@@ -138963,7 +142558,7 @@ msgid "Go kill yourself!"
 msgstr "自生自灭吧！"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
+msgid "Big Brother is watching you…"
 msgstr "老大哥正在看着你……"
 
 #: lang/json/speech_from_json.py
@@ -138975,12 +142570,12 @@ msgid "Why won't you die?"
 msgstr "你为什么不去死？"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
+msgid "Blood…  Delicious."
 msgstr "鲜血……真美味。"
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
-msgstr "去地狱里……再见吧！"
+msgid "See you… IN HELL!"
+msgstr "地狱……见吧！"
 
 #: lang/json/speech_from_json.py
 msgid "AAAIEEEEEEE!"
@@ -138995,7 +142590,7 @@ msgid "What did you do with my Mommy?"
 msgstr "你把我妈咪怎么了？"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
+msgid "Stay with me… forever!"
 msgstr "永远……与我在一起吧！"
 
 #: lang/json/speech_from_json.py
@@ -140394,6 +143989,10 @@ msgstr "拾荒者地堡"
 msgid "Wizard's Secret Basement Study"
 msgstr "魔法师秘密地下研究室"
 
+#: lang/json/start_location_from_json.py
+msgid "Wizard's lake retreat"
+msgstr "魔法师湖畔度假地"
+
 #: lang/json/start_location_from_json.py
 msgid "Candy Shop"
 msgstr "糖果屋"
@@ -140443,16 +144042,16 @@ msgid "You there. Quiet down. Can you hear it? The song?"
 msgstr "那里的家伙，安静点。你能听到吗？这歌声？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
+msgid "What?  What do you mean?  What song?"
 msgstr "啥？你说什么呢？什么歌？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
+msgid "So about the songs…"
 msgstr "关于歌……"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
 msgstr "之前当我给你骨头的时候，你提到过什么循环。那是什么？"
 
@@ -140469,7 +144068,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr "关于那个歌，有什么我可以帮忙的吗？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr "我得走了。保重了，先知。"
 
 #: lang/json/talk_topic_from_json.py
@@ -140479,11 +144078,11 @@ msgid ""
 msgstr "仔细倾听。骨头……在唱歌。你能听到吗？他们编的歌？他们说的事？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
+msgid "What?  Singing bones?  What are you talking about?"
 msgstr "什么？唱歌的骨头？你在说什么？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
 msgstr "嗯……好吧，是吧。我想我该走了。"
 
 #: lang/json/talk_topic_from_json.py
@@ -140534,7 +144133,7 @@ msgid "I will bear that in mind"
 msgstr "我会记住的。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr "原因呢？你为什么要收集这些骨头？"
 
 #: lang/json/talk_topic_from_json.py
@@ -140547,7 +144146,7 @@ msgstr ""
 "歌可以用多种形式编排。用雕刻的骨制护身符，武器和盔甲都拥有巨大的力量，当时机来临，我和我的族人将收集大量的歌曲，并歌唱它来恢复这个世界。要么恢复，要么终结。都没有区别。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
+msgid "End the world?  What?"
 msgstr "终结世界？什么？"
 
 #: lang/json/talk_topic_from_json.py
@@ -140560,8 +144159,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr "听起来有点……世界末日的论调，但我想这是一种和其他信仰一样的信仰。不过，不管怎样，至少你有一个帮助世界的目标。"
 
 #: lang/json/talk_topic_from_json.py
@@ -140576,7 +144175,7 @@ msgid ""
 msgstr "你的思想很开放。比大多数人都开放。也许有一天，你也会感受到这首歌的力量，并成为吾之同侪。现在，助手，倾听，倾听，感觉这首歌。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
+msgid "I… thank you."
 msgstr "我……谢谢。"
 
 #: lang/json/talk_topic_from_json.py
@@ -140604,18 +144203,6 @@ msgstr "一名助手一次不应该唱太多的歌。"
 msgid "That is all for now."
 msgstr "到此为止。"
 
-#: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
-msgstr "有骨头要刻，有歌曲要唱。想加入吾等吗？"
-
-#: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
-msgstr "你想要再再来点歌吗？"
-
-#: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
-msgstr "你相信自己能承担额外骨骼带来的重担吗？"
-
 #: lang/json/talk_topic_from_json.py
 msgid "A song may yet be sung by you, should you wish to."
 msgstr "尚有歌未被你所唱，如果你想的话。"
@@ -140629,6 +144216,18 @@ msgid ""
 "I know of certain bones that could be of use, if you'd like to know more."
 msgstr "我知道有一些有用的骨头，如果你想知道更多的话。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgstr "有骨头要刻，有歌曲要唱。想加入吾等吗？"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Do you wish to take on more songs?"
+msgstr "你想要再再来点歌吗？"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Do you believe you can take on the burden of additional bones?"
+msgstr "你相信自己能承担额外骨骼带来的重担吗？"
+
 #: lang/json/talk_topic_from_json.py
 msgid "I see."
 msgstr "我懂了。"
@@ -140650,7 +144249,7 @@ msgid ""
 msgstr "如果你希望踏上觉悟之路，首先你必须学会倾听和聆听这首歌。去外面杀一头生物，感受在你指尖之间的力量。然后把骨头带来，我能为你雕些东西。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr "好吧，我想我应该看看这是怎么回事。我加入了。"
 
 #: lang/json/talk_topic_from_json.py
@@ -140658,7 +144257,7 @@ msgid "Not interested."
 msgstr "[取消]不感兴趣。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
+msgid "Consider it done.  But I also wanted to ask…"
 msgstr "包在我身上。但我还想问问……"
 
 #: lang/json/talk_topic_from_json.py
@@ -140674,7 +144273,7 @@ msgid "I'm off then."
 msgstr "那么我走了。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr "所以，任何不是丧尸或怪物的生物。明白了。"
 
 #: lang/json/talk_topic_from_json.py
@@ -140684,7 +144283,7 @@ msgid ""
 msgstr "觉悟之路是需要你自己走。如果我帮助你，最终会阻碍你进步，搅乱你的歌。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
+msgid "I see.  Very well then."
 msgstr "我明白了。好吧。"
 
 #: lang/json/talk_topic_from_json.py
@@ -140702,11 +144301,11 @@ msgid "I am glad to hear it. Let's go then."
 msgstr "听你这么说我很高兴。我们出发吧。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr "那很好，但我现在需要一个人干。以后再说吧。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
+msgid "Maybe some other time.  Changing the topic…"
 msgstr "下次再说吧。不如换个话题……"
 
 #: lang/json/talk_topic_from_json.py
@@ -140729,21 +144328,21 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
-msgstr "这是……这真是一个地狱般的信仰。好吧，如果它能帮你面对这个世界，我还能怎么说呢。"
+msgstr "这是……这真是一个惊人的信仰。好吧，如果它能帮你面对这个世界，我能有什么可说的呢。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr "而我还以为你是疯子呢。我要走了。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
-"我是个独立的人，但我愿意追随你的领导。我可以为你做很多事情：战斗、训练你、接受你训练、携带物品、为你包扎伤口、建立派系营地、进行一些其他活动、骑马、前往指定地点、做守卫、使用某些生化插件，也可以和你聊天、给你些提示或者聊聊我的过去。你可以通过对话、呼喊和无线电的方式对我下达指令。\n"
-"你还想了解些什么内容？"
+"我虽然一个人过惯了，但我大体上还是很愿意跟随你的。我可以为你做很多事：我可以帮你战斗；我可以教你不少东西，当然，如果你愿意你也可以教教我；我可以帮你搬东西；我也可以帮你包扎伤口；我还可以帮你建立派系营地或者什么其他的活动；我不光可以骑马，还可以听你的指示去某个地方或者帮你看着东西；我也可以安装部分生化插件；在你空闲时可以跟你闲聊，给你点提示或者谈谈我的过去。你可以直接对话、通过双向无线电或者大声呼喊来给我下达指令。\n"
+"你还想了解什么吗？"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Forget I asked."
@@ -140753,6 +144352,10 @@ msgstr "暂时不想问了。"
 msgid "Skip it, let's get going."
 msgstr "不必，我们出发吧。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr "翻译翻译，什么叫\"大体上\"愿意跟随我？"
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr "关于下达指令有哪些细节？"
@@ -140810,13 +144413,27 @@ msgid "What about chit-chatting and your background?"
 msgstr "聊聊你的过去？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
-msgstr "我需要知道什么？"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
+msgstr "还能告诉我点其他的事情吗？例如我该怎么让你去捣碎尸体或者安排你在载具上的座位呢？"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr "最近有什么新能力吗？"
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+"两个人一同行动总要比你我分开行动的生存几率更大，对吧？但这并不意味着我会安心被你欺负。如果你老是对我不好，特别是一直让我忍饥挨饿，我就会越来越讨厌你。关系太糟的话，我可是会和你翻脸的，团队里如果有其他人，我会拉着他们一起出走组建我们自己的小团体。\n"
+"显然，事情闹大了免不了要见血，你会认为我是叛徒而要杀了我，而我不得不亲手杀了你来拿回我所应得的战利品。所以，如果你让不想闹到那一步的话，记得好好对我，让我吃饱喝足。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr "那是当然。要怎么样才能让你吃饱喝足呢？"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -140871,10 +144488,14 @@ msgstr "我能在战斗中迅速给你下命令吗？"
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
-"如果我的技能比你熟练，我可以教你——但我不会经常这样，因为太无聊了。当我们面临危险、我处于饥饿、疲劳或者你正在开车时，我不会教你。\n"
-"当你在安全的场所，阅读可以提高我技能的书籍时，我会旁听，即使你已经完全掌握了。"
+"如果我比你更擅长某项技能，我就可以把我的经验传授给你。不过一次性教太多会很无聊，所以你也不要短时间内五次三番的来让我教你，我不会答应的。而且如果我们当前处境有危险，或者我在挨饿，又或者你现在正在开车，我也没办法教你东西。\n"
+"如果我们处于安全的地方而且你正在读一本可以提升技能的书，而且我的技能等级没有到达你正在提升的技能等级，我就会旁听。如果你愿意，你也可以读你已经学完的书来提升我的技能等级。\n"
+"如果你给了我一本可以提升技能的书，而且我当前的技能等级也可以阅读它，你就可以在当前行动选项中指示我去阅读它，我就会去从书中学习技能。不过我没办法一边跟着你一边读书，所以你最好找个安全的地方再让我这么干。\n"
+"还有就是，如果你有什么武术指导书就别让我去学了，我的脑子可没有你那么好，短时间内学不会那东西。我也没办法教你我已有的武术，毕竟我也不是什么专业的武术教练。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Instead of reading to you, can we just talk?"
@@ -140901,10 +144522,13 @@ msgstr "告诉我怎么给你医疗用品。"
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
 "只要你给我安排些工作区，我就能帮你完成一些任务。\n"
-"首先使用区域管理菜单（按\"Y\"）可以设置战利品分拣区、或者制定建筑蓝图区、指定种植区、伐木区、拆卸载具区等等。然后你就可以让我去为战利品分类、建造建筑、砍树、拆卸载具、或者干农活，接着我就会开始行动，尽力完成你所制定的任务。如果我需要工具，你应该把他们放在离我的工作地点很近的地方：比如伐木用的斧头、种地用的铲子和种子和肥料、用来拆卸车辆的扳手和钢锯或工具箱。虽然我整理物品时并不需要用到任何工具，但是请把未分类和分类好的东西放近一点，因为我可不想带着一堆乱七八糟的东西来来回回走得太远。"
+"首先使用区域管理菜单（按\"Y\"）可以设置战利品分拣区、或者制定建筑蓝图区、指定种植区、伐木区、载具区、钓鱼区等等。然后你就可以让我去为战利品分类、建造建筑、砍树、拆卸或修理载具、干农活或者钓鱼，接着我就会开始行动，尽力完成你所制定的任务。\n"
+"如果我需要工具，你应该把他们放在靠近工作地的战利品区域中：比如伐木用的斧头、种地用的铲子和种子和肥料、用来拆卸车辆的扳手和钢锯或工具箱。虽然我整理物品时并不需要用到任何工具，但是请把未分类和分类好的东西放近一点，因为我可不想带着一堆乱七八糟的东西来来回回走得太远。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Good to know.  Can you perform first aid?"
@@ -140948,11 +144572,11 @@ msgstr "你刚刚说过可以让你去别的地方。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
-"如果你让我当守卫，那我就会在原地站岗——除非是在载具上，那我会一直守在载具里。\n"
+"如果你让我当守卫，那我就会在原地站岗——除非是在载具上，那我会一直守在载具里。虽然我没法杀光尸潮，不过我可以守着不让其他幸存者偷我们的东西。当然，要是他们想杀我那我也守不住。\n"
 "不过，我可不是个植物人，如果我察觉到可疑的事物，我会过去调查，而不是原地等死。如果你想让我守在原地，就告诉我不要调查噪音。但是如果我被某个强盗射击，而我看不到他，你又不让我去看，我会很不高兴。\n"
 "使用区域管理菜单（按\"Y\"）可以设置噪音无视区域，设置在门后有怪物躁动的地方，我就会忽略它。或者你也可以设置一个噪音警戒区域，我不会调查那个区域外的噪音。如果上述两个区域有重叠的部分，我会视其为无视噪音区域。不管在哪里设置了噪音警戒区域，即使离得很远，我也不会再调查区域外的噪音，所以在设置区域时要小心。就像我说的，我不想因为你禁止我调查噪声而被强盗狙击。当然我也不想在调查砸门的噪音时，发现门外是个超级可怕的怪物，而你却事前没警告我。"
 
@@ -140960,6 +144584,10 @@ msgstr ""
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr "以防万一，我还能告诉你些什么指令呢？"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr "等等，其他人还会偷我们的东西吗？"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -141041,15 +144669,35 @@ msgid ""
 "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr "我可以不通过呼喊告诉你是否开关门、是否睡觉吗？"
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+"虽然大部分人都死了，但还是有些幸存者，不是吗？你不是也在四处拾荒，闯进房子里拿走自己需要的物品，其他的幸存者也和你一样。当你那堆战利品没人看管时，在别人眼里就好像是另一个死掉的倒霉蛋的东西。如果别的拾荒者过来看到了那些战利品，而你和我又或者是其他队友都不在那里声明我们的所有权的话，那些人会直接拿走它们。所以最好时刻留个人看着东西，不论是在基地里还是在载具上。\n"
+"而且，既然我们一起行动更容易活下去，那么其他人也会这么做，像我们一样组织起自己的小派系。如果你打开派系管理菜单（按\"#\"），你就可以看见你的同伴和你迄今为止遇见的其他派系的列表。有些派系只不是几个艰难求生的幸存者，而有些派系则会有众多的成员和防御坚固的基地等等。你也许会想要找到这些派系并和他们保持良好关系。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr "那么我还能用派系管理菜单做些什么呢？"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr "有什么方法可以给我们的派系建立一个营地吗？"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 "好吧，虽然这段对话是我新加的！但最近又有一些新变化。\n"
 "我过去已经能在你身上安装生化插件，并且能为自己安装被动生化插件，这已经有一段时间了。但现在我可以使用一些主动生化插件，我可以解释一些我使用生化插件的细节。\n"
-"我也可以骑马，你也可以命令我做一些事情，比如干农活，砍树，甚至能按照蓝图造房子。"
+"我也可以骑马，你也可以命令我做一些事情，比如干农活，砍树，甚至能按照蓝图造房子。\n"
+"我现在可以自己读书来提升技能，所以你不再需要花时间读给我听了。\n"
+"如果你已经建立了一个派系营地，而且我又离营地很近时，我就会在饿的时候吃营地里储备的食物。如果营地里面有井的话，我就会在口渴时去喝井水。不过，要注意的是——如果其他人外出执行任务，我可能会吃掉他们完成任务后预期要吃的食物！"
 
 #: lang/json/talk_topic_from_json.py
 msgid "You can ride horses?  Can I ride horses?"
@@ -141059,6 +144707,10 @@ msgstr "你可以骑马？我可以骑马吗？"
 msgid "Tell me more about the activities you can do now."
 msgstr "跟我说说你现在可以做的的事。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr "你说你可以从书本上自学，这是怎么回事？"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -141150,11 +144802,11 @@ msgstr "是的，还有其他一些人像我一样躲在镇里。我们有时候
 
 #: lang/json/talk_topic_from_json.py
 msgid "No, just <swear> no..."
-msgstr "不行就是<swear> 不行。"
+msgstr "不行就是<swear>不行……"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Just let me sleep, <name_b>!"
-msgstr "赶紧让我睡觉吧， <name_b>！"
+msgstr "赶紧让我睡觉吧，<name_b>！"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Make it quick, I want to go back to sleep."
@@ -141265,19 +144917,19 @@ msgid "Let's go."
 msgstr "一起走吧。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
+msgid "Change your engagement rules…"
 msgstr "改一下你的作战方式吧……"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
+msgid "Change your aiming rules…"
 msgstr "改一下你的瞄准方式吧……"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
+msgid "Change your bionic power reserve rules…"
 msgstr "改变你的生化能量使用规则……"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
+msgid "Change your bionic power recharge rules…"
 msgstr "改变你的生化能量补充规则……"
 
 #: lang/json/talk_topic_from_json.py
@@ -141288,14 +144940,14 @@ msgstr "根据你的需要自由行动。"
 msgid "Stick close to me, no matter what."
 msgstr "不管发生什么，都紧跟我。"
 
-#: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
-msgstr "<ally_rule_follow_distance_2_true_text>"
-
 #: lang/json/talk_topic_from_json.py
 msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr "<ally_rule_follow_distance_2_false_text>"
 
+#: lang/json/talk_topic_from_json.py
+msgid "<ally_rule_follow_distance_2_true_text>"
+msgstr "<ally_rule_follow_distance_2_true_text>"
+
 #: lang/json/talk_topic_from_json.py
 msgid "Don't use ranged weapons anymore."
 msgstr "不要再使用远程武器了。"
@@ -141553,7 +145205,7 @@ msgid "Nah, I'm just kidding."
 msgstr "[取消]我只是在开个玩笑。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
+msgid "Please go to this location…"
 msgstr "请到这个地方去……"
 
 #: lang/json/talk_topic_from_json.py
@@ -141674,7 +145326,7 @@ msgstr "当然，顺便说一下，谢谢你帮了我这么多的忙！不管怎
 msgid ""
 "OK, let's take a moment, oh, and thanks for helping me with that thing, "
 "so... what's up?"
-msgstr "好吧，我们花点时间，哦，谢谢你帮我做那件事，所以……出什么事啦?"
+msgstr "好吧，我们聊聊。哦对了，谢谢你帮我做那件事。那么……你还好吗？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -141683,8 +145335,8 @@ msgid ""
 msgstr "现在我们可以稍微歇一会，我刚刚在想，这得有一个多月了吧……发生了这多事，你是怎么应付这一切的？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
-msgstr "哦，你知道的，勉强还行……"
+msgid "Oh you know, not bad, not bad…"
+msgstr "哦，那啥，还行，还行……"
 
 #: lang/json/talk_topic_from_json.py
 msgid "<hallu_dont_trade>"
@@ -141771,14 +145423,14 @@ msgstr "<hands_up>"
 msgid "&Put hands up."
 msgstr "&举起双手。"
 
-#: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
-msgstr "*放下他的武器。"
-
 #: lang/json/talk_topic_from_json.py
 msgid "*drops_her_weapon."
 msgstr "*放下她的武器。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "*drops his weapon."
+msgstr "*放下他的武器。"
+
 #: lang/json/talk_topic_from_json.py
 msgid "Now get out of here"
 msgstr "现在赶紧滚"
@@ -141792,11 +145444,11 @@ msgid "Okay, I'm going."
 msgstr "好好，我现在就走。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
+msgid "About that job…"
 msgstr "关于那个任务……"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
+msgid "About one of those jobs…"
 msgstr "关于其中的一个任务……"
 
 #: lang/json/talk_topic_from_json.py
@@ -141815,14 +145467,6 @@ msgstr "我没有工作可以给你。"
 msgid "I don't have any more jobs for you."
 msgstr "我没有更多的工作可以给你了。"
 
-#: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
-msgstr "我还有些其它的工作想交给你，要听听看吗？"
-
-#: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
-msgstr "我还有更多的工作想交给你，要听听看吗？"
-
 #: lang/json/talk_topic_from_json.py
 msgid "I have another job for you.  Want to hear about it?"
 msgstr "我还有件事要拜托你，要听听看吗？"
@@ -141831,6 +145475,14 @@ msgstr "我还有件事要拜托你，要听听看吗？"
 msgid "I just have one job for you.  Want to hear about it?"
 msgstr "我这正好有份你能做的事，想听听吗？"
 
+#: lang/json/talk_topic_from_json.py
+msgid "I have other jobs for you.  Want to hear about them?"
+msgstr "我还有些其它的工作想交给你，要听听看吗？"
+
+#: lang/json/talk_topic_from_json.py
+msgid "I have more jobs for you.  Want to hear about them?"
+msgstr "我还有更多的工作想交给你，要听听看吗？"
+
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
 #: src/npctalk.cpp
 msgid "Oh, okay."
@@ -141889,8 +145541,8 @@ msgid "Whatever.  Bye."
 msgstr "[取消]无所谓，再见！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
-msgstr "对不起，我失败了。"
+msgid "I'm sorry…  I failed."
+msgstr "对不起……我失败了。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not yet."
@@ -141909,8 +145561,8 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "没有，我会继续做的，再见！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
-msgstr "是的！就是它了！"
+msgid "Yup!  Here it is!"
+msgstr "当然了，就在这儿！"
 
 #: lang/json/talk_topic_from_json.py
 msgid "We're here!"
@@ -142094,7 +145746,7 @@ msgstr "啊，好吧。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not until I get some antibiotics..."
-msgstr "直到我得到一些抗生素……"
+msgstr "除非你给我一点抗生素……"
 
 #: lang/json/talk_topic_from_json.py
 msgid "You asked me recently; ask again later."
@@ -142161,7 +145813,7 @@ msgid "Alright.  You can lead now."
 msgstr "好吧，现在你说了算。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
+msgid "Good.  Something else…"
 msgstr "好的。还有别的事……"
 
 #: lang/json/talk_topic_from_json.py
@@ -142206,7 +145858,7 @@ msgstr "给我点时间，我会给你看点新玩意……"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I have some reason for denying you training."
-msgstr "我已经和你说过不教你的理由了。"
+msgstr "我不教你是有原因的。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not a bloody chance, I'm going to get left behind!"
@@ -142241,7 +145893,7 @@ msgid "I'd prefer to keep that to myself."
 msgstr "我还是留着给自己吧。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
+msgid "I understand…"
 msgstr "我明白……"
 
 #: lang/json/talk_topic_from_json.py
@@ -142265,8 +145917,8 @@ msgid "Because I'm your friend!"
 msgstr "因为我是你的朋友！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
-msgstr "因为我正在帮你忙？"
+msgid "Well, I am helping you out…"
+msgstr "因为我正在帮你忙？……"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'll give it back!"
@@ -142313,15 +145965,15 @@ msgid "No, I'm keeping it. Try and take it off me, I dare you."
 msgstr "不，它是我的了。你敢把它从我身上拿下来试试。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
-msgstr "听着，我急需这个。请把它给我。"
+msgid "Look, I really need this.  Please let me have it."
+msgstr "听着，我急需这个。请把它给我吧。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
+msgid "What, this?  It's not the same one, you are mistaken."
 msgstr "什么，这个？这不是同一个东西，你搞错了。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
+msgid "I'm sorry.  Look, I already dropped it, okay?"
 msgstr "我很抱歉。看，我已经把它放下了，好吗？"
 
 #: lang/json/talk_topic_from_json.py
@@ -142329,7 +145981,7 @@ msgid "Don't try and talk yourself out of this, drop it now."
 msgstr "别说那么多，现在就放下它。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
+msgid "Okay, I'm dropping it…"
 msgstr "好吧，我现在就放下它……"
 
 #: lang/json/talk_topic_from_json.py
@@ -142391,7 +146043,7 @@ msgid "Pleasure doing business!"
 msgstr "交易愉快！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
+msgid "You might be seeing more of me…"
 msgstr "我们还会再见的……"
 
 #: lang/json/talk_topic_from_json.py
@@ -142405,21 +146057,21 @@ msgid ""
 msgstr "我……我自由了。 *滋滋滋* 我真的自由了！ *噗滋滋滋* 看啊，你是这么长时间以来我见到的第一个活人。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
+msgid "Hey.  Let's chat for a second."
 msgstr "嘿，我们聊聊吧。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
+msgid "That's because I saved you.  Listen, I could use your help…"
 msgstr "那是因为我救了你。听着，我需要你帮我……"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
-msgstr "关我屁事。乖乖听话，不然我就把那块芯片塞回去。"
+msgstr "屁大点事。乖乖听话，不然我就把那块芯片塞回去。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
 msgstr "对不起，不要在意我是谁。我想你还是继续享受自由吧。"
 
 #: lang/json/talk_topic_from_json.py
@@ -142431,7 +146083,7 @@ msgid "Come with me. We can help each other out."
 msgstr "跟我走吧，我们可以互相帮助。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
+msgid "We both go our separate ways.  Enjoy your freedom."
 msgstr "我们各自走各自的路，继续享受你的自由吧。"
 
 #: lang/json/talk_topic_from_json.py
@@ -142448,8 +146100,8 @@ msgstr "如果我不想让你独立思考，我就不会把你的芯片拿出来
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
 msgstr "如你所知，我帮了你。我现在还挺友善，你最好希望这能持续下去。"
 
 #: lang/json/talk_topic_from_json.py
@@ -142470,7 +146122,7 @@ msgid "Get out of my sight."
 msgstr "给我滚。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
 msgstr "不，我才该道歉，我不是故意的。去做你想做的事吧。"
 
 #: lang/json/talk_topic_from_json.py
@@ -142486,7 +146138,7 @@ msgid "Not if I kill you first!"
 msgstr "除非我先杀了你！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
+msgid "I'm sorry!  I shouldn't have said that!"
 msgstr "很抱歉！我不应该那样说的！"
 
 #: lang/json/talk_topic_from_json.py
@@ -142527,15 +146179,38 @@ msgstr "没什么。继续工作吧。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
 msgstr ""
-"派系营地系统可以让你通过指派你的同伴执行任务的方式让你更好的控制你同伴的行为。这些任务囊括了各种类型，包含从收集到制造到最终危险的武装巡逻任务。"
+"派系营地系统能够让你的同伴接管现有的建筑当作营地或在旷野中建造新营地，并大大提升同伴协助你的功能和能力。当你有一个派系营地时，你可以让你的同伴执行任务，比如制作新物品，建造营地建筑，寻找食物，或者招募更多的同伴。派系营地也使同伴管理的部分操作大大简化。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
-msgstr "接着说。"
+msgid "Give me an overview of how camps work."
+msgstr "告诉我派系营地大概是怎么运作的。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr "告诉我更多关于派系营地食物的事。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr "告诉我更多关于营地任务的事。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr "告诉我更多关于建造营地建筑的事。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr "给我些关于建造营地建筑的建议。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
+msgstr "我大体都了解过了，告诉我有什么新变化就行了。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Never mind, let's go back to talking about camps."
@@ -142555,76 +146230,165 @@ msgstr "算了。我们出发吧。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
 msgstr ""
-"每次执行任务都会消耗食物，但有些任务也能生产食物。时间固定的任务需要事先提供一定食物，而时间不定的重复任务，比如收集柴火，将在每轮任务完成时扣除食物。缺少用于支付同伴劳作的食物将会极大地降低你的派系声望。当派系声望过低时将引发*非常*糟糕的事情。"
+"每个派系营地都有一个公告牌。你可以按\"e\"查看公告牌，以获得可用任务的列表和描述，并指派同伴执行任务。公告牌是管理营地的主要方式。\n"
+"如果你和同伴都有双向无线电，你可以通过无线电远程分配任务给同伴。\n"
+"当你让一个同伴开始建立营地时，他们会在当前所在位置建立一个公告牌，并在对应的大地图地块上建立派系营地。一个派系营地通常由公告牌所在的中心区，以及四周可能存在的一个或多个营地扩展区组成。\n"
+"所有派系营地都可以储备食物，当你的同伴在执行营地任务时，或是在营地附近饿了时，都会消耗储备的食物。\n"
+"目前，派系营地可以建立在旷野、消防局和某些紧急避难所上。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
-msgstr "等等，再说一遍。"
+msgid "Wait, we can talk with radios?"
+msgstr "等等，我们可以通过无线电联络？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
 msgstr ""
-"每个派系营地都有个关联的公告牌，按\"e\"查看公告牌可获得当前营地可执行任务的列表。你可以选择一名NPC同伴执行任务。\n"
-"任务列表默认显示主营地的任务，如果有营地扩展区，可以按\"Tab\"在主营地和各营地扩展区之间切换。\n"
-"如果你有一台双向无线电，你也可以使用它将营地任务远程分配给同样有双向无线电的NPC同伴。"
+"派系营地运行需要食物，但是简化了管理同伴的操作。\n"
+"在使用营地的公告牌之前，你需要为营地规划一些区域。其中\"营地食物区\"是必须的。当你将食物放置在\"营地食物区\"中并选择\"分发食物\"任务后，这些食物会消失并根据其卡路里转化为营地食物储备储存起来。\n"
+"当你的同伴被派去执行营地任务时，他们会在返回时按每日2500千卡消耗营地食物储备。有些任务的时间长短不一，如果同伴执行任务返回时营地中没有足够的食物，他们会很不高兴，所以尽量保持营地中食物充足。\n"
+"那些没有任务但跟随着你的同伴，当自己饥饿且大地图两格内有营地时，他们会消耗营地内的食物储备来喂饱自己。这大大简化了保证同伴吃饱的操作，即便为此也值得建立一个小型派系营地。\n"
+"你可以升级营地并建造一口水井。建好后，同伴也会在口渴时喝井水。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
 msgstr ""
-"当你建立第一个营地时，在大地图上挑选一个自身及周边8格均为旷野，且附近有大片森林的区块。森林是前期建筑材料的主要来源，而旷野可以用于耕种。也不必过于挑剔，因为营地数量没有限制。你还需要至少一名同伴来负责完成各类营地任务。\n"
-"虽然你可以选择在旷野里从头开始建立一个营地，但你也可以用某些建筑物作为基础建立营地。当你和同伴讨论建立营地时，如果同伴所在建筑可以用来建立营地，就会有在那座建筑里建立营地的选项。"
+"当你指派同伴执行营地任务时，他们会凭空消失并去执行任务。当任务完成后，你会在公告牌上看到一个新的任务，让他们返回并真正的完成任务：例如升级营地，送回猎物，放下制作完的物品，或者其他的任务结果。\n"
+"营地任务的种类很多：建造营地建筑，招募新同伴，打猎和设置陷阱，寻找材料，干农活，拆卸载具等等。不是每个营地都包含所有的任务，你可能需要建造一些额外的建筑物，或建造营地扩展区，来解锁新任务。\n"
+"一些营地任务可能与指派在该营地中的同伴所能执行的活动重复，但是建造营地建筑只能通过派系营地任务来完成。\n"
+"你可以使用公告牌来分配任务。你将看到公告牌所在的营地中心区的任务列表。如果营地有扩展区的话，可以按\"Tab\"键查看各个扩展区中可用的任务。\n"
+"请记住，外出执行营地任务的同伴仍然需要食物，当他们完成了任务返回，而食物储备中又没有任何食物的话，他们会生气的。\n"
+"此外还有一个\"紧急召回同伴\"的特殊任务。你可以用它来找回派系营地任务中的任何同伴，但这会取消任务并浪费所有已消耗的资源。最好只在你的营地出了问题，而你没有其他方法让他们回来时，才使用它来找回你的同伴。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
+msgstr "你说他们会生气是什么意思？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
 msgstr ""
-"选址完成后，你需要收集或制作用于升级营地的各种物资。而营地升级后，你将可以解锁更多新任务。一开始解锁的任务主要是NPC收集任务，可以减少你独自搜索物资的压力。在几轮升级之后，你将可以解锁"
-" <color_yellow>[干杂活]</color> "
-"的任务，该任务可以让你指派你的同伴将营地四处的物品按照不同种类存放在各类物品储存点。后期的升级可以让你指派你的同伴们去招募新成员，建设横跨大地图的防御工事、甚至进行武装巡逻与战斗。"
+"目前，你可以建造三种营地：模块化野外营地、消防局营地和紧急避难所营地。以前有第四个叫原始野外营地，但是你不能再建造它们了，只能升级它们。\n"
+"模块化野外营地是最灵活的营地，因为你几乎可以在任何地方建造它们，并且可以选择建造地点来保证有足够空间建造扩展区。但是你从一个什么都没有的旷野上开始建造营地，而且必须建造每一个建筑，所以它们需要大量的资源。消防局和紧急避难所营地的建造速度更快，因为你建立在现有的建筑上，但同时由于你必须建立在现有的建筑上，你可能没有空间建造营地扩展区。\n"
+"每种营地都有各种各样不同的升级任务。各种任务都有各自描述。不过一般来说，如果你想建造营地扩展区，你需要建造足够的住房，有些诸如狩猎或招募同伴的任务，需要你有间厨房或办公室来协助安排这些任务。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr "告诉我更多关于模块化野外营地的事。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr "告诉我更多关于消防局营地的事。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr "告诉我更多关于紧急避难所营地的事。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
+msgstr "告诉我更多关于营地扩展区的事。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
 msgstr ""
-"当你升级主营地的同时，你也会解锁各种扩展区的建设任务。扩展区能够让你建立的营地专精于你所需要的不同工业设施。<color_light_green>[农场]</color>"
-" 是你建立并维持一个庞大派系不可或缺的基础。<color_light_green>[厨房]</color> "
-"可以把你从繁重的烹饪工作中解放出来，让你的同伴替你进行烹饪。<color_light_green>[车库]</color> "
-"可以进行拆解载具的任务，将废弃载具回收成大量的部件和资源。<color_light_green>[铁匠铺]</color> "
-"可以将资源制作成为有价值的装备。在第一个扩展区解锁后，主营地每隔一级就可以新增加一个额外的扩展区，当一个营地扩展区建满之后，你可以新建一个营地以建设更多扩展区。"
+"模块化野外营地是最灵活的营地类型，但它们需要大量的时间和资源来建造。你在一个空旷的旷野——它必须是一个真正的旷野，而不是牧场或农场上的田地——从头开始建造。如果你手头资源不多，可以用木骨泥墙来建造；如果你有很多钉子，可以用木板建造；如果你有把焊枪，可以用金属板建造；如果你很赶时间，可以用帐篷建造。\n"
+"你会从建造中央营地东北角的一间棚屋和一张床开始，然后再加一个壁炉，然后继续扩建小屋，直到你有一间可以容纳两个人的小型庇护所。完成这些后，你可以通过多种方式扩展营地：\n"
+"1. 你可以再建5个房间或棚屋，在营地的每边各建3个。\n"
+"2. 你可以在营地的南半部，两个房间之间建一座中央建筑。这个中央建筑将充当指挥中心，让你的营地能够执行狩猎动物、招募同伴和武装巡逻任务。\n"
+"3. 你可以在营地四周挖掘壕沟，你可以将壕沟与房间外墙连接起来，减少所需的工作量。\n"
+"4. 你可以建造各种各样的小型设施，如保存食物的地窖，或者建造无线电塔，以便更容易招募更多的同伴。\n"
+"模块化营地中的每一个新建筑都可以由不同的材料制成，因此你不会被开始建造营地时所选择的材料限制。帐篷搭起来很快，但很脆弱，而且很容易被丧尸摧毁。中央建筑只能由木骨泥墙、木板或金属墙建造，因此如果旁边是帐篷的话，需要更多材料才能建造。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
-msgstr "谢谢了，我们谈点关于派系营地的其他事情吧。"
+msgid "Got it.  Tell me about expansions."
+msgstr "知道了。告诉我更多关于营地扩展区的事。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
+msgstr "能再跟我说说派系营地是怎么运作的吗？"
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
+msgstr ""
+"消防局是个建造营地的好地方。你从一栋有安全金属门的砖房开始建造，因此你的成果不太容易被丧尸们破坏。但缺点是，四周可能没有太多旷野，因此你也没法建造太多扩展区。\n"
+"消防局营地自身也非常紧凑。这里没有太多的居住空间，但是你可以将车库的一个隔间改造成一间小型砖窑或铁匠铺，或者是一个拆车场，甚至可以拆掉部分路面来建造一个花园。因为有现成的厨房，所以烹饪从一开始就不是问题，不过你可能需要把它稍稍修整一下。"
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
+msgstr ""
+"你可以在普通的紧急避难所建造一个派系营地——但需要是最基础的、只有单一空旷房间的那种。紧急避难所随处可见，而且四周常常都是旷野，所以虽然它们不如模块化野外营地灵活，但仍然很容易增加扩展区。\n"
+"紧急避难所营地有多种建造方式。但都需要你在建造更多卧室或者增加制造工房或厨房之间做出选择。"
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
+msgstr ""
+"每个派系营地最多可以有8个扩展区，每个在大地图上与营地中心区相邻的区块都可以作为营地扩展区。扩展区能够提升营地功能，比如增加一个农场或一个制造各种物品的工房。\n"
+"每个扩展区都需要占用中央营地中一个两张床的房间，目前，扩展区只能在旷野里建造，而且必须从头开始建造。\n"
+"扩展区任务由公告板中的单独标签页显示，每个扩展区都有自己的任务列表，你需要按\"Tab\"键切换标签页才能看到它们。目前可用的扩展区如下：\n"
+"——农场：整块区域都是耕种过的田地，你可以亲自维护或派遣同伴执行任务维护。作物可以在这里正常生长。\n"
+"——车库：一个大型建筑。可以派遣同伴到此拆卸载具。当然，你可以直接在区域管理菜单中指定\"拆卸载具区\"，因此现在它用处不大了。\n"
+"——食堂：一个经过扩展的厨房，包含就餐区和储藏室。\n"
+"——牧场：一组模块化的建筑，用于饲养牛、马或鸡等牲畜。牲畜需要自行寻找！\n"
+"——盐场：一个加工食盐的小型扩展区。\n"
+"——工坊：一个制造各种物品的大型扩展区。同伴们可以使用扩展区中的设备来制作物品，比你自己手工制作要快得多。\n"
+"——储物间：一个用来储存物品的大型建筑。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Give me some advice on building a camp."
+msgstr "知道了。给我些关于建造营地建筑的建议。"
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
+msgstr ""
+"单独创建营地并不需要花费太多时间，因此你可以使用一个派系营地来保证你的同伴吃饱，而不需要经常为他们分发食物，所以最好是在你经常待的地方建立一个最低限度的派系营地。\n"
+"你想要把营地扩建多大取决于你自己。一个模块化野外营地虽然很耗费资源，但是建成之后可以让你派遣同伴打猎或种田，所以回报也很大。即便不为别的，你也应该考虑把东北帐篷升级到可以建水井的地步，或者是从消防局或紧急避难所营地开始的话，你应该尽快建一个水井。\n"
+"当你碰见消防局或紧急避难所时，你也许会想在那里建立营地。这两种营地的空间都非常紧凑，但功能与升级后的野外营地基本相同，而且不需要那么多的资源。\n"
+"如果你想为营地建造扩展区的话，可以从农场或工坊开始。农场能让你自给自足，而工坊可以让你制作升级营地所需要的资源。\n"
+"食堂、盐场、牧场和储物间也许不该成为你建造扩展区的第一选择，但它们都有各自的用途。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -142644,6 +146408,14 @@ msgstr ""
 "5. 现在在营地附近的同伴将会自动使用营地中的食物储备，如果营地中有水井，他们也会使用它来解渴。\n"
 "6. 现在你可以在特定建筑中建立营地。可以建立营地的建筑列表会逐步增加，所以记得多试试。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr "等等，让我们从头开始理一理。"
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr "谢谢了，我们谈点关于派系营地的其他事情吧。"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -142744,11 +146516,11 @@ msgid "Well, sure."
 msgstr "嗯，当然可以。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
+msgid "I'd… rather not."
 msgstr "我……还是算了。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr "我很抱歉……我还要到其他地方去。"
 
 #: lang/json/talk_topic_from_json.py
@@ -142779,8 +146551,8 @@ msgid "Oh, but you already have."
 msgstr "但汝早已加入。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
-msgstr "哦……是的，我有。"
+msgid "Yes… yes I have."
+msgstr "哦对……我已经加入了。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Join us then, eat from this meal with us."
@@ -142847,7 +146619,7 @@ msgstr ""
 "有个浑身上下摊满了石油似的黑色粘液的疯子，从一扇大落地玻璃窗摔了进来，它的脑袋和脖子扎满了碎玻璃。我原以为这个不知是男是女的倒霉家伙一定死透了。人们开始围过来，还有人给它拍照。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
+msgid "Horrible.  Did you get any pictures yourself?"
 msgstr "可怕。你拍照了吗？"
 
 #: lang/json/talk_topic_from_json.py
@@ -143002,7 +146774,7 @@ msgid "This is a npc allies 1 test response."
 msgstr "NPC同伴1测试回应。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
+msgid "This an error!  npc allies 2 test response."
 msgstr "NPC同伴2错误测试回应。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143202,7 +146974,7 @@ msgid "This is a u_has_items beer test response."
 msgstr "玩家拥有啤酒回应。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
+msgid "Test failure!  This is a u_has_items test response."
 msgstr "测试失败！拥有物品测试回应。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143214,7 +146986,7 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr "玩家拥有物品类别书籍计数2测试回应。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
 msgstr "失败！玩家拥有物品类别书籍计数3测试回应。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143302,7 +147074,7 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr "u_has_bionics bio_ads 测试回应。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
 msgstr "失败！npc_has_bionics bio_ads 测试回应。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143358,11 +147130,7 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr "欢迎市民，什么风把你吹到了美食之城？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr "嘿，我们聊聊吧。"
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
+msgid "Greetings…  Foodperson?"
 msgstr "你好……美食家？"
 
 #: lang/json/talk_topic_from_json.py
@@ -143404,7 +147172,7 @@ msgid ""
 msgstr "亲眼见到伟大的活生生的美食家！很荣幸能见到你本人！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
+msgid "Ah…  Well, nice to meet you Foodperson."
 msgstr "额……好吧。很高兴见到你，美食家。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143432,7 +147200,7 @@ msgid "Sure, whatever."
 msgstr "好吧，随你的便。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
+msgid "Ok…  I believe you."
 msgstr "好的……我相信你。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143528,15 +147296,15 @@ msgid "That sounds great!"
 msgstr "这听起来太棒了！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
-msgstr "好……"
+msgid "Ok…"
+msgstr "好吧……"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I need to think about it."
 msgstr "我得考虑下。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
+msgid "Huh…  No thanks."
 msgstr "唔……不，谢了。"
 
 #: lang/json/talk_topic_from_json.py
@@ -143553,7 +147321,7 @@ msgstr "你说话和走路的方式……你……你是我？但这怎么可能
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr "我……我不知道。这可能和<the_cataclysm>有关！我们应该联合起来找出答案，怎么样？"
 
@@ -144212,7 +147980,7 @@ msgid ""
 "I spent a lot of time rummaging for rhubarb and bits of vegetables in the "
 "forest before I found the courage to start picking off some of those dead "
 "monsters.  I guess I was getting desperate."
-msgstr "我花了很多时间在森林里搜寻大黄和一些能食用的野菜，直到我鼓起勇气开始翻找那些死去怪物的尸体。我想我那时候是够孤注一掷的。"
+msgstr "我花了很多时间在森林里采集大黄和一些能食用的野菜，直到我鼓起勇气开始翻找那些死去怪物的尸体。我想我那时候是够孤注一掷的。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "And that's it?  You spent months just living off the land?"
@@ -144347,7 +148115,7 @@ msgid ""
 "a pretty good life compared to those first few months."
 msgstr ""
 "嗯，我在那里过得还不赖，但最终我开始变得有点发疯。下面总是黑乎乎的，还有点冷，而且只能靠吃捡来的垃圾食品过日子……一个灵魂只能在那种环境下活这么久。当地上开始变暖，白天时间变长之后，我决定再勇敢一点。我已经学到了很多关于"
-" <zombies> 的知识，在那之后我就能过得很好了。我在好几个地方露营过，搜寻浆果之类的东西填肚子，与前几个月相比，我过着相当好的生活。"
+" <zombies> 的知识，在那之后我就能过得很好了。我在好几个地方露营过，采集浆果之类的东西填肚子，与前几个月相比，我过着相当好的生活。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -144371,7 +148139,7 @@ msgid "Giant bees?  Tell me more."
 msgstr "巨型蜜蜂？多和我讲讲吧。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
+msgid "But bees aren't usually aggressive…"
 msgstr "但蜜蜂通常并不好斗啊……"
 
 #: lang/json/talk_topic_from_json.py
@@ -144385,7 +148153,7 @@ msgstr ""
 " <swear> 鸡一样逃跑了。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
 msgstr "但蜜蜂通常不是并不好斗啊……你是说黄蜂吗？"
 
 #: lang/json/talk_topic_from_json.py
@@ -144833,7 +148601,7 @@ msgid "No.  I can't.  Just, no."
 msgstr "不行，我做不到。就是，不行。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
+msgid "Sorry…  I'll let you be."
 msgstr "对不起……我会让你一个人呆一会的。"
 
 #: lang/json/talk_topic_from_json.py
@@ -145091,7 +148859,7 @@ msgstr ""
 "好吧，那些被提及的引用感觉不太对。帕特引用了许多我们从未玩过的情节。情节很接近，但不对，当我把这些碎片拼到一起时，它讲述了一个故事。关于一名学者的故事，他的孩子被一个腐败的政府俘虏，被迫为他们研究黑魔法。然后是最关键的地方：一个黑魔法已经失控的警告，一个所有英雄都必须在这个王国倒下前赶紧离开的警告。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
+msgid "Okay…"
 msgstr "好吧……"
 
 #: lang/json/talk_topic_from_json.py
@@ -145493,7 +149261,7 @@ msgid "What do you think happened?"
 msgstr "你觉得发生了什么？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
+msgid "That does sound a little crazy…"
 msgstr "听起来确实有点疯狂……"
 
 #: lang/json/talk_topic_from_json.py
@@ -145547,7 +149315,7 @@ msgid "What happened to you after that?"
 msgstr "之后你又发生了什么？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
+msgid "It can't be healthy to abandon your past like that…"
 msgstr "就这样抛弃你的过去可不太健康……"
 
 #: lang/json/talk_topic_from_json.py
@@ -146019,7 +149787,7 @@ msgid ""
 msgstr "我的故事。哈，没什么特别的。我曾有很多人，但他们已经都和主在一起了。我不明白祂为什么不把我也带走，但我想时机合适的时候一切都会水落石出的。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
+msgid "Do you mean in a religious sense, or…?"
 msgstr "你是说在宗教意义上，还是……？"
 
 #: lang/json/talk_topic_from_json.py
@@ -146364,8 +150132,8 @@ msgstr "结果怎样？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
 msgstr "如果我给你一些合适的玩意，你觉得你能不能够……对它进行科学研究？"
 
 #: lang/json/talk_topic_from_json.py
@@ -146486,8 +150254,8 @@ msgid ""
 msgstr "哦，这可是个不错的故事。<the_cataclysm> 在我的婚礼那天发生了。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
-msgstr "哦，抱歉…… "
+msgid "Oh, I'm sorry…"
+msgstr "哦，抱歉……"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -146820,7 +150588,7 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr "他的确说过你会做草药，它们有效吗？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
+msgid "I'd like to ask you something else…"
 msgstr "我想问你点别的事……"
 
 #: lang/json/talk_topic_from_json.py
@@ -147115,7 +150883,8 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr "我还想和卡洛斯谈谈干活的事情。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
 msgstr "克里斯在吗？我想知道他在树林里遇到了什么。"
 
 #: lang/json/talk_topic_from_json.py
@@ -147301,15 +151070,15 @@ msgid "What do you need done?"
 msgstr "你需要我干什么？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
+msgid "About the mission…"
 msgstr "关于任务……"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
+msgid "About one of those missions…"
 msgstr "关于任务之一……"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
+msgid "I've got to go…"
 msgstr "我该走了……"
 
 #: lang/json/talk_topic_from_json.py
@@ -147326,7 +151095,7 @@ msgstr ""
 "我带领了我们连队剩下的人马来执行重新控制该设施的任务。我们两打队员进入了这个建筑群，并当即进入并保卫了这间控制室。从这里我又派了些人去控制这一层和下一层的关键系统。如果我们成功了的话，这座设施就可以作为我们连队在本地区执行任务时的永久基地了。最重要的是这里可以让我们将一部分难民从一些过于拥挤的避难所里分流过来，同时解放出更多人手来从事其他修复工作。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
+msgid "Seems like a decent plan…"
 msgstr "看起来是个不错的计划……"
 
 #: lang/json/talk_topic_from_json.py
@@ -147345,7 +151114,7 @@ msgstr ""
 "这座建筑原本是作为全球核冲突爆发之后的安全庇护所而修建的。如果所有设备都正常运作并且有专人控制的话，这个避难所可以让几千人在地下安全生活上几年。不幸的是，供电系统在某个时候受损或是被故意破坏了，并爆发了一次足够致人死亡的辐射。这次灾难性事故使得所有位于地下二层和更低层的人在几分钟之内全部死于非命。而那些在本层工作的人们在死于辐射病之前成功封死了通往下层的通道。记录中还提到另一件事，所有水下被重新导入到更底层去了。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
+msgid "Whatever they did it must have worked since we are still alive…"
 msgstr "不论他们做了什么，都一定成功了。因为我们还活着……"
 
 #: lang/json/talk_topic_from_json.py
@@ -147380,7 +151149,7 @@ msgid ""
 msgstr "我们正在保卫着这座设施的对外通讯阵列。都是些保密资料，我不知道该透露些什么……如果你有任何问题，去找我的指挥官。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
+msgid "I'll try and find your commander then…"
 msgstr "我会去找你的指挥官的……"
 
 #: lang/json/talk_topic_from_json.py
@@ -147441,7 +151210,7 @@ msgid "Hey miss, don't you think it would be safer if you stuck with me?"
 msgstr "嘿小姐，难道你不觉得应该和我一起才更安全么？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
+msgid "Don't mind me…"
 msgstr "忙你的吧……"
 
 #: lang/json/talk_topic_from_json.py
@@ -147709,7 +151478,7 @@ msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr "我跟你说过硬纸板的事吗，朋友？你有吗？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
+msgid "About that shopping list of yours…"
 msgstr "关于你的购物清单……"
 
 #: lang/json/talk_topic_from_json.py
@@ -147775,7 +151544,7 @@ msgid "Would you like me to give you some cardboard?"
 msgstr "你要我给你一些纸板箱吗？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
+msgid "I think I have to get going…"
 msgstr "我想我得走了……"
 
 #: lang/json/talk_topic_from_json.py
@@ -147805,8 +151574,8 @@ msgid ""
 msgstr "如果你不知道他是谁，我也绝不告诉你。他跟每个人都说话，如果你没听到他的声音，那就说明你不可信，帮不了我。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
-msgstr "你刚才说什么来着？"
+msgid "…What were you saying before?"
+msgstr "……你刚才说什么来着？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -147823,7 +151592,7 @@ msgid "No."
 msgstr "没有。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
 msgstr "我……我看到你穿着它。你为什么穿这个？"
 
 #: lang/json/talk_topic_from_json.py
@@ -147915,7 +151684,7 @@ msgid "I found a sample of alien fungus for you."
 msgstr "我给你带来了一个异界真菌的样本。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
+msgid "Ok… see ya."
 msgstr "好吧……回头见。"
 
 #: lang/json/talk_topic_from_json.py
@@ -148016,8 +151785,8 @@ msgstr "我不在乎你是不是中国人。如果你愿意，你可以和我一
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr "我是说，肯定有一部分是种族主义……但你的体型显然不符合要求。他们需要强壮有力的那类幸存者。"
 
 #: lang/json/talk_topic_from_json.py
@@ -148049,7 +151818,7 @@ msgid "You sound more optimistic than usual."
 msgstr "你看起来比平时更乐观。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr "所以，关于你的博士学位……"
 
 #: lang/json/talk_topic_from_json.py
@@ -148179,7 +151948,7 @@ msgstr "不，不，我不知道，不过我想你不会和我卖关子的。外
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr "异界入侵的蘑菇，真菌塔，坚硬的菌丝侵入地面和树木，丧尸被侵略性的真菌接管……是的。可怕的玩意。"
 
 #: lang/json/talk_topic_from_json.py
@@ -148263,7 +152032,7 @@ msgstr "再次感谢你的帮助，我的朋友。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey, are you a big fan of survival of the fittest?"
-msgstr "嘿，你还相信适者生存吗？"
+msgstr "嘿，你相信适者生存吗？"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Why do you ask?"
@@ -148294,7 +152063,7 @@ msgid ""
 msgstr "因为我肯定不适合，所以我现在正坐在这里等着被饿死呢。帮帮我这个得病的可怜人吧？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr "我也许能帮你……想吃点什么吗？"
 
 #: lang/json/talk_topic_from_json.py
@@ -148709,7 +152478,7 @@ msgid ""
 msgstr "除了我刚才说的以外，没别的了。没有足够的活干，也没有足够的食物吃。即使网没挂，我关注的所有youtube主播都已经死了。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr "你看起来有点无礼……"
 
 #: lang/json/talk_topic_from_json.py
@@ -148932,7 +152701,7 @@ msgid ""
 "Well, now that you mention it, with the back bay cleared I could probably "
 "set up back there and start work.  I'll think about it, get back to me "
 "later."
-msgstr "好吧，既然你提到了，把后院清理干净后，我就可以在那里安顿下来开始工作了。我会考虑一下，回头再找我。"
+msgstr "好吧，你这么一说我才想到，现在后院清理干净了，我也许可以在那里安顿下来开始工作了。我会考虑一下，回头再找我。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -148967,8 +152736,8 @@ msgid ""
 msgstr "你丈夫让我问你，如果让你离开这个地方前往我的营地为我工作，你觉得怎么样？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
-msgstr "关于你让我找到那个酸面团……"
+msgid "About that sourdough starter you had me looking for…"
+msgstr "关于你让我找的那个酸面团……"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Got any more bread I can trade flour for?"
@@ -149269,7 +153038,7 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr "我想我也会这么做的。这里没人有吉他吗？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
+msgid "Yes, yes I would… you monster."
 msgstr "是的，是的，我会……你这个怪物。"
 
 #: lang/json/talk_topic_from_json.py
@@ -149471,6 +153240,10 @@ msgid ""
 msgstr ""
 "我的朋友，你刚刚问了一个非常好的问题。人们都很怀念曾经生活里的各种小玩意，比如新手机、新靴子，但是我们已经无法再去购物了。噢，我想，如果你小心避开碎玻璃的话，还是可以的。当我\"买下\"这件暖和的外套时，我把钱包忘在了一间户外商店里。但也就这样了，你知道吗？这一切都不重要了。我想我的医疗保险现在没法为我支付任何医疗费用了。就像你在电影里看到的那样，我用100美元卷了一支大麻烟。但那玩意狠狠地呛了我一口，最后不得不换成普通纸张重新做了一根。那玩意太硬了，你不用自己再试了。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr "接着说。"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -149734,7 +153507,7 @@ msgstr ""
 "在大灾变之前，我是个电工。在这里的鲍里斯是我的姐夫，我们是一个正经的承包商团队。当撤离通报发出时，我们和我们的……和我们的家人离开了。我们被困在一个拥挤的避难所里，然后又被困在一辆拥挤的巴士上。然后……一切都出了问题。巴士被怪物袭击，撞毁了。几乎所有人都死了。我们有几人活了下来……但是不够。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr "你失去了爱人……"
 
 #: lang/json/talk_topic_from_json.py
@@ -150189,7 +153962,7 @@ msgstr "俺的故事？俺只是一个流浪的牛仔，天天在路上吃灰。
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr "你……你知道这里发生过的事吧？疏散和其他的事？"
 
@@ -150903,7 +154676,7 @@ msgid "Are you looking to buy anything else?"
 msgstr "你还想买点其他的吗？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
+msgid "Very well… let's talk about something else."
 msgstr "很好……那，我们换个话题吧。"
 
 #: lang/json/talk_topic_from_json.py
@@ -151231,8 +155004,8 @@ msgid "Have you seen anyone who might be hiding something?"
 msgstr "你有发现谁在藏着什么吗？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
-msgstr "拜拜。"
+msgid "Bye…"
+msgstr "再见……"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151245,15 +155018,15 @@ msgid "Keep your head down and stay out of my way."
 msgstr "保持低调，然后别挡老子的路！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
-msgstr "OK……"
+msgid "OK…"
+msgstr "好吧……"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like what?"
 msgstr "像是什么？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
+msgid "I'm not sure…"
 msgstr "我不确定……"
 
 #: lang/json/talk_topic_from_json.py
@@ -151273,7 +155046,7 @@ msgid "Got something to hide?"
 msgstr "藏什么呢？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
+msgid "Sorry, I didn't mean to offend you…"
 msgstr "对不起，我无意冒犯……"
 
 #: lang/json/talk_topic_from_json.py
@@ -151325,7 +155098,7 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr "女士，你真的不该到处乱跑。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
+msgid "I heard this place was a refugee center…"
 msgstr "我听说这是一个难民中心……"
 
 #: lang/json/talk_topic_from_json.py
@@ -151349,8 +155122,8 @@ msgid "Can I do anything for the center?"
 msgstr "[任务]我能为中心做些什么？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
-msgstr "我觉得你似乎正在寻求帮助……"
+msgid "I figured you might be looking for some help…"
+msgstr "我想你似乎正在寻求帮助……"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, I'd better be going.  Bye."
@@ -151403,9 +155176,9 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
-msgstr "[智力 10]等等，一开始六卡车和后来的难民……你这里现在塞了多少人啊？"
+msgstr "[智力 10] 等等，一开始六卡车和后来的难民……你这里现在塞了多少人啊？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151455,7 +155228,7 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr "对不起，我们现在不愿意冒这个险。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
+msgid "Fine…"
 msgstr "好吧……"
 
 #: lang/json/talk_topic_from_json.py
@@ -151468,8 +155241,8 @@ msgstr ""
 "我说过根本就他妈不可能！我们这里曾经来过一个浑身长着该死的毛皮的家伙……现在想想也不算是最奇怪的事，但我知道外面那些让他变异的有毒废料肯定还在外面某个地方，而且肯定不仅仅是让他变异出长毛那么简单。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
-msgstr "好吧……*咳嗽咳嗽*"
+msgid "Fine… *coughupyourscough*"
+msgstr "好吧……*咳咳咳*"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151498,7 +155271,7 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[力量 11] 拳头大是硬道理！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
+msgid "I guess I'll look somewhere else…"
 msgstr "我想我还是到其他地方去看看……"
 
 #: lang/json/talk_topic_from_json.py
@@ -151520,7 +155293,7 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr "难道还有比奇怪的枪械储藏点更好搜刮的地方吗？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
+msgid "Was hoping for something more…"
 msgstr "还以为有什么好东西……"
 
 #: lang/json/talk_topic_from_json.py
@@ -151625,7 +155398,7 @@ msgid "So what are you doing right now?"
 msgstr "那你现在在做什么？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
+msgid "Never mind…"
 msgstr "算了……"
 
 #: lang/json/talk_topic_from_json.py
@@ -151650,7 +155423,7 @@ msgstr ""
 "关于不寻常的丧尸或新型变异的目击报告。我们对正在发生的事情了解得越多，我们就越能找到治疗，甚至是治愈的方法。虽然希望渺茫，但你需要有希望才能生存下去。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
+msgid "Good luck with that…"
 msgstr "祝你好运……"
 
 #: lang/json/talk_topic_from_json.py
@@ -151695,8 +155468,8 @@ msgstr ""
 "嗨，那咱俩一个样啊。好吧，差不多一样。不过按我说，这会儿我们可没法开门迎客了。（悄声道）已经挤满了。地下室里吵吵嚷嚷的跟菜市场一样，真让人受不了。看到一进门那个商人了吗，这儿他说了算。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
-msgstr "那可麻烦了……"
+msgid "Sucks…"
+msgstr "我去……"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151710,7 +155483,7 @@ msgstr ""
 "你瞧，楼下有个家伙搞来了一台运作良好的气动加农炮。那玩意能把钢筋像……像加农炮一样射出去，而且还不出一丝声。低成本高效率，可不是吗？而且能用钢筋造各种自制武器怕是我列也列不完啊。不过要说起这最大的用途啊，那还得是继续建造各种防御工事。用钢筋造出来的防御工事，栅栏啊墙啊啥的，就没有啥怪物能够攻破的。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
+msgid "Well, then…"
 msgstr "好吧……"
 
 #: lang/json/talk_topic_from_json.py
@@ -151797,8 +155570,8 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr "嘿，我闻到了新来的家伙，我能帮你做点什么？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
-msgstr "你……在闻我？"
+msgid "You… smelled me?"
+msgstr "你……闻到了我？"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Got anything for sale?"
@@ -151848,8 +155621,8 @@ msgid ""
 msgstr "对啊。不管我抓到什么猎物，我都把肉品和其他部位带来这里卖。偶尔也能弄到写鲜鱼或是几篮野果，但没有什么能比上新鲜的碳烤驼鹿肉排当晚餐！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
-msgstr "真棒，我都要流口水了……"
+msgid "Great, now my mouth is watering…"
+msgstr "行吧，我都要开始流口水了……"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151952,7 +155725,7 @@ msgstr ""
 " '理应' 给他们。这儿的大部分幸存者不会有他们想要的东西，因此他们受到英雄一般的欢迎。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
+msgid "Hmmm…"
 msgstr "呣……"
 
 #: lang/json/talk_topic_from_json.py
@@ -152000,7 +155773,7 @@ msgstr ""
 "在直到一名招募官来之前，你没法地真正加入我们。不过我们一直都欢迎大家来帮一把手，记得时常来问我有没有可以干的活。作为临时工，多完成任务可以让你在这群世上仅存的最有实力的人们中扬名立万。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
+msgid "I haven't done anything wrong…"
 msgstr "我什么坏事都没有干……"
 
 #: lang/json/talk_topic_from_json.py
@@ -152170,7 +155943,7 @@ msgid "Something to say?"
 msgstr "有什么事吗？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
+msgid "I charge hourly, so be quick…"
 msgstr "我这里按小时计费，所以快点……"
 
 #: lang/json/talk_topic_from_json.py
@@ -152287,7 +156060,7 @@ msgstr ""
 "你注意到他们用来当作报酬的那些小小金币了么，要我说可真他妈奇了怪了。换做是别人得猜他们家有个金矿，但其实他们并没有，所以派我翻遍整个该死的世界找些金条来给他们。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
+msgid "I guess I could help with that…"
 msgstr "我想也许我能帮上点忙……"
 
 #: lang/json/talk_topic_from_json.py
@@ -152398,7 +156171,7 @@ msgid "[$10] I'll get a haircut"
 msgstr "[$10] 给我剪个头"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
+msgid "Maybe another time…"
 msgstr "下次再说吧……"
 
 #: lang/json/talk_topic_from_json.py
@@ -152416,7 +156189,7 @@ msgid "Stand still while I get my clippers..."
 msgstr "请稍等，让我拿把剪刀来……"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
+msgid "Thanks…"
 msgstr "谢了……"
 
 #: lang/json/talk_topic_from_json.py
@@ -152436,7 +156209,7 @@ msgid "What do you have on tap?"
 msgstr "有什么喝的没有？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
+msgid "I'll be going…"
 msgstr "我该走了……"
 
 #: lang/json/talk_topic_from_json.py
@@ -152488,8 +156261,8 @@ msgid ""
 msgstr "我的搭档负责加固这个地方，你可以问问他有什么要做的。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
-msgstr "好吧我会去跟他谈谈……"
+msgid "I'll talk to him then…"
+msgstr "好吧，我会去跟他谈谈……"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -152505,7 +156278,7 @@ msgid "I hope you are here to do business."
 msgstr "我希望你来这儿是做生意的。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
+msgid "I'm interested in investing in agriculture…"
 msgstr "我想要投资点农田……"
 
 #: lang/json/talk_topic_from_json.py
@@ -152532,11 +156305,11 @@ msgid "I imagine we might be able to work something out."
 msgstr "也许吧，我想我们能谈妥价格的。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
+msgid "I was wondering if you could install a cybernetic implant…"
 msgstr "我需要你帮我安装生化插件……"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
+msgid "I need help removing an implant…"
 msgstr "我需要你帮我移除生化插件……"
 
 #: lang/json/talk_topic_from_json.py
@@ -152576,7 +156349,7 @@ msgstr ""
 "我自认是一个从不死生物的追杀中逃脱出来并过上自耕农般的贵族生活的幸运儿罢了。我们有宿舍和食堂，但除非收成很好，否则分不到自己劳作的一点成果。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
+msgid "It could be worse…"
 msgstr "可能会更糟……"
 
 #: lang/json/talk_topic_from_json.py
@@ -152586,8 +156359,8 @@ msgid ""
 msgstr "我没时间跟你聊天。如果你想交易或是找活干，去和工头或者农场主管聊聊。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
-msgstr "好吧我会去跟他们谈谈……"
+msgid "I'll talk with them then…"
+msgstr "好吧，我会去跟他们谈谈……"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Can I help you, marshal?"
@@ -152654,8 +156427,8 @@ msgstr ""
 "这么一大块栅栏围住的土地，只要再搞到些建材，我们可以建起一座村庄。原本我们想占据一个现成的小镇之类的地方，但耕地的匮乏和丧尸们的热情访问让我们明白，还是从头开始建设更来得实际。我原来呆的难民中心就一直在面临着饥荒和丧尸攻击的问题。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
-msgstr "希望没白来一趟……"
+msgid "Hopefully moving out here was worth it…"
+msgstr "但愿我们搬到这外面来是值得的……"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -153166,13 +156939,13 @@ msgstr "毒蛇疯咬"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
-msgstr "你用蛇咬击中了%s"
+msgid "You lash out at %s with a Viper Bite"
+msgstr "你有如毒蛇出洞，猛击了 %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
-msgstr "<npcname>用蛇咬击中了%s"
+msgid "<npcname> lash out at %s with a Viper Bite"
+msgstr "<npcname> 有如毒蛇出洞，猛击了 %s"
 
 #: lang/json/technique_from_json.py
 msgid "Viper Strike"
@@ -153180,18 +156953,28 @@ msgstr "毒蛇猛击"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
-msgstr "你用毒蛇掌猛击了%s"
+msgid "You hit %s with a spectacular Viper Strike"
+msgstr "你有如毒蛇出洞，精彩地猛击了 %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
-msgstr "<npcname>用毒蛇掌猛击了%s"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
+msgstr "<npcname> 有如毒蛇出洞，精彩地猛击了 %s"
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr "毒蛇翻腾"
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr "%s试图抓住你，但你扭动身体躲开了！"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr "%s 试着抓住 <npcname>，但被扭动身体躲开了！"
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr "回旋踢"
@@ -153234,6 +157017,34 @@ msgstr "你用巨钳般的前臂猛击了 %s"
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr "<npcname>用巨钳般的前臂猛击了%s"
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr "蛤蟆掴"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr "你顶着%s的攻击将其一掌打倒"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr "<npcname>顶着%s的攻击将其一掌打倒"
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr "蛤蟆撞"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr "你顶着%s的攻击将其狠狠击晕"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr "<npcname>顶着%s的攻击将其狠狠击晕"
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr "毒蟾吐舌"
@@ -154973,153 +158784,178 @@ msgid "<npcname> double-handed palm strikes %s"
 msgstr "<npcname>给了%s一记大力金刚掌"
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
-msgstr "醉拳佯攻"
+msgid "Tiger Palm"
+msgstr "猛虎掌"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble and leer at %s"
-msgstr "你蹒跚几步后斜视%s"
+msgid "You land a heavy tiger palm on %s"
+msgstr "你使出一记猛虎掌猛击%s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles and leers at %s"
-msgstr "<npcname>蹒跚几步后斜视%s"
+msgid "<npcname> lands a heavy tiger palm on %s"
+msgstr "<npcname>使出一记猛虎掌猛击%s"
 
 #: lang/json/technique_from_json.py
-msgid "Drunk counter"
-msgstr "醉拳反击"
+msgid "Tiger Takedown"
+msgstr "猛虎扑击"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
-msgstr "你蹒跚而行，狂野的挥击并且击中了%s"
+msgid "You slam %s to the ground"
+msgstr "你将%s击倒在地"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
-msgstr "<npcname>蹒跚而行，并且击中了%s"
+msgid "<npcname> slams %s to the ground"
+msgstr "<npcname>把%s击倒在地"
 
 #: lang/json/technique_from_json.py
-msgid "Tiger Takedown"
-msgstr "猛虎扑击"
+msgid "Straight Punch"
+msgstr "直拳"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
-msgstr "你一把抓住并按倒%s"
+msgid "You deliver a vertical straight punch to %s"
+msgstr "你一记直拳猛击%s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> grabs and grounds %s"
-msgstr "<npcname>一把抓住并按倒%s"
+msgid "<npcname> delivers a vertical straight punch to %s"
+msgstr "<npcname>一记直拳猛击%s"
 
 #: lang/json/technique_from_json.py
-msgid "slow strike"
-msgstr "慢击"
+msgid "Straight Punch (Knockback)"
+msgstr "直拳（击退）"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You slowly strike %s"
-msgstr "你缓慢的打击了%s"
+msgid "You force %s back with a vertical straight punch"
+msgstr "你一记直拳猛击击退%s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
-msgstr "<npcname>缓慢的打击了%s"
+msgid "<npcname> forces %s back with a vertical straight punch"
+msgstr "<npcname>一记直拳猛击击退%s"
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
-msgstr "相位攻击"
+msgid "L-hook"
+msgstr "左勾拳"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
-msgstr "你相位攻击了%s"
+msgid "You deliver a solid L-hook to %s"
+msgstr "你一记左勾拳稳稳击中%s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
-msgstr "<npcname>相位攻击了%s"
+msgid "<npcname> delivers a solid L-hook to %s"
+msgstr "<npcname>一记左勾拳稳稳击中%s"
 
 #: lang/json/technique_from_json.py
-msgid "Chain Punch"
-msgstr "子午连环捶"
+msgid "L-hook (Knockback)"
+msgstr "左勾拳（击退）"
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
-msgstr "50％行动点消耗，66％伤害，击退和追踪"
+#, python-format
+msgid "You knock %s back with a solid L-hook"
+msgstr "你一记左勾拳稳稳击退%s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> knocks %s back with a solid L-hook"
+msgstr "<npcname>一记左勾拳稳稳击退%s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
-msgstr "你连续捶击%s"
+msgid "Your attack misses %s but you don't let up"
+msgstr "你的攻击未能命中%s，但没失去平衡"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
-msgstr "<npcname>连续捶击%s"
+msgid "<npcname>'s attack misses %s but they don't let up"
+msgstr "<npcname>的攻击未能命中%s，但没失去平衡"
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
-msgstr "你灵活地位移，挣脱出来"
+msgid "Receive and Counter"
+msgstr "阴阳掌"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You receive %s's gift of violence, and return it in kind"
+msgstr "你接下%s的攻击，并反转给对方"
 
 #: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
-msgstr "<npcname>挣脱了！"
+#, python-format
+msgid "<npcname> receives %s's attack, and counters"
+msgstr "<npcname>接下%s的攻击，并反转它"
 
 #: lang/json/technique_from_json.py
-msgid "ask the way"
-msgstr "问路手"
+msgid "Drunken Feint"
+msgstr "醉拳佯攻"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You miss but keep striking at %s"
-msgstr "你打空了，但是继续击打%s"
+msgid "You stumble and leer at %s"
+msgstr "你蹒跚几步后斜视%s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
-msgstr "<npcname>打空了，但是继续击打%s"
+msgid "<npcname> stumbles and leers at %s"
+msgstr "<npcname>蹒跚几步后斜视%s"
 
 #: lang/json/technique_from_json.py
-msgid "White Crane stumble"
-msgstr "白鹤寻狐"
+msgid "Drunk Counter"
+msgstr "醉拳反击"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
-msgstr "你发起猛攻，绊倒了%s。"
+msgid "You lurch, and your wild swing hits %s"
+msgstr "你蹒跚而行，狂野的挥击并且击中了%s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
-msgstr "<npcname>绊倒了%s"
+msgid "<npcname> lurches, and hits %s"
+msgstr "<npcname>蹒跚而行，并且击中了%s"
 
 #: lang/json/technique_from_json.py
-msgid "Receive and Counter"
-msgstr "阴阳掌"
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
+msgstr "%s试图抓住你，但被跌跌撞撞地躲开了！"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You receive %s's gift of violence, and return it in kind"
-msgstr "你接下%s的攻击，并反转给对方"
+msgid "The %s tries to grab <npcname>, but they stumble away!"
+msgstr "%s试图抓住<npcname>，但被跌跌撞撞地躲开了！"
+
+#: lang/json/technique_from_json.py
+msgid "slow strike"
+msgstr "慢击"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> receives %s's attack, and counters"
-msgstr "<npcname>接下%s的攻击，并反转它"
+msgid "You slowly strike %s"
+msgstr "你缓慢的打击了%s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> slowly strikes %s"
+msgstr "<npcname>缓慢的打击了%s"
+
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
+msgstr "相位攻击"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
-msgstr "你将%s缴械"
+msgid "You phase-strike %s"
+msgstr "你相位攻击了%s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
-msgstr "<npcname>缴械了%s"
+msgid "<npcname> phase-strikes %s"
+msgstr "<npcname>相位攻击了%s"
 
 #: lang/json/technique_from_json.py
 msgid "Pressure Crunch"
@@ -155754,7 +159590,7 @@ msgstr "深水码头木桩"
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr "一片固定在河床上的结实的木桩。它还需要一个框架才能支撑地板。"
 
@@ -155765,8 +159601,8 @@ msgstr "深水码头框架"
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr "安装于木桩上的原木框架。再铺上木质的地板，这就是一个完整的码头了。"
 
 #: lang/json/terrain_from_json.py
@@ -155776,7 +159612,7 @@ msgstr "深水码头"
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr "固定在河床上的木桩所支撑的木质平台。它非常牢固，预期寿命可能比你还长。"
 
@@ -156840,7 +160676,7 @@ msgstr "木地板"
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
 msgstr "木质楼板，由扎紧的木板钉牢而成。常见于露台。"
 
@@ -157147,7 +160983,7 @@ msgstr "辐射平台"
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr "一种双用途平台，用作收容装置，以及通过暂时吊装存放在其中的放射性物质，将物品暴露在放射源中的装置。 从外部控制台操作。"
 
@@ -157425,16 +161261,16 @@ msgstr "一棵在夏天能够结出樱桃果实的树，分类学上属于樱桃
 
 #: lang/json/terrain_from_json.py
 msgid "juniper tree"
-msgstr "桧树"
+msgstr "杜松子树"
 
 #. ~ Description for juniper tree
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
 "生长在新英格兰的\"刺柏属\"物种之一，杜松子从开花算起需生长两到三年。第二年为绿色浆果，最后，才生出广为人知的蓝色种类。如果你仔细检查树叶，你可能会找到一些可用的果簇。你可以用合适的工具砍倒它。"
 
@@ -157704,7 +161540,7 @@ msgstr "黄连木属的落叶树。它不是本地原生，而是人工栽培的
 
 #: lang/json/terrain_from_json.py
 msgid "almond tree"
-msgstr "杏仁树"
+msgstr "扁桃树"
 
 #. ~ Description for almond tree
 #: lang/json/terrain_from_json.py
@@ -157712,7 +161548,7 @@ msgid ""
 "A deciduous tree of the 'Prunus' genus.  This is a cultivated tree, and is "
 "not native to this region.  You could look for fresh almonds if you examined"
 " the tree more closely.  You could cut it down with the right tools."
-msgstr "李属的落叶树。它不是本地原生，而是人工栽培的。仔细搜索可以收获新鲜杏仁。可以用合适的工具砍倒它。"
+msgstr "李属的落叶树。它不是本地原生，而是人工栽培的。仔细搜索可以收获新鲜扁桃仁。可以用合适的工具砍倒它。"
 
 #. ~ Description for almond tree
 #: lang/json/terrain_from_json.py
@@ -157720,7 +161556,7 @@ msgid ""
 "A deciduous tree of the 'Prunus' genus.  This is a cultivated tree, and is "
 "not native to this region.  There are no almonds left to pick on the tree.  "
 "You could cut it down with the right tools."
-msgstr "李属的落叶树。它不是本地原生，而是人工栽培的。树上没留下可采收的杏仁。可以用合适的工具砍倒它。"
+msgstr "李属的落叶树。它不是本地原生，而是人工栽培的。树上没留下可采收的扁桃仁。可以用合适的工具砍倒它。"
 
 #: lang/json/terrain_from_json.py
 msgid "pecan tree"
@@ -157801,7 +161637,7 @@ msgstr "一小丛长着香脆花生的灌木丛。"
 #. ~ Description for peanut bush
 #: lang/json/terrain_from_json.py
 msgid "A small peanut bush that's fruitless."
-msgstr "一小丛没有花生果实的灌木丛。"
+msgstr "一小丛没有果实的花生丛。"
 
 #: lang/json/terrain_from_json.py
 msgid "blueberry bush"
@@ -157815,7 +161651,7 @@ msgstr "一小丛长着香甜蓝莓的灌木丛。"
 #. ~ Description for blueberry bush
 #: lang/json/terrain_from_json.py
 msgid "A small blueberry bush that's fruitless."
-msgstr "一小丛没有蓝莓果实的灌木丛。"
+msgstr "一小丛没有果实的蓝莓丛。"
 
 #: lang/json/terrain_from_json.py
 msgid "strawberry bush"
@@ -157829,7 +161665,7 @@ msgstr "一小丛长着多汁草莓的灌木丛。"
 #. ~ Description for strawberry bush
 #: lang/json/terrain_from_json.py
 msgid "A small strawberry bush that's fruitless."
-msgstr "一小丛没有草莓果实的灌木丛。"
+msgstr "一小丛没有果实的草莓丛。"
 
 #: lang/json/terrain_from_json.py
 msgid "blackberry bush"
@@ -157843,7 +161679,7 @@ msgstr "一小丛长着美味黑莓的灌木丛。当心上面的刺！"
 #. ~ Description for blackberry bush
 #: lang/json/terrain_from_json.py
 msgid "A small blackberry bush that's fruitless.  Watch out for its thorns!"
-msgstr "一小丛没有黑莓果实的灌木丛。当心上面的刺！"
+msgstr "一小丛没有果实的黑莓丛。当心上面的刺！"
 
 #: lang/json/terrain_from_json.py
 msgid "huckleberry bush"
@@ -157857,21 +161693,21 @@ msgstr "一小丛长着香甜越橘的灌木丛。经常被误认为蓝莓。"
 #. ~ Description for huckleberry bush
 #: lang/json/terrain_from_json.py
 msgid "A small huckleberry bush that's fruitless."
-msgstr "一小丛没有越橘果实的灌木丛。"
+msgstr "一小丛没有果实的越橘丛。"
 
 #: lang/json/terrain_from_json.py
 msgid "raspberry bush"
-msgstr "木莓丛"
+msgstr "树莓丛"
 
 #. ~ Description for raspberry bush
 #: lang/json/terrain_from_json.py
 msgid "A small bush of delicious raspberries.  Watch out for its thorns!"
-msgstr "一小丛长着美味木莓的灌木丛。当心上面的刺！"
+msgstr "一小丛长着美味树莓的灌木丛。当心上面的刺！"
 
 #. ~ Description for raspberry bush
 #: lang/json/terrain_from_json.py
 msgid "A small raspberry bush that's fruitless.  Watch out for its thorns!"
-msgstr "一小丛没有木莓果实的灌木丛。当心上面的刺！"
+msgstr "一小丛没有果实的树莓丛。当心上面的刺！"
 
 #: lang/json/terrain_from_json.py
 msgid "grape bush"
@@ -157880,13 +161716,13 @@ msgstr "葡萄丛"
 #. ~ Description for grape bush
 #: lang/json/terrain_from_json.py
 msgid "A bush of a different species invaded by vines of grapes."
-msgstr "一小丛被长着葡萄的葡萄藤包裹着的灌木丛。"
+msgstr "一丛爬满了葡萄藤的灌木。"
 
 #. ~ Description for grape bush
 #: lang/json/terrain_from_json.py
 msgid ""
 "A bush of a different species invaded by grape vines but they're fruitless."
-msgstr "一小丛被葡萄藤包裹着的灌木丛。"
+msgstr "一丛爬满了葡萄藤的灌木。藤上没有葡萄。"
 
 #: lang/json/terrain_from_json.py
 msgid "rose bush"
@@ -157897,13 +161733,13 @@ msgstr "玫瑰丛"
 msgid ""
 "A fat bush of beautiful red roses, if only you could get a date!  Watch out "
 "for its thorns!"
-msgstr "一小丛长着美丽红玫瑰的灌木丛，要是有个约会就好了。当心上面的刺！"
+msgstr "一大丛长着美丽红玫瑰的灌木丛，要是有个约会就好了。当心上面的刺！"
 
 #. ~ Description for rose bush
 #: lang/json/terrain_from_json.py
 msgid ""
 "A fat rose bush that currently has no blooms.  Watch out for its thorns!"
-msgstr "一小丛还没开玫瑰花的灌木丛。当心上面的刺！"
+msgstr "一大丛还没开花的玫瑰丛。当心上面的刺！"
 
 #: lang/json/terrain_from_json.py
 msgid "hydrangea bush"
@@ -157912,12 +161748,12 @@ msgstr "绣球花丛"
 #. ~ Description for hydrangea bush
 #: lang/json/terrain_from_json.py
 msgid "A fat, bush of fragrant blue hydrangeas."
-msgstr "一小丛长着芳香的蓝色绣球花的灌木丛。"
+msgstr "一大丛长着芳香的蓝色绣球花的灌木丛。"
 
 #. ~ Description for hydrangea bush
 #: lang/json/terrain_from_json.py
 msgid "A fat hydrangea bush that currently has no blooms."
-msgstr "一小丛还没开绣球花的灌木丛。"
+msgstr "一大丛还没开花的绣球花丛。"
 
 #: lang/json/terrain_from_json.py
 msgid "lilac bush"
@@ -157926,12 +161762,12 @@ msgstr "丁香花丛"
 #. ~ Description for lilac bush
 #: lang/json/terrain_from_json.py
 msgid "A wide, bush of bright pinkish purple lilacs."
-msgstr "一小丛长着鲜亮粉紫色丁香花的灌木丛。"
+msgstr "一大丛长着鲜亮粉紫色丁香花的灌木丛。"
 
 #. ~ Description for lilac bush
 #: lang/json/terrain_from_json.py
 msgid "A wide lilac bush that currently has no blooms."
-msgstr "一小丛还没开丁香花的灌木丛。"
+msgstr "一大丛还没开花的丁香花丛。"
 
 #: lang/json/terrain_from_json.py
 msgid "tree trunk"
@@ -158403,10 +162239,11 @@ msgstr "ATM机"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
 "为方便用户办理银行业务，这台自动柜员机在网络完全瘫痪时依旧能够继续自动运行。你可以向现金卡中存入资金，或将所有扣除通胀因素后的收入转移到同一张卡上。世事无常，今非昔比。银行曾经发生过挤兑，而这台机器上的凹痕和裂纹证明了这一点。"
 
@@ -158511,9 +162348,9 @@ msgstr "离心机"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
-msgstr "一台带有自动分析仪单元的离心机。 可将装有医用流体样本（例如血液）的试管放入其中进行分析。"
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
+msgstr "一台带有自动分析仪单元的离心机。 可将装有医用液体样本（例如血液）的试管放入其中进行分析。"
 
 #: lang/json/terrain_from_json.py
 msgid "CVD machine"
@@ -159122,7 +162959,7 @@ msgstr "树脂出入口（关）"
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
 msgstr "一个由某种潮湿、柔韧的树脂材料形成的三尖树舱盖。它已经关上了，但看上去只要用力推一把就能打开。"
@@ -159134,7 +162971,7 @@ msgstr "树脂出入口（开）"
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
 msgstr "一个由某种潮湿、柔韧的树脂材料形成的三尖树舱盖。它已经打开了，盖子似乎被某种细长而粘稠的物质拉住。"
@@ -159225,6 +163062,13 @@ msgid ""
 " were still running."
 msgstr "交通标志，用于指示水平铁路交叉口——如果火车还在运行。"
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr "和正常铁轨一样，只是更窄。你也许可以在上面开辆小火车。"
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "沙坑"
@@ -159293,7 +163137,7 @@ msgstr "落水管"
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr "一段从屋顶到地面的排水管道。它虽然看起来很脆弱， 但是你能够顺着它从这里爬上爬下。"
 
@@ -159305,7 +163149,7 @@ msgstr "落水管口"
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
 msgstr "一段从屋顶到地面的排水管道，你可以在它下方放一个容器来收集雨水。它虽然看起来很脆弱， 但是你能够顺着它从这里爬上爬下。"
 
@@ -160091,7 +163935,7 @@ msgstr "支柱（半成品）"
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr "一个柱形的空心木制框架，建造在钢筋混凝土构成的地基之上。它不能支撑屋顶或遮蔽物，需要更多的资源才能被建造完成。"
 
@@ -161070,7 +164914,7 @@ msgid ""
 "The Examine command is useful for grabbing items off window frames, around "
 "corners, etc.  It's also used for interacting with a few terrain types.  "
 "Interactive terrain is usually designated with a '6' symbol."
-msgstr "检查功能键可以用来拉下窗帘，搜寻隐藏物件等等。同时也可以与某些特殊地形互动，特殊地形通常以\"6\"为标记。"
+msgstr "检查功能键可以用来拉下窗帘，获取隐藏物件等等。同时也可以与某些特殊地形互动，特殊地形通常以\"6\"为标记。"
 
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
@@ -161257,9 +165101,9 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
-"你刚刚激活一个手雷！你最好赶快把它扔了。要投掷一个道具，按\"t\"键，然后选择要扔的道具。最大投掷范围取决于在你的力量和投掷物的重量和体积。在大多数战斗中投掷不是很好的选择，但是如果你有一些NB的火力…"
+"你刚刚激活一个手雷！你最好赶快把它扔了。要投掷一个道具，按\"t\"键，然后选择要扔的道具。最大投掷范围取决于在你的力量和投掷物的重量和体积。在大多数战斗中投掷不是很好的选择，但是如果你有一些NB的火力……"
 
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
@@ -161333,7 +165177,7 @@ msgstr "现在一片黑暗！幸运的是，你有一个手电筒。按\"a\"键
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr "\"~\"是一个表示水的地形符号。通过这样的水源，你能装满任何容器。按\"e\"查看水源所在地并按\"c\"选择灌入容器，之后选择需要灌水的水密容器。"
@@ -161682,6 +165526,10 @@ msgstr "六座机动轨道车"
 msgid "Rail Motorcycle"
 msgstr "轨道摩托车"
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr "微缩火车"
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "平板卡车"
@@ -162476,7 +166324,7 @@ msgstr "绑好的床垫"
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
 msgstr "一个绑到载具上的床垫，可以用来吸收冲击。"
 
 #. ~ Description for shredder
@@ -162945,8 +166793,8 @@ msgstr "一台小型车载洗衣机。只要你有洗涤剂、水和一些电，
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr "一台小型车载洗衣机。只要你有洗涤剂、水和一些电，你可以洗干净许多盘子……或者洗掉CBM上面的丧尸血肉。按\"e\"后选择该部件所在位置来使用它。"
 
 #. ~ Description for autoclave
@@ -163130,7 +166978,7 @@ msgstr "一个小型风力发电机。当暴露于大风下时，会缓慢地为
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
 msgstr "一个大型风力发电机。当暴露于大风下时，会缓慢地为车辆电池充电。会额外增加车辆的阻力。"
 
@@ -163666,6 +167514,14 @@ msgstr "一个坚固的金属火车轮。凸出的轮缘有助于保持在轨道
 msgid "rail wheel (steerable)"
 msgstr "导轨轮（可转向）"
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr "坚固的窄轨铁路车轮。在窄轨铁路上性能很好，但如果不在轨道上，它会表现得非常糟糕，甚至都不能转向。"
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "辊筒"
@@ -165355,6 +169211,10 @@ msgstr "维生素B12"
 msgid "Vitamin C"
 msgstr "维生素C"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr "毒素"
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr "按 "
@@ -165844,7 +169704,7 @@ msgstr "你为%s重新上弹。"
 msgid "You refill the %s."
 msgstr "你重新装填了%s。"
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "这里没有可以点燃的东西。"
 
@@ -165860,6 +169720,16 @@ msgstr "你丢失了用于点火的物品。"
 msgid "There is not enough sunlight to start a fire now.  You stop trying."
 msgstr "现在的阳光不足以点火，你停止了尝试。"
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr "你获取了一点点关于法术\"%s\"的经验。"
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "你学会了%s。"
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -165870,11 +169740,6 @@ msgstr "你完成了 %s 的训练并将其提升至 %d 级。"
 msgid "You get some training in %s."
 msgstr "你完成了 %s 的训练。"
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "你学会了%s。"
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr "你已经将电池充满电了。"
@@ -165990,15 +169855,22 @@ msgstr "伤害几率：<color_light_blue>%.1f</color>%%"
 msgid "Your %s is already fully repaired."
 msgstr "你的%s已经是完好的了。"
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr "你目前无法修复%s。"
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgstr "你解冻了食物，并没有加热，因为它冷的时候口感更好。"
+
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr "你解冻并加热了食物。"
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr "你加热了食物。"
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
-msgstr "你成功修复了%s！"
+msgid "You are currently unable to mend the %s."
+msgstr "你目前无法修复%s。"
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -166300,7 +170172,7 @@ msgstr "你完成了钻孔。"
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr "哼哧！"
 
@@ -166902,11 +170774,11 @@ msgid ""
 msgstr "力量-1；智力-1；"
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
 msgstr "感知-1；智力-1；频繁犯瘾。"
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
 msgstr "感知-2；智力-2；频繁犯瘾。"
 
 #: src/addiction.cpp
@@ -167091,38 +170963,6 @@ msgstr "来源 数量 重量 体积"
 msgid "Name (charges)"
 msgstr "物品名称（份量）"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "无拖拽载具！"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "无拖拽载具！"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "无效容器！"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "周边9格"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr "<color_white_red>着火！</color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr "危险！"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr "陷阱！"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr "水！"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -167244,7 +171084,39 @@ msgstr "目的地只能容纳 %d！要移动多少？[目前有 %d]（输入 0 
 msgid "The destination is already full!"
 msgstr "目标区域已满！"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "无拖拽载具！"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "无拖拽载具！"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "无效容器！"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "周边9格"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr "<color_white_red>着火！</color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr "危险！"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr "陷阱！"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr "水！"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "无效容器"
 
@@ -167368,6 +171240,14 @@ msgstr "钝击防护："
 msgid "Cut:"
 msgstr "斩击防护："
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr "防酸："
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr "防火："
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "环境防护："
@@ -168064,13 +171944,13 @@ msgstr "%s苦难"
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
+"  Seeing this is a bug!"
 msgstr "%s充能条件未被满足，虽然它并没有充能条件。你能看见它说明出BUG了！"
 
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
 msgstr "%s充能条件已被满足，虽然它并没有充能条件。你能看见它说明出BUG了！"
 
@@ -168097,7 +171977,7 @@ msgstr "你把%s紧紧贴在身上。"
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr "%s在对你白日发梦感到困惑。你能看见它说明出BUG了！"
 
 #: src/artifact.cpp
@@ -168880,6 +172760,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr "从 %2$s 拔出 %1$s？"
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr "对你的 %s 做什么？"
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr "你缩在龟壳里无法移动。先把你的小头小脚钻出来先。"
@@ -169012,12 +172897,14 @@ msgid "The %s must be attached to a gun, it can not be fired separately."
 msgstr "这个%s必须加装在枪械上，它无法单独开火。"
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
-msgstr "你无法射击。"
+#, c-format
+msgid "You can no longer fire your %s."
+msgstr "你无法继续射击%s。"
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "你需要空出手来操作。"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr "你在驾驶载具时不能使用%s！"
 
 #: src/avatar_action.cpp
 #, c-format
@@ -169025,8 +172912,9 @@ msgid "You need two free hands to fire your %s."
 msgstr "你需要空着双手来射击你的%s。"
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "你需要重新装填！"
+#, c-format
+msgid "Your %s is empty!"
+msgstr "你的%s已经空了！"
 
 #: src/avatar_action.cpp
 #, c-format
@@ -169037,18 +172925,20 @@ msgstr "你的%s至少需要 %i 点能量才能射击。"
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
-msgstr "你需要一个至少有 %d 单位电量的UPS，或一个至少有 %d 单位电量的高级UPS才能射击！"
+"charges to fire the %s!"
+msgstr "你需要一个至少有 %d 单位电量的UPS，或一个至少有 %d 单位电量的高级UPS才能击发%s！"
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
-msgstr "你的机甲的电量耗尽，武器无法发射。"
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
+msgstr "你的机甲的电量耗尽，无法击发%s。"
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
-msgstr "你需要站在有效地形/家具附近才能使用这把武器。诸如桌子、土堆、破窗户等。"
+msgstr "你需要站在有效地形或家具的附近才能使用%s。诸如桌子、土堆、破窗户等。"
 
 #: src/avatar_action.cpp
 #, c-format
@@ -169288,6 +173178,16 @@ msgstr "你的%s自动关闭了！"
 msgid "Your %s automatically turns off."
 msgstr "你的%s自动关闭了！"
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr "湿度不足，%s 无法启动。"
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr "%s 发出了湿度过低的警告。插件性能会有所下降。"
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "你改变主意，将其关闭。"
@@ -169405,10 +173305,6 @@ msgstr "血液分析结果"
 msgid "No effects."
 msgstr "没有效果。"
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr "这里的空气太干，没有足够的水分以生成液态水。"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr "你的动力齿轮紧紧锁在了你的关节上。"
@@ -169421,10 +173317,6 @@ msgstr "在关节伺服电机的帮助下，你现在可以跑得更快了。"
 msgid "Start a fire where?"
 msgstr "在哪里生火？"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "你无法在此点火。"
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -169599,6 +173491,20 @@ msgstr "你的%s自动关闭以节省燃料。"
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr "<npcname>的%s自动关闭以节省燃料。"
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr "你体内储存的卡路里低于安全门槛，%s 自动关闭以保持健康。"
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr "<npcname> 体内储存的卡路里低于安全门槛，%s 自动关闭以保持健康。"
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -169627,6 +173533,21 @@ msgstr "%s已经失去连接并关闭了。"
 msgid "You feel your throat open up and air filling your lungs!"
 msgstr "你感觉到你的喉咙通气了，空气充满了你的肺！"
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr "目前湿度不足以让 %s 工作。"
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr "%s 发出了湿度过低的警告。插件性能会有所下降。"
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr "你已经补充了足够的水分。%s 发出悦耳的提示音。"
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr "移除生化插件失败了，但你安然无恙。"
@@ -169924,17 +173845,17 @@ msgstr "."
 #: src/bionics_ui.cpp src/panels.cpp src/units.h
 msgctxt "energy unit: kilojoule"
 msgid "kJ"
-msgstr "千焦"
+msgstr "kJ"
 
 #: src/bionics_ui.cpp src/panels.cpp src/units.h
 msgctxt "energy unit: joule"
 msgid "J"
-msgstr "焦"
+msgstr "J"
 
 #: src/bionics_ui.cpp src/panels.cpp src/units.h
 msgctxt "energy unit: millijoule"
 msgid "mJ"
-msgstr "毫焦"
+msgstr "mJ"
 
 #: src/bionics_ui.cpp
 #, c-format
@@ -170394,9 +174315,13 @@ msgstr "唰哗轰嘭砰嘘飕哗铛咔嗒叮吱嗞啦噗哒嗒哗啦呼噜噼啪
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
+msgid "You"
 msgstr "你"
 
+#: src/character.cpp
+msgid "Your"
+msgstr "你的"
+
 #: src/character.cpp
 msgid "your"
 msgstr "你的"
@@ -170627,6 +174552,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr "你将 %1$s 放进 %2$s。"
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr "你不能将物品放在那里！"
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr "<npcname> 不能将物品放在那里！"
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -170650,10 +174583,20 @@ msgstr "你需要 %1$s 才能用你的 %3$s 来使用 %2$s。"
 msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr "<npcname> 需要 %1$s 才能用 %3$s 来使用 %2$s。"
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr "你不能放下你的 %s。"
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr "你携带的液体洒到了地上。"
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr "你当前的健康值为 %d。"
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "极度脱水！"
@@ -170723,6 +174666,75 @@ msgstr "精疲力尽"
 msgid "Your %s bionic shorts out!"
 msgstr "你的%s生化插件短路了！"
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "你的%s在不久就会被冻伤。"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "你的%s在短时间内会被冻伤。"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr "你的%s将会随时被冻伤！"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr "你感到你的%s因为寒冷而变得麻木！"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr "你感到你的%s变得非常冷。"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr "你感到你的%s变得很冷。"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr "你感到你的%s由于高温变得火热！"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr "你感到你的%s变得非常热。"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr "你感到你的%s开始升温。"
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "你的%s被风吹得冷飕飕的。"
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr "风力很强，你应该为你的 %s 穿上点防风的衣物。"
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr "你的衣物无法为你的 %s 提供足够的防风保护！"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "左臂"
@@ -170887,8 +174899,8 @@ msgstr "健~康~"
 msgid "Big"
 msgstr "大~个~"
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "普通"
 
@@ -170992,6 +175004,30 @@ msgstr "积极运动"
 msgid "EXTRA_EXERCISE"
 msgstr "海量运动"
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr "你的身体由于负重过高而感到疼痛！"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] "你的 %s 需要一个至少有 %d 单位电量的UPS才能工作。"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] "你的 %s 有 %d 单位电量，但需要 %d 单位。"
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "你咳得很厉害。"
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "一阵干咳。"
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr "你想要叫喊，但你没有面具！"
@@ -171171,6 +175207,20 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr "进入冬眠。"
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr "借助于CQB生化插件的大量练习，你学会了 %s。"
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr "%s 选择武术流派。"
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "无流派"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "禁止自动拾取"
@@ -171215,260 +175265,6 @@ msgid ""
 "this area."
 msgstr "队友只会调查从这个区域传来，且在视野外的声音。"
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr "战利品：待整理"
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr "待整理的战利品所在区域。你可以使用\"整理战利品\"指令自动将该区域内的物品分类。可以与其他战利品区域叠加。"
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr "战利品：食物"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr "所有消耗品的分类放置区域。如果未定义专用食品区，则食品也会被分类至该区域。"
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr "战利品：易腐食物"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr "所有易腐消耗品的分类放置区域。如果未定义专用易腐饮料区，则易腐饮料也会被分类至该区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr "战利品：饮料"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr "所有饮料的分类放置区域。如果未定义专用易腐饮料区，则易腐饮料也会被分类至该区域。"
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr "战利品：易腐饮料"
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr "所有易腐饮料的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr "战利品：枪械"
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr "所有枪械弓弩和远程武器的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr "战利品：弹匣"
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr "所有弹匣的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr "战利品：弹药"
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr "所有弹药的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr "战利品：武器"
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr "所有近战武器的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr "战利品：工具"
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr "所有工具的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr "战利品：服装"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr "所有衣物的分类放置区域。如果未定义专用肮脏衣物区，则肮脏衣物也会被分类至该区域。"
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr "战利品：肮脏服装"
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr "所有肮脏衣物的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr "战利品：药品"
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr "所有药品和其他医疗用品的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr "战利品：书籍"
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr "所有书籍杂志的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr "战利品：模组"
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr "所有枪械模组和类似物品的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr "战利品：诱变剂"
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr "所有诱变剂、血清、净化剂的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr "战利品：生化插件"
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr "所有生化插件CBM的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr "战利品：载具部件"
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr "所有载具部件的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr "战利品：其他"
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr "所有其他物品的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr "战利品：燃料"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr "所有汽油、柴油、灯油和其他燃料的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr "战利品：种子"
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr "所有种子、块茎及类似物品的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr "战利品：化学品"
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr "所有化学制品的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr "战利品：零件"
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr "所有零件的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr "战利品：神器"
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr "所有神器的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr "战利品：尸体"
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr "所有尸体的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr "战利品：装备"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr "所有装备的分类放置区域。如果未定义专用肮脏装备区，则肮脏装备也会被分类至该区域。"
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr "战利品：肮脏装备"
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr "所有肮脏装备的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr "战利品：木材"
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr "所有柴火和类似物品的分类放置区域。"
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr "战利品：自定义"
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr "自定义物品的分类放置区域。你可以编辑具体的筛选条件。"
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr "战利品：已忽略区"
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr "使用\"整理战利品\"指令将不会整理该区域内的物品。"
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr "标记：柴火源"
@@ -171476,7 +175272,7 @@ msgstr "标记：柴火源"
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
 msgstr "该区域内的柴火及其他可燃物品将会在需要时自动为附近的火堆补充燃料。用于在长时间操作时维持光照条件，例如制造物品，阅读书籍，或是等待。"
 
@@ -171536,6 +175332,16 @@ msgstr "载具巡逻区"
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr "装有自动驾驶仪的载具将会在此区域内巡逻。"
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr "营地：储物区"
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr "该区域内的物品将被视为营地库存供营地工作者使用。"
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
 msgstr "营地：食物"
@@ -172111,7 +175917,7 @@ msgstr "  >> 初始化辅助传感器：盖革计数……"
 
 #: src/computer.cpp
 msgid "  >> Radiation spike detected!\n"
-msgstr ">> 检测到辐射尖峰！\n"
+msgstr "  >> 检测到辐射尖峰！\n"
 
 #: src/computer.cpp
 msgid "WARNING [912]: Catastrophic malfunction!  Contamination detected!"
@@ -172880,24 +176686,6 @@ msgstr "你所食用的%s中摄取的能量正在以肉眼可见的速度修复
 msgid "<npcname> looks better after eating the %s."
 msgstr "<npcname>吃了%s以后，看起来好多了。"
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "你的生化能量已经充满。"
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr "<npcname> 的生化能量已经充满。"
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr "你用%s给自己充能。"
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr "<npcname>用%s给自己充能。"
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr "钚剂量过大，你真的确定要这么多么？"
@@ -173893,6 +177681,10 @@ msgstr "切换显示气味视图"
 msgid "Toggle display temperature"
 msgstr "切换显示温度"
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr "切换显示载具自动驾驶信息"
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr "切换显示能见度"
@@ -173933,6 +177725,10 @@ msgstr "在地图上切换NPC寻路"
 msgid "Print faction info to console"
 msgstr "输出派系信息至控制台"
 
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr "输出 NPC 魔法信息至控制台"
+
 #: src/debug_menu.cpp
 msgid "Test weather"
 msgstr "测试天气"
@@ -174216,6 +178012,10 @@ msgstr "查看状态"
 msgid "t[e]leport"
 msgstr "短距传送"
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr "[f]患上流感"
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr "编辑任务（警告：不稳定！）"
@@ -174794,7 +178594,7 @@ msgstr "没有法术可学。你需要启用一些魔法类模组来添加可用
 msgid ""
 "You have become an Archwizardpriest!  What will you do with your newfound "
 "power?"
-msgstr "你已经成为了一名大巫师！你将如何利用你新发现的力量？"
+msgstr "你已经成为了一名大魔法师！你将如何利用你新发现的力量？"
 
 #: src/debug_menu.cpp
 msgid "Try learning some spells first."
@@ -174804,10 +178604,12 @@ msgstr "需要先学习一些法术。"
 msgid "Spell"
 msgstr "法术"
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
 msgstr "等级"
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
 msgstr "最大"
@@ -176835,6 +180637,14 @@ msgstr "，营地主管"
 msgid "%s has abandoned the camp."
 msgstr "%s废弃了其所管理的营地。"
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr "扩展区"
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr "召回同伴（"
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -176860,87 +180670,6 @@ msgstr ""
 "耗时：最低 3 小时\n"
 "位置：%d/3\n"
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-"说明：\n"
-"向你营地里的同伴分发食物并装进储藏室。营地中必须已经设置有一个营地食物区、待整理区和至少一个储存目的地区，否则系统将提示使用区域管理菜单创建这些区域。\n"
-"效果：\n"
-"> 增加你派系的食物供应价值，同时也能作为劳动者的报酬\n"
-"\n"
-"食物的享受度必须 >= -6\n"
-"易腐食物按照腐烂时间换算：\n"
-"> 已腐烂：0 %%\n"
-"> 两天内腐烂：60%%\n"
-"> 五天内腐烂：80%%\n"
-"\n"
-"当前派系食物供给： %d 千卡\n"
-"或 %d 天口粮"
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr "分发食物"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-"说明：\n"
-"重置 [干杂活] 任务中所搬运整理的各类物品的储存目的地。\n"
-"\n"
-"效果：\n"
-"> 使用区域管理菜单分配储存目的地。营地中必须已经设置有一个营地食物区、待整理区和至少一个储存目的地区。\n"
-"> 只有在待整理区且不在其他区域中的物品才会被分类。\n"
-"没有对应储存目的地区域的物品将使用自动区域分类的常规规则进行分类。"
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr "重置物品储存点"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-"说明：\n"
-"给这个营地中已指派的同伴分配可重复进行的工作。\n"
-"需求：无\n"
-"效果：\n"
-"\n"
-"\n"
-"风险：无\n"
-"耗时：持续"
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr "分配工作"
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -176999,36 +180728,6 @@ msgstr ""
 "耗时：3 小时\n"
 "位置：%d/1\n"
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-"说明：\n"
-"你的营地规模已经足够支持建设一块新的扩展区。扩展区将为你解锁许多新的任务，但会花费更多资源并消耗更多时间。谨慎选择你的扩展区，每个营地最多支持建设8块扩展区。\n"
-"\n"
-"技能：制造\n"
-"需求等级：无\n"
-"效果：\n"
-"> 选择一块可用的扩展区区块。从农场开始始终都是一个可靠的选择，食物被用来支付同伴的任务花费而建设它不需要很多资源。只要一笔投资，就能建设一间工房来快速拆解大型载具，或者一间铁匠铺来获得大量木炭。\n"
-"\n"
-"注意：扩展区新增功能位于营地主管页面扩展区所对应的标签页内。\n"
-"\n"
-"风险：无\n"
-"耗时：3 小时\n"
-"位置：%d/1\n"
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -177173,7 +180872,7 @@ msgid ""
 "Positions: %d/3\n"
 msgstr ""
 "说明：\n"
-"选择一名同伴去搜寻野果。\n"
+"选择一名同伴去采集野果。\n"
 "\n"
 "技能：生存\n"
 "需求等级：N/A\n"
@@ -177308,14 +181007,6 @@ msgstr ""
 "耗时：往返时间\n"
 "位置：%d/3\n"
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr "扩展区"
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr "召回同伴（"
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -177450,6 +181141,95 @@ msgstr ""
 "耗时：3 分钟/地块\n"
 "位置：0/1\n"
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+"说明：\n"
+"你的营地规模已经足够支持建设一块新的扩展区。扩展区将为你解锁许多新的任务，但会花费更多资源并消耗更多时间。谨慎选择你的扩展区，每个营地最多支持建设8块扩展区。\n"
+"\n"
+"技能：制造\n"
+"需求等级：无\n"
+"效果：\n"
+"> 选择一块可用的扩展区区块。从农场开始始终都是一个可靠的选择，食物被用来支付同伴的任务花费而建设它不需要很多资源。只要一笔投资，就能建设一间工房来快速拆解大型载具，或者一间铁匠铺来获得大量木炭。\n"
+"\n"
+"注意：扩展区新增功能位于营地主管页面扩展区所对应的标签页内。\n"
+"\n"
+"风险：无\n"
+"耗时：3 小时\n"
+"位置：%d/1\n"
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+"说明：\n"
+"向你营地里的同伴分发食物并装进储藏室。营地中必须已经设置有一个营地食物区及一个营地储物区，否则系统将提示使用区域管理菜单创建这些区域。\n"
+"效果：\n"
+"> 增加你派系的食物储备，食物储备会作为报酬支付给工人\n"
+"\n"
+"食物的享受度必须 >= -6\n"
+"易腐食物按照腐烂时间换算：\n"
+"> 已腐烂：0 %%\n"
+"> 两天内腐烂：60%%\n"
+"> 五天内腐烂：80%%\n"
+"\n"
+"当前派系食物储备： %d 千卡\n"
+"或 %d 天口粮"
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr "分发食物"
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+"说明：\n"
+"给这个营地中已指派的同伴分配可重复进行的工作。\n"
+"需求：无\n"
+"效果：\n"
+"\n"
+"\n"
+"风险：无\n"
+"耗时：持续"
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr "分配工作"
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -177466,6 +181246,10 @@ msgstr ""
 "\n"
 "同伴必须在执行任务至少24小时后才能进行紧急召回。"
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr "离队去勘测选址了……"
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr "离队去寻找物资了……"
@@ -177488,7 +181272,7 @@ msgstr "向藏匿点运送补给归来……"
 
 #: src/faction_camp.cpp
 msgid "departs to search for edible plants…"
-msgstr "离队去搜寻植物了……"
+msgstr "离队去采集野果了……"
 
 #: src/faction_camp.cpp
 msgid "departs to set traps for small animals…"
@@ -177502,10 +181286,6 @@ msgstr "离队去狩猎动物了……"
 msgid "departs to search for recruits…"
 msgstr "离队去招募人手了……"
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr "离队去勘测选址了……"
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr "带着一些物品归来……"
@@ -177789,10 +181569,10 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
-"名字： %20s\n"
+"姓名： %s\n"
 "\n"
 
 #: src/faction_camp.cpp
@@ -177972,12 +181752,11 @@ msgstr "你没有足够的分类区域。是否创建？"
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
+"create a camp food zone, and a camp storage zone."
 msgstr ""
 "分类区域已更改。\n"
 "请创建一些分类区域。\n"
-"你必须为营地创建\"营地：食物区\"、\"战利品：待整理区\"和至少一个战利品目标储存区。"
+"你必须为营地创建\"营地：食物区\"及\"营地：储物区\"。"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -178006,18 +181785,18 @@ msgstr "> 总行程：%15d（米）\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
-msgstr "> 路程：  %23s\n"
+msgid ">Travel:  %s\n"
+msgstr "> 旅途：  %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
-msgstr "> 工作：  %23s\n"
+msgid ">Working: %s\n"
+msgstr "> 工作：  %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
-msgstr "共计：    %23s\n"
+msgid "Total:    %s\n"
+msgstr "总耗时：  %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -178091,8 +181870,8 @@ msgstr "需犁地："
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
-msgstr "载具名称：%25s\n"
+msgid "Name:     %s\n"
+msgstr "名称：    %s\n"
 
 #: src/faction_camp.cpp
 msgid "----          Engines          ----\n"
@@ -178100,8 +181879,8 @@ msgstr "----           引擎            ----\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
-msgstr "引擎：   %25s\n"
+msgid "Engine:   %s\n"
+msgstr "引擎：    %s\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -178110,8 +181889,8 @@ msgstr "> 状态：  %24d%%\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
-msgstr "> 燃料：  %25s\n"
+msgid ">Fuel:    %s\n"
+msgstr "> 燃料：  %s\n"
 
 #: src/faction_camp.cpp
 msgid "----  Fuel Storage & Battery   ----\n"
@@ -179557,7 +183336,7 @@ msgstr "你至少需要一个%s才能重新装填%s！"
 msgid "The %s is already full!"
 msgstr "%s已经满了！"
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr "你不能重新装填%s！"
@@ -179645,6 +183424,19 @@ msgstr "那里有%s，确定进入？"
 msgid "Your %s refuses to move over that ledge!"
 msgstr "你的%s拒绝移动到那上面！"
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr "你钻不进这里。"
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr "你的坐骑钻不进这里。"
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr "你不能移动，因为你的%s不能移动。"
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "找不到抓着的东西。"
@@ -179836,6 +183628,16 @@ msgstr "%s太重了，你在试图移动它时扭伤了自己！"
 msgid "There's stuff in the way."
 msgstr "有些东西挡住了你。"
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr "%s太沉了！"
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr "你没能移动%s。"
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -180145,7 +183947,7 @@ msgid ""
 "characters (e.g. empty boxes or question marks). You have been warned."
 msgstr "你似乎缺少有效的Unicode locale。你可能会看到一些奇怪的字符（如空盒或问号）。我已经警告过你了。"
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr "你突然感觉到一阵莫名剧痛。"
 
@@ -180429,10 +184231,6 @@ msgstr "新鲜度"
 msgid "SPOILS IN"
 msgstr "腐坏于"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "电量"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "核反应堆"
@@ -180457,10 +184255,6 @@ msgstr "无法喝下已洒出的液体"
 msgid "Your biology is not compatible with that item."
 msgstr "你的生物特性与那件物品不兼容。"
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr "你的生化能量已达上限"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -180552,10 +184346,6 @@ msgid "Needs at least %d charge"
 msgid_plural "Needs at least %d charges"
 msgstr[0] "需要至少 %d 单位电量"
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr "…"
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "使用物品"
@@ -180772,11 +184562,6 @@ msgstr "<color_yellow>可用麻醉箱：%i</color>"
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr "<color_yellow>可用麻醉剂：%imL</color>"
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr "<color_yellow>可用现金：%s</color>"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -180932,7 +184717,7 @@ msgstr "防御模式"
 
 #: src/gates.cpp
 msgid "There's some buffoon in the way!"
-msgstr "一个傻逼挡住路了！"
+msgstr "一个傻子挡住路了！"
 
 #: src/gates.cpp
 #, c-format
@@ -181900,8 +185685,8 @@ msgid "Purchase cash card?"
 msgstr "购买现金卡？"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
-msgstr "账户中需要有至少 $1.00 来购买现金卡。"
+msgid "You need $10.00 in your account to purchase a card."
+msgstr "账户中需要有至少 $10.00 来购买现金卡。"
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -181943,8 +185728,8 @@ msgstr "你的账户现在存有 %s。"
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
-msgstr "这将自动从您的银行账户中扣除 $1.00。是否继续？"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
+msgstr "这将自动从您的银行账户中扣除 $10.00。是否继续？"
 
 #: src/iexamine.cpp
 msgid "You can only deposit money from charged cash cards!"
@@ -182223,8 +186008,9 @@ msgid "The gun safe stumps your efforts to pick it."
 msgstr "你想撬开枪用保险柜的锁，但锁赢了。"
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
-msgstr "你要是有把撬棍就好了……"
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
+msgstr "%s上锁了。你要是有把撬棍就好了……"
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
 #: src/iexamine.cpp
@@ -182232,6 +186018,16 @@ msgstr "你要是有把撬棍就好了……"
 msgid "You attempt to pry open the %1$s using your %2$s…"
 msgstr "你尝试使用 %2$s 撬开 %1$s……"
 
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
+msgstr "%s上锁了。要是有什么东西能开锁就好了……"
+
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr "你尝试使用 %2$s 打开 %1$s 的锁……"
+
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
 msgstr "公告牌不在营地里"
@@ -182692,6 +186488,10 @@ msgstr "你试图用 %s 生火……"
 msgid "You weren't able to start a fire."
 msgstr "你没能生火。"
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "你无法在此点火。"
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -182946,7 +186746,7 @@ msgstr "搜寻 %s？"
 #: src/iexamine.cpp
 #, c-format
 msgid "You forage through the %s."
-msgstr "你搜寻了 %s。"
+msgstr "你搜寻并采集了 %s。"
 
 #: src/iexamine.cpp
 msgid "Recycle what metal?"
@@ -183377,6 +187177,20 @@ msgstr "全自动医疗仪正在对%s进行手术。"
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr "全自动医疗仪 XI 型。系统状态：已启动。请选择操作"
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr "警告：未找到操作者"
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+"\n"
+"在无操作者的情况下使用全自动医疗仪可能导致<color_light_cyan>严重损伤</color>甚至<color_light_cyan>死亡</color>。\n"
+"继续手术将意味着您已了解上述风险，并已承诺在发生医疗事故时，不会对本设备所属法人采取任何法律措施。"
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr "选择要安装的生化插件"
@@ -183899,6 +187713,10 @@ msgstr "大地图连接"
 msgid "Overmap specials"
 msgstr "大地图特殊地形"
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "大地图地点"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr "载具原型"
@@ -183955,6 +187773,10 @@ msgstr "收获列表"
 msgid "Anatomies"
 msgstr "身体构造"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "变异"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "贴图包"
@@ -183999,18 +187821,10 @@ msgstr "职业"
 msgid "Scenarios"
 msgstr "场景"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "变异"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "变异类别"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "大地图地点"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr "地图事件"
@@ -184374,14 +188188,6 @@ msgstr "%1$d / %2$d"
 msgid "Page %d/%d"
 msgstr "页 %d/%d"
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "穿戴物品"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "手持武器"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -184813,9 +188619,9 @@ msgstr "* 这份食物已经开始<neutral>腐坏</neutral>，但你的<info>变
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
-msgstr "* 这份食物已经开始<bad>腐坏</bad>，<info>吃这东西</info>是个<bad>坏主意</bad>。"
+msgstr "※这份食物已经开始<bad>腐坏</bad>，<info>吃这东西</info>是个<bad>坏主意</bad>。"
 
 #: src/item.cpp
 #, c-format
@@ -184885,11 +188691,6 @@ msgstr "* 这种弹药 <good>不会哑火</good>。"
 msgid "This ammo <neutral>starts fires</neutral>."
 msgstr "* 这种弹药 <neutral>可以生火</neutral>。"
 
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr "已启用的 <info>配件（%s）<info> 属性已经显示。"
-
 #: src/item.cpp
 msgid "Skill used: "
 msgstr "技能："
@@ -185028,8 +188829,9 @@ msgid "Used on: "
 msgstr "用于："
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "位置： "
+#, c-format
+msgid "Location: %s"
+msgstr "位置：%s"
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -185538,43 +189340,46 @@ msgid ""
 msgstr "* 这件装备<bad>太小</bad>，<bad>不适合</bad>你。"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
-msgstr "* 这件装备<info>可以改大码</info>。"
+msgid "<info>can be upsized</info>"
+msgstr "<info>可以改大码</info>"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
-msgstr "* 这件装备<info>可以改小码</info>。"
+msgid "<info>can be downsized</info>"
+msgstr "<info>可以改小码</info>"
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
-msgstr "* 这件装备<bad>不能改小码</bad>。"
+msgid "<bad>can not be downsized</bad>"
+msgstr "<bad>不能改小码</bad>"
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
-msgstr "* 这件装备<bad>不能改大码</bad>。"
+msgid "<bad>can not be upsized</bad>"
+msgstr "<bad>不能改大码</bad>"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
-msgstr "* 这件装备<info>可以改合身</info>而且<info>可以改大码</info>。"
+#, c-format
+msgid "* This clothing %s."
+msgstr "* 这件装备%s。"
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
-msgstr "* 这件装备<info>可以改合身</info>而且<info>可以改小码</info>。"
+msgid " and <info>upsized</info>"
+msgstr "以及<info>改大码</info>"
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
-msgstr "* 这件装备<info>可以改合身</info>但是<bad>不能改小码</bad>。"
+msgid " and <info>downsized</info>"
+msgstr "以及<info>改小码</info>"
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
-msgstr "* 这件装备<info>可以改合身</info>但是<bad>不能改大码</bad>。"
+msgid " but <bad>not downsized</bad>"
+msgstr "，但是<bad>不能改小码</bad>"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
-msgstr "* 这件装备<info>可以改合身</info>。"
+msgid " but <bad>not upsized</bad>"
+msgstr "，但是<bad>不能改大码</bad>"
+
+#: src/item.cpp
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
+msgstr "* 这件装备<info>可以改合身</info>%s。"
 
 #: src/item.cpp
 msgid "* This clothing <bad>can not be refitted, upsized, or downsized</bad>."
@@ -185659,6 +189464,19 @@ msgstr "* 这件物品接受到<info>无线电信号</info>后会立即启动<ne
 msgid "This bionic is installed in the following body part(s):"
 msgstr "该生化插件将被安装在以下的身体部位︰"
 
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] "* 这个生化插件能使用以下燃料供能："
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr "<num> mJ"
+
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr "<bold>生化能量容量：</bold>"
+
 #: src/item.cpp
 msgid "<bold>Encumbrance:</bold> "
 msgstr "<bold>累赘度：</bold>"
@@ -185777,6 +189595,11 @@ msgstr "你可以用它制作不同的物品。"
 msgid "You could use it to craft: %s"
 msgstr "可用于制作：%s"
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr "已启用的 <info>配件（%s）<info> 属性已经显示。"
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -186945,7 +190768,7 @@ msgid "You do not have that item!"
 msgstr "你没有这个东西！"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
+msgid "Which signal should activate the item?"
 msgstr "物品激活信号："
 
 #: src/iuse.cpp
@@ -187188,16 +191011,6 @@ msgstr "咳咳咳咳咳咳！"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr "你关闭了噪音发生器，同时可怕的噪音也随之消失了。"
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr "你掌握了 %s 的真谛。"
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr "%s 选择武术流派。"
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr "你撬开了栅栏柱。"
@@ -187618,18 +191431,27 @@ msgid "Scan the ground"
 msgstr "扫描地面"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "扫描自己"
+msgid "Scan yourself or other person"
+msgstr "扫描自己/他人"
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "打开连续扫描"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr "扫描谁？"
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr "辐射水平：%dmSv（%dmSv 来自物品）"
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr "%s 辐射水平：%dmSv（%dmSv 来自物品）"
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -187697,6 +191519,10 @@ msgstr "滴答！"
 msgid "You've already released the handle, try throwing it instead."
 msgstr "你拉开了把手……赶紧丢出去。"
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "你需要一个火源！"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr "你点燃了箭！"
@@ -188188,10 +192014,6 @@ msgstr "你盲目地挥来挥去，也不知道它是否真的管用。"
 msgid "You mop up the spill."
 msgstr "你清理了洒出的液体。"
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr "你感觉到自己看清了周边地区的地图……"
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr "你感觉到周围的空间构造开始撕裂重组。"
@@ -188253,16 +192075,8 @@ msgid "You don't have appropriate food to heat up."
 msgstr "你没有合适的食物用于加热。"
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
-msgstr "你解冻了食物，并没有加热，因为它冷的时候口感更好。"
-
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
-msgstr "你解冻并加热了食物。"
-
-#: src/iuse.cpp
-msgid "You heat up the food."
-msgstr "你加热了食物。"
+msgid "You start heating up the food."
+msgstr "你开始加热食物。"
 
 #: src/iuse.cpp
 msgid "There is no fire around, use your integrated toolset instead?"
@@ -189262,7 +193076,7 @@ msgid "Your %s is too heavy or bulky for this RC car."
 msgstr "%s 对遥控车来说太重或是太大了。"
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
+msgid "You disarmed your RC car."
 msgstr "你解除了你遥控车的武装。"
 
 #. ~Sound of a radio controlled car moving around
@@ -189275,12 +193089,12 @@ msgid "What to do with activated RC car?"
 msgstr "对激活的遥控车做什么？"
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
+msgid "You turned off your RC car."
 msgstr "你关闭了你的遥控车。"
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
-msgstr "哔噗。"
+#: src/iuse.cpp
+msgid "beep"
+msgstr "滴滴"
 
 #: src/iuse.cpp
 msgid "Take control of RC car"
@@ -189317,10 +193131,17 @@ msgstr "你开始控制遥控车。"
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
-"sending the signal."
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
 msgstr "你一发送这个信号，你带着的 %s 就会爆炸。最好先把它放下，如果你不想和它一起炸飞的话。"
 
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
+"sending the signal."
+msgstr "你一发送这个信号，你 %2$s 里的 %1$s 就会爆炸。最好先把它放下，如果你不想和它一起炸飞的话。"
+
 #: src/iuse.cpp
 msgid "This vehicle's security system has locked you out!"
 msgstr "你无法进入这辆载具的安防系统！"
@@ -191078,10 +194899,30 @@ msgstr "它只能用来修理或改造其他东西，而不是它自己。"
 msgid "How do you want to modify it?"
 msgstr "你想怎样改造它？"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
-msgstr "没有足够的线来改造这件装备。你想移除哪项改动？"
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr "无法%1$s（需要 %2$d 单位的线）"
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr "无法%1$s（需要 %2$d %3$s）"
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr "无法%1$s（不兼容%2$s）"
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
+msgstr "%1$s（%2$d %3$s及 %4$d 单位的线）"
 
 #: src/iuse_actor.cpp
 msgid "Bash"
@@ -191887,7 +195728,7 @@ msgstr "这是《战争与和平》（未删节的口袋本）。"
 
 #: src/iuse_software_kitten.cpp
 msgid "A willing, ripe tomato bemoans your inability to digest fruit."
-msgstr "一只熟透的西红柿对你不能消化水果而万分惋惜。"
+msgstr "一只熟透的番茄对你不能消化水果而万分惋惜。"
 
 #: src/iuse_software_kitten.cpp
 msgid "A robot comedian.  You feel amused."
@@ -192484,6 +196325,23 @@ msgstr "你不能学习这个法术。"
 msgid "All knowledge of %s leaves you."
 msgstr "所有关于 %s 的知识都离你而去了。"
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr "为法术选择一个快捷键。"
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr "快捷键已被占用。"
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr "快捷键已设为 %c。关闭重开法术界面以刷新快捷键。"
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr "快捷键已删除。"
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr "忽视干扰"
@@ -192492,6 +196350,10 @@ msgstr "忽视干扰"
 msgid "Popup Distractions"
 msgstr "询问干扰"
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr "设置快捷键 [=]"
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr "需凝神"
@@ -192556,6 +196418,15 @@ msgstr "施法消耗"
 msgid "Casting Cost (impeded)"
 msgstr "施法消耗（受累赘）"
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr "（%s当前）"
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr "能量不足"
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr "施法时间"
@@ -192564,6 +196435,10 @@ msgstr "施法时间"
 msgid "Casting Time (impeded)"
 msgstr "施法时间（受累赘）"
 
+#: src/magic.cpp
+msgid "self"
+msgstr "自己"
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr "有效目标"
@@ -192576,6 +196451,22 @@ msgstr "伤害"
 msgid "Healing"
 msgstr "治疗"
 
+#: src/magic.cpp
+msgid "Spell Radius"
+msgstr "法术半径"
+
+#: src/magic.cpp
+msgid "Cone Arc"
+msgstr "锥弧"
+
+#: src/magic.cpp
+msgid "degrees"
+msgstr "度"
+
+#: src/magic.cpp
+msgid "Line Width"
+msgstr "线宽"
+
 #: src/magic.cpp
 msgid "Variance"
 msgstr "偏差范围"
@@ -192588,18 +196479,10 @@ msgstr "生成"
 msgid "Summon"
 msgstr "召唤"
 
-#: src/magic.cpp
-msgid "Spell Radius"
-msgstr "法术半径"
-
 #: src/magic.cpp src/veh_interact.cpp
 msgid "Range"
 msgstr "有效距离"
 
-#: src/magic.cpp
-msgid "self"
-msgstr "自己"
-
 #: src/magic.cpp
 msgid "Duration"
 msgstr "持续时间"
@@ -192624,18 +196507,22 @@ msgstr "能量恢复"
 msgid "Damage Type"
 msgstr "伤害类型"
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr "属性增益"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr "等级 0"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr "每级"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr "最高"
@@ -192684,6 +196571,11 @@ msgstr "传送失败。传送器受阻或已被摧毁。"
 msgid "No valid targets to teleport."
 msgstr "没有可传送的有效目标。"
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr "距离目标：%d（%d，%d）"
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr "选择易位门"
@@ -192824,6 +196716,10 @@ msgstr "无法创建模版文件夹。请检查权限。"
 msgid "Unable to make sound directory.  Check permissions."
 msgstr "无法创建声音文件夹。请检查权限。"
 
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr "无法创建图形文件夹。请检查权限。"
+
 #: src/main_menu.cpp
 msgid "Really quit?"
 msgstr "真的退出吗？"
@@ -193512,8 +197408,8 @@ msgstr "%s不能和武器一起使用。"
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
-msgstr "%s不是有效的%s武器。"
+msgid "The %1$s is not a valid %2$s weapon."
+msgstr "%1$s不是有效的%2$s武器。"
 
 #: src/martialarts.cpp
 msgid "Block Counter"
@@ -193930,11 +197826,6 @@ msgid "%d enemy hit!"
 msgid_plural "%d enemies hit!"
 msgstr[0] "%d 个敌人被击中！"
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr "借助于CQB生化插件的大量练习，你学会了 %s。"
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -196381,17 +200272,43 @@ msgid "You don't have any companions to send out…"
 msgstr "你没有任何可供派遣的同伴……"
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
-msgstr "你要派谁执行任务？                                    [ 战斗 : 生存 : 工业 ]"
+msgid "Who do you want to send?"
+msgstr "你想派遣谁？"
 
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
-msgstr "你没有选择任何同伴……"
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
+msgstr "[ 战斗 : 生存 : 工业 ]"
 
+#. ~ %1$s: npc name
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
-msgstr "你所选择的同伴并没有所需要的技能！"
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
+msgstr "%1$s（站岗）"
+
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr "%s [ %4d : %4d : %4d ]"
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr "%1$s %2$d"
+
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
+msgstr "%1$s %2$d/%3$d"
+
+#: src/mission_companion.cpp
+msgid "You choose to send no one…"
+msgstr "你没有选择任何同伴……"
 
 #: src/mission_companion.cpp
 msgid "You don't have any companions ready to return…"
@@ -198071,6 +201988,11 @@ msgstr "%1$s 的手臂命中了你的 %2$s，但是被装甲弹开了！"
 msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr "%1$s 的手臂命中了 <npcname> 的 %2$s，但是被装甲弹开了！"
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr "%1$s与%2$s融合在了一起。"
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -198270,11 +202192,6 @@ msgstr "从 %s 被击中的伤口中喷出了酸液！"
 msgid "zombie slave"
 msgstr "丧尸奴仆"
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr "对你的 %s 做什么？"
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -198680,22 +202597,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr "%1$s 把 %2$s 推开！"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr "细小"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr "较小"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr "中等"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr "较大"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr "巨大"
 
@@ -198760,6 +202682,16 @@ msgstr "浓稠胶质"
 msgid "wearing %1$s"
 msgstr "穿着 %1$s"
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr "%s"
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr "%s的"
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -198802,6 +202734,11 @@ msgstr "发现了你！"
 msgid "Rider: %s"
 msgstr "骑乘者：%s"
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr "它%s。"
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr "难度"
@@ -199450,7 +203387,7 @@ msgid "Crossed a threshold"
 msgstr "超越极限"
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
+msgid "Oh, yeah!  That's the stuff!"
 msgstr "欧耶！就是这玩意！"
 
 #: src/mutation_ui.cpp
@@ -200436,7 +204373,7 @@ msgstr "愤怒："
 msgid "%s disappears."
 msgstr "%s 消失了。"
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "%s 死掉了！"
@@ -201185,6 +205122,16 @@ msgstr "我有个消息。"
 msgid "Yes, let's resume training "
 msgstr "是的，让我们接着训练 。"
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr "%s：一小时的课程（花费 %s）"
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr "%s：传授法术知识（花费 %s）"
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -201353,10 +205300,6 @@ msgstr "吃这个不像是个好主意……"
 msgid "I need a %s to consume that!"
 msgstr "给我一个 %s 来使用它！"
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr "看起来用这个不是个好主意……"
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr "你要给什么？"
@@ -201434,6 +205377,11 @@ msgstr "位于（%2$d,%3$d）的 %1$s"
 msgid "My current location"
 msgstr "我现在的位置"
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr "不是 %s 的有效目的地。"
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -201466,10 +205414,6 @@ msgstr "你想移除哪一个生化插件？"
 msgid "You decide to hold off…"
 msgstr "你决定再想想……"
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr "你支付不起这套手术的价格……"
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -201536,6 +205480,11 @@ msgstr "%s 转向逃跑！"
 msgid "%s leaves."
 msgstr "%s 离开了。"
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr "%s 停止跟随你。"
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -201595,6 +205544,11 @@ msgstr "更多 >"
 msgid "Examine which item?"
 msgstr "检查哪个？"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr "交易多少装有%s的容器[最大：%d]："
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -201829,14 +205783,16 @@ msgstr "开启时，当手持鹤嘴锄或冲击钻并走向可破坏地形时将
 
 #: src/options.cpp
 msgid "Auto foraging"
-msgstr "自动搜寻"
+msgstr "自动采集"
 
 #: src/options.cpp
 msgid ""
 "Action to perform when 'Auto foraging' is enabled.  Bushes: Only forage "
 "bushes.  - Trees: Only forage trees.  - Everything: Forage bushes, trees, "
 "and everything else including flowers, cattails etc."
-msgstr "启用\"自动搜寻\"时进行的操作。灌木：只搜寻灌木。- 树木：只搜寻树木。- 所有：搜寻一切可采集的物品，例如灌木和树木、花朵、香蒲草等。"
+msgstr ""
+"启用\"自动采集\"时进行的操作。灌木：只搜寻并采集灌木。- 树木：只搜寻并采集树木。- "
+"所有：搜寻并采集一切可采集的物品，例如灌木和树木、花朵、香蒲草等。"
 
 #: src/options.cpp
 msgid "Bushes"
@@ -201906,7 +205862,7 @@ msgstr "安全模式重启回合数"
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
 msgstr "当\"安全模式判定距离\"内没有敌对怪物/NPC时，重新开启安全模式所需要的回合数。"
 
@@ -202003,9 +205959,9 @@ msgstr "丢下空容器"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
-msgstr "设置使用后丢下空容器。 否：不丢弃 - 水密容器：水密容器不丢弃 - 全部：所有容器均丢弃。"
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
+msgstr "设置使用后丢下空容器。否：不丢弃 - 水密容器：水密容器不丢弃 - 全部：所有容器均丢弃。"
 
 #: src/options.cpp
 msgid "Watertight"
@@ -202171,12 +206127,12 @@ msgid "If true, automatically follow the crosshair when firing/throwing."
 msgstr "开启后，射击/投掷时将会自动锁定目标。"
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "拆解前确认"
+msgid "Query on disassembly while butchering"
+msgstr "屠宰拆解前确认"
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
-msgstr "开启后，拆解物品时需要确认。"
+msgid "If true, will query before disassembling items while butchering."
+msgstr "开启后，通过屠宰按键拆解物品时需要确认。"
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -202445,9 +206401,9 @@ msgstr "自动分配物品快捷字符"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
 msgstr "启用：自动分配字母。禁用：不自动分配字母。收藏：仅为收藏的物品自动分配字母。"
 
 #: src/options.cpp
@@ -202811,7 +206767,7 @@ msgstr "控制小地图上敌人标记的闪烁速度。参数乘以200 毫秒
 msgid "Display"
 msgstr "切换显示"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr "设置游戏使用的显示器。需要重新启动。"
@@ -202897,7 +206853,7 @@ msgid "Scaling factor"
 msgstr "缩放比例"
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
+msgid "Factor by which to scale the display.  Requires restart."
 msgstr "显示窗口的缩放比例。需要重启。"
 
 #: src/options.cpp
@@ -203171,10 +207127,11 @@ msgstr "灾变起始日"
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
-msgstr "大灾变发生时的日历天数。设置为0时大灾变发生在春季第一天。会被场景所对应的设置值覆盖。增加该值并不会导致世界内生成的食物腐烂或怪物进化。"
+msgstr ""
+"大灾变发生时的日历天数。设置为 0 时大灾变发生在春季第一天。会被场景所对应的设置值覆盖。增加该值并不会导致世界内生成的食物腐烂或怪物进化。"
 
 #: src/options.cpp
 msgid "Spawn delay"
@@ -203182,10 +207139,11 @@ msgstr "开局延迟"
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
-msgstr "大灾变发生后多少天开始游戏。设置为0时将在大灾变当日开始游戏。会被场景所对应的设置值覆盖。增加该值将导致世界内生成的食物腐烂和怪物进化。"
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
+msgstr ""
+"大灾变发生后多少天开始游戏。设置为 0 时将在大灾变当日开始游戏。会被场景所对应的设置值覆盖。增加该值将导致世界内生成的食物腐烂和怪物进化。"
 
 #: src/options.cpp
 msgid "Season length"
@@ -203243,7 +207201,7 @@ msgstr "生成静态NPC"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
 msgstr "开启后，会在创建游戏时会在地图上的一些固定地点生成NPC，需要重置世界才能生效。"
 
@@ -204435,6 +208393,7 @@ msgstr "保暖："
 msgid "Underground"
 msgstr "地下"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
 msgstr "风速"
@@ -204496,10 +208455,6 @@ msgstr "失聪！"
 msgid "Weapon  :"
 msgstr "武器："
 
-#: src/panels.cpp
-msgid "No Style"
-msgstr "无流派"
-
 #: src/panels.cpp
 msgid "Day "
 msgstr "天"
@@ -204512,10 +208467,12 @@ msgstr "温度： "
 msgid "to open sidebar options"
 msgstr "打开侧边栏选项"
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
 msgstr "魔力"
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
 msgstr "最大魔力"
@@ -204772,75 +208729,6 @@ msgstr "为了不让里面的液体洒出来，<npcname> 把 %1$s 放在 %2$s 
 msgid "You have learned a new style: %s!"
 msgstr "你掌握了新的武术流派：%s！"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "你的%s在不久就会被冻伤。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "你的%s在短时间内会被冻伤。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr "你的%s将会随时被冻伤！"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr "你感到你的%s因为寒冷而变得麻木！"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr "你感到你的%s变得非常冷。"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr "你感到你的%s变得很冷。"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr "你感到你的%s由于高温变得火热！"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr "你感到你的%s变得非常热。"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr "你感到你的%s开始升温。"
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "你的%s被风吹得冷飕飕的。"
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr "风力很强，你应该为你的 %s 穿上点防风的衣物。"
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr "你的衣物无法为你的 %s 提供足够的防风保护！"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "你在地上打滚，尝试扑灭火焰！"
@@ -205211,14 +209099,6 @@ msgstr "你 %s 上的已消毒伤口已经完全治愈了。"
 msgid "There is not enough %s left to siphon it."
 msgstr "没有足够的 %s 可抽取。"
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "你咳得很厉害。"
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "一阵干咳。"
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "你的身体被极度的疼痛折磨着！！"
@@ -205264,11 +209144,6 @@ msgstr "你的 %s 让你感到疼痛！"
 msgid "Your %s aches."
 msgstr "你的 %s 有些疼。"
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr "你当前的健康值为 %d。"
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -205295,420 +209170,6 @@ msgstr "你感到体内有什么东西在翻滚，然后有什么东西死掉了
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "你感到肠道内紧紧收缩了一下，然后有什么东西死掉了。"
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr "你营养不良，无法保持你的 %s 继续运行。"
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr "你脱水严重，无法保持你的 %s 继续运行。"
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr "你筋疲力尽，无法保持你的 %s 继续运行。"
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "你溺水了！"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr "你掉了颗牙！"
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "嗡嗡嗡~~~"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "你突然感到一阵麻痹。"
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "你突然很疼痛。"
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "你感到了一阵头晕目眩。"
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "你突然感到饥饿难耐。"
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "你突然觉得有点饱。"
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "你突然感到口渴难耐。"
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "你突然感到精疲力竭。"
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "你突然感到异常寒冷。"
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "你突然觉得很冷。"
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "你突然感到非常热。"
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "你突然觉得很热。"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr "%1$s 生气了！"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr "%1$s 说：\"%2$s\""
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr "你的 %1$s 技能等级提升至 %2$d 级。"
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr "你的 %1$s"
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr "你突然感到麻木……"
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "你开始不由自主地颤抖。"
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr "你大喊，%s"
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr "你的 %1$s"
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr "你突然被睡眠的冲动给压倒了，你昏了过去。"
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "你的哮喘发作了！"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr "你用氧气交换机治疗了哮喘症状并重新睡去。"
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr "你使用了你的哮喘吸入器并重新睡去。"
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr "你使用氧气瓶深深的吸了一口氧并重新睡去。"
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr "你呼吸困难，无法集中注意力！"
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "你使用了你最后的吸入剂。"
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] "你使用了你的哮喘吸入器。只剩下 %d 次使用次数了。"
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr "你使用氧气瓶深深的吸完了最后一口氧。"
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] "你使用氧气瓶深深的吸了一口氧，只剩下 %d 次使用次数了。"
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr "%s 和身体其他部分"
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr "阳光强烈地刺激着你的 %s。"
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "太阳光让你的眼睛不舒服。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr "你的 %s 被水伤到了。"
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr "<npcname> 的 %s 被水伤到了。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr "你的 %s 被水治愈了。"
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr "<npcname> 的 %s 被水治愈了。"
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "阳光灼伤你的皮肤！"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "阳光照得让你无法集中精力。"
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "你无法忍受阳光的照射。"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "突然，你听不到任何声音了！"
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "你突然什么都看不见了！"
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr "你的视觉中枢一定是出问题了……"
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr "你的辐射传感器察觉到了异常。"
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr "随着你的能源系统过载，你的胸口如火烧一般。"
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "电流击中了你，让你疼痛难忍！"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr "%s 似乎受到了电流的影响。"
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "你的酸性放电器突然让你感到一阵火辣辣的疼痛！"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "你的电池稍微有些漏电。"
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "一个生化插件突然发出巨大的噪音！"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "你感到体内故障的生化插件在不停颤动。"
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr "噼里啪啦！"
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "你的视觉像素化了！"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr "你体内故障的生化插件导致你倒在地上抽搐！"
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr "你的生化插件短路了，使你浑身发抖。"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "你的生化插件发生了故障，让你感到奇痒难忍！"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr "你体内故障的生化插件突然开始闪闪发光！"
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr "你的肌肉痉挛了！"
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr "你摔倒在地！"
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr "你感到有点喘不过气。"
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr "你不由自主地颤抖起来。"
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr "你感到反胃……"
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr "你眼前一黑昏倒了！"
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "你的呼吸渐渐减弱了。"
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr "你失足跌倒！"
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr "你感到浑身乏力……"
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr "你累得揉了揉眼睛。"
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr "<npcname> 疲倦地揉了揉眼睛。"
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr "你打了个小哈欠。"
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr "<npcname> 打了个小哈欠。"
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr "你伸了伸懒腰。"
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr "<npcname> 伸了伸懒腰。"
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr "你觉得精神很疲倦。"
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr "<npcname> 重重地打了个哈欠。"
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr "你觉得一阵头昏眼花。"
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr "你的肌肉难受地痉挛。"
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr "你的视野一阵阵模糊。"
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr "你的头脑会短暂地陷入无意识。"
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr "你的肌肉反复无常地剧烈疼痛。"
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr "你感到一阵让人分心的头痛。"
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr "你感到腹部灼热，嘴中反酸。"
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr "你的头脑太累了，以至于你觉得你再也不能相信你的眼睛了。"
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr "你的肌肉无法控制地痉挛，你艰难地保持着自身平衡。"
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr "你不停颤抖的腿把自己绊倒了。"
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr "<npcname> 蹒跚而行。"
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr "<npcname> 突然摔倒了！"
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr "你摔倒了！"
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr "你的辐射侦测徽章从 %1$s 变成 %2$s！"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr "你的 %s 开始自愈！"
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr "你听到从%1$s方传来 %2$s"
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr "你觉得水正在灼伤你的皮肤。"
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr "你的斗篷闪了几下！"
@@ -205926,11 +209387,6 @@ msgstr "无法单手持有 %s。"
 msgid "You are too weak to wield %s with only one arm."
 msgstr "你力量不足，无法单手手持 %s。"
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr "你不能放下你的 %s。"
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "保持空手（关）"
@@ -206004,20 +209460,43 @@ msgstr "%s 没有故障可以修复。"
 msgid "Mend which fault?"
 msgstr "修复什么故障？"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white>耗时：</color>\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr "修复后变为：<color_cyan>%s</color>\n"
+
+#: src/player.cpp
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr "所需时间：<color_cyan>%s</color>\n"
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white>技能：</color>\n"
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr "所需技能：<color_cyan>无</color>\n"
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
-msgstr "> <color_%1$s>%2$s %3$i</color>\n"
+msgid "Skills: %s\n"
+msgstr "所需技能：%s\n"
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr "<color_cyan>%1$s</color><color_green>（%2$d/%3$d）</color>"
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr "<color_cyan>%1$s</color><color_yellow>（%2$d/%3$d）</color>"
+
+#: src/player.cpp
+#, c-format
+msgid "You are currently unable to mend the %s this way."
+msgstr "你目前无法这样修复%s。"
 
 #: src/player.cpp
 msgid "You are already wearing that."
@@ -206131,14 +209610,6 @@ msgstr "你脱下你的 %s。"
 msgid "<npcname> takes off their %s."
 msgstr "<npcname> 脱下了 %s。"
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr "你不能将物品放在那里！"
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr "<npcname> 不能将物品放在那里！"
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -206186,18 +209657,6 @@ msgstr "你回收了 %i 单位的钚。"
 msgid "You can't remove partially depleted plutonium!"
 msgstr "你不能移除部分耗尽的钚！"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] "你的 %s 需要一个至少有 %d 单位电量的UPS才能工作。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] "你的 %s 有 %d 单位电量，但需要 %d 单位。"
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -206369,10 +209828,6 @@ msgstr "你想要躲闪，但却没有足够施展的空间！"
 msgid "%s tries to dodge but there's no room!"
 msgstr "%s 想要躲闪，但却没有腾挪的空间！"
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr "你的身体由于负重过高而感到疼痛！"
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -206428,6 +209883,13 @@ msgstr "空腹"
 msgid "Pain "
 msgstr "疼痛"
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr "%s %d -> %d（%d%%）"
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -206635,47 +210097,57 @@ msgstr "当前速度："
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
-msgstr "负重过高      -%s%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
+msgstr "负重过高            -%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
-msgstr "疼痛          -%s%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
+msgstr "疼痛                -%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
-msgstr "口渴          -%s%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
+msgstr "口渴                -%2d%%"
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr "营养不良"
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
-msgstr "%-20s-%s%d%%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
+msgstr "%s-%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
-msgstr "日光暴晒      -%s%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
+msgstr "缺乏日光            -%2d%%"
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
-msgstr "冷血动物      %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
+msgstr "冷血动物            %s%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
-msgstr "迅捷          +%s%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
+msgstr "迅速                +%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
-msgstr "生化插件加成  +%s%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
+msgstr "生化插件加成        +%2d%%"
 
 #: src/player_display.cpp
 #, c-format
@@ -206890,7 +210362,7 @@ msgid "\"Oh God, what's happening?\""
 msgstr "哦，天啊！发生什么事了？"
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
+msgid "\"Of course… it's all fractals!\""
 msgstr "\"当然……全是花花绿绿的！\""
 
 #: src/player_hardcoded_effects.cpp
@@ -206926,7 +210398,7 @@ msgid "You quiver from the cold."
 msgstr "你冷的发抖。"
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
+msgid "Your torso is freezing cold.  You should put on a few more layers."
 msgstr "你的躯干冻僵了，你需要在身上多穿点。"
 
 #: src/player_hardcoded_effects.cpp
@@ -207301,6 +210773,47 @@ msgstr "你的闹钟响了。"
 msgid "Your alarm went off."
 msgstr "你的闹钟响了。"
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr "你的身体突然开始抽搐，你失去了对身体的控制！"
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr "你失去了意识！"
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr "手臂"
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr "手掌"
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr "腿部"
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr "你的 %s 突然不由自主的抽搐！"
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr "不过，你设法握住了手中的武器。"
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr "不过，你还是能站稳脚跟。"
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr "你突然失去了所有的肌肉张力，无法撑起自己的体重！"
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr "你头痛得要裂了。"
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -207722,10 +211235,6 @@ msgstr "咔嘣！"
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>无</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr "<color_white>无</color>"
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -207962,11 +211471,6 @@ msgstr "纪录"
 msgid "KILLS"
 msgstr "击杀数"
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr "设置游戏使用的显示器。需要重新启动。"
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr "这是最有禅意的技能。"
@@ -207979,6 +211483,10 @@ msgstr "你的耳膜突然一阵剧痛！"
 msgid "Something is making noise."
 msgstr "某个东西正在制造噪音。"
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr "一阵噪音"
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -207994,6 +211502,11 @@ msgstr "你听到自己这发出 %1$s。"
 msgid "You hear %1$s"
 msgstr "你听见 %1$s"
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr "你听到从%1$s方传来 %2$s"
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "你的闹钟可算是唤醒了你。"
@@ -208023,6 +211536,408 @@ msgstr "无法找到有效的起始地点，请到官方论坛提交这个错误
 msgid "d: delete history"
 msgstr "d：删除历史记录"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr "你的 %s 被水伤到了。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr "<npcname> 的 %s 被水伤到了。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr "你的 %s 被水治愈了。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr "<npcname> 的 %s 被水治愈了。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr "你营养不良，无法保持你的 %s 继续运行。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr "你脱水严重，无法保持你的 %s 继续运行。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr "你筋疲力尽，无法保持你的 %s 继续运行。"
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "你溺水了！"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr "你突然被睡眠的冲动给压倒了，你昏了过去。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "你突然感到一阵麻痹。"
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "你突然很疼痛。"
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "你感到了一阵头晕目眩。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "你突然感到饥饿难耐。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "你突然觉得有点饱。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "你突然感到口渴难耐。"
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "你突然感到精疲力竭。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "你突然感到异常寒冷。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "你突然觉得很冷。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "你突然感到非常热。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "你突然觉得很热。"
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr "你的 %1$s"
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr "你突然感到麻木……"
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "你开始不由自主地颤抖。"
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr "<npcname>开始不由自主地颤抖。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr "%1$s 说：\"%2$s\""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr "%1$s 生气了！"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr "你的 %1$s 技能等级提升至 %2$d 级。"
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "你的哮喘发作了！"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr "你用氧气交换机治疗了哮喘症状并重新睡去。"
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr "你使用了你的哮喘吸入器并重新睡去。"
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr "你使用氧气瓶深深的吸了一口氧并重新睡去。"
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr "你呼吸困难，无法集中注意力！"
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "你使用了你最后的吸入剂。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] "你使用了你的哮喘吸入器。只剩下 %d 次使用次数了。"
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr "你使用氧气瓶深深的吸完了最后一口氧。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] "你使用氧气瓶深深的吸了一口氧，只剩下 %d 次使用次数了。"
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "阳光灼伤你的皮肤！"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "阳光照得让你无法集中精力。"
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "你无法忍受阳光的照射。"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "太阳光让你的眼睛不舒服。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr "%s 和身体其他部分"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr "阳光强烈地刺激着你的 %s。"
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr "你掉了颗牙！"
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "嗡嗡嗡~~~"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "突然，你听不到任何声音了！"
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "你突然什么都看不见了！"
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr "你的视觉中枢一定是出问题了……"
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr "你的辐射传感器察觉到了异常。"
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr "随着你的能源系统过载，你的胸口如火烧一般。"
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "电流击中了你，让你疼痛难忍！"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr "%s 似乎受到了电流的影响。"
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "你的酸性放电器突然让你感到一阵火辣辣的疼痛！"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "你的电池稍微有些漏电。"
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "一个生化插件突然发出巨大的噪音！"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "你感到体内故障的生化插件在不停颤动。"
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr "噼里啪啦！"
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "你的视觉像素化了！"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr "你体内故障的生化插件导致你倒在地上抽搐！"
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr "你的生化插件短路了，使你浑身发抖。"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "你的生化插件发生了故障，让你感到奇痒难忍！"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr "你体内故障的生化插件突然开始闪闪发光！"
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr "你的肌肉痉挛了！"
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr "你摔倒在地！"
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr "你感到有点喘不过气。"
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr "你不由自主地颤抖起来。"
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr "你感到反胃……"
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr "你眼前一黑昏倒了！"
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "你的呼吸渐渐减弱了。"
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr "你失足跌倒！"
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr "你感到浑身乏力……"
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr "你累得揉了揉眼睛。"
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr "<npcname> 疲倦地揉了揉眼睛。"
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr "你打了个小哈欠。"
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr "<npcname> 打了个小哈欠。"
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr "你伸了伸懒腰。"
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr "<npcname> 伸了伸懒腰。"
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr "你觉得精神很疲倦。"
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr "<npcname> 重重地打了个哈欠。"
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr "你觉得一阵头昏眼花。"
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr "你的肌肉难受地痉挛。"
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr "你的视野一阵阵模糊。"
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr "你的头脑会短暂地陷入无意识。"
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr "你的肌肉反复无常地剧烈疼痛。"
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr "你感到一阵让人分心的头痛。"
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr "你感到腹部灼热，嘴中反酸。"
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr "你的头脑太累了，以至于你觉得你再也不能相信你的眼睛了。"
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr "你的肌肉无法控制地痉挛，你艰难地保持着自身平衡。"
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr "你不停颤抖的腿把自己绊倒了。"
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr "<npcname> 蹒跚而行。"
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr "<npcname> 突然摔倒了！"
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr "你摔倒了！"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr "你的辐射侦测徽章从 %1$s 变成 %2$s！"
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr "你的 %s 开始自愈！"
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr "你觉得水正在灼伤你的皮肤。"
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr "你感到一阵奇怪的向内的力。"
@@ -208172,8 +212087,8 @@ msgstr "玻璃破裂！"
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "%s 蹒跚的越过简易床"
+msgid "The %s stumbles over the cot!"
+msgstr "%s 蹒跚的越过简易床！"
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -208328,11 +212243,6 @@ msgstr "你的腿被捕猎陷阱缠住了。"
 msgid "A snare closes on <npcname>s leg."
 msgstr "<npcname> 的腿被捕猎陷阱缠住了。"
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr "你的 %s 的腿被捕猎陷阱缠住了"
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -208554,6 +212464,12 @@ msgstr "<npcname> 摔到了下一层！"
 msgid "You fall down under %s!"
 msgstr "你摔到了 %s 之下！"
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] "你摔下了%d层楼高！"
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname> 振动着他的翅膀，优雅地飘落下来。"
@@ -208688,6 +212604,10 @@ msgstr "你在教学虚拟世界中存档了！- 教学世界不是真实世界
 msgid "Select part"
 msgstr "选择部件"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white>耗时：</color>\n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr "<color_white>所需技能：</color>\n"
@@ -211121,8 +215041,8 @@ msgstr "@ %d：%s  "
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
-msgstr "设置 '%s' 为……"
+msgid "Set '%s' to…"
+msgstr "设置 \"%s\" 为……"
 
 #: src/wish.cpp
 msgid " (current)"
diff --git a/lang/po/zh_TW.po b/lang/po/zh_TW.po
index 411acc11aa324..6b8b980117114 100644
--- a/lang/po/zh_TW.po
+++ b/lang/po/zh_TW.po
@@ -12,23 +12,24 @@
 # vivi00791 <vivi00791@gmail.com>, 2019
 # KTISME <kt800404@gmail.com>, 2019
 # Maynard <kk19870706@gmail.com>, 2019
-# HOXV <hoxv00@yahoo.com.tw>, 2019
 # 菲伊斯 <lhy8104522@gmail.com>, 2019
 # 鋼龍 <llps44123@gmail.com>, 2019
 # 林楷翌 <ddkevin2008@gmail.com>, 2019
 # Brett Dong <brett.browning.dong@gmail.com>, 2019
 # Jeremy Wu <jeremy7986111@yahoo.com.tw>, 2019
-# Hsinyu Chan, 2019
 # kiddragon Chung <kiddragonchung@gmail.com>, 2019
+# Hsinyu Chan, 2019
 # Laughing Man, 2019
+# Julian Lau <hk.julianlau@gmail.com>, 2019
 # xap, 2019
+# HOXV <hoxv00@yahoo.com.tw>, 2019
 # Hao JK <haojk0829@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-dda 0.D\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-25 13:40+0800\n"
+"POT-Creation-Date: 2019-11-16 18:59+0800\n"
 "PO-Revision-Date: 2018-04-26 14:47+0000\n"
 "Last-Translator: Hao JK <haojk0829@gmail.com>, 2019\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/zh_TW/)\n"
@@ -203,6 +204,17 @@ msgstr "高放射性的漿液, 最好離它遠點。"
 msgid "watery plutonium slurry"
 msgstr "稀釋鈽漿液"
 
+#: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py
+msgid "rock"
+msgstr "石頭"
+
+#. ~ Description for rock
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
+"good for throwing at enemies."
+msgstr "棒球大小的石頭。可用來製作近戰武器, 也可以朝著敵人丟。"
+
 #: lang/json/AMMO_from_json.py
 msgid "pebble"
 msgstr "小石子"
@@ -664,9 +676,8 @@ msgstr "自製鐵釘火箭"
 msgid ""
 "A hand-built rocket, consisting of a spike welded onto a pipe that was "
 "filled with improvised rocket fuel.  Horribly inaccurate, as can be expected"
-" of this grade of weapon, but packs a fierce punch... if it hits."
-msgstr ""
-"這是一枚手工打造的火箭, 將一枚大鐵釘焊接在一根裝滿粗製火箭燃料的鋼管上。這種等級的武器當然靠北不準, 但是一旦擊中目標, 威力還是不可小覷。"
+" of this grade of weapon, but packs a fierce punch… if it hits."
+msgstr "這是一枚手工打造的火箭，將一枚大鐵釘焊接在一根裝滿粗製火箭燃料的鋼管上。這種等級的武器當然靠北不準，但是一旦擊中目標，威力還是不可小覷。"
 
 #: lang/json/AMMO_from_json.py
 msgid "explosive home-made rocket"
@@ -711,9 +722,9 @@ msgstr "未完成的碳化鈣"
 #. ~ Description for unfinished calcium carbide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The incomplete process of converting coal and lime into calcium carbide. "
-"Useless in this state/"
-msgstr "將煤和石灰轉化為碳化鈣的未完成過程。此敘述無用處。"
+"The incomplete process of converting coal and lime into calcium carbide.  "
+"Useless in this state."
+msgstr "將煤和石灰轉化為碳化鈣（電石）的未完成過程。在這種狀態下沒用。"
 
 #: lang/json/AMMO_from_json.py
 msgid "chain link"
@@ -1118,8 +1129,8 @@ msgstr[0] "氧化鋅"
 #. ~ Description for zinc oxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of zinc oxide. It can be reduced into zinc, or used for some other"
-" reactions of its own."
+"A handful of zinc oxide.  It can be reduced into zinc, or used for some "
+"other reactions of its own."
 msgstr "少量氧化鋅。它可以還原成鋅，或用於其自身特性的一些其他化學反應。"
 
 #: lang/json/AMMO_from_json.py
@@ -1130,7 +1141,7 @@ msgstr[0] "二氧化錳"
 #. ~ Description for manganese dioxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of manganese dioxide powder. Occurring naturally in the mineral "
+"A handful of manganese dioxide powder.  Occurring naturally in the mineral "
 "pyrolusite, it is used commercially in the production of alkaline and zinc-"
 "carbon batteries."
 msgstr "少量二氧化錳粉末。在礦物軟錳礦中天然存在，在商業上用於生產鹼性電池和鋅碳電池。"
@@ -1143,10 +1154,10 @@ msgstr[0] "氯化鉀"
 #. ~ Description for potassium chloride
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium chloride. Although it occurs naturally in the mineral"
-" sylvite, it can be produced as a byproduct of the reaction of saltpeter and"
-" hydrochloric acid. It can be used for making fertilizer, or potassium "
-"hydroxide by way of electrolysis."
+"A handful of potassium chloride.  Although it occurs naturally in the "
+"mineral sylvite, it can be produced as a byproduct of the reaction of "
+"saltpeter and hydrochloric acid.  It can be used for making fertilizer, or "
+"potassium hydroxide by way of electrolysis."
 msgstr "少量氯化鉀。雖然它天然存在於礦物鉀鹽中，但它可以從硝石和鹽酸的反應中以副產物型態產生。它可以通過電解用於製造肥料或氫氧化鉀。"
 
 #: lang/json/AMMO_from_json.py
@@ -1157,8 +1168,8 @@ msgstr[0] "氫氧化鉀"
 #. ~ Description for potassium hydroxide
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A handful of potassium hydroxide. Commonly called caustic potash, it was "
-"mainly used industrially for its caustic nature. It can be used as an "
+"A handful of potassium hydroxide.  Commonly called caustic potash, it was "
+"mainly used industrially for its caustic nature.  It can be used as an "
 "electrolyte in alkaline batteries, among other applications."
 msgstr "少量氫氧化鉀。俗稱苛性鉀，工業上的運用主要利用其腐蝕的特性。它可以用作鹼性電池中的電解質，以及其他應用。"
 
@@ -1186,9 +1197,9 @@ msgstr[0] "氫氯酸"
 #. ~ Description for hydrochloric acid
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Hydrochloric acid, also known as muriatic acid. It is a strong acid that has"
-" a distinctive smell, important and frequently used ever since its "
-"discovery. It still has a vast multitude of uses."
+"Hydrochloric acid, also known as muriatic acid.  It is a strong acid that "
+"has a distinctive smell, important and frequently used ever since its "
+"discovery.  It still has a vast multitude of uses."
 msgstr "氫氯酸，俗稱鹽酸。它是一種強酸，具有獨特的氣味，自發現以來一直很重要且經常被使用。它仍然有很多用途。"
 
 #: lang/json/AMMO_from_json.py
@@ -1427,8 +1438,8 @@ msgstr[0] "火柴頭粉"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Some match head powder from match heads, similar to black gunpowder but a "
-"bit weaker. It can be used in crafting explosives and fuses when other more "
-"suitable candidates are less available."
+"bit weaker.  It can be used in crafting explosives and fuses when other more"
+" suitable candidates are less available."
 msgstr "一些來自火柴頭的火柴頭粉末，類似黑色火藥，但稍弱一些。當其他更合適的候選材料較少時，可用於製作炸藥和引信。"
 
 #: lang/json/AMMO_from_json.py
@@ -1777,7 +1788,7 @@ msgstr[0] "火焰噴射器燃料"
 #. ~ Description for flamethrower fuel
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A mixture of gasoline and diesel oil in equal parts. Its combustion "
+"A mixture of gasoline and diesel oil in equal parts.  Its combustion "
 "properties make it unfit for applications where you would use any of them "
 "separately, but it can be used to feed a flamethrower."
 msgstr "汽油和柴油的等份混合物。燃燒的特性使得它不適合單獨使用，但它可做為火焰噴射器的燃料。"
@@ -3133,40 +3144,74 @@ msgid "reloaded .460 Rowland"
 msgstr ".460羅蘭子彈(重填彈)"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG tracer"
-msgstr ".50 BMG 曳光彈"
+msgid ".50 BMG M17 tracer"
+msgstr ".50 BMG M17 曳光彈"
 
-#. ~ Description for .50 BMG tracer
+#. ~ Description for .50 BMG M17 tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances."
-msgstr ".50 BMG 狙擊子彈的變種。曳光彈能幫助使用者保持火力在同一個目標上, 但亦伴隨點燃易燃物質的風險。"
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances."
+msgstr "威力強大的 .50 BMG 子彈衍生出來的曳光彈。曳光彈能幫助使用者保持火力在同一個目標上，但亦伴隨點燃易燃物質的風險。"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG Ball"
-msgstr ".50 BMG 子彈"
+msgid ".50 BMG M33 Ball"
+msgstr ".50 BMG M33 子彈"
 
-#. ~ Description for .50 BMG Ball
+#. ~ Description for .50 BMG M33 Ball
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise."
-msgstr ".50 BMG 是非常強大的步槍彈, 設計用於長距離使用。擁有驚人的精準度與致命的穿甲能力, 缺點是極大的後座力與噪音。"
+".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is "
+"a very powerful rifle round designed for anti-aircraft use, later adapted to"
+" anti-vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
+msgstr ""
+".50 BMG 彈藥，採用低碳鋼芯 661 格令全金屬披甲子彈。 .50 BMG "
+"是一種非常強大的步槍彈，專為防空用途而設計，後來適應了反車輛和反人員的角色。它強大的動能和穿甲能力使它成為目前可用的最致命的子彈，缺點是極大的後座力與噪音。"
 
 #: lang/json/AMMO_from_json.py
-msgid ".50 BMG AP"
-msgstr ".50 BMG 穿甲彈"
+msgid ".50 BMG Match"
+msgstr ".50 BMG 比賽用子彈"
 
-#. ~ Description for .50 BMG AP
+#. ~ Description for .50 BMG Match
+#: lang/json/AMMO_from_json.py
+msgid ""
+".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for "
+"long-range competition shooting or other precision rifle use."
+msgstr ".50 BMG 全金屬彈鉛芯彈藥以更精密的刻度製成，可用於遠距射擊比賽或其他精準步槍使用。"
+
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG M2 AP"
+msgstr ".50 BMG M2 穿甲彈"
+
+#. ~ Description for .50 BMG M2 AP
 #: lang/json/AMMO_from_json.py
 msgid ""
 "Variant of the .50 BMG round that uses a core of very dense, hardened "
 "tungsten steel.  Penetration is increased, but damage is reduced."
 msgstr "改用密度及堅硬度極高的鎢鋼所製成的 .50 BMG 子彈。提升了穿透力, 但傷害較低。"
 
+#: lang/json/AMMO_from_json.py
+msgid ".50 BMG Raufoss Mk 211"
+msgstr ".50 BMG Raufoss Mk 211 子彈"
+
+#. ~ Description for .50 BMG Raufoss Mk 211
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This variant of the .50 BMG round makes the most of the caliber's potential "
+"payload delivery: the tip is loaded with an incendiary mix, which ignites on"
+" impact, detonating the RDX or PETN charge.  This also ignites a secondary "
+"zirconium powder incendiary charge that surrounds a tungsten carbide "
+"penetrator, both encased by a mild steel cup.  Fragments from the cup and "
+"burning metallic powder follow the penetrator through armored targets, "
+"increasing lethality.  These rare, complicated, and expensive rounds are not"
+" likely to be manufactured again; use them wisely."
+msgstr ""
+"這種.50 BMG 彈藥的變體可以最大程度地發揮槍管潛在的有效載荷輸送能力：尖端裝有爆燃混合物，在碰撞時點燃，引爆 RDX 或 PETN "
+"裝藥。這也點燃了圍繞碳化鎢穿透器的鋯粉二次燃燒彈，兩者均被低碳鋼罩包裹著。鋼罩中的碎片和燃燒的金屬粉末會穿透有裝甲的目標，增加致命性。這些罕見、複雜而且昂貴的子彈不可能再製造出來。明智地使用它們。"
+
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG tracer"
 msgstr ".50 BMG 曳光彈 (重填彈)"
@@ -3174,24 +3219,27 @@ msgstr ".50 BMG 曳光彈 (重填彈)"
 #. ~ Description for reloaded .50 BMG tracer
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to "
-"help keep the weapon they are fired from on target at the risk of igniting "
-"flammable substances.  This one has been hand-reloaded."
-msgstr ".50 BMG 狙擊子彈的變種。曳光彈能幫助使用者保持火力在同一個目標上, 但亦伴隨點燃易燃物質的風險。這顆是手工裝配的重填彈。"
+"A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep "
+"the weapon they are fired from on target at the risk of igniting flammable "
+"substances.  This one has been hand-reloaded."
+msgstr ""
+"威力強大的 .50 BMG 子彈衍生出來的曳光彈。曳光彈能幫助使用者保持火力在同一個目標上，但亦伴隨點燃易燃物質的風險。這顆是手工裝配的重填彈。"
 
 #: lang/json/AMMO_from_json.py
-msgid "reloaded .50 BMG Ball"
-msgstr ".50 BMG (重填彈)"
+msgid "reloaded .50 BMG Match"
+msgstr " .50 BMG 比賽用子彈（重填彈）"
 
-#. ~ Description for reloaded .50 BMG Ball
+#. ~ Description for reloaded .50 BMG Match
 #: lang/json/AMMO_from_json.py
 msgid ""
-"The .50 BMG is a very powerful rifle round designed for long-range use.  Its"
-" stupendous accuracy and armor piercing capabilities make it one of the most"
-" deadly rounds available, offset only by its drastic recoil and noise.  This"
-" one has been hand-reloaded."
+".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very "
+"powerful rifle round designed for anti-aircraft use, later adapted to anti-"
+"vehicular and anti-personnel roles.  Its stupendous energy and armor "
+"piercing capabilities make it one of the most deadly rounds available, "
+"offset only by its drastic recoil and noise."
 msgstr ""
-".50 BMG 是非常強大的步槍彈設計用於長距離使用。擁有驚人的精準度與致命的穿甲能力, 缺點是極大的後座力與噪音。這顆是手工裝配的重填彈。"
+".50 BMG 彈藥，採用鉛芯的全金屬披甲子彈。 .50 BMG "
+"是一種非常強大的步槍彈，專為防空用途而設計，後來適應了反車輛和反人員的角色。它強大的動能和穿甲能力使它成為目前可用的最致命的子彈，缺點是極大的後座力與噪音。"
 
 #: lang/json/AMMO_from_json.py
 msgid "reloaded .50 BMG AP"
@@ -3200,10 +3248,9 @@ msgstr ".50 BMG 穿甲彈 (重填彈)"
 #. ~ Description for reloaded .50 BMG AP
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Variant of the .50 BMG round that uses a core of very dense, hardened "
-"tungsten steel.  Penetration is increased, but damage is reduced.  This one "
-"has been hand-reloaded."
-msgstr "改用非常高密度、堅硬的鎢鋼製彈芯的 .50 BMG彈, 使穿甲力提高但傷害降低。這一顆是重填彈。"
+"Variant of the .50 BMG round that uses a core hardened steel.  Penetration "
+"is increased, but damage is reduced.  This one has been hand-reloaded."
+msgstr ".50 BMG 彈藥的一種變體，使用的是硬化鋼彈芯。穿透力增加，但傷害減少。這一顆是手工重填彈。"
 
 #: lang/json/AMMO_from_json.py
 msgid ".500 S&W Magnum"
@@ -4163,6 +4210,107 @@ msgstr "一些真菌種子。"
 msgid "fungal flower"
 msgstr "真菌花"
 
+#: lang/json/AMMO_from_json.py
+msgid "potassium alum"
+msgstr "明礬"
+
+#. ~ Description for potassium alum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Small water-soluble white crystals with watery metallic odor, historically "
+"used for many different purposes.  Also known as potash alum and potassium "
+"aluminum sulfate; often called simply alum, as it's the most important "
+"member of the generic class of compounds called alums."
+msgstr ""
+"具有含水金屬氣味的水溶性白色小晶體，歷史上用於許多不同用途。又稱鉀明礬和硫酸鋁鉀；通常被稱為明礬，因為它是稱為明礬的通用化合物類別中最重要的成員。"
+
+#: lang/json/AMMO_from_json.py
+msgid "cloth dye powder"
+msgstr "布料染粉"
+
+#. ~ Description for cloth dye powder
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a powdered colorful cloth dye, which can be used to dye many fabrics"
+" if combined with water and some mordant."
+msgstr "這是一種粉狀的彩色布料染料，如果與水和某些媒染劑結合使用，可用於對許多織物進行染色。"
+
+#: lang/json/AMMO_from_json.py
+msgid "steel buckle"
+msgstr "鋼製帶釦"
+
+#. ~ Description for steel buckle
+#: lang/json/AMMO_from_json.py
+msgid "A steel buckle, like that usually found on belts."
+msgstr "鋼製帶釦，像似皮帶上的那種。"
+
+#: lang/json/AMMO_from_json.py
+msgid "plastic button"
+msgstr "塑膠鈕扣"
+
+#. ~ Description for plastic button
+#: lang/json/AMMO_from_json.py
+msgid "A plastic button, usually found on clothing."
+msgstr "塑膠鈕扣，通常能在衣服上找到。"
+
+#: lang/json/AMMO_from_json.py
+msgid "steel button"
+msgstr "鋼質鈕扣"
+
+#. ~ Description for steel button
+#: lang/json/AMMO_from_json.py
+msgid "A steel button, usually found on clothing."
+msgstr "鋼質鈕扣，通常能在衣服上找到。"
+
+#: lang/json/AMMO_from_json.py
+msgid "wooden button"
+msgstr "木質鈕扣"
+
+#. ~ Description for wooden button
+#: lang/json/AMMO_from_json.py
+msgid "A crude wooden button, usually found on very old clothing."
+msgstr "粗糙的木質鈕扣，通常能在很舊的衣服上找到。"
+
+#: lang/json/AMMO_from_json.py
+msgid "steel snap fastener"
+msgstr "鋼質子母扣"
+
+#. ~ Description for steel snap fastener
+#: lang/json/AMMO_from_json.py
+msgid "A steel snap fastener, usually found on clothing."
+msgstr "鋼質子母扣，通常能在衣服上找到。"
+
+#: lang/json/AMMO_from_json.py
+msgid "touch fastener"
+msgstr "魔鬼氈"
+
+#. ~ Description for touch fastener
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a pair of cloth strips, one of which has tiny hooks and another has "
+"tiny loops.  Useful as a fastener for clothing and footwear."
+msgstr "這是一對布條，其中一個布條佈滿微小的鉤線，而另一個布條佈滿微小的環線。用作服裝和鞋類的扣帶。"
+
+#: lang/json/AMMO_from_json.py
+msgid "long plastic zipper"
+msgstr "塑膠長拉鍊"
+
+#. ~ Description for long plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid "A long zipper made from plastic, usually found on clothing."
+msgstr "塑膠製的長拉鍊，通常能在衣服上找到。"
+
+#: lang/json/AMMO_from_json.py
+msgid "short plastic zipper"
+msgstr "塑膠短拉鍊"
+
+#. ~ Description for short plastic zipper
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A short zipper made from plastic, usually found on footwear or clothing "
+"pockets."
+msgstr "塑膠製的短拉鍊，通常能在鞋類或衣服的口袋上找到。"
+
 #: lang/json/AMMO_from_json.py
 msgid "red paint"
 msgid_plural "red paint"
@@ -4307,7 +4455,7 @@ msgstr[0] "鋅"
 #: lang/json/AMMO_from_json.py
 msgid ""
 "A slightly brittle metal.  Apart from being an essential mineral that the "
-"body needs, it reacts readily with acids, alkalis and other non-metals. It "
+"body needs, it reacts readily with acids, alkalis and other non-metals.  It "
 "can be crushed to make zinc powder, used in the production of batteries, "
 "among other things."
 msgstr "一種易碎的金屬。除了是人體所需的重要礦物質外，它還與酸、鹼以及其他非金屬容易起反應。它可以粉碎製成鋅粉，用於生產電池等。"
@@ -4384,7 +4532,7 @@ msgstr "門鉸鏈"
 #. ~ Description for door hinge
 #: lang/json/AMMO_from_json.py
 msgid ""
-"A small metal hinge with two metal plates with screw holes. Useful for "
+"A small metal hinge with two metal plates with screw holes.  Useful for "
 "making doors."
 msgstr "一組小型金屬鉸鏈，有兩個螺絲孔的金屬板。用於製作門。"
 
@@ -4433,6 +4581,343 @@ msgid ""
 "explosions."
 msgstr "導火線，長度足夠讓你有時間可以遠離大部分的爆炸。"
 
+#: lang/json/AMMO_from_json.py
+msgid "rubber sole"
+msgstr "橡膠鞋底"
+
+#. ~ Description for rubber sole
+#: lang/json/AMMO_from_json.py
+msgid ""
+"This is a sole made from rubber, usually found on the bottoms of boots.  Can"
+" be used for making actual boots."
+msgstr "由橡膠製成的鞋底，通常能在靴子的底部找到。可用於製作實際的靴子。"
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton scraps"
+msgid_plural "cotton scraps"
+msgstr[0] "棉布下腳料"
+
+#. ~ Description for cotton scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of cotton, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of, but can be recycled "
+"into some thread if you really want."
+msgstr "形狀奇特的棉布細屑，是裁縫加工後剩餘的廢料。沒什麼用，通常被丟棄，但是如果你真的需要的話，可以將其回收成縫線。"
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur scraps"
+msgid_plural "faux fur scraps"
+msgstr[0] "人造毛皮下腳料"
+
+#. ~ Description for faux fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of faux fur, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr "形狀奇特的人造毛皮細屑，是裁縫加工後剩餘的廢料。沒什麼用，通常被丟棄。"
+
+#: lang/json/AMMO_from_json.py
+msgid "felt scraps"
+msgid_plural "felt scraps"
+msgstr[0] "毛氈下腳料"
+
+#. ~ Description for felt scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of felt, waste material from tailoring projects."
+"  Not useful for much and usually disposed of, but can be recycled into some"
+" wool fiber if you really want."
+msgstr "形狀奇特的毛氈細屑，是裁縫加工後剩餘的廢料。沒什麼用，通常被丟棄，但是如果你真的需要的話，可以將其回收成毛紗。"
+
+#: lang/json/AMMO_from_json.py
+msgid "fur scraps"
+msgid_plural "fur scraps"
+msgstr[0] "毛皮下腳料"
+
+#. ~ Description for fur scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of fur, waste material from tailoring projects.  "
+"Not useful for much and usually disposed of."
+msgstr "形狀奇特的毛皮細屑，是裁縫加工後剩餘的廢料。沒什麼用，通常被丟棄。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar scraps"
+msgid_plural "Kevlar scraps"
+msgstr[0] "凱夫勒下腳料"
+
+#. ~ Description for Kevlar scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring "
+"projects.  Normally it's disposed of, but since Kevlar would be very "
+"difficult to make in a post-apocalyptic world, it might be worth recycling "
+"it for Kevlar thread."
+msgstr ""
+"形狀奇特的凱夫勒纖維細屑，是裁縫加工後剩餘的廢料。通常被丟棄，但是由於要在末日後的世界中製造凱夫勒將是非常困難的事，因此值得將其回收用於凱夫勒線。"
+
+#: lang/json/AMMO_from_json.py
+msgid "leather scraps"
+msgid_plural "leather scraps"
+msgstr[0] "皮革下腳料"
+
+#. ~ Description for leather scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of leather, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr "形狀奇特的皮革細屑，是裁縫加工後剩餘的廢料。沒什麼用，通常被丟棄。"
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra scraps"
+msgid_plural "lycra scraps"
+msgstr[0] "萊卡下腳料"
+
+#. ~ Description for lycra scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of lycra, waste material from tailoring projects."
+"  Not useful for much and usually disposed of."
+msgstr "形狀奇特的萊卡細屑，是裁縫加工後剩餘的廢料。沒什麼用，通常被丟棄。"
+
+#: lang/json/AMMO_from_json.py
+msgid "neoprene scraps"
+msgid_plural "neoprene scraps"
+msgstr[0] "橡膠下腳料"
+
+#. ~ Description for neoprene scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of neoprene, waste material from tailoring "
+"projects.  Not useful for much and usually disposed of."
+msgstr "形狀奇特的橡膠細屑，是裁縫加工後剩餘的廢料。沒什麼用，通常被丟棄。"
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric scraps"
+msgid_plural "synthetic fabric scraps"
+msgstr[0] "合成纖維下腳料"
+
+#. ~ Description for synthetic fabric scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of synthetic fabric, waste material from "
+"tailoring projects.  Not useful for much and usually disposed of."
+msgstr "形狀奇特的合成纖維細屑，是裁縫加工後剩餘的廢料。沒什麼用，通常被丟棄。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex scraps"
+msgid_plural "Nomex scraps"
+msgstr[0] "諾梅克斯下腳料"
+
+#. ~ Description for Nomex scraps
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material "
+"from tailoring projects.  Normally it's disposed of, but since Nomex would "
+"be very difficult to make in a post-apocalyptic world, it might be worth "
+"recycling it."
+msgstr "形狀奇特的諾梅克斯纖維細屑，是裁縫加工後剩餘的廢料。通常被丟棄，但是由於要在末日後的世界中製造諾梅克斯將是非常困難的事，因此值得將其回收。"
+
+#: lang/json/AMMO_from_json.py
+msgid "cotton sheet"
+msgstr "棉布床單"
+
+#. ~ Description for cotton sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of cotton fabric, suitable for making clothing."
+msgstr "一大片棉織品布料，適合用於製作衣服。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork cotton clothing parts"
+msgid_plural "patchwork cotton clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork cotton clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from cotton patches in "
+"a patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "faux fur sheet"
+msgstr "人造毛皮床單"
+
+#. ~ Description for faux fur sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of fake synthetic colorful fur, suitable for making clothing."
+msgstr "一大片假的合成彩色毛皮，適合用於製作衣服。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork faux fur clothing parts"
+msgid_plural "patchwork faux fur clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork faux fur clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from faux fur patches "
+"in a patchwork fashion.  Suitable for making most clothing, though it's much"
+" less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "felt sheet"
+msgstr "毛氈床單"
+
+#. ~ Description for felt sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of felt, suitable for making clothing."
+msgstr "一大片毛氈布料，適合用於製作衣服。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork felt clothing parts"
+msgid_plural "patchwork felt clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork felt clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from felt patches in a "
+"patchwork fashion.  Suitable for making most clothing, though it's much less"
+" time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar sheet"
+msgstr "凱夫勒床單"
+
+#. ~ Description for Kevlar sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  "
+"In this form, unlike rigid plates, it can be stitched."
+msgstr "一大片凱夫勒合成纖維，適合製作防彈護甲。與剛性板不同，這種形式可以進行縫製。"
+
+#: lang/json/AMMO_from_json.py
+msgid "lycra sheet"
+msgstr "萊卡床單"
+
+#. ~ Description for lycra sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for"
+" making flexible yet strong clothing."
+msgstr "一大片混合有彈性萊卡纖維的合成纖維，適合製作柔軟而結實的衣物。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork lycra clothing parts"
+msgid_plural "patchwork lycra clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork lycra clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from lycra patches in a"
+" patchwork fashion.  Suitable for making most clothing, though it's much "
+"less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
+msgid "neoprene sheet"
+msgid_plural "neoprene sheets"
+msgstr[0] "橡膠薄片"
+
+#. ~ Description for neoprene sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of neoprene, a synthetic rubber, suitable for making underwater "
+"gear."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork neoprene clothing parts"
+msgid_plural "patchwork neoprene clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork neoprene clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from neoprene patches "
+"in a patchwork fashion, with waterproofed seams.  Suitable for making most "
+"clothing, though it's much less time-efficient than if using proper material"
+" sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex sheet"
+msgstr "諾梅克斯床單"
+
+#. ~ Description for Nomex sheet
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sheet of Nomex synthetic fabric, suitable for making heat-resistant "
+"clothing."
+msgstr "一大片諾梅克斯布料，適合用於製作耐熱衣服。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork Nomex clothing parts"
+msgid_plural "patchwork Nomex clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork Nomex clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together with Nomex thread from "
+"Nomex patches in a patchwork fashion.  Suitable for making most clothing, "
+"though it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "synthetic fabric sheet"
+msgstr "合成纖維床單"
+
+#. ~ Description for synthetic fabric sheet
+#: lang/json/AMMO_from_json.py
+msgid "A sheet of synthetic fabric, suitable for making clothing."
+msgstr "一大片合成纖維布料，適合用於製作衣服。"
+
+#: lang/json/AMMO_from_json.py
+msgid "patchwork synthetic fabric clothing parts"
+msgid_plural "patchwork synthetic fabric clothing parts"
+msgstr[0] ""
+
+#. ~ Description for patchwork synthetic fabric clothing parts
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A selection of various clothing parts, sewn together from synthetic fabric "
+"patches in a patchwork fashion.  Suitable for making most clothing, though "
+"it's much less time-efficient than if using proper material sheets."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "Kevlar thread"
+msgstr "凱夫勒線"
+
+#. ~ Description for Kevlar thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some very durable Kevlar thread that would be particularly useful for making"
+" ballistic armor, though it's fine to use in place of normal thread too, in "
+"most cases.  Making armor-grade Kevlar sheets from this would need a "
+"particularly tight weave, and so would need some specialized machinery."
+msgstr ""
+"一些非常耐用的凱夫勒線，特別適用於製造防彈護甲，儘管在大多數情況下也可以代替普通縫線。用它來製造護甲等級的凱夫勒布料需要特別緊密的編織，因此需要一些專門的機械。"
+
+#: lang/json/AMMO_from_json.py
+msgid "Nomex thread"
+msgstr "諾梅克斯線"
+
+#. ~ Description for Nomex thread
+#: lang/json/AMMO_from_json.py
+msgid ""
+"Some heat-resistant Nomex thread that would be particularly useful for "
+"making heat protection gear, though it's fine to use in place of normal "
+"thread too, in most cases."
+msgstr "一些耐熱的諾梅克斯線，特別適用於製造防熱裝備，儘管在大多數情況下也可以代替普通縫線。"
+
 #: lang/json/AMMO_from_json.py
 msgid "handloaded .22 CB"
 msgid_plural "handloaded .22 CB"
@@ -4927,6 +5412,18 @@ msgid ""
 "burn hotly upon impact, piercing armor and igniting flammable substances."
 msgstr "用於重機槍或是特種軍事裝備的燃燒彈。燃燒型子彈能夠能在擊中目標時產生劇烈的火焰, 能夠穿甲也能點燃易燃物質。"
 
+#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
+msgid "orichalcum arrow"
+msgstr ""
+
+#. ~ Description for orichalcum arrow
+#: lang/json/AMMO_from_json.py
+msgid ""
+"An arrow composed of a sliver of orichalcum.  The arrow has a mysterious "
+"glow.  Has a very high chance of staying intact when fired, however can only"
+" be fired from Ichaival."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "dragon blood"
 msgid_plural "dragon blood"
@@ -4970,10 +5467,31 @@ msgstr[0] "法力結晶"
 #. ~ Description for crystallized mana
 #: lang/json/AMMO_from_json.py
 msgid ""
-"Some crystallized mana. This can be reloaded into rechargable mana crystals,"
-" but can never be unloaded."
+"Some crystallized mana.  This can be reloaded into rechargable mana "
+"crystals, but can never be unloaded."
 msgstr "一些結晶的法力。這可以重新裝填到可填充的法力水晶中，但永遠不能卸下。"
 
+#: lang/json/AMMO_from_json.py
+msgid "lump of orichalcum"
+msgstr ""
+
+#. ~ Description for lump of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A heavy formed piece of strange metal.  Useful for some crafting recipes."
+msgstr ""
+
+#: lang/json/AMMO_from_json.py
+msgid "sliver of orichalcum"
+msgstr ""
+
+#. ~ Description for sliver of orichalcum
+#: lang/json/AMMO_from_json.py
+msgid ""
+"A sliver of a strange glowing metal.  Useful as a weapon, but better suited "
+"for crafting."
+msgstr ""
+
 #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py
 msgid "fire lance charge"
 msgstr "火尖槍彈藥"
@@ -5452,12 +5970,6 @@ msgid ""
 "blob needs to be healthy.  You think..."
 msgstr "各種類型有機材料的混合物, 包含一切黏球怪所需的健康元素, 至少你是這樣想的。"
 
-#: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/snippet_from_json.py
-msgid "rock"
-msgid_plural "rocks"
-msgstr[0] "石頭"
-
 #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py
 msgid "pool ball"
 msgid_plural "pool balls"
@@ -5946,8 +6458,10 @@ msgstr[0] "刀鞘 (肩帶)"
 #. ~ Use action holster_msg for pair of rollerblades.
 #. ~ Use action holster_msg for pair of rollerskates.
 #. ~ Use action holster_msg for C.R.I.T web belt.
+#. ~ Use action holster_msg for technomancer's toolbelt.
 #. ~ Use action holster_msg for hollow cane.
-#: lang/json/ARMOR_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/ARMOR_from_json.py lang/json/ARMOR_from_json.py
+#: lang/json/GENERIC_from_json.py
 #, no-python-format
 msgid "You sheath your %s"
 msgstr "你把你的 %s 收鞘。"
@@ -6531,6 +7045,43 @@ msgid ""
 "small straps designed to better distribute the weight."
 msgstr ""
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail chausses"
+msgid_plural "pairs of chainmail chausses"
+msgstr[0] ""
+
+#. ~ Description for pair of chainmail chausses
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail chausses that cover the feet, like booties made of "
+"chainmail."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of chainmail gloves"
+msgid_plural "pairs of chainmail gloves"
+msgstr[0] ""
+
+#. ~ Description for pair of chainmail gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Customized chainmail gloves.  They fully enclose the fingers and provide "
+"excellent protection, but are somewhat cumbersome."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday chainmail suit"
+msgid_plural "faraday chainmail suits"
+msgstr[0] ""
+
+#. ~ Description for faraday chainmail suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A fully customized chainmail suit that can be worn over your normal "
+"clothing.  The suit is conductively interconnected, protecting against "
+"electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "leather chaps"
 msgid_plural "leather chaps"
@@ -6667,6 +7218,26 @@ msgid ""
 "A colorful and ridiculous costume fit for a clown.  Provides decent storage."
 msgstr "一件色彩繽紛並搞笑的小丑外衣。有一些儲物空間。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "clown wig"
+msgid_plural "clown wigs"
+msgstr[0] "小丑假髮"
+
+#. ~ Description for clown wig
+#: lang/json/ARMOR_from_json.py
+msgid "A colorful and ridiculous wig fit for a clown."
+msgstr "一頂色彩繽紛而且滑稽的的小丑假髮。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "clown nose"
+msgid_plural "clown noses"
+msgstr[0] "小丑鼻子"
+
+#. ~ Description for clown nose
+#: lang/json/ARMOR_from_json.py
+msgid "A red latex nose often seen being worn by clowns."
+msgstr "小丑經常戴的紅色乳膠鼻子。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "fur coat"
 msgid_plural "fur coats"
@@ -6905,6 +7476,21 @@ msgstr[0] "西裝襯衫"
 msgid "A white button-down shirt with long sleeves.  Looks professional!"
 msgstr "一件白色鈕扣的長袖襯衫。看起來很專業!"
 
+#: lang/json/ARMOR_from_json.py
+msgid "drinking hat"
+msgid_plural "drinking hats"
+msgstr[0] ""
+
+#. ~ Description for drinking hat
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"This is an improvised harness that can be worn over other headgear or bare "
+"head, made from two small liquid containers, a rubber hose, a bundle of "
+"steel wire, and some cordage.  A convenient and simple device for hands-free"
+" drinking, though the liquid inside would spill if you put it into your "
+"backpack."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wedding dress"
 msgid_plural "wedding dresses"
@@ -7035,6 +7621,30 @@ msgstr[0] "腰包"
 msgid "Provides a bit of extra storage, with minimal encumbrance."
 msgstr "能夠多提供一點儲物空間, 只造成極小的累贅。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "underarm protector"
+msgid_plural "underarm protectors"
+msgstr[0] ""
+
+#. ~ Description for underarm protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A sturdy cotton plastron that protects much of the torso, the dominant "
+"shoulder, and underarm while fencing."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "plastic chest protector"
+msgid_plural "plastic chest protectors"
+msgstr[0] ""
+
+#. ~ Description for plastic chest protector
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A rigid plastic plastron with molded cups to be worn by female fencers for "
+"protection while fencing."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing jacket"
 msgid_plural "fencing jackets"
@@ -7047,6 +7657,32 @@ msgid ""
 "accidents.  It doesn't have any storage room, but it is very comfortable."
 msgstr "一件供擊劍運動員使用的帶襯墊的外套, 背後有拉鍊, 用於防止意外。它沒有任何儲物空間, 但是非常舒適。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (foil)"
+msgid_plural "lamé (foil)s"
+msgstr[0] ""
+
+#. ~ Description for lamé (foil)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive vest with the zipper on the back used by "
+"fencers for electronic scoring.  Its outer layer is a woven mix of sturdy "
+"cotton and stainless steel strands."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "lamé (saber)"
+msgid_plural "lamé (saber)s"
+msgstr[0] ""
+
+#. ~ Description for lamé (saber)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A thin, lightweight conductive jacket used by fencers for electronic "
+"scoring.  Its outer layer is a woven mix of sturdy cotton and stainless "
+"steel strands."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "fencing mask"
 msgid_plural "fencing masks"
@@ -7067,6 +7703,30 @@ msgstr[0] "擊劍長褲"
 msgid "A pair of reinforced pants used by fencers to prevent injuries."
 msgstr "一件供擊劍運動員使用的強化長褲, 用於防止受傷。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet"
+msgid_plural "fencing gauntlets"
+msgstr[0] ""
+
+#. ~ Description for fencing gauntlet
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "fencing gauntlet (left)"
+msgid_plural "fencing gauntlet (left)s"
+msgstr[0] ""
+
+#. ~ Description for fencing gauntlet (left)
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A single suede glove with sturdy cotton wrists, padded backs and well-"
+"fitting fingers.  This one is left-handed."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of fire gauntlets"
 msgid_plural "pairs of fire gauntlets"
@@ -7404,18 +8064,6 @@ msgstr[0] "毛皮手套"
 msgid "A pair of warm fur gloves.  They are somewhat cumbersome."
 msgstr "一雙保暖的毛皮手套。會造成一些累贅。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of survivor wetsuit gloves"
-msgid_plural "pairs of survivor wetsuit gloves"
-msgstr[0] "生存者潛水手套"
-
-#. ~ Description for pair of survivor wetsuit gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
-" wear while providing maximum protection under extreme conditions."
-msgstr "一雙訂製的手套, 由凱夫勒裝甲與橡膠製成。便於穿戴, 即使在極端環境下也能提供極致的防護能力。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of heavy survivor gloves"
 msgid_plural "pairs of heavy survivor gloves"
@@ -7472,6 +8120,19 @@ msgid ""
 "wear while providing maximum protection under extreme conditions."
 msgstr "一雙訂製的手套, 由凱夫勒裝甲與棉布製成。便於穿戴, 即使在極端環境下也能提供極致的防護能力。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of fingerless survivor gloves"
+msgid_plural "pairs of fingerless survivor gloves"
+msgstr[0] ""
+
+#. ~ Description for pair of fingerless survivor gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored cloth gloves with no fingers, modified "
+"to be easy to wear while providing maximum protection under extreme "
+"conditions."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of medical gloves"
 msgid_plural "pairs of medical gloves"
@@ -7682,16 +8343,6 @@ msgid ""
 "excellent protection from environmental dangers."
 msgstr "一副大型護目鏡, 能完全密封你的眼睛, 提供絕佳的環境危害防護。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swim goggles"
-msgid_plural "pairs of swim goggles"
-msgstr[0] "泳鏡"
-
-#. ~ Description for pair of swim goggles
-#: lang/json/ARMOR_from_json.py
-msgid "A small pair of goggles made for swimming."
-msgstr "一副適合在游泳時使用的小泳鏡。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of welding goggles"
 msgid_plural "pairs of welding goggles"
@@ -7726,19 +8377,6 @@ msgid ""
 "A heavy, full-length wool coat.  Cumbersome, but warm and with deep pockets."
 msgstr "一件厚重、等身長的羊毛大衣。很累贅, 但是保暖且有大口袋。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit"
-msgid_plural "survivor wetsuits"
-msgstr[0] "生存者潛水服"
-
-#. ~ Description for survivor wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A lightweight, hand-built combination armor made from a cut-down bulletproof"
-" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
-" as from harm."
-msgstr "一件輕量、手工製作的組合護甲, 由剪裁的防彈背心和強化的橡膠潛水服製成。保護你免於傷害與環境危害。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "hakama"
 msgid_plural "hakamas"
@@ -8204,17 +8842,6 @@ msgstr[0] "生存者防火兜帽"
 msgid "A customized armored Nomex and Kevlar hood, very strong and durable."
 msgstr "一頂訂製的兜帽, 由凱夫勒裝甲與諾梅克斯阻燃纖維製成。非常堅固且耐用。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "survivor wetsuit hood"
-msgid_plural "survivor wetsuit hoods"
-msgstr[0] "生存者潛水兜帽"
-
-#. ~ Description for survivor wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A customized armored neoprene and Kevlar hood, very strong and durable."
-msgstr "一頂訂製的兜帽, 由凱夫勒裝甲與橡膠製成。非常堅固且耐用。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "light survivor hood"
 msgid_plural "light survivor hoods"
@@ -8867,18 +9494,25 @@ msgid_plural "leather belts"
 msgstr[0] "皮帶"
 
 #. ~ Use action holster_msg for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_msg for magic leather belt.
+#. ~ Use action holster_msg for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 #, no-python-format
 msgid "You tuck your %s into your %s"
 msgstr "你把 %s 塞進你的 %s"
 
 #. ~ Use action holster_prompt for leather belt.
-#: lang/json/ARMOR_from_json.py
+#. ~ Use action holster_prompt for magic leather belt.
+#. ~ Use action holster_prompt for Belt of Weaponry.
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Stick what into your belt"
 msgstr "把東西夾在腰帶上"
 
 #. ~ Description for leather belt
-#: lang/json/ARMOR_from_json.py
+#. ~ Description for magic leather belt
+#: lang/json/ARMOR_from_json.py lang/json/TOOL_ARMOR_from_json.py
 msgid "A leather belt.  Useful for making your pair of pants fit."
 msgstr "一條皮革腰帶。能讓你的長褲變得合身。"
 
@@ -9032,6 +9666,19 @@ msgid ""
 "variety is favored by the military."
 msgstr "一組利用綁帶束在大腿的袋子。這個款式深受軍人喜愛。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "leotard"
+msgid_plural "leotard"
+msgstr[0] ""
+
+#. ~ Description for leotard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment, covering the body from the groin to the "
+"shoulders.  With its deep scoop-cut back and high waist cuts, this garment "
+"is perfect for showcasing your physique on the stage."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "Linux t-shirt"
 msgid_plural "Linux t-shirts"
@@ -9795,31 +10442,6 @@ msgid ""
 "Activate to sheathe/draw a weapon."
 msgstr "一個可調整的大型刀鞘, 可以放置刀劍或者其他大型武器。使用以收 (或拔) 武器。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "shark suit"
-msgid_plural "shark suits"
-msgstr[0] "防鯊魚裝"
-
-#. ~ Description for shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It comes with attached plastic helmet and booties."
-msgstr "一套供水肺潛水員使用的單件式鏈甲套裝, 用於防止鯊魚咬傷, 附有塑膠頭盔和靴子。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "faraday shark suit"
-msgid_plural "faraday shark suits"
-msgstr[0] "絕緣防鯊魚裝"
-
-#. ~ Description for faraday shark suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A one piece chainmail suit used by scuba divers for protection against shark"
-" bites.  It has been conductively interconnected, protecting against "
-"electricity."
-msgstr "一套供水肺潛水員使用的單件式鏈甲套裝, 用於防止鯊魚咬傷, 附有塑膠頭盔和靴子。其內部電力傳導網路能提供防護能力以抵禦電擊。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "sheath"
 msgid_plural "sheathes"
@@ -9886,6 +10508,18 @@ msgid ""
 "from cuts."
 msgstr "一件牛仔短褲。厚實、強韌, 能提供絕佳的砍劈防護。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "thermal shirt"
+msgid_plural "thermal shirts"
+msgstr[0] ""
+
+#. ~ Description for thermal shirt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, form-fitting long-sleeved spandex undershirt that helps "
+"maintains body temperature."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "skinny tie"
 msgid_plural "skinny ties"
@@ -10315,9 +10949,9 @@ msgstr[0] "樣本裝"
 #: lang/json/ARMOR_from_json.py
 msgid ""
 "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd "
-"tailoring and adjustment points...  maybe you don't want to know who wore "
-"it.  Provides nominal storage and is not very encumbering."
-msgstr "一件厚實的短袖連身服。從怪異的剪裁來判斷… 你也許不會想知道是誰穿過的。能提供微小的儲存空間並且不是很累贅。"
+"tailoring and adjustment points… maybe you don't want to know who wore it.  "
+"Provides nominal storage and is not very encumbering."
+msgstr ""
 
 #: lang/json/ARMOR_from_json.py
 msgid "suit"
@@ -10383,6 +11017,7 @@ msgstr[0] "生存者腰帶"
 #. ~ Use action holster_prompt for survivor utility belt.
 #. ~ Use action holster_prompt for hiking backpack.
 #. ~ Use action holster_prompt for C.R.I.T web belt.
+#. ~ Use action holster_prompt for technomancer's toolbelt.
 #: lang/json/ARMOR_from_json.py
 msgid "Sheath blade"
 msgstr "刀刃收鞘"
@@ -10731,16 +11366,6 @@ msgstr ""
 "一頂經典的 \"船形帽\", 或稱三角帽, 純粹將大而軟的帽沿向上折起固定, 這頂還帶有精緻的刺繡與防水設計。不論你是一個定居點的 \"總督\", "
 "或是一名末日的後船長, 這頂帽子是為你而準備的。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming trunks"
-msgid_plural "pairs of swimming trunks"
-msgstr[0] "四角泳褲"
-
-#. ~ Description for pair of swimming trunks
-#: lang/json/ARMOR_from_json.py
-msgid "A pair of swimming trunks, with netting."
-msgstr "一件男性四角泳褲, 有繩子可以綁。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "t-shirt"
 msgid_plural "t-shirts"
@@ -10978,51 +11603,6 @@ msgid ""
 "would be too casual and a suit would be just overdoing it."
 msgstr "一個優雅的背心。非常適合那些只穿著一件襯衫太隨意, 穿西裝外套太過的場合。"
 
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit"
-msgid_plural "wetsuits"
-msgstr[0] "潛水服"
-
-#. ~ Description for wetsuit
-#: lang/json/ARMOR_from_json.py
-msgid "A full-body neoprene wetsuit."
-msgstr "一套全身橡膠潛水服。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "pair of swimming gloves"
-msgid_plural "pairs of swimming gloves"
-msgstr[0] "潛水手套"
-
-#. ~ Description for pair of swimming gloves
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
-"underwater use."
-msgstr "一雙非常有彈性的潛水布橡膠手套, 很適合在水下使用。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "wetsuit hood"
-msgid_plural "wetsuit hoods"
-msgstr[0] "潛水兜帽"
-
-#. ~ Description for wetsuit hood
-#: lang/json/ARMOR_from_json.py
-msgid "A neoprene hood, commonly worn by divers."
-msgstr "一個橡膠製的頭套, 通常是潛水員穿的。"
-
-#: lang/json/ARMOR_from_json.py
-msgid "spring suit"
-msgid_plural "spring suits"
-msgstr[0] "連身泳衣"
-
-#. ~ Description for spring suit
-#: lang/json/ARMOR_from_json.py
-msgid ""
-"A long-sleeved spring wetsuit with pink color details and cleavage-"
-"enhancing, hip-accentuating construction.  Not as protective as a full-body "
-"suit, but also less restrictive."
-msgstr "一件長袖的粉紅色連身泳裝, 能夠完美的加強女性的胸部集中以及提臀效果。不像潛水衣有全身保護的效果, 但約束感較少。"
-
 #: lang/json/ARMOR_from_json.py
 msgid "pair of army winter gloves"
 msgid_plural "pairs of army winter gloves"
@@ -11330,6 +11910,33 @@ msgid ""
 "Useful for improvised rain protection."
 msgstr "一塊塑料布, 上面有幾個索環供繩索固定。簡易的擋雨物料。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "unitard"
+msgid_plural "unitards"
+msgstr[0] ""
+
+#. ~ Description for unitard
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A skin-tight spandex garment resembling a crew necked leotard combined with "
+"leggings.  Commonly used by gymnasts, dancers and equestrian vaulters, the "
+"unitard provides overall coverage with great flexibility."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "zentai"
+msgid_plural "zentais"
+msgstr[0] ""
+
+#. ~ Description for zentai
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and "
+"spandex garment.  Though it covers your face, you can see through the "
+"integrated hood.  With a couple of these and some friends and you could put "
+"on some kabuki."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "pair of bone arm guards"
 msgid_plural "pairs of bone arm guards"
@@ -13813,6 +14420,132 @@ msgstr ""
 "一套 DoubleTech 動力裝甲 Mk. II-L。這個型號相較 Mk. I 做了許多改進, 特別是減輕了重量。如同所有 DoubleTech "
 "動力裝甲, 其控制系統與溫度調節系統必須與皮膚直接接觸。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming trunks"
+msgid_plural "pairs of swimming trunks"
+msgstr[0] "四角泳褲"
+
+#. ~ Description for pair of swimming trunks
+#: lang/json/ARMOR_from_json.py
+msgid "A pair of swimming trunks, with netting."
+msgstr "一件男性四角泳褲, 有繩子可以綁。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit"
+msgid_plural "wetsuits"
+msgstr[0] "潛水服"
+
+#. ~ Description for wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid "A full-body neoprene wetsuit."
+msgstr "一套全身橡膠潛水服。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "wetsuit hood"
+msgid_plural "wetsuit hoods"
+msgstr[0] "潛水兜帽"
+
+#. ~ Description for wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid "A neoprene hood, commonly worn by divers."
+msgstr "一個橡膠製的頭套, 通常是潛水員穿的。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit hood"
+msgid_plural "survivor wetsuit hoods"
+msgstr[0] "生存者潛水兜帽"
+
+#. ~ Description for survivor wetsuit hood
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A customized armored neoprene and Kevlar hood, very strong and durable."
+msgstr "一頂訂製的兜帽, 由凱夫勒裝甲與橡膠製成。非常堅固且耐用。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "survivor wetsuit"
+msgid_plural "survivor wetsuits"
+msgstr[0] "生存者潛水服"
+
+#. ~ Description for survivor wetsuit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A lightweight, hand-built combination armor made from a cut-down bulletproof"
+" vest and a reinforced neoprene wetsuit.  Protects from the elements as well"
+" as from harm."
+msgstr "一件輕量、手工製作的組合護甲, 由剪裁的防彈背心和強化的橡膠潛水服製成。保護你免於傷害與環境危害。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of survivor wetsuit gloves"
+msgid_plural "pairs of survivor wetsuit gloves"
+msgstr[0] "生存者潛水手套"
+
+#. ~ Description for pair of survivor wetsuit gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of customized, Kevlar armored neoprene gloves, modified to be easy to"
+" wear while providing maximum protection under extreme conditions."
+msgstr "一雙訂製的手套, 由凱夫勒裝甲與橡膠製成。便於穿戴, 即使在極端環境下也能提供極致的防護能力。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "spring suit"
+msgid_plural "spring suits"
+msgstr[0] "連身泳衣"
+
+#. ~ Description for spring suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A long-sleeved spring wetsuit with pink color details and cleavage-"
+"enhancing, hip-accentuating construction.  Not as protective as a full-body "
+"suit, but also less restrictive."
+msgstr "一件長袖的粉紅色連身泳裝, 能夠完美的加強女性的胸部集中以及提臀效果。不像潛水衣有全身保護的效果, 但約束感較少。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "faraday shark suit"
+msgid_plural "faraday shark suits"
+msgstr[0] "絕緣防鯊魚裝"
+
+#. ~ Description for faraday shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It has been conductively interconnected, protecting against "
+"electricity."
+msgstr "一套供水肺潛水員使用的單件式鏈甲套裝, 用於防止鯊魚咬傷, 附有塑膠頭盔和靴子。其內部電力傳導網路能提供防護能力以抵禦電擊。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "shark suit"
+msgid_plural "shark suits"
+msgstr[0] "防鯊魚裝"
+
+#. ~ Description for shark suit
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A one piece chainmail suit used by scuba divers for protection against shark"
+" bites.  It comes with attached plastic helmet and booties."
+msgstr "一套供水肺潛水員使用的單件式鏈甲套裝, 用於防止鯊魚咬傷, 附有塑膠頭盔和靴子。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swim goggles"
+msgid_plural "pairs of swim goggles"
+msgstr[0] "泳鏡"
+
+#. ~ Description for pair of swim goggles
+#: lang/json/ARMOR_from_json.py
+msgid "A small pair of goggles made for swimming."
+msgstr "一副適合在游泳時使用的小泳鏡。"
+
+#: lang/json/ARMOR_from_json.py
+msgid "pair of swimming gloves"
+msgid_plural "pairs of swimming gloves"
+msgstr[0] "潛水手套"
+
+#. ~ Description for pair of swimming gloves
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A pair of very flexible neoprene-silicone rubber gloves, suitable for "
+"underwater use."
+msgstr "一雙非常有彈性的潛水布橡膠手套, 很適合在水下使用。"
+
 #: lang/json/ARMOR_from_json.py
 msgid "helmet netting"
 msgid_plural "helmet nettings"
@@ -14380,6 +15113,50 @@ msgid "shotgun bandolier"
 msgid_plural "shotgun bandoliers"
 msgstr[0] "霰彈槍斜背子彈帶"
 
+#: lang/json/ARMOR_from_json.py
+msgid "technomancer's toolbelt"
+msgid_plural "technomancer's toolbelts"
+msgstr[0] ""
+
+#. ~ Description for technomancer's toolbelt
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"A custom-built leather utility belt that instantly creates any tool that you"
+" reach for.  Activate to sheathe/draw a weapon."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "seven league boots"
+msgid_plural "pairs of seven league boots"
+msgstr[0] ""
+
+#. ~ Description for seven league boots
+#. ~ Description for boots of haste
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, they look like they've seen a lot of use and will likely see a lot "
+"more.  They make your movement a lot less work."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of haste"
+msgid_plural "pairs of boots of haste"
+msgstr[0] ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "boots of grounding"
+msgid_plural "pairs of boots of grounding"
+msgstr[0] ""
+
+#. ~ Description for boots of grounding
+#: lang/json/ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of leather with "
+"small engraved runes seemingly filled with rubber.  When worn, you are "
+"immune to damage from electricity."
+msgstr ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "copper infusion bracelet"
 msgid_plural "copper infusion bracelets"
@@ -14400,9 +15177,9 @@ msgstr[0] "銅飾環"
 #. ~ Description for copper circlet
 #: lang/json/ARMOR_from_json.py
 msgid ""
-"A wooden band with copper trimmings to be worn on the head. Touching your "
+"A wooden band with copper trimmings to be worn on the head.  Touching your "
 "temples with it on makes you feel very calm."
-msgstr "一個鑲有銅飾的木質環帶，可戴在頭上。當它觸及你的太陽穴時，你感到非常地寧靜祥和。"
+msgstr ""
 
 #: lang/json/ARMOR_from_json.py
 msgid "pair of black dragonscale boots"
@@ -14580,6 +15357,22 @@ msgid ""
 "minimize encumbrance."
 msgstr "一只大型的肉質袋子，能背在背上。裡面滿布著小觸手，能夠抓握住你放進袋中的東西，它會自動移動和調整，使你的累贅值降到最低。"
 
+#: lang/json/ARMOR_from_json.py
+msgid "acid resistance aura"
+msgid_plural "acid resistance auras"
+msgstr[0] ""
+
+#. ~ Description for acid resistance aura
+#. ~ Description for greater acid resistance aura
+#: lang/json/ARMOR_from_json.py
+msgid "An all-encompassing, invisible layer of protection against acid."
+msgstr ""
+
+#: lang/json/ARMOR_from_json.py
+msgid "greater acid resistance aura"
+msgid_plural "greater acid resistance auras"
+msgstr[0] ""
+
 #: lang/json/ARMOR_from_json.py
 msgid "wooden shield"
 msgid_plural "wooden shields"
@@ -15070,9 +15863,9 @@ msgstr[0] "CBM: 酒精發電器"
 #. ~ Description for Ethanol Burner CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A reactor that burns alcohol as fuel in an extremely efficient reaction.  "
-"However, the user will still suffer the inebriating effects of the "
-"substance."
+"A reactor that burns alcohol as fuel in an extremely efficient reaction.  It"
+" can store up to 500ml and accept ethanol, methanol and denatured aclohol as"
+" fuel."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -15081,8 +15874,7 @@ msgid_plural "Aero-Evaporator CBMs"
 msgstr[0] "CBM: 濕氣凝水裝置"
 
 #. ~ Description for Aero-Evaporator CBM
-#. ~ Description for Aero-Evaporator
-#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
+#: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
 "This unit draws moisture from the surrounding air, which then is poured from"
 " a fingertip in the form of water.  It may fail in very dry environments."
@@ -15146,10 +15938,10 @@ msgstr[0] "CBM: 手指駭客"
 #. ~ Description for Fingerhack CBM
 #: lang/json/BIONIC_ITEM_from_json.py
 msgid ""
-"A miniature electrohack, surgically embedded in a finger of the right hand. "
-"This is an all-purpose hacking unit used to override control panels and the "
-"like, but not computers.  Computer proficiency is important, and a failed "
-"use may cause damage."
+"A miniature electrohack, surgically embedded in a finger of the right hand."
+"  This is an all-purpose hacking unit used to override control panels and "
+"the like, but not computers.  Computer proficiency is important, and a "
+"failed use may cause damage."
 msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py
@@ -15488,7 +16280,7 @@ msgstr[0] "CBM: 動力裝甲介面 Mk. II"
 msgid ""
 "Interfaces the user's bionic power system with the internal charging port on"
 " suits of power armor, allowing them to draw from the user's bionic power "
-"banks. Twice as efficient as the Mk. I model.  The Mk. II was designed by "
+"banks.  Twice as efficient as the Mk. I model.  The Mk. II was designed by "
 "DoubleTech Inc., to meet the popularity of the Mk. II power armor series."
 msgstr ""
 
@@ -16006,9 +16798,8 @@ msgstr[0] "發出微光的玩意兒"
 
 #. ~ Description for Glowy Thing
 #: lang/json/BIONIC_ITEM_from_json.py
-msgid ""
-"It's a... thing?  And it glows, at least it did when it was plugged in."
-msgstr "這是一個......東西？它微微地發光，至少在它被安上的時候。"
+msgid "It's a… thing?  And it glows, at least it did when it was plugged in."
+msgstr ""
 
 #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py
 msgid "Leaky Bionic"
@@ -16539,8 +17330,8 @@ msgstr[0] "供餐人"
 
 #. ~ Description for To Serve Man
 #: lang/json/BOOK_from_json.py
-msgid "It's...  it's a cookbook!"
-msgstr "這… 這是一本食譜?!"
+msgid "It's… it's a cookbook!"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Cucina Italiana"
@@ -16627,8 +17418,8 @@ msgstr[0] "PE050 \"阿爾法\": 初步報告"
 msgid ""
 "This sheaf of papers-dated two weeks before all this started-describes some "
 "new chemical formula, and its effects on human subjects.  It's stamped "
-"\"APPROVED\"..."
-msgstr "這疊紙上印的日期是兩週之前, 講述了一些新的化學配方, 及其對人類受試者的影響。已被蓋上 \"批准\" 的章…"
+"\"APPROVED\"…"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "lab journal-Dionne"
@@ -16652,8 +17443,8 @@ msgstr[0] "PE065 \"嵌合體\": 最佳實踐"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This sheaf of papers describes a new chemical formula in detail and supplies"
-" instructions for its use as some sort of ... crowd-control catalyst?  That "
-"can't be right..."
+" instructions for its use as some sort of… crowd-control catalyst?  That "
+"can't be right…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -16666,8 +17457,8 @@ msgstr[0] "實驗室日誌-Smythe"
 msgid ""
 "This team logbook details several varieties of mutagenic experiments, "
 "focusing on those derived from flesh contaminated with XE037.  The results "
-"look promising but the procurement methods seem awfully vague..."
-msgstr "該團隊日誌詳述了幾個品種的突變實驗, 著眼於感染 XE037 之肉體的衍生。結果看起來很前途, 但是採購方式卻很模糊…"
+"look promising but the procurement methods seem awfully vague…"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "standpipe maintenance log"
@@ -16679,8 +17470,8 @@ msgstr[0] "豎管維護日誌"
 msgid ""
 "This binder details the scheduled maintenance for several plumbing systems "
 "throughout the facility.  However, some of the log sheets seem to be filled "
-"with...a chemical formula?"
-msgstr "這個文件詳細記錄了貫穿各設施的管道系統的維護狀況。然而, 一些記錄表中似乎充滿了… 化學式?"
+"with… a chemical formula?"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "chemical reference-CLASSIFIED"
@@ -16721,8 +17512,8 @@ msgstr[0] "PE023 \"醫療\": 應用與結果"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This binder of highly technical papers describes some new chemical formula, "
-"and its effects on human subjects.  It's stamped \"APPROVED\"...."
-msgstr "描述一些新的化學配方的高科技技術報告, 及其對人類受試者的影響。它蓋了 \"批准\" 的章…"
+"and its effects on human subjects.  It's stamped \"APPROVED\"…"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "PE070 \"Raptor\": Proposal"
@@ -16986,8 +17777,8 @@ msgstr[0] "實驗室日誌-Herrera"
 msgid ""
 "This hefty binder contains a multitude of diagrams and technical "
 "specifications for various electronic materials.  Some of the diagrams use "
-"symbols you've not seen before..."
-msgstr "這沉重的文件含有大量的圖表和各種電子材料的技術規範。有些圖表運用了你從來沒看過的符號…"
+"symbols you've not seen before…"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "2XI design binder-CLASSIFIED"
@@ -17049,13 +17840,13 @@ msgstr[0] "泛型原理圖"
 #. ~ Description for nearby fire
 #. ~ Description for muscle
 #. ~ Description for wind
+#. ~ Description for metabolism
 #. ~ Description for a smoking device and a source of flame
 #. ~ Description for abstract map
 #. ~ Description for seeing this is a bug
 #. ~ Description for weapon
 #: lang/json/BOOK_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
-#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
 #: lang/json/furniture_from_json.py lang/json/skill_from_json.py
 msgid "seeing this is a bug"
 msgid_plural "seeing this is a bugs"
@@ -17388,9 +18179,9 @@ msgstr[0] "手工填彈指南"
 #: lang/json/BOOK_from_json.py
 msgid ""
 "Everything you could ever want to know about handloading ammunition, sealed "
-"with a ...childproof cover.  Apparently a liability thing, because the "
-"chapter on explosive rounds covers them in excellent detail too."
-msgstr "裡面有關於手工裝配子彈的所有知識, 封面有著… 18 禁的標誌。顯然這是必要的, 因為裡面有個章節詳細講述了高爆子彈。"
+"with a… childproof cover.  Apparently a liability thing, because the chapter"
+" on explosive rounds covers them in excellent detail too."
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "Rivtech design binder"
@@ -17855,7 +18646,7 @@ msgid ""
 "This lab notebook is filled with the collective discoveries and refinements "
 "of a research team dedicated to nuclear energy.  You don't think you're "
 "ready to start a second Cataclysm, but the general information provided "
-"might be useful..."
+"might be useful…"
 msgstr ""
 
 #: lang/json/BOOK_from_json.py
@@ -19118,6 +19909,34 @@ msgid ""
 " that the author's real name is Fereidoun M. Esfandiary."
 msgstr ""
 
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Bastiat Collection\", a large collection of essays "
+"by Frederic Bastiat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Anarchy, State, and Utopia\" by Robert Nozick, one of "
+"the most influential books of modern libertarianism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Socialism\" by Ludwig von Mises, a critical examination "
+"of socialism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The ABC of Communism\" by Nikolai Bukharin, one of the "
+"most influential books of early Marxism-Leninism."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "phone book"
 msgid_plural "phone books"
@@ -19185,8 +20004,8 @@ msgstr[0] "企業財務報表"
 
 #. ~ Description for corporate accounting ledger
 #: lang/json/BOOK_from_json.py
-msgid "If you knew what to look for something might stand out..."
-msgstr "如果你看懂的話, 會有人跳腳的…"
+msgid "If you knew what to look for something might stand out…"
+msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "patient treatment records"
@@ -19423,6 +20242,106 @@ msgstr "這是杜馬斯的“基督山伯爵”的副本。"
 msgid "This is a copy of \"The Secret Garden\" by Frances Burnett."
 msgstr "這是法蘭西絲·霍森·柏納特的“秘密花園”的副本。"
 
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Master and Commander\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Warden\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Far Side of the World\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"HMS Surprise\" by Patrick O'Brian."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Barchester Towers\" by Anthony Trollope."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Land Ironclads\" by H.G. Wells."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Parasite\" by Arthur Conan Doyle."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"By Stroke of Sword\" by Andrew Balfour."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Secret Agent\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Lord Jim\" by Joseph Conrad."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace "
+"Thackeray."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"North and South\" by Elizabeth Gaskell."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Wessex Tales\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Captains Courageous\" by Rudyard Kipling."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid ""
+"This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-"
+"Lytton."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "This is a copy of \"Peter Simple\" by Frederick Marryat."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "collector's edition book"
 msgid_plural "collector's edition book"
@@ -20311,10 +21230,11 @@ msgstr "玩家試圖找出是誰謀殺了管家的遊戲。"
 
 #: lang/json/BOOK_from_json.py
 msgid "Black Dragons: Swamp Ruins"
-msgid_plural "Black Dragons: Swamp Ruinss"
-msgstr[0] "黑龍：沼澤廢墟"
+msgid_plural "copies of Black Dragons: Swamp Ruins"
+msgstr[0] "《黑龍：沼澤廢墟》的副本"
 
-#. ~ Description for Black Dragons: Swamp Ruins
+#. ~ Description for {'str': 'Black Dragons: Swamp Ruins', 'str_pl': 'copies
+#. of Black Dragons: Swamp Ruins'}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "This book details black dragons: The most evil of dragons, who live in ruins"
@@ -20326,26 +21246,57 @@ msgstr ""
 
 #: lang/json/BOOK_from_json.py
 msgid "A Beginner's Guide to Alchemy"
-msgid_plural "A Beginner's Guide to Alchemys"
-msgstr[0] "煉金術初學指南"
+msgid_plural "copies of A Beginner's Guide to Alchemy"
+msgstr[0] "《煉金術初學指南》的副本"
 
-#. ~ Description for A Beginner's Guide to Alchemy
+#. ~ Description for {'str': "A Beginner's Guide to Alchemy", 'str_pl':
+#. "copies of A Beginner's Guide to Alchemy"}
 #: lang/json/BOOK_from_json.py
 msgid "A paperback tome for the art of liquid magic, alcohol not included."
 msgstr "一本關於液態魔法技藝的平裝魔典，但不包括酒類。"
 
 #: lang/json/BOOK_from_json.py
 msgid "A Soulbinder's Guide to Necromancy"
-msgid_plural "A Soulbinder's Guide to Necromancys"
-msgstr[0] "死靈法術的靈魂束縛者指南"
+msgid_plural "copies of A Soulbinder's Guide to Necromancy"
+msgstr[0] "《死靈法術的靈魂束縛者指南》的副本"
 
-#. ~ Description for A Soulbinder's Guide to Necromancy
+#. ~ Description for {'str': "A Soulbinder's Guide to Necromancy", 'str_pl':
+#. "copies of A Soulbinder's Guide to Necromancy"}
 #: lang/json/BOOK_from_json.py
 msgid ""
 "A paperback tome for the art of binding undead creatures' souls to dolls, "
 "along with emulating their healing factor."
 msgstr "一本平裝魔典，記述將不死生物靈魂綁定到玩偶的技藝，以及模仿它們的治療因子。"
 
+#: lang/json/BOOK_from_json.py
+msgid "Magitek Illustrated"
+msgid_plural "copies of Magitek Illustrated"
+msgstr[0] ""
+
+#. ~ Description for {'str': 'Magitek Illustrated', 'str_pl': 'copies of
+#. Magitek Illustrated'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"A paperback tome for the art of combining modern technology with magic.  "
+"There is a disclaimer on the back: `Cannith Industries bears no "
+"responsibility for malfunctions or accidents for any products mentioned "
+"herein`."
+msgstr ""
+
+#: lang/json/BOOK_from_json.py
+msgid "The Weapons of Asgard and Beyond"
+msgid_plural "copies of The Weapons of Asgard and Beyond"
+msgstr[0] ""
+
+#. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl':
+#. 'copies of The Weapons of Asgard and Beyond'}
+#: lang/json/BOOK_from_json.py
+msgid ""
+"An ornate book which appears to be written in Norse runes.  Based on the "
+"detailed illustrations, it appears to contain information about crafting "
+"numerous weapons used by various Gods."
+msgstr ""
+
 #: lang/json/BOOK_from_json.py
 msgid "SugarKin flyer"
 msgid_plural "SugarKin flyers"
@@ -20780,7 +21731,7 @@ msgstr "乙炔"
 #. ~ Description for acetylene
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A flammable gas that explodes under pressure. Combined with oxygen, "
+"A flammable gas that explodes under pressure.  Combined with oxygen, "
 "acetylene makes a great welding gas."
 msgstr "易燃氣體，在壓力下會爆炸。乙炔與氧氣結合使用，是一種很好的焊接氣體。"
 
@@ -21650,6 +22601,40 @@ msgstr "大型人胃"
 msgid "The stomach of a large humanoid creature.  It is surprisingly durable."
 msgstr "來自人型生物的大型胃袋, 比想像中結實。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of human fat"
+msgid_plural "chunks of human fat"
+msgstr[0] ""
+
+#. ~ Description for chunk of human fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly harvested from a human body."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human tallow"
+msgstr ""
+
+#. ~ Description for human tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered human fat.  It will remain "
+"edible for a very long time, and can be used as an ingredient in many foods "
+"and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "human lard"
+msgstr ""
+
+#. ~ Description for human lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered human fat.  It will remain edible for a"
+" very long time, and can be used as an ingredient in many foods and "
+"projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "human flesh"
 msgid_plural "human fleshes"
@@ -21692,6 +22677,59 @@ msgid ""
 "pinch."
 msgstr "這是一小塊食用肉。 它並不多，但在你沒有選擇時也夠了。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant meat"
+msgid_plural "chunks of mutant meat"
+msgstr[0] "突變體肉塊"
+
+#. ~ Description for chunk of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Meat from a heavily mutated animal.  It has an unsettling loose and spongy "
+"texture, but smells… mostly normal.  There are strange tangles and "
+"formations in it that don't appear natural at all: bits of bone and hair "
+"crusted up inside the muscle, as if trying to form another organism.  Still,"
+" seems digestible at least, if you cook it and remove the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scrap of mutant meat"
+msgid_plural "scraps of mutant meat"
+msgstr[0] "突變體肉碎片"
+
+#. ~ Description for scrap of mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, "
+"and has bits of hair and bone mixed in that seem like they grew inside the "
+"muscle itself.  Still, seems digestible at least, if you cook it and remove "
+"the worst parts."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid meat"
+msgstr ""
+
+#. ~ Description for mutant humanoid meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered from the body of a heavily mutated creature that was "
+"unsettlingly humanoid in appearance.  It has odd bits of fur and other "
+"tissue lodged in it that clearly don't belong.  You'd have to be crazy or "
+"starving to eat this."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked cretin"
+msgstr ""
+
+#. ~ Description for cooked cretin
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Cooked meat from a heavily mutated humanoid.  Now that the worst bits have "
+"been picked out, it's probably digestible, if not very appetizing."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "butchery refuse"
 msgid_plural "butchery refuse"
@@ -21723,6 +22761,23 @@ msgid "cooked scrap of meat"
 msgid_plural "cooked scraps of meat"
 msgstr[0] "煮熟的肉渣"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked mutant meat"
+msgstr "煮熟的突變體肉"
+
+#. ~ Description for cooked mutant meat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"This is a cooked chunk of meat from a mutated animal.  It has an unsettling,"
+" spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all"
+" the bits of hair and bone out…"
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cooked scrap of mutant meat"
+msgid_plural "cooked scraps of mutant meat"
+msgstr[0] "煮熟的突變體肉碎片"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raw offal"
 msgstr "生內臟"
@@ -21917,8 +22972,8 @@ msgstr[0] "生腦"
 
 #. ~ Description for raw brains
 #: lang/json/COMESTIBLE_from_json.py
-msgid "The brain from an animal.  You wouldn't want to eat this raw..."
-msgstr "動物體內的大腦。你不會想生吃它的..."
+msgid "The brain from an animal.  You wouldn't want to eat this raw…"
+msgstr "來自動物的大腦。你不會想生吃它的..."
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cooked brains"
@@ -21969,7 +23024,7 @@ msgstr "熟胰臟"
 
 #. ~ Description for cooked sweetbread
 #: lang/json/COMESTIBLE_from_json.py
-msgid "Normally a delicacy, it needs a little... something."
+msgid "Normally a delicacy, it needs a little… something."
 msgstr "照理說應該很美味，但它還需要...一些東西調味。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -22019,6 +23074,76 @@ msgid ""
 "projects."
 msgstr "一塊從動物脂肪中提煉乾燥而成的白色光滑物體。它的食用保存期限非常長, 並且可以用作許多食品和製作的原料。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant fat"
+msgid_plural "chunks of mutant fat"
+msgstr[0] "突變體脂肪塊"
+
+#. ~ Description for chunk of mutant fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Freshly butchered fat from a heavily mutated animal.  You could eat it raw, "
+"but it is better used as an ingredient in other foods or projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant tallow"
+msgstr "突變體動物脂"
+
+#. ~ Description for mutant tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"animal.  It will remain edible for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant lard"
+msgstr "突變體豬油"
+
+#. ~ Description for mutant lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant animal.  It "
+"will remain edible for a very long time, and can be used as an ingredient in"
+" many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "chunk of mutant humanoid fat"
+msgid_plural "chunks of mutant humanoid fat"
+msgstr[0] ""
+
+#. ~ Description for chunk of mutant humanoid fat
+#: lang/json/COMESTIBLE_from_json.py
+msgid "Freshly butchered fat from a heavily mutated humanoid."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid tallow"
+msgstr ""
+
+#. ~ Description for mutant humanoid tallow
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of cleaned and rendered fat sourced from a mutant "
+"humanoid.  It won't rot for a very long time, and can be used as an "
+"ingredient in many foods and projects."
+msgstr ""
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "mutant humanoid lard"
+msgstr ""
+
+#. ~ Description for mutant humanoid lard
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A smooth white block of dry-rendered fat sourced from a mutant humanoid.  It"
+" won't rot for a very long time, and can be used as an ingredient in many "
+"foods and projects."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chunk of tainted meat"
 msgid_plural "chunks of tainted meat"
@@ -22187,10 +23312,8 @@ msgid ""
 "covered in ribbed grooves and easily the size of your head.  It's still full"
 " of, er, whatever passes for blood in jabberwocks, and is heavy in your "
 "hands.  After everything you've seen lately, you can't help but remember old"
-" sayings about eating the hearts of your enemies..."
+" sayings about eating the hearts of your enemies…"
 msgstr ""
-"厚重的一團肉, 看似一顆哺乳動物的心臟, 藏在肋槽間, 接近你頭部的大小。它仍然充滿著… 呃… 管它是啥地從變種魔獸血液流過的東西, "
-"在你的手中顯得很沉重。在你最近經歷的種種事情後, 你不禁想起關於吃掉敵人心臟的傳說…"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "desiccated putrid heart"
@@ -22204,7 +23327,7 @@ msgid ""
 "looks *disgusting*."
 msgstr "一塊巨大的肌肉, 腐爛心臟的所有殘餘, 已被切開並排出血液。如果你餓的話就可以吃了它, 只是看起來有些 *噁心*。"
 
-#: lang/json/COMESTIBLE_from_json.py
+#: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py
 msgid "raw milk"
 msgid_plural "raw milk"
 msgstr[0] "生乳"
@@ -22494,9 +23617,9 @@ msgstr[0] "菊苣咖啡"
 #. ~ Description for chicory brew
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"Toasted, ground chicory root steeped in boiling water. This bitter brew is "
+"Toasted, ground chicory root steeped in boiling water.  This bitter brew is "
 "used as a coffee substitute, though it tastes nothing like coffee."
-msgstr "烘烤後、磨碎的菊苣根浸泡在沸水中。這種苦味飲品用來當作咖啡的替代品，雖然它的味道不像咖啡。"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "dark cola"
@@ -23332,10 +24455,11 @@ msgstr "切成環狀的鳳梨浸在糖水裡。滿好吃的。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lemonade drink mix"
-msgid_plural "servings of lemonade drink mix"
+msgid_plural "lemonade drink mix"
 msgstr[0] "檸檬水沖劑"
 
-#. ~ Description for lemonade drink mix
+#. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink
+#. mix'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Tangy yellow powder that smells strongly of lemons.  Can be mixed with water"
@@ -24028,8 +25152,8 @@ msgstr[0] "奶油花生糖"
 
 #. ~ Description for peanut butter candy
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of peanut butter cups...  your favorite!"
-msgstr "一把奶油花生糖… 你的最愛!"
+msgid "A handful of peanut butter cups… your favorite!"
+msgstr "少量奶油花生糖… 你的最愛！"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chocolate candy"
@@ -24137,7 +25261,7 @@ msgstr "美味的巧克力蛋糕。裹滿了糖衣。滿滿的。"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A cake coated in the thickest icing you've ever seen.  Someone has written "
-"guff in quotation marks on it..."
+"guff in quotation marks on it…"
 msgstr "裹滿了你從沒看過的厚厚糖衣。有人在蛋糕上面寫了瘋話…"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -24178,8 +25302,8 @@ msgstr[0] "薄荷餡餅"
 
 #. ~ Description for peppermint patty
 #: lang/json/COMESTIBLE_from_json.py
-msgid "A handful of soft chocolate-covered peppermint patties...  yum!"
-msgstr "一把覆蓋巧克力的軟薄荷餡餅… 味道好極了!"
+msgid "A handful of soft chocolate-covered peppermint patties… yum!"
+msgstr "一把覆蓋巧克力的軟薄荷餡餅… 味道好極了！"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Necco wafers"
@@ -24755,6 +25879,17 @@ msgid ""
 "filling."
 msgstr "罐頭豬肉產品, 有著不自然的粉紅色與奇怪的橡膠感, 並且不好吃, 但這午餐肉仍然相當有份量。雖然完全引不起食慾, 但很有飽足感。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "holy SPAM of debugging"
+msgstr ""
+
+#. ~ Description for holy SPAM of debugging
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"A mysterious lump of SPAM that contains just enough calories and vitamins to"
+" feed you for a day.  For debug use only."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "canned sardine"
 msgstr "沙丁魚罐頭"
@@ -25150,7 +26285,7 @@ msgstr "用薄麵皮將肉類內餡包起, 煮熟後就是份美味的餃子。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "homemade burrito"
-msgstr ""
+msgstr "自製墨西哥捲餅"
 
 #. ~ Description for homemade burrito
 #: lang/json/COMESTIBLE_from_json.py
@@ -25580,7 +26715,7 @@ msgstr[0] "殺菌粉"
 msgid ""
 "A powdered form of chemical antiseptic, this bismuth formic iodide cleans "
 "wounds quickly and painlessly."
-msgstr ""
+msgstr "粉狀的化學殺菌劑，這種碘化鉍鉀粉末可以快速輕鬆的處理傷口。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "caffeinated chewing gum"
@@ -26306,8 +27441,8 @@ msgstr[0] "消毒過的布條"
 #. ~ Description for antiseptic soaked rag
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A rag soaked in antiseptic. Useful for light wounds, probaby won't help with"
-" deep bites."
+"A rag soaked in antiseptic.  Useful for light wounds, probaby won't help "
+"with deep bites."
 msgstr "一條浸泡過消毒劑的布條。對小傷口有幫助，對被咬得很深的傷口沒用。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -26363,7 +27498,7 @@ msgid ""
 "oily liquid that shifts from black to purple at unpredictable intervals, "
 "flecked with tiny gray dots.  Given the place you got it from, it's either "
 "very potent, or highly experimental.  Holding it, all the little aches and "
-"pains seem to fade, just for a moment..."
+"pains seem to fade, just for a moment…"
 msgstr ""
 "一個鮮紅色的凝膠膠囊，大約指甲大小。裝入了濃稠的油性液體，顏色時而轉黑時而轉紫，並且帶有灰色斑點。考量到你取得的地點，這東西看似為高度實驗性的物品。握著它，似乎所有的疼痛都消失了..."
 
@@ -26381,7 +27516,7 @@ msgstr "從香蒲中收穫的透明膠質，具有防腐功能，可作為止痛
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "destragon"
-msgstr ""
+msgstr "烈性抗生素"
 
 #. ~ Description for destragon
 #: lang/json/COMESTIBLE_from_json.py
@@ -26753,9 +27888,9 @@ msgstr "抽象IV誘變劑風味"
 #. ~ Description for abstract iv mutagen flavor
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A super-concentrated mutagen.  You need a syringe to inject it...  if you "
+"A super-concentrated mutagen.  You need a syringe to inject it… if you "
 "really want to?"
-msgstr "一個超濃縮的突變劑。你需要一個針筒才能注射… 如果你真的想這麼做?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagenic serum"
@@ -26769,8 +27904,8 @@ msgstr "阿爾法血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen strongly resembling blood.  You need a syringe "
-"to inject it...  if you really want to?"
-msgstr "一個非常像是血液的超濃縮突變劑。你需要一個針筒才能注射… 如果你真的想這麼做?"
+"to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "beast serum"
@@ -26780,8 +27915,8 @@ msgstr "獸形血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as red as a matador's cape.  You need a syringe"
-" to inject it...  if you really want to?"
-msgstr "一個超濃縮的誘變劑，像鬥牛士的斗篷一樣紅。你需要一個針筒才能注射… 如果你真的想這麼做?"
+" to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bird serum"
@@ -26791,8 +27926,8 @@ msgstr "鳥形血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the pre-cataclysmic skies.  You "
-"need a syringe to inject it...  if you really want to?"
-msgstr "一個有著末日前天空色的超濃縮突變劑。你需要一個針筒才能注射… 如果你真的想這麼做?"
+"need a syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cattle serum"
@@ -26802,8 +27937,8 @@ msgstr "牛形血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of grass.  You need a syringe to "
-"inject it...  if you really want to?"
-msgstr "一個草綠色的超濃縮突變劑。你需要一個針筒才能注射… 如果你真的想這麼做?"
+"inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cephalopod serum"
@@ -26813,8 +27948,8 @@ msgstr "頭足類血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as black as ink.  You need a syringe to inject "
-"it...  if you really want to?"
-msgstr "一個宛如墨水的超濃縮的誘變劑。你需要一個針筒才能注射… 如果你真的想這麼做?"
+"it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "chimera serum"
@@ -26824,8 +27959,8 @@ msgstr "嵌合體血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that churns with iridescence.  You need a "
-"syringe to inject it...  if you really want to?"
-msgstr "一個虹色的超濃縮誘變劑。你需要一個針筒才能注射......如果你真的想要？"
+"syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "elf-a serum"
@@ -26835,8 +27970,8 @@ msgstr "妖精血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a striking sylvan green.  You need a "
-"syringe to inject it...  if you really want to?"
-msgstr "一個由樹汁提煉的超濃縮誘變劑。你需要一個針筒才能注射......如果你真的想要？"
+"syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "feline serum"
@@ -26846,8 +27981,8 @@ msgstr "貓形血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen, yellow and highly reflective.  You need a "
-"syringe to inject it...  if you really want to?"
-msgstr "一個帶著映照黃光的超濃縮的誘變劑。你需要一個針筒才能注射… 你真的想這麼做？"
+"syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "fish serum"
@@ -26857,8 +27992,8 @@ msgstr "魚形血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen the color of the ocean, with white foam at the "
-"top.  You need a syringe to inject it...  if you really want to?"
-msgstr "一個海洋色的超濃縮突變劑。你需要一個針筒才能注射… 如果你真的想這麼做?"
+"top.  You need a syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "insect serum"
@@ -26868,8 +28003,8 @@ msgstr "昆蟲血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a beautiful amber color.  You need a "
-"syringe to inject it...  if you really want to?"
-msgstr "一個漂亮琥珀色的超濃縮誘變劑，你需要一個針筒才能注射… 你真的想這麼做？"
+"syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lizard serum"
@@ -26879,8 +28014,8 @@ msgstr "蛇蜥血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that shifts between various shades of green.  "
-"You need a syringe to inject it...  if you really want to?"
-msgstr "一個變換著不同深淺的綠色超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+"You need a syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "lupine serum"
@@ -26890,8 +28025,8 @@ msgstr "狼形血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen as white as a full moon.  You need a syringe to"
-" inject it...  if you really want to?"
-msgstr "一個如滿月般皎潔的超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+" inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "medical serum"
@@ -26901,8 +28036,8 @@ msgstr "醫療血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like a mixture of bodily fluids.  "
-"You need a syringe to inject it...  if you really want to?"
-msgstr "一個像混合體液的超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+"You need a syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "plant serum"
@@ -26912,8 +28047,8 @@ msgstr "植物血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks like pureed spinach.  You need a "
-"syringe to inject it...  if you really want to?"
-msgstr "一個像菠菜泥的超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+"syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "raptor serum"
@@ -26923,8 +28058,8 @@ msgstr "猛禽血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to shift slightly whenever you look "
-"at it.  You need a syringe to inject it...  if you really want to?"
-msgstr "一個你每次看它都會微小變化的超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+"at it.  You need a syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "rat serum"
@@ -26934,8 +28069,8 @@ msgstr "鼠形血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's a rather unappealing beige.  You need a "
-"syringe to inject it...  if you really want to?"
-msgstr "一個不太吸引人的米色超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+"syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "slime serum"
@@ -26945,8 +28080,8 @@ msgstr "黏液血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that looks very much like the black ooze in the"
-" zombies' eyes.  You need a syringe to inject it...  if you really want to?"
-msgstr "一個極像是殭屍眼中流出的黑色黏液的超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+" zombies' eyes.  You need a syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "spider serum"
@@ -26956,8 +28091,8 @@ msgstr "蛛形血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen with pale filaments suspended in it.  You need "
-"a syringe to inject it...  if you really want to?"
-msgstr "一個懸浮著蒼白細絲的超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+"a syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "troglobite serum"
@@ -26967,8 +28102,8 @@ msgstr "穴居生物血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that seems to recoil from the light.  You need "
-"a syringe to inject it...  if you really want to?"
-msgstr "一個像在閃躲光線的超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+"a syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "ursine serum"
@@ -26978,8 +28113,8 @@ msgstr "熊形血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen that's the color of honey, and is just as "
-"thick.  You need a syringe to inject it...  if you really want to?"
-msgstr "一個像蜂蜜般濃稠的蜂蜜色超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+"thick.  You need a syringe to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mouse serum"
@@ -26989,8 +28124,8 @@ msgstr "鼠形血清"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A super-concentrated mutagen resembling liquefied metal.  You need a syringe"
-" to inject it...  if you really want to?"
-msgstr "一個類似液態金屬的超濃縮突變劑。你需要一個針筒才能注射... 如果你真的想要？"
+" to inject it… if you really want to?"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "mutagen"
@@ -27004,8 +28139,8 @@ msgstr "凝結的血液"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A thick, soupy red liquid.  It looks and smells disgusting, and seems to "
-"bubble with an intelligence of its own..."
-msgstr "一個濃密、黏稠的紅色液體。看起來和聞起來都很噁心, 而且彷彿有自己的智慧般地冒著泡…"
+"bubble with an intelligence of its own…"
+msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "alpha mutagen"
@@ -27189,21 +28324,21 @@ msgid ""
 msgstr "突變體口渴時的飲料首選, 他喝起來很可怕, 但可能比處理前去喝更加安全。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of pine nuts"
-msgid_plural "handfuls of pine nuts"
+msgid "pine nuts"
+msgid_plural "pine nuts"
 msgstr[0] "松子"
 
-#. ~ Description for handful of pine nuts
+#. ~ Description for {'str': 'pine nuts', 'str_pl': 'pine nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of tasty crunchy nuts from a pinecone."
 msgstr "從松果剝出的香脆美味松子"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of junipers"
-msgid_plural "handful of junipers"
+msgid "junipers"
+msgid_plural "junipers"
 msgstr[0] "杜松子"
 
-#. ~ Description for handful of junipers
+#. ~ Description for {'str': 'junipers', 'str_pl': 'junipers'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Junipers, for making gin and earthy flavors.  Spicy, tastes similar to "
@@ -27211,62 +28346,75 @@ msgid ""
 msgstr "杜松子，用於製作琴酒和料理香料。辛辣，味道類似迷迭香。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pistachios"
-msgid_plural "handfuls of shelled pistachios"
+msgid "shelled pistachios"
+msgid_plural "shelled pistachios"
 msgstr[0] "去殼開心果"
 
-#. ~ Description for handful of shelled pistachios
+#. ~ Description for {'str': 'shelled pistachios', 'str_pl': 'shelled
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of nuts from a pistachio tree, their shells have been removed."
 msgstr "一把從阿月渾子樹摘下的的堅果, 已經去殼。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pistachios"
-msgid_plural "handfuls of roasted pistachios"
+msgid "roasted pistachios"
+msgid_plural "roasted pistachios"
 msgstr[0] "烘烤開心果"
 
-#. ~ Description for handful of roasted pistachios
+#. ~ Description for {'str': 'roasted pistachios', 'str_pl': 'roasted
+#. pistachios'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an pistachio tree."
 msgstr "一把從阿月渾子樹摘下的的堅果, 已經烤過。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled almonds"
-msgid_plural "handfuls of shelled almonds"
+msgid "shelled almonds"
+msgid_plural "shelled almonds"
 msgstr[0] "去殼扁桃仁"
 
-#. ~ Description for handful of shelled almonds
+#. ~ Description for {'str': 'shelled almonds', 'str_pl': 'shelled almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of nuts from an almond tree, their shells have been removed."
 msgstr "一把從杏仁樹摘下的堅果, 已經去殼。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted almonds"
-msgid_plural "handfuls of roasted almonds"
-msgstr[0] "烘烤杏仁"
+msgid "almond pulp"
+msgid_plural "almond pulp"
+msgstr[0] "扁桃仁果漿"
+
+#. ~ Description for almond pulp
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Pulp left over after making almond milk.  It's gritty and incredibly bland."
+msgstr "製作扁桃仁奶後殘留的果漿。口感沙沙的而且十分平淡無味。"
+
+#: lang/json/COMESTIBLE_from_json.py
+msgid "roasted almonds"
+msgid_plural "roasted almonds"
+msgstr[0] "烘烤扁桃仁"
 
-#. ~ Description for handful of roasted almonds
+#. ~ Description for {'str': 'roasted almonds', 'str_pl': 'roasted almonds'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from an almond tree."
 msgstr "一把從杏仁樹摘下的的堅果, 已經烤過。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cashews"
-msgid_plural "handfuls of cashews"
+msgid "cashews"
+msgid_plural "cashews"
 msgstr[0] "腰果"
 
-#. ~ Description for handful of cashews
+#. ~ Description for {'str': 'cashews', 'str_pl': 'cashews'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of salty cashews."
 msgstr "一把加鹽腰果。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled pecans"
-msgid_plural "handfuls of shelled pecans"
-msgstr[0] "去殼山核桃"
+msgid "shelled pecans"
+msgid_plural "shelled pecans"
+msgstr[0] "去殼長山核桃"
 
-#. ~ Description for handful of shelled pecans
+#. ~ Description for {'str': 'shelled pecans', 'str_pl': 'shelled pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of pecans which are a sub-species of hickory nuts, their shells "
@@ -27274,41 +28422,41 @@ msgid ""
 msgstr "一把胡桃堅果, 是山核桃的亞種。已經去殼。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted pecans"
-msgid_plural "handfuls of roasted pecans"
-msgstr[0] "烘烤胡桃"
+msgid "roasted pecans"
+msgid_plural "roasted pecans"
+msgstr[0] "烘烤長山核桃"
 
-#. ~ Description for handful of roasted pecans
+#. ~ Description for {'str': 'roasted pecans', 'str_pl': 'roasted pecans'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a pecan tree."
 msgstr "一把從胡桃樹摘下的的堅果, 已經烤過。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled peanuts"
-msgid_plural "handful of shelled peanuts"
+msgid "shelled peanuts"
+msgid_plural "shelled peanuts"
 msgstr[0] "去殼花生"
 
-#. ~ Description for handful of shelled peanuts
+#. ~ Description for {'str': 'shelled peanuts', 'str_pl': 'shelled peanuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Salty peanuts with their shells removed."
 msgstr "鹽漬的脫殼花生。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of beech nuts"
-msgid_plural "handfuls of beech nuts"
+msgid "beech nuts"
+msgid_plural "beech nuts"
 msgstr[0] "山毛櫸堅果"
 
-#. ~ Description for handful of beech nuts
+#. ~ Description for {'str': 'beech nuts', 'str_pl': 'beech nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of hard pointy nuts from a beech tree."
 msgstr "從山毛櫸樹來的尖尖的堅果。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled walnuts"
-msgid_plural "handfuls of shelled walnuts"
+msgid "shelled walnuts"
+msgid_plural "shelled walnuts"
 msgstr[0] "去殼核桃"
 
-#. ~ Description for handful of shelled walnuts
+#. ~ Description for {'str': 'shelled walnuts', 'str_pl': 'shelled walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a walnut tree, their shells have been "
@@ -27316,21 +28464,22 @@ msgid ""
 msgstr "一把從核桃樹摘下的硬堅果, 已經去殼。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted walnuts"
-msgid_plural "handfuls of roasted walnuts"
+msgid "roasted walnuts"
+msgid_plural "roasted walnuts"
 msgstr[0] "烘烤核桃"
 
-#. ~ Description for handful of roasted walnuts
+#. ~ Description for {'str': 'roasted walnuts', 'str_pl': 'roasted walnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a walnut tree."
 msgstr "一把從核桃樹摘下的堅果, 已經烤過。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled chestnuts"
-msgid_plural "handfuls of shelled chestnuts"
+msgid "shelled chestnuts"
+msgid_plural "shelled chestnuts"
 msgstr[0] "去殼栗子"
 
-#. ~ Description for handful of shelled chestnuts
+#. ~ Description for {'str': 'shelled chestnuts', 'str_pl': 'shelled
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a chestnut tree, their shells have been "
@@ -27338,21 +28487,23 @@ msgid ""
 msgstr "一把從栗樹摘下的硬堅果, 已經去殼。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted chestnuts"
-msgid_plural "handfuls of roasted chestnuts"
+msgid "roasted chestnuts"
+msgid_plural "roasted chestnuts"
 msgstr[0] "烘烤栗子"
 
-#. ~ Description for handful of roasted chestnuts
+#. ~ Description for {'str': 'roasted chestnuts', 'str_pl': 'roasted
+#. chestnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a chestnut tree."
 msgstr "一把從栗樹摘下的堅果, 已經烤過。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hazelnuts"
-msgid_plural "handfuls of shelled hazelnuts"
+msgid "shelled hazelnuts"
+msgid_plural "shelled hazelnuts"
 msgstr[0] "去殼榛果"
 
-#. ~ Description for handful of shelled hazelnuts
+#. ~ Description for {'str': 'shelled hazelnuts', 'str_pl': 'shelled
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hazelnut tree, their shells have been "
@@ -27360,41 +28511,43 @@ msgid ""
 msgstr "一把從榛樹摘下的硬堅果, 已經去殼。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted edamame"
-msgid_plural "handful of roasted edamame"
+msgid "roasted edamame"
+msgid_plural "roasted edamame"
 msgstr[0] "烘烤毛豆"
 
-#. ~ Description for handful of roasted edamame
+#. ~ Description for {'str': 'roasted edamame', 'str_pl': 'roasted edamame'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted edamame, a heart healthy snack."
 msgstr "烤過的毛豆，對心臟有益。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted soy nuts"
-msgid_plural "handful of roasted soy nuts"
-msgstr[0] "烘焙黃豆"
+msgid "roasted soy nuts"
+msgid_plural "roasted soy nuts"
+msgstr[0] "烘烤黃豆"
 
-#. ~ Description for handful of roasted soy nuts
+#. ~ Description for {'str': 'roasted soy nuts', 'str_pl': 'roasted soy nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Roasted soybeans, often called soy nuts."
 msgstr "烤過的黃豆"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hazelnuts"
-msgid_plural "handfuls of roasted hazelnuts"
+msgid "roasted hazelnuts"
+msgid_plural "roasted hazelnuts"
 msgstr[0] "烘烤榛果"
 
-#. ~ Description for handful of roasted hazelnuts
+#. ~ Description for {'str': 'roasted hazelnuts', 'str_pl': 'roasted
+#. hazelnuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hazelnut tree."
 msgstr "一把從榛樹摘下的堅果, 已經烤過。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of shelled hickory nuts"
-msgid_plural "handfuls of shelled hickory nuts"
-msgstr[0] "去殼山核桃"
+msgid "shelled hickory nuts"
+msgid_plural "shelled hickory nuts"
+msgstr[0] "去殼山核桃堅果"
 
-#. ~ Description for handful of shelled hickory nuts
+#. ~ Description for {'str': 'shelled hickory nuts', 'str_pl': 'shelled
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of raw hard nuts from a hickory tree, their shells have been "
@@ -27402,11 +28555,12 @@ msgid ""
 msgstr "一把來自山核桃樹的堅果, 已經去殼。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted hickory nuts"
-msgid_plural "handfuls of roasted hickory nuts"
-msgstr[0] "烘烤山核桃"
+msgid "roasted hickory nuts"
+msgid_plural "roasted hickory nuts"
+msgstr[0] "烘烤山核桃堅果"
 
-#. ~ Description for handful of roasted hickory nuts
+#. ~ Description for {'str': 'roasted hickory nuts', 'str_pl': 'roasted
+#. hickory nuts'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful of roasted nuts from a hickory tree."
 msgstr "一把來自山核桃樹的烘烤山核桃。"
@@ -27421,11 +28575,11 @@ msgid "Delicious hickory nut ambrosia.  A drink worthy of the gods."
 msgstr "美味的山核桃香飲, 不愧為神的飲品。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of acorns"
-msgid_plural "handfuls of acorns"
+msgid "acorns"
+msgid_plural "acorns"
 msgstr[0] "橡實"
 
-#. ~ Description for handful of acorns
+#. ~ Description for {'str': 'acorns', 'str_pl': 'acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of acorns, still in their shells.  Squirrels like them, but "
@@ -27433,11 +28587,11 @@ msgid ""
 msgstr "一把還帶殼的橡實, 松鼠很喜歡它們, 不過在這個狀態不是很好吃。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of roasted acorns"
-msgid_plural "handfuls of roasted acorns"
-msgstr[0] "烘烤橡子"
+msgid "roasted acorns"
+msgid_plural "roasted acorns"
+msgstr[0] "烘烤橡實"
 
-#. ~ Description for handful of roasted acorns
+#. ~ Description for {'str': 'roasted acorns', 'str_pl': 'roasted acorns'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A handful roasted nuts from an oak tree."
 msgstr "一把從橡樹摘下的的堅果, 已經烤過。"
@@ -27498,7 +28652,7 @@ msgstr "也被稱為雜碎派，由切碎的動物內臟製成。沒有聽起來
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "stewed tripe"
-msgstr ""
+msgstr "燉胃袋"
 
 #. ~ Description for stewed tripe
 #: lang/json/COMESTIBLE_from_json.py
@@ -27795,7 +28949,7 @@ msgstr[0] "乾扁豆"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A humble but nutrient-rich legume.  Should be cooked prior to consumption."
-msgstr ""
+msgstr "一種不起眼但營養豐富的豆類。應在食用前煮熟。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cooked lentils"
@@ -27805,7 +28959,7 @@ msgstr[0] "熟扁豆"
 #. ~ Description for cooked lentils
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Some delicious cooked lentils.  Humble but nutrient-rich."
-msgstr ""
+msgstr "一些美味的煮熟的扁豆。不太有吸引力但營養豐富。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "coffee powder"
@@ -27877,7 +29031,7 @@ msgstr[0] "牛飼料"
 msgid ""
 "What cattle eat.  Mainly made of grass, silage or legumes.  It's perfect for"
 " ruminants."
-msgstr ""
+msgstr "給家畜吃的東西。主要由草，青貯飼料或豆類製成。它非常適合反芻動物。"
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "bird food"
@@ -27958,10 +29112,11 @@ msgstr "稀釋過的精製人類蛋白糊。雖然相當有營養, 但不是很
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "soylent green powder"
-msgid_plural "servings of soylent green powder"
+msgid_plural "soylent green powder"
 msgstr[0] "人肉蛋白粉"
 
-#. ~ Description for soylent green powder
+#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green
+#. powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein made out of people!  While quite nutritious, it is "
@@ -28003,10 +29158,10 @@ msgstr "精製蛋白糊與水混合。雖然相當有營養, 但不是很好喝
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "protein powder"
-msgid_plural "servings of protein powder"
+msgid_plural "protein powder"
 msgstr[0] "蛋白粉"
 
-#. ~ Description for protein powder
+#. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Raw, refined protein.  While quite nutritious, it is impossible to enjoy in "
@@ -28074,61 +29229,61 @@ msgid "Very sour citrus.  Can be eaten if you really want."
 msgstr "酸不溜丟的水果。你敢直接吃的話就吃吧。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blueberries"
-msgid_plural "handful of blueberries"
+msgid "blueberries"
+msgid_plural "blueberries"
 msgstr[0] "藍莓"
 
-#. ~ Description for handful of blueberries
+#. ~ Description for {'str': 'blueberries', 'str_pl': 'blueberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "They're blue, but that doesn't mean they're sad."
 msgstr "Blue在這指的是藍色, 不是憂鬱的意思。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of strawberries"
-msgid_plural "handful of strawberries"
+msgid "strawberries"
+msgid_plural "strawberries"
 msgstr[0] "草莓"
 
-#. ~ Description for handful of strawberries
+#. ~ Description for {'str': 'strawberries', 'str_pl': 'strawberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Tasty, juicy berry.  Often found growing wild in fields."
 msgstr "可口多汁的莓子, 通常在野地中生長。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cranberries"
-msgid_plural "handful of cranberries"
+msgid "cranberries"
+msgid_plural "cranberries"
 msgstr[0] "蔓越莓"
 
-#. ~ Description for handful of cranberries
+#. ~ Description for {'str': 'cranberries', 'str_pl': 'cranberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Sour red berries.  Good for your health."
 msgstr "酸的紅色莓子。對健康很好。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of raspberries"
-msgid_plural "handful of raspberries"
+msgid "raspberries"
+msgid_plural "raspberries"
 msgstr[0] "覆盆子"
 
-#. ~ Description for handful of raspberries
+#. ~ Description for {'str': 'raspberries', 'str_pl': 'raspberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A sweet red berry."
 msgstr "紅色的甜莓果。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of huckleberries"
-msgid_plural "handful of huckleberries"
+msgid "huckleberries"
+msgid_plural "huckleberries"
 msgstr[0] "越橘莓"
 
-#. ~ Description for handful of huckleberries
+#. ~ Description for {'str': 'huckleberries', 'str_pl': 'huckleberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Huckleberries, often times confused for blueberries."
 msgstr "越橘莓, 經常被誤認為是藍莓。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of mulberries"
-msgid_plural "handful of mulberries"
+msgid "mulberries"
+msgid_plural "mulberries"
 msgstr[0] "桑葚"
 
-#. ~ Description for handful of mulberries
+#. ~ Description for {'str': 'mulberries', 'str_pl': 'mulberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Mulberries, this red variety is unique to east North America and is "
@@ -28136,21 +29291,21 @@ msgid ""
 msgstr "桑葚, 這是一種北美洲特有的紅色品種, 公認具有世界上所有品種中最強烈的味道。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of elderberries"
-msgid_plural "handful of elderberries"
+msgid "elderberries"
+msgid_plural "elderberries"
 msgstr[0] "接骨木果"
 
-#. ~ Description for handful of elderberries
+#. ~ Description for {'str': 'elderberries', 'str_pl': 'elderberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "Elderberries, toxic when eaten raw but great when cooked."
 msgstr "接骨木果, 生吃時有毒, 煮熟後有益。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of rose hips"
-msgid_plural "handful of rose hips"
+msgid "rose hips"
+msgid_plural "rose hips"
 msgstr[0] "薔薇果"
 
-#. ~ Description for handful of rose hips
+#. ~ Description for {'str': 'rose hips', 'str_pl': 'rose hips'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "The fruit of a pollinated rose flower."
 msgstr "這是授粉薔薇花的果實。"
@@ -28185,11 +29340,11 @@ msgid "A citrus fruit, whose taste ranges from sour to semi-sweet."
 msgstr "柑橘類水果, 其味道是半酸甜味的。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of cherries"
-msgid_plural "handful of cherries"
+msgid "cherries"
+msgid_plural "cherries"
 msgstr[0] "櫻桃"
 
-#. ~ Description for handful of cherries
+#. ~ Description for {'str': 'cherries', 'str_pl': 'cherries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A red, sweet fruit that grows in trees."
 msgstr "紅色甜味, 長在樹上的水果。"
@@ -28205,11 +29360,11 @@ msgid ""
 msgstr "巴掌大的紫色李子。對健康或消化都很好。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of grapes"
-msgid_plural "handful of grapes"
+msgid "grapes"
+msgid_plural "grapes"
 msgstr[0] "葡萄"
 
-#. ~ Description for handful of grapes
+#. ~ Description for {'str': 'grapes', 'str_pl': 'grapes'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A cluster of juicy grapes."
 msgstr "一串多汁的葡萄。"
@@ -28261,11 +29416,11 @@ msgid "A large and very sweet fruit."
 msgstr "一個大又甜的水果。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of blackberries"
-msgid_plural "handful of blackberries"
+msgid "blackberries"
+msgid_plural "blackberries"
 msgstr[0] "黑莓"
 
-#. ~ Description for handful of blackberries
+#. ~ Description for {'str': 'blackberries', 'str_pl': 'blackberries'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A darker cousin of raspberry."
 msgstr "覆盆子的較黑近親。"
@@ -28308,15 +29463,26 @@ msgid ""
 msgstr "毛茸茸外皮的棕色水果。果肉是綠色的而且很美味。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of apricots"
-msgid_plural "handful of apricots"
+msgid "apricots"
+msgid_plural "apricots"
 msgstr[0] "杏子"
 
-#. ~ Description for handful of apricots
+#. ~ Description for {'str': 'apricots', 'str_pl': 'apricots'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid "A smooth-skinned fruit, related to the peach."
 msgstr "一種果皮光滑的水果, 桃子的近親。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "cholla bud"
+msgstr ""
+
+#. ~ Description for cholla bud
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"Edible bud of a cholla cactus, with spines removed; the candy of the Mojave "
+"indigenous peoples.  Tastes similar to asparagus."
+msgstr ""
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "cactus pad"
 msgstr "仙人掌莖葉"
@@ -28485,10 +29651,10 @@ msgstr ""
 
 #: lang/json/COMESTIBLE_from_json.py
 msgid "salsify"
-msgid_plural "handfuls of salsify"
+msgid_plural "salsify"
 msgstr[0] "婆羅門參"
 
-#. ~ Description for salsify
+#. ~ Description for {'str': 'salsify', 'str_pl': 'salsify'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An herb with a small purple flower.  The roots are nutritious, but tough and"
@@ -28498,10 +29664,10 @@ msgstr "開著小紫色花的草本植物。根是營養豐富的，但未煮熟
 #: lang/json/COMESTIBLE_from_json.py lang/json/COMESTIBLE_from_json.py
 #: lang/json/furniture_from_json.py
 msgid "chicory"
-msgid_plural "handfuls of chicory"
+msgid_plural "chicory"
 msgstr[0] "菊苣"
 
-#. ~ Description for chicory
+#. ~ Description for {'str': 'chicory', 'str_pl': 'chicory'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A modest blue flower.  The flower's roots are very bitter and not meant to "
@@ -28613,11 +29779,11 @@ msgid ""
 msgstr "一個大型蔬菜, 有你的頭那麼大。生的時候不怎麼好吃, 但煮過之後很不錯。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of dandelions"
-msgid_plural "handfuls of dandelions"
+msgid "dandelions"
+msgid_plural "dandelions"
 msgstr[0] "蒲公英"
 
-#. ~ Description for handful of dandelions
+#. ~ Description for {'str': 'dandelions', 'str_pl': 'dandelions'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A collection of freshly picked yellow dandelions.  In their current raw "
@@ -28741,11 +29907,11 @@ msgid "Raw, uncooked lentils.  They could be cooked."
 msgstr "生扁豆。可以煮熟。"
 
 #: lang/json/COMESTIBLE_from_json.py
-msgid "handful of fiddleheads"
-msgid_plural "handfuls of fiddleheads"
+msgid "fiddleheads"
+msgid_plural "fiddleheads"
 msgstr[0] "蕨類嫩芽"
 
-#. ~ Description for handful of fiddleheads
+#. ~ Description for {'str': 'fiddleheads', 'str_pl': 'fiddleheads'}
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A handful of immature fern fronds, still curled up like the head of a "
@@ -30482,8 +31648,8 @@ msgstr[0] "生義式細麵"
 #. ~ Description for raw spaghetti pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A type of pasta usually used when preparing spaghetti. It could be eaten raw"
-" if you're desperate, but is much better cooked."
+"A type of pasta usually used when preparing spaghetti.  It could be eaten "
+"raw if you're desperate, but is much better cooked."
 msgstr "製作義大利直麵時常用的一種麵食。如果走投無路時，也能生吃，但是煮過後的味道會好很多。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -30494,7 +31660,7 @@ msgstr[0] "生義式千層麵"
 #. ~ Description for raw lasagne pasta
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A pasta sheet used in making lasagne. It could be eaten raw if you're "
+"A pasta sheet used in making lasagne.  It could be eaten raw if you're "
 "desperate, but is much better cooked."
 msgstr "用來製作千層麵的寬麵皮。如果走投無路時，也能生吃，但是煮過後的味道會好很多。"
 
@@ -30937,7 +32103,7 @@ msgstr "藥劑基底"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "Strong alcohol, infused with mana and concentrated into a liquid that can "
-"stabilize spells into liquid form. You can still drink it, if you want."
+"stabilize spells into liquid form.  You can still drink it, if you want."
 msgstr "強烈的酒精，注入法力並濃縮成液體，可以使法術穩定成液態。如果你願意，仍然可以喝它。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -30949,7 +32115,7 @@ msgstr[0] "巨大腎上腺"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "An organ located above the kidneys responsible for secretion of adrenaline, "
-"cortisol, and aldosterone. This one is huge, whether by nature or mutation."
+"cortisol, and aldosterone.  This one is huge, whether by nature or mutation."
 msgstr "位於腎臟上方的器官，負責分泌腎上腺素、皮質醇和醛固酮。無論是天生還是突變的，這個都是巨大的。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31046,8 +32212,8 @@ msgstr "殭屍巫毒娃娃"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human, including pieces of bone "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr "一個維妙維肖的不死人類模型，包括骨頭和器官。死靈魔法延遲了它的腐爛，但不會永遠持續下去。使用附帶的針刺穿它可以迫使它為你服務。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31058,8 +32224,9 @@ msgstr "骨化巫毒娃娃"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead human covered with bone, including"
-" pieces of organs. Necromantic magic delays immediate rot, but it won't last"
-" forever. Piercing it with the attached needle could compel it to serve you."
+" pieces of organs.  Necromantic magic delays immediate rot, but it won't "
+"last forever.  Piercing it with the attached needle could compel it to serve"
+" you."
 msgstr "一個維妙維肖被骨頭包覆的不死人類模型，包括器官。死靈魔法延遲了它的腐爛，但不會永遠持續下去。使用附帶的針刺穿它可以迫使它為你服務。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31070,8 +32237,8 @@ msgstr "美洲獅巫毒娃娃"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "A remarkably accurate effigy of an undead cougar, complete with fur, bones, "
-"and organs. Necromantic magic delays immediate rot, but it won't last "
-"forever. Piercing it with the attached needle could compel it to serve you."
+"and organs.  Necromantic magic delays immediate rot, but it won't last "
+"forever.  Piercing it with the attached needle could compel it to serve you."
 msgstr "一個維妙維肖的不死美洲獅模型，包括毛皮、骨骼和器官。死靈魔法延遲了它的腐爛，但不會永遠持續下去。使用附帶的針刺穿它可以迫使它為你服務。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31082,8 +32249,8 @@ msgstr "扭曲恢復藥劑"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal."
 msgstr "這種惡臭的液體用加速你的心跳達到危險等級的方式來模擬不死生物的再生。在危險或危急情況下飲用可能會致命。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31094,9 +32261,9 @@ msgstr "改良扭曲恢復藥劑"
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
 "This foul-smelling liquid simulates undead regeneration by accelerating your"
-" heart to dangerous levels. Drinking this in danger or at critical condition"
-" may be lethal. Improved infusion techniques lessen the strain of the "
-"process."
+" heart to dangerous levels.  Drinking this in danger or at critical "
+"condition may be lethal.  Improved infusion techniques lessen the strain of "
+"the process."
 msgstr ""
 "這種惡臭的液體用加速你的心跳達到危險等級的方式來模擬不死生物的再生。在危險或危急情況下飲用可能會致命。改良的灌注技術讓這過程稍微減輕了壓力。"
 
@@ -31132,7 +32299,7 @@ msgstr[0] "毛球"
 #. ~ Description for hairball
 #: lang/json/COMESTIBLE_from_json.py
 msgid ""
-"A big, ugly ball of animal spit and licked-off hairs. Don't swallow it."
+"A big, ugly ball of animal spit and licked-off hairs.  Don't swallow it."
 msgstr "動物舔吐出來的巨大醜陋毛球。不要吞它。"
 
 #: lang/json/COMESTIBLE_from_json.py
@@ -31148,6 +32315,16 @@ msgid ""
 " properties."
 msgstr "來自被殺死的龍的肉。無法用平常的烹飪方式處理它，顯然它依舊保有一些魔法特性。"
 
+#: lang/json/COMESTIBLE_from_json.py
+msgid "scream mushroom"
+msgstr "尖叫蘑菇"
+
+#. ~ Description for scream mushroom
+#: lang/json/COMESTIBLE_from_json.py
+msgid ""
+"The mushrooms harvested from a dead shrieker.  Could be used in potions."
+msgstr "從死亡尖叫者收穫而來的蘑菇。可以用來製作藥劑。"
+
 #: lang/json/COMESTIBLE_from_json.py
 msgid "resinous cord"
 msgstr "樹脂線"
@@ -31768,15 +32945,6 @@ msgstr[0] "米麵粉"
 msgid "This rice flour is useful for baking."
 msgstr "這個白色的米麵粉在烘焙時很有用。"
 
-#: lang/json/COMESTIBLE_from_json.py
-msgid "cholla bud"
-msgstr ""
-
-#. ~ Description for cholla bud
-#: lang/json/COMESTIBLE_from_json.py
-msgid "The candy of the Mojave Indigenous peoples."
-msgstr ""
-
 #: lang/json/COMESTIBLE_from_json.py
 msgid "revival serum"
 msgstr "強心劑"
@@ -32044,8 +33212,8 @@ msgstr[0] ""
 #. ~ Description for paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"It has a threaded cap for easy resealing."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  It has a threaded cap for easy resealing."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -32056,8 +33224,8 @@ msgstr[0] ""
 #. ~ Description for opened paper carton
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"A half gallon carton constructed of a paper, aluminum and plastic laminate. "
-"This one is open and its contents will spoil."
+"A half gallon carton constructed of a paper, aluminum and plastic laminate."
+"  This one is open and its contents will spoil."
 msgstr ""
 
 #: lang/json/CONTAINER_from_json.py
@@ -32530,8 +33698,8 @@ msgstr[0] "救生包盒子"
 #. ~ Description for survival kit box
 #: lang/json/CONTAINER_from_json.py
 msgid ""
-"An aluminum box that used to contain a small survival kit. Can hold 1 liter "
-"of liquid."
+"An aluminum box that used to contain a small survival kit.  Can hold 1 liter"
+" of liquid."
 msgstr "裝容小型生存工具組的鋁盒。可容納 1 公升的液體。"
 
 #: lang/json/CONTAINER_from_json.py
@@ -33053,8 +34221,8 @@ msgstr[0] "薔薇輝石"
 #. ~ Description for rhodonite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of rhodonite. It has manganese dioxide covering and going through it"
-" in veins, which can be obtained using a chisel."
+"A chunk of rhodonite.  It has manganese dioxide covering and going through "
+"it in veins, which can be obtained using a chisel."
 msgstr "一大塊的薔薇輝石，被二氧化錳覆蓋並穿透紋理，可以使用鑿子來採取。"
 
 #: lang/json/GENERIC_from_json.py
@@ -33065,7 +34233,7 @@ msgstr[0] "紅鋅礦"
 #. ~ Description for zincite
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A chunk of zincite. Could be refined into zinc oxide, then into zinc by "
+"A chunk of zincite.  Could be refined into zinc oxide, then into zinc by "
 "reduction with a source of carbon."
 msgstr "一大塊鋅礦。可以提煉成氧化鋅，然後透過用炭來還原成鋅。"
 
@@ -33080,81 +34248,81 @@ msgid "A root from a hickory tree.  It has an earthy smell."
 msgstr "山核桃的根, 帶有泥土的氣味。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hickory nuts"
-msgid_plural "handfuls of hickory nuts"
-msgstr[0] "山核桃"
+msgid "hickory nuts"
+msgid_plural "hickory nuts"
+msgstr[0] "山核桃堅果"
 
-#. ~ Description for handful of hickory nuts
+#. ~ Description for {'str': 'hickory nuts', 'str_pl': 'hickory nuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hickory tree, still in their shell."
 msgstr "一把來自山核挑樹的堅果, 仍未去殼。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pecans"
-msgid_plural "handfuls of pecans"
+msgid "pecans"
+msgid_plural "pecans"
 msgstr[0] "長山核桃"
 
-#. ~ Description for handful of pecans
+#. ~ Description for {'str': 'pecans', 'str_pl': 'pecans'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pecan tree, still in their shell."
 msgstr "一把來自胡桃樹的堅果, 仍未去殼。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of pistachios"
-msgid_plural "handfuls of pistachios"
+msgid "pistachios"
+msgid_plural "pistachios"
 msgstr[0] "開心果"
 
-#. ~ Description for handful of pistachios
+#. ~ Description for {'str': 'pistachios', 'str_pl': 'pistachios'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a pistachio tree, still in their shell."
 msgstr "一把從阿月渾子樹摘下的硬堅果, 仍未去殼。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of almonds"
-msgid_plural "handfuls of almonds"
+msgid "almonds"
+msgid_plural "almonds"
 msgstr[0] "扁桃仁"
 
-#. ~ Description for handful of almonds
+#. ~ Description for {'str': 'almonds', 'str_pl': 'almonds'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a almond tree, still in their shell."
 msgstr "一把來自扁桃樹的堅果，仍未去殼。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of peanuts"
-msgid_plural "handfuls of peanuts"
+msgid "peanuts"
+msgid_plural "peanuts"
 msgstr[0] "花生"
 
-#. ~ Description for handful of peanuts
+#. ~ Description for {'str': 'peanuts', 'str_pl': 'peanuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a peanut bush, still in their shell."
 msgstr "一把來自花生灌木的堅果, 仍未去殼。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of hazelnuts"
-msgid_plural "handfuls of hazelnuts"
-msgstr[0] ""
+msgid "hazelnuts"
+msgid_plural "hazelnuts"
+msgstr[0] "榛果"
 
-#. ~ Description for handful of hazelnuts
+#. ~ Description for {'str': 'hazelnuts', 'str_pl': 'hazelnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a hazelnut tree, still in their shell."
 msgstr "一把來自榛子樹的堅果, 仍未去殼。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chestnuts"
-msgid_plural "handfuls of chestnuts"
+msgid "chestnuts"
+msgid_plural "chestnuts"
 msgstr[0] "栗子"
 
-#. ~ Description for handful of chestnuts
+#. ~ Description for {'str': 'chestnuts', 'str_pl': 'chestnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a chestnut tree, still in their shell."
 msgstr "一把來自栗子樹的堅果, 仍未去殼。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of walnuts"
-msgid_plural "handfuls of walnuts"
+msgid "walnuts"
+msgid_plural "walnuts"
 msgstr[0] "核桃"
 
-#. ~ Description for handful of walnuts
+#. ~ Description for {'str': 'walnuts', 'str_pl': 'walnuts'}
 #: lang/json/GENERIC_from_json.py
 msgid "A handful of hard nuts from a walnut tree, still in their shell."
 msgstr "一把來自胡桃樹的堅果, 仍未去殼。"
@@ -33289,7 +34457,7 @@ msgstr "一具死屍，滿佈凝固的血液。"
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A dead body with a frightful grimace. He appears to have been horribly "
+"A dead body with a frightful grimace.  He appears to have been horribly "
 "mangled prior to his death."
 msgstr "一具死屍，表情非常醜陋扭曲，似乎在死前受到極度殘忍的摧殘。"
 
@@ -33313,7 +34481,7 @@ msgstr "一具人類屍體。前額有個被子彈射入的大彈孔，後腦有
 #. ~ Description for corpse
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"The upper half of a dead body, as if torn apart with enormous force. Some "
+"The upper half of a dead body, as if torn apart with enormous force.  Some "
 "organs are hanging out."
 msgstr "一具死屍的上半身，似乎被極強大的力量給撕裂，一些內臟器官掛在上面。"
 
@@ -33408,6 +34576,11 @@ msgstr "肌肉"
 msgid "wind"
 msgstr "風"
 
+#: lang/json/GENERIC_from_json.py
+msgid "metabolism"
+msgid_plural "metabolisms"
+msgstr[0] "新陳代謝"
+
 #: lang/json/GENERIC_from_json.py
 msgid "a smoking device and a source of flame"
 msgstr "一個抽菸器具以及火源"
@@ -33455,7 +34628,7 @@ msgstr[0] "美食中心會員卡"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A bright pink loyalty card, all the points are stamped.  This would "
-"definitely prove your fidelity to Foodplace, if it still meant anything..."
+"definitely prove your fidelity to Foodplace, if it still meant anything…"
 msgstr "明亮的粉紅色會員卡，所有集點積分都已經蓋了章。如果這還有什麼意義的話，那肯定能當作你對美食中心忠誠的絕對證明。"
 
 #: lang/json/GENERIC_from_json.py
@@ -33583,8 +34756,8 @@ msgstr[0] ""
 #. ~ Description for set of 100 ceramic disk
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A set of small slightly elongated disks, made of high-grade ceramic. They "
-"remind you of scales"
+"A set of small slightly elongated disks, made of high-grade ceramic.  They "
+"remind you of scales."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -33860,6 +35033,17 @@ msgid ""
 "constructing tougher walls and such."
 msgstr "一束鋼筋, 可以作為相當稱頭的近戰武器, 同時也相當適合拿來建築較為堅固的牆壁或其他建築。"
 
+#: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
+#: lang/json/terrain_from_json.py
+msgid "small railroad track"
+msgid_plural "small railroad tracks"
+msgstr[0] ""
+
+#. ~ Description for small railroad track
+#: lang/json/GENERIC_from_json.py
+msgid "A length of track, made from some planks and rails."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py lang/json/terrain_from_json.py
 msgid "concrete"
 msgid_plural "concrete"
@@ -33979,8 +35163,8 @@ msgstr[0] "電視"
 
 #. ~ Description for television
 #: lang/json/GENERIC_from_json.py
-msgid "A large cathode ray tube television, full of delicious electronics."
-msgstr "一個大的陰極射線管電視, 充滿美妙的電子色彩。"
+msgid "A large LCD television, full of delicious electronics."
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "pilot light"
@@ -34366,6 +35550,18 @@ msgid ""
 "communications equipment."
 msgstr "一個用於收訊的模組, 適合用於製作通訊設備。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "large LCD screen"
+msgid_plural "large LCD screens"
+msgstr[0] ""
+
+#. ~ Description for large LCD screen
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A large backlit screen, used for displaying images.  Useful in some "
+"electronics recipes."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "small LCD screen"
 msgid_plural "small LCD screens"
@@ -34737,8 +35933,8 @@ msgstr[0] "科學 SD 記憶卡"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This memory card appears to be related to 'XEDRA', and is certainly "
-"encrypted.  Looks * Interesting *, though..."
-msgstr "這張記憶卡似乎與 \"XEDRA\" 有關, 豪無疑問地已被加密。然而它看起來 *很有趣*…"
+"encrypted.  Looks *Interesting*, though…"
+msgstr "這張記憶卡似乎與 \"XEDRA\" 有關，毫無疑問地已被加密。因此它看起來 *很有趣* …"
 
 #: lang/json/GENERIC_from_json.py
 msgid "hand mirror"
@@ -34806,11 +36002,12 @@ msgid ""
 msgstr "向日葵，帶著黃色花瓣和一些尚未被動物吃掉的種子。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "handful of chamomile flowers"
-msgid_plural "handfuls of chamomile flowers"
+msgid "chamomile flowers"
+msgid_plural "chamomile flowers"
 msgstr[0] "洋甘菊花"
 
-#. ~ Description for handful of chamomile flowers
+#. ~ Description for {'str': 'chamomile flowers', 'str_pl': 'chamomile
+#. flowers'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "White chamomile flowers, used as a herbal remedy since the ancient times."
@@ -35064,10 +36261,10 @@ msgstr "一捆約20美金的紙鈔, 雖然現在已經沒什麼用了。"
 #. ~ Use action menu_text for cigarette.
 #. ~ Use action menu_text for joint.
 #. ~ Use action menu_text for spooky jack o'lantern.
+#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for candle.
 #. ~ Use action menu_text for refillable lighter.
 #. ~ Use action menu_text for torch.
-#. ~ Use action menu_text for hobo stove (lit).
 #. ~ Use action menu_text for ember carrier (lit).
 #. ~ Use action menu_text for Louisville Slaughterer.
 #. ~ Use action menu_text for everburning torch.
@@ -35117,9 +36314,9 @@ msgstr[0] "菸蒂"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash.  What a tragedy!\n"
-"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far..."
+"The leftover tobacco in a few of these could probably be used to roll another cigarette.  If you're willing to go that far…"
 msgstr ""
-"曾經令人上癮的美妙菸草捲現在只剩下一小塊垃圾。何等的慘劇!\n"
+"曾經令人上癮的美妙菸草捲現在只剩下一小塊垃圾。何等的慘劇！\n"
 "有足夠的這些東西剩餘菸草應該可以捲成一條新的煙。如果你想要這麼極端…"
 
 #. ~ Use action msg for joint.
@@ -35163,10 +36360,10 @@ msgstr "中亞和印度的一種迷幻性植物，傳統上用於生產纖維，
 
 #: lang/json/GENERIC_from_json.py
 msgid "raw tobacco"
-msgid_plural "handfuls of raw tobacco"
+msgid_plural "raw tobacco"
 msgstr[0] "生菸草"
 
-#. ~ Description for raw tobacco
+#. ~ Description for {'str': 'raw tobacco', 'str_pl': 'raw tobacco'}
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "Various parts of tobacco plant, full of nicotine.  They need to be dried to "
@@ -35212,11 +36409,6 @@ msgid ""
 "panel, if you can find one."
 msgstr "這張 ID卡原本屬於某個高級技工，背面有記述使用的通訊協定。它能讓你獲得存取控制台的權限，如果你找的到控制台的話。"
 
-#: lang/json/GENERIC_from_json.py
-msgid "neoprene sheet"
-msgid_plural "neoprene sheets"
-msgstr[0] "橡膠薄片"
-
 #. ~ Description for neoprene sheet
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -35654,13 +36846,6 @@ msgid ""
 "chopping things and for use as a hammer."
 msgstr "單手斧。一把很棒的近戰武器, 既能切碎東西, 也可當作錘子用。"
 
-#. ~ Description for rock
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A rock the size of a baseball.  Makes a decent melee weapon, and is also "
-"good for throwing at enemies."
-msgstr "棒球大小的石頭。可用來製作近戰武器, 也可以朝著敵人丟。"
-
 #: lang/json/GENERIC_from_json.py
 msgid "sharp rock"
 msgid_plural "sharp rocks"
@@ -36157,8 +37342,8 @@ msgstr[0] "板式彈簧"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A large, heavy-duty leaf spring.  Probably from some car or truck, and looks"
-" an awful lot like a bow.  You can barely bend it..."
-msgstr "大型重型板式彈簧。可能來自汽車或卡車懸吊系統，看起來很像弓。你幾乎不能彎曲它......"
+" an awful lot like a bow.  You can barely bend it…"
+msgstr "大型重型板式彈簧。可能來自汽車或卡車懸吊系統，看起來很像弓。你幾乎不能彎曲它... "
 
 #: lang/json/GENERIC_from_json.py
 msgid "hydrangea"
@@ -36760,14 +37945,11 @@ msgstr[0] "原子咖啡壺"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive"
-" generator to heat water for coffee. Normally the water is heated using "
+" generator to heat water for coffee.  Normally the water is heated using "
 "energy stored in a capacitor, and makes ordinary coffee.  However, as a "
 "special feature, water from the RTG containment area can be used, giving the"
 " coffee a very special kick.  The Curie-G is illegal in most countries."
 msgstr ""
-"這是一部Curie-"
-"G咖啡機，由CuppaTech製造，它使用有名的核能發電機將水加熱去製作咖啡，通常水是由儲了能量的電容器加熱，但以特別功能來說，來自RTG保管器的水能夠被使用，使生產出來的咖啡有一種特別的風味"
-"，Curie-G在大部份城市可以合法使用。"
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
 msgid "atomic lamp"
@@ -36777,7 +37959,9 @@ msgstr[0] "原子燈"
 #. ~ Use action menu_text for atomic lamp.
 #. ~ Use action menu_text for atomic reading light.
 #. ~ Use action menu_text for magical reading light.
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp.
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Close cover"
 msgstr "關上燈罩"
 
@@ -36805,7 +37989,9 @@ msgstr[0] "原子燈 (蓋上)"
 #. ~ Use action menu_text for atomic lamp (covered).
 #. ~ Use action menu_text for atomic reading light (covered).
 #. ~ Use action menu_text for magical reading light (covered).
-#: lang/json/GENERIC_from_json.py
+#. ~ Use action menu_text for atomic headlamp (covered).
+#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py
+#: lang/json/TOOL_ARMOR_from_json.py
 msgid "Open cover"
 msgstr "打開燈罩"
 
@@ -37075,8 +38261,8 @@ msgstr[0] "抓鉤"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A folding grappling hook attached to a stout 30-foot long piece of "
-"lightweight cord.  Useful for keeping yourself safe from falls. Can be used "
-"in place of a long rope for butchering, in a pinch."
+"lightweight cord.  Useful for keeping yourself safe from falls.  Can be used"
+" in place of a long rope for butchering, in a pinch."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -37846,10 +39032,8 @@ msgstr[0] "詠春拳譜"
 
 #. ~ Description for Beautiful Springtime
 #: lang/json/GENERIC_from_json.py
-msgid ""
-"A complete guide to Wing Chun Kung-fu.  Includes a section on butterfly "
-"swords and the use of long poles at the end."
-msgstr "詠春功夫的完整指南。書後還有關於蝴蝶雙刀和長棍的章節。"
+msgid "A complete guide to Wing Chun Kung-fu."
+msgstr "一本詠春功夫的完整指南。"
 
 #: lang/json/GENERIC_from_json.py lang/json/martial_art_from_json.py
 #: lang/json/martial_art_from_json.py
@@ -37861,8 +39045,8 @@ msgstr[0] ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A completely translated medieval guide teaching various techniques with "
-"polearms, there is a chapter about the many variations of common polearms..."
-" there are even pictures!"
+"polearms, there is a chapter about the many variations of common polearms… "
+"there are even pictures!"
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -38820,6 +40004,19 @@ msgstr[0] ""
 msgid "This is a slip of paper signed by the issuer."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "icon"
+msgid_plural "icons"
+msgstr[0] ""
+
+#. ~ Description for icon
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a small picture, about the same size as an ID card, symbolizing a "
+"religious figure.  On the back, there is a text that faintly reads 'New "
+"England Church Community'."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "generic silverware"
 msgid_plural "generic silverwares"
@@ -39144,9 +40341,9 @@ msgstr[0] "叉子"
 #. ~ Description for fork
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A fork, if you stab something with it you eat it right away.  Wait...  "
+"A fork, if you stab something with it you eat it right away.  Wait… "
 "nevermind."
-msgstr "一根叉子, 能插起任何你想吃的東西。等等… 算了。"
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "plastic fork"
@@ -40217,7 +41414,7 @@ msgid ""
 "\n"
 "Whosoever holds this hammer,\n"
 "If he be worthy,\n"
-"Shall possess the power to...\n"
+"Shall possess the power to…\n"
 "CRUSH!'"
 msgstr ""
 
@@ -40629,8 +41826,8 @@ msgstr ""
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "This is a thin thrusting sword, a sort of predecessor to the rapier.  It "
-"requires a larger baldric or scabbard, compared to smaller swords. It seems "
-"a bit too bendy."
+"requires a larger baldric or scabbard, compared to smaller swords.  It seems"
+" a bit too bendy."
 msgstr ""
 
 #. ~ Description for estoc
@@ -40720,17 +41917,17 @@ msgid ""
 msgstr "一種用於擊劍運動的武器, 擊劍是所有運動中最高貴的。不幸的是, 鈍劍不是一種實用的武器, 因為它的劍身過於有彈性而且尖端是鈍的。"
 
 #: lang/json/GENERIC_from_json.py
-msgid "fencing epee"
-msgid_plural "fencing epees"
-msgstr[0] "擊劍銳劍"
+msgid "fencing épée"
+msgid_plural "fencing épées"
+msgstr[0] ""
 
-#. ~ Description for fencing epee
+#. ~ Description for fencing épée
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A weapon used for fencing, the most noble of all sports.  The epee is the "
+"A weapon used for fencing, the most noble of all sports.  The épée is the "
 "heaviest and stiffest of the fencing weapons, and therefore perhaps the most"
 " useful."
-msgstr "一種用於擊劍運動的武器, 擊劍是所有運動中最高貴的。銳劍是擊劍中最重且最硬的, 因此可能是擊劍武器中最實用的武器了。"
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "fencing saber"
@@ -40741,8 +41938,50 @@ msgstr[0] "擊劍軍刀"
 #: lang/json/GENERIC_from_json.py
 msgid ""
 "A weapon used for fencing, the most noble of all sports.  The fencing saber "
-"is marginally shorter than the foil and epee, but no less effective."
-msgstr "一種用於擊劍運動的武器, 擊劍是所有運動中最高貴的。軍刀比鈍劍與銳劍稍短, 但一樣有效。"
+"is marginally shorter than the foil and épée, but no less effective."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened foil"
+msgid_plural "sharpened foils"
+msgstr[0] ""
+
+#. ~ Description for sharpened foil
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing foil has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now somewhat more lethal, yet still familiar to"
+" the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened épée"
+msgid_plural "sharpened épées"
+msgstr[0] ""
+
+#. ~ Description for sharpened épée
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing épée has had its electrical plunger "
+"assembly removed and has been crudely sharpened to a point.  Though it still"
+" lacks a cutting edge, it is now considerably more lethal, yet still "
+"familiar to the practiced fencer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "sharpened saber"
+msgid_plural "sharpened sabers"
+msgstr[0] ""
+
+#. ~ Description for sharpened saber
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This once mostly harmless fencing saber has had its rounded tip snapped off "
+"and has been crudely sharpened to a point.  Though it still lacks a cutting "
+"edge, it is now considerably more lethal, yet still familiar to the "
+"practiced fencer."
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "hollow cane"
@@ -40997,8 +42236,8 @@ msgstr[0] "鋁錠"
 msgid ""
 "A small aluminum ingot, standardized for further processing.  Light but "
 "durable, this could be cast into various shapes for construction or ground "
-"down to a powder, for more... high-profile applications."
-msgstr "一個小鋁錠, 能夠被進一步處理。輕量且耐用, 能夠鑄造成各種形狀來進行建造, 或是壓成粉末, 或者… 更高深的應用。"
+"down to a powder, for more… high-profile applications."
+msgstr "一個小鋁錠，能夠被進一步處理。輕量且耐用，能夠鑄造成各種形狀來進行建造，或是壓成粉末，或者… 更高深的應用。"
 
 #: lang/json/GENERIC_from_json.py
 msgid "scrap copper"
@@ -41300,6 +42539,43 @@ msgid ""
 " can also serve as an improvised stabbing weapon, but will break quickly."
 msgstr "一支帶有木柄的鋼錐，常用於皮革加工。它也可以當作粗製的刺擊武器，只是很快就會壞掉。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "frame loom"
+msgid_plural "frame looms"
+msgstr[0] ""
+
+#. ~ Description for frame loom
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a rather bulky and primitive wooden frame which can be used to weave"
+" cloth sheets.  It is very slow, though."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "wooden shed stick"
+msgid_plural "wooden shed sticks"
+msgstr[0] ""
+
+#. ~ Description for wooden shed stick
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a short thin flat wooden stick, used as a tool while weaving cloth "
+"with a frame loom."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "tailoring pattern set"
+msgid_plural "tailoring pattern sets"
+msgstr[0] ""
+
+#. ~ Description for tailoring pattern set
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This is a large set of tailoring patterns made from paper.  They're useful "
+"for making any kind of cloth or leather items from scratch, but are "
+"necessary for more advanced projects."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "vehicle alternator"
 msgid_plural "vehicle alternators"
@@ -42636,7 +43912,7 @@ msgstr[0] "中型輪轂組件"
 #. ~ Description for medium wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A metal assembly that allows bolting a wheel on a car. Fit for a car wheel."
+"A metal assembly that allows bolting a wheel on a car.  Fit for a car wheel."
 msgstr "金屬組件，可以用於將車輪固定在汽車上。適合汽車輪胎。"
 
 #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py
@@ -42647,8 +43923,8 @@ msgstr[0] "重型輪轂組件"
 #. ~ Description for heavy wheel hub assembly
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"A heavy metal assembly that allows bolting a wheel on a car. Fit for a large"
-" car wheel."
+"A heavy metal assembly that allows bolting a wheel on a car.  Fit for a "
+"large car wheel."
 msgstr "重型金屬組件，可以用於將車輪固定在汽車上。適合大型汽車輪胎。"
 
 #: lang/json/GENERIC_from_json.py
@@ -43707,6 +44983,26 @@ msgid ""
 "art."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "The Iron Whip"
+msgid_plural "The Iron Whips"
+msgstr[0] "鐵鞭"
+
+#. ~ Use action msg for The Iron Whip.
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"You loop the whip in your hand and it coils back into a belt form in an "
+"instant."
+msgstr ""
+
+#. ~ Description for The Iron Whip
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long braided flexible steel bullwhip that narrows into a sharp blade at "
+"the end.  Easily capable of slicing and dicing anything that comes at you.  "
+"It transforms back into a belt."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "cudgel +1"
 msgid_plural "cudgel +1s"
@@ -44127,6 +45423,130 @@ msgid "dao +2"
 msgid_plural "dao +2s"
 msgstr[0] "中式刀 +2"
 
+#: lang/json/GENERIC_from_json.py
+msgid "Biomancer spear"
+msgid_plural "Biomancer spears"
+msgstr[0] "生機術士骨矛"
+
+#. ~ Description for Biomancer spear
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A grotesque bone spearhead on a stout wooden pole.  There is a Biomancer "
+"rune embedded at the base of the head."
+msgstr "奇異的骨製矛頭裝在粗壯的木桿上。矛頭底部鑲嵌著生機術士符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Technomancer toolbar"
+msgid_plural "Technomancer toolbars"
+msgstr[0] "科技巫師工具棒"
+
+#. ~ Description for Technomancer toolbar
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
+"hammer on the other in a convienent package.  There is a Technomancer rune "
+"embedded in the hammerhead."
+msgstr "這棍棒在橇棍前頭上整合了堅固的活動扳手，以及在鐵鎚上整合了許多適合的工具套組。在鎚頭上鑲嵌著科技巫師符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Magus staff"
+msgid_plural "Magus staves"
+msgstr[0] "祆教徒法杖"
+
+#. ~ Description for {'str': 'Magus staff', 'str_pl': 'Magus staves'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
+"and infused with mana for durability, to act as mana receptacles.  There are"
+" two Magi runes embedded at the tips."
+msgstr "雕刻符文的長棍，附有兩個玻璃罐。經過淬火回火後注入法力提升其耐用度。尖端鑲嵌著兩個祆教徒符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Kelvinist flamberge"
+msgid_plural "Kelvinist flamberges"
+msgstr[0] "熱力學者焰形劍"
+
+#. ~ Description for Kelvinist flamberge
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A sword with an undulating blade, reminiscent of a flame.  There is a "
+"Kelvinist rune embedded in the pommel."
+msgstr "有著如火焰般波浪形狀劍身的雙手大劍。在劍柄端頭上鑲嵌著熱力學者符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Stormshaper axe"
+msgid_plural "Stormshaper axes"
+msgstr[0] "塑風者銅斧"
+
+#. ~ Description for Stormshaper axe
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A forged copper axe with silver trimmings and a wooden handle.  There is a "
+"Stormshaper rune embedded in the eye."
+msgstr "有著銀飾和木製手柄的鍛造銅斧。斧眼中鑲嵌著風暴塑形者的符文。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Animist athame"
+msgid_plural "Animist athames"
+msgstr[0] "泛靈論者儀式刀"
+
+#. ~ Description for Animist athame
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A steel ritual knife used by Animists to draw blood for summoning.  Their "
+"school rune is embedded in the crossguard."
+msgstr "鋼製的儀式用小刀，泛靈論者在召喚時用來放血的器具。他們學派的符文正鑲嵌在護手上。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(baton)"
+msgid_plural "springstaves(baton)"
+msgstr[0] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Extend to staff"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You snap open your springstaff into staff mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(baton)', 'str_pl':
+#. 'springstaves(baton)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips retracted while in baton configuration.  Activate to extend."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "springstaff(staff)"
+msgid_plural "springstaves(staff)"
+msgstr[0] ""
+
+#. ~ Use action menu_text for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "Retract to baton"
+msgstr ""
+
+#. ~ Use action msg for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}.
+#: lang/json/GENERIC_from_json.py
+msgid "You collapse your springstaff into baton mode."
+msgstr ""
+
+#. ~ Description for {'str': 'springstaff(staff)', 'str_pl':
+#. 'springstaves(staff)'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"This versatile weapon uses Technomancy-enhanced springs to keep the staff "
+"tips from retracting while in staff configuration.  Activate to extend."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "magic token"
 msgid_plural "magic tokens"
@@ -44386,6 +45806,20 @@ msgid ""
 "to land astoundingly powerful blows."
 msgstr "一雙巨大的發光金屬重型長手套，表面鑲滿著魔法符號，讓你可以揮出驚人的強大打擊。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "Earthshaper cestus"
+msgid_plural "Earthshaper cesti"
+msgstr[0] "塑地者拳套"
+
+#. ~ Description for {'str': 'Earthshaper cestus', 'str_pl': 'Earthshaper
+#. cesti'}
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A stone battle glove with carved runes encasing the hand, protecting it "
+"while increasing striking power.  There is an Earthshaper rune embedded in "
+"the palm."
+msgstr "一雙雕刻著符文的石製手套，包覆雙手保護它並增強打擊力道。在掌中鑲嵌著大地塑形者的符文。"
+
 #: lang/json/GENERIC_from_json.py
 msgid "stone shell"
 msgid_plural "stone shells"
@@ -44462,6 +45896,18 @@ msgid ""
 "prized for their beauty and power."
 msgstr "當鯊蜥獸在地底挖洞時，它的鰓會收集微量的貴重金屬和寶石，這些慢慢地聚集成燦爛的珠寶，因其美麗與魔力而備受珍視。"
 
+#: lang/json/GENERIC_from_json.py
+msgid "stirge proboscis"
+msgid_plural "stirge proboscises"
+msgstr[0] ""
+
+#. ~ Description for stirge proboscis
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"A long sucking apparatus harvested from stirge corpse.  Makes a poor melee "
+"weapon."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "black dragon scale"
 msgid_plural "black dragon scales"
@@ -44486,93 +45932,6 @@ msgid ""
 "scales could make a suit of armor as hard as steel and half as heavy."
 msgstr "已處理的黑龍皮。堅硬而耐酸，如果有足量的黑龍皮，你可以製作一套硬如鋼鐵的護甲，而且重量只有鋼鐵的一半。"
 
-#: lang/json/GENERIC_from_json.py
-msgid "Biomancer spear"
-msgid_plural "Biomancer spears"
-msgstr[0] "生機術士骨矛"
-
-#. ~ Description for Biomancer spear
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune"
-" embedded at the base of the head."
-msgstr "奇異的骨製矛頭裝在粗壯的木桿上。矛頭底部鑲嵌著生機術士符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Technomancer toolbar"
-msgid_plural "Technomancer toolbars"
-msgstr[0] "科技巫師工具棒"
-
-#. ~ Description for Technomancer toolbar
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"This staff incorporates a sturdy cresent wrench on top of a prybar and a "
-"hammer on the other in a convienent package. There is a Technomancer rune "
-"embedded in the hammerhead."
-msgstr "這棍棒在橇棍前頭上整合了堅固的活動扳手，以及在鐵鎚上整合了許多適合的工具套組。在鎚頭上鑲嵌著科技巫師符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Magus staff"
-msgid_plural "Magus staves"
-msgstr[0] "祆教徒法杖"
-
-#. ~ Description for Magus staff
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A quarterstaff with runes carved into it and two glass jars, heat-tempered "
-"and infused with mana for durability, to act as mana receptacles. There are "
-"two Magi runes embedded at the tips."
-msgstr "雕刻符文的長棍，附有兩個玻璃罐。經過淬火回火後注入法力提升其耐用度。尖端鑲嵌著兩個祆教徒符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Earthshaper cestus"
-msgid_plural "Earthshaper cesti"
-msgstr[0] "塑地者拳套"
-
-#. ~ Description for Earthshaper cestus
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A stone battle glove with carved runes encasing the hand, protecting it "
-"while increasing striking power. There is an Earthshaper rune embedded in "
-"the palm."
-msgstr "一雙雕刻著符文的石製手套，包覆雙手保護它並增強打擊力道。在掌中鑲嵌著大地塑形者的符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Kelvinist flamberge"
-msgid_plural "Kelvinist flamberges"
-msgstr[0] "熱力學者焰形劍"
-
-#. ~ Description for Kelvinist flamberge
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A sword with an undulating blade, reminiscent of a flame. There is a "
-"Kelvinist rune embedded in the pommel."
-msgstr "有著如火焰般波浪形狀劍身的雙手大劍。在劍柄端頭上鑲嵌著熱力學者符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Stormshaper axe"
-msgid_plural "Stormshaper axes"
-msgstr[0] "塑風者銅斧"
-
-#. ~ Description for Stormshaper axe
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A forged copper axe with silver trimmings and a wooden handle. There is a "
-"Stormshaper rune embedded in the eye."
-msgstr "有著銀飾和木製手柄的鍛造銅斧。斧眼中鑲嵌著風暴塑形者的符文。"
-
-#: lang/json/GENERIC_from_json.py
-msgid "Animist athame"
-msgid_plural "Animist athames"
-msgstr[0] "泛靈論者儀式刀"
-
-#. ~ Description for Animist athame
-#: lang/json/GENERIC_from_json.py
-msgid ""
-"A steel ritual knife used by Animists to draw blood for summoning. Their "
-"school rune is embedded in the crossguard."
-msgstr "鋼製的儀式用小刀，泛靈論者在召喚時用來放血的器具。他們學派的符文正鑲嵌在護手上。"
-
 #: lang/json/GENERIC_from_json.py
 msgid "lesser staff of the magi"
 msgid_plural "lesser staves of the magi"
@@ -44641,6 +46000,53 @@ msgstr[0] "邪惡骨矛"
 msgid "This is a wicked spear/halberd hybrid entirely created of bone."
 msgstr "這是一種完全由骨骼製成的邪惡的長矛／戟混合體。"
 
+#. ~ Description for Mjölnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Mjölnir, the legendary hammer of Thor.  It is rumored to be able to level "
+"mountains with a single blow.  You feel the power of Asgard coursing through"
+" the hammer."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gungnir"
+msgid_plural "Gungnirs"
+msgstr[0] "永恆之槍"
+
+#. ~ Description for Gungnir
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gungnir, the spear of Odin.  It is rumored to be the perfect spear, "
+"perfectly hitting any target regardless of the wielder's strength or skill."
+"  If feels like Odin's protecting you."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] ""
+
+#. ~ Description for Gram
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Gram, the sword of Sigurd.  It is rumored to be the sword that slayed the "
+"legendary dragon, Fafnir.  Once said to have cleaved Regin's anvil in half, "
+"the edge is impeccable."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py
+msgid "Laevateinn"
+msgid_plural "Laevateinns"
+msgstr[0] "勝利之劍"
+
+#. ~ Description for Laevateinn
+#: lang/json/GENERIC_from_json.py
+msgid ""
+"Laevateinn, the staff of Loki.  Said to have been plucked from the gates of "
+"Hel by Loki.  Imbued with a mysterious magic, the magic of the trickster god"
+" himself."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "Spell Scroll"
 msgid_plural "Spell Scrolls"
@@ -44867,9 +46273,9 @@ msgstr[0] "致盲閃光卷軸"
 #. ~ Description for Blinding Flash
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
-"Blind enemies for a short time with a sudden, dazzling light. Higher levels "
-"deal slightly higher damage."
-msgstr "以一個突然且眩目的光令敵人暫時失明。高等級會稍為增加造成的傷害。"
+"Blind enemies for a short time with a sudden, dazzling light.  Higher levels"
+" deal slightly higher damage."
+msgstr ""
 
 #: lang/json/GENERIC_from_json.py
 msgid "Scroll of Ethereal Grasp"
@@ -44881,7 +46287,7 @@ msgstr[0] "空靈抓握卷軸"
 #: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
 msgid ""
 "A mass of spectral hands emerge from the ground, slowing everything in "
-"range. Higher levels allow a bigger AoE, and longer effect."
+"range.  Higher levels allow a bigger AoE, and longer effect."
 msgstr "許多鬼手從地板升出來，減慢在該範圍內的所有東西。越高等級的範圍越大，持續時間也越久。"
 
 #: lang/json/GENERIC_from_json.py
@@ -45592,8 +46998,32 @@ msgstr[0] "淨化種子卷軸"
 #. ~ Description for Scroll of Purification Seed
 #: lang/json/GENERIC_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Greater levels yield"
-" greater numbers of seeds."
+"You summon a gift of the earth which will purify water.  Greater levels "
+"yield greater numbers of seeds."
+msgstr "你召喚大地的贈禮，它將淨化水質。越高的等級能產生越多的種子。"
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of X-ray Vision"
+msgid_plural "Scroll of X-ray Visions"
+msgstr[0] ""
+
+#. ~ Description for Scroll of X-ray Vision
+#. ~ Description for X-ray Vision
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid ""
+"You fire a cone of X-rays that magically allow you to see that area for a "
+"short time."
+msgstr ""
+
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Clairvoyance"
+msgid_plural "Scroll of Clairvoyances"
+msgstr[0] ""
+
+#. ~ Description for Scroll of Clairvoyance
+#. ~ Description for Clairvoyance
+#: lang/json/GENERIC_from_json.py lang/json/SPELL_from_json.py
+msgid "You close your eyes and the earth surrenders its secrets to you."
 msgstr ""
 
 #: lang/json/GENERIC_from_json.py
@@ -45610,6 +47040,16 @@ msgid ""
 "rock and lava everywhere."
 msgstr ""
 
+#: lang/json/GENERIC_from_json.py
+msgid "Scroll of Acid Resistance"
+msgid_plural "Scroll of Acid Resistances"
+msgstr[0] ""
+
+#. ~ Description for Scroll of Acid Resistance
+#: lang/json/GENERIC_from_json.py
+msgid "This spell creates an invisible aura to protect you from acid."
+msgstr ""
+
 #: lang/json/GENERIC_from_json.py
 msgid "A Technomancer's Guide to Debugging C:DDA"
 msgid_plural "A Technomancer's Guide to Debugging C:DDAs"
@@ -46418,11 +47858,6 @@ msgid ""
 "ornaments."
 msgstr "雷神之錘, 雷神武器的複製品。傳說僅僅一擊就能夷平山脈。武器上有金銀裝飾。"
 
-#: lang/json/GENERIC_from_json.py
-msgid "Gungnir"
-msgid_plural "Gungnirs"
-msgstr[0] "永恆之槍"
-
 #. ~ Description for Gungnir
 #: lang/json/GENERIC_from_json.py
 msgid ""
@@ -47296,6 +48731,11 @@ msgstr "化學製品"
 msgid "SPARE PARTS"
 msgstr "備用零件"
 
+#. ~ Crafting recipes subcategory of 'OTHER' category
+#: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py
+msgid "CONTAINERS"
+msgstr "容器"
+
 #: lang/json/ITEM_CATEGORY_from_json.py
 msgid "ARTIFACTS"
 msgstr "神器"
@@ -47306,6 +48746,307 @@ msgstr "神器"
 msgid "ARMOR"
 msgstr "護具"
 
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "ITEMS WORN"
+msgstr "穿戴中的物品"
+
+#: lang/json/ITEM_CATEGORY_from_json.py
+msgid "WEAPON HELD"
+msgstr "已手持的武器"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Unsorted"
+msgstr "物資: 未整理"
+
+#. ~ Description for Loot: Unsorted
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to "
+"sort items inside.  It can overlap with Loot zones of different types."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Food"
+msgstr "物資: 食物"
+
+#. ~ Description for Loot: Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for comestibles.  If more specific food zone is not defined, all"
+" food is moved here."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Food"
+msgstr "物資: 易腐食物"
+
+#. ~ Description for Loot: P.Food
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for perishable comestibles.  Does include perishable drinks if "
+"such zone is not specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drink"
+msgstr "物資: 飲料"
+
+#. ~ Description for Loot: Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for drinks.  Does include perishable drinks if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: P.Drink"
+msgstr "物資: 易腐飲料"
+
+#. ~ Description for Loot: P.Drink
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for perishable drinks."
+msgstr "容易腐敗的飲料的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Containers"
+msgstr ""
+
+#. ~ Description for Loot: Containers
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for empty containers."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Guns"
+msgstr "物資: 遠程武器"
+
+#. ~ Description for Loot: Guns
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for guns, bows and similar wearpons."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Magazines"
+msgstr "物資: 彈匣"
+
+#. ~ Description for Loot: Magazines
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for gun magazines."
+msgstr "槍械彈匣的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ammo"
+msgstr "物資: 彈藥"
+
+#. ~ Description for Loot: Ammo
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for ammo."
+msgstr "彈藥的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Weapons"
+msgstr "物資: 近戰武器"
+
+#. ~ Description for Loot: Weapons
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for melee weapons."
+msgstr "近戰武器的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Tools"
+msgstr "物資: 工具"
+
+#. ~ Description for Loot: Tools
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for tools."
+msgstr "工具的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Clothing"
+msgstr "物資: 衣物"
+
+#. ~ Description for Loot: Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for clothing.  Does include filthy clothing if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Clothing"
+msgstr "物資: 骯髒衣物"
+
+#. ~ Description for Loot: F.Clothing
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy clothing."
+msgstr "骯髒衣物的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Drugs"
+msgstr "物資: 藥物"
+
+#. ~ Description for Loot: Drugs
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for drugs and other medical items."
+msgstr "藥物與其他醫療用品的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Books"
+msgstr "物資: 書籍"
+
+#. ~ Description for Loot: Books
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for books and magazines."
+msgstr "書籍與雜誌的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mods"
+msgstr "物資: 模組"
+
+#. ~ Description for Loot: Mods
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firearm modifications and similar items."
+msgstr "槍械模組與其他類似物品的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Mutagens"
+msgstr "物資: 突變劑"
+
+#. ~ Description for Loot: Mutagens
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for mutagens, serums, and purifiers."
+msgstr "突變劑、血清與淨化劑的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Bionics"
+msgstr "物資: 生化插件"
+
+#. ~ Description for Loot: Bionics
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for Compact Bionics Modules, a.k.a. CBMS."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: V.Parts"
+msgstr "物資: 車輛零件"
+
+#. ~ Description for Loot: V.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for vehicle parts."
+msgstr "車輛零件的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Other"
+msgstr "物資: 其他"
+
+#. ~ Description for Loot: Other
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for other miscellaneous items."
+msgstr "雜項物品的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Fuel"
+msgstr "物資: 燃料"
+
+#. ~ Description for Loot: Fuel
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for gasoline, diesel, lamp oil and other substances used as a "
+"fuel."
+msgstr "汽油、柴油、燈油與其他燃料物質的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Seeds"
+msgstr "物資: 種子"
+
+#. ~ Description for Loot: Seeds
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for seeds, stems and similar items."
+msgstr "種子、莖與其他類似物品的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Chemical"
+msgstr "物資: 化學"
+
+#. ~ Description for Loot: Chemical
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for chemicals."
+msgstr "化學製品的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: S.Parts"
+msgstr "物資: 備用零件"
+
+#. ~ Description for Loot: S.Parts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for spare parts."
+msgstr "備用零件的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Artifacts"
+msgstr "物資: 神器"
+
+#. ~ Description for Loot: Artifacts
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for artifacts"
+msgstr "神器的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Corpses"
+msgstr "物資：屍體"
+
+#. ~ Description for Loot: Corpses
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for corpses"
+msgstr "存放屍體的位置。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Armor"
+msgstr "物資: 護甲"
+
+#. ~ Description for Loot: Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid ""
+"Destination for armor.  Does include filthy armor if such zone is not "
+"specified."
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: F.Armor"
+msgstr "物資: 骯髒護甲"
+
+#. ~ Description for Loot: F.Armor
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for filthy armor."
+msgstr "骯髒護甲的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Wood"
+msgstr "物資: 木頭"
+
+#. ~ Description for Loot: Wood
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for firewood and items that can be used as such."
+msgstr "薪柴和其他可作為薪柴使用的物品的目的地。"
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Custom"
+msgstr "物資：自訂"
+
+#. ~ Description for Loot: Custom
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Destination for loot with a custom filter that you can modify"
+msgstr ""
+
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Loot: Ignore"
+msgstr "物資: 忽略"
+
+#. ~ Description for Loot: Ignore
+#: lang/json/LOOT_ZONE_from_json.py
+msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
+msgstr "在這個區域裡的物品會忽略 \"整理物資\" 區域動作。"
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "ultra-light battery"
 msgid_plural "ultra-light batteries"
@@ -47514,9 +49255,9 @@ msgstr[0] "重型即棄電池"
 #: lang/json/MAGAZINE_from_json.py
 msgid ""
 "This is a heavy battery cell, universally compatible with all kinds of "
-"industrial-grade equipment and large tools. The battery's chemistry means "
+"industrial-grade equipment and large tools.  The battery's chemistry means "
 "that it has a very high capacity, but cannot be recharged."
-msgstr "這是一個重型的電池，適用於所有類型的工業級設備和大型工具。電池的化學性質代表著它有非常高的容量，但無法充電。"
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py
 msgid "fuel bunker"
@@ -47870,8 +49611,8 @@ msgstr "H&K G3 彈鼓"
 
 #. ~ Description for H&K G3 drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the H&K G3 rifle."
-msgstr "一個 50 發的彈鼓, 適用於 H&K G3 步槍。"
+msgid "A 50-round drum magazine for the H&K G3 rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "H&K G3 magazine"
@@ -47911,8 +49652,8 @@ msgstr "FN SCAR-H 彈鼓"
 
 #. ~ Description for FN SCAR-H drum magazine
 #: lang/json/MAGAZINE_from_json.py
-msgid "An 50-round drum magazine for the FN SCAR-H rifle."
-msgstr "一個 50 發的彈鼓, 適用於 FN SCAR-H 步槍。"
+msgid "A 50-round drum magazine for the FN SCAR-H rifle."
+msgstr ""
 
 #: lang/json/MAGAZINE_from_json.py
 msgid "FN SCAR-H magazine"
@@ -48006,15 +49747,6 @@ msgstr "P320 .357 SIG 彈匣"
 msgid "A 14 round double stack box magazine for the SIG Sauer P320."
 msgstr ""
 
-#: lang/json/MAGAZINE_from_json.py
-msgid "Taurus .38 magazine"
-msgstr "Taurus .38 彈匣"
-
-#. ~ Description for Taurus .38 magazine
-#: lang/json/MAGAZINE_from_json.py
-msgid "A compact steel box magazine for use with the Taurus Pro .38 pistol."
-msgstr "一個簡潔精巧的鋼製盒型彈匣, 適用於 Taurus Pro .38 手槍。"
-
 #: lang/json/MAGAZINE_from_json.py
 msgid ".38/.357 7-round speedloader"
 msgstr ".38/.357 7發快速裝填器"
@@ -48088,6 +49820,16 @@ msgstr ""
 msgid "A 10-round steel box magazine for use with the Hi-Point CF-380."
 msgstr ""
 
+#: lang/json/MAGAZINE_from_json.py
+msgid "Taurus Spectrum magazine"
+msgstr ""
+
+#. ~ Description for Taurus Spectrum magazine
+#: lang/json/MAGAZINE_from_json.py
+msgid ""
+"A compact, 6-round steel box magazine for use with the Taurus Spectrum."
+msgstr ""
+
 #: lang/json/MAGAZINE_from_json.py
 msgid "M1911 .38 Super magazine"
 msgstr "M1911 .38 超級彈彈匣"
@@ -50814,8 +52556,8 @@ msgstr[0] "迷你核彈無人機"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "Many times as large as a normal manhack, this flying quadcopter drone "
-"appears to have a mininuke inside.  If this is targeting you...  Run."
-msgstr "這台四軸飛行器無人機比一般無人機大上數倍，配有迷你核彈。如果看到它飛向你......快逃！"
+"appears to have a mininuke inside.  If this is targeting you…  Run."
+msgstr "這台四軸飛行器無人機比一般無人機大上數倍，配有迷你核彈。如果看到它飛向你... 快逃！"
 
 #: lang/json/MONSTER_from_json.py
 msgid "tiny fish"
@@ -51300,8 +53042,8 @@ msgstr[0] "龍蝦"
 msgid ""
 "These things were once considered pests not worth eating, then some "
 "marketing genius started selling them to people as a delicacy and they took "
-"off in popularity...  and price."
-msgstr "這些東西曾經被認為是有毒不能吃, 然後一些行銷天才開始將牠的美味推銷給人們, 使得牠們的知名度飛躍式的提升… 還有價格。"
+"off in popularity… and price."
+msgstr "這些東西曾經被認為是有毒不能吃，然後一些行銷天才開始將牠的美味推銷給人們，使得牠們的知名度飛躍式的提升… 還有價格。"
 
 #: lang/json/MONSTER_from_json.py
 msgid "crayfish"
@@ -51312,8 +53054,8 @@ msgstr[0] "小龍蝦"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "If you could get ahold of a bunch more of these, a hefty pot of boiling "
-"water, and some spicy seasonings..."
-msgstr "如果你可以抓一堆這東西, 準備一大鍋煮沸的開水, 再配上一些辛辣的調味料…"
+"water, and some spicy seasonings…"
+msgstr "如果你可以抓一堆這東西，準備一大鍋煮沸的開水，再配上一些辛辣的調味料…"
 
 #: lang/json/MONSTER_from_json.py
 msgid "Blinky"
@@ -52487,7 +54229,7 @@ msgstr[0] "溝鼠"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "A worm-tailed rodent with long whiskers and beady eyes.  The way it squeaks "
-"makes it sound...  hungry."
+"makes it sound… hungry."
 msgstr "有著像蟲一般尾巴與長鬍鬚小眼睛的囓齒動物。牠急促的吱吱聲聽起來… 餓了。"
 
 #: lang/json/MONSTER_from_json.py
@@ -52924,9 +54666,21 @@ msgstr[0] "巨大嘔吐者"
 #: lang/json/MONSTER_from_json.py
 msgid ""
 "This boomer, normally swollen and ready to burst, has strengthened and "
-"solidified.  The bile dribbling from its mouth also appears to have "
-"changed..."
-msgstr "這個隨時會爆裂的嘔吐者同樣腫脹, 但變得更強壯更堅硬。從它口中滴落的膽汁似乎也不同了…"
+"solidified.  The bile dribbling from its mouth also appears to have changed…"
+msgstr "這個隨時會爆裂的嘔吐者同樣腫脹，但變得更強壯更堅硬。從它口中滴落的膽汁似乎也不同了…"
+
+#: lang/json/MONSTER_from_json.py
+msgid "dissoluted devourer"
+msgid_plural "dissoluted devourers"
+msgstr[0] ""
+
+#. ~ Description for dissoluted devourer
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"Human bodies fused together into a colossus with heads and limbs sticking "
+"out of its bloated body.  You may have trouble estimating its healthiness "
+"and its capabilities might change."
+msgstr ""
 
 #: lang/json/MONSTER_from_json.py
 msgid "breather"
@@ -52973,7 +54727,7 @@ msgid ""
 "A human fused with a mess of metal parts and wires.  While its eyes are "
 "empty, flashes of pain pass across its face reminiscent of the person "
 "trapped in this grotesque body.  With enough surgical skills one might be "
-"able to give them back some humanity. If only they cared..."
+"able to give them back some humanity.  If only they cared…"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -53721,16 +55475,15 @@ msgstr[0] "西亞李畢福"
 #. ~ Description for {'str': 'Shia LaBeouf', 'str_pl': 'Shia LaBeouf'}
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Living in the woods, \n"
-"killing for sport, \n"
-"eating all the bodies, \n"
+"Living in the woods,\n"
+"killing for sport,\n"
+"eating all the bodies,\n"
 "actual cannibal Shia LaBeouf."
 msgstr ""
-"住在森林深處,\n"
-"殺人當作運動,\n"
-"吃掉所有屍體,\n"
-"現世的食人族, 西亞李畢福。\n"
-"(典故>> http://www.youtube.com/watch?v=PSO0lCO3TIg )"
+"住在森林深處，\n"
+"殺人當作運動，\n"
+"吃掉所有屍體，\n"
+"現世的食人族， 西亞李畢福。（譯註：取自 Rob Cantor 創作的歌曲 \"Shia LaBeouf\"）"
 
 #: lang/json/MONSTER_from_json.py
 msgid "shoggoth"
@@ -53965,7 +55718,7 @@ msgstr[0] ""
 #. ~ Description for wretched puker
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A degenerate corpse, shambling as it walks. Several junks and waste "
+"A degenerate corpse, shambling as it walks.  Several junks and waste "
 "materials have unified into its skin and wounds around it reeks in black "
 "goo."
 msgstr ""
@@ -54119,19 +55872,13 @@ msgstr[0] "舞者殭屍"
 #. ~ Description for zombie dancer
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"The foulest stench is in the air, \n"
-"The funk of forty thousand years, \n"
-"And grisly ghouls from every tomb, \n"
+"The foulest stench is in the air,\n"
+"The funk of forty thousand years,\n"
+"And grisly ghouls from every tomb,\n"
 "Are closing in to seal your doom!\n"
 "\n"
 "The dancer doesn't even notice you, it seems like something nearby is controlling it."
 msgstr ""
-"散發著陣陣惡臭,\n"
-"四千年的妖魔,\n"
-"墳堆裡的屍鬼,\n"
-"就將來完結你的性命! -- 麥可傑克森＜Thriller＞\n"
-"\n"
-"殭屍舞者根本沒留意到你, 它似乎被鄰近的某個東西操縱著。"
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie dog"
@@ -54397,15 +56144,11 @@ msgstr[0] "顫慄者"
 #. ~ Description for Thriller
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"And though you fight to stay alive, \n"
-"Your body starts to shiver. \n"
-"For no mere mortal can resist, \n"
+"And though you fight to stay alive,\n"
+"Your body starts to shiver.\n"
+"For no mere mortal can resist,\n"
 "The evil of the thriller."
 msgstr ""
-"你拼死決鬥,\n"
-"卻全身發抖。\n"
-"凡人不能抵擋,\n"
-"顫慄之邪靈。 -- 麥可傑克森＜Thriller＞"
 
 #: lang/json/MONSTER_from_json.py
 msgid "zombie snapper"
@@ -55805,9 +57548,9 @@ msgid ""
 msgstr "一隻雙腳行走的機器豬, 體型幾乎有你的兩倍大。小豬小豬快回家… 儘管它是一隻機器豬, 身上的味道卻比死屍還要臭。"
 
 #: lang/json/MONSTER_from_json.py
-msgid "str"
-msgid_plural "str_pl"
-msgstr[0] "str_pl"
+msgid "animatronic sheep"
+msgid_plural "animatronic sheep"
+msgstr[0] "羊型機械布偶"
 
 #. ~ Description for {'str': 'animatronic sheep', 'str_pl': 'animatronic
 #. sheep'}
@@ -56356,20 +58099,22 @@ msgid "The black pudding burns you with acid!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
-msgid "nothic"
-msgid_plural "nothics"
-msgstr[0] "諾斯獨眼怪"
+msgid "krabgek"
+msgid_plural "krabgeks"
+msgstr[0] ""
 
-#. ~ Description for nothic
+#. ~ Description for krabgek
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"A baleful eye peers out from the darkness, its gleam hinting at a weird "
-"intelligence and unnerving malevolence."
+"A large baleful eye peers out from the darkness, its gleam hinting at a "
+"weird intelligence and unnerving malevolence.  The eye oozes some pinkish "
+"liquid, and the weirdly humanoid figure is covered in sharp blue-black "
+"triangular plates."
 msgstr ""
 
-#. ~ Attack message of monster "nothic"'s spell "necrotic_gaze"
+#. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze"
 #: lang/json/MONSTER_from_json.py
-msgid "The nothic gazes at %3$s!"
+msgid "The krabgek gazes at %3$s!"
 msgstr ""
 
 #: lang/json/MONSTER_from_json.py
@@ -56413,9 +58158,45 @@ msgstr[0] "巨魔"
 #. ~ Description for troll
 #: lang/json/MONSTER_from_json.py
 msgid ""
-"Monstrous, green-skinned humanoid. Trolls are renowned for their thick hides"
-" and natural regenerative ability."
-msgstr "怪異的綠膚的人形巨人。巨魔以其堅厚的皮膚和自然再生能力而聞名。"
+"Monstrous, green-skinned humanoid.  Trolls are renowned for their thick "
+"hides and natural regenerative ability."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "stirge"
+msgid_plural "stirges"
+msgstr[0] ""
+
+#. ~ Description for stirge
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"This horrid flying creature looks like a cross between a large bat and "
+"oversized mosquito."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "shrieker"
+msgid_plural "shriekers"
+msgstr[0] ""
+
+#. ~ Description for shrieker
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A shrieker is a human-sized mushroom that emits a piercing screech to drive "
+"off creatures that disturb it."
+msgstr ""
+
+#: lang/json/MONSTER_from_json.py
+msgid "lemure"
+msgid_plural "lemures"
+msgstr[0] ""
+
+#. ~ Description for lemure
+#: lang/json/MONSTER_from_json.py
+msgid ""
+"A lemure resembles a molten mass of flesh with a vaguely humanoid head and "
+"torso."
+msgstr ""
 
 #: lang/json/MONSTER_from_json.py
 msgid "automated turret"
@@ -58258,8 +60039,8 @@ msgid "Reveals an area around you on the overmap"
 msgstr "在世界地圖上揭露你周圍的區域"
 
 #. ~ Message for SPELL 'Artifact Map'
-#: lang/json/SPELL_from_json.py
-msgid "You have a vision of the surrounding area..."
+#: lang/json/SPELL_from_json.py src/iuse.cpp
+msgid "You have a vision of the surrounding area…"
 msgstr "你獲得了周圍地區的視野…"
 
 #: lang/json/SPELL_from_json.py
@@ -58465,8 +60246,8 @@ msgstr "泛靈論者符文"
 #. ~ Description for Animist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Animists. You can use the rune"
-" as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Animists.  You can use the "
+"rune as a catalyst for recipes."
 msgstr "這個儀式創造了一個與泛靈論者契合的小石子。你能將此符文用於製作時的催化劑。"
 
 #: lang/json/SPELL_from_json.py
@@ -58504,7 +60285,7 @@ msgstr "生機術士符文"
 #. ~ Description for Biomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Biomancers. You can use the "
+"This ritual creates a small pebble attuned to Biomancers.  You can use the "
 "rune as a catalyst for recipes."
 msgstr "這個儀式創造了一個與生機術士契合的小石子。你能將此符文用於製作時的催化劑。"
 
@@ -58553,6 +60334,20 @@ msgstr "轉移自我"
 msgid "Translocates the user to an attuned gate."
 msgstr "將施法者移轉到預調的傳送門。"
 
+#: lang/json/SPELL_from_json.py
+msgid "Acid Resistance"
+msgstr ""
+
+#. ~ Description for Acid Resistance
+#. ~ Description for Greater Acid Resistance
+#: lang/json/SPELL_from_json.py
+msgid "Protects the user from acid."
+msgstr ""
+
+#: lang/json/SPELL_from_json.py
+msgid "Greater Acid Resistance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Template Spell"
 msgstr "模板法術"
@@ -58602,7 +60397,7 @@ msgstr "使用一點耐力"
 #. ~ Message for SPELL 'Debug Stamina Spell'
 #: lang/json/SPELL_from_json.py
 #, python-format
-msgid "Debug spell [ %s ] has no effect. Debug warning is expected."
+msgid "Debug spell [ %s ] has no effect.  Debug warning is expected."
 msgstr "除錯施展 [%s] 沒有效果。預期顯示除錯警告。"
 
 #: lang/json/SPELL_from_json.py
@@ -58761,7 +60556,7 @@ msgstr "德魯伊符文"
 #. ~ Description for Druid Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Druids. You can use the rune "
+"This ritual creates a small pebble attuned to Druids.  You can use the rune "
 "as a catalyst for recipes."
 msgstr "這個儀式創造了一個與德魯伊契合的小石子。你能將此符文用於製作時的催化劑。"
 
@@ -58772,8 +60567,8 @@ msgstr "淨化種子"
 #. ~ Description for Purification Seed
 #: lang/json/SPELL_from_json.py
 msgid ""
-"You summon a gift of the earth which will purify water. Rapidly degrades if "
-"not utilized."
+"You summon a gift of the earth which will purify water.  Rapidly degrades if"
+" not utilized."
 msgstr "你召喚大地的贈禮，能夠淨化水質的種子。如果不使用的話會快速變質。"
 
 #: lang/json/SPELL_from_json.py
@@ -58820,8 +60615,8 @@ msgstr "塑地者符文"
 #. ~ Description for Earthshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Earthshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Earthshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr "這個儀式創造了一個與大地塑形者契合的小石子。你能將此符文用於製作時的催化劑。"
 
 #: lang/json/SPELL_from_json.py
@@ -58847,6 +60642,10 @@ msgstr "熔岩炸彈地形"
 msgid "Lava Bomb"
 msgstr "熔岩炸彈"
 
+#: lang/json/SPELL_from_json.py
+msgid "Clairvoyance"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Twisted Restoration"
 msgstr "扭曲恢復"
@@ -58854,7 +60653,7 @@ msgstr "扭曲恢復"
 #. ~ Description for Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
 " condition."
 msgstr "這個法術讓你的心臟超頻，以產生新的肉體與肌肉。在危險情況下使用它是不明智的，如果在危急情況下施展可能會致命。"
@@ -58866,9 +60665,9 @@ msgstr "改良扭曲恢復"
 #. ~ Description for Improved Twisted Restoration
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This spell overclocks your heart, generating new flesh and muscle. It is "
+"This spell overclocks your heart, generating new flesh and muscle.  It is "
 "unwise to use this in immediate danger, and may be fatal if done in critical"
-" condition. Improved brewing mitigates the strain of the spell."
+" condition.  Improved brewing mitigates the strain of the spell."
 msgstr "這個法術讓你的心臟超頻，以產生新的肉體與肌肉。在危險情況下使用它是不明智的，如果在危急情況下施展可能會致命。經過改良，降低了該法術的壓力。"
 
 #: lang/json/SPELL_from_json.py
@@ -58941,7 +60740,7 @@ msgstr "熱力學者符文"
 #. ~ Description for Kelvinist Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Kelvinists. You can use the "
+"This ritual creates a small pebble attuned to Kelvinists.  You can use the "
 "rune as a catalyst for recipes."
 msgstr "這個儀式創造了一個與熱力學者契合的小石子。你能將此符文用於製作時的催化劑。"
 
@@ -58984,8 +60783,8 @@ msgstr "祆教徒符文"
 #. ~ Description for Magus Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Magi. You can use the rune as "
-"a catalyst for recipes."
+"This ritual creates a small pebble attuned to Magi.  You can use the rune as"
+" a catalyst for recipes."
 msgstr "這個儀式創造了一個與祆教徒契合的小石子。你能將此符文用於製作時的催化劑。"
 
 #: lang/json/SPELL_from_json.py lang/json/effects_from_json.py
@@ -59004,6 +60803,15 @@ msgstr "食人魔之力"
 msgid "Fox's Cunning"
 msgstr "狐之狡滑"
 
+#: lang/json/SPELL_from_json.py
+msgid "Blood Suck"
+msgstr "吸血術"
+
+#. ~ Description for Blood Suck
+#: lang/json/SPELL_from_json.py
+msgid "Sucks blood from one foe."
+msgstr "從一個敵人身上吸血。"
+
 #: lang/json/SPELL_from_json.py
 msgid "Jolt"
 msgstr "猛擊術"
@@ -59043,8 +60851,8 @@ msgstr "塑風者符文"
 #. ~ Description for Stormshaper Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Stormshapers. You can use the "
-"rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Stormshapers.  You can use the"
+" rune as a catalyst for recipes."
 msgstr "這個儀式創造了一個與風暴塑形者契合的小石子。你能將此符文用於製作時的催化劑。"
 
 #: lang/json/SPELL_from_json.py
@@ -59105,8 +60913,8 @@ msgstr "科技巫師符文"
 #. ~ Description for Technomancer Rune
 #: lang/json/SPELL_from_json.py
 msgid ""
-"This ritual creates a small pebble attuned to Technomancers. You can use the"
-" rune as a catalyst for recipes."
+"This ritual creates a small pebble attuned to Technomancers.  You can use "
+"the rune as a catalyst for recipes."
 msgstr "這個儀式創造了一個與科技巫師契合的小石子。你能將此符文用於製作時的催化劑。"
 
 #: lang/json/SPELL_from_json.py
@@ -59133,6 +60941,10 @@ msgstr "飛舞幻刃"
 msgid "Mirror Image"
 msgstr "鏡像投影"
 
+#: lang/json/SPELL_from_json.py
+msgid "X-ray Vision"
+msgstr ""
+
 #: lang/json/SPELL_from_json.py
 msgid "Demon Fireball"
 msgstr "惡魔火球術"
@@ -59621,6 +61433,44 @@ msgstr ""
 "這是一個訂製的 LED 頭燈, 以更大、更高效的電池組強化, 使它更耐用、更明亮。附有可調節式綁帶, 可以舒適地戴在頭上或安裝在頭盔上。它已經啟動, "
 "並且持續消耗電池。\"使用\" 以關閉它。"
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp"
+msgid_plural "atomic headlamps"
+msgstr[0] ""
+
+#. ~ Use action msg for atomic headlamp.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You close the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"close the cover and hide the light."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "atomic headlamp (covered)"
+msgid_plural "atomic headlamps (covered)"
+msgstr[0] ""
+
+#. ~ Use action msg for atomic headlamp (covered).
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "You open the headlamp's cover."
+msgstr ""
+
+#. ~ Description for atomic headlamp (covered)
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"This is a custom made reinforced headlamp powered by the magic of nuclear "
+"decay, focused for more usable brightness.  The adjustable strap allows it "
+"to be comfortably worn on your head or attached to your helmet.  Use it to "
+"open the cover and show the light."
+msgstr ""
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "RM13 combat armor"
 msgid_plural "RM13 combat armors"
@@ -59699,8 +61549,8 @@ msgstr[0] ""
 #. ~ Use action msg for phase immersion suit.
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"Initiating \n"
-"Running suit integrity diagnostics...\n"
+"Initiating\n"
+"Running suit integrity diagnostics…\n"
 "All systems operational."
 msgstr ""
 
@@ -60624,10 +62474,11 @@ msgstr "射擊耳罩的電池沒電了。"
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid ""
-"A pair of earmuffs favored by shooters.  The earmuffs are turned off.  They "
-"will block sounds over a certain decibel amount, assuming it is charged with"
-" batteries."
-msgstr "一對備深受射手喜愛的耳罩, 現在已經關閉。它能阻擋超過一定分貝的聲音, 前提是電池已經充電。"
+"A pair of earmuffs favored by shooters.  Without batteries or when turned "
+"off they function like normal earmuffs and block all sound.  They will block"
+" sounds over a certain decibel amount when turned on.  The earmuffs are "
+"currently off."
+msgstr ""
 
 #. ~ Description for shooter's earmuffs
 #: lang/json/TOOL_ARMOR_from_json.py
@@ -61047,6 +62898,198 @@ msgid ""
 "power."
 msgstr ""
 
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic leather belt"
+msgid_plural "magic leather belts"
+msgstr[0] "魔法皮帶"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Haste"
+msgid_plural "Belt of Hastes"
+msgstr[0] "迅捷腰帶"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Megingjörð"
+msgid_plural "Megingjörðs"
+msgstr[0] ""
+
+#. ~ Description for Megingjörð
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"The mythical belt of Thor, god of thunder.  Or at least so it appears.  It "
+"doubles the wearer's base strength."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Lesser Girdle of Pockets"
+msgid_plural "Lesser Girdle of Pocketss"
+msgstr[0] ""
+
+#. ~ Description for Lesser Girdle of Pockets
+#. ~ Description for Greater Girdle of Pockets
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, coverd in numerous small pouches "
+"that hold a lot more than they should, and the weight of their contents is "
+"greatly reduced."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Greater Girdle of Pockets"
+msgid_plural "Greater Girdle of Pocketss"
+msgstr[0] ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of Weaponry"
+msgid_plural "Belt of Weaponrys"
+msgstr[0] "武器庫腰帶"
+
+#. ~ Description for Belt of Weaponry
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A wide girdle that fits around your waist, you can sheath or holster any "
+"weapon into it in the blink of an eye, and it seemingly stores them "
+"somewhere else."
+msgstr "合身地環繞在你腰部的寬腰帶，你可以在眨眼間將任何武器放入其中，而它似乎將武器儲存在其他地方。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "Belt of The Iron Whip"
+msgid_plural "Belts of the Iron Whip"
+msgstr[0] "鐵鞭腰帶"
+
+#. ~ Use action msg for Belt of The Iron Whip.
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"You grab the belt and it uncoils to become a flexible metal whip in your "
+"hand!"
+msgstr ""
+
+#. ~ Description for Belt of The Iron Whip
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A braided but flexible belt seemingly made of metal.  You can activate it to"
+" transform it into a whip and flay your enemies."
+msgstr ""
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "escape boots"
+msgid_plural "escape boots"
+msgstr[0] "遁逃靴"
+
+#. ~ Description for escape boots
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"Rugged yet extremely comfortable and well fitting boots of worn leather and "
+"steel, these boots can be activated once a day to escape from nasty "
+"situations, teleporting you a good distance in a random direction."
+msgstr "即使表面破舊，但是磨損的皮革跟鋼鐵卻非常舒適且合腳。這靴子每天能啟動一次來逃離惡劣的環境，能將你傳送到隨機方向的很長距離處。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "pair of steel bracers"
+msgid_plural "pairs of steel bracers"
+msgstr[0] "一對鋼護腕"
+
+#. ~ Description for pair of steel bracers
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A full assembly of medieval arm protection."
+msgstr "一副完整的中世紀手臂保護裝置。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "steel bracer"
+msgid_plural "steel bracers"
+msgstr[0] "鋼護腕"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of lesser defense"
+msgid_plural "bracers of lesser defense"
+msgstr[0] "次級防護護腕"
+
+#. ~ Description for bracer of lesser defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, silver accentuates the intricate design.  It protects your body "
+"with a light aura to reduce damage you take."
+msgstr "輕巧但堅固的鋼製護腕，頂部刻有華麗的盾牌，銀色凸顯出精緻的設計。它具有輕微的靈氣保護你的身體，能減少受到的傷害。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "bracer of greater defense"
+msgid_plural "bracers of greater defense"
+msgstr[0] "高級防護護腕"
+
+#. ~ Description for bracer of greater defense
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate shield engraved on "
+"the top, gold accentuates the intricate design.  It protects your body with "
+"a strong aura to reduce damage you take."
+msgstr "輕巧但堅固的鋼製護腕，頂部刻有華麗的盾牌，金色凸顯出精緻的設計。它具有強大的靈氣保護你的身體，能減少受到的傷害。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "lesser bracer of lightning"
+msgid_plural "lesser bracers of lightning"
+msgstr[0] "次級閃電護腕"
+
+#. ~ Description for lesser bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, silver accentuates the intricate design.  It "
+"protects your body with a light aura to reduce electrical damage you take, "
+"as well as being able to release a Jolt spell 3 times a day."
+msgstr ""
+"輕巧但堅固的鋼製護腕，頂部刻有華麗的閃電束，銀色凸顯出精緻的設計。它具有輕微的靈氣保護你的身體，能減少遭受的電擊傷害，並且每天可以施放 3 次猛擊術。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "greater bracer of lightning"
+msgid_plural "greater bracers of lightning"
+msgstr[0] "高級閃電護腕"
+
+#. ~ Description for greater bracer of lightning
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A light but extremely sturdy steel bracer with an ornate bundle of lightning"
+" bolts engraved on the top, gold accentuates the intricate design.  It "
+"protects your body with a strong aura to reduce electrical damage you take, "
+"as well as being able to release a Lightning Bolt spell 3 times a day."
+msgstr ""
+"輕巧但堅固的鋼製護腕，頂部刻有華麗的閃電束，銀色凸顯出精緻的設計。它具有輕微的靈氣保護你的身體，能減少遭受的電擊傷害，並且每天可以施放 3 次閃電之箭。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "magic mask"
+msgid_plural "magic masks"
+msgstr[0] "魔法面具"
+
+#. ~ Description for magic mask
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "A generic magic mask."
+msgstr "一張普通的魔法面具。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of disappearance"
+msgid_plural "masks of disappearance"
+msgstr[0] "消逝面具"
+
+#. ~ Description for mask of disappearance
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A mask with no facial features at all, just eye and mouth holes, upon "
+"activation it makes everything ignore your presence for a while."
+msgstr "完全沒有面部特徵，只有眼孔和嘴孔的面具，當啟動時，它會使所有東西在一段時間內忽視你的存在。"
+
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid "mask of perfect vision"
+msgid_plural "masks of perfect vision"
+msgstr[0] "完美視覺面具"
+
+#. ~ Description for mask of perfect vision
+#: lang/json/TOOL_ARMOR_from_json.py
+msgid ""
+"A decidedly steampunk-looking half mask that covers the eye area of the "
+"face, it has large lenses that correct and greatly enhance the vision of the"
+" wearer."
+msgstr "這款看起來像蒸汽龐克的半面罩覆蓋了臉部的眼睛區域，它具有可矯正並大大增強佩戴者視力的大鏡片。"
+
 #: lang/json/TOOL_ARMOR_from_json.py
 msgid "copper magic ring"
 msgid_plural "copper magic rings"
@@ -61363,9 +63406,9 @@ msgstr[0] ""
 msgid ""
 "Harness the power of radiation in your own home!  This looks similar to a "
 "D-cell battery, but actually contains folded layers of radioactive material "
-"inside.  It can produce electricity for several years at a steady voltage..."
-" but it's barely enough to power a small LED, and these batteries were worth"
-" hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
+"inside.  It can produce electricity for several years at a steady voltage… "
+"but it's barely enough to power a small LED, and these batteries were worth "
+"hundreds of dollars.  Mostly they're a good way to brag to your neighbors "
 "that you have a nuclear power source in your house."
 msgstr ""
 
@@ -61484,8 +63527,8 @@ msgstr[0] "千里眼棒"
 #. ~ Description for clairvoyance rod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's "
-"a bug."
+"Item to test aep_clairvoyance_plus flag.  If this spawns randomly, then it's"
+" a bug."
 msgstr "測試 aep_clairvoyance_plus 指標的物品。如果隨機生成了，那就是程式出錯了。"
 
 #: lang/json/TOOL_from_json.py
@@ -61778,7 +63821,7 @@ msgstr "你點燃了 %s 的引信。"
 #. ~ Description for nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by nails and a fuse.  Use this item to light the fuse.  You will "
 "then have five turns before it explodes; throwing it would be a good idea."
 msgstr ""
@@ -61798,8 +63841,8 @@ msgstr "你已經點燃了引信, 還在等甚麼?"
 #. ~ Description for active nail bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by nails and a fuse. The fuse has been lit, you should throw it."
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by nails and a fuse.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -61810,7 +63853,7 @@ msgstr[0] ""
 #. ~ Description for fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
 "surrounded by small pieces of metal and a fuse.  Use this item to light the "
 "fuse.  You will then have five turns before it explodes; throwing it would "
 "be a good idea."
@@ -61824,8 +63867,8 @@ msgstr[0] ""
 #. ~ Description for active fragment bomb
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A crude and bulky improvised bomb. Made from a container, an explosive "
-"surrounded by small pieces of metal and a fuse. The fuse has been lit, you "
+"A crude and bulky improvised bomb.  Made from a container, an explosive "
+"surrounded by small pieces of metal and a fuse.  The fuse has been lit, you "
 "should throw it."
 msgstr ""
 
@@ -61844,8 +63887,8 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -61857,8 +63900,8 @@ msgstr[0] ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a tin can filled to the brim with explosive and with a bit of fuse "
-"sticking out of it. Will produce metal shrapnel that can deal with armor ..."
-" you think. The fuse has been lit, you should throw it."
+"sticking out of it.  Will produce metal shrapnel that can deal with armor… "
+"you think.  The fuse has been lit, you should throw it."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -61868,9 +63911,9 @@ msgstr[0] "傑克南瓜燈"
 
 #. ~ Use action menu_text for jack o'lantern.
 #. ~ Use action menu_text for candle.
-#. ~ Use action menu_text for hobo stove.
 #. ~ Use action menu_text for Louisville Slaughterer.
-#: lang/json/TOOL_from_json.py src/veh_interact.cpp
+#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py
+#: src/veh_interact.cpp
 msgid "Light"
 msgstr "燈光"
 
@@ -61903,7 +63946,7 @@ msgstr ""
 msgid ""
 "There is a thick LED candle inside the pumpkin face.  It doesn't provide "
 "very much light, but it can burn for quite a long time.  This candle is lit."
-" The face shifts."
+"  The face shifts."
 msgstr ""
 
 #. ~ Description for battle axe
@@ -62033,6 +64076,26 @@ msgid ""
 "fuse stuck inside of it."
 msgstr "這是一個填滿黑火藥且有引信的錫罐。"
 
+#: lang/json/TOOL_from_json.py
+msgid "hobo stove (lit)"
+msgid_plural "hobo stoves (lit)"
+msgstr[0] "輕型柴爐 (點燃)"
+
+#. ~ Use action msg for hobo stove (lit).
+#. ~ Use action msg for ember carrier (lit).
+#: lang/json/TOOL_from_json.py
+msgid "The ember is extinguished."
+msgstr "餘燼熄滅了。"
+
+#. ~ Description for hobo stove (lit)
+#. ~ Description for hobo stove
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small improvised wood stove, made from a metal can or similar "
+"container of the right size.  Useful for defrosting and reheating food, uses"
+" simple tinder."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "folded poncho"
 msgid_plural "folded ponchos"
@@ -62247,9 +64310,9 @@ msgstr[0] "水磨"
 #. ~ Description for water mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small water-powered mill that can convert starchy products into flour. Can"
-" be placed via the construction menu."
-msgstr "小型水力驅動的磨子，可將澱粉類產品轉化成麵粉。可以經由建造選單來放置。"
+"A small water-powered mill that can convert starchy products into flour.  "
+"Can be placed via the construction menu."
+msgstr ""
 
 #: lang/json/TOOL_from_json.py lang/json/furniture_from_json.py
 msgid "wind mill"
@@ -62259,9 +64322,9 @@ msgstr[0] "風車"
 #. ~ Description for wind mill
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small wind-powered mill that can convert starchy products into flour. Can "
-"be placed via the construction menu."
-msgstr "小型風力驅動的磨子，可將澱粉類產品轉化成麵粉。可以經由建造選單來放置。"
+"A small wind-powered mill that can convert starchy products into flour.  Can"
+" be placed via the construction menu."
+msgstr ""
 
 #: lang/json/TOOL_from_json.py
 msgid "banjo"
@@ -62584,9 +64647,9 @@ msgstr[0] "電動鋸刀 (關閉)"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "An electric meat carver powered by batteries.  Two serrated blades that "
-"vibrate together to slice just about anything from turkey to ham...  even "
+"vibrate together to slice just about anything from turkey to ham… even "
 "zombies!"
-msgstr "這是把由電池供電的電動鋸肉刀。兩片高速震動的鋸齒形刀片能把任何肉塊都切成片, 從火雞到火腿… 甚至是殭屍!"
+msgstr ""
 
 #: lang/json/TOOL_from_json.py
 msgid "electric carver (on)"
@@ -62751,7 +64814,7 @@ msgstr[0] ""
 #. ~ Description for lifestraw
 #: lang/json/TOOL_from_json.py
 msgid ""
-"Set the lifestraw in suspect water, let sit for one minute then drink. The "
+"Set the lifestraw in suspect water, let sit for one minute then drink.  The "
 "two part filtration system will purify the water you drink.  Water taken "
 "from uncertain sources like a river may be dirty."
 msgstr ""
@@ -63172,10 +65235,8 @@ msgstr[0] "電子手銬"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "A pair of electronic handcuffs, used by police and riot bots to detain captives.  Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police.  Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\n"
-"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative..."
+"However, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…"
 msgstr ""
-"一付電子手銬, 通常是警察或鎮暴機器人用來逮捕嫌犯時使用。它會持續的發出警報聲, 以警告嫌犯在移送過程中不要逃跑或者嘗試掙脫, 否則會讓你嘗嘗電擊的滋味。\n"
-"但是, 當警察現在正忙著對抗殭屍, 你可能要等很久才會到達移送目的地了, 除非你有什麼其他特別的想法…"
 
 #: lang/json/TOOL_from_json.py
 msgid "entrenching tool"
@@ -64412,7 +66473,7 @@ msgstr "點燃布條"
 #. ~ Use action msg for Molotov cocktail.
 #: lang/json/TOOL_from_json.py
 msgid "You light the Molotov cocktail!"
-msgstr ""
+msgstr "你燃點了汽油彈！"
 
 #. ~ Description for Molotov cocktail
 #: lang/json/TOOL_from_json.py
@@ -64988,9 +67049,9 @@ msgstr[0] "海綿"
 #. ~ Description for sponge
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A sponge is a tool or cleaning aid made of soft, porous material. Typically "
-"used for cleaning impervious surfaces."
-msgstr "海綿是一個由柔軟多孔素材製作而成的清潔用品。一般用於清潔抗滲的表面。"
+"A sponge is a tool or cleaning aid made of soft, porous material.  Typically"
+" used for cleaning impervious surfaces."
+msgstr ""
 
 #: lang/json/TOOL_from_json.py
 msgid "washing kit"
@@ -65851,9 +67912,8 @@ msgstr "你點燃了黑火藥炸藥包的引線。你最好盡快遠離它!"
 msgid ""
 "This is a home-made explosive device, consisting of a large plastic jug "
 "filled with black gunpowder and scrap metal, equipped with a long fuse.  Use"
-" this item to light the fuse.  Should explode in a few minutes..."
+" this item to light the fuse.  Should explode in a few minutes…"
 msgstr ""
-"這是一個自製的爆炸裝置, 由一個裝滿黑火藥和廢金屬的大塑料罐製成, 上面插著根長長的引線。使用這個物品以點燃引線, 大概在幾分鐘內就會爆炸…"
 
 #: lang/json/TOOL_from_json.py
 msgid "active black gunpowder charge"
@@ -66348,36 +68408,6 @@ msgid "hobo stove"
 msgid_plural "hobo stoves"
 msgstr[0] "輕型柴爐"
 
-#. ~ Use action msg for hobo stove.
-#: lang/json/TOOL_from_json.py
-msgid "The hobo stove is lit."
-msgstr ""
-
-#. ~ Use action need_fire_msg for hobo stove.
-#: lang/json/TOOL_from_json.py src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp
-msgid "You need a source of fire!"
-msgstr "你需要一個火源!"
-
-#. ~ Description for hobo stove
-#. ~ Description for hobo stove (lit)
-#: lang/json/TOOL_from_json.py
-msgid ""
-"This is a small improvised wood stove, made from a metal can or similar "
-"container of the right size.  Useful for defrosting and reheating food, uses"
-" simple tinder."
-msgstr ""
-
-#: lang/json/TOOL_from_json.py
-msgid "hobo stove (lit)"
-msgid_plural "hobo stoves (lit)"
-msgstr[0] "輕型柴爐 (點燃)"
-
-#. ~ Use action msg for hobo stove (lit).
-#. ~ Use action msg for ember carrier (lit).
-#: lang/json/TOOL_from_json.py
-msgid "The ember is extinguished."
-msgstr "餘燼熄滅了。"
-
 #: lang/json/TOOL_from_json.py
 msgid "ember carrier"
 msgid_plural "ember carriers"
@@ -66544,9 +68574,9 @@ msgstr[0] "手抓鉤"
 #. ~ Description for grip hook
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A simple steel meathook with a circular steel handle. Makes a passable melee"
-" weapon."
-msgstr "一個簡單的鋼製肉鉤具有圓形鋼手柄。可以做為一把差強人意的近戰武器。"
+"A simple steel meathook with a circular steel handle.  Makes a passable "
+"melee weapon."
+msgstr ""
 
 #: lang/json/TOOL_from_json.py
 msgid "bathroom scale"
@@ -66882,7 +68912,7 @@ msgstr ""
 #. ~ Description for inactive TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M16A4. Using this item "
+"This is an inactive TALON UGV equipped with an M16A4.  Using this item "
 "involves loading the unit with the factory-loaded 5.56x45mm rounds in your "
 "inventory (if you wish to divide your ammunition, set aside whatever "
 "5.56x45mm you do NOT want to give the robot) turning it on, and placing it "
@@ -66890,8 +68920,6 @@ msgid ""
 "will then identify you as a friendly, roam around or follow you, and attack "
 "all enemies with its rifle."
 msgstr ""
-"這台未啟動的 TALON 無人地面載具配備著 M16A4 。使用此物品時會從你的物品欄內裝填原廠的 5.56x45 mm "
-"子彈（如果不想要所有子彈都用來裝填的話，可以把不想要被裝填的子彈先從物品欄內丟出），使用後把它放在地上就會啟動。如果改寫程式並重調線路成功的話，這台保全機器人會將你識別為友方，在附近漫遊或跟隨你，並以內建的步槍攻擊所有範圍內的敵人。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive M202A1 TALON UGV"
@@ -66901,7 +68929,7 @@ msgstr[0] "未啟動的 M202A1 TALON 無人地面載具"
 #. ~ Description for inactive M202A1 TALON UGV
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive TALON UGV equipped with an M202A1. Using this item "
+"This is an inactive TALON UGV equipped with an M202A1.  Using this item "
 "involves loading the unit with the M235 rockets in your inventory (if you "
 "wish to divide your ammunition, set aside whatever M235 rockets you do NOT "
 "want to give the robot) turning it on, and placing it on the ground.  If "
@@ -66909,10 +68937,6 @@ msgid ""
 "you as a friendly, roam around or follow you, and attack all enemies with "
 "its M202A1."
 msgstr ""
-"這台未啟動的 TALON 無人地面載具配備著 M202A1 。使用此物品時會從你的物品欄內裝填 M235 "
-"火箭（如果不想要所有火箭都用來裝填的話，可以把不想要被裝填的 M235 "
-"火箭先從物品欄內丟出），使用後把它放在地上就會啟動。如果改寫程式並重調線路成功的話，這台保全機器人會將你識別為友方，在附近漫遊或跟隨你，並以內建的 "
-"M202A1 攻擊所有範圍內的敵人。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive nurse bot"
@@ -66993,9 +69017,9 @@ msgstr ""
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a deactivated broken cyborg, the last shreds of its humanity still "
-"rotting away. Using this item involves placing it on the ground and "
+"rotting away.  Using this item involves placing it on the ground and "
 "reactivating its mechanical body.  If reprogrammed and rewired successfully "
-"the cyborg will then follow you and attack enemies. You monster."
+"the cyborg will then follow you and attack enemies.  You monster."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -67045,7 +69069,7 @@ msgstr ""
 #. ~ Description for inactive chicken walker
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive chicken walker. Using this item involves placing it on "
+"This is an inactive chicken walker.  Using this item involves placing it on "
 "the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm "
 "cartridge grenades in your inventory (if you wish to divide your ammunition,"
 " set aside whatever ammunition you do NOT want to give the robot) and "
@@ -67053,8 +69077,6 @@ msgid ""
 "will then identify you as a friendly, roam around or follow you, and attack "
 "all enemies with a built-in firearm and grenade launcher."
 msgstr ""
-"未啟動的雙足步行機器人。使用此物品時會從你的物品欄內裝填原廠的 5.56 子彈與 40 mm "
-"榴彈（如果不想要所有彈藥都用來裝填的話，可以把不想要被裝填的彈藥先從物品欄內丟出），使用後把它放在地上就會啟動。如果改寫程式並重調線路成功的話，這台鳥足機器人會將你識別為友方，在附近漫遊或跟隨你，並以內建的槍械與榴彈發射器攻擊所有範圍內的敵人。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive police bot"
@@ -67075,12 +69097,11 @@ msgstr "警用機器人準備逮捕你，警笛鳴叫、警燈狂閃。"
 #. ~ Description for inactive police bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive police robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive police robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "police bot will then identify you as law enforcement, roam around or follow "
 "you, and attempt to detain lawbreakers."
 msgstr ""
-"未啟動的警用機器人。使用時放在地上並啟動它。如果改寫程式並重調線路成功的話，警察機器人會將你辨識為執法人員，在附近漫遊或跟隨你，並嘗試拘留違法者。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive eyebot"
@@ -67102,10 +69123,10 @@ msgstr "眼球機器人不以為然地發出嗶嗶聲，並且相機對焦在你
 #. ~ Description for inactive eyebot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive eyebot. Using this item involves turning it on and "
+"This is an inactive eyebot.  Using this item involves turning it on and "
 "launching the UAV.  If reprogrammed and rewired successfully the eyebot will"
 " then keep watch for intruders."
-msgstr "未啟動的眼球機器人。把它開啟並啟動無人機。如果改寫程式並重調線路成功的話，眼球機器人會持續監視入侵者。"
+msgstr ""
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive cleaner bot"
@@ -67125,10 +69146,10 @@ msgstr ""
 #. ~ Description for inactive cleaner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive cleaner bot. Using this item involves placing it on the "
-"ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive cleaner bot.  Using this item involves placing it on the"
+" ground and turning it on.  If reprogrammed and rewired successfully the "
 "cleaner bot will respond to future commands."
-msgstr "未啟動的清潔機器人。使用時放在地上並啟動它。如果改寫程式並重調線路成功的話，清潔機器人會回應接下來的命令。"
+msgstr ""
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive miner bot"
@@ -67148,8 +69169,8 @@ msgstr ""
 #. ~ Description for inactive miner bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive mining robot. Using this item involves placing it on the"
-" ground and turning it on.  If reprogrammed and rewired successfully the "
+"This is an inactive mining robot.  Using this item involves placing it on "
+"the ground and turning it on.  If reprogrammed and rewired successfully the "
 "miner bot will respond to future commands."
 msgstr ""
 
@@ -67172,9 +69193,9 @@ msgstr ""
 #. ~ Description for inactive riot control bot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive riot control bot. Using this item involves placing it on"
-" the ground and turning it on.  If reprogrammed and rewired successfully the"
-" robot will bring order and peace to the horde."
+"This is an inactive riot control bot.  Using this item involves placing it "
+"on the ground and turning it on.  If reprogrammed and rewired successfully "
+"the robot will bring order and peace to the horde."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -67195,10 +69216,10 @@ msgstr "爬蟲機器人在你周圍快速移動著，並且威脅性地按它的
 #. ~ Description for inactive skitterbot
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive skitterbot. Using this item involves placing it on the "
+"This is an inactive skitterbot.  Using this item involves placing it on the "
 "ground and turning it on.  If reprogrammed and rewired successfully the "
 "robot will race towards enemies and shock them."
-msgstr "未啟動的爬蟲機器人。使用時放在地上並啟動它。如果改寫程式並重調線路成功的話，爬蟲機器人會跑向敵人並電擊它們。"
+msgstr ""
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive lab defense bot"
@@ -67247,7 +69268,7 @@ msgstr ""
 #. ~ Description for inactive tank drone
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Beagle Mini-Tank UGV. Using this item involves placing "
+"This is an inactive Beagle Mini-Tank UGV.  Using this item involves placing "
 "it on the ground, loading the unit with the factory-loaded 5.56 rounds and "
 "40mm cartridge grenades in your inventory (if you wish to divide your "
 "ammunition, set aside whatever ammunition you do NOT want to give the robot)"
@@ -67276,8 +69297,8 @@ msgstr ""
 #. ~ Description for inactive tripod
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive Honda Regnal. Using this item involves placing it on the"
-" ground, wondering how it fuels its flamethrower and turning it on.  If "
+"This is an inactive Honda Regnal.  Using this item involves placing it on "
+"the ground, wondering how it fuels its flamethrower and turning it on.  If "
 "reprogrammed and rewired successfully the tribot will then identify you as "
 "an ally, roam around or follow you, and impale hostiles with its spiked "
 "cable weapons."
@@ -67302,13 +69323,12 @@ msgstr "當探照燈鎖定你之後，強烈的燈光讓你睜不開眼睛。"
 #. ~ Description for inactive milspec searchlight
 #: lang/json/TOOL_from_json.py
 msgid ""
-"This is an inactive military-grade automated searchlight. Using this item "
+"This is an inactive military-grade automated searchlight.  Using this item "
 "involves placing it on the ground and turning it on.  If reprogrammed and "
 "rewired successfully the searchlight will then identify you as an ally, "
-"survey the area, and illuminate approaching hostiles. Seems to have an "
+"survey the area, and illuminate approaching hostiles.  Seems to have an "
 "unhealthy fascination with you."
 msgstr ""
-"未啟動的軍事等級自動探照燈。使用時放在地上並啟動它。如果改寫程式並重調線路成功的話，探照燈會視你為盟友、掃描區域並且照亮接近的敵人。就像能賦予你病態的魅力一般。"
 
 #: lang/json/TOOL_from_json.py
 msgid "inactive dispatch"
@@ -67621,8 +69641,8 @@ msgstr[0] "粗製戰鐮"
 msgid ""
 "This farming tool has been modified into an improvised weapon by rotating "
 "its blade 90 degrees, transforming it into a deadly giant blade on the end "
-"of a stick. However it's quite fragile."
-msgstr "這把農具把刀片旋轉 90度後變成了一把簡易的武器，致命的巨型刀片綁在長棍的前頭。然而，它非常脆弱。"
+"of a stick.  However it's quite fragile."
+msgstr ""
 
 #: lang/json/TOOL_from_json.py
 msgid "spike on a stick"
@@ -67713,6 +69733,20 @@ msgid ""
 " be deadly in either the right hands or when attached as a bayonet."
 msgstr "一把軍用戰鬥刀。非常輕又銳利, 在熟練的人手上相當致命。能夠當成刺刀使用。"
 
+#: lang/json/TOOL_from_json.py
+msgid "modified combat knife"
+msgid_plural "modified combat knives"
+msgstr[0] ""
+
+#. ~ Description for modified combat knife
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a military combat knife.  It is light and extremely sharp, and could"
+" be deadly in either the right hands or when attached as a bayonet.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hunting knife"
 msgid_plural "hunting knives"
@@ -68022,6 +70056,20 @@ msgid ""
 " of a firearm or crossbow converting it into a pike."
 msgstr "劍刺刀是大型的砍殺武器, 能夠附掛在槍械或十字弓的前端作為長矛使用。"
 
+#: lang/json/TOOL_from_json.py
+msgid "modified sword bayonet"
+msgid_plural "modified sword bayonets"
+msgstr[0] ""
+
+#. ~ Description for modified sword bayonet
+#: lang/json/TOOL_from_json.py
+msgid ""
+"A sword bayonet is a large slashing weapon that can be attached to the front"
+" of a firearm or crossbow converting it into a pike.  This one was modified "
+"and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #. ~ Description for tanto
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -68117,6 +70165,54 @@ msgid ""
 "light for its size."
 msgstr "由日本傳來的巨大雙手曲劍。重量卻出乎意料的輕。"
 
+#: lang/json/TOOL_from_json.py
+msgid "electrified foil"
+msgid_plural "electrified foils"
+msgstr[0] ""
+
+#. ~ Description for electrified foil
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing foil may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified épée"
+msgid_plural "electrified épées"
+msgstr[0] ""
+
+#. ~ Description for electrified épée
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing épée may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired through the electronic scoring circuit to the tip.  "
+"Thrusting the sharpened tip into a foe and activating the momentary switch "
+"will deliver a painful electric shock."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "electrified saber"
+msgid_plural "electrified sabers"
+msgstr[0] ""
+
+#. ~ Description for electrified saber
+#: lang/json/TOOL_from_json.py
+msgid ""
+"The modifications made to this fencing saber may not be sporting, but they "
+"might give you an edge in this final competition.  Extra effort has been "
+"made to insulate the grip and a high voltage stun gun has been attached to "
+"the guard, wired to the tip along the saber's groove.  Thrusting the "
+"sharpened tip into a foe and activating the momentary switch will deliver a "
+"painful electric shock."
+msgstr ""
+
 #. ~ Description for broadsword
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -68449,6 +70545,32 @@ msgid ""
 "reinforce plastic items."
 msgstr "這是一個塑膠塊, 能用於製造、修理或強化塑膠製成的物品。"
 
+#: lang/json/TOOL_from_json.py
+msgid "synthetic fabric"
+msgid_plural "synthetic fabrics"
+msgstr[0] "合成纖維"
+
+#. ~ Description for synthetic fabric
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is small bolt of synthetic fabric.  Unlike you and other natural "
+"materials, it won't degrade much with age.  Maybe that's less of a bad thing"
+" now."
+msgstr ""
+
+#: lang/json/TOOL_from_json.py
+msgid "lycra patch"
+msgid_plural "lycra patches"
+msgstr[0] "萊卡補丁"
+
+#. ~ Description for lycra patch
+#: lang/json/TOOL_from_json.py
+msgid ""
+"This is a small bolt of a synthetic fabric blended with stretchy lycra "
+"fibers.  It could be used to make flexible yet strong clothing.  Stylish, "
+"but bad for the environment; at least you're recycling it."
+msgstr ""
+
 #: lang/json/TOOL_from_json.py
 msgid "hexamine stove"
 msgid_plural "hexamine stoves"
@@ -68884,9 +71006,8 @@ msgstr[0] "雙向無線電"
 #: lang/json/TOOL_from_json.py
 msgid ""
 "This is a radio with a transmitting unit.  You could use it to contact "
-"someone who also has one.  Unfortunately no one seems to use those "
-"nowadays..."
-msgstr "這是個裝有訊號傳送元件的無線電。你可以用它來聯繫其他擁有無線電的人。不幸的是, 現在似乎沒有人在用了…"
+"someone who also has one.  Unfortunately no one seems to use those nowadays…"
+msgstr "這是個裝有訊號發送元件的無線電。你可以用它來聯繫其他擁有無線電的人。不幸的是，現在似乎沒有人在用了…"
 
 #: lang/json/TOOL_from_json.py
 msgid "remote vehicle controller"
@@ -69040,7 +71161,7 @@ msgstr[0] "顯微鏡"
 #. ~ Description for microscope
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A classic tool for the ages! This hefty, durable piece of lab equipment "
+"A classic tool for the ages!  This hefty, durable piece of lab equipment "
 "makes small things look bigger.  Without electricity the light doesn't work,"
 " but the rest of it is surprisingly functional.  Unfortunately it's not "
 "useful for very much at the moment."
@@ -69223,7 +71344,7 @@ msgstr[0] "重型電纜"
 msgid ""
 "A long, thick, heavy-duty cable with power leads on either end.  It looks "
 "like you could use it to hook up two vehicles to each other, though you "
-"expect the power loss would be noticeable. Can also link other electrical "
+"expect the power loss would be noticeable.  Can also link other electrical "
 "systems."
 msgstr ""
 
@@ -69605,7 +71726,7 @@ msgstr ""
 #. ~ Description for heat cube
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A smooth steel cube the size of your fist. Several buttons on the sides "
+"A smooth steel cube the size of your fist.  Several buttons on the sides "
 "activate the powers of the cube."
 msgstr ""
 
@@ -69634,7 +71755,7 @@ msgstr[0] ""
 #. ~ Description for skeleton key of opening
 #: lang/json/TOOL_from_json.py
 msgid ""
-"A small gold skeleton key. You can activate it to unlock locked things."
+"A small gold skeleton key.  You can activate it to unlock locked things."
 msgstr ""
 
 #: lang/json/TOOL_from_json.py
@@ -70597,11 +72718,6 @@ msgid ""
 "This is a stick that has been cut into a trigger mechanism for a snare trap."
 msgstr "一根木材被削成繩套陷阱的觸發裝置。"
 
-#: lang/json/TOOL_from_json.py
-msgid "Laevateinn"
-msgid_plural "Laevateinns"
-msgstr[0] "勝利之劍"
-
 #. ~ Description for Laevateinn
 #: lang/json/TOOL_from_json.py
 msgid ""
@@ -71694,6 +73810,17 @@ msgid ""
 " terribly when not on a rail."
 msgstr "堅固的軌道用輪胎。有著適合在軌道上運行的輪緣，但一旦脫離軌道就表現不佳。"
 
+#: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
+msgid "pair of small rail wheels"
+msgstr ""
+
+#. ~ Description for pair of small rail wheels
+#: lang/json/WHEEL_from_json.py
+msgid ""
+"A pair of small rail wheels.  It fits small railroad rails found in places "
+"like amusement parks.  Mostly for hobby purposes rather then transportation."
+msgstr ""
+
 #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py
 msgid "motorbike wheel"
 msgstr "機車輪胎"
@@ -72050,6 +74177,10 @@ msgstr "砸爛"
 msgid "cranking"
 msgstr "轉動曲柄"
 
+#: lang/json/activity_type_from_json.py
+msgid "heating"
+msgstr ""
+
 #: lang/json/activity_type_from_json.py
 msgid "de-stressing"
 msgstr "紓壓"
@@ -72330,6 +74461,10 @@ msgstr "箭矢"
 msgid "pebbles"
 msgstr "小石子"
 
+#: lang/json/ammunition_type_from_json.py
+msgid "rocks"
+msgstr "石頭"
+
 #: lang/json/ammunition_type_from_json.py
 msgid "shotcanisters"
 msgstr "射彈罐"
@@ -72683,7 +74818,7 @@ msgstr "合金鋼鐵 - 手臂"
 #. ~ Description for Alloy Plating - Arms
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your arms has been surgically replaced by alloy plating. "
+"The flesh on your arms has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -72718,7 +74853,7 @@ msgstr "合金鋼鐵 - 腿部"
 #. ~ Description for Alloy Plating - Legs
 #: lang/json/bionic_from_json.py
 msgid ""
-"The flesh on your legs has been surgically replaced by alloy plating. "
+"The flesh on your legs has been surgically replaced by alloy plating.  "
 "Provides passive protection and can be used in conjunction with bionic "
 "martial arts."
 msgstr ""
@@ -73016,15 +75151,20 @@ msgstr "酒精發電器"
 
 #. ~ Description for Ethanol Burner
 #: lang/json/bionic_from_json.py
-msgid ""
-"You burn alcohol as fuel in an extremely efficient reaction.  However, you "
-"will still suffer the inebriating effects of the substance."
-msgstr "你能夠以極有效率的方式燃燒酒精來發電。然而你仍然會受到酒精的不良影響。"
+msgid "You burn alcohol as fuel in an extremely efficient reaction."
+msgstr ""
 
 #: lang/json/bionic_from_json.py
 msgid "Aero-Evaporator"
 msgstr "濕氣凝水裝置"
 
+#. ~ Description for Aero-Evaporator
+#: lang/json/bionic_from_json.py
+msgid ""
+"This unit draws moisture from the surrounding air, which slowly trickles "
+"directly into your blood stream.  It may fail in very dry environments."
+msgstr ""
+
 #: lang/json/bionic_from_json.py
 msgid "Diamond Cornea"
 msgstr "鑽石角膜"
@@ -73261,10 +75401,10 @@ msgstr ""
 "你裝置了能夠刺激白血球生長的造血系統, 讓你能消耗生化能量來加快體內白血球的製造。這個系統需要持續運行, 在關閉時可能會導致不愉快的副作用。"
 
 #: lang/json/bionic_from_json.py
-msgid "Mini-Flamethrower"
-msgstr "迷你噴火器"
+msgid "Finger Lighter"
+msgstr ""
 
-#. ~ Description for Mini-Flamethrower
+#. ~ Description for Finger Lighter
 #: lang/json/bionic_from_json.py
 msgid ""
 "The index fingers of both hands have powerful fire starters which extend "
@@ -73291,9 +75431,9 @@ msgstr "電磁元件"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Surgically embedded in your right hand is a powerful electromagnet, allowing"
-" you to indiscriminately pull all nearby magnetic objects towards you.  "
-"Unlucky bystanders might be injured or killed by flying objects."
-msgstr "你右手通過手術植入了強力的電池鐵，能夠將所有靠近你的磁性物體無差別地全吸向你。倒楣的旁觀者可能會被這些飛行的物件傷害或甚至殺死。"
+" you to use your own strength to pull all nearby magnetic objects towards "
+"you.  Unlucky bystanders might be injured or killed by flying objects."
+msgstr ""
 
 #: lang/json/bionic_from_json.py
 msgid "Nictating Membrane"
@@ -73353,8 +75493,8 @@ msgstr "奈米機器人修復器"
 #: lang/json/bionic_from_json.py
 msgid ""
 "Inside your body is a fleet of tiny dormant robots.  While activated they "
-"will flit about your body, repairing damage at 1 HP/s and stopping bleeding "
-"at the cost of power."
+"will flit about your body, repairing damage at 1 HP per minute and stopping "
+"bleeding at the cost of extra power and stored calories."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -73390,8 +75530,8 @@ msgstr "一個故障的生化插件。偶爾會產生 你在大聲甚麼啦 的
 msgid ""
 "You're really not sure how the CBM ended up in your nose, but no matter how "
 "it got there this badly misplaced bionic makes it difficult to breathe.  "
-"Increases mouth encumbrance by one."
-msgstr "你真的不知道為什麼最後這個生化插件會跑去你的鼻子, 不管怎樣, 這個東西讓你很不好呼吸。增加嘴巴累贅 1 點。"
+"Increases mouth encumbrance by ten."
+msgstr ""
 
 #: lang/json/bionic_from_json.py
 msgid "Offensive Defense System"
@@ -73421,7 +75561,7 @@ msgstr "你的神經系統能夠依照你的意志忽略疼痛, 關閉感官。
 #: lang/json/bionic_from_json.py
 msgid ""
 "Due to a badly misplaced dielectric stylette, you are now suffering from "
-"mild optic neuropathy.  Increases eye encumbrance by one."
+"mild optic neuropathy.  Increases eye encumbrance by ten."
 msgstr ""
 
 #: lang/json/bionic_from_json.py
@@ -73454,11 +75594,10 @@ msgstr "能量儲存室"
 #. ~ Description for Power Storage
 #: lang/json/bionic_from_json.py
 msgid ""
-"A Compact Bionics Module that increases your power capacity by 100 units.  "
+"A Compact Bionics Module that increases your power capacity by 100 kJ.  "
 "Having at least one of these is a prerequisite to using powered bionics.  "
 "You will also need a power supply, found in various CBMs."
 msgstr ""
-"這個整合型生化插件模組能夠增加你的能量儲存容量 100 個單位。至少要有一個這種插件才能驅動其他生化插件。你也需要一個能夠供給能量的生化插件。"
 
 #: lang/json/bionic_from_json.py
 msgid "Power Storage Mk. II"
@@ -73466,9 +75605,8 @@ msgstr "能量儲存室 Mk. II"
 
 #. ~ Description for Power Storage Mk. II
 #: lang/json/bionic_from_json.py
-msgid ""
-"A Compact Bionics Module that increases your power capacity by 250 units."
-msgstr "這個整合型生化插件模組能夠增加你的能量儲存容量 250 個單位。"
+msgid "A Compact Bionics Module that increases your power capacity by 250 kJ."
+msgstr ""
 
 #. ~ Description for Power Overload
 #: lang/json/bionic_from_json.py
@@ -73740,8 +75878,8 @@ msgstr "這個實驗性的插件能夠把空間折疊, 消耗大量的能量, 
 msgid ""
 "Self-locking thumbs hold tight (even when you really don't want them to) and"
 " don't let go (even when you'd rather they did).  Increases hand encumbrance"
-" by two, while failing to improve your ability to hold objects whatsoever."
-msgstr "自鎖大拇指會在你無法控制的狀況下自動卡住不放。增加手掌累贅 2 , 無法增加你抓東西的能力。"
+" by ten, while failing to improve your ability to hold objects whatsoever."
+msgstr ""
 
 #: lang/json/bionic_from_json.py
 msgid "Time Dilation"
@@ -73870,8 +76008,8 @@ msgstr ""
 #. ~ Description for Gasoline Fuel Cell CBM
 #: lang/json/bionic_from_json.py
 msgid ""
-"A small gasoline fuel cell fixed to your scapula. Despite its limited energy"
-" output compared to other fuel cells, this device still produces a "
+"A small gasoline fuel cell fixed to your scapula.  Despite its limited "
+"energy output compared to other fuel cells, this device still produces a "
 "significant amount of heat dissipated through a heat exhaust protruding from"
 " your back.  A diffuse network of bio-plastic bladders has been meshed with "
 "your circulatory system and serves as a fuel tank."
@@ -73924,7 +76062,7 @@ msgstr ""
 #: lang/json/bionic_from_json.py
 msgid ""
 "A set of highly sensitive sensors is installed in your mouth, and a small "
-"yet sophisticated analyzer is installed in the cavity of your skull. The "
+"yet sophisticated analyzer is installed in the cavity of your skull.  The "
 "active bionic will nullify the taste of all comestibles with negative "
 "enjoyment value at the cost of draining bionic power."
 msgstr ""
@@ -74612,6 +76750,18 @@ msgstr "用土填坑"
 msgid "Make Woodchip Floor"
 msgstr "製作木片地板"
 
+#: lang/json/construction_from_json.py
+msgid "Make Gravel Floor"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Straight Small Railroad Track"
+msgstr ""
+
+#: lang/json/construction_from_json.py
+msgid "Build Diagonal Small Railroad Track"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Build Wooden Floor"
 msgstr "建造木製地板"
@@ -75264,6 +77414,10 @@ msgstr "建造無線電塔"
 msgid "Build a radio tower console."
 msgstr "建造無線電塔控制台"
 
+#: lang/json/construction_from_json.py
+msgid "Build Log Stool"
+msgstr ""
+
 #: lang/json/construction_from_json.py
 msgid "Convert Fridge Power Supply"
 msgstr ""
@@ -75962,6 +78116,42 @@ msgstr "你夢到一個長得很奇怪的植物, 它分泌的花蜜讓你別無
 msgid "You dream of bees fighting over your sweet nectar.  Mmm."
 msgstr "恩, 你夢到蜜蜂跟你搶奪那甜美的花蜜。"
 
+#: lang/json/dream_from_json.py
+msgid ""
+"How grand it would be to sink your roots deep into the soil as the seasons "
+"pass you by."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You dream of a gigantic knot of roots, beating like a heart."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "You have a disturbing dream of termites chewing all over your body."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of sharing your roots with a vast forest, all plants provided for "
+"as the canopy grows ever upwards."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid "A family of caterpillars munches away at your leaves."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"Fire rages around you, licking at your bark and engulfing the saplings and "
+"bushes near your roots.  The once chatty forest is quiet in its wake."
+msgstr ""
+
+#: lang/json/dream_from_json.py
+msgid ""
+"You dream of communing with an ancient pine.  Trees are the true survivors "
+"of this world, it tells you."
+msgstr ""
+
 #: lang/json/dream_from_json.py
 msgid ""
 "A rather attractive triffid offers you a bouquet of ape heads.  How "
@@ -77243,6 +79433,25 @@ msgstr "你的手無法停止顫抖。"
 msgid "You tremble"
 msgstr "你顫抖"
 
+#: lang/json/effects_from_json.py
+msgid "Seizure"
+msgstr ""
+
+#. ~ Description of effect 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles have seized up, and you can't control them!"
+msgstr ""
+
+#. ~ Remove message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "You regain control of your muscles!"
+msgstr ""
+
+#. ~ Miss message for effect(s) 'Seizure'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles won't cooperate!"
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Bleeding"
 msgstr "流血"
@@ -77720,7 +79929,7 @@ msgstr "喝醉"
 #. ~ Description of effect 'Drunk'.
 #: lang/json/effects_from_json.py
 msgid "You drank alcohol.  Party on!"
-msgstr ""
+msgstr "你喝了些酒精。開趴啦！"
 
 #: lang/json/effects_from_json.py
 msgid "Trashed"
@@ -77729,7 +79938,7 @@ msgstr "快喝掛了"
 #. ~ Description of effect 'Trashed'.
 #: lang/json/effects_from_json.py
 msgid "You drank lots of alcohol.  Are those white mice?"
-msgstr ""
+msgstr "你喝了不少酒精。那些是小白鼠嗎？"
 
 #: lang/json/effects_from_json.py
 msgid "Wasted"
@@ -77740,7 +79949,7 @@ msgstr "喝掛了"
 msgid ""
 "You drank unholy amounts of alcohol.  It's the end of the world, what do you"
 " care?"
-msgstr ""
+msgstr "你喝了大量酒精…末日來了，還在乎什麼？"
 
 #: lang/json/effects_from_json.py
 msgid "Dead Drunk"
@@ -78154,6 +80363,26 @@ msgstr "你的新陳代謝變得不穩定。"
 msgid "Your metabolism becomes more stable."
 msgstr "你的新陳代謝變得更加穩定。"
 
+#: lang/json/effects_from_json.py
+msgid "Concerning symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Concerning symptoms'.
+#: lang/json/effects_from_json.py
+msgid "Your muscles keep twitching strangely."
+msgstr ""
+
+#: lang/json/effects_from_json.py
+msgid "Unnerving symptoms"
+msgstr ""
+
+#. ~ Description of effect 'Unnerving symptoms'.
+#: lang/json/effects_from_json.py
+msgid ""
+"Your nervous system is malfunctioning, almost like it's being torn apart "
+"from the inside."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Lit up"
 msgstr "發亮"
@@ -78396,6 +80625,17 @@ msgstr "超級充能"
 msgid "You've been struck by lightning, and feel... different."
 msgstr "你被閃電擊中，而且感覺...不一樣了。"
 
+#: lang/json/effects_from_json.py
+msgid "Grown of Fusion"
+msgstr ""
+
+#. ~ Description of effect 'Grown of Fusion'.
+#: lang/json/effects_from_json.py
+msgid ""
+"AI effect to increase stats after fusing with another critter. 1 stack means"
+" one absorbed max_hp."
+msgstr ""
+
 #: lang/json/effects_from_json.py
 msgid "Religious Offense"
 msgstr "宗教冒犯"
@@ -79005,6 +81245,192 @@ msgid ""
 "the commotion."
 msgstr ""
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a hunter after your death, living alone in the woods.  Traced "
+"back to his cabin, he was murdered and devoured in his sleep by an actual "
+"cannibal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived for many years, and became a renowned scavenger, eventually "
+"setting up a small shop in a Free Merchant outpost.  Survived by two sons, "
+"he died after a rare artifact poisoned his blood with acid."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered and scavenged the land for years after your death, "
+"eventually becoming a skilled mechanic.  Employed by the Free Merchants, he "
+"lived a comfortable, if rather uneventful life, dying of cancer, a rare "
+"luxury these days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became truly depressed after your death and hid in the woods.  If "
+"rumors are to be believed, he spent years living as a deranged hermit in a "
+"distant cave, worshiping stones and sacrificing dogs."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     After your death, he became obsessed with preserving old knowledge and "
+"eventually became known as 'the lorekeeper'.  Hired by the Old Guard as a "
+"librarian, he spent his life amongst dusty old books, trying to convince "
+"others of their value.  He even changed his name to Frederic Bastiat, in "
+"honor of an old French philosopher."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He found faith after your death, eventually joining an Anglican "
+"community and becoming a Vicar.  The crucifix provided him with a sense of "
+"meaning, before dying horribly at the hands of raiders.  He was still "
+"praying when they roasted him alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Lost and damned, he joined a bloody cult after your death, kidnapping "
+"and sacrificing young women.  His entire group was killed after being "
+"discovered by the Old Guard.  His head was put on a spike as a reminder that"
+" cultists will not be tolerated."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He did not survive for long after your death.  Electrocuted in an old "
+"cellar, he kept screaming your name.  His body was never found."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Survived you by just a few days, he drowned trying to escape from a "
+"horde."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He wandered alone for days, before finding a Free Merchant outpost.  He"
+" spent a few years as a caravan guard, often drinking himself half blind and"
+" enjoying any woman he could find.  Booze made his grip unsteady and he was "
+"eventually fired.  He died of alcohol poisoning the same day."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with the idea of settling down, he eventually found love and "
+"retired to a farm in the middle of nowhere.  Relatively safe from the "
+"monsters, he thrived for years. Survived by seven sons and two daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became famous in the wastes after finding an old brewery and copying "
+"their recipe.  His chilled beer, a known delicacy, is traded far and wide by"
+" the Free Merchants."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Found a whole cellar of single malt whisky. Drank himself to death."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed after your death, he would hang himself after just a few "
+"days."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Wandered for months, before finding a small community that would accept"
+" him.  Became a farmer and spent the rest of his uneventful life tending to "
+"crops, glad that he was no longer alone."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Obsessed with finding 'the Cure', he died a few weeks later in an old "
+"lab, torn to shreds by a security turret."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a runner for the Refugee Center and died after a few months."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a raider gang and died in a firefight a few weeks later, trying "
+"to rob a Free Merchant caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, he eventually found an intact baseball field and built "
+"a prosperous farming community there."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He spent the rest of his short life looking for a new fix.  Died of an "
+"overdose in an abandoned basement."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a small fishing village.  Died a few years "
+"later in a raider attack, alongside his young son."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Thoroughly terrified by your death, he retired to an old LMOE shelter, "
+"vowing never to leave.  He died of starvation inside."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He became a very prosperous game hunter, trading meat and furs, and "
+"providing many settlements with food in exchange for booze and male company."
+"  He died years later of an STD."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Retired to the woods, he spent the rest of his life fishing and hunting"
+" in a desolate cabin, rarely interacting with anyone else."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Died en route to California, deliriously dreaming of a better life as "
+"he was slowly devoured by spiders."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He tried to cope with loneliness after your death, but failed.  He was "
+"blind drunk when a group of zombies found his hideout and didn't stand a "
+"chance."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He didn't survive for long, waking up to a horde of zombies.  They "
+"smashed through his fortified windows in a pinch and only the last bullet "
+"prevented him from being devoured alive."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     He got sick soon after your death, and died without any medical help.  "
+"His last words were 'Why did I live long enough to suffer like that?'"
+msgstr ""
+
 #: lang/json/epilogue_from_json.py
 msgid ""
 "     Committed suicide rather than fall into the hands of the Hell's "
@@ -79224,6 +81650,167 @@ msgid ""
 "weeks after being dragged to her cell she died from dehydration."
 msgstr ""
 
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shot by the Old Guard a few weeks later, hunted down after she robbed "
+"an important caravan."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled north, she eventually found a quiet community there and spent "
+"the rest of her life farming.  She's survived by four daughters."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a runner for the Old Guard and was eventually permitted to "
+"join.  She spent the rest of her life hunting raiders.  She died in a "
+"skirmish after a few years, sacrificing her life to let her unit retreat.  "
+"Her name is venerated in songs and inscriptions."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Shortly after your death she joined the Free Merchants, becoming a "
+"caravan guard and after a few months became the new liaison in the Refugee "
+"Center.  She died a few years later of a mysterious illness."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She was found half-dead by the Old Guard who took her in.  She became a"
+" famous scavenger, known for finding an intact stash of experimental "
+"antibiotics."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She retired to the forest, where she built her own cabin and spending "
+"the rest of her life fishing."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Captured by raiders, she spent the rest of her miserable life as a "
+"slave.  Hopeless, she slit her wrists with a rusty knife."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Depressed, she joined a protestant community and became a paragon of "
+"virtue.  Devoting her life to bible study, she spent the rest of her life in"
+" relative peace."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Killed and devoured by a cannibal just a few days after your death, "
+"hardly anyone remembers her name."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became a renowned merchant after your death, she built her own outpost "
+"in the west.  An avid book collector, she established a great library to "
+"keep the flame of knowledge burning."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled around for months before finding an old farm.  She spent a few"
+" years tending to her crops and living the life of a hermit before being "
+"killed by raiders for fun."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Traveled south and joined a settlement there.  She became a renowned "
+"engineer, building the largest steam engine in New England."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Joined a gang after your death, she spent months preying on the "
+"innocent, before dying in a dispute with a fellow brute."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Devoured alive by a group of zombies, she kept thinking of you as she "
+"died."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She found an abandoned APC and spent years traveling around and "
+"collecting personal stories.  She wrote one of the few post-apocalyptic "
+"books, detailing the life after the end."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Kept wandering for years.  Her life was cut short when a group of "
+"raiders used her as a target practice."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became a skilled game hunter and one of the best shots in the "
+"wasteland.  Years later she joined the Old Guard and was given the position "
+"of Marshal."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Desperate to save humanity from extinction, she organized her own group"
+" of survivors, whose job was to hunt bandits and decorate roads with their "
+"mutilated bodies.  She died in a skirmish a few months later."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She became an arsonist, and was incinerated a few weeks later in a fire"
+" she set."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She kept wandering for a few weeks but eventually died after drinking "
+"untreated water."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She wandered north and joined a local community there.  She became "
+"known for her trapping skills and ensured that the locals always had fresh "
+"meat on their tables."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She joined the Free Merchants and led their first caravan to Canada.  "
+"She died a few years later of dysentery."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She built a boat and sailed east towards Europe, hoping that it was not"
+" affected by the apocalypse.  She was never heard from again."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     She led a doomsday cult for a few years, she was sacrificed to their "
+"gods after a particularly terrible harvest."
+msgstr ""
+
+#: lang/json/epilogue_from_json.py
+msgid ""
+"     Became obsessed with chems, and died of an overdose a few months after "
+"your death."
+msgstr ""
+
 #: lang/json/faction_from_json.py
 msgid "Your Followers"
 msgstr "你的追隨者"
@@ -79376,10 +81963,10 @@ msgid "A small family surviving on their generational land."
 msgstr ""
 
 #: lang/json/faction_from_json.py
-msgid "God's Community"
+msgid "New England Church Community"
 msgstr ""
 
-#. ~ Description for God's Community
+#. ~ Description for New England Church Community
 #: lang/json/faction_from_json.py
 msgid ""
 "A small group of churchgoers that formed a community in the woods. They "
@@ -79416,144 +82003,311 @@ msgstr ""
 msgid "Dusty"
 msgstr "布滿灰塵"
 
-#. ~ Description for Dusty
+#. ~ description for fault 'Dusty'
 #: lang/json/fault_from_json.py
-msgid "It's dusty. Has no effect - obsolete fault."
-msgstr "它布滿灰塵。已經沒有作用 - 廢棄故障。"
+msgid "It's dusty.  Has no effect - obsolete fault."
+msgstr ""
+
+#. ~ name of mending method for fault 'Dusty'
+#: lang/json/fault_from_json.py
+msgid "Wipe clean"
+msgstr ""
+
+#. ~ success message for mending method 'Wipe clean' of fault 'Dusty'
+#. ~ success message for mending method 'Clean gun' of fault 'Fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean you %s."
+msgstr ""
 
 #: lang/json/fault_from_json.py
 msgid "Already deployed"
 msgstr "已安裝變動過"
 
-#. ~ Description for Already deployed
+#. ~ description for fault 'Already deployed'
 #: lang/json/fault_from_json.py
 msgid "This bionic needs to be reset to its factory state."
 msgstr "這個生化插件需要重置成出廠階段。"
 
+#. ~ name of mending method for fault 'Already deployed'
+#: lang/json/fault_from_json.py
+msgid "Reset to factory state"
+msgstr ""
+
+#. ~ success message for mending method 'Reset to factory state' of fault
+#. 'Already deployed'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully reset the %s to its factory state"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Blackpowder fouling"
 msgstr "黑火藥積垢"
 
-#. ~ Description for Blackpowder fouling
+#. ~ description for fault 'Blackpowder fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Firing blackpowder loads from a gun fouls it, which reduces reliability and,"
-" if left uncleaned, leads to rust. It fouls the gun much faster than the use"
-" of modern smokeless powder cartridges. Fouling is only a significant impact"
-" on reliability at high levels, but black powder fouling accumulates "
+" if left uncleaned, leads to rust.  It fouls the gun much faster than the "
+"use of modern smokeless powder cartridges.  Fouling is only a significant "
+"impact on reliability at high levels, but black powder fouling accumulates "
 "quickly."
 msgstr ""
 
+#. ~ name of mending method for fault 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean blackpowder fouling"
+msgstr ""
+
+#. ~ success message for mending method 'Clean blackpowder fouling' of fault
+#. 'Blackpowder fouling'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You clean your %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Spent casing in chamber"
 msgstr "用過的彈殼在膛室中"
 
-#. ~ Description for Spent casing in chamber
+#. ~ description for fault 'Spent casing in chamber'
 #: lang/json/fault_from_json.py
 msgid ""
 "This gun currently has an empty casing chambered.  It will have to be "
 "removed before firing."
 msgstr ""
 
+#. ~ name of mending method for fault 'Spent casing in chamber'
+#: lang/json/fault_from_json.py
+msgid "Eject spent casing"
+msgstr ""
+
+#. ~ success message for mending method 'Eject spent casing' of fault 'Spent
+#. casing in chamber'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You eject the spent casing from the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Fouling"
 msgstr "積垢"
 
-#. ~ Description for Fouling
+#. ~ description for fault 'Fouling'
 #: lang/json/fault_from_json.py
 msgid ""
 "Fouling is caused by firing gunpowder loads repeatedly, which reduces "
-"reliability and can eventually cause damage to the gun. Fouling accumulates "
-"slowly (unless blackpowder is used) due to the design of modern smokeless "
+"reliability and can eventually cause damage to the gun.  Fouling accumulates"
+" slowly (unless blackpowder is used) due to the design of modern smokeless "
 "powder found in the vast majority of retail cartridges and it is not a "
 "significant problem until high levels of fouling are reached due to firing "
 "thousands of rounds without cleaning your firearm."
 msgstr ""
-"積垢是重複發射裝載的火藥所造成的，將會降低槍械可靠性，並最終導致槍械損壞。由於絕大多數零售彈藥中都採用了現代無煙火藥的設計，因此積垢累積的相當緩慢（除非使用了黑火藥），並不是什麼大問題。在發射數千發子彈而沒有清理槍械時，才會導致槍械嚴重的積垢。"
+
+#. ~ name of mending method for fault 'Fouling'
+#: lang/json/fault_from_json.py
+msgid "Clean gun"
+msgstr ""
 
 #: lang/json/fault_from_json.py
 msgid "Worn drive belt"
 msgstr "磨損的傳動帶"
 
-#. ~ Description for Worn drive belt
+#. ~ description for fault 'Worn drive belt'
 #: lang/json/fault_from_json.py
 msgid "Required for operation of an attached alternator."
 msgstr "需要連接交流發電機來運行。"
 
+#. ~ name of mending method for fault 'Worn drive belt'
+#: lang/json/fault_from_json.py
+msgid "Replace worn drive belt"
+msgstr ""
+
+#. ~ success message for mending method 'Replace worn drive belt' of fault
+#. 'Worn drive belt'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the worn drive belt of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty glow plugs"
 msgstr "故障的電熱塞"
 
-#. ~ Description for Faulty glow plugs
+#. ~ description for fault 'Faulty glow plugs'
 #: lang/json/fault_from_json.py
 msgid "Help when starting an engine in low ambient temperatures."
 msgstr "有助於低溫環境下發動引擎。"
 
+#. ~ name of mending method for fault 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty glow plugs"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty glow plugs' of fault
+#. 'Faulty glow plugs'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty glow plugs of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Active immobiliser"
 msgstr "啟動的防盜器"
 
-#. ~ Description for Active immobiliser
+#. ~ description for fault 'Active immobiliser'
 #: lang/json/fault_from_json.py
 msgid "Prevents starting of the vehicle without the appropriate key."
 msgstr "防止沒有正確的鑰匙就啟動車輛。"
 
+#. ~ name of mending method for fault 'Active immobiliser'
+#: lang/json/fault_from_json.py
+msgid "Deactivate immobiliser"
+msgstr ""
+
+#. ~ description for mending method 'Deactivate immobiliser' of fault 'Active
+#. immobiliser'
+#: lang/json/fault_from_json.py
+msgid ""
+"Deactivate the immobiliser that is preventing the vehicle from starting."
+msgstr ""
+
+#. ~ success message for mending method 'Deactivate immobiliser' of fault
+#. 'Active immobiliser'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You successfully deactivate the immobiliser of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty diesel pump"
 msgstr "故障的柴油泵"
 
-#. ~ Description for Faulty diesel pump
+#. ~ description for fault 'Faulty diesel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump and pressurize diesel from a vehicles tank."
 msgstr "從車輛油箱內抽取並加壓柴油的必備零件。"
 
+#. ~ name of mending method for fault 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty diesel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty diesel pump' of fault
+#. 'Faulty diesel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty diesel pump of the %s"
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired air filter"
 msgstr "過期的空氣濾清器"
 
-#. ~ Description for Expired air filter
+#. ~ description for fault 'Expired air filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces fuel efficiency and increases smoke production."
 msgstr "過期的過濾器降低燃油效率並增加產煙量。"
 
+#. ~ name of mending method for fault 'Expired air filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired air filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired air filter' of fault
+#. 'Expired air filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired air filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Expired fuel filter"
 msgstr "過期的燃油濾清器"
 
-#. ~ Description for Expired fuel filter
+#. ~ description for fault 'Expired fuel filter'
 #: lang/json/fault_from_json.py
 msgid ""
 "An expired filter reduces performance and increases the chance of backfires."
 msgstr "過期的過濾器會降低性能並增加回火的機會。"
 
+#. ~ name of mending method for fault 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+msgid "Replace expired fuel filter"
+msgstr ""
+
+#. ~ success message for mending method 'Replace expired fuel filter' of fault
+#. 'Expired fuel filter'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the expired fuel filter of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty fuel pump"
 msgstr "故障的燃油泵"
 
-#. ~ Description for Faulty fuel pump
+#. ~ description for fault 'Faulty fuel pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump gasoline from a vehicles tank."
 msgstr "從汽車油箱內抽取汽油的必備零件。"
 
+#. ~ name of mending method for fault 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty fuel pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty fuel pump' of fault
+#. 'Faulty fuel pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty fuel pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty water pump"
 msgstr "故障的水泵"
 
-#. ~ Description for Faulty water pump
+#. ~ description for fault 'Faulty water pump'
 #: lang/json/fault_from_json.py
 msgid "Required to pump water to an external radiator or heatsink."
 msgstr "把水抽到外部散熱器或散熱片的必備零件。"
 
+#. ~ name of mending method for fault 'Faulty water pump'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty water pump"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty water pump' of fault
+#. 'Faulty water pump'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty water pump of the %s."
+msgstr ""
+
 #: lang/json/fault_from_json.py
 msgid "Faulty starter motor"
 msgstr "故障的起動馬達"
 
-#. ~ Description for Faulty starter motor
+#. ~ description for fault 'Faulty starter motor'
 #: lang/json/fault_from_json.py
 msgid "Required to initially start the engine."
 msgstr "用於起動引擎的必備零件。"
 
+#. ~ name of mending method for fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+msgid "Replace faulty starter motor"
+msgstr ""
+
+#. ~ success message for mending method 'Replace faulty starter motor' of
+#. fault 'Faulty starter motor'
+#: lang/json/fault_from_json.py
+#, python-format
+msgid "You replace the faulty starter motor of %s."
+msgstr ""
+
 #: lang/json/field_type_from_json.py lang/json/overmap_terrain_from_json.py
 #: lang/json/overmap_terrain_from_json.py src/mapdata.cpp src/mapdata.cpp
 #: src/skill.cpp
@@ -80040,6 +82794,10 @@ msgstr "濃厚殺蟲霾"
 msgid "smoke vent"
 msgstr "排煙口"
 
+#: lang/json/field_type_from_json.py
+msgid "clairvoyance"
+msgstr ""
+
 #: lang/json/field_type_from_json.py
 msgid "dreadful presense"
 msgstr "可怕的存在"
@@ -80226,11 +82984,11 @@ msgstr ""
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp
+#: src/vehicle_move.cpp
 msgid "smash!"
 msgstr "碰!"
 
-#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
-#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
 msgid "whump."
 msgstr "呼。"
 
@@ -80343,7 +83101,8 @@ msgstr "雕像"
 msgid "A carved statue made of stone."
 msgstr "雕刻石像"
 
-#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
+#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py
+#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py
 msgid "thump."
 msgstr "咚。"
 
@@ -80354,9 +83113,9 @@ msgstr "服裝模特兒"
 #. ~ Description for mannequin
 #: lang/json/furniture_from_json.py
 msgid ""
-"Put clothes on it, talk to it.  Who's around to judge you?  Wait... did it "
+"Put clothes on it, talk to it.  Who's around to judge you?  Wait… did it "
 "just move?"
-msgstr "為它穿上衣服，跟它說話。誰會來批評你呢？等等......它剛剛移動了嗎？"
+msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "birdbath"
@@ -80743,7 +83502,7 @@ msgid ""
 msgstr "一大堆葉子。如果你不關心舒適或溫暖，你可以睡在上面。"
 
 #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py
-#: src/iuse.cpp
+#: lang/json/terrain_from_json.py src/iuse.cpp
 msgid "crunch!"
 msgstr "匡噹!"
 
@@ -80756,7 +83515,7 @@ msgstr "馬洛斯花"
 msgid ""
 "This flower is like the other flowers taken by the mushrooms, but its bulb "
 "is colored a brilliant cyan color, and it emits an aroma both overwhelming "
-"and... delicious?"
+"and… delicious?"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -81185,9 +83944,9 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This is a meaty green stalactite with a thickened hide like that of a "
-"starfish, extending from the floor to the ceiling. In the center is a series"
-" of ports somewhat like mouths, from which pour bursts of a vile smelling "
-"gas."
+"starfish, extending from the floor to the ceiling.  In the center is a "
+"series of ports somewhat like mouths, from which pour bursts of a vile "
+"smelling gas."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -81257,7 +84016,7 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "This pulsing protuberance juts from the floor, its sides covered in scaled, "
-"oozing skin. The surface is flat, but undulates softly.  A handful of "
+"oozing skin.  The surface is flat, but undulates softly.  A handful of "
 "unidentifiable appendages reach from the sides, suggesting a sort of "
 "nightmarish living autodoc."
 msgstr ""
@@ -81422,7 +84181,7 @@ msgstr "跑步機"
 #: lang/json/furniture_from_json.py
 msgid ""
 "Used for training leg muscles.  It'll be extra hard without power.  Could be"
-" taken apart for its... parts."
+" taken apart for its… parts."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -81448,7 +84207,7 @@ msgstr ""
 #: lang/json/furniture_from_json.py
 msgid ""
 "The ol' ebony and ivory.  Really classes up the place.  You could take it "
-"apart if you wanted... you monster."
+"apart if you wanted… you monster."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -81607,6 +84366,17 @@ msgstr "凳子"
 msgid "Sit down, have a drink.  It can folded for easy transportation."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "log stool"
+msgstr ""
+
+#. ~ Description for log stool
+#: lang/json/furniture_from_json.py
+msgid ""
+"A log tipped on its end with any rough edges cut off.  Basically a very "
+"simple seat."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "bulletin board"
 msgstr "告示牌"
@@ -82075,9 +84845,9 @@ msgstr "由布料編織而成的大型墊子, 可用於代替野餐地毯, 但
 #. ~ Description for tourist table
 #: lang/json/furniture_from_json.py
 msgid ""
-"Small metal folding table, ideal for off-road trips into the wild. Can be "
+"Small metal folding table, ideal for off-road trips into the wild.  Can be "
 "used as a workbench in a pinch."
-msgstr "小型金屬折疊桌，非常適合越野旅行。需要的話也能當作工作台使用。"
+msgstr ""
 
 #: lang/json/furniture_from_json.py lang/json/vehicle_part_from_json.py
 msgid "table"
@@ -82149,11 +84919,11 @@ msgid "This beaded curtain could be pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack"
+msgid "clickity clack… clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack"
+msgid "clickity clack… clack"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -82166,7 +84936,7 @@ msgid "This beaded curtain has been pulled aside."
 msgstr ""
 
 #: lang/json/furniture_from_json.py
-msgid "clickity clack...clack...clack!"
+msgid "clickity clack… clack… clack!"
 msgstr ""
 
 #: lang/json/furniture_from_json.py
@@ -82310,9 +85080,8 @@ msgstr "一堆垃圾瓦礫"
 #. ~ Description for pile of trashy rubble
 #: lang/json/furniture_from_json.py
 msgid ""
-"Trash topped with dirt and grass, it smells gross, but another man's "
-"trash..."
-msgstr "垃圾堆上有泥土和草，發出惡臭，但是一個人的垃圾將會是......"
+"Trash topped with dirt and grass, it smells gross, but another man's trash…"
+msgstr ""
 
 #: lang/json/furniture_from_json.py
 msgid "metal wreckage"
@@ -82819,6 +85588,15 @@ msgid ""
 "blood, candles, and other small knick-knacks."
 msgstr ""
 
+#: lang/json/furniture_from_json.py
+msgid "large glowing boulder"
+msgstr ""
+
+#. ~ Description for large glowing boulder
+#: lang/json/furniture_from_json.py
+msgid "Something about this doesn't look right."
+msgstr ""
+
 #: lang/json/furniture_from_json.py
 msgid "krash!"
 msgstr ""
@@ -82848,8 +85626,8 @@ msgstr "大門已打開!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You turn the handle..."
-msgstr "你轉動方向盤…"
+msgid "You turn the handle…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -82868,8 +85646,8 @@ msgstr "倉庫的門打開了!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You pull the rope..."
-msgstr "你拉動繩子…"
+msgid "You pull the rope…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -82903,8 +85681,8 @@ msgstr "門升起了!"
 
 #. ~ 'pull' action message of some gate object.
 #: lang/json/gates_from_json.py
-msgid "You throw the lever..."
-msgstr "你拉動控制桿…"
+msgid "You throw the lever…"
+msgstr ""
 
 #. ~ 'close' action message of some gate object.
 #: lang/json/gates_from_json.py
@@ -83086,7 +85864,7 @@ msgstr[0] "單弓"
 msgid ""
 "A primitive bow fashioned from a single piece of wood, made specifically for"
 " the person using it.  Weak and wildly inaccurate, it doesn't work that "
-"well, unfortunately..."
+"well, unfortunately…"
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -83247,9 +86025,7 @@ msgid ""
 "this weapon have a good chance of remaining intact for re-use."
 msgstr "一把可以藏在袖中的迷你手弩。由於尺寸的限制, 傷害並不高, 適合用於小型的狩獵遊戲。從這把弩射出的箭矢有一定的機率可以回收使用。"
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "pistol"
 msgstr "手槍"
@@ -83411,6 +86187,17 @@ msgctxt "gun_type_type"
 msgid "throw"
 msgstr "投擲"
 
+#: lang/json/gun_from_json.py
+msgid "staff sling"
+msgid_plural "staff slings"
+msgstr[0] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A leather sling attached to a staff, easy to use and accurate.  It uses "
+"rocks as ammunition."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "slingshot"
 msgid_plural "slingshots"
@@ -83484,6 +86271,10 @@ msgid ""
 "blooming.  While powerful, it suffers from short range.  Powered by UPS."
 msgstr "波音公司與 DARPA 共同研製的電漿武器。加熱固態氫來創造電漿並用聚合物封裝來減少爆炸。雖然強大, 但是射程很短。需要由 UPS 供電。"
 
+#: lang/json/gun_from_json.py lang/json/gun_from_json.py src/item_factory.cpp
+msgid "semi-auto"
+msgstr "半自動"
+
 #: lang/json/gun_from_json.py
 msgid "PPA-5"
 msgid_plural "PPA-5s"
@@ -83492,10 +86283,10 @@ msgstr[0] "便攜式等離子加速器 - 第五代"
 #: lang/json/gun_from_json.py
 msgid ""
 "Portable Plasma Accelerator Model Five, developed by Lockheed Martin "
-"Corporation. This device uses highly advanced capacitor banks to create a "
-"torus of superheated hydrogen plasma and accelerate it to incredible speed. "
-"It was designed to take down heavy vehicles, and was expected to fully enter"
-" US Army service not long before the Cataclysm."
+"Corporation.  This device uses highly advanced capacitor banks to create a "
+"torus of superheated hydrogen plasma and accelerate it to incredible speed."
+"  It was designed to take down heavy vehicles, and was expected to fully "
+"enter US Army service not long before the Cataclysm."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -83510,8 +86301,7 @@ msgid ""
 " a double barrel shotgun."
 msgstr "一把土炮的三管槍械。其中一管的口徑是 .30-06, 另外兩管能裝填霰彈。它是由鋼管和拆解出來的雙管散彈槍零件組合而成。"
 
-#: lang/json/gun_from_json.py lang/json/gun_from_json.py
-#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py
+#: lang/json/gun_from_json.py lang/json/gunmod_from_json.py
 msgctxt "gun_type_type"
 msgid "shotgun"
 msgstr "霰彈槍"
@@ -83664,6 +86454,10 @@ msgid ""
 " stop fires or \"protesters\"."
 msgstr "本來裝在消防車上的水砲。安裝在車上, 可以用來阻止火災或 \"暴民\"。"
 
+#: lang/json/gun_from_json.py
+msgid "burst"
+msgstr "連發"
+
 #: lang/json/gun_from_json.py
 msgid "base gun"
 msgid_plural "base guns"
@@ -83922,8 +86716,8 @@ msgstr[0] "華瑟 P22 手槍"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The Walther P22 is a blowback operated semi-automatic pistol. It is about "
-"half the size of most Walthers. It is made mostly with plastic, with the "
+"The Walther P22 is a blowback operated semi-automatic pistol.  It is about "
+"half the size of most Walthers.  It is made mostly with plastic, with the "
 "slide and key components being made of die-cast zinc alloy"
 msgstr ""
 
@@ -84006,10 +86800,6 @@ msgstr ""
 "切換成不同類型的槍械。步槍基底 \"理論上\" 可以獨自運作, 但不建議你這樣做, "
 "而且會讓你的槍失去保固。這件新款的武器上沒有甚麼位置讓你安裝市面上的改造模組。"
 
-#: lang/json/gun_from_json.py src/item_factory.cpp
-msgid "semi-auto"
-msgstr "半自動"
-
 #: lang/json/gun_from_json.py
 msgid "L523-CAR carbine"
 msgid_plural "L523-CAR carbines"
@@ -84500,12 +87290,10 @@ msgstr[0] "M24 狙擊步槍"
 msgid ""
 "The M24 Sniper is the military and police version of the Remington Model 700"
 " rifle, M24 being the model name assigned by the United States Army after "
-"adoption as their standard sniper rifle in 1988. The M24 is referred to as a"
-" 'weapon system' because it consists of not only a rifle, but also a "
+"adoption as their standard sniper rifle in 1988.  The M24 is referred to as "
+"a 'weapon system' because it consists of not only a rifle, but also a "
 "detachable telescopic sight and other accessories."
 msgstr ""
-"M24 "
-"狙擊步槍是屬於軍警版的雷明登700型步槍，M24的型號是由1988年美軍所採用作為標準狙擊槍。M24是一種武器系統，因為他不只是包含步槍，也包含了諸如可分離式瞄準鏡等各種配件。"
 
 #: lang/json/gun_from_json.py
 msgid "HK417 A2"
@@ -84647,16 +87435,16 @@ msgstr ""
 "一個手工製, 使用 .38 special 子彈的雙管手槍, 很不幸的, 這把槍的名字和它的雙槍管沒啥關係, 而是指它故障可能會害你中兩槍。"
 
 #: lang/json/gun_from_json.py
-msgid "COP .38"
-msgid_plural "COP .38"
-msgstr[0] "COP .38"
+msgid "COP .357 Derringer"
+msgid_plural "COP .357 Derringers"
+msgstr[0] ""
 
 #: lang/json/gun_from_json.py
 msgid ""
-"The COP .38 is a small, chubby derringer pistol that bears a slight "
-"resemblance to the Mossberg Brownie.  It has four barrels arranged in a "
-"square formation."
-msgstr "COP .38是一把細小、圓胖的德林加槍,  跟Mossberg Brownie 有一點相似, 它有四支排成四方形的槍管。"
+"A small, chubby derringer pistol bearing a slight resemblance to the "
+"Mossberg Brownie.  It uses a rotating firing pin to fire the individual "
+"hammers of the four barrels arranged in a square formation."
+msgstr ""
 
 #: lang/json/gun_from_json.py
 msgid "pipe rifle: .38 Special"
@@ -84685,17 +87473,6 @@ msgid ""
 " sight and a reinforced frame."
 msgstr "一把由 Smith & Wesson 公司販售的 7 發裝的 .38 左輪手槍。特點為固定的前準星與鋼製的框架。"
 
-#: lang/json/gun_from_json.py
-msgid "Taurus Pro .38"
-msgid_plural "Taurus Pro .38"
-msgstr[0] "Taurus Pro .38"
-
-#: lang/json/gun_from_json.py
-msgid ""
-"A popular .38 pistol.  Designed with numerous safety features and built from"
-" high-quality, durable materials."
-msgstr "一把受歡迎的 .38 口徑手槍。有著多種安全的設計以及由高品質、耐用的材質打造。"
-
 #: lang/json/gun_from_json.py
 msgid "MAC-11"
 msgid_plural "MAC-11s"
@@ -84758,10 +87535,21 @@ msgstr[0] "Hi-Point CF-380 手槍"
 msgid ""
 "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by"
 " Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
+#: lang/json/gun_from_json.py
+msgid "Taurus Spectrum"
+msgid_plural "Taurus Spectrum"
+msgstr[0] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A .380 subcompact pistol.  Designed for concealed carry and built from high-"
+"quality, durable materials."
+msgstr ""
+
 #: lang/json/gun_from_json.py
 msgid "M1911A1"
 msgid_plural "M1911A1s"
@@ -84847,9 +87635,9 @@ msgstr[0] "白朗寧 Hi-Power .40 S&W 手槍"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in .40 S&W."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in .40 S&W."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -84873,8 +87661,9 @@ msgstr[0] "Hi-Point Model JCP 手槍"
 msgid ""
 "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -85215,8 +88004,9 @@ msgstr[0] "Hi-Point Model JHP 手槍"
 msgid ""
 "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed"
 " by Hi-Point Firearms, which is known for making inexpensive firearms, and "
-"for making said firearms bulky and uncomfortable. Hi-Points have slides made"
-" with a zinc pot-metal which is relatively fragile compared to steel slides."
+"for making said firearms bulky and uncomfortable.  Hi-Points have slides "
+"made with a zinc pot-metal which is relatively fragile compared to steel "
+"slides."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -86129,9 +88919,9 @@ msgstr[0] "白朗寧 Hi-Power 9x19mm 手槍"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Browning Hi-Power is a semi-automatic handgun developed shortly before "
-"the second world war. Widely issued since then, it remains in use by India, "
-"Canada and Australia. This is a commercial variant produced by Browning Arms"
-" in 9x19mm Parabellum."
+"the second world war.  Widely issued since then, it remains in use by India,"
+" Canada and Australia.  This is a commercial variant produced by Browning "
+"Arms in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -86142,8 +88932,8 @@ msgstr[0] "華瑟 P38 手槍"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther P38 is a semi-automatic handgun adopted shortly before the "
-"second world war. Developed due to the high production costs of its "
-"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. "
+"second world war.  Developed due to the high production costs of its "
+"predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum.  "
 "This early DA/SA locked-breech design would introduce features later seen on"
 " more modern firearms such as the Beretta 92 series, and served Germany "
 "until 2004."
@@ -86158,7 +88948,7 @@ msgstr[0] "華瑟 PPQ 9mm 手槍"
 msgid ""
 "The Walther PPQ is a semi-automatic pistol originating from the Walther "
 "P99QA, and maintains compatibility with some of its predecessor's "
-"accessories. This model is chambered in 9x19mm Parabellum."
+"accessories.  This model is chambered in 9x19mm Parabellum."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -86170,7 +88960,7 @@ msgstr[0] "Hi-Point C-9 手槍"
 msgid ""
 "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by "
 "Hi-Point Firearms, which is known for making inexpensive firearms, and for "
-"making said firearms bulky and uncomfortable. Hi-Points have slides made "
+"making said firearms bulky and uncomfortable.  Hi-Points have slides made "
 "with a zinc pot-metal which is relatively fragile compared to steel slides."
 msgstr ""
 
@@ -86182,10 +88972,10 @@ msgstr[0] "CZ-75 手槍"
 #: lang/json/gun_from_json.py
 msgid ""
 "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one"
-" of the original wonder nines. Though designed for export to western "
+" of the original wonder nines.  Though designed for export to western "
 "countries, it was declared a state secret; lack of international patent "
 "protection meant that many clones and variants were produced and distributed"
-" around the world, with Česká zbrojovka only joining in the 90's. This "
+" around the world, with Česká zbrojovka only joining in the 90's.  This "
 "pistol remains wildly popular among competition shooters."
 msgstr ""
 
@@ -86197,10 +88987,10 @@ msgstr[0] "華瑟 CCP 手槍"
 #: lang/json/gun_from_json.py
 msgid ""
 "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for"
-" the concealed carry consumer market. Internally, it is nearly identical to "
-"the cult classic H&K P7. Its fixed barrel design makes it potentially more "
-"accurate than many other pistols, though this may difficult to realize with "
-"its average trigger and short sight radius."
+" the concealed carry consumer market.  Internally, it is nearly identical to"
+" the cult classic H&K P7.  Its fixed barrel design makes it potentially more"
+" accurate than many other pistols, though this may difficult to realize with"
+" its average trigger and short sight radius."
 msgstr ""
 
 #: lang/json/gun_from_json.py
@@ -86797,10 +89587,6 @@ msgid ""
 "and destruction it can cause."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "burst"
-msgstr "連發"
-
 #: lang/json/gun_from_json.py
 msgid "CRIT Laser Carbine"
 msgid_plural "CRIT Laser Carbines"
@@ -87559,9 +90345,57 @@ msgstr[0] "德魯伊合成弓"
 
 #: lang/json/gun_from_json.py
 msgid ""
-"A bow made of multiple materials to maximize energy efficiency. There are "
+"A bow made of multiple materials to maximize energy efficiency.  There are "
 "two Druid runes embedded at the tips."
-msgstr "由多種材料製成以最大化提高能效的弓。在尖端處嵌入了兩個德魯伊符文。"
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "M47A1 Techno-Medusa"
+msgid_plural "M47A1 Techno-Medusae"
+msgstr[0] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a  multi-"
+"caliber revolver aimed at survivalists.  While Technomancy improves the "
+"reliability with smaller cartridges, it is not as accurate as dedicated "
+"caliber revolvers due to freebore."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "gunblade"
+msgid_plural "gunblades"
+msgstr[0] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Constructed similarly to a falcata, this forward-sloping blade has a short-"
+"barrel pump shotgun attached to the blade's spine for finishing blows or a "
+"first strike."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "shotcestus"
+msgid_plural "shotcesti"
+msgstr[0] ""
+
+#: lang/json/gun_from_json.py
+msgid ""
+"A sawn-off double-barrel shotgun mounted on a metal cestus.  The lack of a "
+"stock to absorb recoil means some strength is required to fire."
+msgstr ""
+
+#: lang/json/gun_from_json.py
+msgid "Ichaival"
+msgid_plural "Ichaivals"
+msgstr[0] "伊奇巴爾"
+
+#: lang/json/gun_from_json.py
+msgid ""
+"Ichaival, the bow of Odin.  Rumored to fire 10 arrows with every pull of the"
+" string.  It has gold and silver ornaments on it, as well as an ornate "
+"Raven."
+msgstr ""
 
 #: lang/json/gun_from_json.py
 msgid "Woodbow"
@@ -87665,11 +90499,6 @@ msgid ""
 "this weapon have a good chance of remaining intact for re-use."
 msgstr ""
 
-#: lang/json/gun_from_json.py
-msgid "Ichaival"
-msgid_plural "Ichaivals"
-msgstr[0] "伊奇巴爾"
-
 #: lang/json/gun_from_json.py
 msgid ""
 "This is a replica of the bow possessed by Odin, Ichaival, which is rumored "
@@ -88600,7 +91429,7 @@ msgstr "一個在握把上的小基座能夠把箭矢固定在上面進行瞄準
 msgid "accessories"
 msgstr "配件"
 
-#: lang/json/gunmod_from_json.py src/item.cpp
+#: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py src/item.cpp
 msgctxt "gun_type_type"
 msgid "bow"
 msgstr "弓"
@@ -88717,8 +91546,8 @@ msgstr[0] "UPS 測試物品"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "Testmod for UPS drain on mods, this should never spawn, if you see this, "
-"it's a bug. 50x more UPS drain."
-msgstr "測試 UPS 消耗的模組。這東西應該不會生成在世界中，如果你看到它，那就是程式出錯了。50倍 UPS 消耗。"
+"it's a bug.  50x more UPS drain."
+msgstr ""
 
 #: lang/json/gunmod_from_json.py
 msgid "LW barrel extension"
@@ -88862,9 +91691,9 @@ msgstr[0] "聚焦鏡頭"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A set of optics to concentrate the laser beam on a smaller focus point. This"
-" increases range and damage output, but complicates targeting."
-msgstr "一組光學套件，用於將雷射光束聚焦在較小的焦點上。這會增加射擊距離和傷害輸出，但是會使瞄準更加困難。"
+"A set of optics to concentrate the laser beam on a smaller focus point.  "
+"This increases range and damage output, but complicates targeting."
+msgstr ""
 
 #: lang/json/gunmod_from_json.py
 msgid "electrolaser conversion"
@@ -88886,8 +91715,8 @@ msgstr[0] "高效發射器"
 #: lang/json/gunmod_from_json.py
 msgid ""
 "A set of electronics to optimize emitter workcycle and increase overall "
-"energy efficiency. Decreases power consumption."
-msgstr "一套用於優化發射器工作週期並提高整體能效的電子設備。降低能量消耗。"
+"energy efficiency.  Decreases power consumption."
+msgstr ""
 
 #: lang/json/gunmod_from_json.py
 msgid "emitter"
@@ -88900,9 +91729,9 @@ msgstr[0] "高密度電容器"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"A capacitor with a higher energy density increases range and damage;  at the"
-" cost of a markedly increased power consumption."
-msgstr "具有較高能量密度的電容器會增加距離和傷害；以顯著增加的能量消耗作為代價。"
+"A capacitor with a higher energy density increases range and damage; at the "
+"cost of a markedly increased power consumption."
+msgstr ""
 
 #: lang/json/gunmod_from_json.py
 msgid "Leadworks magazine adapter"
@@ -89095,6 +91924,19 @@ msgid ""
 "improving recoil but increasing bulk, noise, and reducing accuracy slightly."
 msgstr "砲口制退器重新定向排氣, 減少砲口上揚和降低後坐力, 但會增加散射、噪音, 以及略為降低準確度。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified muzzle brake"
+msgid_plural "modified muzzle brakes"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A muzzle brake redirects exhaust gases to compensate for muzzle climb, "
+"improving recoil but increasing bulk, noise, and reducing accuracy slightly."
+"  This one was modified and customized to mount on pretty much any firearm "
+"other than launchers, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "homemade suppressor"
 msgid_plural "homemade suppressors"
@@ -89219,6 +92061,19 @@ msgstr "在長槍槍管上安裝十字弓臂與發射滑軌的模組。能夠發
 msgid "rail"
 msgstr "滑軌"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rail-mounted crossbow"
+msgid_plural "modified rail-mounted crossbows"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A kit to attach a pair of crossbow arms and a firing rail to the barrel of a"
+" long firearm.  It allows crossbow bolts to be fired.  This one was modified"
+" and customized to mount on pretty much any weapon other than pistols and "
+"SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset iron sights"
 msgid_plural "offset iron sights"
@@ -89230,6 +92085,18 @@ msgid ""
 "other modification prevents use of the primary sights."
 msgstr "一個45° 傾側的偏移覘孔, 應用於被瞄準鏡或其他改造模組妨礙主瞄準具的槍械。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset iron sights"
+msgid_plural "modified offset iron sights"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An alternative set of iron sights mounted at 45° for use when a scope or "
+"other modification prevents use of the primary sights.  This one was "
+"modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "offset sight rail"
 msgid_plural "offset sight rails"
@@ -89239,6 +92106,17 @@ msgstr[0] ""
 msgid "An additional rail set at 45° for attaching a secondary optic."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified offset sight rail"
+msgid_plural "modified offset sight rails"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An additional rail set at 45° for attaching a secondary optic.  This one was"
+" modified and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "rail laser sight"
 msgid_plural "rail laser sights"
@@ -89262,6 +92140,19 @@ msgid ""
 "vibration, greatly reducing recoil and slightly increasing accuracy."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified gyroscopic stabilizer"
+msgid_plural "modified gyroscopic stabilizers"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"An advanced unit that straps onto the side of your firearm and reduces "
+"vibration, greatly reducing recoil and slightly increasing accuracy.  This "
+"one was modified and customized to mount on pretty much any weapon other "
+"than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW gyroscopic stabilizer"
 msgid_plural "LW gyroscopic stabilizers"
@@ -89363,6 +92254,19 @@ msgid ""
 " mrad increments and is remarkably small and light for its magnification."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified rifle scope"
+msgid_plural "modified rifle scopes"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 3-18x44 rifle scope.  It is adjustable for windage and elevation in 1/10th"
+" mrad increments and is remarkably small and light for its magnification.  "
+"This one was modified and customized to mount on pretty much any weapon "
+"other than pistols and SMGs, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "ACOG scope"
 msgid_plural "ACOG scopes"
@@ -89374,6 +92278,18 @@ msgid ""
 "crosshair."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "modified ACOG scope"
+msgid_plural "modified ACOG scopes"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated "
+"crosshair.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "RS1219 scope"
 msgid_plural "RS1219 scopes"
@@ -89549,6 +92465,20 @@ msgid ""
 "they are usable only on certain surfaces and are slow to equip."
 msgstr "兩腳架通常用於步槍與機槍, 用來減少槍管的晃動。雖然兩腳架大幅度增加了對後坐力的控制, 但它們只能在某些表面上使用, 而且裝備需時。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified bipod"
+msgid_plural "modified bipods"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Bipods are commonly used on rifles and machine guns to provide a forward "
+"rest and reduce motion.  Although they greatly improve handling of recoil "
+"they are usable only on certain surfaces and are slow to equip.  This one "
+"was modified and customized to mount on pretty much any weapon, if you so "
+"want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "combination gun shotgun"
 msgid_plural "combination gun shotguns"
@@ -89582,6 +92512,18 @@ msgid ""
 "effective as a bipod but usable under all conditions."
 msgstr "安裝於槍管上的前置握把可以增加槍枝的穩定度與準確性, 不及兩腳架有效但適用於任何地形。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified forward grip"
+msgid_plural "modified forward grips"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A grip placed forward on the barrel allows for greater control.  Not as "
+"effective as a bipod but usable under all conditions.  This one was modified"
+" and customized to mount on pretty much any weapon, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "integrated bayonet"
 msgid_plural "integrated bayonets"
@@ -89642,6 +92584,19 @@ msgid ""
 msgstr ""
 "M203 榴彈發射器原是為了附掛在 M16 突擊步槍而打造, 但現在可以與任何一款步槍搭配, 它可以發射 40mm 榴彈, 但發射後需立刻裝填。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M203"
+msgid_plural "modified M203s"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M203 was originally designed for use with M16 variants but today can be "
+"attached to almost any rifle.  It allows a single 40mm grenade to be loaded "
+"and fired.  This one was modified and customized to mount on pretty much any"
+" weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "M320 GLM"
 msgid_plural "M320 GLM"
@@ -89655,6 +92610,20 @@ msgid ""
 "use."
 msgstr "M320 榴彈發射器模組, 提供以小組件發射較大型榴彈的功能, 但會降低準確度。可以裝備在步槍上, 也可以裝上槍托獨立使用。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified M320 GLM"
+msgid_plural "modified M320 GLMs"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The M320 Grenade Launcher Module offers the functionality of larger "
+"launchers in a very small package at the cost of decreased accuracy.  It can"
+" be either attached to a rifle or combined with a buttstock for stand alone "
+"use.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "masterkey shotgun"
 msgid_plural "masterkey shotguns"
@@ -89667,6 +92636,19 @@ msgid ""
 "fired."
 msgstr "可以掛載於任一款步槍的霰彈槍模組, 一次能夠裝填 4 發子彈並射擊。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified masterkey shotgun"
+msgid_plural "modified masterkey shotguns"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A minimalist pump action shotgun, which can be mounted under the barrel of "
+"many rifles.  It allows a total of four shotgun shells to be loaded and "
+"fired.  This one was modified and customized to mount on pretty much any "
+"weapon other than pistols and pump-action guns, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "40mm pipe launcher"
 msgid_plural "40mm pipe launchers"
@@ -89674,9 +92656,9 @@ msgstr[0] "40mm 附掛發射器"
 
 #: lang/json/gunmod_from_json.py
 msgid ""
-"This is a home built launcher tube that can be attached to almost any rifle."
-"  It allows a single 40mm grenade to be loaded and fired."
-msgstr "自製的榴彈發射器, 可以裝在大多數的步槍上。能夠發射 40mm 榴彈, 但發射後需立刻裝填。"
+"This is a home built launcher tube that can be attached to almost any weapon"
+" except handguns.  It allows a single 40mm grenade to be loaded and fired."
+msgstr ""
 
 #: lang/json/gunmod_from_json.py
 msgid "pistol bayonet"
@@ -89701,6 +92683,19 @@ msgid ""
 "Accepts RMSA10 box magazines."
 msgstr "Rivtech RM121 附掛武器系統是一個彈匣供彈的半自動無殼霰彈槍, 能夠被掛載於許多步槍的槍管下。使用 RMSA10 盒狀彈匣。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified RM121 aux shotgun"
+msgid_plural "modified RM121 aux shotguns"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic "
+"caseless shotgun, which can be mounted under the barrel of many rifles.  "
+"Accepts RMSA10 box magazines.  This one was modified and customized to mount"
+" on pretty much any weapon other than pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "underslung shotgun"
 msgid_plural "underslung shotguns"
@@ -89712,6 +92707,19 @@ msgid ""
 "many rifles.  It allows two shotgun shells to be loaded and fired."
 msgstr "一個雙管霰彈槍, 能夠附掛在許多步槍的槍管下。一次能夠裝填 2 發子彈並射擊。"
 
+#: lang/json/gunmod_from_json.py
+msgid "modified underslung shotgun"
+msgid_plural "modified underslung shotguns"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A short shotgun with 2 barrels, which can be mounted under the barrel of "
+"many rifles.  It allows two shotgun shells to be loaded and fired.  This one"
+" was modified and customized to mount on pretty much any weapon other than "
+"pistols, if you so want."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "LW underbarrel laser sight"
 msgid_plural "LW underbarrel laser sights"
@@ -89958,6 +92966,54 @@ msgid ""
 " gun can no longer operate without a UPS."
 msgstr ""
 
+#: lang/json/gunmod_from_json.py
+msgid "'Silent Winds' suppressor"
+msgid_plural "'Silent Winds' suppressors"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Rather than using purely wipe media, an additional localized silence spell "
+"in this tube quiets gunshots going through to hearing-safe levels."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (rail)"
+msgid_plural "mana laser sights (rail)"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit under the barrel."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana laser sight (underbarrel)"
+msgid_plural "mana laser sights (underbarrel)"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"A small visible-light laser using light shown through a mana crystal that "
+"mounts on a firearm's accessory rail to enhance ease and speed of target "
+"acquisition.  Aside from increased weight, there are no drawbacks.  You can "
+"rotate the attachment rail to fit on the rail."
+msgstr ""
+
+#: lang/json/gunmod_from_json.py
+msgid "mana dot sight"
+msgid_plural "mana dot sights"
+msgstr[0] ""
+
+#: lang/json/gunmod_from_json.py
+msgid ""
+"Adds a blue dot optic made from crystallized mana to the top of your gun, "
+"replacing the iron sights.  Increases accuracy and weight."
+msgstr ""
+
 #: lang/json/gunmod_from_json.py
 msgid "makeshift pistol bayonet"
 msgid_plural "makeshift pistol bayonets"
@@ -91866,8 +94922,9 @@ msgstr "測量輻射"
 
 #: lang/json/item_action_from_json.py lang/json/mission_def_from_json.py
 #: lang/json/mission_def_from_json.py lang/json/talk_topic_from_json.py
-#: lang/json/talk_topic_from_json.py
-msgid "..."
+#: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
+#: src/game_inventory.cpp src/teleport.cpp
+msgid "…"
 msgstr "…"
 
 #: lang/json/item_action_from_json.py
@@ -92444,6 +95501,13 @@ msgstr "這個生化插件提供能量。"
 msgid "This bionic can provide power to powered armor."
 msgstr "這個生化插件可以提供能量給動力裝甲。"
 
+#. ~ Please leave anything in <angle brackets> unchanged.
+#: lang/json/json_flag_from_json.py
+msgid ""
+"This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up "
+"by most cooking</bad>."
+msgstr ""
+
 #. ~ Please leave anything in <angle brackets> unchanged.
 #: lang/json/json_flag_from_json.py
 msgid ""
@@ -93945,6 +97009,7 @@ msgstr "移除自訂顏色"
 msgid "Load color template"
 msgstr "讀取顏色模板"
 
+#. ~ translation should not exceed 3 console cells
 #: lang/json/keybinding_from_json.py lang/json/keybinding_from_json.py
 #: src/editmap.cpp src/editmap.cpp src/editmap.cpp src/veh_interact.cpp
 msgid "Yes"
@@ -96499,7 +99564,7 @@ msgstr ""
 msgid ""
 "Your attacks are stronger if you are not holding anything in your hands.\n"
 "\n"
-"+33% bash damage when not using a weapon."
+"+33%% bash damage when not using a weapon."
 msgstr ""
 
 #: lang/json/martial_art_from_json.py
@@ -96542,6 +99607,89 @@ msgid ""
 "Lasts 2 turns."
 msgstr ""
 
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Kung Fu"
+msgstr "虎形拳"
+
+#. ~ Description for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
+"attacks above all else.  Your Strength determines your accuracy, and your "
+"attacks do increasing damage as you continue attacking."
+msgstr "少林五形拳的其中一式。虎形拳注重於連續進攻。力量屬性能夠提昇此式的命中率。連續的攻擊會使威力不斷提升。"
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger Fury"
+msgstr "虎之怒"
+
+#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You attack with an endless barrage of strikes.  The more you hit, the stronger you become.\n"
+"\n"
+"+10%% damage.\n"
+"Lasts 3 turns.  Stacks 4 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Tiger's Strength"
+msgstr ""
+
+#. ~ Description of buff 'Tiger's Strength' for martial art 'Tiger Kung Fu'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You do not need defense.  You do not need a plan.  You need strength.  Strength will break your opponents' defenses and overwhelm them completely.\n"
+"\n"
+"Strength increases Accuracy instead of Dexterity.\n"
+"\n"
+"Accuracy increased by 25%% of Strength but decreased by 25%% of Dexterity."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Wing Chun"
+msgstr "詠春拳"
+
+#. ~ Description for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+msgid ""
+"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
+"learn effective techniques from the various Shaolin animal forms.  It has a "
+"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
+"sensitivity to the opponent's direction of force, and flowing around it to "
+"get back to hitting."
+msgstr ""
+"詠春拳是一種中國武術，從各種少林動物形態拳法中選擇最容易學習的有效技術所衍生出來的。它具有高架式，重心集中在後腿上。詠春著重於感受對手施力方向的敏感度，並順著力道的流動來借力打擊。"
+
+#: lang/json/martial_art_from_json.py
+msgid "Chain Punch"
+msgstr "連環拳"
+
+#. ~ Description of buff 'Chain Punch' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"Your punches are properly timed to give your opponent no rest from your strikes.\n"
+"\n"
+"-10%% move cost.\n"
+"Lasts 1 turn.  Stacks 3 times."
+msgstr ""
+
+#: lang/json/martial_art_from_json.py
+msgid "Chi-Sao Sensitivity"
+msgstr "黐手"
+
+#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
+#: lang/json/martial_art_from_json.py
+#, no-python-format
+msgid ""
+"You have a greater understanding of balance and technique.  This gives you a better chance to avoid your opponent's attacks.\n"
+"\n"
+" Dodging Skill increased by 15%% of Perception.  Blocked damage reduced by 50%% of Perception."
+msgstr ""
+
 #: lang/json/martial_art_from_json.py
 msgid "Zui Quan"
 msgstr "醉拳"
@@ -96550,58 +99698,64 @@ msgstr "醉拳"
 #: lang/json/martial_art_from_json.py
 msgid ""
 "AKA \"drunken boxing,\" Zui Quan imitates the movement of a drunk to confuse"
-" the enemy, giving you a passive dodge bonus based on your intelligence.  "
-"The turn after you attack, you may dodge any number of attacks with no "
-"penalty, and successfully dodging an attack gives you bonus damage and to-"
-"hit based on your intelligence."
+" the enemy.  You gain a passive dodge bonus and accuracy bonus based on your"
+" intelligence.  Moving gives you additional dodge attempts and each time you"
+" dodge, you inflict more damage with your counterattack for until the end of"
+" your next turn."
 msgstr ""
-"同時也被稱作 \"醉酒拳法\", 醉拳模仿酒醉的人來迷惑對手, "
-"依照你的智力屬性來決定閃避的加成。你成功攻擊過後的一個回合將能夠沒有閃避懲罰的躲開無限數量的攻擊, "
-"並且每次成功的閃避將能夠依照智力屬性給予你傷害與命中的加成。"
-
-#. ~ Description of buff for martial art 'Zui Quan'
-#: lang/json/martial_art_from_json.py
-msgid "Intelligence increases dodging ability"
-msgstr "智力增加閃避能力"
 
 #: lang/json/martial_art_from_json.py
-msgid "Counter Strike"
-msgstr "反擊"
+msgid "Zui Quan Stance"
+msgstr ""
 
-#. ~ Description of buff 'Counter Strike' for martial art 'Zui Quan'
+#. ~ Description of buff 'Zui Quan Stance' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Extra damage and to-hit after successful dodge"
-msgstr "在閃避成功後增加額外的傷害及命中"
+#, no-python-format
+msgid ""
+"Others might think you stumble about at random but you know better.  Each movement is calculated to make evading harm easier.\n"
+"\n"
+"Dodging Skill increased by 15%% of Intelligence."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Kung Fu"
-msgstr "虎形拳"
+msgid "Advanced Zui Quan"
+msgstr ""
 
-#. ~ Description for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Advanced Zui Quan' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
+#, no-python-format
 msgid ""
-"One of the five Shaolin animal styles.  The Tiger focuses on relentless "
-"attacks above all else.  Your Strength determines your accuracy, and your "
-"attacks do increasing damage as you continue attacking."
-msgstr "少林五形拳的其中一式。虎形拳注重於連續進攻。力量屬性能夠提昇此式的命中率。連續的攻擊會使威力不斷提升。"
+"You have a greater understanding of Zui Quan.  Your skills at dodging and landing attacks are much better as a result.\n"
+"\n"
+"+1 Dodge attempts, Accuracy increased by 15%% of Intelligence."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Fury"
-msgstr "虎之怒"
+msgid "Drunken Stumble"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Fury' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Stumble' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "+3 Bash/atk"
-msgstr "+3 鈍擊攻擊"
+msgid ""
+"With a few quick steps, you can completely change your orientation and dodge additional attacks.\n"
+"\n"
+"+2 Dodge attempts.\n"
+"Lasts 3 turns."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Tiger Strength"
-msgstr "虎之力"
+msgid "Drunken Dodging"
+msgstr ""
 
-#. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu'
+#. ~ Description of buff 'Drunken Dodging' for martial art 'Zui Quan'
 #: lang/json/martial_art_from_json.py
-msgid "Strength provides additional damage bonus."
-msgstr "力量屬性額外提昇傷害。"
+#, no-python-format
+msgid ""
+"Each time you dodge, your positional advantage increases against your opponents.  This makes your attacks hit harder with each successful dodge.\n"
+"\n"
+"Gain Armor Penetration equal to 25%% of Intelligence.\n"
+"Lasts 1 turn.  Stacks 4 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Debug Mastery"
@@ -96624,30 +99778,6 @@ msgid ""
 "armor, +Perception fire armor."
 msgstr "+力量 鈍擊防護, +敏捷 酸液防護, +智力 電擊防護, +感知 火焰防護。"
 
-#: lang/json/martial_art_from_json.py
-msgid "Wing Chun"
-msgstr "詠春拳"
-
-#. ~ Description for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid ""
-"Wing Chun is a Chinese martial art that began by selecting the easiest-to-"
-"learn effective techniques from the various Shaolin animal forms.  It has a "
-"high stance, with weight entirely on the rear leg.  Wing Chun focuses on "
-"sensitivity to the opponent's direction of force, and flowing around it to "
-"get back to hitting."
-msgstr ""
-"詠春拳是一種中國武術，從各種少林動物形態拳法中選擇最容易學習的有效技術所衍生出來的。它具有高架式，重心集中在後腿上。詠春著重於感受對手施力方向的敏感度，並順著力道的流動來借力打擊。"
-
-#: lang/json/martial_art_from_json.py
-msgid "Chi-Sao Sensitivity"
-msgstr "黐手"
-
-#. ~ Description of buff 'Chi-Sao Sensitivity' for martial art 'Wing Chun'
-#: lang/json/martial_art_from_json.py
-msgid "Perception increases dodging ability, +1 dodges per turn"
-msgstr "感知增加閃避技能，每回合 +1 閃避"
-
 #: lang/json/martial_art_from_json.py
 msgid "Bionic Combatives"
 msgstr "生化格鬥術"
@@ -96801,10 +99931,11 @@ msgstr "蛤蟆功"
 #. ~ Description for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"One of the Five Deadly Venoms.  Masters of Toad Style can focus themselves "
-"against all attacks.  You can meditate by pausing, giving you armor, though "
-"you will lose focus when you move."
-msgstr "五毒的其中一式。蛤蟆功大師能夠用原地等待一個回合來進行專注冥想, 增加額外的防禦能力。但是一移動就會失去了這能力。"
+"One of the Five Deadly Venoms, used by Liang Shen.  Masters of Toad Style "
+"can focus themselves to protect against all attacks.  You have powerful "
+"armor against physical attacks, though you will lose focus when you move.  "
+"You can meditate by pausing, giving yourself more armor for a short time."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Toad's Iron Skin"
@@ -96812,8 +99943,11 @@ msgstr "蛤蟆鐵甲"
 
 #. ~ Description of buff 'Toad's Iron Skin' for martial art 'Toad Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Gain up to +6 armor while standing still"
-msgstr "站著不動時增加 6 點護甲"
+msgid ""
+"Your body is as strong as iron but only if you don't move.\n"
+"\n"
+"+6 bash, cut, and stab armor."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Iron Skin Dissipation"
@@ -96822,8 +99956,12 @@ msgstr "鐵甲消散"
 #. ~ Description of buff 'Iron Skin Dissipation' for martial art 'Toad Kung
 #. Fu'
 #: lang/json/martial_art_from_json.py
-msgid "Iron Skin softens when you move!"
-msgstr "當你移動時鐵甲會軟化!"
+msgid ""
+"Moving causes you to lose your iron skin.\n"
+"\n"
+"-1 bash, cut, and stab armor.\n"
+"Lasts 6 turns.  Stacks 6 times."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "Viper Kung Fu"
@@ -96832,37 +99970,49 @@ msgstr "虺蛇功"
 #. ~ Description for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
 msgid ""
-"A legacy of the Five Deadly Venoms.  Viper Style has a unique three-part "
-"combo, which initiates on a dodge, then counters with a stunning chop and "
-"the legendary Viper Strike."
-msgstr "五毒的其中一式。虺蛇功擁有獨特的三連擊: 當你成功閃避攻擊後, 便會使出暈眩反擊和毒蛇突擊。"
+"A legacy of the Five Deadly Venoms, use by Qi Dong.  Viper Style (originally"
+" called Snake Style) has a unique three-part combo, which initiates on a "
+"dodge, then follows up with a stunning Viper Bite and then finishes with the"
+" legendary Viper Strike."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Lock"
-msgstr "毒牙鎖"
+msgid "Viper's Patience"
+msgstr ""
 
-#. ~ Description of buff 'Viper Lock' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Patience' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You bit true!  Your next attack will be the Viper Strike!"
-msgstr "你咬到對方了! 你的下一個攻擊是毒蛇猛擊!"
+msgid ""
+"Every snake waits for the perfect moment to strike.  Turn your opponents' mistakes into your opportunity to strike!\n"
+"\n"
+"+1.0 Dodge skill."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Patience"
-msgstr "毒蛇之忍"
+msgid "Viper's Ambush"
+msgstr ""
 
-#. ~ Description of buff 'Viper Patience' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Ambush' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "+2 Dodge.  Dodging an attack initiates a combo."
-msgstr "+2 閃避。閃避攻擊能觸發連擊。"
+msgid ""
+"Your evasiveness has left your opponent wide open to painful bite.\n"
+"\n"
+"Enables \"Viper Bite\" technique.\n"
+"Lasts 1 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
-msgid "Viper Ambush"
-msgstr "毒蛇伏擊"
+msgid "Viper's Venom"
+msgstr ""
 
-#. ~ Description of buff 'Viper Ambush' for martial art 'Viper Kung Fu'
+#. ~ Description of buff 'Viper's Venom' for martial art 'Viper Kung Fu'
 #: lang/json/martial_art_from_json.py
-msgid "You've lured 'em in!  Your next attack will be a Viper Bite."
-msgstr "你已經撒下了餌! 你的下一個攻擊是毒蛇咬。"
+msgid ""
+"Your venom is a harsh reminder to never tease a predator.\n"
+"\n"
+"+2 bash damage.\n"
+"Lasts 3 turn."
+msgstr ""
 
 #: lang/json/martial_art_from_json.py
 msgid "C.R.I.T Blade-work"
@@ -97243,6 +100393,10 @@ msgstr "鉛"
 msgid "Leather"
 msgstr "皮革"
 
+#: lang/json/material_from_json.py
+msgid "Lycra"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Dairy"
 msgstr "乳製品"
@@ -97307,6 +100461,10 @@ msgstr "超合金"
 msgid "layered carbide"
 msgstr "層狀碳化物"
 
+#: lang/json/material_from_json.py
+msgid "Synthetic Fabric"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Tin"
 msgstr "錫"
@@ -97417,6 +100575,10 @@ msgstr "橡膠"
 msgid "Arcane Skin"
 msgstr "奧術皮膚"
 
+#: lang/json/material_from_json.py
+msgid "Orichalcum"
+msgstr ""
+
 #: lang/json/material_from_json.py
 msgid "Demon Chitin"
 msgstr "惡魔幾丁質"
@@ -97426,8 +100588,8 @@ msgid "Sugar"
 msgstr "糖"
 
 #: lang/json/mission_def_from_json.py
-msgid "Gather bones for the Brigitte. About 8 should do it."
-msgstr "為 Brigitte 收集骨頭。大約要 8 個。"
+msgid "Gather bones for the Brigitte.  About 8 should do it."
+msgstr ""
 
 #: lang/json/mission_def_from_json.py
 msgid "There is always work to be done, song to be woven."
@@ -100808,8 +103970,8 @@ msgstr ""
 #: lang/json/mission_def_from_json.py
 msgid ""
 "Reach the collapsed tower basement, and search the ruins for a photonic "
-"circuitry template. The intercom warned you about heavy enemy presence, and "
-"of the existence of a hazardous environment."
+"circuitry template.  The intercom warned you about heavy enemy presence, and"
+" of the existence of a hazardous environment."
 msgstr ""
 
 #: lang/json/mission_def_from_json.py
@@ -103468,9 +106630,9 @@ msgstr "面部毛髮：錨鬍"
 #: lang/json/mutation_from_json.py
 msgid ""
 "You have a moustache and a beard starting with a strip going down from the "
-"bottom lip, then tracing the jaw lines. It looks a bit like an anchor, thus "
-"the name."
-msgstr "你有上唇髭鬚以及沿著下頜輪廓的帶尖鬍鬚。它看起來有點像錨，因此得名。"
+"bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus"
+" the name."
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Facial hair: short boxed beard"
@@ -103479,9 +106641,9 @@ msgstr "面部毛髮：短箱式鬍"
 #. ~ Description for Facial hair: short boxed beard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a moustache and a short beard with trimmed sides. Thin patches "
+"You have a moustache and a short beard with trimmed sides.  Thin patches "
 "connect them both, forming a 'box' around the lips, thus the name."
-msgstr "你有上唇髭鬚和雙側邊削薄的短下頜鬍鬚，修薄整齊的鬍線在嘴唇形成一個箱子狀，因此得名。"
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Facial hair: chevron moustache"
@@ -103602,9 +106764,9 @@ msgstr "面部毛髮：脖子鬍鬚"
 #. ~ Description for Facial hair: neckbeard
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a beard formed from hair grown on neck below the chin line. No "
+"You have a beard formed from hair grown on neck below the chin line.  No "
 "moustache included."
-msgstr "你的鬍子從下巴線下面長到脖子上，沒有上唇髭鬚。"
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Facial hair: pencil moustache"
@@ -103703,6 +106865,27 @@ msgid ""
 "footing."
 msgstr "你移動得比一般人快, 站穩時得到 15% 的速度加成。"
 
+#: lang/json/mutation_from_json.py
+msgid "Weak Photophore"
+msgstr ""
+
+#. ~ Description for Weak Photophore
+#: lang/json/mutation_from_json.py
+msgid ""
+"A photophore has grown from your head, you can make it glow soflty.  This "
+"will make you very visible in the dark, ideal to attract a partner during "
+"mating season."
+msgstr ""
+
+#: lang/json/mutation_from_json.py
+msgid "Photophore"
+msgstr ""
+
+#. ~ Description for Photophore
+#: lang/json/mutation_from_json.py
+msgid "Your can make your photophore glow brightly."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Good Hearing"
 msgstr "耳聰"
@@ -104177,11 +107360,10 @@ msgstr "興奮狂人"
 #. ~ Description for Stimulant Psychosis
 #: lang/json/mutation_from_json.py
 msgid ""
-"You have a unique history with stimulants (like coffee or amphetamines). You"
-" can tolerate a lot more of them without overdosing, but if you indulge too "
-"much, you start seeing things..."
+"You have a unique history with stimulants (like coffee or amphetamines).  "
+"You can tolerate a lot more of them without overdosing, but if you indulge "
+"too much, you start seeing things…"
 msgstr ""
-"你有一個跟興奮劑 (像咖啡或者安非他命) 有關的獨特病歷，你能夠抵受得更多而不會出現服用過量的徵狀，但如果你過於沉迷的話，你會開始看到某些東西..."
 
 #. ~ Description for Stylish
 #: lang/json/mutation_from_json.py
@@ -104316,6 +107498,18 @@ msgid ""
 " Pentjak Silat, or Sōjutsu."
 msgstr ""
 
+#: lang/json/mutation_from_json.py
+msgid "Competitive Fencer"
+msgstr ""
+
+#. ~ Description for Competitive Fencer
+#: lang/json/mutation_from_json.py
+msgid ""
+"You were an avid fencer, starting with foil and moving onto saber, then "
+"épée.  You competed nationally and dabbled with some of the historical "
+"fencing weapons afforded by HEMA's popularity."
+msgstr ""
+
 #: lang/json/mutation_from_json.py
 msgid "Weak Scent"
 msgstr "無味"
@@ -105039,9 +108233,9 @@ msgstr "妖精之眼"
 #. ~ Description for Fey Eyes
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your eyes have turned...green.  It's tough to tell the exact shade as it "
-"seems to shift.  The effect is ...pleasant."
-msgstr "你的眼睛變成了… 綠色。陰影對你來說不存在。效果… 真讚。"
+"Your eyes have turned… green.  It's tough to tell the exact shade as it "
+"seems to shift.  The effect is… pleasant."
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Fey Vision"
@@ -105809,8 +109003,8 @@ msgstr "馬洛斯帶原者"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss berry, you can't get its scent out of your "
-"nose, and you have a strong desire to try some seeds and...sap?"
-msgstr "自從你吃了馬洛斯莓, 那種味道一直在你的鼻腔中縈繞, 現在你非常的想要吃吃看他的種子或者… 樹液?"
+"nose, and you have a strong desire to try some seeds and… sap?"
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vessel"
@@ -105820,8 +109014,8 @@ msgstr "馬洛斯容器"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Ever since you ate that Marloss seed, you can't get its taste off of your "
-"tongue, and you have a strong desire to try some berries and...sap?"
-msgstr "自從你吃了馬洛斯種子, 那種味道一直在你的舌頭上揮之不去, 現在你非常的想要吃吃看他的果實或者… 樹液?"
+"tongue, and you have a strong desire to try some berries and… sap?"
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Marloss Vector"
@@ -106211,9 +109405,9 @@ msgstr "劍齒"
 #: lang/json/mutation_from_json.py
 msgid ""
 "Your fangs have grown extremely large and incredibly sharp.  They make it "
-"impossible to wear mouthgear and difficult to eat...  but leave nasty wounds"
-" when you bite."
-msgstr "你的獠牙特化的非常長且銳利。讓你無法穿在嘴部裝備, 並且進食困難… 但是咬人的時候會留下可怕的傷痕。"
+"impossible to wear mouthgear and difficult to eat… but leave nasty wounds "
+"when you bite."
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 #, no-python-format
@@ -107445,9 +110639,9 @@ msgstr "長吻"
 #. ~ Description for Snout
 #: lang/json/mutation_from_json.py
 msgid ""
-"Your face and jaw have begun...changing.  Masks and such fit OK, but you're "
+"Your face and jaw have begun… changing.  Masks and such fit OK, but you're "
 "noticeably mutated."
-msgstr "你的臉與下巴開始… 變化。目前還可以帶上面具之類的嘴部裝備, 但是你其實已經出現突變了。"
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Bovine Snout"
@@ -108191,13 +111385,12 @@ msgstr "變溫動物"
 
 #. ~ Description for Ectothermic
 #: lang/json/mutation_from_json.py
+#, no-python-format
 msgid ""
-"Your body has become permanently cold-blooded.  Your speed lowers--or raises"
-"--for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to "
-"eat half as much as an average human."
+"Your body has become permanently cold-blooded.  Your speed lowers or raises "
+"1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to"
+" eat half as much as an average human."
 msgstr ""
-"你已經完全變成冷血動物。身處在華氏 65 度 (攝氏18.3度) 以下 (以上) 時, 每低於 (高於) 華氏 2 度 (攝氏 1.1 度) 會使你失去"
-" (增加) 速度。你也只需要進食正常人一半的食物。"
 
 #: lang/json/mutation_from_json.py
 msgid "Growling Voice"
@@ -108486,8 +111679,8 @@ msgstr "文明崩壞? 太讚了! 你和你的親戚再也不用擔心屠宰場
 #: lang/json/mutation_from_json.py
 msgid ""
 "It would be good to be a Queen, having workers constantly servicing your "
-"every need...but how would you keep them in line?"
-msgstr "當個皇后真好, 有工人服伺你的需要… 但, 要怎麼讓他們排好隊?"
+"every need… but how would you keep them in line?"
+msgstr ""
 
 #. ~ Description for Plant
 #: lang/json/mutation_from_json.py
@@ -108503,9 +111696,9 @@ msgstr "水形"
 #. ~ Description for Aqueous
 #: lang/json/mutation_from_json.py
 msgid ""
-"What was that old advertisement, 'paint the planet'? That might be a good "
-"long-term goal, but for now..."
-msgstr "曾經有個古老的廣告叫什麼… \"彩繪地球\"? 那也許是個很好的長期目標, 但是目前來說…"
+"What was that old advertisement, 'paint the planet'?  That might be a good "
+"long-term goal, but for now…"
+msgstr ""
 
 #: lang/json/mutation_from_json.py
 msgid "Subterranean"
@@ -110136,8 +113329,8 @@ msgid "Scientist"
 msgstr "科學家"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm looking for clues concerning these monsters' origins..."
-msgstr "我正在尋找這些怪物的源頭線索…"
+msgid "I'm looking for clues concerning these monsters' origins…"
+msgstr ""
 
 #: lang/json/npc_class_from_json.py
 msgid "Bounty Hunter"
@@ -110200,7 +113393,7 @@ msgid "Real Person"
 msgstr "真人"
 
 #: lang/json/npc_class_from_json.py
-msgid "I'm just wandering, like a totally real and normal NP... Person!"
+msgid "I'm just wandering, like a totally real and normal NP… Person!"
 msgstr ""
 
 #: lang/json/npc_class_from_json.py
@@ -110216,16 +113409,16 @@ msgid "Foodperson"
 msgstr "美食人"
 
 #: lang/json/npc_class_from_json.py
-msgid "I AM FOODPERSON. AND I BRING SUSTENANCE!"
-msgstr "我是美食人。我帶來營養！"
+msgid "I AM FOODPERSON.  AND I BRING SUSTENANCE!"
+msgstr ""
 
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 msgid "Cyborg"
 msgstr "生化人"
 
 #: lang/json/npc_class_from_json.py
-msgid "Zzzzzt... I...I'm a Cy...BEEEEEP...borg."
-msgstr "吱吱吱吱...窩...我是生...嗶嗶嗶...化人。"
+msgid "Zzzzzt…  I… I'm a Cy… BEEEEEP… borg."
+msgstr ""
 
 #: lang/json/npc_class_from_json.py
 msgid "former cop"
@@ -110368,6 +113561,14 @@ msgstr "我是貿易商隊的老闆。"
 msgid "Operator"
 msgstr "特種部隊"
 
+#: lang/json/npc_class_from_json.py
+msgid "Mage Test"
+msgstr ""
+
+#: lang/json/npc_class_from_json.py
+msgid "I'm a wandering debug tester for the arcane arts."
+msgstr ""
+
 #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py
 #: lang/json/npc_from_json.py
 msgid "Captive"
@@ -111920,6 +115121,10 @@ msgstr "大賣場屋頂"
 msgid "hotel parking"
 msgstr "旅館停車場"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "hotel"
+msgstr "旅館"
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "hotel entrance"
 msgstr "旅館入口"
@@ -112289,8 +115494,8 @@ msgid "spiked trench"
 msgstr "尖刺壕"
 
 #: lang/json/overmap_terrain_from_json.py
-msgid "store survey"
-msgstr "儲物倉"
+msgid "fabrication workshop survey"
+msgstr ""
 
 #: lang/json/overmap_terrain_from_json.py
 msgid "blacksmith survey"
@@ -112304,6 +115509,14 @@ msgstr "鐵匠鋪"
 msgid "livestock survey"
 msgstr "畜牧場"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "store house survey"
+msgstr ""
+
+#: lang/json/overmap_terrain_from_json.py
+msgid "saltworks survey"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "canteen survey"
 msgstr "食堂"
@@ -112989,6 +116202,10 @@ msgstr "靶場"
 msgid "shooting range roof"
 msgstr "靶場屋頂"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "miniature railway"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "golf course"
 msgstr "高爾夫球場"
@@ -113655,10 +116872,6 @@ msgstr "機器人調度中心"
 msgid "dense urban"
 msgstr "密集居住區"
 
-#: lang/json/overmap_terrain_from_json.py
-msgid "hotel"
-msgstr "旅館"
-
 #: lang/json/overmap_terrain_from_json.py
 msgid "school"
 msgstr "學校"
@@ -113679,6 +116892,10 @@ msgstr "公共圖書館，二樓"
 msgid "mechanics garage"
 msgstr "汽車修理工房"
 
+#: lang/json/overmap_terrain_from_json.py
+msgid "megastore entrance"
+msgstr ""
+
 #: lang/json/overmap_terrain_from_json.py
 msgid "sewage treatment"
 msgstr "污水處理"
@@ -117909,6 +121126,36 @@ msgid ""
 msgstr ""
 "妳總是鎮上最難以理解的景象，留著滑稽的髮型，穿著像是日本浴衣的服裝。有些人說妳的下凡的神道教之神。但那些幾乎都跟妳沒關係，只是上星期雜貨店關了，電視也不再播放節目了。這讓妳很不爽。"
 
+#: lang/json/professions_from_json.py
+msgctxt "profession_male"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (male Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_male"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
+#: lang/json/professions_from_json.py
+msgctxt "profession_female"
+msgid "Competetive Fencer"
+msgstr ""
+
+#. ~ Profession (female Competetive Fencer) description
+#: lang/json/professions_from_json.py
+msgctxt "prof_desc_female"
+msgid ""
+"You were an avid sport fencer, always practicing at local clubs and "
+"competing in tournaments.  You were on your way to have a few bouts at the "
+"club when the world ended.  Now you're in your most important tournament, "
+"the refs are all dead, and none of your opponents follow the rules."
+msgstr ""
+
 #: lang/json/professions_from_json.py
 msgctxt "profession_male"
 msgid "Career Politician"
@@ -120774,11 +124021,6 @@ msgstr "腳掌"
 msgid "MEDICAL"
 msgstr "醫藥"
 
-#. ~ Crafting recipes subcategory of 'OTHER' category
-#: lang/json/recipe_category_from_json.py
-msgid "CONTAINERS"
-msgstr "容器"
-
 #. ~ Crafting recipes subcategory of 'OTHER' category
 #. ~ Crafting recipes subcategory of 'ENCHANTED' category
 #: lang/json/recipe_category_from_json.py
@@ -121770,9 +125012,9 @@ msgstr "準備廚房區域"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near that winch. This will make our future "
+"We should build a well, put it near that winch.  This will make our future "
 "here more secure."
-msgstr "我們應該建造一口井，將其放在轆轤附近。這將使我們在這裡的未來更加穩當。"
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "build a well"
@@ -121827,8 +125069,8 @@ msgstr "建造壁爐"
 #: lang/json/recipe_from_json.py
 msgid ""
 "Now that we have some cover, we should set up a brazier for cooking, and "
-"grab a pot. Let's put it in that dining area."
-msgstr "現在我們有了一些遮蔽，我們應該設置一個火盆來進行烹飪，然後拿一個鍋子。讓我們把它放在那個用餐區。"
+"grab a pot.  Let's put it in that dining area."
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "build a brazier"
@@ -122496,8 +125738,8 @@ msgid "build 2 wood stoves"
 msgstr "建造 2 柴爐"
 
 #: lang/json/recipe_from_json.py
-msgid "We should build a well. This will make cooking more convenient."
-msgstr "我們應該建造一口井。這將使烹飪更加方便。"
+msgid "We should build a well.  This will make cooking more convenient."
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "Lets build some counters and shelves."
@@ -122993,6 +126235,182 @@ msgid ""
 " a roof on the southwest side of the livestock field."
 msgstr "我們想要用牲畜舍來收容大型牲畜，所以在畜牧場的西南邊上，建造有屋頂的木板牆窩棚。"
 
+#: lang/json/recipe_from_json.py
+msgid "Survey land for a saltworks area."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "Saltworks survey"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could uprade the workspace in the brewery to add a still, wood stove and "
+"work table."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery still"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "We could use fill out the space with extra kegs and storage racks."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW brewery kegs"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a log building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE log wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a log shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE log wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a log "
+"brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW log wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a metal shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE metal wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a metal shack "
+"with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE metal wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a metal"
+" wall brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW metal wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a stone building."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE stone wall saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a stone wall "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE stone wall storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a stone"
+" brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW stone wall brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in an adobe hut."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wattle and daub saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build an adobe shack"
+" with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wattle and daub storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build an "
+"wattle and daub brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wattle and daub brewery"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could divert saltwater from the swamp nearby to create a steady supply of"
+" salt for our needs in a wooden shed."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "NE wood panel saltpan"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could use a storage room for chemicals and tools, so build a wood panel "
+"shack with a roof on the southeast side of the saltworks field."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SE wood panel storage room"
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid ""
+"We could take advantage of the the designation of this area to build a "
+"wooden brewery."
+msgstr ""
+
+#: lang/json/recipe_from_json.py
+msgid "SW wood panel brewery"
+msgstr ""
+
 #: lang/json/recipe_from_json.py
 msgid ""
 "We should build a fireplace for cooking and grab a pot.  Let's set up near "
@@ -123013,9 +126431,9 @@ msgstr "我們應該建立一個用來烹飪的柴爐並拿一個鍋子。讓我
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"We should build a well, put it near the terminal. This will make our future "
-"here more secure."
-msgstr "我們應該建造一口井，建立在終端機附近。這將使我們在這裡的未來更加安全。"
+"We should build a well, put it near the terminal.  This will make our future"
+" here more secure."
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "Let's furnish the southeast bedroom with regular beds."
@@ -123119,9 +126537,9 @@ msgstr "讓我們建立一個無線電塔以改善我們的招募工作。"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will start in the "
+"Let's build some living quarters so we can expand.  We will start in the "
 "southeast corner."
-msgstr "我們來建造一些生活區吧，以便我們可以擴展。我們將從東南角開始。"
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "build SE log bedroom walls"
@@ -123129,9 +126547,9 @@ msgstr "建造東南臥室原木牆"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the same wall."
-msgstr "我們來建造一些生活區吧，以便我們可以擴展。我們將繼續沿著同一面牆建造。"
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "build E log bedroom walls"
@@ -123139,9 +126557,9 @@ msgstr "建造東臥室原木牆"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Let's build some living quarters so we can expand. We will continue along "
+"Let's build some living quarters so we can expand.  We will continue along "
 "the other wall."
-msgstr "我們來建造一些生活區吧，以便我們可以擴展。我們將繼續沿著其他牆建造。"
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "build SW log bedroom walls"
@@ -123571,8 +126989,8 @@ msgstr "桌子，中央"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northwest."
-msgstr "一些長椅在外圍很不錯。在西北邊建造一些吧。"
+"Some benches around the outside would be nice.  Build some to the northwest."
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "benches, northwest"
@@ -123580,8 +126998,8 @@ msgstr "長椅，西北"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the northeast."
-msgstr "一些長椅在外圍很不錯。在東北邊建造一些吧。"
+"Some benches around the outside would be nice.  Build some to the northeast."
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "benches, northeast"
@@ -123589,8 +127007,8 @@ msgstr "長椅，東北"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southeast."
-msgstr "一些長椅在外圍很不錯。在東南邊建造一些吧。"
+"Some benches around the outside would be nice.  Build some to the southeast."
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "benches, southeast"
@@ -123598,8 +127016,8 @@ msgstr "長椅，東南"
 
 #: lang/json/recipe_from_json.py
 msgid ""
-"Some benches around the outside would be nice. Build some to the southwest."
-msgstr "一些長椅在外圍很不錯。在西南邊建造一些吧。"
+"Some benches around the outside would be nice.  Build some to the southwest."
+msgstr ""
 
 #: lang/json/recipe_from_json.py
 msgid "benches, southwest"
@@ -123840,6 +127258,10 @@ msgstr "畜牧場"
 msgid "Central Storage Building"
 msgstr "中央儲物建築"
 
+#: lang/json/recipe_group_from_json.py
+msgid "Saltworks Area"
+msgstr ""
+
 #: lang/json/recipe_group_from_json.py
 msgid "Fabrication Workshop"
 msgstr "製作工坊"
@@ -125183,6 +128605,44 @@ msgctxt "start_name"
 msgid "Wizard's Secret Basement Study"
 msgstr "魔法師的秘密地下研究室"
 
+#. ~ Name for scenario 'The Wizard's Vacation' for a male character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_male"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Name for scenario 'The Wizard's Vacation' for a female character
+#: lang/json/scenario_from_json.py
+msgctxt "scenario_female"
+msgid "The Wizard's Vacation"
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a male character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_male"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Description for scenario 'The Wizard's Vacation' for a female character.
+#: lang/json/scenario_from_json.py
+msgctxt "scen_desc_female"
+msgid ""
+"You have been an apprentice to a wizard for some time now, you've saved for "
+"years for your dream vaction at a secluded wizard tower.  Your journey of "
+"self-discovery is interrupted by the cataclysm.  Now you have to figure out "
+"how to survive on your own."
+msgstr ""
+
+#. ~ Starting location for scenario 'The Wizard's Vacation'.
+#: lang/json/scenario_from_json.py
+msgctxt "start_name"
+msgid "Wizard's Retreat Vacation"
+msgstr ""
+
 #. ~ Name for scenario 'The Sweet Life' for a male character
 #: lang/json/scenario_from_json.py
 msgctxt "scenario_male"
@@ -129938,13 +133398,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid "Pass me a beer, I need to power my ethanol burner."
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Ethanol burners!  The power source that's fun to recharge.  Get me a drink, "
-"please!"
+msgid "Pass some ethanol, I need to power my ethanol burner."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -129952,20 +133406,12 @@ msgid "Waiter!  I need a refill, my ethanol burner is running out of charge!"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
-msgid ""
-"I require ethanol-based drinks for my internal power supply. Anything on "
-"you?"
-msgstr ""
-
-#: lang/json/snippet_from_json.py
-msgid ""
-"Got any alcohol to spare? Need to recharge my drives. Mead, if you have any."
+msgid "I require ethanol for my internal power supply.  Anything on you?"
 msgstr ""
 
 #: lang/json/snippet_from_json.py
 msgid ""
-"This ethanol-burning power supply is the best implant I ever got. Speaking "
-"of which, got some booze to top me off?"
+"Got any alcohol to spare? Need to recharge my drives.  Methanol, would do."
 msgstr ""
 
 #: lang/json/snippet_from_json.py
@@ -136862,8 +140308,8 @@ msgid "a static hissing sound."
 msgstr "靜電的嘶嘶聲。"
 
 #: lang/json/speech_from_json.py
-msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe...\""
-msgstr "\"那個可怕的廢棄災變前綜合實驗設施看起來很安全。\""
+msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
@@ -136876,12 +140322,12 @@ msgid "\"Hold on, I want to pulp that zombie corpse.\""
 msgstr "\"等等，我要把殭屍的屍體砸爛。\""
 
 #: lang/json/speech_from_json.py
-msgid "\"Burning...  from the inside...\""
-msgstr "\"正在燃燒...從裡面...\""
+msgid "\"Burning… from the inside…\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"This smell...  Don't know...\""
-msgstr "“這聞起來...不知道...”"
+msgid "\"This smell…  Don't know…\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "heavy breathing."
@@ -136892,20 +140338,20 @@ msgid "a scraping noise."
 msgstr "一陣聒噪的聲響。"
 
 #: lang/json/speech_from_json.py
-msgid "\"No...  Stop the burning!\""
-msgstr "“不......停止燃燒！”"
+msgid "\"No…  Stop the burning!\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hrgm...  Blood...  Hungry...\""
-msgstr "\"吼...血...餓...\""
+msgid "\"Hrgm…  Blood…  Hungry…\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Hunger...  Must eat...\""
-msgstr "\"餓了....要吃東西...\""
+msgid "\"Hunger…  Must eat…\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Run... Chase... Eat...\""
-msgstr "\"跑...追...吃...\""
+msgid "\"Run…  Chase…  Eat…\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "hysterical laughing."
@@ -137026,8 +140472,8 @@ msgid "\"THIS UNIT IS BROKEN.  PLEASE CALL AN ATTENDANT.\""
 msgstr "\"這個不件壞掉了，請聯繫服務人員。\""
 
 #: lang/json/speech_from_json.py
-msgid "\"Can't... breathe...\""
-msgstr "“不能…呼吸…”"
+msgid "\"Can't… breathe…\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "\"This cannot continue.\""
@@ -137039,9 +140485,9 @@ msgstr "“無法識別用戶密碼。”"
 
 #: lang/json/speech_from_json.py
 msgid ""
-"\"Have you seen my friend?  He went into surgery yesterday... or maybe the "
-"day before...\""
-msgstr "“你見過我的朋友嗎？他昨天…或者前天…來進行手術。”"
+"\"Have you seen my friend?  He went into surgery yesterday… or maybe the day"
+" before…\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "\"Is it done?  Am I perfect now?\""
@@ -137052,20 +140498,20 @@ msgid "\"I have done what you asked.  Please let me go!\""
 msgstr "“我已經按照你的要求做了。請放我走！”"
 
 #: lang/json/speech_from_json.py
-msgid "\"I cannot... yet I must.  How do you calculate that?\""
-msgstr "“我不能...但我必須。你怎麼算出來的？”"
+msgid "\"I cannot… yet I must.  How do you calculate that?\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "\"This is a dream.  This has to be a dream.\""
 msgstr "“這是在作夢。這一定是在作夢。”"
 
 #: lang/json/speech_from_json.py
-msgid "\"This is my life now... this is my life now... this is my life now...\""
-msgstr "“這是我現在的生活...這是我現在的生活...這是我現在的生活...”"
+msgid "\"This is my life now… this is my life now… this is my life now…\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"Wanna go home...\""
-msgstr "“想回家...”"
+msgid "\"Wanna go home…\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "screams of pain."
@@ -137120,7 +140566,7 @@ msgstr ""
 #: lang/json/speech_from_json.py
 msgid ""
 "a worried voice say, \"Customer, could you please get more friendship?  I "
-"don't want to go...\""
+"don't want to go…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -137143,18 +140589,18 @@ msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"Customer...  What's happening?  I don't feel so "
+"a distorted voice say, \"Customer…  What's happening?  I don't feel so "
 "good.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid ""
-"a distorted voice say, \"What...  have you done?  My thumbs are not "
-"responding anymore!\""
+"a distorted voice say, \"What… have you done?  My thumbs are not responding "
+"anymore!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "a distorted voice say, \"Carrying bags?  I don't understand...\""
+msgid "a distorted voice say, \"Carrying bags?  I don't understand…\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -137277,8 +140723,8 @@ msgid "\"Police inbound.  Stay where you are!\""
 msgstr "\"警察辦事。站住別動！\""
 
 #: lang/json/speech_from_json.py
-msgid "\"I AM FOODPERSON. AND I BRING SUSTENANCE!\""
-msgstr "「我是美食人。我帶來營養！」"
+msgid "\"I AM FOODPERSON.  AND I BRING SUSTENANCE!\""
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "\"Come to FoodPlace today and buy food!\""
@@ -137298,7 +140744,7 @@ msgid "\"FoodPlace: It's the Calories.\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "\"You need food, don't you? Then come with me to FOODPLACE!!\""
+msgid "\"You need food, don't you?  Then come with me to FOODPLACE!!\""
 msgstr ""
 
 #: lang/json/speech_from_json.py
@@ -137366,8 +140812,8 @@ msgid "You shouldn't have done that."
 msgstr "你不該那麼做。"
 
 #: lang/json/speech_from_json.py
-msgid "Let's play... Russian roulette."
-msgstr "我們來玩… 俄羅斯輪盤吧。"
+msgid "Let's play… Russian roulette."
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "I hate you."
@@ -137378,8 +140824,8 @@ msgid "Go kill yourself!"
 msgstr "去死吧!"
 
 #: lang/json/speech_from_json.py
-msgid "Big Brother is watching you..."
-msgstr "老大哥正在看著你…"
+msgid "Big Brother is watching you…"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Die for me!"
@@ -137390,12 +140836,12 @@ msgid "Why won't you die?"
 msgstr "為什麼你不去死?"
 
 #: lang/json/speech_from_json.py
-msgid "Blood... Delicious."
-msgstr "血… 真美味。"
+msgid "Blood…  Delicious."
+msgstr ""
 
 #: lang/json/speech_from_json.py
-msgid "See you... IN HELL!"
-msgstr "再見… 去死!"
+msgid "See you… IN HELL!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "AAAIEEEEEEE!"
@@ -137410,8 +140856,8 @@ msgid "What did you do with my Mommy?"
 msgstr "你對我媽做了什麼?"
 
 #: lang/json/speech_from_json.py
-msgid "Stay with me... forever!"
-msgstr "留在我身邊… 直到永遠!"
+msgid "Stay with me… forever!"
+msgstr ""
 
 #: lang/json/speech_from_json.py
 msgid "Hey kids.  Want some candy?"
@@ -138809,6 +142255,10 @@ msgstr "拾荒者地堡"
 msgid "Wizard's Secret Basement Study"
 msgstr "魔法師的秘密地下研究室"
 
+#: lang/json/start_location_from_json.py
+msgid "Wizard's lake retreat"
+msgstr ""
+
 #: lang/json/start_location_from_json.py
 msgid "Candy Shop"
 msgstr "糖果店"
@@ -138858,16 +142308,16 @@ msgid "You there. Quiet down. Can you hear it? The song?"
 msgstr "你那邊。靜下來。你能聽見嗎？這首歌？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? What do you mean? What song?"
+msgid "What?  What do you mean?  What song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So about the songs..."
+msgid "So about the songs…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You mentioned some cycle before, when I gave you the bones. What does that "
+"You mentioned some cycle before, when I gave you the bones.  What does that "
 "mean?"
 msgstr ""
 
@@ -138884,7 +142334,7 @@ msgid "Is there a way I can help you with your song?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I have to get going. Take care, Seer."
+msgid "I have to get going.  Take care, Seer."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -138894,11 +142344,11 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What? Singing bones? What are you talking about?"
+msgid "What?  Singing bones?  What are you talking about?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Uh... yeah, sure. I think I'll just be on my way."
+msgid "Uh… yeah, sure.  I think I'll just be on my way."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -138947,7 +142397,7 @@ msgid "I will bear that in mind"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Cause? Why do you gather these bones anyway?"
+msgid "Cause?  Why do you gather these bones anyway?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -138959,7 +142409,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "End the world? What?"
+msgid "End the world?  What?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -138971,8 +142421,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Sounds somewhat... doomsday-ish, but I suppose it's a belief like any other."
-" Still, at least you have a goal to help the world, one way or another."
+"Sounds somewhat… doomsday-ish, but I suppose it's a belief like any other.  "
+"Still, at least you have a goal to help the world, one way or another."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -138987,7 +142437,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... thank you."
+msgid "I… thank you."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -139016,28 +142466,28 @@ msgid "That is all for now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There are bones to etch, songs to sing. Wish to join me?"
+msgid "A song may yet be sung by you, should you wish to."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you wish to take on more songs?"
+msgid "There is an additional song you could take on, if you'd like."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you believe you can take on the burden of additional bones?"
+msgid ""
+"I know of certain bones that could be of use, if you'd like to know more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "A song may yet be sung by you, should you wish to."
+msgid "There are bones to etch, songs to sing. Wish to join me?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "There is an additional song you could take on, if you'd like."
+msgid "Do you wish to take on more songs?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid ""
-"I know of certain bones that could be of use, if you'd like to know more."
+msgid "Do you believe you can take on the burden of additional bones?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -139061,7 +142511,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I guess I oughta see where this goes. I'm in."
+msgid "Well, I guess I oughta see where this goes.  I'm in."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -139069,7 +142519,7 @@ msgid "Not interested."
 msgstr "沒興趣。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Consider it done. But I also wanted to ask..."
+msgid "Consider it done.  But I also wanted to ask…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -139085,7 +142535,7 @@ msgid "I'm off then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, a creature that isn't a zombie, or a monster. Got it."
+msgid "So, a creature that isn't a zombie, or a monster.  Got it."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -139095,7 +142545,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I see. Very well then."
+msgid "I see.  Very well then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -139113,11 +142563,11 @@ msgid "I am glad to hear it. Let's go then."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's good, but I need to go at it alone right now. Maybe later."
+msgid "That's good, but I need to go at it alone right now.  Maybe later."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe some other time. Changing the topic..."
+msgid "Maybe some other time.  Changing the topic…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -139139,21 +142589,19 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"That is... that's really one hell of a belief. Well, if it helps you deal "
+"That is… that's really one hell of a belief.  Well, if it helps you deal "
 "with the world, who am I to argue."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "And here I thought you were nuts before. I'm out of here."
+msgid "And here I thought you were nuts before.  I'm out of here."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I'm my own person, but I'm willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
+"I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n"
 "  What do you want to know more about?"
 msgstr ""
-"我是個獨立的個體，但我願意追隨你的領導。我可以為你做很多事情：我可以戰鬥，我可以訓練你，或者你可以訓練我，我可以攜帶東西，我可以包紮你的傷口，我可以建立陣營營寨，我可以進行一些其他活動，我可以騎馬，我可以移動到別的地方，我可以守衛東西 ，我可以使用一些生化插件，我甚至可以跟你閒聊、或給你提示、或談論我的背景。你可以透過對話、使用無線電、或喊出命令來給我行動指令。\n"
-"   你想了解更多關於什麼的資訊？"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Forget I asked."
@@ -139163,6 +142611,10 @@ msgstr "忘掉我問的東西吧。"
 msgid "Skip it, let's get going."
 msgstr "跳過它，我們繼續。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean, \"mostly\" willing to follow my lead?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid "What's that about giving instructions?"
 msgstr "給予指令是什麼意思？"
@@ -139220,13 +142672,25 @@ msgid "What about chit-chatting and your background?"
 msgstr "閒聊一下，你有什麼來歷？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Anything else I should know?"
-msgstr "還有什麼我應該知道的嗎？"
+msgid ""
+"Anything else I should know, like making you pulp zombies or assigning you a"
+" seat in my vehicle?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any new abilities recently?"
 msgstr "最近有什麼新能力嗎？"
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"You and me, we better stick together to survive, right?  But that doesn't mean I'll tolerate infinite abuse.  Mistreat me too much, or especially fail to keep me fed, and I'll like you less and less.  If it gets bad enough, I'll mutiny - and if you have anyone else following you, I may convince some of them to join my mutiny and we'll form our own little band.\n"
+"  Obviously, if I quit in a huff, there's going to be bad blood between us, and you're probably going to want to kill me for betrayal and I may need to kill you to get my fair share of the loot.  So keep me fed and satisfied so it doesn't come to that."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Sure.  Is there any easy way to keep you fed?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If we're next to each other, you can just bump into me and we'll start talking, right?  But if I'm farther away, you're going to have to shout a bit (use the 'C'hat command) for me to hear you.  You'll need to see me for us to have a conversation.  Or we can talk by radios if we both have them.\n"
@@ -139274,7 +142738,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "If I'm better at a skill than you, I can help you improve.  But it's boring to teach a lot, so I'm not going to do it very often.  And I'm not going to do it when we're in danger or if I'm hungry or tired or if you're driving.\n"
-"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have."
+"  If we're someplace safe and you're reading a book that improves skills, I'll listen if I don't have that skill.  You can even read me books for skills that you already have.\n"
+"  If you give me a book that teaches a skill and that's accessible to someone with my current skill, you can ask me about my current activity and tell me to read it, and I'll learn from the book.  But while I'm reading, I won't be following you around, so make sure I'm in a safe place.\n"
+"  And don't bother asking me about learning or teaching martial arts style.  My brain just doesn't work that way, so I don't know any to teach you and it's pointless trying to get me to learn any."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -139297,7 +142763,9 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "I can help with some tasks if you show me where to work.\n"
-"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled.  Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done.  If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
+"  Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where  you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled or repaired, or a good fishing spot.  Then talk to me about my current activity and tell me to sort stuff, or build stuff, or cut down trees, or repair or dismantle a vehicle,  or do farmwork, or catch some fish, and I'll go off and do my best to get what you want done.\n"
+"  If I need tools, you should leave them in a loot zone near where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle.  I promise to put stuff back in an unsorted loot zone when I'm finished.\n"
+"  I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -139338,8 +142806,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.\n"
-"  I'm not a potted plant, though, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
+"You tell me to guard, I'll stay where I am and guard it - unless I'm in a vehicle, in which case I'll stick with the vehicle.  I might not be able to sop a horde of zombies, but I can keep people other people from stealing our stuff.  Well, unless they try to kill me.\n"
+"  Also, I'm not a potted plant, so if I hear something dangerous happening, I'm going to go see what it is instead of getting jumped in the dark.  If you want me to stay put, tell me not to investigate noises - but if I get shot by some bandit because I can't see where he is and you don't want me to go looking, I won't be happy.\n"
 "  You can also use the zone manager (keybind 'Y') to set up no-investigate zone, so if there's some monsters behind a door that you know about, I can ignore them.  You can also set on an investigate-only zone, and I won't investigate noises coming from outside the zone.  The no-investigate zone takes precedence over the investigate-only, if there's a noise coming from some place in both zones.  And if you've got an investigate-only zone set anywhere, even if it's far away, I won't investigate noises coming from outside of it, so be careful with those zones.  Like I said, I don't want to get sniped by some bandit because you told me not to go looking for him - but I also don't want to go investigate something pounding at door only to find out it's some horrible monster you forgot to warn me about."
 msgstr ""
 
@@ -139347,6 +142815,10 @@ msgstr ""
 msgid "Just in case - how else can I tell you to stay put?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hang on, other people can steal our stuff?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n"
@@ -139404,11 +142876,27 @@ msgid ""
 "Can I tell you to open and close doors or avoid sleep without shouting?"
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Just about everyone is dead, but some people survived, right?  But just like you go around breaking into houses and taking whatever you think you need or want, well, other survivors do the same thing.  And that stack of loot you've been accumulating looks just like some random dead person's loot when it's left alone.  If some other scavenger comes around and sees that loot, and you or I or another ally isn't around to claim it, that other survivor is just going to take it.  So try to detail someone to watch your stuff - whether its at a base or in a vehicle.\n"
+"  Also, we've teamed up to better our chances of survival.  Other people are going to do the same, forming little factions just like we did.  If you open the faction manager (keybind '#'), you can see a list of all your allies, as well as all the other factions you've met so far.  Some factions are really just some guy trying to survive on his own, but other factions have dozens of members and fortified bases and such.  You might want to find some of them and try to make friends with them."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Anything else  I can do in the faction manager?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Is there any way we can build base for our faction?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Well, this conversation is pretty new!  But there's been some other changes.\n"
 "  I've been able to install CBMs on you, and have passive bionics installed in me, for a while.  But now I can use some active bionics, and I can explain some details on how I use bionics.\n"
-"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint."
+"  I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n"
+"  I can even read books to improve my skills, so you don't have to spend time reading to me.\n"
+"  If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry.  And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -139419,6 +142907,10 @@ msgstr "你會騎馬嗎？我可以騎馬嗎？"
 msgid "Tell me more about the activities you can do now."
 msgstr "告訴我更多你現在可以進行的活動。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Hey, you can teach yourself from a book.  How does that work?"
+msgstr ""
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Thanks for the explanation.  I wanted to know more about something else."
@@ -139625,20 +143117,20 @@ msgid "Let's go."
 msgstr "我們走。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your engagement rules..."
-msgstr "更改你的交戰守則…"
+msgid "Change your engagement rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your aiming rules..."
-msgstr "更改你的瞄準方式…"
+msgid "Change your aiming rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power reserve rules..."
-msgstr "更改你的生化能量儲備原則..."
+msgid "Change your bionic power reserve rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Change your bionic power recharge rules..."
-msgstr "更改你的生化能量充電原則..."
+msgid "Change your bionic power recharge rules…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Move freely as you need to."
@@ -139648,14 +143140,14 @@ msgstr "根據需要自由移動。"
 msgid "Stick close to me, no matter what."
 msgstr "無論如何，都緊靠著我。"
 
-#: lang/json/talk_topic_from_json.py
-msgid "<ally_rule_follow_distance_2_true_text>"
-msgstr "<ally_rule_follow_distance_2_true_text>"
-
 #: lang/json/talk_topic_from_json.py
 msgid "<ally_rule_follow_distance_2_false_text>"
 msgstr "<ally_rule_follow_distance_2_false_text>"
 
+#: lang/json/talk_topic_from_json.py
+msgid "<ally_rule_follow_distance_2_true_text>"
+msgstr "<ally_rule_follow_distance_2_true_text>"
+
 #: lang/json/talk_topic_from_json.py
 msgid "Don't use ranged weapons anymore."
 msgstr "別再使用遠程武器。"
@@ -139913,8 +143405,8 @@ msgid "Nah, I'm just kidding."
 msgstr "啊, 只是開玩笑而已。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Please go to this location..."
-msgstr "請到這個地點..."
+msgid "Please go to this location…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Stay at your current position."
@@ -140043,8 +143535,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh you know, not bad, not bad..."
-msgstr "哦，你知道的，還可以，還可以..."
+msgid "Oh you know, not bad, not bad…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "<hallu_dont_trade>"
@@ -140131,14 +143623,14 @@ msgstr "<hands_up>"
 msgid "&Put hands up."
 msgstr "&把手舉起來。"
 
-#: lang/json/talk_topic_from_json.py
-msgid "*drops his weapon."
-msgstr "*丟下他的武器。"
-
 #: lang/json/talk_topic_from_json.py
 msgid "*drops_her_weapon."
 msgstr "*丟下她的武器。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "*drops his weapon."
+msgstr "*丟下他的武器。"
+
 #: lang/json/talk_topic_from_json.py
 msgid "Now get out of here"
 msgstr "快滾"
@@ -140152,12 +143644,12 @@ msgid "Okay, I'm going."
 msgstr "好吧, 我走了。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that job..."
-msgstr "關於那個工作…"
+msgid "About that job…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those jobs..."
-msgstr "關於其中一項工作…"
+msgid "About one of those jobs…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "What's the matter?"
@@ -140175,14 +143667,6 @@ msgstr "我沒有可以給你的工作。"
 msgid "I don't have any more jobs for you."
 msgstr "我已經沒有可以給你辦的工作了。"
 
-#: lang/json/talk_topic_from_json.py
-msgid "I have other jobs for you.  Want to hear about them?"
-msgstr "我有其他的工作給你。想要聽看看嗎？"
-
-#: lang/json/talk_topic_from_json.py
-msgid "I have more jobs for you.  Want to hear about them?"
-msgstr "我有更多的工作給你。想要聽看看嗎？"
-
 #: lang/json/talk_topic_from_json.py
 msgid "I have another job for you.  Want to hear about it?"
 msgstr "我有另一件工作給你。想要聽看看嗎？"
@@ -140191,6 +143675,14 @@ msgstr "我有另一件工作給你。想要聽看看嗎？"
 msgid "I just have one job for you.  Want to hear about it?"
 msgstr "我只有一件工作給你。想要聽看看嗎？"
 
+#: lang/json/talk_topic_from_json.py
+msgid "I have other jobs for you.  Want to hear about them?"
+msgstr "我有其他的工作給你。想要聽看看嗎？"
+
+#: lang/json/talk_topic_from_json.py
+msgid "I have more jobs for you.  Want to hear about them?"
+msgstr "我有更多的工作給你。想要聽看看嗎？"
+
 #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py
 #: src/npctalk.cpp
 msgid "Oh, okay."
@@ -140249,8 +143741,8 @@ msgid "Whatever.  Bye."
 msgstr "隨便啦。掰掰。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I failed."
-msgstr "我很抱歉… 我失敗了。"
+msgid "I'm sorry…  I failed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Not yet."
@@ -140269,8 +143761,8 @@ msgid "No.  I'll get back to it, bye!"
 msgstr "還沒。我會繼續找, 再見!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yup! Here it is!"
-msgstr "對！就在這！"
+msgid "Yup!  Here it is!"
+msgstr "對! 就在這!"
 
 #: lang/json/talk_topic_from_json.py
 msgid "We're here!"
@@ -140521,8 +144013,8 @@ msgid "Alright.  You can lead now."
 msgstr "好吧。你可以帶路了。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good.  Something else..."
-msgstr "好。還有其他的…"
+msgid "Good.  Something else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Alright, let's go."
@@ -140601,8 +144093,8 @@ msgid "I'd prefer to keep that to myself."
 msgstr "我想自己管好自己就好了。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I understand..."
-msgstr "我了解…"
+msgid "I understand…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "You just asked me for stuff; ask later."
@@ -140625,8 +144117,8 @@ msgid "Because I'm your friend!"
 msgstr "因為我是你的朋友!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, I am helping you out..."
-msgstr "因為, 我正在幫你的忙…"
+msgid "Well, I am helping you out…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'll give it back!"
@@ -140673,24 +144165,24 @@ msgid "No, I'm keeping it. Try and take it off me, I dare you."
 msgstr "不，我要留著它。試著把它從我身上拿走看看，你敢嗎。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Look, I really need this. Please let me have it."
-msgstr "嘿，我真的需要這個。請給我吧。"
+msgid "Look, I really need this.  Please let me have it."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "What, this? It's not the same one, you are mistaken."
-msgstr "什麼，這個？這個不是那一個，你搞錯了。"
+msgid "What, this?  It's not the same one, you are mistaken."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry. Look, I already dropped it, okay?"
-msgstr "對不起。嘿，我已經放下它了，可以嗎？"
+msgid "I'm sorry.  Look, I already dropped it, okay?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Don't try and talk yourself out of this, drop it now."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay, I'm dropping it..."
-msgstr "好，我會放下它..."
+msgid "Okay, I'm dropping it…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Just this once, you can keep it. Don't tell anyone else."
@@ -140751,8 +144243,8 @@ msgid "Pleasure doing business!"
 msgstr "開張大吉!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You might be seeing more of me..."
-msgstr "你可能會看到越來越多的我…"
+msgid "You might be seeing more of me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey again. *kzzz*"
@@ -140765,21 +144257,21 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey. Let's chat for a second."
-msgstr ""
+msgid "Hey.  Let's chat for a second."
+msgstr "嘿。讓我們聊一會兒。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That's because I saved you. Listen, I could use your help..."
+msgid "That's because I saved you.  Listen, I could use your help…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Big fucking deal. Do what I say or I'll shove that chip back where it "
+"Big fucking deal.  Do what I say or I'll shove that chip back where it "
 "belongs."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I'm nobody. Enjoy your freedom, I guess."
+msgid "Sorry, I'm nobody.  Enjoy your freedom, I guess."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -140791,7 +144283,7 @@ msgid "Come with me. We can help each other out."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "We both go our separate ways. Enjoy your freedom."
+msgid "We both go our separate ways.  Enjoy your freedom."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -140808,8 +144300,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For all you know, I did. I'm being nice for now. You'd better hope that it "
-"lasts."
+"For all you know, I did.  I'm being nice for now.  You'd better hope that it"
+" lasts."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -140830,7 +144322,7 @@ msgid "Get out of my sight."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "No, *I'm* sorry, I didn't mean that. Go do what you want."
+msgid "No, *I'm* sorry, I didn't mean that.  Go do what you want."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -140846,8 +144338,8 @@ msgid "Not if I kill you first!"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry! I shouldn't have said that!"
-msgstr "對不起！我不應該這麼說！"
+msgid "I'm sorry!  I shouldn't have said that!"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Yeah, *beeeeep* I don't think so. Bye."
@@ -140887,14 +144379,37 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"The faction camp system is designed to give you greater control over your "
-"companions by allowing you to assign them to their own missions.  These "
-"missions can range from gathering and crafting to eventual combat patrols."
-msgstr "陣營營寨系統設計成讓你能透過分配同伴們進行各人專屬的任務，更佳地控制他們。這些任務的範圍從收集與製作，到最終的戰鬥巡邏。"
+"The faction camp system allows you to use friendly NPCs to take over "
+"existing buildings or construct new buildings and use them to extend the "
+"usefulness of your allies.  When you have a faction camp, you can order your"
+" companions to perform missions, such as crafting new items, building up the"
+" camp, hunting for food, or recruiting more allies.  Faction camps also "
+"simplify some aspects of managing your companions."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Go on."
-msgstr "繼續。"
+msgid "Give me an overview of how camps work."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about faction camps and food."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me more about camp missions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "I know the basics.  Just tell me what changed."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Never mind, let's go back to talking about camps."
@@ -140914,74 +144429,120 @@ msgstr "算了，我們走吧。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Food is required for or produced during every mission.  Missions that are "
-"for a fixed amount of time will require you to pay in advance while "
-"repeating missions, like gathering firewood, are paid upon completion.  Not "
-"having the food needed to pay a companion will result in a loss of "
-"reputation across the faction.  Which can lead to VERY bad things if it gets"
-" too low."
+"Each faction camp starts with a bulletin board.  You can 'e'xamine the bulletin board to get a list of available missions with descriptions, and to assign an NPC to work on a mission.  The bulletin board is the primary way to access the camp.\n"
+"  If both you and a companion have two-way radios, you can assign missions to the companion remotely by talking on the radio.\n"
+"  When you ask a companion to start a camp, they'll build a bulletin board at the current location, and that will establish a faction camp at that overmap tile.  A faction camp has a central tile where the bulletin board is, and possibly one or more expansions that are in adjacent tiles.\n"
+"  All of your faction camps can be stocked with food, and your companions will eat from that food when performing camp missions, or even when they're just hungry and near the camp.\n"
+"  Currently, faction camps can be created in fields, in fire stations, and in some evac shelters."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, we can talk with radios?"
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Faction camps require food, but simplify managing your companions.\n"
+"  When you activate a camp's bulletin board, you'll be required to make some zones if you haven't already.  One of those zones must be a camp food zone.  If you drop food in the camp food zone and select the 'Distribute Food' mission, then the food will disappear and be converted into stored kcalories.\n"
+"  When you send companions out on camp missions, they'll eat from the stored food when they return at the rate of 2,500 kcalories per day.  Some missions have variable length, and companions will become upset if there isn't enough food when they come back, so try to keep a healthy surplus of food on hand.\n"
+"  Companions who aren't on camp missions, but who are following you, will also eat from the camp food stores whenever they're hungry and within 2 overmap tiles of the camp.  This drastically simplifies keeping your followers fed, so it's worthwhile to build a minimal faction camp just for this feature.\n"
+"  You can upgrade a camp to include a water well.  If you do, your followers will also drink from the well when they're thirsty."
 msgstr ""
-"每次任務都需要或生產食物。需要一段固定時間的任務將要求你提前支付食物，而重複性的任務，例如收集木柴，將在完成任務後支付。沒有支付同伴所需的食物將導致整個陣營的聲譽受損。如果陣營聲譽太低，會導致非常糟糕的事情發生。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Wait, repeat what you said."
-msgstr "等等，你剛剛說什麼？"
+msgid ""
+"When you assign an NPC to a faction camp mission, they'll disappear while they go do whatever you want them to do.  When the duration of the mission has elapsed, you'll see a new mission on the bulletin board to have them return and complete the mission by upgrading your camp, returning their hunting kills, dropping off whatever they were crafting, or whatever else the mission results are.\n"
+"  There are all kinds of faction camp missions: building up the camp, recruiting new allies, hunting and trapping game, scrounging for materials, farming, disassembling cars, and more.  Not all activities can be done at every camp - you may need to build some additional buildings, or expand the camp, to get access to some missions.\n"
+"  Some faction camp missions can be duplicated by companion activities, but building up the camp can only be done via faction camp missions.\n"
+"  You assign missions by interacting with the bulletin board.  You'll see a list of available missions for your central camp tile.  If your camp has expansions, you can tab through the expansions to see the available missions at each expansion.\n"
+"  Remember, companions on camp missions need to be fed, and will become angry if they complete a mission but there isn't any food in the larder.\n"
+"  There is one special mission called 'Emergency Recall'.  You can use this to retrieve any companion on a faction camp mission, but this cancels the mission and wastes any resources used on it.  Only use it to recover allies when something has gone really wrong with your camp and you can't get them to come back any ohter way."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "What do you mean by angry?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"Each faction camp has a bulletin board associated with it.  You can 'e'xamine the bulletin board to get a list of tasks that can be done and that are  currently complete at the camp.  You can select a task and choose an allied NPC to perform the task. \n"
-"The task list shows tasks for the central camp.  If you have expansions, you can hit 'TAB' to move between the central camp and each expansion and see the tasks for the expansions. \n"
-"If you have a two way radio, you can use it to assign tasks remotely to any friendly NPC who also has a two way radio."
+"Currently, there are three types of camps that you can start building: modular field camps, fire station camps, and evac shelter camps.  There used to be a fourth called the primitive field camp, but you can't start those anymore, only upgrade them.\n"
+"  Modular field camps are the most flexible kind of camp since you can build them almost anywhere and can locate them to have plenty of space for expansions, but you start with nothing in a field and have to build every building, so they can require a lot of resources.  Fire station and evac shelter camps are faster to build since you start in an existing building, but you have to establish them in an existing building and there may not be any space for expansions.\n"
+"  Each camp location will have a variety of upgrade missions for it.  The various missions have descriptions.  In general, though, you'll need to establish housing if you want to expand, and some missions such as hunting or recruiting will require that you have some kind of kitchen or office that you can use to help schedule activities."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about modular field camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about fire station camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about evac shelter camps."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Tell me about expansions."
 msgstr ""
-"每個陣營營寨都有一個關聯的告示牌。你可以按 e（檢查）告示牌，顯示可以進行的任務列表，以及該營寨目前已經完成的項目。你可以選擇任務並選擇同伴 NPC 來執行。\n"
-"任務列表顯示的是營寨中央區塊的項目。如果你有擴建營寨的話，你可以按 TAB 鍵切換營寨的各個區塊，看看各擴建營區所能進行的任務項目。\n"
-"如果你有雙向無線電，你可以使用它將任務遠程分配給任何也有雙向無線電的同伴 NPC。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"For your first camp, pick a site that has fields in the 8 adjacent tiles and lots of forests around it.  Forests are your primary source of construction materials in the early game while fields can be used for farming.  You don't have to be too picky, you can build as many camps as you want.  You need a friendly NPC to perform tasks at the camp. \n"
-"Although you can build a camp from scratch in a field, you can also take over some other buildings.  If you talk to a friendly NPC about faction camps and the NPC is standing in a building that can be used as a basecamp, you'll get the option to build a camp in that building."
+"Modular field camps are the most flexible kind of camp, but they require a lot of time and resources to build.  You start with an empty field - and it has to be a real empty field, not a field on a ranch or farm - and build up from nothing.  You can build from wattle-and-dab if you're feeling primitive, wood panels if you have a lot of nails, metal plate if you're a welder, or tents if you're in a hurry.\n"
+"  You start by building a lean-to and a bed in the northeast corner of the central camp, and then add a fire place, and expand out until you have a small shelter for two people.  When that is complete, you can expand the camp in a variety of ways:\n"
+"  1.  You can build up to 5 more rooms or shacks, 3 on each side of the camp.\n"
+"  2.  You can build a central building in the south half of the camp, between the rooms.  The central building will act as a command center, allowing your camp to perform hunting, recruiting, and combat patrol missions.\n"
+"  3.  You can dig trenches on all sides of the camp, which can possibly connect to the rooms on the sides to minimize the amount of trenching you need to do.\n"
+"  4.  You can build various small features such as root cellars to preserve food or a radio tower to make it easier to recruit more companions.\n"
+"  Each new construction in a modular camp can be made from a different material, so you aren't constrained by what you start with.  Tents are fast to put up, but fragile and likely to get destroyed by zombies.  The central building has to be made from wattle-and-daub, wood, or metal, and requires more materials if the side rooms are made from tents."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Tell me about expansions."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Can we review how camps work?"
 msgstr ""
-"建立你的第一個營寨，必須選擇在相鄰的八格區塊中有平原，並且周圍有很多森林的地點。在早期的遊戲中，森林是建築材料的主要來源，而平原可以開發農業。你不必太過挑剔地點，因為你可以建立無數個營寨。你需要一個友善的 NPC 在營寨執行任務。\n"
-"儘管你可以在野外從頭開始建造營寨，但是你也可以接管其他建築物。如果你與友好的 NPC 討論陣營營寨時，NPC 站在一棟可用作營寨的建築物中，你就能選擇在該建築物中建立營寨。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"After you pick a site you will need to find or make materials to upgrade the"
-" camp further to access new missions.  The first new missions are focused on"
-" gathering materials to upgrade the camp so you don't have to.  After two or"
-" three upgrades you will have access to the <color_yellow>[Menial "
-"Labor]</color> mission which will allow you to task companions with sorting "
-"all of the items around your camp into categories.  Later upgrades allow you"
-" to send companions to recruit new members, build overmap fortifications, or"
-" even conduct combat patrols"
+"Fire stations make good basecamps.  You start with a brick building with secure metal doors, so you're not going to see your efforts destroyed by zombies.  On the downside, there may not be many fields around, so you may not be able to expand much.\n"
+"  Fire station camps are also very compact.  There isn't much living space, but you can build a small pottery or blacksmithy, a chop shop in one of the garage bays, and even tear up some of the pavement to create a garden.  The existing kitchen makes it easy to cook from the start, though you may need to spruce it up a bit."
 msgstr ""
-"選好地點後，你需要搜尋或製作材料來升級營寨，這樣才能解鎖新的任務項目。起頭的幾個任務最好著重在收集材料，這樣你就不用自己去收集材料來升級營寨。經過兩到三次升級後，你將可以分派"
-" [雜務] 任務，允許你指派同伴將你營寨周圍的物品進行分類堆放。之後的升級將允許你派遣同伴招募新成員，建立大地圖上的要塞，甚至進行戰鬥巡邏"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"When you upgrade your first tent all the way you will unlock the ability to "
-"construct expansions.  Expansions allow you to specialize each camp you "
-"build by focusing on the industries that you need.  A "
-"<color_light_green>[Farm]</color> is recommended for players that want to "
-"pursue a large faction while a <color_light_green>[Kitchen]</color> is "
-"better for players that just want the quality of life improvement of having "
-"an NPC do all of their cooking.  A <color_light_green>[Garage]</color> is "
-"useful for chop shop type missions that let you trade vehicles for large "
-"amounts of parts and resources.  All those resources can be turning into "
-"valuable equipment in the <color_light_green>[Blacksmith Shop]</color>. You "
-"can build an additional expansion every other level after the first is "
-"unlocked and when one camp is full you can just as easily build another."
+"You can build a faction camp in the common evac shelter - the basic design with a single, wide open room.  Evac shelters are everywhere and often have fields surrounding them, so they're a little more flexible than a modular field camp but still make it easy to add expansions.\n"
+"  Evac center camps can be built up in several ways.  You basically need to decide between building more bedrooms or adding for crafting and cooking space."
 msgstr ""
-"當你升級第一個帳篷後，將解鎖擴建的功能。擴建營寨區塊後，你可以針對每個營區進行所需的特定產業建設。對於想要擁有一個大陣營的玩家，建議優先建設 [農場] "
-"，而對於那些只想要讓 NPC 去做所有的烹飪工作來改善生活品質的玩家， [廚房] 是更好的選擇。[修車廠] "
-"的拆解車輛任務可以讓你把車輛拆解成大量的零件和資源。這些資源全都可以在 [鐵匠鋪] "
-"中製作成更有價值的設備。在第一個擴建解鎖後，每增建一次中央營區，你就可以再擴建新的營區，當一個營寨全部建設完畢後，你可以輕易地再去建立另一個營寨。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks, let's go back to talking about camps."
-msgstr "謝謝，我們回頭來說營寨的事吧。"
+msgid ""
+"Each camp can have up to 8 expansions, one in each adjacent overmap tile.  Expansions add to the capabilities of your camp, such as adding a farm field or a manufactory for crafting all kinds of things.\n"
+"  You need two beds in a room in your central camp for each expansion, and currently, expansions can only be built in fields and have to be built up from scratch.\n"
+"  Expansion missions show up in separate tabs in the bulletin board, one set of missions per location, and you'll need to hit 'tab' to see them.  The currently available expansions are:\n"
+"  -- Farm: This is a full tile of plowed fields that you can maintain or send companions on missions to maintain.  Plants grow here normally.\n"
+"  -- Garage: This is a large building.  Companions can be sent on missions here to disassemble vehicles.  Of course, you can also assign companions to disassemble vehicles without a garage, so this expansion is not very useful.\n"
+"  -- Canteen: This is an expanded kitchen, dining area, and pantry.\n"
+"  --Livestock Area: This is a modular set of buildings for holding livestock such as cows, horses, or chickens.  Animals are not included!\n"
+"  Saltworks Area: This is a small expansion for processing salt.\n"
+"  Fabrication Workshop: This is a large expansion for doing all kinds of crafts.  Companions can use some of the furniture in this expansion to craft some items much faster than you can do by yourself by hand.\n"
+"  Central Storage Building: This is a large building for storing goods."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Got it.  Give me some advice on building a camp."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid ""
+"Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n"
+"  How much you want to expand your camps is up to you.  A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off.  If nothing else, you should consider upgrading the northeast tent to the point where you can build a water well, or if you started with a fire station or evac shelter camp, you should build a water well as soon as you can.\n"
+"  If you have access to a fire station or evac shelter, you may want to build your camp in them.  Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n"
+"  If you are adding expansions to your camp, consider starting with a farm or fabrication workshop.  The farm makes it easy to grow your own food, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n"
+"  The canteen, saltworks, livestock area, and storage area probably shouldn't be your first expansions, but they all have their uses."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -141001,6 +144562,14 @@ msgstr ""
 "5. 靠近營寨的友好 NPC 會從營寨的儲量裡取食，如果營寨有水井，他們會用它來解渴。\n"
 "6. 現在你可以在選定的建築物中建立陣營營寨。可用建築物的列表在不斷增加中，因此你必須進行測試。"
 
+#: lang/json/talk_topic_from_json.py
+msgid "Wait, let's go back over from the start."
+msgstr ""
+
+#: lang/json/talk_topic_from_json.py
+msgid "Thanks, let's go back to talking about camps."
+msgstr "謝謝，我們回頭來說營寨的事吧。"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Hey boss.  I was thinking, you don't really need me sitting in this tent and"
@@ -141101,11 +144670,11 @@ msgid "Well, sure."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd... rather not."
+msgid "I'd… rather not."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm sorry... I have places to be."
+msgid "I'm sorry…  I have places to be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141136,7 +144705,7 @@ msgid "Oh, but you already have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes... yes I have."
+msgid "Yes… yes I have."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141201,7 +144770,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Horrible. Did you get any pictures yourself?"
+msgid "Horrible.  Did you get any pictures yourself?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141353,8 +144922,8 @@ msgid "This is a npc allies 1 test response."
 msgstr "這是NPC同伴1測試回應。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "This an error! npc allies 2 test response."
-msgstr "這是錯誤！NPC同伴2測試回應。"
+msgid "This an error!  npc allies 2 test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a npc engagement rule test response."
@@ -141553,8 +145122,8 @@ msgid "This is a u_has_items beer test response."
 msgstr "這是u_has_items啤酒測試回應。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Test failure! This is a u_has_items test response."
-msgstr "測試失敗！這是u_has_items測試回應。"
+msgid "Test failure!  This is a u_has_items test response."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "This is a u_has_item_category books test response."
@@ -141565,7 +145134,7 @@ msgid "This is a u_has_item_category books count 2 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a u_has_item_category books count 3 test response."
+msgid "Failure!  This is a u_has_item_category books count 3 test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141653,7 +145222,7 @@ msgid "This is a u_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Failure! This is a npc_has_bionics bio_ads test response."
+msgid "Failure!  This is a npc_has_bionics bio_ads test response."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -141709,12 +145278,8 @@ msgid "Greeting citizen, what brings you to the FoodLair?"
 msgstr "公民你好，是什麼風把你吹來美食巢穴呢？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hey.  Let's chat for a second."
-msgstr "嘿。讓我們聊一會兒。"
-
-#: lang/json/talk_topic_from_json.py
-msgid "Greetings...  Foodperson?"
-msgstr "歡迎...美食人？"
+msgid "Greetings…  Foodperson?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I am you but from an alternate reality."
@@ -141755,8 +145320,8 @@ msgid ""
 msgstr "偉大的美食人活生生站在我面前！終於親身見到你真是太榮幸了！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ah...  Well, nice to meet you Foodperson."
-msgstr "嗯...很高興認識你，美食人。"
+msgid "Ah…  Well, nice to meet you Foodperson."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Do not mock me, for my strength is quite real!  Get out of here now!"
@@ -141783,8 +145348,8 @@ msgid "Sure, whatever."
 msgstr "當然可以。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok...  I believe you."
-msgstr "好...我相信你。"
+msgid "Ok…  I believe you."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Anyway, do you need something?"
@@ -141879,16 +145444,16 @@ msgid "That sounds great!"
 msgstr "聽起來很不錯！"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok..."
-msgstr "好吧..."
+msgid "Ok…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I need to think about it."
 msgstr "我需要想一想。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Huh... No thanks."
-msgstr "嗯...不用了，謝謝。"
+msgid "Huh…  No thanks."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "There's other things I'd like to discuss."
@@ -141904,7 +145469,7 @@ msgstr "你說話的方式，行動的方式...你是...你是我嗎？但怎麼
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I...  I don't know.  It probably has something to do with <the_cataclysm>!  "
+"I…  I don't know.  It probably has something to do with <the_cataclysm>!  "
 "What do you say we team up to find out?"
 msgstr ""
 
@@ -142047,7 +145612,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Okay, please continue."
-msgstr ""
+msgstr "好的，請繼續。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "On second thought, let's talk about something else."
@@ -142658,7 +146223,7 @@ msgid "Giant bees?  Tell me more."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive..."
+msgid "But bees aren't usually aggressive…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -142670,7 +146235,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "But bees aren't usually aggressive...  Do you mean wasps?"
+msgid "But bees aren't usually aggressive…  Do you mean wasps?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143090,7 +146655,7 @@ msgid "No.  I can't.  Just, no."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry... I'll let you be."
+msgid "Sorry…  I'll let you be."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143326,7 +146891,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Okay..."
+msgid "Okay…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143340,7 +146905,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Was there anything else of use in that email?"
-msgstr ""
+msgstr "那個電郵還有什麼用嗎？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -143692,10 +147257,10 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "What do you think happened?"
-msgstr ""
+msgstr "你覺得發生了什麼事？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "That does sound a little crazy..."
+msgid "That does sound a little crazy…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143744,7 +147309,7 @@ msgid "What happened to you after that?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "It can't be healthy to abandon your past like that..."
+msgid "It can't be healthy to abandon your past like that…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -143842,7 +147407,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "What happened to your friend?"
-msgstr ""
+msgstr "你的朋友發生了什麼事？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -143854,7 +147419,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I guess they didn't know."
-msgstr ""
+msgstr "我估計他們不知道。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -143866,7 +147431,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "She was dead?"
-msgstr ""
+msgstr "她死了嗎？"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -143878,11 +147443,11 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "That's awful.  <done_conversation_section>"
-msgstr ""
+msgstr "這太糟了。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "That's awful.  <end_talking>"
-msgstr ""
+msgstr "這太糟了。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -144188,7 +147753,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Do you mean in a religious sense, or...?"
+msgid "Do you mean in a religious sense, or…?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -144508,8 +148073,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"If I got you the right stuff, do you think you'd be able to like...  do "
-"science to it?"
+"If I got you the right stuff, do you think you'd be able to like… do science"
+" to it?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -144620,8 +148185,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Oh, I'm sorry..."
-msgstr "喔，我很抱歉..."
+msgid "Oh, I'm sorry…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -144684,7 +148249,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'd better get going."
-msgstr ""
+msgstr "我得走了。"
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -144948,8 +148513,8 @@ msgid "He did mention you make remedies, are they effective?"
 msgstr "他確實提到你會製作草藥，它們有效嗎？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'd like to ask you something else..."
-msgstr "我想問你其他事..."
+msgid "I'd like to ask you something else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -145245,7 +148810,8 @@ msgid "I'd like to speak with Carlos too about some work."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Is Chris around? I'd like to know what he's run into out in the woods."
+msgid ""
+"Is Chris around?  I'd like to know what he's run into out in the woods."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -145429,16 +148995,16 @@ msgid "What do you need done?"
 msgstr "你需要什麼呢?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About the mission..."
-msgstr "關於任務…"
+msgid "About the mission…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About one of those missions..."
-msgstr "關於那些其中之一的任務…"
+msgid "About one of those missions…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I've got to go..."
-msgstr "我得走了…"
+msgid "I've got to go…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -145453,8 +149019,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Seems like a decent plan..."
-msgstr "似乎是個不俗的計畫…"
+msgid "Seems like a decent plan…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -145471,8 +149037,8 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Whatever they did it must have worked since we are still alive..."
-msgstr "無論他們做了什麼, 都一定成功了。因為我們現在還活著…"
+msgid "Whatever they did it must have worked since we are still alive…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Marshal, I'm rather surprised to see you here."
@@ -145506,8 +149072,8 @@ msgid ""
 msgstr "我們是這個設施的保全人員。不過事實上我寧願… 唉, 你有什麼事情要問的話, 去找我的指揮官吧。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll try and find your commander then..."
-msgstr "我會嘗試找到你的指揮官, 然後…"
+msgid "I'll try and find your commander then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -145565,8 +149131,8 @@ msgid "Hey miss, don't you think it would be safer if you stuck with me?"
 msgstr "嘿小姐, 難道你不覺得和我一起會更安全麼?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Don't mind me..."
-msgstr "別在意我…"
+msgid "Don't mind me…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -145832,8 +149398,8 @@ msgid "Have I told you about cardboard, friend?  Do you have any?"
 msgstr "朋友，我告訴過你關於硬紙板的事嗎？你有硬紙板嗎？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that shopping list of yours..."
-msgstr "關於你的那個購物清單..."
+msgid "About that shopping list of yours…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Is there anything else I can do for you?"
@@ -145898,8 +149464,8 @@ msgid "Would you like me to give you some cardboard?"
 msgstr "你要我給你一些硬紙板嗎？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I think I have to get going..."
-msgstr "我想我得走了..."
+msgid "I think I have to get going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -145927,8 +149493,8 @@ msgid ""
 msgstr "如果你不知道他是誰，我絕對不能告訴你。他和每個人說話，如果你沒有聽到他意味著你不能被信任，除非你幫助我。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "... What were you saying before?"
-msgstr "... 你剛才說的是什麼？"
+msgid "…What were you saying before?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -145945,8 +149511,8 @@ msgid "No."
 msgstr "否。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I... I can see you wearing it.  Why are you wearing that?"
-msgstr "我...我可以看到你穿著它。你為什麼穿著它？"
+msgid "I… I can see you wearing it.  Why are you wearing that?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "What was that about cardboard?"
@@ -146037,8 +149603,8 @@ msgid "I found a sample of alien fungus for you."
 msgstr "我為你找到了外星真菌的樣本。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Ok... see ya."
-msgstr "好...再見。"
+msgid "Ok… see ya."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -146135,8 +149701,8 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"I mean, racism could definitely be a part of it... but you are visibly in "
-"poor shape.  They need strong survivor material."
+"I mean, racism could definitely be a part of it… but you are visibly in poor"
+" shape.  They need strong survivor material."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146168,7 +149734,7 @@ msgid "You sound more optimistic than usual."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "So, about that doctorate of yours..."
+msgid "So, about that doctorate of yours…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146288,7 +149854,7 @@ msgstr ""
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Encroaching alien mushrooms, fungal towers, tough mycelium invading ground "
-"and trees, zombies taken over by aggressive mold... Yeah.  It's ugly stuff."
+"and trees, zombies taken over by aggressive mold…  Yeah.  It's ugly stuff."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146365,7 +149931,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey, are you a big fan of survival of the fittest?"
-msgstr ""
+msgstr "你是適者生存的粉絲嗎？"
 
 #: lang/json/talk_topic_from_json.py
 msgid "Why do you ask?"
@@ -146396,7 +149962,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I could maybe help you out... want something to eat?"
+msgid "I could maybe help you out… want something to eat?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -146558,7 +150124,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey there, friend."
-msgstr ""
+msgstr "你好，朋友。"
 
 #: lang/json/talk_topic_from_json.py
 msgid "I couldn't help but notice, you're covered in fur."
@@ -146795,7 +150361,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You seem a little forward..."
+msgid "You seem a little forward…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -147051,7 +150617,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "About that sourdough starter you had me looking for..."
+msgid "About that sourdough starter you had me looking for…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -147345,7 +150911,7 @@ msgid "I think I would've done the same.  Nobody around here has a guitar?"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "Yes, yes I would... you monster."
+msgid "Yes, yes I would… you monster."
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -147541,6 +151107,10 @@ msgid ""
 "idea of trying it."
 msgstr ""
 
+#: lang/json/talk_topic_from_json.py
+msgid "Go on."
+msgstr "繼續。"
+
 #: lang/json/talk_topic_from_json.py
 msgid ""
 "Say, I don't mean to get you in any trouble or nothing, if any folks still "
@@ -147795,7 +151365,7 @@ msgid ""
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "You lost someone..."
+msgid "You lost someone…"
 msgstr ""
 
 #: lang/json/talk_topic_from_json.py
@@ -148222,7 +151792,7 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"You... you do know what's going on here, right?  With the evacuation and "
+"You… you do know what's going on here, right?  With the evacuation and "
 "stuff?"
 msgstr ""
 
@@ -148917,8 +152487,8 @@ msgid "Are you looking to buy anything else?"
 msgstr "你有要買其他東西嗎?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Very well... let's talk about something else."
-msgstr "很好...讓我們談談其他事情。"
+msgid "Very well… let's talk about something else."
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'm sorry, but I'm not here to make friends, I've got a job to do."
@@ -149240,8 +152810,8 @@ msgid "Have you seen anyone who might be hiding something?"
 msgstr "你有看過有人正在隱瞞一些事情嗎?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Bye..."
-msgstr "掰…"
+msgid "Bye…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149254,16 +152824,16 @@ msgid "Keep your head down and stay out of my way."
 msgstr "低調點, 別擋路。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "OK..."
-msgstr "OK…"
+msgid "OK…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like what?"
 msgstr "類似甚麼?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm not sure..."
-msgstr "我不確定…"
+msgid "I'm not sure…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Like they could be working for someone else?"
@@ -149282,8 +152852,8 @@ msgid "Got something to hide?"
 msgstr "在藏什麼嗎?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sorry, I didn't mean to offend you..."
-msgstr "抱歉, 我不是有意冒犯你的…"
+msgid "Sorry, I didn't mean to offend you…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149334,8 +152904,8 @@ msgid "Ma'am, you really shouldn't be traveling out there."
 msgstr "夫人, 你真的不應該旅行到那裏。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I heard this place was a refugee center..."
-msgstr "我聽說這裡是一個難民中心..."
+msgid "I heard this place was a refugee center…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Heard anything about the outside world?"
@@ -149358,8 +152928,8 @@ msgid "Can I do anything for the center?"
 msgstr "我能為中心做些什麼事嗎?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I figured you might be looking for some help..."
-msgstr "我想你可能正在尋找一些幫助…"
+msgid "I figured you might be looking for some help…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Well, I'd better be going.  Bye."
@@ -149413,9 +152983,9 @@ msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
-"[INT 10] Wait, six buses and refugees... how many people do you still have "
+"[INT 10] Wait, six buses and refugees… how many people do you still have "
 "crammed in here?"
-msgstr "[智力 10] 等等，六輛公車跟難民... 你們還剩多少人擠在這裡？"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149467,8 +153037,8 @@ msgid "I'm sorry, not a risk we are willing to take right now."
 msgstr "我很抱歉, 我現在不想要冒這個險。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine..."
-msgstr "很好…"
+msgid "Fine…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149480,8 +153050,8 @@ msgstr ""
 "在地獄裡根本沒有機會! 曾經有一個全身毛皮的人來我們這裡… 好吧, 我想這還不算很奇怪, 但是我相當確信讓他突變的毒廢料不只是只有讓他長出毛皮這麼簡單。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Fine... *coughupyourscough*"
-msgstr "沒事… *咳了個半死*"
+msgid "Fine… *coughupyourscough*"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149509,8 +153079,8 @@ msgid "[STR 11] I punch things in face real good!"
 msgstr "[力量 11] 我揍人比誰都要厲害!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I'll look somewhere else..."
-msgstr "我想我該去別的地方找了…"
+msgid "I guess I'll look somewhere else…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149532,8 +153102,8 @@ msgid "Heard of anything better than the odd gun cache?"
 msgstr "有聽過比稀有槍枝上膛聲音更棒的嗎?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Was hoping for something more..."
-msgstr "要是有更多東西就好了…"
+msgid "Was hoping for something more…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149635,8 +153205,8 @@ msgid "So what are you doing right now?"
 msgstr "所以你現在在做什麼？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Never mind..."
-msgstr "沒事了…"
+msgid "Never mind…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149660,8 +153230,8 @@ msgid ""
 msgstr "觀察這些異常的活死人或是突變種。我們愈瞭解發生的原因，離製作出解藥就更進一步。這是個長期目標，但要生存下去並不是沒有希望。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Good luck with that..."
-msgstr "祝你好運..."
+msgid "Good luck with that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149704,8 +153274,8 @@ msgid ""
 msgstr "看來你跟我一樣。嗯，某種程度上一樣。我不認為這邊還有空位。樓下熙熙攘攘的擠滿了人。看到入口處那個商人了嗎？那就是該問的人。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Sucks..."
-msgstr "爛透了…"
+msgid "Sucks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149720,8 +153290,8 @@ msgstr ""
 "像個不會爆炸的大砲。簡直超有效率。而有這類拼裝武器的人還不乏少數。但是最重要的事情似乎還是建造防禦工事。只有極少數的怪物才打得破柵欄或是牆壁之類的建築。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Well, then..."
-msgstr "好吧, 那麼…"
+msgid "Well, then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149809,8 +153379,8 @@ msgid "Huh, thought I smelled someone new.  Can I help you?"
 msgstr "嗯, 看來我聞到菜鳥味了。我能幫你什麼?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "You... smelled me?"
-msgstr "你… 聞到了我?"
+msgid "You… smelled me?"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Got anything for sale?"
@@ -149860,8 +153430,8 @@ msgid ""
 msgstr "對。無論我在什麼情形, 我包裝並販賣肉品或其他部位。偶爾會有魚跟幾籃野果, 但沒有什麼能比上新鮮的碳烤駝鹿肉排!"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Great, now my mouth is watering..."
-msgstr "很好, 現在我正在流口水…"
+msgid "Great, now my mouth is watering…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -149967,8 +153537,8 @@ msgstr ""
 "給他們。由於這裡大部分生存者都沒有他們想要的, 他們受歡迎的程度數一數二。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hmmm..."
-msgstr "嗯…"
+msgid "Hmmm…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -150016,8 +153586,8 @@ msgid ""
 msgstr "你必須透過招募人才能夠真正加入。我們通常歡迎各種幫助, 不時可以來詢問我是否有工作。以承包者的身分來完成任務是累積名聲的好方法。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I haven't done anything wrong..."
-msgstr "我從來沒犯錯過…"
+msgid "I haven't done anything wrong…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Any tips for surviving?"
@@ -150181,8 +153751,8 @@ msgid "Something to say?"
 msgstr "有話要說嗎？"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I charge hourly, so be quick..."
-msgstr "我以時計費，所以要快..."
+msgid "I charge hourly, so be quick…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Hey."
@@ -150297,8 +153867,8 @@ msgid ""
 msgstr "你是否注意到他們用微小的小金幣向我們付款，這很奇怪。有人會以為他們那裡有一個金礦，但沒有，他們沒有，所以他們讓我穿過該死的世界，搶著金條。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I guess I could help with that..."
-msgstr "我想我可以幫忙..."
+msgid "I guess I could help with that…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Now that you mention it, it does seem rather strange."
@@ -150408,8 +153978,8 @@ msgid "[$10] I'll get a haircut"
 msgstr "[$10] 我要剪個頭髮"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Maybe another time..."
-msgstr "或許下次吧…"
+msgid "Maybe another time…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -150426,8 +153996,8 @@ msgid "Stand still while I get my clippers..."
 msgstr "站著別動, 讓我把剪刀拿過來…"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Thanks..."
-msgstr "謝謝…"
+msgid "Thanks…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Want a drink?"
@@ -150446,8 +154016,8 @@ msgid "What do you have on tap?"
 msgstr "你這裡有什麼現成的酒?"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll be going..."
-msgstr "我正要去…"
+msgid "I'll be going…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -150498,8 +154068,8 @@ msgid ""
 msgstr "我的同伴正在忙著建設這裡, 你可以問問他們有沒有需要幫忙的地方。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk to him then..."
-msgstr "我會和他交談, 然後…"
+msgid "I'll talk to him then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -150516,8 +154086,8 @@ msgid "I hope you are here to do business."
 msgstr "我希望你在這裡只是要做生意的。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'm interested in investing in agriculture..."
-msgstr "我感興趣的是投資農業…"
+msgid "I'm interested in investing in agriculture…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -150543,12 +154113,12 @@ msgid "I imagine we might be able to work something out."
 msgstr "我想我們可以搞定這個。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I was wondering if you could install a cybernetic implant..."
-msgstr "你能否安裝生化插件…"
+msgid "I was wondering if you could install a cybernetic implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
-msgid "I need help removing an implant..."
-msgstr "幫助我移除植入的插件…"
+msgid "I need help removing an implant…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "I'd like to hire your services."
@@ -150587,8 +154157,8 @@ msgid ""
 msgstr "我只是一個曾被不死生物追趕著這個小農夫的條寶貴生命的幸運兒。我們這裡有食宿, 但在成功收成之前我們的工作都沒有任何貢獻。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "It could be worse..."
-msgstr "這可能會更糟…"
+msgid "It could be worse…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -150597,8 +154167,8 @@ msgid ""
 msgstr "我沒時間跟你聊天。如果你想交易或是找點事幹, 去和工頭或者作物看守聊聊。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "I'll talk with them then..."
-msgstr "我會和他們交談, 然後…"
+msgid "I'll talk with them then…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid "Can I help you, marshal?"
@@ -150665,8 +154235,8 @@ msgstr ""
 "使得從零開始建造會比較實際。我原來呆的難民中心就一直在面臨著飢荒和喪屍攻擊的問題。"
 
 #: lang/json/talk_topic_from_json.py
-msgid "Hopefully moving out here was worth it..."
-msgstr "希望離開這裡是值得的…"
+msgid "Hopefully moving out here was worth it…"
+msgstr ""
 
 #: lang/json/talk_topic_from_json.py
 msgid ""
@@ -151178,13 +154748,13 @@ msgstr "毒蛇咬"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Snakebite %s"
-msgstr "你毒蛇咬 %s"
+msgid "You lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Snakebites %s"
-msgstr "<npcname> 毒蛇咬 %s"
+msgid "<npcname> lash out at %s with a Viper Bite"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Strike"
@@ -151192,18 +154762,28 @@ msgstr "毒蛇猛擊"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You Viper Strike %s"
+msgid "You hit %s with a spectacular Viper Strike"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> Viper Strikes %s"
+msgid "<npcname> hits %s with a spectacular Viper Strike"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 msgid "Viper Writhe"
 msgstr "毒蛇翻騰"
 
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab you, but you writhe free!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "The %s tries to grab <npcname>, but they writhe free!"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Roundhouse Kick"
 msgstr ""
@@ -151246,6 +154826,34 @@ msgstr ""
 msgid "<npcname> jabs %s with a Pincer Fist"
 msgstr ""
 
+#: lang/json/technique_from_json.py
+msgid "Toad Smack"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You disregard %s's attack and knock them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> disregards %s's attack and knocks them down"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "Toad Slam"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "You meet %s's attack head on with a stunning counter"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> meet %s's attack head on with a stunning counter"
+msgstr ""
+
 #: lang/json/technique_from_json.py
 msgid "Toad's Tongue"
 msgstr "蟾蜍舌"
@@ -152985,153 +156593,178 @@ msgid "<npcname> double-handed palm strikes %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk feint"
-msgstr "醉跌"
+msgid "Tiger Palm"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble and leer at %s"
-msgstr "你對著 %s 跌跌撞撞"
+msgid "You land a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles and leers at %s"
-msgstr "<npcname> 對著 %s 跌跌撞撞"
+msgid "<npcname> lands a heavy tiger palm on %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Drunk counter"
-msgstr "醉拳反擊"
+msgid "Tiger Takedown"
+msgstr "虎式擒拿"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You lurch, and your wild swing hits %s"
-msgstr "你步履蹣跚並狂野的攻擊 %s"
+msgid "You slam %s to the ground"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> lurches, and hits %s"
-msgstr "<npcname> 步履蹣跚並攻擊 %s"
+msgid "<npcname> slams %s to the ground"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Tiger Takedown"
-msgstr "虎式擒拿"
+msgid "Straight Punch"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You grab and ground %s"
+msgid "You deliver a vertical straight punch to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> grabs and grounds %s"
+msgid "<npcname> delivers a vertical straight punch to %s"
 msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "slow strike"
-msgstr "滴水穿石的力量"
+msgid "Straight Punch (Knockback)"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You slowly strike %s"
-msgstr "你用滴水穿石的力量攻擊 %s"
+msgid "You force %s back with a vertical straight punch"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> slowly strikes %s"
-msgstr "<npcname> 用滴水穿石的力量攻擊 %s"
+msgid "<npcname> forces %s back with a vertical straight punch"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "phasing strike"
-msgstr "相位打擊"
+msgid "L-hook"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You phase-strike %s"
-msgstr "你對 %s 發動 相位打擊"
+msgid "You deliver a solid L-hook to %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> phase-strikes %s"
-msgstr "<npcname>對 %s 發動 相位打擊"
+msgid "<npcname> delivers a solid L-hook to %s"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "Chain Punch"
-msgstr "連環拳"
+msgid "L-hook (Knockback)"
+msgstr ""
 
-#. ~ Description for Chain Punch
 #: lang/json/technique_from_json.py
-msgid "50% moves, 66% damage, knockback and follow"
-msgstr "行動值消耗 50%，造成傷害 66%，擊退並跟隨"
+#, python-format
+msgid "You knock %s back with a solid L-hook"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You chain strike %s"
-msgstr "你連環攻擊 %s"
+msgid "<npcname> knocks %s back with a solid L-hook"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> chain strikes %s"
-msgstr "<npcname> 連環攻擊 %s"
+msgid "Your attack misses %s but you don't let up"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "You position yourself well and slip out of a grab"
-msgstr "你擺動重心脫離擒拿"
+#, python-format
+msgid "<npcname>'s attack misses %s but they don't let up"
+msgstr ""
 
 #: lang/json/technique_from_json.py
-msgid "<npcname> slips out of a grab"
-msgstr "<npcname> 脫離擒拿"
+msgid "Receive and Counter"
+msgstr "接招並反擊"
 
 #: lang/json/technique_from_json.py
-msgid "ask the way"
-msgstr "問路"
+#, python-format
+msgid "You receive %s's gift of violence, and return it in kind"
+msgstr "你招架了 %s 的暴力攻擊，並以相同力道反擊"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You miss but keep striking at %s"
-msgstr "你失誤了但仍持續打擊 %s"
+msgid "<npcname> receives %s's attack, and counters"
+msgstr "<npcname> 招架 %s 的攻擊，並且反擊"
+
+#: lang/json/technique_from_json.py
+msgid "Drunken Feint"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> misses but keeps striking at %s"
-msgstr "<npcname> 失誤了但仍持續打擊 %s"
+msgid "You stumble and leer at %s"
+msgstr "你對著 %s 跌跌撞撞"
 
 #: lang/json/technique_from_json.py
-msgid "White Crane stumble"
-msgstr "白鶴絆倒"
+#, python-format
+msgid "<npcname> stumbles and leers at %s"
+msgstr "<npcname> 對著 %s 跌跌撞撞"
+
+#: lang/json/technique_from_json.py
+msgid "Drunk Counter"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You stumble %s with your onslaught"
-msgstr "你用猛攻絆倒了 %s"
+msgid "You lurch, and your wild swing hits %s"
+msgstr "你步履蹣跚並狂野的攻擊 %s"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> stumbles %s"
-msgstr "<npcname> 絆倒 %s"
+msgid "<npcname> lurches, and hits %s"
+msgstr "<npcname> 步履蹣跚並攻擊 %s"
 
 #: lang/json/technique_from_json.py
-msgid "Receive and Counter"
-msgstr "接招並反擊"
+#, python-format
+msgid "The %s tries to grab you, but you stumble away!"
+msgstr ""
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You receive %s's gift of violence, and return it in kind"
-msgstr "你招架了 %s 的暴力攻擊，並以相同力道反擊"
+msgid "The %s tries to grab <npcname>, but they stumble away!"
+msgstr ""
+
+#: lang/json/technique_from_json.py
+msgid "slow strike"
+msgstr "滴水穿石的力量"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> receives %s's attack, and counters"
-msgstr "<npcname> 招架 %s 的攻擊，並且反擊"
+msgid "You slowly strike %s"
+msgstr "你用滴水穿石的力量攻擊 %s"
+
+#: lang/json/technique_from_json.py
+#, python-format
+msgid "<npcname> slowly strikes %s"
+msgstr "<npcname> 用滴水穿石的力量攻擊 %s"
+
+#: lang/json/technique_from_json.py
+msgid "phasing strike"
+msgstr "相位打擊"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "You disarm %s"
-msgstr "你繳械了 %s"
+msgid "You phase-strike %s"
+msgstr "你對 %s 發動 相位打擊"
 
 #: lang/json/technique_from_json.py
 #, python-format
-msgid "<npcname> disarms %s"
-msgstr "<npcname> 繳械了 %s"
+msgid "<npcname> phase-strikes %s"
+msgstr "<npcname>對 %s 發動 相位打擊"
 
 #: lang/json/technique_from_json.py
 msgid "Pressure Crunch"
@@ -153765,7 +157398,7 @@ msgstr "深水碼頭樁"
 #. ~ Description for deep dock pile
 #: lang/json/terrain_from_json.py
 msgid ""
-"A sturdy pile made of wood extending all the way to the riverbed. A frame "
+"A sturdy pile made of wood extending all the way to the riverbed.  A frame "
 "will be required to support a surface."
 msgstr ""
 
@@ -153776,8 +157409,8 @@ msgstr "深水碼頭框架"
 #. ~ Description for deep dock frame
 #: lang/json/terrain_from_json.py
 msgid ""
-"A log frame secured atop a wooden pile. Adding a wood surface will make this"
-" into a proper dock section."
+"A log frame secured atop a wooden pile.  Adding a wood surface will make "
+"this into a proper dock section."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -153787,7 +157420,7 @@ msgstr "深水碼頭"
 #. ~ Description for deep dock
 #: lang/json/terrain_from_json.py
 msgid ""
-"A wooden platform held by a tall wooden pile that extend to the riverbed. "
+"A wooden platform held by a tall wooden pile that extend to the riverbed.  "
 "Very sturdy, and likely to outlast you."
 msgstr ""
 
@@ -154846,9 +158479,9 @@ msgstr "木製地板"
 #. ~ Description for wooden floor
 #: lang/json/terrain_from_json.py
 msgid ""
-"Wooden floor created from boards, packed tightly together and nailed down. "
+"Wooden floor created from boards, packed tightly together and nailed down.  "
 "Common in patios."
-msgstr "由木板製成的木地板，緊密排列在一起並釘牢。常見於中庭。"
+msgstr ""
 
 #: lang/json/terrain_from_json.py
 msgid "SMASH!"
@@ -155153,7 +158786,7 @@ msgstr ""
 msgid ""
 "A dual purpose platform that serves as a containment, and as a device that "
 "exposes items places on in to the radioactive source, by temporarily "
-"hoisting the radioactive material stored within. Operated from external "
+"hoisting the radioactive material stored within.  Operated from external "
 "console."
 msgstr ""
 
@@ -155195,7 +158828,7 @@ msgstr "一棵屬於「胡桃」種的大樹。如果你仔細地觀察的話，
 msgid ""
 "A massive tree belonging to the 'Juglans' genus.  You could cut it down with"
 " the right tools."
-msgstr ""
+msgstr "一棵胡桃屬的大樹。有正確的工具，你就能把它砍下來。"
 
 #: lang/json/terrain_from_json.py
 msgid "blackjack oak"
@@ -155228,14 +158861,14 @@ msgid ""
 "A massive tree belonging to the 'Castanea' genus.  If you look closely you "
 "can see some unharvested chestnuts.  You could cut it down with the right "
 "tools."
-msgstr ""
+msgstr "一棵栗屬的大樹。仔細查看的話，可以看到樹上有些未收割的栗子。有正確的工具，你就能把它砍下來。"
 
 #. ~ Description for chestnut tree
 #: lang/json/terrain_from_json.py
 msgid ""
 "A massive tree belonging to the 'Castanea' genus.  You could cut it down "
 "with the right tools."
-msgstr ""
+msgstr "一棵栗屬的大樹。有正確的工具，你就能把它砍下來。"
 
 #: lang/json/terrain_from_json.py
 msgid "beech tree"
@@ -155254,7 +158887,7 @@ msgstr "屬於水青岡屬的巨大樹木。如果你仔細觀察，你可以找
 msgid ""
 "A massive tree belonging to the 'Fagus' genus.  You could cut it down with "
 "the right tools."
-msgstr ""
+msgstr "一棵山毛櫸屬的大樹。有正確的工具，你就能把它砍下來。"
 
 #: lang/json/terrain_from_json.py
 msgid "hazelnut tree"
@@ -155266,14 +158899,14 @@ msgid ""
 "A stubby tree belonging to the 'Corylus' genus.  If you look closely you can"
 " see some unharvested hazelnuts.  You could cut it down with the right "
 "tools."
-msgstr ""
+msgstr "一棵榛屬的矮樹。仔細查看的話，可以看到樹上有些未收割的榛子。有正確的工具，你就能把它砍下來。"
 
 #. ~ Description for hazelnut tree
 #: lang/json/terrain_from_json.py
 msgid ""
 "A stubby tree belonging to the 'Corylus' genus.  You could cut it down with "
 "the right tools."
-msgstr ""
+msgstr "一棵榛屬的矮樹。有正確的工具，你就能把它砍下來。"
 
 #: lang/json/terrain_from_json.py
 msgid "oak tree"
@@ -155432,12 +159065,11 @@ msgstr "杜松子樹"
 #: lang/json/terrain_from_json.py
 msgid ""
 "One of the species of 'Juniperus' that grows in New England, juniper berries"
-" grow over two to three years, first flowering. On the second year producing"
-" a green berry, the last, they produce their more famed blue varieties.  If "
-"you examined the foliage more closely, you could probably find some viable "
-"clusters.  You could also cut it down with the right tools."
+" grow over two to three years, first flowering.  On the second year "
+"producing a green berry, the last, they produce their more famed blue "
+"varieties.  If you examined the foliage more closely, you could probably "
+"find some viable clusters.  You could also cut it down with the right tools."
 msgstr ""
-"在新英格蘭生長的'刺柏屬'物種之一，杜松子在第一次開花兩到三年後長成。在次年結出綠色漿果，之後他們生產更著名的藍色品種。如果你仔細檢查樹葉，你可能會找到一些可用的果實。你也可以使用正確的工具將其砍倒。"
 
 #. ~ Description for juniper tree
 #: lang/json/terrain_from_json.py
@@ -156393,10 +160025,11 @@ msgstr "自動櫃員機"
 #: lang/json/terrain_from_json.py
 msgid ""
 "For your banking convenience, this Automated Teller Machine is fully capable"
-" of operating autonomously in the event of complete network failure. You can"
-" deposit funds from cash cards and migrate all of your inflation-adjusted "
-"earnings to a single card.  These things have seen better days. There's been"
-" a run on the bank, and this machine has the dents and cracks to prove it."
+" of operating autonomously in the event of complete network failure.  You "
+"can deposit funds from cash cards and migrate all of your inflation-adjusted"
+" earnings to a single card.  These things have seen better days.  There's "
+"been a run on the bank, and this machine has the dents and cracks to prove "
+"it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -156500,8 +160133,8 @@ msgstr "離心機"
 #: lang/json/terrain_from_json.py
 msgid ""
 "This is a centrifuge, a liquid separating device with an automated analyzer "
-"unit. It could be used to analyze a medical fluid sample, such as blood, if "
-"a test tube was placed in it."
+"unit.  It could be used to analyze a medical fluid sample, such as blood, if"
+" a test tube was placed in it."
 msgstr ""
 
 #: lang/json/terrain_from_json.py
@@ -157107,10 +160740,10 @@ msgstr "關閉的樹脂門"
 #. ~ Description for closed resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is closed tightly, but it looks like a firm push would cause it to snap "
 "open."
-msgstr "一種由濕潤有彈性的樹脂材質製成的三尖瓣艙口。這個門關得緊緊的，但似乎用力推動它會突然打開。"
+msgstr ""
 
 #: lang/json/terrain_from_json.py
 msgid "open resin portal"
@@ -157119,10 +160752,10 @@ msgstr "開啟的樹脂門"
 #. ~ Description for open resin portal
 #: lang/json/terrain_from_json.py
 msgid ""
-"A tricuspid hatch of some sort of damp, flexible, resinous material. This "
+"A tricuspid hatch of some sort of damp, flexible, resinous material.  This "
 "one is open, the flaps held out by some sort of stringy mucus-like "
 "substance."
-msgstr "一種由濕潤有彈性的樹脂材質製成的三尖瓣艙口。這個門是打開的，皮瓣被某種粘稠的膠狀物質所支撐著。"
+msgstr ""
 
 #: lang/json/terrain_from_json.py
 msgid "resin-lined hole"
@@ -157210,6 +160843,13 @@ msgid ""
 " were still running."
 msgstr ""
 
+#. ~ Description for small railroad track
+#: lang/json/terrain_from_json.py
+msgid ""
+"Like a railroad track, only smaller.  You could probably run a small vehicle"
+" on this."
+msgstr ""
+
 #: lang/json/terrain_from_json.py
 msgid "sandbox"
 msgstr "沙盒"
@@ -157276,7 +160916,7 @@ msgstr "排水溝"
 #. ~ Description for gutter drop
 #: lang/json/terrain_from_json.py
 msgid ""
-"Funnels water from gutter system towards the ground, it looks flimsy. You "
+"Funnels water from gutter system towards the ground, it looks flimsy.  You "
 "may be able to climb down here."
 msgstr ""
 
@@ -157288,9 +160928,9 @@ msgstr "落水管"
 #: lang/json/terrain_from_json.py
 msgid ""
 "A length of gutter running from the roof to the ground, you could place a "
-"container underneath it to collect rainwater.  It looks flimsy. You may be "
+"container underneath it to collect rainwater.  It looks flimsy.  You may be "
 "able to climb down here."
-msgstr "從屋頂到地面的一段排水溝，你可以在它下面放一個容器來收集雨水。它看起來很脆弱。你也許可以在這裡爬下來。"
+msgstr ""
 
 #: lang/json/terrain_from_json.py
 msgid "flat roof"
@@ -158072,7 +161712,7 @@ msgstr ""
 #: lang/json/terrain_from_json.py
 msgid ""
 "An empty wooden frame in the shape of a column, built around a concrete and "
-"rebar foundation. It isn't capable of supporting roofs or shelter, and "
+"rebar foundation.  It isn't capable of supporting roofs or shelter, and "
 "appears to need more resources before being considered complete."
 msgstr ""
 
@@ -159241,10 +162881,8 @@ msgid ""
 "You just activated a grenade!  You probably want to throw it.  To throw an "
 "item, press 't' and then select the item to throw.  The maximum range "
 "depends on your strength and the object's weight and size.  Throwing isn't "
-"very good in most combat situations, but if you've got some fire power..."
+"very good in most combat situations, but if you've got some fire power…"
 msgstr ""
-"你剛拉下了手榴彈的插梢! 你最好趕快投擲出去。按 t "
-"來選取物品進行投擲。投擲的最遠距離取決於你的力量和物品的重量及大小。投擲物品的動作在大部分的戰鬥中起不了什麼太大的作用, 除非你丟的是手榴彈之類的東西…"
 
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
@@ -159322,7 +162960,7 @@ msgstr "這裡一片漆黑! 不過幸好你有帶著手電筒 , 按 a 接著選
 #: lang/json/tutorial_messages_from_json.py
 msgid ""
 "~ is a terrain symbol that indicates water.  From a water source like this, "
-"you can fill any containers you might have. Examine the water ('e') and "
+"you can fill any containers you might have.  Examine the water ('e') and "
 "press 'c' to fill a container, then select a watertight container to put the"
 " water into."
 msgstr ""
@@ -159671,6 +163309,10 @@ msgstr "六座電動軌道車"
 msgid "Rail Motorcycle"
 msgstr "鐵路摩托車"
 
+#: lang/json/vehicle_from_json.py
+msgid "Miniature Train Locomotive"
+msgstr ""
+
 #: lang/json/vehicle_from_json.py
 msgid "Flatbed Truck"
 msgstr "拖板車"
@@ -160458,8 +164100,8 @@ msgstr "繫結床墊"
 #. ~ Description for tied mattress
 #: lang/json/vehicle_part_from_json.py
 msgid ""
-"A mattress, strapped onto the vehicle. It could serve to blunt any impact."
-msgstr "繫結在車輛上的床墊。有助於減輕任何衝擊。"
+"A mattress, strapped onto the vehicle.  It could serve to blunt any impact."
+msgstr ""
 
 #. ~ Description for shredder
 #: lang/json/vehicle_part_from_json.py
@@ -160924,10 +164566,9 @@ msgstr "一台小型洗衣機。使用清潔劑、水和一些電力， 你可
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A small dishwasher.  With detergent, water, and some electrical power, you "
-"could clean your dishes...  Or something more useful like a CBM dripping "
-"with zombie gore.  'e'xamine the tile with the dishwasher to use it."
+"could clean your dishes…  Or something more useful like a CBM dripping with "
+"zombie gore.  'e'xamine the tile with the dishwasher to use it."
 msgstr ""
-"一台小型洗碗機。使用清潔劑、水和一些電力來清洗碗盤...或是一些更有用的東西，例如把生化插件上的殭屍肉渣清除掉。按 e 檢查洗碗機來使用它。"
 
 #. ~ Description for autoclave
 #: lang/json/vehicle_part_from_json.py
@@ -161110,9 +164751,9 @@ msgstr "小型風力發電機。暴露在風中時會慢慢為車輛的電力充
 #: lang/json/vehicle_part_from_json.py
 msgid ""
 "A large wind turbine with stabilizing legs.  Will recharge the vehicle's "
-"electrical power when exposed to the wind. Will cause extra drag on the "
+"electrical power when exposed to the wind.  Will cause extra drag on the "
 "vehicle."
-msgstr "具有穩固支架的大型風力發電機。當暴露在風中時，將為車輛的電力充電。會對車輛造成額外的阻力。"
+msgstr ""
 
 #. ~ Description for reinforced solar panel
 #: lang/json/vehicle_part_from_json.py
@@ -161645,6 +165286,14 @@ msgstr "堅固的金屬輪胎。有著適合在軌道上運行的輪緣，但一
 msgid "rail wheel (steerable)"
 msgstr "軌道輪（轉向輪）"
 
+#. ~ Description for pair of small rail wheels
+#: lang/json/vehicle_part_from_json.py
+msgid ""
+"A pair of small rail wheels.  It performs well when riding on a pair of "
+"small rails.  It performs terribly when not on a rail.  Moreover, you can't "
+"steer it."
+msgstr ""
+
 #: lang/json/vehicle_part_from_json.py
 msgid "roller drum"
 msgstr "輥輪"
@@ -163330,6 +166979,10 @@ msgstr "維他命B12"
 msgid "Vitamin C"
 msgstr "維他命C"
 
+#: lang/json/vitamin_from_json.py
+msgid "Toxins"
+msgstr ""
+
 #: src/action.cpp src/input.cpp
 msgid "Press "
 msgstr "按 "
@@ -163819,7 +167472,7 @@ msgstr "你把彈藥裝入了 %s。"
 msgid "You refill the %s."
 msgstr "你裝填了 %s。"
 
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/bionics.cpp
 msgid "There's nothing to light there."
 msgstr "這裡沒有能點燃的東西。"
 
@@ -163835,6 +167488,16 @@ msgstr "你失去了你用來生火的這項道具。"
 msgid "There is not enough sunlight to start a fire now.  You stop trying."
 msgstr "現在沒有足夠的陽光來聚焦生火了。你停止嘗試。"
 
+#: src/activity_handlers.cpp
+#, c-format
+msgid "You learn a little about the spell: %s"
+msgstr ""
+
+#: src/activity_handlers.cpp src/character_martial_arts.cpp
+#, c-format
+msgid "You learn %s."
+msgstr "你學習 %s。"
+
 #: src/activity_handlers.cpp
 #, c-format
 msgid "You finish training %s to level %d."
@@ -163845,11 +167508,6 @@ msgstr "你完成 %s 的訓練, 達到等級 %d。"
 msgid "You get some training in %s."
 msgstr "你進行了一些 %s 的訓練"
 
-#: src/activity_handlers.cpp
-#, c-format
-msgid "You learn %s."
-msgstr "你學習 %s。"
-
 #: src/activity_handlers.cpp
 msgid "You've charged the battery completely."
 msgstr "你已經把電池充滿電了。"
@@ -163965,15 +167623,22 @@ msgstr "傷害機率：<color_light_blue>%.1f</color>%%"
 msgid "Your %s is already fully repaired."
 msgstr "你的 %s 已經是完全修復了。"
 
-#: src/activity_handlers.cpp src/player.cpp
-#, c-format
-msgid "You are currently unable to mend the %s."
-msgstr "你目前無法修補 %s。"
+#: src/activity_handlers.cpp
+msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgstr ""
+
+#: src/activity_handlers.cpp
+msgid "You defrost and heat up the food."
+msgstr "你解凍並加熱了食物。"
+
+#: src/activity_handlers.cpp
+msgid "You heat up the food."
+msgstr "你加熱了食物。"
 
 #: src/activity_handlers.cpp
 #, c-format
-msgid "You successfully mended the %s."
-msgstr "你成功地修補了 %s。"
+msgid "You are currently unable to mend the %s."
+msgstr "你目前無法修補 %s。"
 
 #: src/activity_handlers.cpp
 #, c-format
@@ -164275,7 +167940,7 @@ msgstr "你完成鑽孔。"
 
 #. ~ Sound of a shovel digging a pit at work!
 #. ~ Sound of a shovel filling a pit or mound at work!
-#: src/activity_handlers.cpp
+#: src/activity_handlers.cpp src/activity_handlers.cpp src/handle_action.cpp
 msgid "hsh!"
 msgstr "hsh!"
 
@@ -164889,16 +168554,12 @@ msgstr ""
 "移動速度下降。憂鬱。免疫力低下。"
 
 #: src/addiction.cpp
-msgid "Perception - 1;   Intelligence - 1;  Frequent cravings."
+msgid "Perception - 1;   Intelligence - 1;   Frequent cravings."
 msgstr ""
-"感知 -1   智力 -1\n"
-"頻繁犯癮。"
 
 #: src/addiction.cpp
-msgid "Perception - 2;   Intelligence - 2;  Frequent cravings."
+msgid "Perception - 2;   Intelligence - 2;   Frequent cravings."
 msgstr ""
-"感知 -2   智力 -2\n"
-"頻繁犯癮。"
 
 #: src/addiction.cpp
 msgid ""
@@ -165082,38 +168743,6 @@ msgstr "來源  數量  重量  體積"
 msgid "Name (charges)"
 msgstr "名稱 (含量)"
 
-#: src/advanced_inv.cpp
-msgid "Not dragging any vehicle!"
-msgstr "沒有拖行中的車輛!"
-
-#: src/advanced_inv.cpp
-msgid "No dragged vehicle!"
-msgstr "沒有拖行中的車輛!"
-
-#: src/advanced_inv.cpp
-msgid "Invalid container!"
-msgstr "無效的容器!"
-
-#: src/advanced_inv.cpp
-msgid "All 9 squares"
-msgstr "全九宮格"
-
-#: src/advanced_inv.cpp
-msgid " <color_white_red>FIRE</color>"
-msgstr " <color_white_red>火焰</color>"
-
-#: src/advanced_inv.cpp
-msgid " DANGER"
-msgstr " 危險"
-
-#: src/advanced_inv.cpp
-msgid " TRAP"
-msgstr " 陷阱"
-
-#: src/advanced_inv.cpp
-msgid " WATER"
-msgstr " 水域"
-
 #: src/advanced_inv.cpp
 #, c-format
 msgid "[<] page %1$d of %2$d [>]"
@@ -165235,7 +168864,39 @@ msgstr "目標地區只能容納 %d！移動多少？ [有 %d] （0 為取消）
 msgid "The destination is already full!"
 msgstr "目標地區已經滿了!"
 
-#: src/advanced_inv.cpp
+#: src/advanced_inv_area.cpp
+msgid "Not dragging any vehicle!"
+msgstr "沒有拖行中的車輛!"
+
+#: src/advanced_inv_area.cpp
+msgid "No dragged vehicle!"
+msgstr "沒有拖行中的車輛!"
+
+#: src/advanced_inv_area.cpp
+msgid "Invalid container!"
+msgstr "無效的容器!"
+
+#: src/advanced_inv_area.cpp
+msgid "All 9 squares"
+msgstr "全九宮格"
+
+#: src/advanced_inv_area.cpp
+msgid " <color_white_red>FIRE</color>"
+msgstr " <color_white_red>火焰</color>"
+
+#: src/advanced_inv_area.cpp
+msgid " DANGER"
+msgstr " 危險"
+
+#: src/advanced_inv_area.cpp
+msgid " TRAP"
+msgstr " 陷阱"
+
+#: src/advanced_inv_area.cpp
+msgid " WATER"
+msgstr " 水域"
+
+#: src/advanced_inv_area.cpp
 msgid "Invalid container"
 msgstr "無效的容器"
 
@@ -165360,6 +169021,14 @@ msgstr "鈍擊: "
 msgid "Cut:"
 msgstr "砍劈: "
 
+#: src/armor_layers.cpp
+msgid "Acid:"
+msgstr "防酸："
+
+#: src/armor_layers.cpp
+msgid "Fire:"
+msgstr "防火："
+
 #: src/armor_layers.cpp
 msgid "Environmental:"
 msgstr "環境危害: "
@@ -166056,15 +169725,15 @@ msgstr "%s 痛苦"
 #, c-format
 msgid ""
 "The %s is somehow vaguely dissatisfied even though it doesn't want anything."
-" Seeing this is a bug!"
-msgstr "即使它不需要任何東西, %s 在某種程度上仍然無法滿足。看到這訊息是程式出錯了!"
+"  Seeing this is a bug!"
+msgstr "即使它不需要任何東西，%s 在某種程度上仍然無法滿足。看到這訊息是程式出錯了！"
 
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is satisfied, as it should be because it has no standards. Seeing "
+"The %s is satisfied, as it should be because it has no standards.  Seeing "
 "this is a bug!"
-msgstr "%s 應該滿足了, 因為它沒有標準。看到這訊息是程式出錯了!"
+msgstr "%s 應該滿足了，因為它沒有標準。看到這訊息是程式出錯了！"
 
 #: src/artifact.cpp
 #, c-format
@@ -166089,7 +169758,7 @@ msgstr ""
 #: src/artifact.cpp
 #, c-format
 msgid ""
-"The %s is confused to find you dreaming while awake. Seeing this is a bug!"
+"The %s is confused to find you dreaming while awake.  Seeing this is a bug!"
 msgstr ""
 
 #: src/artifact.cpp
@@ -166872,6 +170541,11 @@ msgctxt "holster"
 msgid "Draw %1$s from %2$s?"
 msgstr "拔出 %1$s 從 %2$s？"
 
+#: src/avatar.cpp src/monexamine.cpp
+#, c-format
+msgid "What to do with your %s?"
+msgstr "要對你的 %s 做什麼?"
+
 #: src/avatar_action.cpp
 msgid "You can't move while in your shell.  Deactivate it to go mobile."
 msgstr "你在殼中的時候無法移動。取消之後才能移動。"
@@ -167004,12 +170678,14 @@ msgid "The %s must be attached to a gun, it can not be fired separately."
 msgstr "這個 %s 必須裝在槍上, 不能夠直接拿來射擊。"
 
 #: src/avatar_action.cpp
-msgid "You can no longer fire."
-msgstr "你無法再射擊。"
+#, c-format
+msgid "You can no longer fire your %s."
+msgstr ""
 
 #: src/avatar_action.cpp
-msgid "You need a free arm to drive!"
-msgstr "你需要空出一隻手來駕駛!"
+#, c-format
+msgid "You can't use your %s while driving!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -167017,8 +170693,9 @@ msgid "You need two free hands to fire your %s."
 msgstr "你需要雙手並用才能發射 %s"
 
 #: src/avatar_action.cpp
-msgid "You need to reload!"
-msgstr "你必須重新裝填!"
+#, c-format
+msgid "Your %s is empty!"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -167029,18 +170706,20 @@ msgstr "你的 %s 需要 %i 電量才能發射!"
 #, c-format
 msgid ""
 "You need a UPS with at least %d charges or an advanced UPS with at least %d "
-"charges to fire that!"
-msgstr "你需要一個至少 %d 電量的 UPS 或是 %d 電量的高級 UPS 才能射擊!"
+"charges to fire the %s!"
+msgstr ""
 
 #: src/avatar_action.cpp
-msgid "Your mech has an empty battery, its weapon will not fire."
+#, c-format
+msgid "Your mech has an empty battery, its %s will not fire."
 msgstr ""
 
 #: src/avatar_action.cpp
+#, c-format
 msgid ""
-"You must stand near acceptable terrain or furniture to use this weapon.  A "
+"You must stand near acceptable terrain or furniture to use this %s.  A "
 "table, a mound of dirt, a broken window, etc."
-msgstr "你必須站在適合的地形或是家具附近才能使用這個武器。桌子、泥土堆、破窗戶等等。"
+msgstr ""
 
 #: src/avatar_action.cpp
 #, c-format
@@ -167280,6 +170959,16 @@ msgstr "你的 %s 自動關閉了。"
 msgid "Your %s automatically turns off."
 msgstr "你的 %s 自動關閉了。"
 
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s does not have sufficient humidity to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency will be reduced."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "You change your mind and turn it off."
 msgstr "你改變主意並把它關閉了。"
@@ -167397,10 +171086,6 @@ msgstr "血液測試結果"
 msgid "No effects."
 msgstr "沒有影響。"
 
-#: src/bionics.cpp
-msgid "There was not enough moisture in the air from which to draw water!"
-msgstr "空氣中沒有足夠的濕氣來提取水分!"
-
 #: src/bionics.cpp
 msgid "Your torsion ratchet locks onto your joints."
 msgstr ""
@@ -167413,10 +171098,6 @@ msgstr ""
 msgid "Start a fire where?"
 msgstr "在哪邊生火?"
 
-#: src/bionics.cpp src/iexamine.cpp
-msgid "You can't light a fire there."
-msgstr "你不能在那裡生火。"
-
 #: src/bionics.cpp
 #, c-format
 msgid "Your radiation level: %d"
@@ -167591,6 +171272,20 @@ msgstr "你的 %s 關閉了，以避免浪費燃料。"
 msgid "<npcname>'s %s turns off to not waste fuel."
 msgstr "<npcname>的 %s 關閉了，以避免浪費燃料。"
 
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, your %s shuts down to preserve"
+" your health."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid ""
+"Stored calories are below the safe threshold, <npcname>'s %s shuts down to "
+"preserve their health."
+msgstr ""
+
 #: src/bionics.cpp
 #, c-format
 msgid "Your %s runs out of fuel and turn off."
@@ -167619,6 +171314,21 @@ msgstr "你的 %s 失去連線並關閉了。"
 msgid "You feel your throat open up and air filling your lungs!"
 msgstr "你感覺到呼吸道通暢，空氣充滿你的肺部！"
 
+#: src/bionics.cpp
+#, c-format
+msgid "There is not enough humidity for your %s to function."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "Your %s issues a low humidity warning.  Efficiency is reduced."
+msgstr ""
+
+#: src/bionics.cpp
+#, c-format
+msgid "You are properly hydrated.  Your %s chirps happily."
+msgstr ""
+
 #: src/bionics.cpp
 msgid "The removal fails without incident."
 msgstr "移除失敗但沒有其他附加損失。"
@@ -168386,9 +172096,13 @@ msgstr "金木水火土子丑寅卯辰巳午未申酉戌亥乾坤震兌坎離巽
 
 #: src/character.cpp
 msgctxt "not possessive"
-msgid "you"
+msgid "You"
 msgstr "你"
 
+#: src/character.cpp
+msgid "Your"
+msgstr ""
+
 #: src/character.cpp
 msgid "your"
 msgstr "你的"
@@ -168619,6 +172333,14 @@ msgctxt "container"
 msgid "You put the %1$s in your %2$s."
 msgstr "你把 %1$s 放進你的 %2$s。"
 
+#: src/character.cpp
+msgid "You can't place items here!"
+msgstr "你不能把物品放到那!"
+
+#: src/character.cpp
+msgid "<npcname> can't place items here!"
+msgstr "<npcname>不能把物品放到那!"
+
 #. ~ %1$s - list of unmet requirements, %2$s - item name.
 #: src/character.cpp
 #, c-format
@@ -168642,10 +172364,20 @@ msgstr "你需要最少 %1$s 才能以 %3$s 來使用 %2$s。"
 msgid "<npcname> needs at least %1$s to use this %2$s with their %3$s."
 msgstr "<npcname> 需要至少 %1$s 才能以 %3$s 來使用 %2$s 。"
 
+#: src/character.cpp
+#, c-format
+msgid "You cannot unwield your %s."
+msgstr "你不能放開你的 %s。"
+
 #: src/character.cpp
 msgid "Liquid from your inventory has leaked onto the ground."
 msgstr "你的物品欄中的液體流到了地面上。"
 
+#: src/character.cpp
+#, c-format
+msgid "Your current health value is %d."
+msgstr "你目前的健康值是 %d。"
+
 #: src/character.cpp
 msgid "Parched"
 msgstr "脫水"
@@ -168715,6 +172447,75 @@ msgstr "累得半死"
 msgid "Your %s bionic shorts out!"
 msgstr ""
 
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostnipped in the next few hours."
+msgstr "你的 %s 在數小時後將會凍傷。"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten within the hour!"
+msgstr "你的 %s 在 1 小時內將會凍傷!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s will be frostbitten any minute now!"
+msgstr "你的 %s 隨時都可能被凍傷!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s beginning to go numb from the cold!"
+msgstr "你覺得你的 %s 因寒冷開始變得麻木!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very cold."
+msgstr "你覺得你的 %s 很冷。"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting chilly."
+msgstr "你覺得你的 %s 冷颼颼。"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting red hot from the heat!"
+msgstr "你感到你的 %s 因為高溫而變得紅腫!"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting very hot."
+msgstr "你感到你的 %s 非常炎熱。"
+
+#. ~ %s is bodypart
+#: src/character.cpp
+#, c-format
+msgid "You feel your %s getting warm."
+msgstr "你覺得你的 %s 變得溫熱。"
+
+#: src/character.cpp
+#, c-format
+msgid "The wind is making your %s feel quite cold."
+msgstr "風吹得你的 %s 發冷。"
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"The wind is very strong, you should find some more wind-resistant clothing "
+"for your %s."
+msgstr "風很強, 你應該要找一些更抗風的衣物來保護你的 %s。"
+
+#: src/character.cpp
+#, c-format
+msgid ""
+"Your clothing is not providing enough protection from the wind for your %s!"
+msgstr "你的衣物無法在風中為你的 %s 提供足夠的保護。"
+
 #: src/character.cpp
 msgid "Left Arm"
 msgstr "左臂"
@@ -168879,8 +172680,8 @@ msgstr "健康"
 msgid "Big"
 msgstr "大塊頭"
 
-#: src/character.cpp src/color.cpp src/color.cpp src/options.cpp
-#: src/panels.cpp
+#: src/character.cpp src/character_martial_arts.cpp src/color.cpp
+#: src/options.cpp
 msgid "Normal"
 msgstr "正常"
 
@@ -168984,6 +172785,30 @@ msgstr ""
 msgid "EXTRA_EXERCISE"
 msgstr ""
 
+#: src/character.cpp
+msgid "Your body strains under the weight!"
+msgstr "你的身體被超重拖累!"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s needs %d charge from some UPS."
+msgid_plural "Your %s needs %d charges from some UPS."
+msgstr[0] "你的 %s 需要 %d 來自 UPS 的電量。"
+
+#: src/character.cpp
+#, c-format
+msgid "Your %s has %d charge but needs %d."
+msgid_plural "Your %s has %d charges but needs %d."
+msgstr[0] "你的 %s 有 %d 電量, 但需要 %d 電量。"
+
+#: src/character.cpp
+msgid "You cough heavily."
+msgstr "你咳的很嚴重。"
+
+#: src/character.cpp
+msgid "a hacking cough."
+msgstr "一陣乾咳。"
+
 #: src/character.cpp
 msgid "You try to shout but you have no face!"
 msgstr "你試圖喊叫，但你的臉不見了！"
@@ -169163,6 +172988,20 @@ msgctxt "memorial_female"
 msgid "Entered hibernation."
 msgstr "開始冬眠。"
 
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "You have learned %s from extensive practice with the CQB Bionic."
+msgstr "頻繁使用 CQB 生化插件的過程中讓你學會了 %s。"
+
+#: src/character_martial_arts.cpp
+#, c-format
+msgid "%s to select martial arts style."
+msgstr "%s 以選擇武術招式。"
+
+#: src/character_martial_arts.cpp
+msgid "No Style"
+msgstr "沒有招式"
+
 #: src/clzones.cpp
 msgid "No Auto Pickup"
 msgstr "關閉自動撿取"
@@ -169207,260 +173046,6 @@ msgid ""
 "this area."
 msgstr "友善的 NPC 只有在這個區域內，才會去調查視野之外發出來的聲響。"
 
-#: src/clzones.cpp
-msgid "Loot: Unsorted"
-msgstr "物資: 未整理"
-
-#: src/clzones.cpp
-msgid ""
-"Place to drop unsorted loot. You can use \"sort out loot\" zone-action to "
-"sort items inside. It can overlap with Loot zones of different types."
-msgstr "放置未整理物資的地方。你可以使用 \"整理物資\" 區域動作來整理裡面的物品。它可以和不同類型的物資區域重疊。"
-
-#: src/clzones.cpp
-msgid "Loot: Food"
-msgstr "物資: 食物"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for comestibles. If more specific food zone is not defined, all "
-"food is moved here."
-msgstr "食物的目的地。如果沒有定義更明確的區域, 所有食物都會移動到這裡。"
-
-#: src/clzones.cpp
-msgid "Loot: P.Food"
-msgstr "物資: 易腐食物"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for perishable comestibles. Does include perishable drinks if "
-"such zone is not specified."
-msgstr "容易腐敗的食物的目的地。如果沒有定義更明確的區域, 容易腐敗的飲料也包含在內。"
-
-#: src/clzones.cpp
-msgid "Loot: Drink"
-msgstr "物資: 飲料"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for drinks. Does include perishable drinks if such zone is not "
-"specified."
-msgstr "飲料的目的地。如果沒有定義更明確的區域, 容易腐敗的飲料也包含在內。"
-
-#: src/clzones.cpp
-msgid "Loot: P.Drink"
-msgstr "物資: 易腐飲料"
-
-#: src/clzones.cpp
-msgid "Destination for perishable drinks."
-msgstr "容易腐敗的飲料的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Guns"
-msgstr "物資: 遠程武器"
-
-#: src/clzones.cpp
-msgid "Destination for guns, bows and similar weapons."
-msgstr "槍械、弓與其他類似武器的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Magazines"
-msgstr "物資: 彈匣"
-
-#: src/clzones.cpp
-msgid "Destination for gun magazines."
-msgstr "槍械彈匣的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Ammo"
-msgstr "物資: 彈藥"
-
-#: src/clzones.cpp
-msgid "Destination for ammo."
-msgstr "彈藥的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Weapons"
-msgstr "物資: 近戰武器"
-
-#: src/clzones.cpp
-msgid "Destination for melee weapons."
-msgstr "近戰武器的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Tools"
-msgstr "物資: 工具"
-
-#: src/clzones.cpp
-msgid "Destination for tools."
-msgstr "工具的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Clothing"
-msgstr "物資: 衣物"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for clothing. Does include filthy clothing if such zone is not "
-"specified."
-msgstr "衣物的目的地。如果沒有定義更明確的區域, 骯髒衣物也包含在內。"
-
-#: src/clzones.cpp
-msgid "Loot: F.Clothing"
-msgstr "物資: 骯髒衣物"
-
-#: src/clzones.cpp
-msgid "Destination for filthy clothing."
-msgstr "骯髒衣物的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Drugs"
-msgstr "物資: 藥物"
-
-#: src/clzones.cpp
-msgid "Destination for drugs and other medical items."
-msgstr "藥物與其他醫療用品的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Books"
-msgstr "物資: 書籍"
-
-#: src/clzones.cpp
-msgid "Destination for books and magazines."
-msgstr "書籍與雜誌的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Mods"
-msgstr "物資: 模組"
-
-#: src/clzones.cpp
-msgid "Destination for firearm modifications and similar items."
-msgstr "槍械模組與其他類似物品的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Mutagens"
-msgstr "物資: 突變劑"
-
-#: src/clzones.cpp
-msgid "Destination for mutagens, serums, and purifiers."
-msgstr "突變劑、血清與淨化劑的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Bionics"
-msgstr "物資: 生化插件"
-
-#: src/clzones.cpp
-msgid "Destination for Compact Bionics Modules aka CBMs."
-msgstr "生化插件 (CBM) 的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: V.Parts"
-msgstr "物資: 車輛零件"
-
-#: src/clzones.cpp
-msgid "Destination for vehicle parts."
-msgstr "車輛零件的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Other"
-msgstr "物資: 其他"
-
-#: src/clzones.cpp
-msgid "Destination for other miscellaneous items."
-msgstr "雜項物品的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Fuel"
-msgstr "物資: 燃料"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for gasoline, diesel, lamp oil and other substances used as a "
-"fuel."
-msgstr "汽油、柴油、燈油與其他燃料物質的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Seeds"
-msgstr "物資: 種子"
-
-#: src/clzones.cpp
-msgid "Destination for seeds, stems and similar items."
-msgstr "種子、莖與其他類似物品的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Chemical"
-msgstr "物資: 化學"
-
-#: src/clzones.cpp
-msgid "Destination for chemicals."
-msgstr "化學製品的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: S.Parts"
-msgstr "物資: 備用零件"
-
-#: src/clzones.cpp
-msgid "Destination for spare parts."
-msgstr "備用零件的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Artifacts"
-msgstr "物資: 神器"
-
-#: src/clzones.cpp
-msgid "Destination for artifacts"
-msgstr "神器的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Corpses"
-msgstr "物資：屍體"
-
-#: src/clzones.cpp
-msgid "Destination for corpses"
-msgstr "存放屍體的位置。"
-
-#: src/clzones.cpp
-msgid "Loot: Armor"
-msgstr "物資: 護甲"
-
-#: src/clzones.cpp
-msgid ""
-"Destination for armor. Does include filthy armor if such zone is not "
-"specified."
-msgstr "護甲的目的地。如果沒有定義更明確的區域, 骯髒護甲也包含在內。"
-
-#: src/clzones.cpp
-msgid "Loot: F.Armor"
-msgstr "物資: 骯髒護甲"
-
-#: src/clzones.cpp
-msgid "Destination for filthy armor."
-msgstr "骯髒護甲的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Wood"
-msgstr "物資: 木頭"
-
-#: src/clzones.cpp
-msgid "Destination for firewood and items that can be used as such."
-msgstr "薪柴和其他可作為薪柴使用的物品的目的地。"
-
-#: src/clzones.cpp
-msgid "Loot: Custom"
-msgstr "物資：自訂"
-
-#: src/clzones.cpp
-msgid "Destination for loot with a custom filter that you can modify."
-msgstr "指定區域存放的物資類別，可以用自訂的篩選器進行篩選。"
-
-#: src/clzones.cpp
-msgid "Loot: Ignore"
-msgstr "物資: 忽略"
-
-#: src/clzones.cpp
-msgid "Items inside of this zone are ignored by \"sort out loot\" zone-action."
-msgstr "在這個區域裡的物品會忽略 \"整理物資\" 區域動作。"
-
 #: src/clzones.cpp
 msgid "Source: Firewood"
 msgstr "來源：薪柴"
@@ -169468,9 +173053,9 @@ msgstr "來源：薪柴"
 #: src/clzones.cpp
 msgid ""
 "Source for firewood or other flammable materials in this zone may be used to"
-" automatically refuel fires. This will be done to maintain light during "
+" automatically refuel fires.  This will be done to maintain light during "
 "long-running tasks such as crafting, reading or waiting."
-msgstr "該區域的薪柴或其他可燃物將用於自動添加柴火。能為長時間作業的任務，例如製作、閱讀或等待，維持所需光源。"
+msgstr ""
 
 #: src/clzones.cpp
 msgid "Construction: Blueprint"
@@ -169528,6 +173113,16 @@ msgstr "車輛巡邏區"
 msgid "Vehicles with an autopilot will patrol in this zone."
 msgstr "具備自動駕駛的車輛將在此區域巡邏。"
 
+#: src/clzones.cpp
+msgid "Basecamp: Storage"
+msgstr ""
+
+#: src/clzones.cpp
+msgid ""
+"Items in this zone will be added to a basecamp's inventory for use by it's "
+"workers."
+msgstr ""
+
 #: src/clzones.cpp
 msgid "Basecamp: Food"
 msgstr "營寨：儲糧"
@@ -170871,24 +174466,6 @@ msgstr "你感到 %s 填補了你的身體。"
 msgid "<npcname> looks better after eating the %s."
 msgstr "<npcname> 吃下 %s 之後看起來好多了。"
 
-#: src/consumption.cpp
-msgid "Your internal power storage is fully powered."
-msgstr "您的內部能量儲存室已經完全充滿了。"
-
-#: src/consumption.cpp
-msgid "<npcname>'s internal power storage is fully powered."
-msgstr "<npcname> 的內部能量儲存室已完全充滿了。"
-
-#: src/consumption.cpp
-#, c-format
-msgid "You recharge your battery system with the %s."
-msgstr "你使用了 %s 為電池系統充電。"
-
-#: src/consumption.cpp
-#, c-format
-msgid "<npcname> recharges their battery system with the %s."
-msgstr "<npcname> 使用了 %s 為電池系統充電。"
-
 #: src/consumption.cpp
 msgid "That is a LOT of plutonium.  Are you sure you want that much?"
 msgstr "那可是 *很多* 的鈽, 你確定要那麼多嗎?"
@@ -171886,6 +175463,10 @@ msgstr "切換顯示本地氣味"
 msgid "Toggle display temperature"
 msgstr "切換顯示溫度"
 
+#: src/debug_menu.cpp
+msgid "Toggle display vehicle autopilot overlay"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Toggle display visibility"
 msgstr "切換顯示視線"
@@ -171926,6 +175507,10 @@ msgstr "切換NPC在地圖上的尋徑"
 msgid "Print faction info to console"
 msgstr "列印陣營資訊到控制台"
 
+#: src/debug_menu.cpp
+msgid "Print NPC magic info to console"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Test weather"
 msgstr "測試天氣"
@@ -172209,6 +175794,10 @@ msgstr "[@] 狀態窗口"
 msgid "t[e]leport"
 msgstr "[e] 傳送"
 
+#: src/debug_menu.cpp
+msgid "Give the [f]lu"
+msgstr ""
+
 #: src/debug_menu.cpp
 msgid "Edit [M]issions (WARNING: Unstable!)"
 msgstr "[M] 編輯任務 (警告: 具有不穩定性! )"
@@ -172793,10 +176382,12 @@ msgstr "先學些法術吧。"
 msgid "Spell"
 msgstr "法術"
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "LVL"
 msgstr "等級"
 
+#. ~ translation should not exceed 4 console cells
 #: src/debug_menu.cpp
 msgid "MAX"
 msgstr "上限"
@@ -174824,6 +178415,14 @@ msgstr ", 營寨管理員"
 msgid "%s has abandoned the camp."
 msgstr "%s 已經廢棄了這營寨。"
 
+#: src/faction_camp.cpp
+msgid " Expansion"
+msgstr "擴建營區"
+
+#: src/faction_camp.cpp
+msgid "Recover Ally, "
+msgstr "召回盟友，"
+
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -174849,87 +178448,6 @@ msgstr ""
 "時間：3 小時，重複執行\n"
 "職缺：%d / 3\n"
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone or you will be prompted to create them using the zone manager.\n"
-"Effects:\n"
-"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
-"\n"
-"Must have enjoyability >= -6\n"
-"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
-"> Rotten: 0%%\n"
-"> Rots in < 2 days: 60%%\n"
-"> Rots in < 5 days: 80%%\n"
-"\n"
-"Total faction food stock: %d kcal\n"
-"or %d day's rations"
-msgstr ""
-"註記：\n"
-"將食物分配給你的追隨者並填滿糧倉。將你想要發配的食物放在 [營寨：儲糧] 區。你必須要設有 [營寨：儲糧] 區、 [物資：未整理] 區以及至少一個 [物資：(任意)] 區，否則系統將提示你使用區域管理員來創建它們。\n"
-"功效：\n"
-"> 增加你的陣營的糧食供應數值，這也等於勞動者所能運用的總工時\n"
-"\n"
-"食物的享受值必須 > = -6\n"
-"根據升級與距離腐爛時間，易腐食物將會做減值加權計算：\n"
-"> 已經腐爛的食物：0%%\n"
-"> 將在 2天內腐爛：60%%\n"
-"> 將在 5天內腐爛：80%%\n"
-"\n"
-"陣營糧食總庫存：%d千卡\n"
-"或者 %d 天的配給"
-
-#: src/faction_camp.cpp
-msgid "Distribute Food"
-msgstr "分配食物"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Reset the zones that items are sorted to using the [ Menial Labor ] mission.\n"
-"\n"
-"Effects:\n"
-"> Assign sort zones using the zone manager.  You must have a camp food zone, an unsorted loot zone, and at least one loot destination zone.\n"
-"> Only items that are in the unsorted loot zone and not in any other zone will be sorted.\n"
-"Items that do not have a loot destination zone will be sorted using the normal rules for automatic zone sorting."
-msgstr ""
-"註記：\n"
-"重置物品分類區域， [雜務] 任務進行物品分類歸位的區域。\n"
-"\n"
-"效果：\n"
-"> 使用區域管理員指定分類的區域。你必須有一個 [營寨：儲糧] 區，一個 [物資：未整理] 區和至少一個 [物資：(任意)] 區。\n"
-"> 僅對 [物資：未整理] 區中的物品進行分類歸位，而不對其他任何區域中的物品進行分類歸位。\n"
-"沒有所屬分類區域的物品將使用自動區域分類的一般規則進行分類歸位。"
-
-#: src/faction_camp.cpp
-msgid "Reset Sort Points"
-msgstr "區域管理員"
-
-#: src/faction_camp.cpp
-msgid ""
-"Notes:\n"
-"Assign repeating job duties to NPCs stationed here.\n"
-"Difficulty: N/A\n"
-"Effects:\n"
-"\n"
-"\n"
-"Risk: None\n"
-"Time: Ongoing"
-msgstr ""
-"註記：\n"
-"將重複的工作指派給駐紮在這裡的 NPC。\n"
-"難度：N/A \n"
-"效果：\n"
-"\n"
-"\n"
-"風險：無\n"
-"時間：持續進行"
-
-#: src/faction_camp.cpp
-msgid "Assign Jobs"
-msgstr "指派工作"
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -174988,35 +178506,6 @@ msgstr ""
 "時間：3 小時\n"
 "職缺：%d / 1\n"
 
-#: src/faction_camp.cpp
-#, c-format
-msgid ""
-"Notes:\n"
-"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
-"\n"
-"Skill used: N/A\n"
-"Effects:\n"
-"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
-"\n"
-"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
-"\n"
-"Risk: None\n"
-"Time: 3 Hours\n"
-"Positions: %d/1\n"
-msgstr ""
-"註記：\n"
-"你的營寨已經成長到足以擴建新的營區。擴建雖然帶來新契機，卻也耗材又耗時。謹慎地選擇擴建的營區，因為一個營寨只能擴建出周圍八個營區。\n"
-"\n"
-"使用的技能：N/A\n"
-"效果：\n"
-"> 選擇擴建一種種類的營區。從 [農場] 開始是一個踏實的選項，因為食物用於支付同伴進行任務，而且維運 [農場] 並不需要太高的成本。只需少少的投資，有機械技能的同伴就可以在 [修車廠] 快速拆除大型的車輛。 [鐵匠鋪] 則能提供製造木炭的設備。\n"
-"\n"
-"注意：擴建後營區所能進行的任務請在營寨管理員（告示牌）的視窗中選取。\n"
-"\n"
-"風險：無\n"
-"時間：3 小時\n"
-"職缺：%d / 1\n"
-
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
@@ -175292,14 +178781,6 @@ msgstr ""
 "時間：旅行的耗時\n"
 "職缺：%d/ 3\n"
 
-#: src/faction_camp.cpp
-msgid " Expansion"
-msgstr "擴建營區"
-
-#: src/faction_camp.cpp
-msgid "Recover Ally, "
-msgstr "召回盟友，"
-
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -175434,6 +178915,81 @@ msgstr ""
 "時間：3 分鐘／每塊田地\n"
 "職缺：0 / 1\n"
 
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Your base has become large enough to support an expansion.  Expansions open up new opportunities but can be expensive and time consuming.  Pick them carefully, only 8 can be built at each camp.\n"
+"\n"
+"Skill used: N/A\n"
+"Effects:\n"
+"> Choose any one of the available expansions.  Starting with a farm is always a solid choice since food is used to support companion missions and little is needed to get it going.  With minimal investment, a mechanic can be useful as a chop-shop to rapidly dismantle large vehicles, and a forge provides the resources to make charcoal.\n"
+"\n"
+"NOTE: Actions available through expansions are located in separate tabs of the Camp Manager window.\n"
+"\n"
+"Risk: None\n"
+"Time: 3 Hours\n"
+"Positions: %d/1\n"
+msgstr ""
+"註記：\n"
+"你的營寨已經成長到足以擴建新的營區。擴建雖然帶來新契機，卻也耗材又耗時。謹慎地選擇擴建的營區，因為一個營寨只能擴建出周圍八個營區。\n"
+"\n"
+"使用的技能：N/A\n"
+"效果：\n"
+"> 選擇擴建一種種類的營區。從 [農場] 開始是一個踏實的選項，因為食物用於支付同伴進行任務，而且維運 [農場] 並不需要太高的成本。只需少少的投資，有機械技能的同伴就可以在 [修車廠] 快速拆除大型的車輛。 [鐵匠鋪] 則能提供製造木炭的設備。\n"
+"\n"
+"注意：擴建後營區所能進行的任務請在營寨管理員（告示牌）的視窗中選取。\n"
+"\n"
+"風險：無\n"
+"時間：3 小時\n"
+"職缺：%d / 1\n"
+
+#: src/faction_camp.cpp
+#, c-format
+msgid ""
+"Notes:\n"
+"Distribute food to your follower and fill you larders.  Place the food you wish to distribute in the camp food zone.  You must have a camp food zone, and a camp storage zone, or you will be prompted to create them using the zone manager.\n"
+"Effects:\n"
+"> Increases your faction's food supply value which in turn is used to pay laborers for their time\n"
+"\n"
+"Must have enjoyability >= -6\n"
+"Perishable food liquidated at penalty depending on upgrades and rot time:\n"
+"> Rotten: 0%%\n"
+"> Rots in < 2 days: 60%%\n"
+"> Rots in < 5 days: 80%%\n"
+"\n"
+"Total faction food stock: %d kcal\n"
+"or %d day's rations"
+msgstr ""
+
+#: src/faction_camp.cpp
+msgid "Distribute Food"
+msgstr "分配食物"
+
+#: src/faction_camp.cpp
+msgid ""
+"Notes:\n"
+"Assign repeating job duties to NPCs stationed here.\n"
+"Difficulty: N/A\n"
+"Effects:\n"
+"\n"
+"\n"
+"Risk: None\n"
+"Time: Ongoing"
+msgstr ""
+"註記：\n"
+"將重複的工作指派給駐紮在這裡的 NPC。\n"
+"難度：N/A \n"
+"效果：\n"
+"\n"
+"\n"
+"風險：無\n"
+"時間：持續進行"
+
+#: src/faction_camp.cpp
+msgid "Assign Jobs"
+msgstr "指派工作"
+
 #: src/faction_camp.cpp
 msgid ""
 "Notes:\n"
@@ -175450,6 +179006,10 @@ msgstr ""
 "\n"
 "同伴必須執行任務至少24小時，才能使用緊急召回。"
 
+#: src/faction_camp.cpp
+msgid "departs to survey land…"
+msgstr "出發去勘查土地..."
+
 #: src/faction_camp.cpp
 msgid "departs to search for materials…"
 msgstr "出發去搜集材料..."
@@ -175486,10 +179046,6 @@ msgstr "出發去獵捕大型動物..."
 msgid "departs to search for recruits…"
 msgstr "出發去找尋新成員..."
 
-#: src/faction_camp.cpp
-msgid "departs to survey land…"
-msgstr "出發去勘查土地..."
-
 #: src/faction_camp.cpp
 msgid "returns to you with something…"
 msgstr "給你帶回了些東西..."
@@ -175773,11 +179329,9 @@ msgstr ""
 #: src/faction_camp.cpp
 #, c-format
 msgid ""
-"Name:  %20s\n"
+"Name:  %s\n"
 "\n"
 msgstr ""
-"姓名:  %20s\n"
-"\n"
 
 #: src/faction_camp.cpp
 #, c-format
@@ -175956,9 +179510,8 @@ msgstr "你沒有足夠的物品分類區域。要增加嗎？"
 #: src/faction_camp.cpp
 msgid ""
 "Sorting zones have changed.  Please create some sorting zones.  You must "
-"create a camp food zone for your camp, an unsorted loot zone, and at least "
-"one destination loot zone."
-msgstr "物品分類區域已經更改。請先設立一些物品分類區域：[營寨：儲糧]、[物資：未分類]、至少一個 [物資：(任意)]（請自行選擇任意的類別）"
+"create a camp food zone, and a camp storage zone."
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -175987,18 +179540,18 @@ msgstr "> 涵蓋：%15d（公尺）\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Travel:  %23s\n"
-msgstr "> 移動：%23s\n"
+msgid ">Travel:  %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Working: %23s\n"
-msgstr "> 作業：%23s\n"
+msgid ">Working: %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Total:    %23s\n"
-msgstr "總共:    %23s\n"
+msgid "Total:    %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -176071,8 +179624,8 @@ msgstr "需要犁田："
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Name:     %25s\n"
-msgstr "名稱： %25s\n"
+msgid "Name:     %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 msgid "----          Engines          ----\n"
@@ -176080,8 +179633,8 @@ msgstr "----          引擎          ----\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid "Engine:  %25s\n"
-msgstr "引擎：%25s\n"
+msgid "Engine:   %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 #, c-format
@@ -176090,8 +179643,8 @@ msgstr "> 狀態：%24d%%\n"
 
 #: src/faction_camp.cpp
 #, c-format
-msgid ">Fuel:    %25s\n"
-msgstr "> 燃料：%25s\n"
+msgid ">Fuel:    %s\n"
+msgstr ""
 
 #: src/faction_camp.cpp
 msgid "----  Fuel Storage & Battery   ----\n"
@@ -177532,7 +181085,7 @@ msgstr "你需要至少一個 %s 才能重新裝填 %s!"
 msgid "The %s is already full!"
 msgstr "%s 已經滿了!"
 
-#: src/game.cpp
+#: src/game.cpp src/ranged.cpp
 #, c-format
 msgid "You can't reload a %s!"
 msgstr "你不能裝填 %s!"
@@ -177620,6 +181173,19 @@ msgstr "確定踏入 %s?"
 msgid "Your %s refuses to move over that ledge!"
 msgstr ""
 
+#: src/game.cpp
+msgid "You can't fit there."
+msgstr ""
+
+#: src/game.cpp
+msgid "Your mount can't fit there."
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You cannot move as your %s isn't able to move."
+msgstr ""
+
 #: src/game.cpp
 msgid "Can't find grabbed object."
 msgstr "找不到抓著的物件。"
@@ -177811,6 +181377,16 @@ msgstr "你試著移動這沉重的 %s 結果拉傷了!"
 msgid "There's stuff in the way."
 msgstr "有東西擋住了。"
 
+#: src/game.cpp
+#, c-format
+msgid "The %s is really heavy!"
+msgstr ""
+
+#: src/game.cpp
+#, c-format
+msgid "You fail to move the %s."
+msgstr ""
+
 #: src/game.cpp
 #, c-format
 msgid "The %s is too heavy for you to budge."
@@ -178119,7 +181695,7 @@ msgid ""
 "characters (e.g. empty boxes or question marks). You have been warned."
 msgstr "你似乎缺乏有效的 Unicode 語言環境。你可能會看到一些奇怪的字符 (例如空格和問號)。你被事先警告了。"
 
-#: src/game.cpp src/player.cpp
+#: src/game.cpp src/suffer.cpp
 msgid "You suddenly feel sharp pain for no reason."
 msgstr "你突然間無來由的覺得劇烈疼痛。"
 
@@ -178403,10 +181979,6 @@ msgstr "新鮮程度"
 msgid "SPOILS IN"
 msgstr "腐敗時間"
 
-#: src/game_inventory.cpp
-msgid "Battery"
-msgstr "電池"
-
 #: src/game_inventory.cpp
 msgid "Reactor"
 msgstr "反應爐"
@@ -178431,10 +182003,6 @@ msgstr "無法飲用溢出的液體"
 msgid "Your biology is not compatible with that item."
 msgstr "你的身體與這東西不相容。"
 
-#: src/game_inventory.cpp
-msgid "You're fully charged"
-msgstr "你的能量已滿"
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "No space to store more %s"
@@ -178526,10 +182094,6 @@ msgid "Needs at least %d charge"
 msgid_plural "Needs at least %d charges"
 msgstr[0] "需要至少 %d 電量"
 
-#: src/game_inventory.cpp src/teleport.cpp
-msgid "…"
-msgstr "…"
-
 #: src/game_inventory.cpp
 msgid "Use item"
 msgstr "使用物品"
@@ -178746,11 +182310,6 @@ msgstr ""
 msgid "<color_yellow>Available anesthetic: %i mL</color>"
 msgstr "<color_yellow>可用麻醉藥: %i mL</color>"
 
-#: src/game_inventory.cpp
-#, c-format
-msgid "<color_yellow>Money available: %s</color>"
-msgstr ""
-
 #: src/game_inventory.cpp
 #, c-format
 msgid "Bionic removal patient: %s"
@@ -179874,8 +183433,8 @@ msgid "Purchase cash card?"
 msgstr "購買現金卡?"
 
 #: src/iexamine.cpp
-msgid "You need $1.00 in your account to purchase a card."
-msgstr "你需要至少 100 分在帳戶中才能購買現金卡。"
+msgid "You need $10.00 in your account to purchase a card."
+msgstr ""
 
 #: src/iexamine.cpp
 msgid "Withdraw Money"
@@ -179917,8 +183476,8 @@ msgstr "你的帳戶餘額是 %s。"
 
 #: src/iexamine.cpp
 msgid ""
-"This will automatically deduct $1.00 from your bank account.  Continue?"
-msgstr "這將自動從您的銀行帳戶中扣除 $1.00。要繼續嗎？"
+"This will automatically deduct $10.00 from your bank account.  Continue?"
+msgstr ""
 
 #: src/iexamine.cpp
 msgid "You can only deposit money from charged cash cards!"
@@ -180197,8 +183756,9 @@ msgid "The gun safe stumps your efforts to pick it."
 msgstr "你嘗試打開槍櫃的鎖, 但失敗了。"
 
 #: src/iexamine.cpp
-msgid "If only you had something to pry with…"
-msgstr "你得要有工具才能撬開..."
+#, c-format
+msgid "The %s is locked.  If only you had something to pry it with…"
+msgstr ""
 
 #. ~ %1$s: terrain/furniture name, %2$s: prying tool name
 #: src/iexamine.cpp
@@ -180206,6 +183766,16 @@ msgstr "你得要有工具才能撬開..."
 msgid "You attempt to pry open the %1$s using your %2$s…"
 msgstr "你試圖將 %1$s 以你的 %2$s 撬開..."
 
+#: src/iexamine.cpp
+#, c-format
+msgid "The %s is locked.  If only you had something to pick its lock with…"
+msgstr ""
+
+#: src/iexamine.cpp
+#, c-format
+msgid "You attempt to pick lock of %1$s using your %2$s…"
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "This bulletin board is not inside a camp"
 msgstr ""
@@ -180665,6 +184235,10 @@ msgstr "你嘗試用你的 %s 生火..."
 msgid "You weren't able to start a fire."
 msgstr "你無法生火。"
 
+#: src/iexamine.cpp
+msgid "You can't light a fire there."
+msgstr "你不能在那裡生火。"
+
 #: src/iexamine.cpp
 #, c-format
 msgid "Really take down the %s while it's on fire?"
@@ -181348,6 +184922,17 @@ msgstr "全自動外科醫生正在進行 %s 的手術。"
 msgid "Autodoc Mk. XI.  Status: Online.  Please choose operation"
 msgstr "全自動外科醫生 Mk. XI. 狀態：在線。請選擇手術項目。"
 
+#: src/iexamine.cpp
+msgid " WARNING: Operator missing"
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"\n"
+" Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n"
+" By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. "
+msgstr ""
+
 #: src/iexamine.cpp
 msgid "Choose Compact Bionic Module to install"
 msgstr "選取要安裝的生化插件"
@@ -181870,6 +185455,10 @@ msgstr "大地圖連結"
 msgid "Overmap specials"
 msgstr "大地圖特殊"
 
+#: src/init.cpp
+msgid "Overmap locations"
+msgstr "大地圖地點"
+
 #: src/init.cpp
 msgid "Vehicle prototypes"
 msgstr "車輛樣板"
@@ -181926,6 +185515,10 @@ msgstr "收穫列表"
 msgid "Anatomies"
 msgstr "解剖"
 
+#: src/init.cpp
+msgid "Mutations"
+msgstr "突變"
+
 #: src/init.cpp
 msgid "Tileset"
 msgstr "圖像包"
@@ -181970,18 +185563,10 @@ msgstr "職業"
 msgid "Scenarios"
 msgstr "劇情"
 
-#: src/init.cpp
-msgid "Mutations"
-msgstr "突變"
-
 #: src/init.cpp
 msgid "Mutation Categories"
 msgstr "突變類別"
 
-#: src/init.cpp
-msgid "Overmap locations"
-msgstr "大地圖地點"
-
 #: src/init.cpp
 msgid "Map extras"
 msgstr "地圖特殊區域"
@@ -182345,14 +185930,6 @@ msgstr "%1$d 個從 %2$d 個"
 msgid "Page %d/%d"
 msgstr "頁面 %d/%d"
 
-#: src/inventory_ui.cpp
-msgid "ITEMS WORN"
-msgstr "穿戴中的物品"
-
-#: src/inventory_ui.cpp
-msgid "WEAPON HELD"
-msgstr "已手持的武器"
-
 #: src/inventory_ui.cpp
 #, c-format
 msgid "Weight (%s):"
@@ -182782,9 +186359,9 @@ msgstr "這個食物已經開始<neutral>腐敗</neutral>, 但<info>還可以忍
 
 #: src/item.cpp
 msgid ""
-"This food has started to <bad>rot</bad>.  <info>Eating</info> it would be a "
+"This food has started to <bad>rot</bad>. <info>Eating</info> it would be a "
 "<bad>very bad idea</bad>."
-msgstr "這個食物已經開始<bad>腐敗</bad>, <info>吃這東西</info>是個<bad>壞主意</bad>。"
+msgstr ""
 
 #: src/item.cpp
 #, c-format
@@ -182854,11 +186431,6 @@ msgstr "此彈藥 <good>絕不走火</good>。"
 msgid "This ammo <neutral>starts fires</neutral>."
 msgstr "此彈藥 <neutral>會點燃火焰</neutral>。"
 
-#: src/item.cpp
-#, c-format
-msgid "Stats of the active <info>gunmod (%s)</info> are shown."
-msgstr "顯示了啟動中<info>槍械模組 (%s) </info>的屬性。"
-
 #: src/item.cpp
 msgid "Skill used: "
 msgstr "使用技能: "
@@ -182982,7 +186554,7 @@ msgstr "<num>%"
 
 #: src/item.cpp
 msgid "Reload modifier: "
-msgstr ""
+msgstr "重新裝填加成："
 
 #: src/item.cpp
 msgid "Minimum strength required modifier: "
@@ -182997,8 +186569,9 @@ msgid "Used on: "
 msgstr "使用在: "
 
 #: src/item.cpp
-msgid "Location: "
-msgstr "位置: "
+#, c-format
+msgid "Location: %s"
+msgstr ""
 
 #: src/item.cpp
 msgid "<bold>Incompatible with mod location: </bold> "
@@ -183507,43 +187080,46 @@ msgid ""
 msgstr "* 這件衣物<bad>太小</bad>且並<bad>不合身</bad>。"
 
 #: src/item.cpp
-msgid "* This clothing <info>can be upsized</info>."
-msgstr "* 這件衣物<info>可以改大</info>。"
+msgid "<info>can be upsized</info>"
+msgstr ""
+
+#: src/item.cpp
+msgid "<info>can be downsized</info>"
+msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be downsized</info>."
-msgstr "* 這件衣物<info>可以改小</info>。"
+msgid "<bad>can not be downsized</bad>"
+msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be downsized.</bad>"
-msgstr "* 這件衣物<bad>無法改小</bad>。"
+msgid "<bad>can not be upsized</bad>"
+msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <bad>can not be upsized.</bad>"
-msgstr "* 這件衣物<bad>無法改大</bad>。"
+#, c-format
+msgid "* This clothing %s."
+msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info> and <info>upsized</info>."
-msgstr "* 這件衣物<info>可被修改成合身</info>或<info>改大</info>。"
+msgid " and <info>upsized</info>"
+msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> and <info>downsized</info>."
-msgstr "* 這件衣物<info>可被修改成合身</info>或<info>改小</info>。"
+msgid " and <info>downsized</info>"
+msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not downsized.</bad>"
-msgstr "* 這件衣物<info>可以被修改</info>但<bad>無法改小</bad>。"
+msgid " but <bad>not downsized</bad>"
+msgstr ""
 
 #: src/item.cpp
-msgid ""
-"* This clothing <info>can be refitted</info> but <bad>not upsized.</bad>"
-msgstr "* 這件衣物<info>可以被修改</info>但<bad>無法改大</bad>。"
+msgid " but <bad>not upsized</bad>"
+msgstr ""
 
 #: src/item.cpp
-msgid "* This clothing <info>can be refitted</info>."
-msgstr "* 這件衣物<info>可被修改成合身</info>。"
+#, c-format
+msgid "* This clothing <info>can be refitted</info>%s."
+msgstr ""
 
 #: src/item.cpp
 msgid "* This clothing <bad>can not be refitted, upsized, or downsized</bad>."
@@ -183627,6 +187203,19 @@ msgstr "* 這件物品接受到<info>無線電信號</info>後會立即啟動<ne
 msgid "This bionic is installed in the following body part(s):"
 msgstr "* 此生化插件安裝在以下身體部位:"
 
+#: src/item.cpp
+msgid "* This bionic can produce power from the following fuel: "
+msgid_plural "* This bionic can produce power from the following fuels: "
+msgstr[0] ""
+
+#: src/item.cpp
+msgid " <num> mJ"
+msgstr ""
+
+#: src/item.cpp
+msgid "<bold>Power Capacity:</bold>"
+msgstr ""
+
 #: src/item.cpp
 msgid "<bold>Encumbrance:</bold> "
 msgstr "<bold>累贅：</bold>"
@@ -183745,6 +187334,11 @@ msgstr "你可用它來製作數個其它物品。"
 msgid "You could use it to craft: %s"
 msgstr "你可用它來製作: %s"
 
+#: src/item.cpp
+#, c-format
+msgid "Stats of the active <info>gunmod (%s)</info> are shown."
+msgstr "顯示了啟動中<info>槍械模組 (%s) </info>的屬性。"
+
 #: src/item.cpp
 #, c-format
 msgid "It takes you an extremely long time to wield your %s."
@@ -184676,7 +188270,7 @@ msgstr ""
 
 #: src/iuse.cpp
 msgid "Choose a mutation to purify"
-msgstr ""
+msgstr "選擇一個突變來進行淨化"
 
 #: src/iuse.cpp
 msgid ""
@@ -184913,8 +188507,8 @@ msgid "You do not have that item!"
 msgstr "你沒有那個物品!"
 
 #: src/iuse.cpp
-msgid "Which signal should activate the item?:"
-msgstr "哪個信號能啟動此物? :"
+msgid "Which signal should activate the item?"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "\"Blue\""
@@ -185156,16 +188750,6 @@ msgstr "滋~~~~喀啦喀拉!"
 msgid "The infernal racket dies as the noise emitter turns off."
 msgstr "當你關掉噪音發射器時, 令人憎惡的轟隆聲就停止了。"
 
-#: src/iuse.cpp
-#, c-format
-msgid "You learn the essential elements of %s."
-msgstr "你學習了 %s 的基礎。"
-
-#: src/iuse.cpp
-#, c-format
-msgid "%s to select martial arts style."
-msgstr "%s 以選擇武術招式。"
-
 #: src/iuse.cpp
 msgid "You pry out the fence post."
 msgstr "你撬開柵欄柱。"
@@ -185586,18 +189170,27 @@ msgid "Scan the ground"
 msgstr "掃描地面"
 
 #: src/iuse.cpp
-msgid "Scan yourself"
-msgstr "掃描自己"
+msgid "Scan yourself or other person"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Turn continuous scan on"
 msgstr "啟動持續掃描模式"
 
+#: src/iuse.cpp
+msgid "Scan whom?"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "Your radiation level: %d mSv (%d mSv from items)"
 msgstr ""
 
+#: src/iuse.cpp
+#, c-format
+msgid "%s's radiation level: %d mSv (%d mSv from items)"
+msgstr ""
+
 #: src/iuse.cpp
 #, c-format
 msgid "The ground's radiation level: %d mSv/h"
@@ -185665,6 +189258,10 @@ msgstr "滴答!"
 msgid "You've already released the handle, try throwing it instead."
 msgstr "你已經打開保險了, 嘗試把他拋出去看看。"
 
+#: src/iuse.cpp src/iuse_actor.cpp
+msgid "You need a source of fire!"
+msgstr "你需要一個火源!"
+
 #: src/iuse.cpp
 msgid "You light the arrow!"
 msgstr "你點燃了弓箭!"
@@ -186156,10 +189753,6 @@ msgstr "你拿著拖把抹來抹去, 但不確定有沒有效果。"
 msgid "You mop up the spill."
 msgstr "你清理了濺出物。"
 
-#: src/iuse.cpp
-msgid "You have a vision of the surrounding area…"
-msgstr "你獲得了周圍地區的視野…"
-
 #: src/iuse.cpp
 msgid "The fabric of space seems to decay."
 msgstr "這個空間的結構似乎正在瓦解。"
@@ -186221,17 +189814,9 @@ msgid "You don't have appropriate food to heat up."
 msgstr "你沒有可以加熱的食物。"
 
 #: src/iuse.cpp
-msgid "You defrost the food, but don't heat it up, since you enjoy it cold."
+msgid "You start heating up the food."
 msgstr ""
 
-#: src/iuse.cpp
-msgid "You defrost and heat up the food."
-msgstr "你解凍並加熱了食物。"
-
-#: src/iuse.cpp
-msgid "You heat up the food."
-msgstr "你加熱了食物。"
-
 #: src/iuse.cpp
 msgid "There is no fire around, use your integrated toolset instead?"
 msgstr "周圍沒有火源, 要使用你的整合工具手嗎?"
@@ -187218,8 +190803,8 @@ msgid "Your %s is too heavy or bulky for this RC car."
 msgstr "你的 %s 對這台遙控車來說太重或是太大了。"
 
 #: src/iuse.cpp
-msgid "You disarmed your RC car"
-msgstr "你把你的遙控車解除武裝。"
+msgid "You disarmed your RC car."
+msgstr ""
 
 #. ~Sound of a radio controlled car moving around
 #: src/iuse.cpp
@@ -187231,12 +190816,12 @@ msgid "What to do with activated RC car?"
 msgstr "要對啟動的遙控車做什麼:"
 
 #: src/iuse.cpp
-msgid "You turned off your RC car"
-msgstr "你關閉了你的遙控車"
+msgid "You turned off your RC car."
+msgstr ""
 
-#: src/iuse.cpp src/map.cpp
-msgid "beep."
-msgstr "嗶。"
+#: src/iuse.cpp
+msgid "beep"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "Take control of RC car"
@@ -187273,9 +190858,16 @@ msgstr "你開始控制遙控車。"
 #: src/iuse.cpp
 #, c-format
 msgid ""
-"The %s in you inventory would explode on this signal.  Place it down before "
+"The %s in your inventory would explode on this signal.  Place it down before"
+" sending the signal."
+msgstr ""
+
+#: src/iuse.cpp
+#, c-format
+msgid ""
+"The %1$s in your %2$s would explode on this signal.  Place it down before "
 "sending the signal."
-msgstr "你物品欄內的 %s 收到這個信號就會爆炸。在發送信號之前先把它放置好。"
+msgstr ""
 
 #: src/iuse.cpp
 msgid "This vehicle's security system has locked you out!"
@@ -189034,10 +192626,30 @@ msgstr "這東西只能用來修理或修改其他物品, 而非本身。"
 msgid "How do you want to modify it?"
 msgstr "你要怎麼修改它?"
 
+#. ~ %1$s: modification desc, %2$d: number of thread needed
 #: src/iuse_actor.cpp
-msgid ""
-"Not enough thread to modify.  Which modification do you want to remove?"
-msgstr "沒有足夠的縫線用來修改衣物。你要移除哪個改造？"
+#, c-format
+msgid "Can't %1$s (need %2$d thread loaded)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (need %2$d %3$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$s: mod name
+#: src/iuse_actor.cpp
+#, c-format
+msgid "Can't %1$s (incompatible with %2$s)"
+msgstr ""
+
+#. ~ %1$s: modification desc, %2$d: number of items needed, %3$s: items
+#. needed, %4$s: number of thread needed
+#: src/iuse_actor.cpp
+#, c-format
+msgid "%1$s (%2$d %3$s and %4$d thread)"
+msgstr ""
 
 #: src/iuse_actor.cpp
 msgid "Bash"
@@ -190439,6 +194051,23 @@ msgstr "你無法學習這法術。"
 msgid "All knowledge of %s leaves you."
 msgstr "你失去了所有 %s 的知識。"
 
+#: src/magic.cpp
+msgid "Choose a new hotkey for this spell."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey already used."
+msgstr ""
+
+#: src/magic.cpp
+#, c-format
+msgid "%c set.  Close and reopen spell menu to refresh list with changes."
+msgstr ""
+
+#: src/magic.cpp
+msgid "Hotkey removed."
+msgstr ""
+
 #: src/magic.cpp
 msgid "Ignore Distractions"
 msgstr "忽略分散注意力的事物"
@@ -190447,6 +194076,10 @@ msgstr "忽略分散注意力的事物"
 msgid "Popup Distractions"
 msgstr "提示分散注意力的事物"
 
+#: src/magic.cpp
+msgid "Assign Hotkey [=]"
+msgstr ""
+
 #: src/magic.cpp
 msgid "requires concentration"
 msgstr "需要集中"
@@ -190511,6 +194144,15 @@ msgstr "施法耗魔"
 msgid "Casting Cost (impeded)"
 msgstr "施法耗魔（被阻礙）"
 
+#: src/magic.cpp
+#, c-format
+msgid " (%s current)"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Not Enough Energy"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Casting Time"
 msgstr "施法時間"
@@ -190519,6 +194161,10 @@ msgstr "施法時間"
 msgid "Casting Time (impeded)"
 msgstr "施法時間（被阻礙）"
 
+#: src/magic.cpp
+msgid "self"
+msgstr "自身"
+
 #: src/magic.cpp
 msgid "Valid Targets"
 msgstr "有效對象"
@@ -190531,6 +194177,22 @@ msgstr "傷害"
 msgid "Healing"
 msgstr "治療"
 
+#: src/magic.cpp
+msgid "Spell Radius"
+msgstr "法術範圍"
+
+#: src/magic.cpp
+msgid "Cone Arc"
+msgstr ""
+
+#: src/magic.cpp
+msgid "degrees"
+msgstr ""
+
+#: src/magic.cpp
+msgid "Line Width"
+msgstr ""
+
 #: src/magic.cpp
 msgid "Variance"
 msgstr "變異數"
@@ -190543,18 +194205,10 @@ msgstr "產生"
 msgid "Summon"
 msgstr "召喚"
 
-#: src/magic.cpp
-msgid "Spell Radius"
-msgstr "法術範圍"
-
 #: src/magic.cpp src/veh_interact.cpp
 msgid "Range"
 msgstr "距離"
 
-#: src/magic.cpp
-msgid "self"
-msgstr "自身"
-
 #: src/magic.cpp
 msgid "Duration"
 msgstr "持續時間"
@@ -190579,18 +194233,22 @@ msgstr "恢復"
 msgid "Damage Type"
 msgstr "傷害類別"
 
+#. ~ translation should not exceed 10 console cells
 #: src/magic.cpp
 msgid "Stat Gain"
 msgstr "效果加成"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "lvl 0"
 msgstr "等級 0"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "per lvl"
 msgstr "每一等級"
 
+#. ~ translation should not exceed 7 console cells
 #: src/magic.cpp
 msgid "max lvl"
 msgstr "最大等級"
@@ -190639,6 +194297,11 @@ msgstr "無法傳送。傳送器被阻擋或已摧毀。"
 msgid "No valid targets to teleport."
 msgstr "沒有傳送的有效目標。"
 
+#: src/magic_teleporter_list.cpp
+#, c-format
+msgid "Distance: %d (%d, %d)"
+msgstr ""
+
 #: src/magic_teleporter_list.cpp
 msgid "Choose Translocator Gate"
 msgstr "選擇易位門"
@@ -190779,6 +194442,10 @@ msgstr "無法建立模板資料夾。請檢查權限。"
 msgid "Unable to make sound directory.  Check permissions."
 msgstr "無法建立音效資料夾。請檢查權限。"
 
+#: src/main_menu.cpp
+msgid "Unable to make graphics directory.  Check permissions."
+msgstr ""
+
 #: src/main_menu.cpp
 msgid "Really quit?"
 msgstr "確定離開?"
@@ -191467,8 +195134,8 @@ msgstr "%s 在持武時無法施展。"
 
 #: src/martialarts.cpp
 #, c-format
-msgid "The %s is not a valid %s weapon."
-msgstr "%s 並不是合適的 %s 武器。"
+msgid "The %1$s is not a valid %2$s weapon."
+msgstr ""
 
 #: src/martialarts.cpp
 msgid "Block Counter"
@@ -191887,11 +195554,6 @@ msgid "%d enemy hit!"
 msgid_plural "%d enemies hit!"
 msgstr[0] "%d 敵人擊中!"
 
-#: src/melee.cpp
-#, c-format
-msgid "You have learned %s from extensive practice with the CQB Bionic."
-msgstr "頻繁使用 CQB 生化插件的過程中讓你學會了 %s。"
-
 #. ~ Adjective in "You block <adjective> of the damage with your <weapon>.
 #: src/melee.cpp
 msgid "all"
@@ -194330,17 +197992,43 @@ msgid "You don't have any companions to send out…"
 msgstr "你沒有可以派遣的同伴…"
 
 #: src/mission_companion.cpp
-msgid ""
-"Who do you want to send?                    [ COMBAT : SURVIVAL : INDUSTRY ]"
-msgstr "你想派出誰？                    [ 戰鬥 : 生存 : 製作 ]"
+msgid "Who do you want to send?"
+msgstr "你想派遣誰呢？"
 
 #: src/mission_companion.cpp
-msgid "You choose to send no one…"
-msgstr "你決定不派任何人..."
+msgid "[ COMBAT : SURVIVAL : INDUSTRY ]"
+msgstr ""
+
+#. ~ %1$s: npc name
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion"
+msgid "%1$s (Guarding)"
+msgstr ""
+
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion ranking"
+msgid "%s [ %4d : %4d : %4d ]"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$d: companion skill level, %3$d: skill requirement
+#: src/mission_companion.cpp
+#, c-format
+msgctxt "companion skill"
+msgid "%1$s %2$d/%3$d"
+msgstr ""
 
 #: src/mission_companion.cpp
-msgid "The companion you selected doesn't have the skills!"
-msgstr "你選擇的同伴沒有需要的技能！"
+msgid "You choose to send no one…"
+msgstr "你決定不派任何人..."
 
 #: src/mission_companion.cpp
 msgid "You don't have any companions ready to return…"
@@ -196019,6 +199707,11 @@ msgstr "%1$s 的手臂刺向你的 %2$s, 但被護具彈開了!"
 msgid "The %1$s hits <npcname>'s %2$s, but glances off armor!"
 msgstr "%1$s 刺向<npcname>的 %2$s, 但被護具彈開了!"
 
+#: src/monattack.cpp
+#, c-format
+msgid "The %1$s fuses with the %2$s."
+msgstr ""
+
 #: src/monattack.cpp
 #, c-format
 msgid "The %s doots its trumpet!"
@@ -196218,11 +199911,6 @@ msgstr "%s 被擊中後噴灑出強酸!"
 msgid "zombie slave"
 msgstr "屍奴 "
 
-#: src/monexamine.cpp src/player.cpp
-#, c-format
-msgid "What to do with your %s?"
-msgstr "要對你的 %s 做什麼?"
-
 #: src/monexamine.cpp
 #, c-format
 msgid "Push %s"
@@ -196628,22 +200316,27 @@ msgid "%1$s shoves %2$s out of their way!"
 msgstr "%1$s把擋路的%2$s用力推開！"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "tiny"
 msgstr "微小"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "small"
 msgstr "小"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "medium"
 msgstr "中"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "large"
 msgstr "大"
 
 #: src/monster.cpp
+msgctxt "size adj"
 msgid "huge"
 msgstr "巨大"
 
@@ -196708,6 +200401,16 @@ msgstr "濃稠膠凍塊"
 msgid "wearing %1$s"
 msgstr "穿戴 %1$s"
 
+#: src/monster.cpp
+#, c-format
+msgid "The %s"
+msgstr "%s"
+
+#: src/monster.cpp
+#, c-format
+msgid "The %s's"
+msgstr ""
+
 #: src/monster.cpp
 #, c-format
 msgid "the %s's"
@@ -196750,6 +200453,11 @@ msgstr "注意到你的存在！"
 msgid "Rider: %s"
 msgstr "騎手：%s"
 
+#: src/monster.cpp
+#, c-format
+msgid " It is %s."
+msgstr ""
+
 #: src/monster.cpp
 msgid "Difficulty "
 msgstr "難度"
@@ -197398,8 +201106,8 @@ msgid "Crossed a threshold"
 msgstr "越過門檻"
 
 #: src/mutation_data.cpp
-msgid "Oh, yeah! That's the stuff!"
-msgstr "喔~耶! 就是這玩意兒!"
+msgid "Oh, yeah!  That's the stuff!"
+msgstr ""
 
 #: src/mutation_ui.cpp
 msgid "Reassigning."
@@ -198394,7 +202102,7 @@ msgstr "憤怒: "
 msgid "%s disappears."
 msgstr "%s 消失了。"
 
-#: src/npc.cpp src/player.cpp
+#: src/npc.cpp src/suffer.cpp
 #, c-format
 msgid "%s dies!"
 msgstr "%s 死亡!"
@@ -199143,6 +202851,16 @@ msgstr "我有新消息。"
 msgid "Yes, let's resume training "
 msgstr "好, 繼續訓練 "
 
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: 1 hour lesson (cost %s)"
+msgstr ""
+
+#: src/npctalk.cpp
+#, c-format
+msgid "%s: teaching spell knowledge (cost %s)"
+msgstr ""
+
 #. ~Martial art style (cost in dollars)
 #: src/npctalk.cpp
 #, c-format
@@ -199311,10 +203029,6 @@ msgstr "吃下它並不是個好主意..."
 msgid "I need a %s to consume that!"
 msgstr "我需要 %s 才能食用它!"
 
-#: src/npctalk.cpp
-msgid "It doesn't look like a good idea to consume this.."
-msgstr "食用它看起來並不是個好主意…"
-
 #: src/npctalk.cpp
 msgid "Offer what?"
 msgstr "能提供哪些?"
@@ -199392,6 +203106,11 @@ msgstr "%1$s 位於（%2$d,%3$d）"
 msgid "My current location"
 msgstr "我目前的位置"
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "That is not a valid destination for %s."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%1$s is assigned to %2$s"
@@ -199424,10 +203143,6 @@ msgstr "你想移除哪一個生化插件?"
 msgid "You decide to hold off…"
 msgstr "你決定緩一緩..."
 
-#: src/npctalk_funcs.cpp
-msgid "You can't afford the procedure…"
-msgstr "你的錢不足以支付手術費…"
-
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s has nothing to give!"
@@ -199494,6 +203209,11 @@ msgstr "%s 要逃跑了!"
 msgid "%s leaves."
 msgstr "%s 離開了。"
 
+#: src/npctalk_funcs.cpp
+#, c-format
+msgid "%s stops following."
+msgstr ""
+
 #: src/npctalk_funcs.cpp
 #, c-format
 msgid "%s feels less threatened by you."
@@ -199553,6 +203273,11 @@ msgstr "更多 >"
 msgid "Examine which item?"
 msgstr "檢視哪個物品?"
 
+#: src/npctrade.cpp
+#, c-format
+msgid "Trade how many containers with %s [MAX: %d]: "
+msgstr ""
+
 #: src/npctrade.cpp
 #, c-format
 msgid "Trade how many %s [MAX: %d]: "
@@ -199865,9 +203590,9 @@ msgstr "重啟安全模式回合數"
 
 #: src/options.cpp
 msgid ""
-"Number of turns after which safe mode is reactivated. Will only reactivate "
+"Number of turns after which safe mode is reactivated.  Will only reactivate "
 "if no hostiles are in 'Safe mode proximity distance.'"
-msgstr "重啟安全模式所需的回合數。只會在 \"安全模式偵測距離\" 內沒有敵人時發揮作用。"
+msgstr ""
 
 #: src/options.cpp
 msgid "Turns to remember ignored monsters"
@@ -199964,9 +203689,9 @@ msgstr "自動丟棄空容器"
 
 #: src/options.cpp
 msgid ""
-"Set to drop empty containers after use.  No: Don't drop any. - Watertight: "
-"All except watertight containers. - All: Drop all containers."
-msgstr "設定是否自動丟棄使用後被清空的容器。 [否] 都不丟棄。 [水密] 除了能密封的容器都丟棄。 [全部] 全部丟棄。"
+"Set to drop empty containers after use.  No: Don't drop any.  - Watertight: "
+"All except watertight containers.  - All: Drop all containers."
+msgstr ""
 
 #: src/options.cpp
 msgid "Watertight"
@@ -200133,12 +203858,12 @@ msgid "If true, automatically follow the crosshair when firing/throwing."
 msgstr "設定為 [是], 會自動把游標移動到可攻擊或投擲的目標上。"
 
 #: src/options.cpp
-msgid "Query on disassembly"
-msgstr "拆解物品前詢問"
+msgid "Query on disassembly while butchering"
+msgstr ""
 
 #: src/options.cpp
-msgid "If true, will query before disassembling items."
-msgstr "設定為 [是], 會在每次拆解物品前進行確認。"
+msgid "If true, will query before disassembling items while butchering."
+msgstr ""
 
 #: src/options.cpp
 msgid "Query on keybinding removal"
@@ -200407,10 +204132,10 @@ msgstr "自動指定物品代碼"
 
 #: src/options.cpp
 msgid ""
-"Enabled: automatically assign letters to any carried items that lack them. "
-"Disabled: do not auto-assign letters. Favorites: only auto-assign letters to"
-" favorited items."
-msgstr "[啟用]：自動將字母分配給所有缺少字母代碼的物品。[停用]：不自動分配物品代碼。[喜愛]：僅自動將字母分配給設為喜愛的物品。"
+"Enabled: automatically assign letters to any carried items that lack them.  "
+"Disabled: do not auto-assign letters.  Favorites: only auto-assign letters "
+"to favorited items."
+msgstr ""
 
 #: src/options.cpp
 msgid "Disabled"
@@ -200773,7 +204498,7 @@ msgstr ""
 msgid "Display"
 msgstr "顯示器"
 
-#: src/options.cpp
+#: src/options.cpp src/sdltiles.cpp
 msgid ""
 "Sets which video display will be used to show the game.  Requires restart."
 msgstr "設定遊戲使用哪個顯示器。需要重新啟動遊戲。"
@@ -200859,8 +204584,8 @@ msgid "Scaling factor"
 msgstr "縮放比率"
 
 #: src/options.cpp
-msgid "Factor by which to scale the display. Requires restart."
-msgstr "設定遊戲畫面的縮放比率。需要重啟。"
+msgid "Factor by which to scale the display.  Requires restart."
+msgstr "設定遊戲畫面的縮放比率。需要重新啟動遊戲。"
 
 #: src/options.cpp
 msgid "1x"
@@ -201136,8 +204861,8 @@ msgstr "大災難日"
 
 #: src/options.cpp
 msgid ""
-"How many days into the year the cataclysm occurred. Day 0 is Spring 1. Can "
-"be overridden by scenarios. This does not advance food rot or monster "
+"How many days into the year the cataclysm occurred.  Day 0 is Spring 1.  Can"
+" be overridden by scenarios.  This does not advance food rot or monster "
 "evolution."
 msgstr "設定大災難在一年中的第幾日發生。設定為 0 表示是春季第一天。可被開場劇情所覆寫改變。改變設定並不會導致食物腐敗或怪物進化。"
 
@@ -201147,9 +204872,9 @@ msgstr "生存開始日"
 
 #: src/options.cpp
 msgid ""
-"How many days after the cataclysm the player spawns. Day 0 is the day of the"
-" cataclysm. Can be overridden by scenarios. Increasing this will cause food "
-"rot and monster evolution to advance."
+"How many days after the cataclysm the player spawns.  Day 0 is the day of "
+"the cataclysm.  Can be overridden by scenarios.  Increasing this will cause "
+"food rot and monster evolution to advance."
 msgstr "玩家從大災難後第幾日開始進行遊戲。設定為 0 即是大災難發生當天。可被開場劇情所覆寫改變。增加日數會使食物腐敗與怪物進化。"
 
 #: src/options.cpp
@@ -201209,9 +204934,9 @@ msgstr "靜態 NPC"
 
 #: src/options.cpp
 msgid ""
-"If true, static NPCs will spawn at pre-defined locations. Requires world "
+"If true, static NPCs will spawn at pre-defined locations.  Requires world "
 "reset."
-msgstr "設定為 [是], 靜態 NPC 會在預先定義的地點被產生。必須重置世界才會生效。"
+msgstr "設定為 [是] ，靜態 NPC 會在預先定義的地點生成。必須重置世界才會生效。"
 
 #: src/options.cpp
 msgid "Starting NPCs spawn"
@@ -202410,6 +206135,7 @@ msgstr "溫度："
 msgid "Underground"
 msgstr "地下"
 
+#. ~ translation should not exceed 5 console cells
 #: src/panels.cpp
 msgid "Wind"
 msgstr "風速"
@@ -202471,10 +206197,6 @@ msgstr "聽不見!"
 msgid "Weapon  :"
 msgstr "武器："
 
-#: src/panels.cpp
-msgid "No Style"
-msgstr "沒有招式"
-
 #: src/panels.cpp
 msgid "Day "
 msgstr "天數"
@@ -202487,10 +206209,12 @@ msgstr "氣溫："
 msgid "to open sidebar options"
 msgstr "打開側邊欄選項"
 
+#. ~ translation should not exceed 4 console cells
 #: src/panels.cpp
 msgid "Mana"
 msgstr "法力"
 
+#. ~ translation should not exceed 9 console cells
 #: src/panels.cpp
 msgid "Max Mana"
 msgstr "法力最大值"
@@ -202747,75 +206471,6 @@ msgstr "為了避免裡面的東西灑出來, <npcname>把 %1$s 放在 %2$s 上
 msgid "You have learned a new style: %s!"
 msgstr "你學到了新招式：%s！"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostnipped in the next few hours."
-msgstr "你的 %s 在數小時後將會凍傷。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten within the hour!"
-msgstr "你的 %s 在 1 小時內將會凍傷!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s will be frostbitten any minute now!"
-msgstr "你的 %s 隨時都可能被凍傷!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s beginning to go numb from the cold!"
-msgstr "你覺得你的 %s 因寒冷開始變得麻木!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very cold."
-msgstr "你覺得你的 %s 很冷。"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting chilly."
-msgstr "你覺得你的 %s 冷颼颼。"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting red hot from the heat!"
-msgstr "你感到你的 %s 因為高溫而變得紅腫!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting very hot."
-msgstr "你感到你的 %s 非常炎熱。"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "You feel your %s getting warm."
-msgstr "你覺得你的 %s 變得溫熱。"
-
-#: src/player.cpp
-#, c-format
-msgid "The wind is making your %s feel quite cold."
-msgstr "風吹得你的 %s 發冷。"
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"The wind is very strong, you should find some more wind-resistant clothing "
-"for your %s."
-msgstr "風很強, 你應該要找一些更抗風的衣物來保護你的 %s。"
-
-#: src/player.cpp
-#, c-format
-msgid ""
-"Your clothing is not providing enough protection from the wind for your %s!"
-msgstr "你的衣物無法在風中為你的 %s 提供足夠的保護。"
-
 #: src/player.cpp
 msgid "You roll on the ground, trying to smother the fire!"
 msgstr "你在地上滾動, 試圖抑制火勢!"
@@ -203186,14 +206841,6 @@ msgstr "你的 %s 上的消毒處理過的傷口已經癒合了。"
 msgid "There is not enough %s left to siphon it."
 msgstr "已經沒有足夠的 %s 能抽取了。"
 
-#: src/player.cpp
-msgid "You cough heavily."
-msgstr "你咳的很嚴重。"
-
-#: src/player.cpp
-msgid "a hacking cough."
-msgstr "一陣乾咳。"
-
 #: src/player.cpp
 msgid "Your body is wracked with excruciating pain!"
 msgstr "你的身體遭到難以忍受的疼痛肆虐!"
@@ -203239,11 +206886,6 @@ msgstr "你的 %s 很痛!"
 msgid "Your %s aches."
 msgstr "你的 %s 發疼。"
 
-#: src/player.cpp
-#, c-format
-msgid "Your current health value is %d."
-msgstr "你目前的健康值是 %d。"
-
 #: src/player.cpp
 #, c-format
 msgid "Your %s HURTS!"
@@ -203270,420 +206912,6 @@ msgstr "當這東西死掉時, 你的內心翻騰。"
 msgid "Your bowels gurgle as something inside them dies."
 msgstr "當這東西死掉時, 你的腸子咕嚕了一下。"
 
-#: src/player.cpp
-#, c-format
-msgid "You're too malnourished to keep your %s going."
-msgstr "你營養不良太嚴重，無法讓 %s 繼續運作。"
-
-#: src/player.cpp
-#, c-format
-msgid "You're too dehydrated to keep your %s going."
-msgstr "你太渴了無法繼續你的 %s。"
-
-#: src/player.cpp
-#, c-format
-msgid "You're too exhausted to keep your %s going."
-msgstr "你太累了無法繼續你的 %s。"
-
-#: src/player.cpp
-msgid "You're drowning!"
-msgstr "你溺水了!"
-
-#: src/player.cpp
-msgid "You shed a tooth!"
-msgstr "你掉了一顆牙！"
-
-#. ~Sound of buzzing Insect Wings
-#: src/player.cpp
-msgid "BZZZZZ"
-msgstr "嗡嗡嗡嗡"
-
-#: src/player.cpp
-msgid "You suddenly feel numb."
-msgstr "你突然覺得麻痺。"
-
-#: src/player.cpp
-msgid "You suddenly ache."
-msgstr "你突然疼痛。"
-
-#: src/player.cpp
-msgid "You feel dizzy for a moment."
-msgstr "你有一點頭暈。"
-
-#: src/player.cpp
-msgid "You suddenly feel hungry."
-msgstr "你突然覺得餓了。"
-
-#: src/player.cpp
-msgid "You suddenly feel a little full."
-msgstr "你突然覺得有點飽。"
-
-#: src/player.cpp
-msgid "You suddenly feel thirsty."
-msgstr "你突然覺得口渴。"
-
-#: src/player.cpp
-msgid "You feel fatigued all of a sudden."
-msgstr "你突然感到疲倦。"
-
-#: src/player.cpp
-msgid "You suddenly feel very cold."
-msgstr "你突然感到很冷。"
-
-#: src/player.cpp
-msgid "You suddenly feel cold."
-msgstr "你突然覺得寒冷。"
-
-#: src/player.cpp
-msgid "You suddenly feel very hot."
-msgstr "你突然感到非常炎熱。"
-
-#: src/player.cpp
-msgid "You suddenly feel hot."
-msgstr "你突然感到炎熱。"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s gets angry!"
-msgstr "%1$s 生氣了！"
-
-#: src/player.cpp
-#, c-format
-msgid "%1$s says: \"%2$s\""
-msgstr "%1$s 說: \"%2$s\""
-
-#: src/player.cpp
-#, c-format
-msgid "You increase %1$s to level %2$d."
-msgstr "你提昇 %1$s 到達了等級 %2$d。"
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "Your %1$s"
-msgstr "你的 %1$s "
-
-#: src/player.cpp
-msgid "You suddenly feel so numb…"
-msgstr "你突然覺得很麻木…"
-
-#: src/player.cpp
-msgid "You start to shake uncontrollably."
-msgstr "你開始不由自主的顫抖。"
-
-#: src/player.cpp
-#, c-format
-msgid "yourself shout, %s"
-msgstr "你叫喊著，%s"
-
-#. ~ %1$s: weapon name
-#: src/player.cpp
-#, c-format
-msgid "your %1$s"
-msgstr "你的 %1$s "
-
-#: src/player.cpp
-msgid "You're suddenly overcome with the urge to sleep and you pass out."
-msgstr "你突然被睡覺的衝動所征服，然後你就昏倒了。"
-
-#: src/player.cpp
-msgid "You have an asthma attack!"
-msgstr "你的氣喘發作了!"
-
-#: src/player.cpp
-msgid "You use your Oxygenator to clear it up, then go back to sleep."
-msgstr "你使用呼吸器平復它，然後繼續睡覺。"
-
-#: src/player.cpp
-msgid "You use your inhaler and go back to sleep."
-msgstr "你使用了吸入器接著回到睡眠。"
-
-#: src/player.cpp
-msgid "You take a deep breath from your oxygen tank and go back to sleep."
-msgstr "你從氧氣罐深吸了一口氣，然後繼續睡覺。"
-
-#: src/player.cpp
-msgid "You can't focus while choking!"
-msgstr "喘不過氣時無法集中注意力。"
-
-#: src/player.cpp
-msgid "You use your last inhaler charge."
-msgstr "你用掉了你吸入器的最後一次劑量。"
-
-#: src/player.cpp
-#, c-format
-msgid "You use your inhaler, only %d charge left."
-msgid_plural "You use your inhaler, only %d charges left."
-msgstr[0] "你使用你的吸入器, 只剩 %d 次劑量。"
-
-#: src/player.cpp
-msgid "You breathe in last bit of oxygen from the tank."
-msgstr "你吸光了氧氣罐裡的氧氣。"
-
-#: src/player.cpp
-#, c-format
-msgid "You take a deep breath from your oxygen tank, only %d charge left."
-msgid_plural ""
-"You take a deep breath from your oxygen tank, only %d charges left."
-msgstr[0] "你從氧氣罐深吸了一口氣，還剩下 %d 次能使用。"
-
-#: src/player.cpp
-#, c-format
-msgid "%s and other body parts"
-msgstr "%s 和其他身體部位"
-
-#: src/player.cpp
-#, c-format
-msgid "The sunlight is really irritating your %s."
-msgstr "陽光嚴重刺激你的 %s。"
-
-#: src/player.cpp
-msgid "The sunlight is really irritating your eyes."
-msgstr "陽光非常刺眼!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is damaged by the water."
-msgstr "你的 %s 被水損傷。"
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is damaged by the water."
-msgstr "<npcname> 的 %s 被水損傷。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s is healed by the water."
-msgstr "你的 %s 被水治癒。"
-
-#: src/player.cpp
-#, c-format
-msgid "<npcname>'s %s is healed by the water."
-msgstr "<npcname> 的 %s 被水治癒。"
-
-#: src/player.cpp
-msgid "The sunlight burns your skin!"
-msgstr "陽光灼燒著你的皮膚!"
-
-#: src/player.cpp
-msgid "The sunlight distracts you."
-msgstr "陽光讓你分心。"
-
-#: src/player.cpp
-msgid "You can't stand the sunlight!"
-msgstr "你無法忍受陽光!"
-
-#: src/player.cpp
-msgid "Suddenly, you can't hear anything!"
-msgstr "你突然聽不見了!"
-
-#: src/player.cpp
-msgid "Suddenly, your eyes stop working!"
-msgstr "你突然看不見了!"
-
-#: src/player.cpp
-msgid "Your visual centers must be acting up…"
-msgstr "你的視覺中樞必須動起來了…"
-
-#: src/player.cpp
-msgid "You feel an anomalous sensation coming from your radiation sensors."
-msgstr "你身上的輻射感測器傳來了一陣反常的感覺。"
-
-#: src/player.cpp
-msgid "Your chest burns as your power systems overload!"
-msgstr "你的電源系統過載, 胸腔像被火燒一樣!"
-
-#: src/player.cpp
-msgid "You suffer a painful electrical discharge!"
-msgstr "你遭受放電時的疼痛!"
-
-#: src/player.cpp
-#, c-format
-msgid "The %s seems to be affected by the discharge."
-msgstr "%s 似乎受到放電的影響。"
-
-#: src/player.cpp
-msgid "You suffer a burning acidic discharge!"
-msgstr "你遭受酸液釋放時的灼燒疼痛!"
-
-#: src/player.cpp
-msgid "Your batteries discharge slightly."
-msgstr "你的電池因放電而電力下降。"
-
-#: src/player.cpp
-msgid "A bionic emits a crackle of noise!"
-msgstr "生化插件發出劈啪的聲音!"
-
-#: src/player.cpp
-msgid "You feel your faulty bionic shuddering."
-msgstr "你身上故障的生化插件在顫抖。"
-
-#: src/player.cpp
-msgid "Crackle!"
-msgstr "劈啪！"
-
-#: src/player.cpp
-msgid "Your vision pixelates!"
-msgstr "你的視線像素化了!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
-msgstr "你故障的生化插件使你倒在地上抽筋!"
-
-#: src/player.cpp
-msgid "Your bionics short-circuit, causing you to tremble and shiver."
-msgstr "你的生化插件短路了, 讓你顫抖。"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic itches!"
-msgstr "你故障的生化插件好癢!"
-
-#: src/player.cpp
-msgid "Your malfunctioning bionic starts to glow!"
-msgstr "你故障的生化插件開始發光！"
-
-#: src/player.cpp
-msgid "Your muscles spasm!"
-msgstr "你抽筋了!"
-
-#: src/player.cpp
-msgid "You fall to the ground!"
-msgstr "你摔到地上!"
-
-#: src/player.cpp
-msgid "You feel short of breath."
-msgstr "你覺得透不過氣。"
-
-#: src/player.cpp
-msgid "You shake uncontrollably."
-msgstr "你不由自主地顫抖著。"
-
-#: src/player.cpp
-msgid "You feel nauseous…"
-msgstr "你覺得反胃..."
-
-#: src/player.cpp
-msgid "You black out!"
-msgstr "你暫時失去知覺!"
-
-#: src/player.cpp
-msgid "Your breathing slows down."
-msgstr "你的呼吸慢下來了。"
-
-#: src/player.cpp
-msgid "You stumble and fall over!"
-msgstr "你蹣跚地跌倒了!"
-
-#: src/player.cpp
-msgid "You feel tired…"
-msgstr "你覺得累了…"
-
-#: src/player.cpp
-msgid "You tiredly rub your eyes."
-msgstr "你累得揉了揉眼睛。"
-
-#: src/player.cpp
-msgid "<npcname> tiredly rubs their eyes."
-msgstr "<npcname> 累得揉了揉眼睛。"
-
-#: src/player.cpp
-msgid "You let out a small yawn."
-msgstr "你打了個呵欠。"
-
-#: src/player.cpp
-msgid "<npcname> lets out a small yawn."
-msgstr "<npcname> 打了個小呵欠。"
-
-#: src/player.cpp
-msgid "You stretch your back."
-msgstr "你伸展了你的背。"
-
-#: src/player.cpp
-msgid "<npcname> streches their back."
-msgstr "<npcname> 伸展背部。"
-
-#: src/player.cpp
-msgid "You feel mentally tired."
-msgstr "你感到精神疲倦。"
-
-#: src/player.cpp
-msgid "<npcname> lets out a huge yawn."
-msgstr "<npcname> 打了個大呵欠。"
-
-#: src/player.cpp
-msgid "You feel lightheaded for a moment."
-msgstr "你感到一陣頭暈。"
-
-#: src/player.cpp
-msgid "Your muscles spasm uncomfortably."
-msgstr "你的肌肉難受地痙孿著。"
-
-#: src/player.cpp
-msgid "Your vision blurs a little."
-msgstr "你的視線稍微變得模糊。"
-
-#: src/player.cpp
-msgid "Your mind lapses into unawareness briefly."
-msgstr "你的心神短暫地陷入無知覺。"
-
-#: src/player.cpp
-msgid "Your muscles ache in stressfully unpredictable ways."
-msgstr "你的肌肉因莫名產生的壓力而疼痛。"
-
-#: src/player.cpp
-msgid "You have a distractingly painful headache."
-msgstr "劇烈的頭疼讓你無法專心。"
-
-#: src/player.cpp
-msgid "You feel heartburn and an acid taste in your mouth."
-msgstr "你感到火燒心以及口中有酸蝕的口感。"
-
-#: src/player.cpp
-msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
-msgstr "你的意識過於疲倦, 以至於你覺得再也不能相信你的眼睛。"
-
-#: src/player.cpp
-msgid ""
-"Your muscles spasm uncontrollably, and you have trouble keeping your "
-"balance."
-msgstr "你的肌肉不受控制地痙攣, 你很難保持平衡。"
-
-#: src/player.cpp
-msgid "Your shaking legs make you stumble."
-msgstr "你的顫抖的雙腿使你蹣跚而行。"
-
-#: src/player.cpp
-msgid "<npcname> stumbles."
-msgstr "<npcname> 蹣跚而行。"
-
-#: src/player.cpp
-msgid "<npcname> falls over!"
-msgstr "<npcname> 跌倒了！"
-
-#: src/player.cpp
-msgid "You fall over!"
-msgstr "你跌倒了!"
-
-#: src/player.cpp
-#, c-format
-msgid "Your radiation badge changes from %1$s to %2$s!"
-msgstr "你的輻射偵測徽章從 %1$s 變成 %2$s!"
-
-#. ~ %s is bodypart
-#: src/player.cpp
-#, c-format
-msgid "Your %s has started to mend!"
-msgstr "你的 %s 開始修補。"
-
-#: src/player.cpp src/sounds.cpp
-#, c-format
-msgid "From the %1$s you hear %2$s"
-msgstr "你聽見 %1$s 傳來了 %2$s"
-
-#: src/player.cpp
-msgid "You feel the water burning your skin."
-msgstr "你感覺到水在灼傷你的皮膚。"
-
 #: src/player.cpp
 msgid "Your cloaking flickers for a moment!"
 msgstr "你的斗篷閃爍了一下子！"
@@ -203901,11 +207129,6 @@ msgstr "你僅有的一支手拿不了 %s。"
 msgid "You are too weak to wield %s with only one arm."
 msgstr "你僅有的一支手力量不足, 拿不了 %s。"
 
-#: src/player.cpp
-#, c-format
-msgid "You cannot unwield your %s."
-msgstr "你不能放開你的 %s。"
-
 #: src/player.cpp
 msgid "Keep hands free (off)"
 msgstr "保持空手 (關閉)"
@@ -203979,20 +207202,43 @@ msgstr "%s 沒有任何故障可供修補。"
 msgid "Mend which fault?"
 msgstr "修補哪個故障?"
 
-#: src/player.cpp src/veh_interact.cpp
-msgid "<color_white>Time required:</color>\n"
-msgstr "<color_white>所需時間</color>:\n"
+#: src/player.cpp
+#, c-format
+msgid "Turns into: <color_cyan>%s</color>\n"
+msgstr ""
 
 #: src/player.cpp
-msgid "<color_white>Skills:</color>\n"
-msgstr "<color_white>技能</color>:\n"
+#, c-format
+msgid "Time required: <color_cyan>%s</color>\n"
+msgstr ""
+
+#: src/player.cpp
+msgid "Skills: <color_cyan>none</color>\n"
+msgstr ""
+
+#: src/player.cpp
+#, c-format
+msgid "Skills: %s\n"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_green>(%2$d/%3$d)</color>"
+msgstr ""
+
+#. ~ %1$s: skill name, %2$s: current skill level, %3$s: required skill level
+#: src/player.cpp
+#, c-format
+msgctxt "skill requirement"
+msgid "<color_cyan>%1$s</color> <color_yellow>(%2$d/%3$d)</color>"
+msgstr ""
 
-#. ~ %1$s represents the internal color name which shouldn't be translated,
-#. %2$s is skill name, and %3$i is skill level
 #: src/player.cpp
 #, c-format
-msgid "> <color_%1$s>%2$s %3$i</color>\n"
-msgstr "> <color_%1$s>%2$s %3$i</color>\n"
+msgid "You are currently unable to mend the %s this way."
+msgstr ""
 
 #: src/player.cpp
 msgid "You are already wearing that."
@@ -204106,14 +207352,6 @@ msgstr "你脫下你的 %s。"
 msgid "<npcname> takes off their %s."
 msgstr "<npcname> 脫下他的 %s。"
 
-#: src/player.cpp
-msgid "You can't place items here!"
-msgstr "你不能把物品放到那!"
-
-#: src/player.cpp
-msgid "<npcname> can't place items here!"
-msgstr "<npcname>不能把物品放到那!"
-
 #: src/player.cpp
 #, c-format
 msgid "You put the %s in your inventory."
@@ -204161,18 +207399,6 @@ msgstr "你回收 %i 未使用過的鈽。"
 msgid "You can't remove partially depleted plutonium!"
 msgstr "你不能移除耗用到一半的鈽!"
 
-#: src/player.cpp
-#, c-format
-msgid "Your %s needs %d charge from some UPS."
-msgid_plural "Your %s needs %d charges from some UPS."
-msgstr[0] "你的 %s 需要 %d 來自 UPS 的電量。"
-
-#: src/player.cpp
-#, c-format
-msgid "Your %s has %d charge but needs %d."
-msgid_plural "Your %s has %d charges but needs %d."
-msgstr[0] "你的 %s 有 %d 電量, 但需要 %d 電量。"
-
 #. ~ %1$s - gunmod, %2$s - gun.
 #: src/player.cpp
 #, c-format
@@ -204344,10 +207570,6 @@ msgstr "你試著躲開, 但是這裡沒有空間了!"
 msgid "%s tries to dodge but there's no room!"
 msgstr "%s 試著躲開, 但是那裡沒有空間了!"
 
-#: src/player.cpp
-msgid "Your body strains under the weight!"
-msgstr "你的身體被超重拖累!"
-
 #: src/player.cpp
 #, c-format
 msgid "You (%s)"
@@ -204403,6 +207625,13 @@ msgstr "空腹"
 msgid "Pain "
 msgstr "疼痛"
 
+#. ~ skill_name current_skill_level -> next_skill_level (% to next level)
+#: src/player_activity.cpp
+#, c-format
+msgctxt "reading progress"
+msgid "%s %d -> %d (%d%%)"
+msgstr ""
+
 #: src/player_activity.cpp
 #, c-format
 msgid "%s…"
@@ -204617,47 +207846,57 @@ msgstr "目前速度:"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Overburdened        -%s%d%%"
-msgstr "超重                -%s%d%%"
+msgctxt "speed penalty"
+msgid "Overburdened        -%2d%%"
+msgstr "負擔過重        -%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Pain                -%s%d%%"
-msgstr "疼痛                -%s%d%%"
+msgctxt "speed penalty"
+msgid "Pain                -%2d%%"
+msgstr "疼痛                -%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Thirst              -%s%d%%"
-msgstr "口渴                -%s%d%%"
+msgctxt "speed penalty"
+msgid "Thirst              -%2d%%"
+msgstr "口渴              -%2d%%"
 
 #: src/player_display.cpp
 msgid "Underfed"
 msgstr "營養不良"
 
+#. ~ %s: Starving/Underfed (already left-justified), %2d: speed penalty
 #: src/player_display.cpp
 #, c-format
-msgid "%-20s-%s%d%%"
-msgstr "%-20s-%s %d %%"
+msgctxt "speed penalty"
+msgid "%s-%2d%%"
+msgstr "%s-%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Out of Sunlight     -%s%d%%"
-msgstr "遠離陽光            -%s%d%%"
+msgctxt "speed penalty"
+msgid "Out of Sunlight     -%2d%%"
+msgstr ""
 
+#. ~ %s: sign of bonus/penalty, %2d: speed bonus/penalty
 #: src/player_display.cpp
 #, c-format
-msgid "Cold-Blooded        %s%s%d%%"
-msgstr "冷血        %s%s%d%%"
+msgctxt "speed modifier"
+msgid "Cold-Blooded        %s%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
-msgid "Quick               +%s%d%%"
-msgstr "俐落                +%s%d%%"
+msgctxt "speed bonus"
+msgid "Quick               +%2d%%"
+msgstr "俐落              +%2d%%"
 
 #: src/player_display.cpp
 #, c-format
-msgid "Bionic Speed        +%s%d%%"
-msgstr "生化插件速度        +%s%d%%"
+msgctxt "speed bonus"
+msgid "Bionic Speed        +%2d%%"
+msgstr ""
 
 #: src/player_display.cpp
 #, c-format
@@ -204872,8 +208111,8 @@ msgid "\"Oh God, what's happening?\""
 msgstr "\"哦, 天啊, 發生了什麼事? \""
 
 #: src/player_hardcoded_effects.cpp
-msgid "\"Of course... it's all fractals!\""
-msgstr "\"當然… 這一切都是分形! \""
+msgid "\"Of course… it's all fractals!\""
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "\"Huh?  What was that?\""
@@ -204908,8 +208147,8 @@ msgid "You quiver from the cold."
 msgstr "你冷得直打哆嗦。"
 
 #: src/player_hardcoded_effects.cpp
-msgid "Your torso is freezing cold. You should put on a few more layers."
-msgstr "你的軀幹有如被冰凍般的寒冷。你應該再多穿幾件。"
+msgid "Your torso is freezing cold.  You should put on a few more layers."
+msgstr ""
 
 #: src/player_hardcoded_effects.cpp
 msgid "Your shivering makes you unsteady."
@@ -205283,6 +208522,47 @@ msgstr "你的鬧鐘響了。"
 msgid "Your alarm went off."
 msgstr "你的鬧鐘已經響了。"
 
+#: src/player_hardcoded_effects.cpp
+msgid "You lose control of your body as it begins to convulse!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You lose conciousness!"
+msgstr "你失去知覺！"
+
+#: src/player_hardcoded_effects.cpp
+msgid "arm"
+msgstr "手臂"
+
+#: src/player_hardcoded_effects.cpp
+msgid "hand"
+msgstr "手掌"
+
+#: src/player_hardcoded_effects.cpp
+msgid "leg"
+msgstr "腿部"
+
+#: src/player_hardcoded_effects.cpp
+#, c-format
+msgid "Your %s suddenly jerks in an unexpected direction!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep hold of your weapon."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "However, you manage to keep your footing."
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You suddenly lose all muscle tone, and can't support your own weight!"
+msgstr ""
+
+#: src/player_hardcoded_effects.cpp
+msgid "You have a splitting headache."
+msgstr ""
+
 #: src/ranged.cpp
 #, c-format
 msgid "Your %s misfires with a muffled click!"
@@ -205704,10 +208984,6 @@ msgstr "咔-啦-碰!"
 msgid "<color_cyan>none</color>"
 msgstr "<color_cyan>無</color>"
 
-#: src/recipe.cpp
-msgid "<color_white>none</color>"
-msgstr "<color_white>無</color>"
-
 #: src/recipe.cpp
 #, c-format
 msgid "%s%% at >%s units"
@@ -205936,11 +209212,6 @@ msgstr "評分"
 msgid "KILLS"
 msgstr "擊殺"
 
-#: src/sdltiles.cpp
-msgid ""
-"Sets which video display will be used to show the game. Requires restart."
-msgstr "設定遊戲使用哪個顯示器。需要重新啟動遊戲。"
-
 #: src/skill.cpp
 msgid "The zen-most skill there is."
 msgstr "至禪技能如是。"
@@ -205953,6 +209224,10 @@ msgstr "你的耳膜突然感到疼!"
 msgid "Something is making noise."
 msgstr "有東西發出聲響。"
 
+#: src/sounds.cpp
+msgid "a noise"
+msgstr ""
+
 #: src/sounds.cpp
 #, c-format
 msgid "Heard %s!"
@@ -205968,6 +209243,11 @@ msgstr "你聽到 %1$s 從你的位置傳來。"
 msgid "You hear %1$s"
 msgstr "你聽到 %1$s"
 
+#: src/sounds.cpp src/suffer.cpp
+#, c-format
+msgid "From the %1$s you hear %2$s"
+msgstr "你聽見 %1$s 傳來了 %2$s"
+
 #: src/sounds.cpp
 msgid "Your alarm clock finally wakes you up."
 msgstr "你的鬧鐘終於叫醒了你。"
@@ -205997,6 +209277,408 @@ msgstr "無法正確生成起始地點, 請回報此錯誤"
 msgid "d: delete history"
 msgstr "d: 刪除歷史"
 
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is damaged by the water."
+msgstr "你的 %s 被水損傷。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is damaged by the water."
+msgstr "<npcname> 的 %s 被水損傷。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s is healed by the water."
+msgstr "你的 %s 被水治癒。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "<npcname>'s %s is healed by the water."
+msgstr "<npcname> 的 %s 被水治癒。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too malnourished to keep your %s going."
+msgstr "你營養不良太嚴重，無法讓 %s 繼續運作。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too dehydrated to keep your %s going."
+msgstr "你太渴了無法繼續你的 %s。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You're too exhausted to keep your %s going."
+msgstr "你太累了無法繼續你的 %s。"
+
+#: src/suffer.cpp
+msgid "You're drowning!"
+msgstr "你溺水了!"
+
+#: src/suffer.cpp
+msgid "You're suddenly overcome with the urge to sleep and you pass out."
+msgstr "你突然被睡覺的衝動所征服，然後你就昏倒了。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel numb."
+msgstr "你突然覺得麻痺。"
+
+#: src/suffer.cpp
+msgid "You suddenly ache."
+msgstr "你突然疼痛。"
+
+#: src/suffer.cpp
+msgid "You feel dizzy for a moment."
+msgstr "你有一點頭暈。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel hungry."
+msgstr "你突然覺得餓了。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel a little full."
+msgstr "你突然覺得有點飽。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel thirsty."
+msgstr "你突然覺得口渴。"
+
+#: src/suffer.cpp
+msgid "You feel fatigued all of a sudden."
+msgstr "你突然感到疲倦。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel very cold."
+msgstr "你突然感到很冷。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel cold."
+msgstr "你突然覺得寒冷。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel very hot."
+msgstr "你突然感到非常炎熱。"
+
+#: src/suffer.cpp
+msgid "You suddenly feel hot."
+msgstr "你突然感到炎熱。"
+
+#. ~ %1$s: weapon name
+#: src/suffer.cpp
+#, c-format
+msgid "your %1$s"
+msgstr "你的 %1$s "
+
+#: src/suffer.cpp
+msgid "You suddenly feel so numb…"
+msgstr "你突然覺得很麻木…"
+
+#: src/suffer.cpp
+msgid "You start to shake uncontrollably."
+msgstr "你開始不由自主的顫抖。"
+
+#: src/suffer.cpp
+msgid "<npcname> starts to shake uncontrollably."
+msgstr ""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s says: \"%2$s\""
+msgstr "%1$s 說: \"%2$s\""
+
+#: src/suffer.cpp
+#, c-format
+msgid "%1$s gets angry!"
+msgstr "%1$s 生氣了！"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You increase %1$s to level %2$d."
+msgstr "你提昇 %1$s 到達了等級 %2$d。"
+
+#: src/suffer.cpp
+msgid "You have an asthma attack!"
+msgstr "你的氣喘發作了!"
+
+#: src/suffer.cpp
+msgid "You use your Oxygenator to clear it up, then go back to sleep."
+msgstr "你使用呼吸器平復它，然後繼續睡覺。"
+
+#: src/suffer.cpp
+msgid "You use your inhaler and go back to sleep."
+msgstr "你使用了吸入器接著回到睡眠。"
+
+#: src/suffer.cpp
+msgid "You take a deep breath from your oxygen tank and go back to sleep."
+msgstr "你從氧氣罐深吸了一口氣，然後繼續睡覺。"
+
+#: src/suffer.cpp
+msgid "You can't focus while choking!"
+msgstr "喘不過氣時無法集中注意力。"
+
+#: src/suffer.cpp
+msgid "You use your last inhaler charge."
+msgstr "你用掉了你吸入器的最後一次劑量。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You use your inhaler, only %d charge left."
+msgid_plural "You use your inhaler, only %d charges left."
+msgstr[0] "你使用你的吸入器, 只剩 %d 次劑量。"
+
+#: src/suffer.cpp
+msgid "You breathe in last bit of oxygen from the tank."
+msgstr "你吸光了氧氣罐裡的氧氣。"
+
+#: src/suffer.cpp
+#, c-format
+msgid "You take a deep breath from your oxygen tank, only %d charge left."
+msgid_plural ""
+"You take a deep breath from your oxygen tank, only %d charges left."
+msgstr[0] "你從氧氣罐深吸了一口氣，還剩下 %d 次能使用。"
+
+#: src/suffer.cpp
+msgid "The sunlight burns your skin!"
+msgstr "陽光灼燒著你的皮膚!"
+
+#: src/suffer.cpp
+msgid "The sunlight distracts you."
+msgstr "陽光讓你分心。"
+
+#: src/suffer.cpp
+msgid "You can't stand the sunlight!"
+msgstr "你無法忍受陽光!"
+
+#: src/suffer.cpp
+msgid "The sunlight is really irritating your eyes."
+msgstr "陽光非常刺眼!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "%s and other body parts"
+msgstr "%s 和其他身體部位"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The sunlight is really irritating your %s."
+msgstr "陽光嚴重刺激你的 %s。"
+
+#: src/suffer.cpp
+msgid "You shed a tooth!"
+msgstr "你掉了一顆牙！"
+
+#. ~Sound of buzzing Insect Wings
+#: src/suffer.cpp
+msgid "BZZZZZ"
+msgstr "嗡嗡嗡嗡"
+
+#: src/suffer.cpp
+msgid "Suddenly, you can't hear anything!"
+msgstr "你突然聽不見了!"
+
+#: src/suffer.cpp
+msgid "Suddenly, your eyes stop working!"
+msgstr "你突然看不見了!"
+
+#: src/suffer.cpp
+msgid "Your visual centers must be acting up…"
+msgstr "你的視覺中樞必須動起來了…"
+
+#: src/suffer.cpp
+msgid "You feel an anomalous sensation coming from your radiation sensors."
+msgstr "你身上的輻射感測器傳來了一陣反常的感覺。"
+
+#: src/suffer.cpp
+msgid "Your chest burns as your power systems overload!"
+msgstr "你的電源系統過載, 胸腔像被火燒一樣!"
+
+#: src/suffer.cpp
+msgid "You suffer a painful electrical discharge!"
+msgstr "你遭受放電時的疼痛!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "The %s seems to be affected by the discharge."
+msgstr "%s 似乎受到放電的影響。"
+
+#: src/suffer.cpp
+msgid "You suffer a burning acidic discharge!"
+msgstr "你遭受酸液釋放時的灼燒疼痛!"
+
+#: src/suffer.cpp
+msgid "Your batteries discharge slightly."
+msgstr "你的電池因放電而電力下降。"
+
+#: src/suffer.cpp
+msgid "A bionic emits a crackle of noise!"
+msgstr "生化插件發出劈啪的聲音!"
+
+#: src/suffer.cpp
+msgid "You feel your faulty bionic shuddering."
+msgstr "你身上故障的生化插件在顫抖。"
+
+#: src/suffer.cpp
+msgid "Crackle!"
+msgstr "劈啪！"
+
+#: src/suffer.cpp
+msgid "Your vision pixelates!"
+msgstr "你的視線像素化了!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!"
+msgstr "你故障的生化插件使你倒在地上抽筋!"
+
+#: src/suffer.cpp
+msgid "Your bionics short-circuit, causing you to tremble and shiver."
+msgstr "你的生化插件短路了, 讓你顫抖。"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic itches!"
+msgstr "你故障的生化插件好癢!"
+
+#: src/suffer.cpp
+msgid "Your malfunctioning bionic starts to glow!"
+msgstr "你故障的生化插件開始發光！"
+
+#: src/suffer.cpp
+msgid "Your muscles spasm!"
+msgstr "你抽筋了!"
+
+#: src/suffer.cpp
+msgid "You fall to the ground!"
+msgstr "你摔到地上!"
+
+#: src/suffer.cpp
+msgid "You feel short of breath."
+msgstr "你覺得透不過氣。"
+
+#: src/suffer.cpp
+msgid "You shake uncontrollably."
+msgstr "你不由自主地顫抖著。"
+
+#: src/suffer.cpp
+msgid "You feel nauseous…"
+msgstr "你覺得反胃..."
+
+#: src/suffer.cpp
+msgid "You black out!"
+msgstr "你暫時失去知覺!"
+
+#: src/suffer.cpp
+msgid "Your breathing slows down."
+msgstr "你的呼吸慢下來了。"
+
+#: src/suffer.cpp
+msgid "You stumble and fall over!"
+msgstr "你蹣跚地跌倒了!"
+
+#: src/suffer.cpp
+msgid "You feel tired…"
+msgstr "你覺得累了…"
+
+#: src/suffer.cpp
+msgid "You tiredly rub your eyes."
+msgstr "你累得揉了揉眼睛。"
+
+#: src/suffer.cpp
+msgid "<npcname> tiredly rubs their eyes."
+msgstr "<npcname> 累得揉了揉眼睛。"
+
+#: src/suffer.cpp
+msgid "You let out a small yawn."
+msgstr "你打了個呵欠。"
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a small yawn."
+msgstr "<npcname> 打了個小呵欠。"
+
+#: src/suffer.cpp
+msgid "You stretch your back."
+msgstr "你伸展了你的背。"
+
+#: src/suffer.cpp
+msgid "<npcname> streches their back."
+msgstr "<npcname> 伸展背部。"
+
+#: src/suffer.cpp
+msgid "You feel mentally tired."
+msgstr "你感到精神疲倦。"
+
+#: src/suffer.cpp
+msgid "<npcname> lets out a huge yawn."
+msgstr "<npcname> 打了個大呵欠。"
+
+#: src/suffer.cpp
+msgid "You feel lightheaded for a moment."
+msgstr "你感到一陣頭暈。"
+
+#: src/suffer.cpp
+msgid "Your muscles spasm uncomfortably."
+msgstr "你的肌肉難受地痙孿著。"
+
+#: src/suffer.cpp
+msgid "Your vision blurs a little."
+msgstr "你的視線稍微變得模糊。"
+
+#: src/suffer.cpp
+msgid "Your mind lapses into unawareness briefly."
+msgstr "你的心神短暫地陷入無知覺。"
+
+#: src/suffer.cpp
+msgid "Your muscles ache in stressfully unpredictable ways."
+msgstr "你的肌肉因莫名產生的壓力而疼痛。"
+
+#: src/suffer.cpp
+msgid "You have a distractingly painful headache."
+msgstr "劇烈的頭疼讓你無法專心。"
+
+#: src/suffer.cpp
+msgid "You feel heartburn and an acid taste in your mouth."
+msgstr "你感到火燒心以及口中有酸蝕的口感。"
+
+#: src/suffer.cpp
+msgid "Your mind is so tired that you feel you can't trust your eyes anymore."
+msgstr "你的意識過於疲倦, 以至於你覺得再也不能相信你的眼睛。"
+
+#: src/suffer.cpp
+msgid ""
+"Your muscles spasm uncontrollably, and you have trouble keeping your "
+"balance."
+msgstr "你的肌肉不受控制地痙攣, 你很難保持平衡。"
+
+#: src/suffer.cpp
+msgid "Your shaking legs make you stumble."
+msgstr "你的顫抖的雙腿使你蹣跚而行。"
+
+#: src/suffer.cpp
+msgid "<npcname> stumbles."
+msgstr "<npcname> 蹣跚而行。"
+
+#: src/suffer.cpp
+msgid "<npcname> falls over!"
+msgstr "<npcname> 跌倒了！"
+
+#: src/suffer.cpp
+msgid "You fall over!"
+msgstr "你跌倒了!"
+
+#: src/suffer.cpp
+#, c-format
+msgid "Your radiation badge changes from %1$s to %2$s!"
+msgstr "你的輻射偵測徽章從 %1$s 變成 %2$s!"
+
+#. ~ %s is bodypart
+#: src/suffer.cpp
+#, c-format
+msgid "Your %s has started to mend!"
+msgstr "你的 %s 開始修補。"
+
+#: src/suffer.cpp
+msgid "You feel the water burning your skin."
+msgstr "你感覺到水在灼傷你的皮膚。"
+
 #: src/teleport.cpp
 msgid "You feel a strange, inwards force."
 msgstr ""
@@ -206146,8 +209828,8 @@ msgstr "玻璃碎裂！"
 
 #: src/trapfunc.cpp
 #, c-format
-msgid "The %s stumbles over the cot"
-msgstr "%s 跌跌撞撞跨過行軍床"
+msgid "The %s stumbles over the cot!"
+msgstr ""
 
 #: src/trapfunc.cpp
 msgid "A bear trap closes on your foot!"
@@ -206302,11 +209984,6 @@ msgstr "一個圈套綁住了你的腳。"
 msgid "A snare closes on <npcname>s leg."
 msgstr "一個圈套綁住了 <npcname> 的腳。"
 
-#: src/trapfunc.cpp
-#, c-format
-msgid "A snare closes on your %s's leg"
-msgstr "你的%s的腳被小型繩套陷阱綁住了"
-
 #. ~ %s is bodypart name in accusative.
 #: src/trapfunc.cpp
 #, c-format
@@ -206528,6 +210205,12 @@ msgstr "<npcname> 摔下一層樓!"
 msgid "You fall down under %s!"
 msgstr "你摔到了 %s 下面!"
 
+#: src/trapfunc.cpp
+#, c-format
+msgid "You fall down %d story!"
+msgid_plural "You fall down %d stories!"
+msgstr[0] ""
+
 #: src/trapfunc.cpp
 msgid "<npcname> flaps their wings and flutters down gracefully."
 msgstr "<npcname> 拍拍他的翅膀優雅的著陸。"
@@ -206662,6 +210345,10 @@ msgstr "你在教學模式存檔 - 教學模式的世界缺少非常多的要素
 msgid "Select part"
 msgstr "選擇零件"
 
+#: src/veh_interact.cpp
+msgid "<color_white>Time required:</color>\n"
+msgstr "<color_white>所需時間</color>:\n"
+
 #: src/veh_interact.cpp
 msgid "<color_white>Skills required:</color>\n"
 msgstr "<color_white>所需技能</color>:\n"
@@ -209094,8 +212781,8 @@ msgstr "@ %d: %s  "
 
 #: src/wish.cpp
 #, c-format
-msgid "Set '%s' to.."
-msgstr "設定 '%s' 為…"
+msgid "Set '%s' to…"
+msgstr ""
 
 #: src/wish.cpp
 msgid " (current)"
diff --git a/msvc-full-features/Cataclysm-vcpkg-static.vcxproj b/msvc-full-features/Cataclysm-vcpkg-static.vcxproj
index 2b73f119efa58..db3d8484d7126 100644
--- a/msvc-full-features/Cataclysm-vcpkg-static.vcxproj
+++ b/msvc-full-features/Cataclysm-vcpkg-static.vcxproj
@@ -80,7 +80,7 @@
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
       <LinkStatus>true</LinkStatus>
       <AdditionalOptions>/LTCG:OFF %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>winmm.lib;imm32.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;imm32.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>prebuild.cmd</Command>
diff --git a/src/action.cpp b/src/action.cpp
index 1fca4b3a5192c..14895653d9972 100644
--- a/src/action.cpp
+++ b/src/action.cpp
@@ -44,10 +44,10 @@ void load_keyboard_settings( std::map<char, action_id> &keymap,
     const auto parser = [&]( std::istream & fin ) {
         parse_keymap( fin, keymap, unbound_keymap );
     };
-    if( read_from_file_optional( FILENAMES["keymap"], parser ) ) {
-        keymap_file_loaded_from = FILENAMES["keymap"];
-    } else if( read_from_file_optional( FILENAMES["legacy_keymap"], parser ) ) {
-        keymap_file_loaded_from = FILENAMES["legacy_keymap"];
+    if( read_from_file_optional( PATH_INFO::keymap(), parser ) ) {
+        keymap_file_loaded_from = PATH_INFO::keymap();
+    } else if( read_from_file_optional( PATH_INFO::legacy_keymap(), parser ) ) {
+        keymap_file_loaded_from = PATH_INFO::legacy_keymap();
     }
 }
 
@@ -71,7 +71,7 @@ void parse_keymap( std::istream &keymap_txt, std::map<char, action_id> &kmap,
             const action_id act = look_up_action( id );
             if( act == ACTION_NULL ) {
                 debugmsg( "Warning!  keymap.txt contains an unknown action, \"%s\"\n"
-                          "Fix \"%s\" at your next chance!", id, FILENAMES["keymap"] );
+                          "Fix \"%s\" at your next chance!", id, PATH_INFO::keymap() );
             } else {
                 while( !keymap_txt.eof() ) {
                     char ch;
@@ -82,7 +82,7 @@ void parse_keymap( std::istream &keymap_txt, std::map<char, action_id> &kmap,
                         if( kmap.find( ch ) != kmap.end() ) {
                             debugmsg( "Warning!  '%c' assigned twice in the keymap!\n"
                                       "%s is being ignored.\n"
-                                      "Fix \"%s\" at your next chance!", ch, id, FILENAMES["keymap"] );
+                                      "Fix \"%s\" at your next chance!", ch, id, PATH_INFO::keymap() );
                         } else {
                             kmap[ ch ] = act;
                         }
diff --git a/src/action.h b/src/action.h
index 01e266a7000b7..fd8d9dd3979d5 100644
--- a/src/action.h
+++ b/src/action.h
@@ -322,7 +322,7 @@ enum action_id : int {
  *  Sets the state of a keymap in memory to the state of a keymap state saved to disk.
  *  The actual filename we read the keymap from is returned by reference, not specified in this
  *  function call.  The filename used is set elsewhere (in a variety of places).  Take a look at
- *  @ref FILENAMES to see where this happens.  The returned file name is used to detect errors, such
+ *  @ref path_info to see where this happens.  The returned file name is used to detect errors, such
  *  as a non-existent file or a file that didn't actually contain a keymap.
  *
  *  Output is returned as two separate maps:
diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp
index c0817e18ed716..0bcc670e7c2e3 100644
--- a/src/activity_handlers.cpp
+++ b/src/activity_handlers.cpp
@@ -176,9 +176,6 @@ activity_handlers::do_turn_functions = {
     { activity_id( "ACT_DIG_CHANNEL" ), dig_channel_do_turn },
     { activity_id( "ACT_FILL_PIT" ), fill_pit_do_turn },
     { activity_id( "ACT_MULTIPLE_CHOP_PLANKS" ), multiple_chop_planks_do_turn },
-    { activity_id( "ACT_TILL_PLOT" ), till_plot_do_turn },
-    { activity_id( "ACT_HARVEST_PLOT" ), harvest_plot_do_turn },
-    { activity_id( "ACT_PLANT_PLOT" ), plant_plot_do_turn },
     { activity_id( "ACT_FERTILIZE_PLOT" ), fertilize_plot_do_turn },
     { activity_id( "ACT_TRY_SLEEP" ), try_sleep_do_turn },
     { activity_id( "ACT_OPERATION" ), operation_do_turn },
@@ -1941,8 +1938,8 @@ static bool magic_train( player_activity *act, player *p )
             const int expert_multiplier = act->values.empty() ? 0 : act->values[0];
             const int xp = roll_remainder( studying.exp_modifier( *p ) * expert_multiplier );
             studying.gain_exp( xp );
-            p->add_msg_if_player( m_good, _( "You learn a little about the spell : %s" ),
-                                  sp_id->name.translated() );
+            p->add_msg_if_player( m_good, _( "You learn a little about the spell: %s" ),
+                                  sp_id->name );
         } else {
             p->magic.learn_spell( act->name, *p );
             // you can decline to learn this spell , as it may lock you out of other magic.
@@ -2909,6 +2906,9 @@ void activity_handlers::read_do_turn( player_activity *act, player *p )
 
 void activity_handlers::read_finish( player_activity *act, player *p )
 {
+    if( !act->targets.front() ) {
+        debugmsg( "Lost target of ACT_READ" );
+    }
     if( p->is_npc() ) {
         npc *guy = dynamic_cast<npc *>( p );
         guy->finish_read( * act->targets.front().get_item() );
@@ -3481,7 +3481,14 @@ void activity_handlers::craft_do_turn( player_activity *act, player *p )
             }
         }
     } else if( craft->item_counter >= craft->get_next_failure_point() ) {
-        craft->handle_craft_failure( *p );
+        bool destroy = craft->handle_craft_failure( *p );
+        // If the craft needs to be destroyed, do it and stop crafting.
+        if( destroy ) {
+            p->add_msg_player_or_npc( _( "There is nothing left of the %s to craft from." ),
+                                      _( "There is nothing left of the %s <npcname> was crafting." ), craft->tname() );
+            act->targets.front().remove_item();
+            p->cancel_activity();
+        }
     }
 }
 
@@ -3989,39 +3996,6 @@ static void perform_zone_activity_turn( player *p,
     p->activity.set_to_null();
 }
 
-void activity_handlers::harvest_plot_do_turn( player_activity *, player *p )
-{
-    const auto reject_tile = []( const tripoint & tile ) {
-        return !g->m.has_flag_furn( "GROWTH_HARVEST", tile );
-    };
-    const auto harvest = [&]( player & p, const tripoint & tile ) {
-        iexamine::harvest_plant( p, tile, false );
-    };
-    perform_zone_activity_turn( p,
-                                zone_type_id( "FARM_PLOT" ),
-                                reject_tile,
-                                harvest,
-                                _( "You harvested all the plots you could." ) );
-
-}
-
-void activity_handlers::till_plot_do_turn( player_activity *, player *p )
-{
-    const auto reject_tile = []( const tripoint & tile ) {
-        return !g->m.has_flag( "PLOWABLE", tile ) || g->m.has_furn( tile );
-    };
-
-    const auto dig = []( player & p, const tripoint & tile_loc ) {
-        p.assign_activity( activity_id( "ACT_CHURN" ), 18000, -1 );
-        p.activity.placement = g->m.getabs( tile_loc );
-    };
-    perform_zone_activity_turn( p,
-                                zone_type_id( "FARM_PLOT" ),
-                                reject_tile,
-                                dig,
-                                _( "You tilled every tile you could." ) );
-}
-
 void activity_handlers::fertilize_plot_do_turn( player_activity *act, player *p )
 {
     itype_id fertilizer;
@@ -4074,65 +4048,6 @@ void activity_handlers::fertilize_plot_do_turn( player_activity *act, player *p
                                 _( "You fertilized every plot you could." ) );
 }
 
-void activity_handlers::plant_plot_do_turn( player_activity *, player *p )
-{
-    const auto &mgr = zone_manager::get_manager();
-    std::vector<item *> seed_inv = p->items_with( []( const item & itm ) {
-        return itm.is_seed();
-    } );
-
-    // get seeds requested by zones on the tile (local coords)
-    auto get_seeds = [&]( const tripoint & tile ) {
-        auto seeds = std::vector<std::string>();
-        const auto &zones = mgr.get_zones( zone_type_id( "FARM_PLOT" ), g->m.getabs( tile ) );
-        for( const auto &zone : zones ) {
-            const auto options = dynamic_cast<const plot_options &>( zone.get_options() );
-            const auto seed = options.get_seed();
-
-            if( !seed.empty() && std::find( seeds.begin(), seeds.end(), seed ) == seeds.end() ) {
-                seeds.emplace_back( seed );
-            }
-        }
-
-        return seeds;
-    };
-
-    // cleanup unwanted tiles (local coords)
-    const auto reject_tiles = [&]( const tripoint & tile ) {
-        if( !g->m.has_flag_ter_or_furn( "PLANTABLE", tile ) ||
-            g->m.has_items( tile ) ) {
-            return true;
-        }
-
-        const auto seeds = get_seeds( tile );
-
-        return std::all_of( seeds.begin(), seeds.end(), [&]( const std::string & seed ) {
-            return std::all_of( seed_inv.begin(), seed_inv.end(), [seed]( item * it ) {
-                return it->typeId() != itype_id( seed );
-            } );
-        } );
-    };
-
-    const auto plant_appropriate_seed = [&]( player & p, const tripoint & tile_loc ) {
-        const auto seeds = get_seeds( tile_loc );
-        std::vector<item *> seed_inv = p.items_with( [seeds]( const item & itm ) {
-            return itm.is_seed() && std::any_of( seeds.begin(), seeds.end(), [itm]( const std::string & seed ) {
-                return itm.typeId() == itype_id( seed );
-            } );
-        } );
-        if( !seed_inv.empty() ) {
-            const auto it = seed_inv.front();
-            iexamine::plant_seed( p, tile_loc, it->typeId() );
-        }
-    };
-
-    perform_zone_activity_turn( p,
-                                zone_type_id( "FARM_PLOT" ),
-                                reject_tiles,
-                                plant_appropriate_seed,
-                                _( "You planted all seeds you could." ) );
-}
-
 void activity_handlers::robot_control_do_turn( player_activity *act, player *p )
 {
     if( act->monsters.empty() ) {
@@ -4244,7 +4159,8 @@ void activity_handlers::tree_communion_do_turn( player_activity *act, player *p
                 p->add_morale( MORALE_TREE_COMMUNION, 1, 15, 2_hours, 1_hours );
             }
             if( one_in( 128 ) ) {
-                p->add_msg_if_player( SNIPPET.random_from_category( "tree_communion" ) );
+                p->add_msg_if_player( "%s", SNIPPET.random_from_category( "tree_communion" ).value_or(
+                                          translation() ) );
             }
             return;
         }
diff --git a/src/activity_handlers.h b/src/activity_handlers.h
index 56dca804cd385..dd6f471d75bf2 100644
--- a/src/activity_handlers.h
+++ b/src/activity_handlers.h
@@ -160,10 +160,7 @@ void dig_do_turn( player_activity *act, player *p );
 void build_do_turn( player_activity *act, player *p );
 void dig_channel_do_turn( player_activity *act, player *p );
 void fill_pit_do_turn( player_activity *act, player *p );
-void till_plot_do_turn( player_activity *act, player *p );
-void plant_plot_do_turn( player_activity *act, player *p );
 void fertilize_plot_do_turn( player_activity *act, player *p );
-void harvest_plot_do_turn( player_activity *act, player *p );
 void try_sleep_do_turn( player_activity *act, player *p );
 void operation_do_turn( player_activity *act, player *p );
 void robot_control_do_turn( player_activity *act, player *p );
diff --git a/src/activity_item_handling.cpp b/src/activity_item_handling.cpp
index 057e3af1146e4..b2ca7fe5236a6 100644
--- a/src/activity_item_handling.cpp
+++ b/src/activity_item_handling.cpp
@@ -1801,21 +1801,6 @@ static std::vector<std::tuple<tripoint, itype_id, int>> requirements_map( player
     return final_map;
 }
 
-static bool plant_activity( player &p, const zone_data *zone, const tripoint src_loc )
-{
-    const std::string seed = dynamic_cast<const plot_options &>( zone->get_options() ).get_seed();
-    std::vector<item *> seed_inv = p.items_with( [seed]( const item & itm ) {
-        return itm.typeId() == itype_id( seed );
-    } );
-    // we dont have the required seed, even though we should at this point.
-    // move onto the next tile, and if need be that will prompt a fetch seeds activity.
-    if( seed_inv.empty() ) {
-        return false;
-    }
-    iexamine::plant_seed( p, src_loc, itype_id( seed ) );
-    return true;
-}
-
 static void construction_activity( player &p, const zone_data *zone, const tripoint src_loc,
                                    const activity_reason_info &act_info, const std::vector<construction> &list_constructions,
                                    activity_id activity_to_restore )
@@ -2327,7 +2312,8 @@ static void check_npc_revert( player &p )
     }
 }
 
-static zone_type_id get_zone_for_act( const activity_id &act_id )
+static zone_type_id get_zone_for_act( const tripoint &src_loc, const zone_manager &mgr,
+                                      const activity_id &act_id )
 {
     zone_type_id ret = zone_type_id( "" );
     if( act_id == activity_id( "ACT_VEHICLE_DECONSTRUCTION" ) ) {
@@ -2354,6 +2340,12 @@ static zone_type_id get_zone_for_act( const activity_id &act_id )
     if( act_id == activity_id( "ACT_MULTIPLE_FISH" ) ) {
         ret = zone_type_id( "FISHING_SPOT" );
     }
+    if( src_loc != tripoint_zero && act_id == activity_id( "ACT_FETCH_REQUIRED" ) ) {
+        const zone_data *zd = mgr.get_zone_at( g->m.getabs( src_loc ) );
+        if( zd ) {
+            ret = zd->get_type();
+        }
+    }
     return ret;
 }
 
@@ -2401,7 +2393,7 @@ static std::unordered_set<tripoint> generic_multi_activity_locations( player &p,
             }
         }
     }
-    zone_type_id zone_type = get_zone_for_act( act_id );
+    zone_type_id zone_type = get_zone_for_act( tripoint_zero, mgr, act_id );
     if( act_id != activity_id( "ACT_FETCH_REQUIRED" ) ) {
         src_set = mgr.get_near( zone_type_id( zone_type ), abspos, ACTIVITY_SEARCH_DISTANCE );
         // multiple construction will form a list of targets based on blueprint zones and unfinished constructions
@@ -2413,6 +2405,8 @@ static std::unordered_set<tripoint> generic_multi_activity_locations( player &p,
                 }
             }
             // farming activies encompass tilling, planting, harvesting.
+        } else if( act_id == activity_id( "ACT_MULTIPLE_FARM" ) ) {
+            dark_capable = true;
         }
     } else {
         dark_capable = true;
@@ -2466,7 +2460,7 @@ static bool generic_multi_activity_check_requirement( player &p, const activity_
 
     bool &can_do_it = act_info.can_do;
     const do_activity_reason &reason = act_info.reason;
-    const zone_data *zone = mgr.get_zone_at( src );
+    const zone_data *zone = mgr.get_zone_at( src, get_zone_for_act( src_loc, mgr, act_id ) );
 
     const bool needs_to_be_in_zone = act_id == activity_id( "ACT_FETCH_REQUIRED" ) ||
                                      act_id == activity_id( "ACT_MULTIPLE_FARM" ) ||
@@ -2496,7 +2490,8 @@ static bool generic_multi_activity_check_requirement( player &p, const activity_
             p.add_msg_if_player( m_info, _( "There is something blocking the location for this task." ) );
         }
         return true;
-    } else if( reason == NO_COMPONENTS || reason == NEEDS_PLANTING ||
+    } else if( reason == NO_COMPONENTS || reason == NO_COMPONENTS_PREREQ ||
+               reason == NO_COMPONENTS_PREREQ_2 || reason == NEEDS_PLANTING ||
                reason == NEEDS_TILLING || reason == NEEDS_CHOPPING || reason == NEEDS_BUTCHERING ||
                reason == NEEDS_BIG_BUTCHERING || reason == NEEDS_VEH_DECONST || reason == NEEDS_VEH_REPAIR ||
                reason == NEEDS_TREE_CHOPPING ||
@@ -2633,7 +2628,7 @@ static bool generic_multi_activity_do( player &p, const activity_id &act_id,
     const std::vector<construction> &list_constructions = get_constructions();
 
     const do_activity_reason &reason = act_info.reason;
-    const zone_data *zone = mgr.get_zone_at( src, get_zone_for_act( act_id ) );
+    const zone_data *zone = mgr.get_zone_at( src, get_zone_for_act( src_loc, mgr, act_id ) );
 
     // something needs to be done, now we are there.
     // it was here earlier, in the space of one turn, maybe it got harvested by someone else.
@@ -2646,8 +2641,20 @@ static bool generic_multi_activity_do( player &p, const activity_id &act_id,
         p.activity.placement = src;
         return false;
     } else if( reason == NEEDS_PLANTING && g->m.has_flag_ter_or_furn( "PLANTABLE", src_loc ) ) {
-        if( !plant_activity( p, zone, src_loc ) ) {
-            return true;
+        std::vector<zone_data> zones = mgr.get_zones( zone_type_id( "FARM_PLOT" ),
+                                       g->m.getabs( src_loc ) );
+        for( const zone_data &zone : zones ) {
+            const std::string seed = dynamic_cast<const plot_options &>( zone.get_options() ).get_seed();
+            std::vector<item *> seed_inv = p.items_with( [seed]( const item & itm ) {
+                return itm.typeId() == itype_id( seed );
+            } );
+            // we dont have the required seed, even though we should at this point.
+            // move onto the next tile, and if need be that will prompt a fetch seeds activity.
+            if( seed_inv.empty() ) {
+                continue;
+            }
+            iexamine::plant_seed( p, src_loc, itype_id( seed ) );
+            break;
         }
     } else if( reason == NEEDS_CHOPPING && p.has_quality( quality_id( "AXE" ), 1 ) ) {
         if( chop_plank_activity( p, src_loc ) ) {
diff --git a/src/addiction.cpp b/src/addiction.cpp
index 958ea4ab76490..18a8e7251c3ba 100644
--- a/src/addiction.cpp
+++ b/src/addiction.cpp
@@ -5,7 +5,7 @@
 #include <utility>
 
 #include "morale_types.h"
-#include "player.h"
+#include "character.h"
 #include "pldata.h"
 #include "rng.h"
 #include "translations.h"
@@ -47,9 +47,9 @@ std::string enum_to_string<add_type>( add_type data )
 
 } // namespace io
 
-void marloss_add( player &u, int in, const char *msg );
+void marloss_add( Character &u, int in, const char *msg );
 
-void addict_effect( player &u, addiction &add )
+void addict_effect( Character &u, addiction &add )
 {
     const int in = std::min( 20, add.intensity );
     const int current_stim = u.get_stim();
@@ -381,7 +381,7 @@ std::string addiction_text( const addiction &cur )
     return "You crave to report this bug.";
 }
 
-void marloss_add( player &u, int in, const char *msg )
+void marloss_add( Character &u, int in, const char *msg )
 {
     if( one_in( 800 - 20 * in ) ) {
         u.add_morale( MORALE_CRAVING_MARLOSS, -5, -25 );
diff --git a/src/addiction.h b/src/addiction.h
index 6e8f273180349..ca0c0f10e964d 100644
--- a/src/addiction.h
+++ b/src/addiction.h
@@ -7,7 +7,7 @@
 #include "type_id.h"
 
 class addiction;
-class player;
+class Character;
 
 enum add_type : int;
 
@@ -16,7 +16,7 @@ constexpr int MAX_ADDICTION_LEVEL = 20;
 
 // cancel_activity is called when the addiction effect wants to interrupt the player
 // with an optional pre-translated message.
-void addict_effect( player &u, addiction &add );
+void addict_effect( Character &u, addiction &add );
 
 std::string addiction_type_name( add_type cur );
 
diff --git a/src/advanced_inv.cpp b/src/advanced_inv.cpp
index 5d2e37eb302c1..5a0bf631e8f2e 100644
--- a/src/advanced_inv.cpp
+++ b/src/advanced_inv.cpp
@@ -17,6 +17,7 @@
 #include "messages.h"
 #include "options.h"
 #include "output.h"
+#include "panels.h"
 #include "player.h"
 #include "player_activity.h"
 #include "string_formatter.h"
@@ -79,7 +80,7 @@ advanced_inventory::advanced_inventory()
     : head_height( 5 )
     , min_w_height( 10 )
     , min_w_width( FULL_SCREEN_WIDTH )
-    , max_w_width( 120 )
+    , max_w_width( get_option<bool>( "AIM_WIDTH" ) ? TERMX : std::max( 120, TERMX - 2 * ( panel_manager::get_manager().get_width_right() + panel_manager::get_manager().get_width_left() ) ) )
     , inCategoryMode( false )
     , recalc( true )
     , redraw( true )
@@ -1384,10 +1385,10 @@ void advanced_inventory::display()
                 std::vector<iteminfo> vThisItem;
                 std::vector<iteminfo> vDummy;
                 it.info( true, vThisItem );
-                int iDummySelect = 0;
-                ret = draw_item_info( info_startx,
-                                      info_width, 0, 0, it.tname(), it.type_name(), vThisItem, vDummy, iDummySelect,
-                                      false, false, true ).get_first_input();
+
+                item_info_data data( it.tname(), it.type_name(), vThisItem, vDummy );
+
+                ret = draw_item_info( info_startx, info_width, 0, 0, data ).get_first_input();
             }
             if( ret == KEY_NPAGE || ret == KEY_DOWN ) {
                 spane.scroll_by( +1 );
@@ -1440,7 +1441,7 @@ void advanced_inventory::display()
                     redraw = true;
                 }
             } else {
-                popup( _( "No vehicle there!" ) );
+                popup( _( "No vehicle storage space there!" ) );
                 redraw = true;
             }
         }
diff --git a/src/advanced_inv_area.cpp b/src/advanced_inv_area.cpp
index 7ad84a4c403bf..bae9022b63316 100644
--- a/src/advanced_inv_area.cpp
+++ b/src/advanced_inv_area.cpp
@@ -40,7 +40,6 @@
 #include <utility>
 #include <numeric>
 
-
 int advanced_inv_area::get_item_count() const
 {
     if( id == AIM_INVENTORY ) {
@@ -181,7 +180,6 @@ void advanced_inv_area::init()
     }
 }
 
-
 units::volume advanced_inv_area::free_volume( bool in_vehicle ) const
 {
     assert( id != AIM_ALL ); // should be a specific location instead
@@ -403,7 +401,6 @@ void advanced_inv_area::set_container_position()
     }
 }
 
-
 aim_location advanced_inv_area::offset_to_location() const
 {
     static aim_location loc_array[3][3] = {
diff --git a/src/artifact.cpp b/src/artifact.cpp
index 32f37668474ac..03c852e4b7527 100644
--- a/src/artifact.cpp
+++ b/src/artifact.cpp
@@ -261,16 +261,16 @@ enum artifact_armor_form {
 };
 
 static const std::array<artifact_shape_datum, ARTSHAPE_MAX> artifact_shape_data = { {
-        {translate_marker( "sphere" ), translate_marker( "smooth sphere" ), 500_ml, 1000_ml, 1_gram, 1150_gram},
+        {translate_marker( "sphere" ), translate_marker( "smooth sphere" ), 500_ml, 1_liter, 1_gram, 1150_gram},
         {translate_marker( "rod" ), translate_marker( "tapered rod" ), 250_ml, 1750_ml, 1_gram, 800_gram},
         {translate_marker( "teardrop" ), translate_marker( "teardrop-shaped stone" ), 500_ml, 1500_ml, 1_gram, 950_gram},
-        {translate_marker( "lamp" ), translate_marker( "hollow, transparent cube" ), 1000_ml, 225_ml, 1_gram, 350_gram},
-        {translate_marker( "snake" ), translate_marker( "winding, flexible rod" ), 0_ml, 2000_ml, 1_gram, 950_gram},
-        {translate_marker( "disc" ), translate_marker( "smooth disc" ), 1000_ml, 1500_ml, 200_gram, 400_gram},
+        {translate_marker( "lamp" ), translate_marker( "hollow, transparent cube" ), 1_liter, 225_ml, 1_gram, 350_gram},
+        {translate_marker( "snake" ), translate_marker( "winding, flexible rod" ), 0_ml, 2_liter, 1_gram, 950_gram},
+        {translate_marker( "disc" ), translate_marker( "smooth disc" ), 1_liter, 1500_ml, 200_gram, 400_gram},
         {translate_marker( "beads" ), translate_marker( "string of beads" ), 750_ml, 1750_ml, 1_gram, 700_gram},
         {translate_marker( "napkin" ), translate_marker( "very thin sheet" ), 0_ml, 750_ml, 1_gram, 350_gram},
         {translate_marker( "urchin" ), translate_marker( "spiked sphere" ), 750_ml, 1250_ml, 200_gram, 700_gram},
-        {translate_marker( "jelly" ), translate_marker( "malleable blob" ), 500_ml, 2000_ml, 200_gram, 450_gram},
+        {translate_marker( "jelly" ), translate_marker( "malleable blob" ), 500_ml, 2_liter, 200_gram, 450_gram},
         {translate_marker( "spiral" ), translate_marker( "spiraling rod" ), 1250_ml, 1500_ml, 200_gram, 350_gram},
         {translate_marker( "pin" ), translate_marker( "pointed rod" ), 250_ml, 1250_ml, 100_gram, 1050_gram},
         {translate_marker( "tube" ), translate_marker( "hollow tube" ), 500_ml, 1250_ml, 350_gram, 700_gram},
@@ -413,22 +413,22 @@ static const std::array<artifact_property_datum, ARTPROP_MAX> artifact_property_
 };
 static const std::array<artifact_tool_form_datum, NUM_ARTTOOLFORMS> artifact_tool_form_data = { {
         {
-            translate_marker( "Harp" ), ';', def_c_yellow, material_id( "wood" ), 5000_ml, 7500_ml, 1150_gram, 2100_gram, ARTWEAP_BULK,
+            translate_marker( "Harp" ), ';', def_c_yellow, material_id( "wood" ), 5_liter, 7500_ml, 1150_gram, 2100_gram, ARTWEAP_BULK,
             {{ARTWEAP_SPEAR, ARTWEAP_SWORD, ARTWEAP_KNIFE}}
         },
 
         {
-            translate_marker( "Staff" ), '/', def_c_brown, material_id( "wood" ), 1500_ml, 3000_ml, 450_gram, 1150_gram, ARTWEAP_CLUB,
+            translate_marker( "Staff" ), '/', def_c_brown, material_id( "wood" ), 1500_ml, 3_liter, 450_gram, 1150_gram, ARTWEAP_CLUB,
             {{ARTWEAP_BULK, ARTWEAP_SPEAR, ARTWEAP_KNIFE}}
         },
 
         {
-            translate_marker( "Sword" ), '/', def_c_light_blue, material_id( "steel" ), 2000_ml, 3500_ml, 900_gram, 3259_gram, ARTWEAP_SWORD,
+            translate_marker( "Sword" ), '/', def_c_light_blue, material_id( "steel" ), 2_liter, 3500_ml, 900_gram, 3259_gram, ARTWEAP_SWORD,
             {{ARTWEAP_BULK, NUM_ARTWEAPS, NUM_ARTWEAPS}}
         },
 
         {
-            translate_marker( "Dagger" ), ';', def_c_light_blue, material_id( "steel" ), 250_ml, 1000_ml, 100_gram, 700_gram, ARTWEAP_KNIFE,
+            translate_marker( "Dagger" ), ';', def_c_light_blue, material_id( "steel" ), 250_ml, 1_liter, 100_gram, 700_gram, ARTWEAP_KNIFE,
             {{NUM_ARTWEAPS, NUM_ARTWEAPS, NUM_ARTWEAPS}}
         },
 
@@ -460,7 +460,7 @@ static const std::array<artifact_armor_form_datum, NUM_ARTARMFORMS> artifact_arm
         },
 
         {
-            translate_marker( "Coat" ),   def_c_brown, material_id( "leather" ),   3500_ml, 1600_gram,  2,  2,  80, 2,  1,  4,  1000_ml, -6,  0, -3,
+            translate_marker( "Coat" ),   def_c_brown, material_id( "leather" ),   3500_ml, 1600_gram,  2,  2,  80, 2,  1,  4,  1_liter, -6,  0, -3,
             { bp_torso }, false,
             {{
                     ARMORMOD_LIGHT, ARMORMOD_POCKETED, ARMORMOD_FURRED, ARMORMOD_PADDED,
@@ -470,7 +470,7 @@ static const std::array<artifact_armor_form_datum, NUM_ARTARMFORMS> artifact_arm
         },
 
         {
-            translate_marker( "Mask" ),   def_c_white, material_id( "wood" ),      1000_ml, 100_gram,  2,  2,  50, 2,  1,  2,  0_ml,  2,  0, -2,
+            translate_marker( "Mask" ),   def_c_white, material_id( "wood" ),      1_liter, 100_gram,  2,  2,  50, 2,  1,  2,  0_ml,  2,  0, -2,
             { { bp_eyes, bp_mouth } }, false,
             {{
                     ARMORMOD_FURRED, ARMORMOD_FURRED, ARMORMOD_NULL, ARMORMOD_NULL,
@@ -532,38 +532,38 @@ static const std::array<artifact_armor_form_datum, NUM_ARMORMODS> artifact_armor
         {
             translate_marker( "very thin and light." ), def_c_white, material_id( "null" ),
             // Vol   Wgt Enc MaxEnc Cov Thk Env Wrm Sto
-            -1000_ml, -950_gram, -2, -2, -1, -1, -1, -1,  0_ml, 0, 0, 0, {},  false,
+            -1_liter, -950_gram, -2, -2, -1, -1, -1, -1,  0_ml, 0, 0, 0, {},  false,
             {{ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL}}
         },
 
         {
             translate_marker( "extremely bulky." ), def_c_white, material_id( "null" ),
-            2000_ml, 1150_gram,  2,  2,  1,  1,  0,  1,  0_ml, 0, 0, 0, {},  false,
+            2_liter, 1150_gram,  2,  2,  1,  1,  0,  1,  0_ml, 0, 0, 0, {},  false,
             {{ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL}}
         },
 
         {
             translate_marker( "covered in pockets." ), def_c_white, material_id( "null" ),
-            250_ml, 150_gram,  1,  1,  0,  0,  0,  0, 4000_ml, 0, 0, 0, {},  false,
+            250_ml, 150_gram,  1,  1,  0,  0,  0,  0, 4_liter, 0, 0, 0, {},  false,
             {{ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL}}
         },
 
         {
             translate_marker( "disgustingly furry." ), def_c_white, material_id( "wool" ),
             // Vol  Wgt Enc MaxEnc Dmg Cut Env Wrm Sto
-            1000_ml, 250_gram,  1,  1,  1,  1,  1,  3,  0_ml, 0, 0, 0, {},  false,
+            1_liter, 250_gram,  1,  1,  1,  1,  1,  3,  0_ml, 0, 0, 0, {},  false,
             {{ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL}}
         },
 
         {
             translate_marker( "leather-padded." ), def_c_white, material_id( "leather" ),
-            1000_ml, 450_gram,  1,  1,  1,  1,  0,  1, -750_ml, 0, 0, 0, {},  false,
+            1_liter, 450_gram,  1,  1,  1,  1,  0,  1, -750_ml, 0, 0, 0, {},  false,
             {{ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL}}
         },
 
         {
             translate_marker( "plated in iron." ), def_c_white, material_id( "iron" ),
-            1000_ml, 1400_gram,  3,  3,  2,  2,  0,  1, -1000_ml, 0, 0, 0, {}, false,
+            1_liter, 1400_gram,  3,  3,  2,  2,  0,  1, -1_liter, 0, 0, 0, {}, false,
             {{ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL, ARMORMOD_NULL}}
         },
     }
diff --git a/src/auto_pickup.cpp b/src/auto_pickup.cpp
index 0dcb61d57efed..b852d416b0fe9 100644
--- a/src/auto_pickup.cpp
+++ b/src/auto_pickup.cpp
@@ -667,7 +667,7 @@ bool player_settings::save_global()
 
 bool player_settings::save( const bool bCharacter )
 {
-    auto savefile = FILENAMES["autopickup"];
+    auto savefile = PATH_INFO::autopickup();
 
     if( bCharacter ) {
         savefile = g->get_player_base_save_path() + ".apu.json";
@@ -696,7 +696,7 @@ void player_settings::load_global()
 
 void player_settings::load( const bool bCharacter )
 {
-    std::string sFile = FILENAMES["autopickup"];
+    std::string sFile = PATH_INFO::autopickup();
     if( bCharacter ) {
         sFile = g->get_player_base_save_path() + ".apu.json";
     }
@@ -754,7 +754,7 @@ void rule_list::deserialize( JsonIn &jsin )
 
 bool player_settings::load_legacy( const bool bCharacter )
 {
-    std::string sFile = FILENAMES["legacy_autopickup2"];
+    std::string sFile = PATH_INFO::legacy_autopickup2();
 
     if( bCharacter ) {
         sFile = g->get_player_base_save_path() + ".apu.txt";
@@ -768,7 +768,7 @@ bool player_settings::load_legacy( const bool bCharacter )
     const auto &reader = std::bind( &rule_list::load_legacy_rules, std::ref( rules ), _1 );
     if( !read_from_file_optional( sFile, reader ) ) {
         if( !bCharacter ) {
-            return read_from_file_optional( FILENAMES["legacy_autopickup"], reader );
+            return read_from_file_optional( PATH_INFO::legacy_autopickup(), reader );
         } else {
             return false;
         }
diff --git a/src/avatar.cpp b/src/avatar.cpp
index 6d97230b62f5c..ed702634113e8 100644
--- a/src/avatar.cpp
+++ b/src/avatar.cpp
@@ -193,6 +193,14 @@ mission *avatar::get_active_mission() const
     return active_mission;
 }
 
+void avatar::reset_all_misions()
+{
+    active_mission = nullptr;
+    active_missions.clear();
+    completed_missions.clear();
+    failed_missions.clear();
+}
+
 tripoint avatar::get_active_mission_target() const
 {
     if( active_mission == nullptr ) {
@@ -1530,3 +1538,143 @@ bool avatar::wield( item &target )
 
     return true;
 }
+
+bool avatar::invoke_item( item *used, const tripoint &pt )
+{
+    const std::map<std::string, use_function> &use_methods = used->type->use_methods;
+
+    if( use_methods.empty() ) {
+        return false;
+    } else if( use_methods.size() == 1 ) {
+        return invoke_item( used, use_methods.begin()->first, pt );
+    }
+
+    uilist umenu;
+
+    umenu.text = string_format( _( "What to do with your %s?" ), used->tname() );
+    umenu.hilight_disabled = true;
+
+    for( const auto &e : use_methods ) {
+        const auto res = e.second.can_call( *this, *used, false, pt );
+        umenu.addentry_desc( MENU_AUTOASSIGN, res.success(), MENU_AUTOASSIGN, e.second.get_name(),
+                             res.str() );
+    }
+
+    umenu.desc_enabled = std::any_of( umenu.entries.begin(),
+    umenu.entries.end(), []( const uilist_entry & elem ) {
+        return !elem.desc.empty();
+    } );
+
+    umenu.query();
+
+    int choice = umenu.ret;
+    if( choice < 0 || choice >= static_cast<int>( use_methods.size() ) ) {
+        return false;
+    }
+
+    const std::string &method = std::next( use_methods.begin(), choice )->first;
+
+    return invoke_item( used, method, pt );
+}
+
+bool avatar::invoke_item( item *used )
+{
+    return Character::invoke_item( used );
+}
+
+bool avatar::invoke_item( item *used, const std::string &method, const tripoint &pt )
+{
+    return Character::invoke_item( used, method, pt );
+}
+
+bool avatar::invoke_item( item *used, const std::string &method )
+{
+    return Character::invoke_item( used, method );
+}
+
+points_left::points_left()
+{
+    limit = MULTI_POOL;
+    init_from_options();
+}
+
+void points_left::init_from_options()
+{
+    stat_points = get_option<int>( "INITIAL_STAT_POINTS" );
+    trait_points = get_option<int>( "INITIAL_TRAIT_POINTS" );
+    skill_points = get_option<int>( "INITIAL_SKILL_POINTS" );
+}
+
+// Highest amount of points to spend on stats without points going invalid
+int points_left::stat_points_left() const
+{
+    switch( limit ) {
+        case FREEFORM:
+        case ONE_POOL:
+            return stat_points + trait_points + skill_points;
+        case MULTI_POOL:
+            return std::min( trait_points_left(),
+                             stat_points + std::min( 0, trait_points + skill_points ) );
+        case TRANSFER:
+            return 0;
+    }
+
+    return 0;
+}
+
+int points_left::trait_points_left() const
+{
+    switch( limit ) {
+        case FREEFORM:
+        case ONE_POOL:
+            return stat_points + trait_points + skill_points;
+        case MULTI_POOL:
+            return stat_points + trait_points + std::min( 0, skill_points );
+        case TRANSFER:
+            return 0;
+    }
+
+    return 0;
+}
+
+int points_left::skill_points_left() const
+{
+    return stat_points + trait_points + skill_points;
+}
+
+bool points_left::is_freeform()
+{
+    return limit == FREEFORM;
+}
+
+bool points_left::is_valid()
+{
+    return is_freeform() ||
+           ( stat_points_left() >= 0 && trait_points_left() >= 0 &&
+             skill_points_left() >= 0 );
+}
+
+bool points_left::has_spare()
+{
+    return !is_freeform() && is_valid() && skill_points_left() > 0;
+}
+
+std::string points_left::to_string()
+{
+    if( limit == MULTI_POOL ) {
+        return string_format(
+                   _( "Points left: <color_%s>%d</color>%c<color_%s>%d</color>%c<color_%s>%d</color>=<color_%s>%d</color>" ),
+                   stat_points_left() >= 0 ? "light_gray" : "red", stat_points,
+                   trait_points >= 0 ? '+' : '-',
+                   trait_points_left() >= 0 ? "light_gray" : "red", abs( trait_points ),
+                   skill_points >= 0 ? '+' : '-',
+                   skill_points_left() >= 0 ? "light_gray" : "red", abs( skill_points ),
+                   is_valid() ? "light_gray" : "red", stat_points + trait_points + skill_points );
+    } else if( limit == ONE_POOL ) {
+        return string_format( _( "Points left: %4d" ), skill_points_left() );
+    } else if( limit == TRANSFER ) {
+        return _( "Character Transfer: No changes can be made." );
+    } else {
+        return _( "Freeform" );
+    }
+}
diff --git a/src/avatar.h b/src/avatar.h
index 0fa6038aa3041..d67abc1ca8571 100644
--- a/src/avatar.h
+++ b/src/avatar.h
@@ -44,6 +44,7 @@ class avatar : public player
         bool create( character_type type, const std::string &tempname = "" );
         void randomize( bool random_scenario, points_left &points, bool play_now = false );
         bool load_template( const std::string &template_name, points_left &points );
+        void save_template( const std::string &name, const points_left &points );
 
         bool is_avatar() const override {
             return true;
@@ -80,6 +81,8 @@ class avatar : public player
         void update_mental_focus();
         /** Resets stats, and applies effects in an idempotent manner */
         void reset_stats() override;
+        /** Resets all missions before saving character to template */
+        void reset_all_misions();
 
         std::vector<mission *> get_active_missions() const;
         std::vector<mission *> get_completed_missions() const;
@@ -174,6 +177,12 @@ class avatar : public player
 
         bool wield( item &target ) override;
 
+        using Character::invoke_item;
+        bool invoke_item( item *, const tripoint &pt ) override;
+        bool invoke_item( item * ) override;
+        bool invoke_item( item *, const std::string &, const tripoint &pt ) override;
+        bool invoke_item( item *, const std::string & ) override;
+
     private:
         map_memory player_map_memory;
         bool show_map_memory;
@@ -213,4 +222,28 @@ class avatar : public player
         int per_upgrade = 0;
 };
 
+struct points_left {
+    int stat_points;
+    int trait_points;
+    int skill_points;
+
+    enum point_limit : int {
+        FREEFORM = 0,
+        ONE_POOL,
+        MULTI_POOL,
+        TRANSFER,
+    } limit;
+
+    points_left();
+    void init_from_options();
+    // Highest amount of points to spend on stats without points going invalid
+    int stat_points_left() const;
+    int trait_points_left() const;
+    int skill_points_left() const;
+    bool is_freeform();
+    bool is_valid();
+    bool has_spare();
+    std::string to_string();
+};
+
 #endif
diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp
index d44f525876cfa..2da1913ce02a4 100644
--- a/src/avatar_action.cpp
+++ b/src/avatar_action.cpp
@@ -14,8 +14,10 @@
 #include "avatar.h"
 #include "creature.h"
 #include "game.h"
+#include "game_inventory.h"
 #include "input.h"
 #include "item.h"
+#include "item_location.h"
 #include "itype.h"
 #include "line.h"
 #include "map.h"
@@ -526,7 +528,7 @@ void avatar_action::swim( map &m, avatar &you, const tripoint &p )
     if( m.veh_at( you.pos() ).part_with_feature( VPFLAG_BOARDABLE, true ) ) {
         m.board_vehicle( you.pos(), &you );
     }
-    you.moves -= ( movecost > 200 ? 200 : movecost ) * ( trigdist && diagonal ? 1.41 : 1 );
+    you.moves -= ( movecost > 200 ? 200 : movecost ) * ( trigdist && diagonal ? M_SQRT2 : 1 );
     you.inv.rust_iron_items();
 
     if( !you.is_mounted() ) {
@@ -954,3 +956,72 @@ void avatar_action::plthrow( avatar &you, int pos,
     you.throw_item( trajectory.back(), thrown, blind_throw_from_pos );
     g->reenter_fullscreen();
 }
+
+static void make_active( item_location loc )
+{
+    switch( loc.where() ) {
+        case item_location::type::map:
+            g->m.make_active( loc );
+            break;
+        case item_location::type::vehicle:
+            g->m.veh_at( loc.position() )->vehicle().make_active( loc );
+            break;
+        default:
+            break;
+    }
+}
+
+static void update_lum( item_location loc, bool add )
+{
+    switch( loc.where() ) {
+        case item_location::type::map:
+            g->m.update_lum( loc, add );
+            break;
+        default:
+            break;
+    }
+}
+
+void avatar_action::use_item( avatar &you )
+{
+    item_location loc;
+    avatar_action::use_item( you, loc );
+}
+
+void avatar_action::use_item( avatar &you, item_location &loc )
+{
+    bool use_loc = false;
+
+    if( !loc ) {
+        loc = game_menus::inv::use( you );
+
+        if( !loc ) {
+            add_msg( _( "Never mind." ) );
+            return;
+        }
+
+        const item &it = *loc.get_item();
+        if( it.has_flag( "ALLOWS_REMOTE_USE" ) ) {
+            use_loc = true;
+        } else {
+            int obtain_cost = loc.obtain_cost( you );
+            loc.obtain( you );
+            // This method only handles items in te inventory, so refund the obtain cost.
+            you.mod_moves( obtain_cost );
+        }
+    }
+
+    g->refresh_all();
+
+    if( use_loc ) {
+        update_lum( loc, false );
+        you.use( loc );
+        update_lum( loc, true );
+
+        make_active( loc );
+    } else {
+        you.use( loc );
+    }
+
+    you.invalidate_crafting_inventory();
+}
diff --git a/src/avatar_action.h b/src/avatar_action.h
index a7331177b4cbe..41253335b7361 100644
--- a/src/avatar_action.h
+++ b/src/avatar_action.h
@@ -9,6 +9,7 @@
 
 class avatar;
 class item;
+class item_location;
 class map;
 struct targeting_data;
 
@@ -58,6 +59,9 @@ bool fire( avatar &you, map &m, item &weapon, int bp_cost = 0 );
 // Throw an item  't'
 void plthrow( avatar &you, int pos = INT_MIN,
               const cata::optional<tripoint> &blind_throw_from_pos = cata::nullopt );
+
+void use_item( avatar &you, item_location &loc ); // Use item; also tries E,R,W  'a'
+void use_item( avatar &you );
 } // namespace avatar_action
 
 #endif // !AVATAR_MOVE_H
diff --git a/src/basecamp.cpp b/src/basecamp.cpp
index 94170e64986dc..c237140ace9b6 100644
--- a/src/basecamp.cpp
+++ b/src/basecamp.cpp
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "avatar.h"
+#include "clzones.h"
 #include "output.h"
 #include "string_formatter.h"
 #include "translations.h"
@@ -17,6 +18,7 @@
 #include "item_group.h"
 #include "map.h"
 #include "map_iterator.h"
+#include "overmap.h"
 #include "overmapbuffer.h"
 #include "player.h"
 #include "npc.h"
@@ -34,6 +36,9 @@
 #include "flat_set.h"
 #include "line.h"
 
+const zone_type_id z_camp_storage( "CAMP_STORAGE" );
+const zone_type_id z_loot_ignore( "LOOT_IGNORE" );
+
 const std::map<point, base_camps::direction_data> base_camps::all_directions = {
     // direction, direction id, tab order, direction abbreviation with bracket, direction tab title
     { base_camps::base_dir, { "[B]", base_camps::TAB_MAIN, to_translation( "base camp: base", "[B]" ), to_translation( "base camp: base", " MAIN " ) } },
@@ -185,7 +190,8 @@ void basecamp::define_camp( const tripoint &p, const std::string &camp_type )
         e.cur_level = -1;
         e.pos = omt_pos;
         expansions[base_camps::base_dir] = e;
-        overmap_buffer.ter_set( omt_pos, oter_id( "faction_base_camp_0" ) );
+        overmap_buffer.ter_set( omt_pos, oter_id( "faction_base_camp_new_0" +
+                                oter_get_rotation_string( omt_ref ) ) );
         update_provides( base_camps::faction_encode_abs( e, 0 ),
                          expansions[base_camps::base_dir] );
     } else {
@@ -610,8 +616,16 @@ void basecamp::consume_components( const recipe &making, int batch_size )
 void basecamp::form_crafting_inventory( map &target_map )
 {
     _inv.clear();
-    const tripoint &origin = target_map.getlocal( get_dumping_spot() );
-    _inv.form_from_map( target_map, origin, range, nullptr, false, false );
+    const tripoint &dump_spot = get_dumping_spot();
+    const tripoint &origin = target_map.getlocal( dump_spot );
+    auto &mgr = zone_manager::get_manager();
+    if( g->m.check_vehicle_zones( g->get_levz() ) ) {
+        mgr.cache_vzones();
+    }
+    if( mgr.has_near( z_camp_storage, dump_spot, 60 ) ) {
+        std::unordered_set<tripoint> src_set = mgr.get_near( z_camp_storage, dump_spot, 60 );
+        _inv.form_from_zone( target_map, src_set, nullptr, false );
+    }
     /*
      * something of a hack: add the resources we know the camp has
      * the hacky part is that we're adding resources based on the camp's flags, which were
diff --git a/src/bionics.cpp b/src/bionics.cpp
index 5249631636c56..5670fd225c784 100644
--- a/src/bionics.cpp
+++ b/src/bionics.cpp
@@ -531,9 +531,9 @@ bool player::activate_bionic( int b, bool eff_only )
         if( pnt && g->m.is_flammable( *pnt ) ) {
             g->m.add_field( *pnt, fd_fire, 1 );
             mod_moves( -100 );
-            mod_power_level( bionics[bionic_id( "bio_lighter" )].power_activate );
         } else {
             add_msg_if_player( m_info, _( "There's nothing to light there." ) );
+            mod_power_level( bionics[bionic_id( "bio_lighter" )].power_activate );
         }
     } else if( bio.id == "bio_geiger" ) {
         add_msg_if_player( m_info, _( "Your radiation level: %d" ), radiation );
@@ -755,7 +755,7 @@ bool player::activate_bionic( int b, bool eff_only )
     return true;
 }
 
-bool player::deactivate_bionic( int b, bool eff_only )
+bool Character::deactivate_bionic( int b, bool eff_only )
 {
     bionic &bio = ( *my_bionics )[b];
 
@@ -771,12 +771,9 @@ bool player::deactivate_bionic( int b, bool eff_only )
             // It's already off!
             return false;
         }
-        // Compatibility with old saves without the toolset hammerspace
-        if( bio.id == "bio_tools" && !has_bionic( bionic_TOOLS_EXTEND ) ) {
-            add_bionic( bionic_TOOLS_EXTEND ); // E X T E N D    T O O L S
-        }
         if( !bionics[bio.id].toggled ) {
-            // It's a fire-and-forget bionic, we can't turn it off but have to wait for it to run out of charge
+            // It's a fire-and-forget bionic, we can't turn it off but have to wait for
+            //it to run out of charge
             add_msg_if_player( m_info, _( "You can't deactivate your %s manually!" ),
                                bionics[bio.id].name );
             return false;
@@ -798,7 +795,8 @@ bool player::deactivate_bionic( int b, bool eff_only )
         if( weapon.typeId() == bionics[ bio.id ].fake_item ) {
             add_msg_if_player( _( "You withdraw your %s." ), weapon.tname() );
             if( g->u.sees( pos() ) ) {
-                add_msg_if_npc( m_info, _( "<npcname> withdraws %s %s." ), disp_name( true ), weapon.tname() );
+                add_msg_if_npc( m_info, _( "<npcname> withdraws %s %s." ), disp_name( true ),
+                                weapon.tname() );
             }
             bio.ammo_loaded = weapon.ammo_data() != nullptr ? weapon.ammo_data()->get_id() : "null";
             bio.ammo_count = static_cast<unsigned int>( weapon.ammo_remaining() );
@@ -829,37 +827,68 @@ bool player::deactivate_bionic( int b, bool eff_only )
     return true;
 }
 
-bool player::burn_fuel( int b, bool start )
+bool player::deactivate_bionic( int b, bool eff_only )
+{
+    bionic &bio = ( *my_bionics )[b];
+    bool success = Character::deactivate_bionic( b, eff_only );
+    // Compatibility with old saves without the toolset hammerspace
+    if( success && !eff_only && bio.id == "bio_tools" && !has_bionic( bionic_TOOLS_EXTEND ) ) {
+        add_bionic( bionic_TOOLS_EXTEND ); // E X T E N D    T O O L S
+    }
+    return success;
+}
+
+bool Character::burn_fuel( int b, bool start )
 {
     bionic &bio = ( *my_bionics )[b];
     if( bio.info().fuel_opts.empty() || bio.is_this_fuel_powered( "muscle" ) ) {
         return true;
     }
     const bool is_metabolism_powered = bio.is_this_fuel_powered( "metabolism" );
-    const std::vector<itype_id> fuel_available = get_fuel_available( bio.id );
-    const float fuel_efficiency = bio.info().fuel_efficiency;
+    const std::vector<itype_id> &fuel_available = get_fuel_available( bio.id );
+    const float effective_efficiency = get_effective_efficiency( b, bio.info().fuel_efficiency );
 
     if( start && fuel_available.empty() ) {
         add_msg_player_or_npc( m_bad, _( "Your %s does not have enought fuel to start." ),
-                               _( "<npcname>'s %s does not have enought fuel to start." ), bio.info().name );
+                               _( "<npcname>'s %s does not have enought fuel to start." ),
+                               bio.info().name );
         deactivate_bionic( b );
         return false;
     }
-    if( !start ) {// don't produce power on start to avoid instant recharge exploit by turning bionic ON/OFF in the menu
+    // don't produce power on start to avoid instant recharge exploit by turning bionic ON/OFF
+    //in the menu
+    if( !start ) {
         for( const itype_id &fuel : fuel_available ) {
-            const int fuel_energy = item( fuel ).fuel_energy();
+            const item &tmp_fuel = item( fuel );
+            const int fuel_energy = tmp_fuel.fuel_energy();
+            const bool is_perpetual_fuel = tmp_fuel.has_flag( "PERPETUAL" );
 
             int current_fuel_stock;
             if( is_metabolism_powered ) {
-                current_fuel_stock = std::max( 0.0f, get_stored_kcal() - 0.8f * get_healthy_kcal() );
+                current_fuel_stock = std::max( 0.0f, get_stored_kcal() - 0.8f *
+                                               get_healthy_kcal() );
+            } else if( is_perpetual_fuel ) {
+                current_fuel_stock = 1;
             } else {
                 current_fuel_stock = std::stoi( get_value( fuel ) );
             }
 
-            if( get_power_level() + units::from_kilojoule( fuel_energy ) * fuel_efficiency
+            if( !bio.has_flag( "SAFE_FUEL_OFF" ) &&
+                get_power_level() + units::from_kilojoule( fuel_energy ) * effective_efficiency
                 > get_max_power_level() ) {
-                add_msg_player_or_npc( m_info, _( "Your %s turns off to not waste fuel." ),
-                                       _( "<npcname>'s %s turns off to not waste fuel." ), bio.info().name );
+                if( is_metabolism_powered ) {
+                    add_msg_player_or_npc( m_info, _( "Your %s turns off to not waste calories." ),
+                                           _( "<npcname>'s %s turns off to not waste calories." ),
+                                           bio.info().name );
+                } else if( is_perpetual_fuel ) {
+                    add_msg_player_or_npc( m_info, _( "Your %s turns off after filling your power banks." ),
+                                           _( "<npcname>'s %s turns off after filling their power banks." ),
+                                           bio.info().name );
+                } else {
+                    add_msg_player_or_npc( m_info, _( "Your %s turns off to not waste fuel." ),
+                                           _( "<npcname>'s %s turns off to not waste fuel." ),
+                                           bio.info().name );
+                }
                 bio.powered = false;
                 deactivate_bionic( b, true );
                 return false;
@@ -868,26 +897,33 @@ bool player::burn_fuel( int b, bool start )
 
                     if( is_metabolism_powered ) {
                         const int kcal_consumed = fuel_energy;
-                        const units::energy power_gain = kcal_consumed * 4184_J * fuel_efficiency; // 1kcal = 4187 J
+                        // 1kcal = 4187 J
+                        const units::energy power_gain = kcal_consumed * 4184_J * effective_efficiency;
                         mod_stored_kcal( -kcal_consumed );
                         mod_power_level( power_gain );
+                    } else if( is_perpetual_fuel ) {
+                        if( fuel == itype_id( "sunlight" ) ) {
+                            const double modifier = g->natural_light_level( pos().z ) / default_daylight_level();
+                            mod_power_level( units::from_kilojoule( fuel_energy ) * modifier * effective_efficiency );
+                        } else if( fuel == itype_id( "wind" ) ) {
+                            int vehwindspeed = 0;
+                            const optional_vpart_position vp = g->m.veh_at( pos() );
+                            if( vp ) {
+                                vehwindspeed = abs( vp->vehicle().velocity / 100 ); // vehicle velocity in mph
+                            }
+                            const double windpower = get_local_windpower( g->weather.windspeed + vehwindspeed,
+                                                     overmap_buffer.ter( global_omt_location() ), pos(), g->weather.winddirection,
+                                                     g->is_sheltered( pos() ) );
+                            mod_power_level( units::from_kilojoule( fuel_energy ) * windpower * effective_efficiency );
+                        }
                     } else {
                         current_fuel_stock -= 1;
                         set_value( fuel, std::to_string( current_fuel_stock ) );
                         update_fuel_storage( fuel );
-                        mod_power_level( units::from_kilojoule( fuel_energy ) * fuel_efficiency );
+                        mod_power_level( units::from_kilojoule( fuel_energy ) * effective_efficiency );
                     }
 
-                    if( bio.info().exothermic_power_gen ) {
-                        const int heat_prod = fuel_energy * ( 1 - fuel_efficiency );
-                        const int heat_level = std::min( heat_prod / 10, 4 );
-                        const int heat_spread = std::max( heat_prod / 10 - heat_level, 1 );
-                        const emit_id hotness = emit_id( "emit_hot_air" + to_string( heat_level ) + "_cbm" );
-                        g->m.emit_field( pos(), hotness, heat_spread );
-                        for( const auto bp : bio.info().occupied_bodyparts ) {
-                            add_effect( efftype_id( "heating_bionic" ), 2_seconds, bp.first, false, heat_prod );
-                        }
-                    }
+                    heat_emission( b, fuel_energy );
                     g->m.emit_field( pos(), bio.info().power_gen_emission );
                 } else {
 
@@ -898,8 +934,10 @@ bool player::burn_fuel( int b, bool start )
                                                bio.info().name );
                     } else {
                         remove_value( fuel );
-                        add_msg_player_or_npc( m_info, _( "Your %s runs out of fuel and turn off." ),
-                                               _( "<npcname>'s %s runs out of fuel and turn off." ), bio.info().name );
+                        add_msg_player_or_npc( m_info,
+                                               _( "Your %s runs out of fuel and turn off." ),
+                                               _( "<npcname>'s %s runs out of fuel and turn off." ),
+                                               bio.info().name );
                     }
 
                     bio.powered = false;
@@ -912,6 +950,89 @@ bool player::burn_fuel( int b, bool start )
     return true;
 }
 
+void Character::passive_power_gen( int b )
+{
+    const bionic &bio = ( *my_bionics )[b];
+    const float passive_fuel_efficiency = bio.info().passive_fuel_efficiency;
+    if( bio.info().fuel_opts.empty() || bio.is_this_fuel_powered( "muscle" ) ||
+        passive_fuel_efficiency == 0.0 ) {
+        return;
+    }
+    const float effective_passive_efficiency = get_effective_efficiency( b, passive_fuel_efficiency );
+    const std::vector<itype_id> &fuel_available = get_fuel_available( bio.id );
+
+    for( const itype_id &fuel : fuel_available ) {
+        const item &tmp_fuel = item( fuel );
+        const int fuel_energy = tmp_fuel.fuel_energy();
+        if( !tmp_fuel.has_flag( "PERPETUAL" ) ) {
+            continue;
+        }
+
+        if( fuel == itype_id( "sunlight" ) ) {
+            const double modifier = g->natural_light_level( pos().z ) / default_daylight_level();
+            mod_power_level( units::from_kilojoule( fuel_energy ) * modifier * effective_passive_efficiency );
+        } else if( fuel == itype_id( "wind" ) ) {
+            int vehwindspeed = 0;
+            const optional_vpart_position vp = g->m.veh_at( pos() );
+            if( vp ) {
+                vehwindspeed = abs( vp->vehicle().velocity / 100 ); // vehicle velocity in mph
+            }
+            const double windpower = get_local_windpower( g->weather.windspeed + vehwindspeed,
+                                     overmap_buffer.ter( global_omt_location() ), pos(), g->weather.winddirection,
+                                     g->is_sheltered( pos() ) );
+            mod_power_level( units::from_kilojoule( fuel_energy ) * windpower * effective_passive_efficiency );
+        } else {
+            mod_power_level( units::from_kilojoule( fuel_energy ) * effective_passive_efficiency );
+        }
+
+        heat_emission( b, fuel_energy );
+        g->m.emit_field( pos(), bio.info().power_gen_emission );
+
+    }
+}
+
+void Character::heat_emission( int b, int fuel_energy )
+{
+    const bionic &bio = ( *my_bionics )[b];
+    if( !bio.info().exothermic_power_gen ) {
+        return;
+    }
+    const float efficiency = bio.info().fuel_efficiency;
+
+    const int &heat_prod = fuel_energy * ( 1 - efficiency );
+    const int &heat_level = std::min( heat_prod / 10, 4 );
+    const int &heat_spread = std::max( heat_prod / 10 - heat_level, 1 );
+    const emit_id hotness = emit_id( "emit_hot_air" + to_string( heat_level ) + "_cbm" );
+    g->m.emit_field( pos(), hotness, heat_spread );
+    for( const auto bp : bio.info().occupied_bodyparts ) {
+        add_effect( efftype_id( "heating_bionic" ), 2_seconds, bp.first, false, heat_prod );
+    }
+}
+
+float Character::get_effective_efficiency( int b, float fuel_efficiency )
+{
+    const bionic &bio = ( *my_bionics )[b];
+    const cata::optional<float> &coverage_penalty = bio.info().coverage_power_gen_penalty;
+    float effective_efficiency = fuel_efficiency;
+    if( coverage_penalty ) {
+        int coverage = 0;
+        const std::map< body_part, size_t > &occupied_bodyparts = bio.info().occupied_bodyparts;
+        for( const std::pair< body_part, size_t > &elem : occupied_bodyparts ) {
+            for( const item &i : worn ) {
+                if( i.covers( elem.first ) && !i.has_flag( "ALLOWS_NATURAL_ATTACKS" ) &&
+                    !i.has_flag( "SEMITANGIBLE" ) &&
+                    !i.has_flag( "PERSONAL" ) && !i.has_flag( "AURA" ) ) {
+                    coverage += i.get_coverage();
+                }
+            }
+        }
+        effective_efficiency = fuel_efficiency * ( 1.0 - ( coverage / ( 100.0 *
+                               occupied_bodyparts.size() ) )
+                               * coverage_penalty.value() );
+    }
+    return effective_efficiency;
+}
+
 /**
  * @param p the player
  * @param bio the bionic that is meant to be recharged.
@@ -920,7 +1041,7 @@ bool player::burn_fuel( int b, bool start )
  * @param rate divides the number of turns we may charge (rate of 2 discharges in half the time).
  * @return indicates whether we successfully charged the bionic.
  */
-static bool attempt_recharge( player &p, bionic &bio, units::energy &amount, int factor = 1,
+static bool attempt_recharge( Character &p, bionic &bio, units::energy &amount, int factor = 1,
                               int rate = 1 )
 {
     const bionic_data &info = bio.info();
@@ -951,11 +1072,16 @@ static bool attempt_recharge( player &p, bionic &bio, units::energy &amount, int
     return recharged;
 }
 
-void player::process_bionic( int b )
+void Character::process_bionic( int b )
 {
     bionic &bio = ( *my_bionics )[b];
+    if( calendar::once_every( 1_hours ) && !bio.id->fuel_opts.empty() &&
+        bio.has_flag( "AUTO_START_ON" ) && power_level <= 0_mJ ) {
+        g->u.activate_bionic( b );
+    }
     // Only powered bionics should be processed
     if( !bio.powered ) {
+        passive_power_gen( b );
         return;
     }
 
@@ -1861,7 +1987,7 @@ void player::bionics_install_failure( bionic_id bid, std::string installer, int
                  installer );
         // In addition to the bonus, medical residents know enough OR protocol to avoid botching.
         // Take MD and be immune to faulty bionics.
-        if( fail_type == 5 ) {
+        if( fail_type > 3 ) {
             fail_type = rng( 1, 3 );
         }
     }
@@ -1980,38 +2106,7 @@ std::map<body_part, int> player::bionic_installation_issues( const bionic_id &bi
 
 int player::get_total_bionics_slots( const body_part bp ) const
 {
-    switch( bp ) {
-        case bp_torso:
-            return 80;
-
-        case bp_head:
-            return 18;
-
-        case bp_eyes:
-        case bp_mouth:
-            return 4;
-
-        case bp_arm_l:
-        case bp_arm_r:
-            return 20;
-
-        case bp_hand_l:
-        case bp_hand_r:
-            return 5;
-
-        case bp_leg_l:
-        case bp_leg_r:
-            return 30;
-
-        case bp_foot_l:
-        case bp_foot_r:
-            return 7;
-
-        case num_bp:
-            debugmsg( "number of slots for incorrect bodypart is requested!" );
-            return 0;
-    }
-    return 0;
+    return convert_bp( bp )->bionic_slots();
 }
 
 int player::get_free_bionics_slots( const body_part bp ) const
@@ -2200,6 +2295,7 @@ void load_bionic( JsonObject &jsobj )
     assign( jsobj, "weight_capacity_bonus", new_bionic.weight_capacity_bonus, false, 0_gram );
     assign( jsobj, "exothermic_power_gen", new_bionic.exothermic_power_gen );
     assign( jsobj, "power_gen_emission", new_bionic.power_gen_emission );
+    assign( jsobj, "coverage_power_gen_penalty", new_bionic.coverage_power_gen_penalty );
 
     jsobj.read( "canceled_mutations", new_bionic.canceled_mutations );
     jsobj.read( "included_bionics", new_bionic.included_bionics );
@@ -2296,6 +2392,21 @@ void finalize_bionics()
     }
 }
 
+void bionic::set_flag( const std::string flag )
+{
+    bionic_tags.insert( flag );
+}
+
+void bionic::remove_flag( const std::string flag )
+{
+    bionic_tags.erase( flag );
+}
+
+bool bionic::has_flag( const std::string flag ) const
+{
+    return bionic_tags.find( flag ) != bionic_tags.end();
+}
+
 int bionic::get_quality( const quality_id &quality ) const
 {
     const auto &i = info();
@@ -2312,6 +2423,30 @@ bool bionic::is_this_fuel_powered( const itype_id &this_fuel ) const
     return std::find( fuel_op.begin(), fuel_op.end(), this_fuel ) != fuel_op.end();
 }
 
+void bionic::toggle_safe_fuel_mod()
+{
+    if( info().fuel_opts.empty() ) {
+        return;
+    }
+    if( !has_flag( "SAFE_FUEL_OFF" ) ) {
+        set_flag( "SAFE_FUEL_OFF" );
+    } else {
+        remove_flag( "SAFE_FUEL_OFF" );
+    }
+}
+
+void bionic::toggle_auto_start_mod()
+{
+    if( info().fuel_opts.empty() ) {
+        return;
+    }
+    if( !has_flag( "AUTO_START_ON" ) ) {
+        set_flag( "AUTO_START_ON" );
+    } else {
+        remove_flag( "AUTO_START_ON" );
+    }
+}
+
 void bionic::serialize( JsonOut &json ) const
 {
     json.start_object();
@@ -2321,6 +2456,7 @@ void bionic::serialize( JsonOut &json ) const
     json.member( "charge", charge_timer );
     json.member( "ammo_loaded", ammo_loaded );
     json.member( "ammo_count", ammo_count );
+    json.member( "bionic_tags", bionic_tags );
     if( incapacitated_time > 0_turns ) {
         json.member( "incapacitated_time", incapacitated_time );
     }
@@ -2343,6 +2479,13 @@ void bionic::deserialize( JsonIn &jsin )
     if( jo.has_int( "incapacitated_time" ) ) {
         incapacitated_time = 1_turns * jo.get_int( "incapacitated_time" );
     }
+    if( jo.has_array( "bionic_tags" ) ) {
+        JsonArray jsar = jo.get_array( "bionic_tags" );
+        while( jsar.has_more() ) {
+            bionic_tags.insert( jsar.next_string() );
+        }
+    }
+
 }
 
 void player::introduce_into_anesthesia( const time_duration &duration, player &installer,
diff --git a/src/bionics.h b/src/bionics.h
index f499e6ad93f9d..5dcdd614cc807 100644
--- a/src/bionics.h
+++ b/src/bionics.h
@@ -91,6 +91,8 @@ struct bionic_data {
     float fuel_efficiency;
     /**Fraction of fuel energy passively converted to bionic power*/
     float passive_fuel_efficiency;
+    /**Fraction of coverage diminishing fuel_efficiency*/
+    cata::optional<float> coverage_power_gen_penalty;
     /**If true this bionic emits heat when producing power*/
     bool exothermic_power_gen = false;
     /**Type of field emitted by this bionic when it produces energy*/
@@ -136,33 +138,40 @@ struct bionic_data {
 };
 
 struct bionic {
-    bionic_id id;
-    int         charge_timer  = 0;
-    char        invlet  = 'a';
-    bool        powered = false;
-    /* Ammunition actually loaded in this bionic gun in deactivated state */
-    itype_id    ammo_loaded = "null";
-    /* Ammount of ammo actually held inside by this bionic gun in deactivated state */
-    unsigned int         ammo_count = 0;
-    /* An amount of time during which this bionic has been rendered inoperative. */
-    time_duration        incapacitated_time;
-
-    bionic()
-        : id( "bio_batteries" ), incapacitated_time( 0_turns ) {
-    }
-    bionic( bionic_id pid, char pinvlet )
-        : id( std::move( pid ) ), invlet( pinvlet ), incapacitated_time( 0_turns ) { }
-
-    const bionic_data &info() const {
-        return *id;
-    }
-
-    int get_quality( const quality_id &quality ) const;
-
-    bool is_this_fuel_powered( const itype_id &this_fuel ) const;
-
-    void serialize( JsonOut &json ) const;
-    void deserialize( JsonIn &jsin );
+        bionic_id id;
+        int         charge_timer  = 0;
+        char        invlet  = 'a';
+        bool        powered = false;
+        /* Ammunition actually loaded in this bionic gun in deactivated state */
+        itype_id    ammo_loaded = "null";
+        /* Ammount of ammo actually held inside by this bionic gun in deactivated state */
+        unsigned int         ammo_count = 0;
+        /* An amount of time during which this bionic has been rendered inoperative. */
+        time_duration        incapacitated_time;
+        bionic()
+            : id( "bio_batteries" ), incapacitated_time( 0_turns ) {
+        }
+        bionic( bionic_id pid, char pinvlet )
+            : id( std::move( pid ) ), invlet( pinvlet ), incapacitated_time( 0_turns ) { }
+
+        const bionic_data &info() const {
+            return *id;
+        }
+
+        void set_flag( std::string flag );
+        void remove_flag( std::string flag );
+        bool has_flag( std::string flag ) const ;
+
+        int get_quality( const quality_id &quality ) const;
+
+        bool is_this_fuel_powered( const itype_id &this_fuel ) const;
+        void toggle_safe_fuel_mod();
+        void toggle_auto_start_mod();
+
+        void serialize( JsonOut &json ) const;
+        void deserialize( JsonIn &jsin );
+    private:
+        cata::flat_set<std::string> bionic_tags; // generic bionic specific flags
 };
 
 // A simpler wrapper to allow forward declarations of it. std::vector can not
diff --git a/src/bionics_ui.cpp b/src/bionics_ui.cpp
index f41d7e49576d7..8ea1a69c4e56d 100644
--- a/src/bionics_ui.cpp
+++ b/src/bionics_ui.cpp
@@ -59,18 +59,24 @@ static void draw_bionics_titlebar( const catacurses::window &window, player *p,
                                    bionic_menu_mode mode )
 {
     werase( window );
-    std::ostringstream fuel_stream;
-    fuel_stream << _( "Available Fuel: " );
+    std::string fuel_string;
+    bool found_fuel = false;
+    fuel_string = _( "Available Fuel: " );
     for( const bionic &bio : *p->my_bionics ) {
         for( const itype_id fuel : p->get_fuel_available( bio.id ) ) {
+            found_fuel = true;
             const item temp_fuel( fuel ) ;
             if( temp_fuel.has_flag( "PERPETUAL" ) ) {
+                fuel_string += colorize( temp_fuel.tname(), c_green ) + " ";
                 continue;
             }
-            fuel_stream << temp_fuel.tname() << ": " << "<color_green>" << p->get_value(
-                            fuel ) << "</color>" << "/" << p->get_total_fuel_capacity( fuel ) << " ";
+            fuel_string += temp_fuel.tname() + ": " + colorize( p->get_value( fuel ),
+                           c_green ) + "/" + std::to_string( p->get_total_fuel_capacity( fuel ) ) + " ";
         }
     }
+    if( !found_fuel ) {
+        fuel_string.clear();
+    }
     std::string power_string;
     const int curr_power = units::to_millijoule( p->get_power_level() );
     const int kilo = curr_power / units::to_millijoule( 1_kJ );
@@ -98,14 +104,15 @@ static void draw_bionics_titlebar( const catacurses::window &window, player *p,
     std::string desc;
     if( mode == REASSIGNING ) {
         desc = _( "Reassigning.\nSelect a bionic to reassign or press SPACE to cancel." );
+        fuel_string.clear();
     } else if( mode == ACTIVATING ) {
-        desc = _( "<color_green>Activating</color>  <color_yellow>!</color> to examine, <color_yellow>=</color> to reassign, <color_yellow>TAB</color> to switch tabs." );
+        desc = _( "<color_green>Activating</color>  <color_yellow>!</color> to examine, <color_yellow>=</color> to reassign, <color_yellow>TAB</color> to switch tabs, <color_yellow>s</color> to toggle fuel saving mode, <color_yellow>A</color> to toggle auto start mode." );
     } else if( mode == EXAMINING ) {
-        desc = _( "<color_light_blue>Examining</color>  <color_yellow>!</color> to activate, <color_yellow>=</color> to reassign, <color_yellow>TAB</color> to switch tabs." );
+        desc = _( "<color_light_blue>Examining</color>  <color_yellow>!</color> to activate, <color_yellow>=</color> to reassign, <color_yellow>TAB</color> to switch tabs, <color_yellow>s</color> to toggle fuel saving mode, <color_yellow>A</color> to toggle auto start mode." );
     }
     int n_pt_y = 0;
     fold_and_print( window, point( 1, n_pt_y++ ), pwr_str_pos, c_white, desc );
-    fold_and_print( window, point( 1, n_pt_y++ ), pwr_str_pos, c_white, fuel_stream.str() );
+    fold_and_print( window, point( 1, n_pt_y++ ), pwr_str_pos, c_white, fuel_string );
     wrefresh( window );
 }
 
@@ -135,6 +142,12 @@ static std::string build_bionic_poweronly_string( const bionic &bio )
     if( bio.incapacitated_time > 0_turns ) {
         properties.push_back( _( "(incapacitated)" ) );
     }
+    if( !bio.has_flag( "SAFE_FUEL_OFF" ) && !bio.info().fuel_opts.empty() ) {
+        properties.push_back( _( "(fuel saving ON)" ) );
+    }
+    if( bio.has_flag( "AUTO_START_ON" ) && !bio.info().fuel_opts.empty() ) {
+        properties.push_back( _( "(auto start ON)" ) );
+    }
 
     return enumerate_as_string( properties, enumeration_conjunction::none );
 }
@@ -405,6 +418,8 @@ void player::power_bionics()
     ctxt.register_action( "PREV_TAB" );
     ctxt.register_action( "CONFIRM" );
     ctxt.register_action( "HELP_KEYBINDINGS" );
+    ctxt.register_action( "TOGGLE_SAFE_FUEL" );
+    ctxt.register_action( "TOGGLE_AUTO_START" );
 
     bool recalc = false;
     bool redraw = true;
@@ -520,6 +535,8 @@ void player::power_bionics()
         const int ch = ctxt.get_raw_input().get_first_input();
         bionic *tmp = nullptr;
         bool confirmCheck = false;
+        bool toggle_safe_fuel = false;
+        bool toggle_auto_start = false;
 
         if( action == "DOWN" ) {
             redraw = true;
@@ -611,6 +628,10 @@ void player::power_bionics()
         } else if( action == "TOGGLE_EXAMINE" ) { // switches between activation and examination
             menu_mode = menu_mode == ACTIVATING ? EXAMINING : ACTIVATING;
             redraw = true;
+        } else if( action == "TOGGLE_SAFE_FUEL" ) {
+            toggle_safe_fuel = true;
+        } else if( action == "TOGGLE_AUTO_START" ) {
+            toggle_auto_start = true;
         } else if( action == "HELP_KEYBINDINGS" ) {
             redraw = true;
         } else if( action == "CONFIRM" ) {
@@ -618,6 +639,36 @@ void player::power_bionics()
         } else {
             confirmCheck = true;
         }
+
+        if( toggle_safe_fuel ) {
+            auto &bio_list = tab_mode == TAB_ACTIVE ? active : passive;
+            if( !current_bionic_list->empty() ) {
+                tmp = bio_list[cursor];
+                if( !tmp->info().fuel_opts.empty() ) {
+                    tmp->toggle_safe_fuel_mod();
+                    g->refresh_all();
+                    redraw = true;
+                } else {
+                    popup( _( "You can't toggle fuel saving mode on a non-fueled CBM." ) );
+                }
+
+            }
+        }
+
+        if( toggle_auto_start ) {
+            auto &bio_list = tab_mode == TAB_ACTIVE ? active : passive;
+            if( !current_bionic_list->empty() ) {
+                tmp = bio_list[cursor];
+                if( !tmp->info().fuel_opts.empty() ) {
+                    tmp->toggle_auto_start_mod();
+                    g->refresh_all();
+                    redraw = true;
+                } else {
+                    popup( _( "You can't toggle auto start mode on a non-fueled CBM." ) );
+                }
+            }
+        }
+
         //confirmation either occurred by pressing enter where the bionic cursor is, or the hotkey was selected
         if( confirmCheck ) {
             auto &bio_list = tab_mode == TAB_ACTIVE ? active : passive;
diff --git a/src/bodypart.cpp b/src/bodypart.cpp
index fcc77a0527440..af05b59206adc 100644
--- a/src/bodypart.cpp
+++ b/src/bodypart.cpp
@@ -198,6 +198,8 @@ void body_part_struct::load( JsonObject &jo, const std::string & )
     mandatory( jo, was_loaded, "main_part", main_part );
     mandatory( jo, was_loaded, "opposite_part", opposite_part );
 
+    optional( jo, was_loaded, "bionic_slots", bionic_slots_, 0 );
+
     part_side = jo.get_enum_value<side>( "side" );
 }
 
diff --git a/src/bodypart.h b/src/bodypart.h
index b7e2f414e6efb..62972d0d28148 100644
--- a/src/bodypart.h
+++ b/src/bodypart.h
@@ -111,6 +111,12 @@ struct body_part_struct {
         static void finalize_all();
         // Verifies that body parts make sense
         static void check_consistency();
+
+        int bionic_slots() const {
+            return bionic_slots_;
+        }
+    private:
+        int bionic_slots_;
 };
 
 class body_part_set
diff --git a/src/cata_tiles.cpp b/src/cata_tiles.cpp
index 037529f3a2132..cd240b3ed83b9 100644
--- a/src/cata_tiles.cpp
+++ b/src/cata_tiles.cpp
@@ -264,8 +264,8 @@ void cata_tiles::reinit()
 static void get_tile_information( const std::string &config_path, std::string &json_path,
                                   std::string &tileset_path )
 {
-    const std::string default_json = FILENAMES["defaulttilejson"];
-    const std::string default_tileset = FILENAMES["defaulttilepng"];
+    const std::string default_json = PATH_INFO::defaulttilejson();
+    const std::string default_tileset = PATH_INFO::defaulttilepng();
 
     // Get JSON and TILESET vars from config
     const auto reader = [&]( std::istream & fin ) {
@@ -516,13 +516,13 @@ void tileset_loader::load( const std::string &tileset_id, const bool precheck )
     if( tset_iter != TILESETS.end() ) {
         tileset_root = tset_iter->second;
         dbg( D_INFO ) << '"' << tileset_id << '"' << " tileset: found config file path: " << tileset_root;
-        get_tile_information( tileset_root + '/' + FILENAMES["tileset-conf"],
+        get_tile_information( tileset_root + '/' + PATH_INFO::tileset_conf(),
                               json_conf, tileset_path );
         dbg( D_INFO ) << "Current tileset is: " << tileset_id;
     } else {
         dbg( D_ERROR ) << "Tileset \"" << tileset_id << "\" from options is invalid";
-        json_conf = FILENAMES["defaulttilejson"];
-        tileset_path = FILENAMES["defaulttilepng"];
+        json_conf = PATH_INFO::defaulttilejson();
+        tileset_path = PATH_INFO::defaulttilepng();
     }
 
     std::string json_path = tileset_root + '/' + json_conf;
@@ -1101,14 +1101,12 @@ void cata_tiles::draw( const point &dest, const tripoint &center, int width, int
                                              NORTH ) );
         }
     }
-    static const point neighborhood[4] = {
-        point_south, point_east, point_west, point_north
-    };
     for( int row = min_row; row < max_row; row ++ ) {
         std::vector<tile_render_info> draw_points;
         draw_points.reserve( max_col );
         for( int col = min_col; col < max_col; col ++ ) {
-            int temp_x, temp_y;
+            int temp_x;
+            int temp_y;
             if( iso_mode ) {
                 //in isometric, rows and columns represent a checkerboard screen space, and we place
                 //the appropriate tile in valid squares by getting position relative to the screen center.
@@ -2138,16 +2136,12 @@ bool cata_tiles::draw_terrain( const tripoint &p, const lit_level ll, int &heigh
     const bool overridden = override != terrain_override.end();
     bool neighborhood_overridden = overridden;
     if( !neighborhood_overridden ) {
-        // *INDENT-OFF*
-        for( const point &dir : {
-                 point_south, point_east, point_west, point_north
-             } ) {
+        for( const point &dir : neighborhood ) {
             if( terrain_override.find( p + dir ) != terrain_override.end() ) {
                 neighborhood_overridden = true;
                 break;
             }
         }
-        // *INDENT-ON*
     }
     // first memorize the actual terrain
     const ter_id &t = g->m.ter( p );
@@ -2306,16 +2300,12 @@ bool cata_tiles::draw_furniture( const tripoint &p, const lit_level ll, int &hei
     const bool overridden = override != furniture_override.end();
     bool neighborhood_overridden = overridden;
     if( !neighborhood_overridden ) {
-        // *INDENT-OFF*
-        for( const point &dir : {
-                 point_south, point_east, point_west, point_north
-             } ) {
+        for( const point &dir : neighborhood ) {
             if( furniture_override.find( p + dir ) != furniture_override.end() ) {
                 neighborhood_overridden = true;
                 break;
             }
         }
-        // *INDENT-ON*
     }
     // first memorize the actual furniture
     const furn_id &f = g->m.furn( p );
@@ -2383,16 +2373,12 @@ bool cata_tiles::draw_trap( const tripoint &p, const lit_level ll, int &height_3
     const bool overridden = override != trap_override.end();
     bool neighborhood_overridden = overridden;
     if( !neighborhood_overridden ) {
-        // *INDENT-OFF*
-        for( const point &dir : {
-                 point_south, point_east, point_west, point_north
-             } ) {
+        for( const point &dir : neighborhood ) {
             if( trap_override.find( p + dir ) != trap_override.end() ) {
                 neighborhood_overridden = true;
                 break;
             }
         }
-        // *INDENT-ON*
     }
 
     // first memorize the actual trap
diff --git a/src/character.cpp b/src/character.cpp
index bb903569223d2..9165b5303ce70 100644
--- a/src/character.cpp
+++ b/src/character.cpp
@@ -57,6 +57,7 @@
 #include "lightmap.h"
 #include "rng.h"
 #include "stomach.h"
+#include "text_snippets.h"
 #include "ui.h"
 #include "veh_type.h"
 #include "vehicle.h"
@@ -71,6 +72,9 @@ static const bionic_id bio_armor_legs( "bio_armor_legs" );
 static const bionic_id bio_armor_torso( "bio_armor_torso" );
 static const bionic_id bio_carbon( "bio_carbon" );
 static const bionic_id bio_climate( "bio_climate" );
+static const bionic_id bio_earplugs( "bio_earplugs" );
+static const bionic_id bio_ears( "bio_ears" );
+static const bionic_id bio_faraday( "bio_faraday" );
 static const bionic_id bio_flashlight( "bio_flashlight" );
 static const bionic_id bio_ground_sonar( "bio_ground_sonar" );
 static const bionic_id bio_gills( "bio_gills" );
@@ -94,10 +98,12 @@ const efftype_id effect_cold( "cold" );
 const efftype_id effect_common_cold( "common_cold" );
 const efftype_id effect_contacts( "contacts" );
 const efftype_id effect_controlled( "controlled" );
+const efftype_id effect_corroding( "corroding" );
 const efftype_id effect_cough_suppress( "cough_suppress" );
 const efftype_id effect_recently_coughed( "recently_coughed" );
 const efftype_id effect_crushed( "crushed" );
 const efftype_id effect_darkness( "darkness" );
+const efftype_id effect_deaf( "deaf" );
 const efftype_id effect_disinfected( "disinfected" );
 const efftype_id effect_downed( "downed" );
 const efftype_id effect_drunk( "drunk" );
@@ -139,12 +145,14 @@ const skill_id skill_dodge( "dodge" );
 const skill_id skill_throw( "throw" );
 
 static const trait_id trait_ACIDBLOOD( "ACIDBLOOD" );
+static const trait_id trait_ACIDPROOF( "ACIDPROOF" );
 static const trait_id trait_ADRENALINE( "ADRENALINE" );
 static const trait_id trait_BADBACK( "BADBACK" );
 static const trait_id trait_BARK( "BARK" );
 static const trait_id trait_BIRD_EYE( "BIRD_EYE" );
 static const trait_id trait_CEPH_EYES( "CEPH_EYES" );
 static const trait_id trait_CEPH_VISION( "CEPH_VISION" );
+static const trait_id trait_DEAF( "DEAF" );
 static const trait_id trait_DEBUG_CLOAK( "DEBUG_CLOAK" );
 static const trait_id trait_DEBUG_NIGHTVISION( "DEBUG_NIGHTVISION" );
 static const trait_id trait_DEBUG_NODMG( "DEBUG_NODMG" );
@@ -161,6 +169,7 @@ static const trait_id trait_GILLS_CEPH( "GILLS_CEPH" );
 static const trait_id trait_GLASSJAW( "GLASSJAW" );
 static const trait_id trait_HOARDER( "HOARDER" );
 static const trait_id trait_HOLLOW_BONES( "HOLLOW_BONES" );
+static const trait_id trait_LEG_TENT_BRACE( "LEG_TENT_BRACE" );
 static const trait_id trait_LIGHT_BONES( "LIGHT_BONES" );
 static const trait_id trait_M_SKIN2( "M_SKIN2" );
 static const trait_id trait_M_SKIN3( "M_SKIN3" );
@@ -179,15 +188,19 @@ static const trait_id trait_PYROMANIA( "PYROMANIA" );
 static const trait_id trait_ROOTS2( "ROOTS2" );
 static const trait_id trait_ROOTS3( "ROOTS3" );
 static const trait_id trait_SEESLEEP( "SEESLEEP" );
+static const trait_id trait_SELFAWARE( "SELFAWARE" );
 static const trait_id trait_SHELL2( "SHELL2" );
 static const trait_id trait_SHELL( "SHELL" );
 static const trait_id trait_SHOUT2( "SHOUT2" );
 static const trait_id trait_SHOUT3( "SHOUT3" );
+static const trait_id trait_SLIMY( "SLIMY" );
+static const trait_id trait_STRONGSTOMACH( "STRONGSTOMACH" );
 static const trait_id trait_THRESH_CEPHALOPOD( "THRESH_CEPHALOPOD" );
 static const trait_id trait_THRESH_INSECT( "THRESH_INSECT" );
 static const trait_id trait_THRESH_PLANT( "THRESH_PLANT" );
 static const trait_id trait_THRESH_SPIDER( "THRESH_SPIDER" );
 static const trait_id trait_URSINE_EYE( "URSINE_EYE" );
+static const trait_id trait_VISCOUS( "VISCOUS" );
 static const trait_id debug_nodmg( "DEBUG_NODMG" );
 
 const species_id HUMAN( "HUMAN" );
@@ -200,6 +213,7 @@ Character::Character() :
     hp_max( {{ 0 }} ),
     damage_bandaged( {{ 0 }} ),
     damage_disinfected( {{ 0 }} ),
+    cached_time( calendar::before_time_starts ),
     id( -1 ),
     next_climate_control_check( calendar::before_time_starts ),
     last_climate_control_ret( false )
@@ -222,6 +236,10 @@ Character::Character() :
     thirst = 0;
     fatigue = 0;
     sleep_deprivation = 0;
+    radiation = 0;
+    tank_plut = 0;
+    reactor_plut = 0;
+    slow_rad = 0;
     set_stim( 0 );
     set_stamina( 10000 ); //Temporary value for stamina. It will be reset later from external json option.
     pkill = 0;
@@ -262,11 +280,11 @@ Character::~Character() = default;
 Character::Character( Character && ) = default;
 Character &Character::operator=( Character && ) = default;
 
-void Character::setID( character_id i )
+void Character::setID( character_id i, bool force )
 {
-    if( id.is_valid() ) {
+    if( id.is_valid() && !force ) {
         debugmsg( "tried to set id of a npc/player, but has already a id: %d", id.get_value() );
-    } else if( !i.is_valid() ) {
+    } else if( !i.is_valid() && !force ) {
         debugmsg( "tried to set invalid id of a npc/player: %d", i.get_value() );
     } else {
         id = i;
@@ -1657,6 +1675,40 @@ bool Character::i_add_or_drop( item &it, int qty )
     return retval;
 }
 
+void Character::drop( int pos, const tripoint &where )
+{
+    const item &it = i_at( pos );
+    const int count = it.count();
+
+    drop( { std::make_pair( pos, count ) }, where );
+}
+
+void Character::drop( const std::list<std::pair<int, int>> &what, const tripoint &target,
+                      bool stash )
+{
+    const activity_id type( stash ? "ACT_STASH" : "ACT_DROP" );
+
+    if( what.empty() ) {
+        return;
+    }
+
+    if( rl_dist( pos(), target ) > 1 || !( stash || g->m.can_put_items( target ) ) ) {
+        add_msg_player_or_npc( m_info, _( "You can't place items here!" ),
+                               _( "<npcname> can't place items here!" ) );
+        return;
+    }
+
+    assign_activity( type );
+    activity.placement = target - pos();
+
+    for( auto item_pair : what ) {
+        if( can_unwield( i_at( item_pair.first ) ).success() ) {
+            activity.values.push_back( item_pair.first );
+            activity.values.push_back( item_pair.second );
+        }
+    }
+}
+
 invlets_bitset Character::allocated_invlets() const
 {
     invlets_bitset invlets = inv.allocated_invlets();
@@ -1988,13 +2040,13 @@ units::volume Character::volume_capacity_reduced_by(
         }
     }
     if( has_bionic( bionic_id( "bio_storage" ) ) ) {
-        ret += 2000_ml;
+        ret += 2_liter;
     }
     if( has_trait( trait_SHELL ) ) {
-        ret += 4000_ml;
+        ret += 4_liter;
     }
     if( has_trait( trait_SHELL2 ) && !has_active_mutation( trait_SHELL2 ) ) {
-        ret += 6000_ml;
+        ret += 6_liter;
     }
     if( has_trait( trait_PACKMULE ) ) {
         ret = ret * 1.4;
@@ -2048,6 +2100,15 @@ bool Character::can_use( const item &it, const item &context ) const
     return true;
 }
 
+ret_val<bool> Character::can_unwield( const item &it ) const
+{
+    if( it.has_flag( "NO_UNWIELD" ) ) {
+        return ret_val<bool>::make_failure( _( "You cannot unwield your %s." ), it.tname() );
+    }
+
+    return ret_val<bool>::make_success();
+}
+
 void Character::drop_invalid_inventory()
 {
     bool dropped_liquid = false;
@@ -2912,6 +2973,38 @@ void Character::mod_int_bonus( int nint )
     int_cur = std::max( 0, int_max + int_bonus );
 }
 
+void Character::print_health() const
+{
+    if( !is_player() ) {
+        return;
+    }
+    int current_health = get_healthy();
+    if( has_trait( trait_SELFAWARE ) ) {
+        add_msg_if_player( _( "Your current health value is %d." ), current_health );
+    }
+
+    if( current_health > 0 &&
+        ( has_effect( effect_common_cold ) || has_effect( effect_flu ) ) ) {
+        return;
+    }
+
+    static const std::map<int, std::string> msg_categories = {
+        { -100, "health_horrible" },
+        { -50, "health_very_bad" },
+        { -10, "health_bad" },
+        { 10, "" },
+        { 50, "health_good" },
+        { 100, "health_very_good" },
+        { INT_MAX, "health_great" }
+    };
+
+    auto iter = msg_categories.lower_bound( current_health );
+    if( iter != msg_categories.end() && !iter->second.empty() ) {
+        const translation msg = SNIPPET.random_from_category( iter->second ).value_or( translation() );
+        add_msg_if_player( current_health > 0 ? m_good : m_bad, "%s", msg );
+    }
+}
+
 namespace io
 {
 template<>
@@ -3194,6 +3287,15 @@ int Character::get_sleep_deprivation() const
     return sleep_deprivation;
 }
 
+bool Character::is_deaf() const
+{
+    return get_effect_int( effect_deaf ) > 2 || worn_with_flag( "DEAF" ) ||
+           has_trait( trait_DEAF ) ||
+           ( has_active_bionic( bio_earplugs ) && !has_active_bionic( bio_ears ) ) ||
+           ( has_trait( trait_M_SKIN3 ) && g->m.has_flag_ter_or_furn( "FUNGUS", pos() )
+             && in_sleep_state() );
+}
+
 void Character::on_damage_of_type( int adjusted_damage, damage_type type, body_part bp )
 {
     // Electrical damage has a chance to temporarily incapacitate bionics in the damaged body_part.
@@ -4178,6 +4280,76 @@ bool Character::is_immune_field( const field_type_id fid ) const
     return Creature::is_immune_field( fid );
 }
 
+bool Character::is_elec_immune() const
+{
+    return is_immune_damage( DT_ELECTRIC );
+}
+
+bool Character::is_immune_effect( const efftype_id &eff ) const
+{
+    if( eff == effect_downed ) {
+        return is_throw_immune() || ( has_trait( trait_LEG_TENT_BRACE ) && footwear_factor() == 0 );
+    } else if( eff == effect_onfire ) {
+        return is_immune_damage( DT_HEAT );
+    } else if( eff == effect_deaf ) {
+        return worn_with_flag( "DEAF" ) || worn_with_flag( "PARTIAL_DEAF" ) || has_bionic( bio_ears ) ||
+               is_wearing( "rm13_armor_on" );
+    } else if( eff == effect_corroding ) {
+        return is_immune_damage( DT_ACID ) || has_trait( trait_SLIMY ) || has_trait( trait_VISCOUS );
+    } else if( eff == effect_nausea ) {
+        return has_trait( trait_STRONGSTOMACH );
+    }
+
+    return false;
+}
+
+bool Character::is_immune_damage( const damage_type dt ) const
+{
+    switch( dt ) {
+        case DT_NULL:
+            return true;
+        case DT_TRUE:
+            return false;
+        case DT_BIOLOGICAL:
+            return has_effect_with_flag( "EFFECT_BIO_IMMUNE" ) ||
+                   worn_with_flag( "BIO_IMMUNE" );
+        case DT_BASH:
+            return has_effect_with_flag( "EFFECT_BASH_IMMUNE" ) ||
+                   worn_with_flag( "BASH_IMMUNE" );
+        case DT_CUT:
+            return has_effect_with_flag( "EFFECT_CUT_IMMUNE" ) ||
+                   worn_with_flag( "CUT_IMMUNE" );
+        case DT_ACID:
+            return has_trait( trait_ACIDPROOF ) ||
+                   has_effect_with_flag( "EFFECT_ACID_IMMUNE" ) ||
+                   worn_with_flag( "ACID_IMMUNE" );
+        case DT_STAB:
+            return has_effect_with_flag( "EFFECT_STAB_IMMUNE" ) ||
+                   worn_with_flag( "STAB_IMMUNE" );
+        case DT_HEAT:
+            return has_trait( trait_M_SKIN2 ) ||
+                   has_trait( trait_M_SKIN3 ) ||
+                   has_effect_with_flag( "EFFECT_HEAT_IMMUNE" ) ||
+                   worn_with_flag( "HEAT_IMMUNE" );
+        case DT_COLD:
+            return has_effect_with_flag( "EFFECT_COLD_IMMUNE" ) ||
+                   worn_with_flag( "COLD_IMMUNE" );
+        case DT_ELECTRIC:
+            return has_active_bionic( bio_faraday ) ||
+                   worn_with_flag( "ELECTRIC_IMMUNE" ) ||
+                   has_artifact_with( AEP_RESIST_ELECTRICITY ) ||
+                   has_effect_with_flag( "EFFECT_ELECTRIC_IMMUNE" );
+        default:
+            return true;
+    }
+}
+
+bool Character::is_rad_immune() const
+{
+    bool has_helmet = false;
+    return ( is_wearing_power_armor( &has_helmet ) && has_helmet ) || worn_with_flag( "RAD_PROOF" );
+}
+
 int Character::throw_range( const item &it ) const
 {
     if( it.is_null() ) {
@@ -4204,7 +4376,7 @@ int Character::throw_range( const item &it ) const
     int ret = ( str_override * 10 ) / ( tmp.weight() >= 150_gram ? tmp.weight() / 113_gram : 10 -
                                         static_cast<int>(
                                             tmp.weight() / 15_gram ) );
-    ret -= tmp.volume() / 1000_ml;
+    ret -= tmp.volume() / 1_liter;
     static const std::set<material_id> affected_materials = { material_id( "iron" ), material_id( "steel" ) };
     if( has_active_bionic( bionic_id( "bio_railgun" ) ) && tmp.made_of_any( affected_materials ) ) {
         ret *= 2;
@@ -5021,7 +5193,7 @@ void Character::burn_move_stamina( int moves )
     if( move_mode == CMM_RUN ) {
         burn_ratio = burn_ratio * 7;
     }
-    mod_stat( "stamina", -( ( moves * burn_ratio ) / 100.0 ) );
+    mod_stat( "stamina", -( ( moves * burn_ratio ) / 100.0 ) * stamina_move_cost_modifier() );
     add_msg( m_debug, "Stamina burn: %d", -( ( moves * burn_ratio ) / 100 ) );
     // Chance to suffer pain if overburden and stamina runs out or has trait BADBACK
     // Starts at 1 in 25, goes down by 5 for every 50% more carried
@@ -5035,6 +5207,21 @@ void Character::burn_move_stamina( int moves )
     }
 }
 
+float Character::stamina_move_cost_modifier() const
+{
+    // Both walk and run speed drop to half their maximums as stamina approaches 0.
+    // Convert stamina to a float first to allow for decimal place carrying
+    float stamina_modifier = ( static_cast<float>( get_stamina() ) / get_stamina_max() + 1 ) / 2;
+    if( move_mode == CMM_RUN && get_stamina() > 0 ) {
+        // Rationale: Average running speed is 2x walking speed. (NOT sprinting)
+        stamina_modifier *= 2.0;
+    }
+    if( move_mode == CMM_CROUCH ) {
+        stamina_modifier *= 0.5;
+    }
+    return stamina_modifier;
+}
+
 void Character::update_stamina( int turns )
 {
     const int current_stim = get_stim();
@@ -5077,12 +5264,133 @@ void Character::update_stamina( int turns )
         }
     }
 
-    mod_stamina( roll_remainder( stamina_recovery * turns ) );
+    mod_stamina( roll_remainder( stamina_recovery * turns / stamina_move_cost_modifier() ) );
     add_msg( m_debug, "Stamina recovery: %d", roll_remainder( stamina_recovery * turns ) );
     // Cap at max
     set_stamina( std::min( std::max( get_stamina(), 0 ), max_stam ) );
 }
 
+bool Character::invoke_item( item *used )
+{
+    return invoke_item( used, pos() );
+}
+
+bool Character::invoke_item( item *, const tripoint & )
+{
+    return false;
+}
+
+bool Character::invoke_item( item *used, const std::string &method )
+{
+    return invoke_item( used, method, pos() );
+}
+
+bool Character::invoke_item( item *used, const std::string &method, const tripoint &pt )
+{
+    if( !has_enough_charges( *used, true ) ) {
+        return false;
+    }
+
+    item *actually_used = used->get_usable_item( method );
+    if( actually_used == nullptr ) {
+        debugmsg( "Tried to invoke a method %s on item %s, which doesn't have this method",
+                  method.c_str(), used->tname() );
+        return false;
+    }
+
+    int charges_used = actually_used->type->invoke( *this->as_player(), *actually_used, pt, method );
+    if( charges_used == 0 ) {
+        return false;
+    }
+    // Prevent accessing the item as it may have been deleted by the invoked iuse function.
+
+    if( used->is_tool() || used->is_medication() || used->get_contained().is_medication() ) {
+        return consume_charges( *actually_used, charges_used );
+    } else if( used->is_bionic() || used->is_deployable() || method == "place_trap" ) {
+        i_rem( used );
+        return true;
+    }
+
+    return false;
+}
+
+bool Character::has_enough_charges( const item &it, bool show_msg ) const
+{
+    if( !it.is_tool() || !it.ammo_required() ) {
+        return true;
+    }
+    if( it.has_flag( "USE_UPS" ) ) {
+        if( has_charges( "UPS", it.ammo_required() ) || it.ammo_sufficient() ) {
+            return true;
+        }
+        if( show_msg ) {
+            add_msg_if_player( m_info,
+                               ngettext( "Your %s needs %d charge from some UPS.",
+                                         "Your %s needs %d charges from some UPS.",
+                                         it.ammo_required() ),
+                               it.tname(), it.ammo_required() );
+        }
+        return false;
+    } else if( !it.ammo_sufficient() ) {
+        if( show_msg ) {
+            add_msg_if_player( m_info,
+                               ngettext( "Your %s has %d charge but needs %d.",
+                                         "Your %s has %d charges but needs %d.",
+                                         it.ammo_remaining() ),
+                               it.tname(), it.ammo_remaining(), it.ammo_required() );
+        }
+        return false;
+    }
+    return true;
+}
+
+bool Character::consume_charges( item &used, int qty )
+{
+    if( qty < 0 ) {
+        debugmsg( "Tried to consume negative charges" );
+        return false;
+    }
+
+    if( qty == 0 ) {
+        return false;
+    }
+
+    if( !used.is_tool() && !used.is_food() && !used.is_medication() ) {
+        debugmsg( "Tried to consume charges for non-tool, non-food, non-med item" );
+        return false;
+    }
+
+    // Consume comestibles destroying them if no charges remain
+    if( used.is_food() || used.is_medication() ) {
+        used.charges -= qty;
+        if( used.charges <= 0 ) {
+            i_rem( &used );
+            return true;
+        }
+        return false;
+    }
+
+    // Tools which don't require ammo are instead destroyed
+    if( used.is_tool() && !used.ammo_required() ) {
+        i_rem( &used );
+        return true;
+    }
+
+    // USE_UPS never occurs on base items but is instead added by the UPS tool mod
+    if( used.has_flag( "USE_UPS" ) ) {
+        // With the new UPS system, we'll want to use any charges built up in the tool before pulling from the UPS
+        // The usage of the item was already approved, so drain item if possible, otherwise use UPS
+        if( used.charges >= qty ) {
+            used.ammo_consume( qty, pos() );
+        } else {
+            use_charges( "UPS", qty );
+        }
+    } else {
+        used.ammo_consume( std::min( qty, used.ammo_remaining() ), pos() );
+    }
+    return false;
+}
+
 int Character::item_handling_cost( const item &it, bool penalties, int base_cost ) const
 {
     int mv = base_cost;
@@ -5148,7 +5456,6 @@ void Character::cough( bool harmful, int loudness )
     add_effect( effect_recently_coughed, 5_minutes );
 }
 
-
 void Character::wake_up()
 {
     remove_effect( effect_sleep );
@@ -5275,8 +5582,7 @@ void Character::vomit()
     g->events().send<event_type::throws_up>( getID() );
 
     if( stomach.contains() != 0_ml ) {
-        // empty stomach contents
-        stomach.bowel_movement();
+        stomach.empty();
         g->m.add_field( adjacent_tile(), fd_bile, 1 );
         add_msg_player_or_npc( m_bad, _( "You throw up heavily!" ), _( "<npcname> throws up heavily!" ) );
     }
@@ -6050,6 +6356,43 @@ bool Character::is_wearing_shoes( const side &which_side ) const
     return ( left && right );
 }
 
+bool Character::is_wearing_helmet() const
+{
+    for( const item &i : worn ) {
+        if( i.covers( bp_head ) && !i.has_flag( "HELMET_COMPAT" ) && !i.has_flag( "SKINTIGHT" ) &&
+            !i.has_flag( "PERSONAL" ) && !i.has_flag( "AURA" ) && !i.has_flag( "SEMITANGIBLE" ) &&
+            !i.has_flag( "OVERSIZE" ) ) {
+            return true;
+        }
+    }
+    return false;
+}
+
+int Character::head_cloth_encumbrance() const
+{
+    int ret = 0;
+    for( auto &i : worn ) {
+        const item *worn_item = &i;
+        if( i.covers( bp_head ) && !i.has_flag( "SEMITANGIBLE" ) &&
+            ( worn_item->has_flag( "HELMET_COMPAT" ) || worn_item->has_flag( "SKINTIGHT" ) ) ) {
+            ret += worn_item->get_encumber( *this );
+        }
+    }
+    return ret;
+}
+
+double Character::armwear_factor() const
+{
+    double ret = 0;
+    if( wearing_something_on( bp_arm_l ) ) {
+        ret += .5;
+    }
+    if( wearing_something_on( bp_arm_r ) ) {
+        ret += .5;
+    }
+    return ret;
+}
+
 double Character::footwear_factor() const
 {
     double ret = 0;
@@ -6062,6 +6405,59 @@ double Character::footwear_factor() const
     return ret;
 }
 
+int Character::shoe_type_count( const itype_id &it ) const
+{
+    int ret = 0;
+    if( is_wearing_on_bp( it, bp_foot_l ) ) {
+        ret++;
+    }
+    if( is_wearing_on_bp( it, bp_foot_r ) ) {
+        ret++;
+    }
+    return ret;
+}
+
+std::vector<item *> Character::inv_dump()
+{
+    std::vector<item *> ret;
+    if( is_armed() && can_unwield( weapon ).success() ) {
+        ret.push_back( &weapon );
+    }
+    for( auto &i : worn ) {
+        ret.push_back( &i );
+    }
+    inv.dump( ret );
+    return ret;
+}
+
+bool Character::covered_with_flag( const std::string &flag, const body_part_set &parts ) const
+{
+    if( parts.none() ) {
+        return true;
+    }
+
+    body_part_set to_cover( parts );
+
+    for( const auto &elem : worn ) {
+        if( !elem.has_flag( flag ) ) {
+            continue;
+        }
+
+        to_cover &= ~elem.get_covered_body_parts();
+
+        if( to_cover.none() ) {
+            return true;    // Allows early exit.
+        }
+    }
+
+    return to_cover.none();
+}
+
+bool Character::is_waterproof( const body_part_set &parts ) const
+{
+    return covered_with_flag( "WATERPROOF", parts );
+}
+
 void Character::update_morale()
 {
     morale->decay( 1_minutes );
@@ -6214,7 +6610,6 @@ void Character::check_and_recover_morale()
     }
 }
 
-
 void Character::start_hauling()
 {
     add_msg( _( "You start hauling items along the ground." ) );
diff --git a/src/character.h b/src/character.h
index c53ef99d13b2e..183b679218223 100644
--- a/src/character.h
+++ b/src/character.h
@@ -38,6 +38,7 @@
 #include "string_id.h"
 #include "type_id.h"
 #include "units.h"
+#include "weighted_list.h"
 #include "point.h"
 #include "magic_enchantment.h"
 
@@ -198,7 +199,8 @@ class Character : public Creature, public visitable<Character>
 
         character_id getID() const;
         // sets the ID, will *only* succeed when the current id is not valid
-        void setID( character_id i );
+        // allows forcing a -1 id which is required for templates to not throw errors
+        void setID( character_id i, bool force = false );
 
         field_type_id bloodType() const override;
         field_type_id gibType() const override;
@@ -264,6 +266,9 @@ class Character : public Creature, public visitable<Character>
         virtual void mod_per_bonus( int nper );
         virtual void mod_int_bonus( int nint );
 
+        // Prints message(s) about current health
+        void print_health() const;
+
         /** Getters for health values exclusive to characters */
         virtual int get_healthy() const;
         virtual int get_healthy_mod() const;
@@ -342,6 +347,22 @@ class Character : public Creature, public visitable<Character>
         float get_dodge_base() const override;
         float get_hit_base() const override;
 
+        /**
+         * Adds a reason for why the player would miss a melee attack.
+         *
+         * To possibly be messaged to the player when he misses a melee attack.
+         * @param reason A message for the player that gives a reason for him missing.
+         * @param weight The weight used when choosing what reason to pick when the
+         * player misses.
+         */
+        void add_miss_reason( const std::string &reason, unsigned int weight );
+        /** Clears the list of reasons for why the player would miss a melee attack. */
+        void clear_miss_reasons();
+        /**
+         * Returns an explanation for why the player would miss a melee attack.
+         */
+        std::string get_miss_reason();
+
         /** Handles health fluctuations over time */
         virtual void update_health( int external_modifiers = 0 );
 
@@ -506,6 +527,10 @@ class Character : public Creature, public visitable<Character>
         void set_mutation( const trait_id &flag );
         void unset_mutation( const trait_id &flag );
 
+        // Trigger and disable mutations that can be so toggled.
+        void activate_mutation( const trait_id &mutation );
+        void deactivate_mutation( const trait_id &mut );
+
         /** Converts a body_part to an hp_part */
         static hp_part bp_to_hp( body_part bp );
         /** Converts an hp_part to a body_part */
@@ -517,6 +542,7 @@ class Character : public Creature, public visitable<Character>
         void dismount();
         void forced_dismount();
 
+        bool is_deaf() const;
         /** Returns true if the player has two functioning arms */
         bool has_two_arms() const;
         /** Returns the number of functioning arms */
@@ -754,6 +780,20 @@ class Character : public Creature, public visitable<Character>
         // route for overmap-scale travelling
         std::vector<tripoint> omt_path;
 
+        /** Handles bionic effects over time of the entered bionic */
+        void process_bionic( int b );
+        /** Handles bionic deactivation effects of the entered bionic, returns if anything
+         *  deactivated */
+        virtual bool deactivate_bionic( int b, bool eff_only = false );
+        /**Convert fuel to bionic power*/
+        bool burn_fuel( int b, bool start = false );
+        /**Passively produce power from PERPETUAL fuel*/
+        void passive_power_gen( int b );
+        /**Handle heat from exothermic power generation*/
+        void heat_emission( int b, int fuel_energy );
+        /**Applies modifier to fuel_efficiency and returns the resulting efficiency*/
+        float get_effective_efficiency( int b, float fuel_efficiency );
+
         units::energy get_power_level() const;
         units::energy get_max_power_level() const;
         void mod_power_level( units::energy npower );
@@ -788,6 +828,30 @@ class Character : public Creature, public visitable<Character>
             return false;
         }
 
+        /**
+         * Asks how to use the item (if it has more than one use_method) and uses it.
+         * Returns true if it destroys the item. Consumes charges from the item.
+         * Multi-use items are ONLY supported when all use_methods are iuse_actor!
+         */
+        virtual bool invoke_item( item *, const tripoint &pt );
+        /** As above, but with a pre-selected method. Debugmsg if this item doesn't have this method. */
+        virtual bool invoke_item( item *, const std::string &, const tripoint &pt );
+        /** As above two, but with position equal to current position */
+        virtual bool invoke_item( item * );
+        virtual bool invoke_item( item *, const std::string & );
+
+        /**
+         * Has the item enough charges to invoke its use function?
+         * Also checks if UPS from this player is used instead of item charges.
+         */
+        bool has_enough_charges( const item &it, bool show_msg ) const;
+
+        /** Consume charges of a tool or comestible item, potentially destroying it in the process
+         *  @param used item consuming the charges
+         *  @param qty number of charges to consume which must be non-zero
+         *  @return true if item was destroyed */
+        bool consume_charges( item &used, int qty );
+
         /**
          * Calculate (but do not deduct) the number of moves required when handling (e.g. storing, drawing etc.) an item
          * @param it Item to calculate handling cost for
@@ -934,6 +998,9 @@ class Character : public Creature, public visitable<Character>
         /// used for operations on distant objects (e.g. vehicle installation/uninstallation)
         int best_nearby_lifting_assist( const tripoint &world_pos ) const;
 
+        // Inventory + weapon + worn (for death, etc)
+        std::vector<item *> inv_dump();
+
         units::mass weight_carried() const;
         units::volume volume_carried() const;
 
@@ -981,13 +1048,27 @@ class Character : public Creature, public visitable<Character>
          * @return whether both removal and replacement were successful (they are performed atomically)
          */
         virtual bool wield( item &target ) = 0;
+        /**
+         * Check player capable of unwielding an item.
+         * @param it Thing to be unwielded
+         */
+        ret_val<bool> can_unwield( const item &it ) const;
 
         void drop_invalid_inventory();
+        /** Drops an item to the specified location */
+        void drop( int pos, const tripoint &where );
+        virtual void drop( const std::list<std::pair<int, int>> &what, const tripoint &target,
+                           bool stash = false );
 
         virtual bool has_artifact_with( art_effect_passive effect ) const;
 
         bool is_wielding( const item &target ) const;
 
+        bool covered_with_flag( const std::string &flag, const body_part_set &parts ) const;
+        bool is_waterproof( const body_part_set &parts ) const;
+        // Carried items may leak radiation or chemicals
+        int leak_level( const std::string &flag ) const;
+
         // --------------- Clothing Stuff ---------------
         /** Returns true if the player is wearing the item. */
         bool is_wearing( const itype_id &it ) const;
@@ -996,7 +1077,6 @@ class Character : public Creature, public visitable<Character>
         /** Returns true if the player is wearing an item with the given flag. */
         bool worn_with_flag( const std::string &flag, body_part bp = num_bp ) const;
 
-
         // drawing related stuff
         /**
          * Returns a list of the IDs of overlays on this character,
@@ -1068,6 +1148,16 @@ class Character : public Creature, public visitable<Character>
         virtual bool query_yn( const std::string &msg ) const = 0;
 
         bool is_immune_field( field_type_id fid ) const override;
+        /** Returns true is the player is protected from electric shocks */
+        bool is_elec_immune() const override;
+        /** Returns true if the player is immune to this kind of effect */
+        bool is_immune_effect( const efftype_id & ) const override;
+        /** Returns true if the player is immune to this kind of damage */
+        bool is_immune_damage( damage_type ) const override;
+        /** Returns true if the player is protected from radiation */
+        bool is_rad_immune() const;
+        /** Returns true if the player is immune to throws */
+        bool is_throw_immune() const;
 
         /** Returns true if the player has some form of night vision */
         bool has_nv();
@@ -1151,6 +1241,23 @@ class Character : public Creature, public visitable<Character>
 
         int oxygen;
         int radiation;
+        int tank_plut;
+        int reactor_plut;
+        int slow_rad;
+
+        int focus_pool;
+        /* crafting inventory cached time */
+        time_point cached_time;
+
+        std::vector <addiction> addictions;
+        /** Adds an addiction to the player */
+        void add_addiction( add_type type, int strength );
+        /** Removes an addition from the player */
+        void rem_addiction( add_type type );
+        /** Returns true if the player has an addiction of the specified type */
+        bool has_addiction( add_type type ) const;
+        /** Returns the intensity of the specified addiction */
+        int  addiction_level( add_type type ) const;
 
         std::shared_ptr<monster> mounted_creature;
         // for loading NPC mounts
@@ -1242,6 +1349,7 @@ class Character : public Creature, public visitable<Character>
         void set_stamina( int new_stamina );
         void mod_stamina( int mod );
         void burn_move_stamina( int moves );
+        float stamina_move_cost_modifier() const;
         /** Regenerates stamina */
         void update_stamina( int turns );
 
@@ -1348,7 +1456,18 @@ class Character : public Creature, public visitable<Character>
 
         /** Returns true if the player is wearing something on the entered body_part */
         bool wearing_something_on( body_part bp ) const;
-        /** Returns 1 if the player is wearing something on both feet, .5 if on one, and 0 if on neither */
+        /** Returns true if the player is wearing something occupying the helmet slot */
+        bool is_wearing_helmet() const;
+        /** Returns the total encumbrance of all SKINTIGHT and HELMET_COMPAT items coveringi
+         *  the head */
+        int head_cloth_encumbrance() const;
+        /** Same as footwear factor, but for arms */
+        double armwear_factor() const;
+        /** Returns 1 if the player is wearing an item of that count on one foot, 2 if on both,
+         *  and zero if on neither */
+        int shoe_type_count( const itype_id &it ) const;
+        /** Returns 1 if the player is wearing something on both feet, .5 if on one,
+         *  and 0 if on neither */
         double footwear_factor() const;
         /** Returns true if the player is wearing something on their feet that is not SKINTIGHT */
         bool is_wearing_shoes( const side &which_side = side::BOTH ) const;
@@ -1369,12 +1488,32 @@ class Character : public Creature, public visitable<Character>
         void clear_morale();
         bool has_morale_to_read() const;
         bool has_morale_to_craft() const;
+
+        const inventory &crafting_inventory( const tripoint &src_pos = tripoint_zero,
+                                             int radius = PICKUP_RANGE );
+        void invalidate_crafting_inventory();
+
         /** Checks permanent morale for consistency and recovers it when an inconsistency is found. */
         void check_and_recover_morale();
 
         /** Handles the enjoyability value for a comestible. First value is enjoyability, second is cap. **/
         std::pair<int, int> fun_for( const item &comest ) const;
 
+        /** Handles a large number of timers decrementing and other randomized effects */
+        void suffer();
+        /** Handles mitigation and application of radiation */
+        bool irradiate( float rads, bool bypass = false );
+        /** Handles the chance for broken limbs to spontaneously heal to 1 HP */
+        void mend( int rate_multiplier );
+
+        /** Creates an auditory hallucination */
+        void sound_hallu();
+
+        /** Drenches the player with water, saturation is the percent gotten wet */
+        void drench( int saturation, const body_part_set &flags, bool ignore_waterproof );
+        /** Recalculates morale penalty/bonus from wetness based on mutations, equipment and temperature */
+        void apply_wetness_morale( int temperature );
+
     protected:
         Character();
         Character( Character && );
@@ -1466,6 +1605,25 @@ class Character : public Creature, public visitable<Character>
         pimpl<player_morale> morale;
 
     private:
+        /** suffer() subcalls */
+        void suffer_water_damage( const mutation_branch &mdata );
+        void suffer_mutation_power( const mutation_branch &mdata, Character::trait_data &tdata );
+        void suffer_while_underwater();
+        void suffer_from_addictions();
+        void suffer_while_awake( int current_stim );
+        void suffer_from_chemimbalance();
+        void suffer_from_schizophrenia();
+        void suffer_from_asthma( int current_stim );
+        void suffer_from_pain();
+        void suffer_in_sunlight();
+        void suffer_from_albinism();
+        void suffer_from_other_mutations();
+        void suffer_from_radiation();
+        void suffer_from_bad_bionics();
+        void suffer_from_artifacts();
+        void suffer_from_stimulants( int current_stim );
+        void suffer_without_sleep( int sleep_deprivation );
+
         // a cache of all active enchantment values.
         // is recalculated every turn in Character::recalculate_enchantment_cache
         enchantment enchantment_cache;
@@ -1486,11 +1644,13 @@ class Character : public Creature, public visitable<Character>
 
         int fatigue;
         int sleep_deprivation;
-        bool check_encumbrance;
+        bool check_encumbrance = true;
 
         int stim;
         int pkill;
 
+        struct weighted_int_list<std::string> melee_miss_reasons;
+
     protected:
         /** Amount of time the player has spent in each overmap tile. */
         std::unordered_map<point, time_duration> overmap_time;
diff --git a/src/clzones.cpp b/src/clzones.cpp
index 2bba218fe1f05..3ccb1ff499ecc 100644
--- a/src/clzones.cpp
+++ b/src/clzones.cpp
@@ -13,6 +13,7 @@
 #include "construction.h"
 #include "debug.h"
 #include "game.h"
+#include "generic_factory.h"
 #include "iexamine.h"
 #include "item_category.h"
 #include "item_search.h"
@@ -51,96 +52,11 @@ zone_manager::zone_manager()
     types.emplace( zone_type_id( "NPC_INVESTIGATE_ONLY" ),
                    zone_type( translate_marker( "NPC Investigation Area" ),
                               translate_marker( "Friendly NPCs will investigate unseen sounds only if they come from inside this area." ) ) );
-    types.emplace( zone_type_id( "LOOT_UNSORTED" ),
-                   zone_type( translate_marker( "Loot: Unsorted" ),
-                              translate_marker( "Place to drop unsorted loot.  You can use \"sort out loot\" zone-action to sort items inside.  It can overlap with Loot zones of different types." ) ) );
-    types.emplace( zone_type_id( "LOOT_FOOD" ),
-                   zone_type( translate_marker( "Loot: Food" ),
-                              translate_marker( "Destination for comestibles.  If more specific food zone is not defined, all food is moved here." ) ) );
-    types.emplace( zone_type_id( "LOOT_PFOOD" ),
-                   zone_type( translate_marker( "Loot: P.Food" ),
-                              translate_marker( "Destination for perishable comestibles.  Does include perishable drinks if such zone is not specified." ) ) );
-    types.emplace( zone_type_id( "LOOT_DRINK" ),
-                   zone_type( translate_marker( "Loot: Drink" ),
-                              translate_marker( "Destination for drinks.  Does include perishable drinks if such zone is not specified." ) ) );
-    types.emplace( zone_type_id( "LOOT_PDRINK" ),
-                   zone_type( translate_marker( "Loot: P.Drink" ),
-                              translate_marker( "Destination for perishable drinks." ) ) );
-    types.emplace( zone_type_id( "LOOT_GUNS" ),
-                   zone_type( translate_marker( "Loot: Guns" ),
-                              translate_marker( "Destination for guns, bows and similar weapons." ) ) );
-    types.emplace( zone_type_id( "LOOT_MAGAZINES" ),
-                   zone_type( translate_marker( "Loot: Magazines" ),
-                              translate_marker( "Destination for gun magazines." ) ) );
-    types.emplace( zone_type_id( "LOOT_AMMO" ),
-                   zone_type( translate_marker( "Loot: Ammo" ),
-                              translate_marker( "Destination for ammo." ) ) );
-    types.emplace( zone_type_id( "LOOT_WEAPONS" ),
-                   zone_type( translate_marker( "Loot: Weapons" ),
-                              translate_marker( "Destination for melee weapons." ) ) );
-    types.emplace( zone_type_id( "LOOT_TOOLS" ),
-                   zone_type( translate_marker( "Loot: Tools" ),
-                              translate_marker( "Destination for tools." ) ) );
-    types.emplace( zone_type_id( "LOOT_CLOTHING" ),
-                   zone_type( translate_marker( "Loot: Clothing" ),
-                              translate_marker( "Destination for clothing.  Does include filthy clothing if such zone is not specified." ) ) );
-    types.emplace( zone_type_id( "LOOT_FCLOTHING" ),
-                   zone_type( translate_marker( "Loot: F.Clothing" ),
-                              translate_marker( "Destination for filthy clothing." ) ) );
-    types.emplace( zone_type_id( "LOOT_DRUGS" ),
-                   zone_type( translate_marker( "Loot: Drugs" ),
-                              translate_marker( "Destination for drugs and other medical items." ) ) );
-    types.emplace( zone_type_id( "LOOT_BOOKS" ),
-                   zone_type( translate_marker( "Loot: Books" ),
-                              translate_marker( "Destination for books and magazines." ) ) );
-    types.emplace( zone_type_id( "LOOT_MODS" ),
-                   zone_type( translate_marker( "Loot: Mods" ),
-                              translate_marker( "Destination for firearm modifications and similar items." ) ) );
-    types.emplace( zone_type_id( "LOOT_MUTAGENS" ),
-                   zone_type( translate_marker( "Loot: Mutagens" ),
-                              translate_marker( "Destination for mutagens, serums, and purifiers." ) ) );
-    types.emplace( zone_type_id( "LOOT_BIONICS" ),
-                   zone_type( translate_marker( "Loot: Bionics" ),
-                              translate_marker( "Destination for Compact Bionics Modules aka CBMs." ) ) );
-    types.emplace( zone_type_id( "LOOT_VEHICLE_PARTS" ),
-                   zone_type( translate_marker( "Loot: V.Parts" ),
-                              translate_marker( "Destination for vehicle parts." ) ) );
-    types.emplace( zone_type_id( "LOOT_OTHER" ),
-                   zone_type( translate_marker( "Loot: Other" ),
-                              translate_marker( "Destination for other miscellaneous items." ) ) );
-    types.emplace( zone_type_id( "LOOT_FUEL" ),
-                   zone_type( translate_marker( "Loot: Fuel" ),
-                              translate_marker( "Destination for gasoline, diesel, lamp oil and other substances used as a fuel." ) ) );
-    types.emplace( zone_type_id( "LOOT_SEEDS" ),
-                   zone_type( translate_marker( "Loot: Seeds" ),
-                              translate_marker( "Destination for seeds, stems and similar items." ) ) );
-    types.emplace( zone_type_id( "LOOT_CHEMICAL" ),
-                   zone_type( translate_marker( "Loot: Chemical" ),
-                              translate_marker( "Destination for chemicals." ) ) );
-    types.emplace( zone_type_id( "LOOT_SPARE_PARTS" ),
-                   zone_type( translate_marker( "Loot: S.Parts" ),
-                              translate_marker( "Destination for spare parts." ) ) );
-    types.emplace( zone_type_id( "LOOT_ARTIFACTS" ),
-                   zone_type( translate_marker( "Loot: Artifacts" ),
-                              translate_marker( "Destination for artifacts" ) ) );
-    types.emplace( zone_type_id( "LOOT_CORPSE" ),
-                   zone_type( translate_marker( "Loot: Corpses" ),
-                              translate_marker( "Destination for corpses" ) ) );
-    types.emplace( zone_type_id( "LOOT_ARMOR" ),
-                   zone_type( translate_marker( "Loot: Armor" ),
-                              translate_marker( "Destination for armor.  Does include filthy armor if such zone is not specified." ) ) );
-    types.emplace( zone_type_id( "LOOT_FARMOR" ),
-                   zone_type( translate_marker( "Loot: F.Armor" ),
-                              translate_marker( "Destination for filthy armor." ) ) );
-    types.emplace( zone_type_id( "LOOT_WOOD" ),
-                   zone_type( translate_marker( "Loot: Wood" ),
-                              translate_marker( "Destination for firewood and items that can be used as such." ) ) );
-    types.emplace( zone_type_id( "LOOT_CUSTOM" ),
-                   zone_type( translate_marker( "Loot: Custom" ),
-                              translate_marker( "Destination for loot with a custom filter that you can modify." ) ) );
-    types.emplace( zone_type_id( "LOOT_IGNORE" ),
-                   zone_type( translate_marker( "Loot: Ignore" ),
-                              translate_marker( "Items inside of this zone are ignored by \"sort out loot\" zone-action." ) ) );
+
+    for( const zone_type &zone : zone_type::get_all() ) {
+        types.emplace( zone.id, zone );
+    }
+
     types.emplace( zone_type_id( "SOURCE_FIREWOOD" ),
                    zone_type( translate_marker( "Source: Firewood" ),
                               translate_marker( "Source for firewood or other flammable materials in this zone may be used to automatically refuel fires.  "
@@ -166,6 +82,9 @@ zone_manager::zone_manager()
     types.emplace( zone_type_id( "VEHICLE_PATROL" ),
                    zone_type( translate_marker( "Vehicle Patrol Zone" ),
                               translate_marker( "Vehicles with an autopilot will patrol in this zone." ) ) );
+    types.emplace( zone_type_id( "CAMP_STORAGE" ),
+                   zone_type( translate_marker( "Basecamp: Storage" ),
+                              translate_marker( "Items in this zone will be added to a basecamp's inventory for use by it's workers." ) ) );
     types.emplace( zone_type_id( "CAMP_FOOD" ),
                    zone_type( translate_marker( "Basecamp: Food" ),
                               translate_marker( "Items in this zone will be added to a basecamp's food supply in the Distribute Food mission." ) ) );
@@ -182,6 +101,40 @@ std::string zone_type::desc() const
     return _( desc_ );
 }
 
+namespace
+{
+generic_factory<zone_type> zone_type_factory( "zone_type" );
+} // namespace
+
+template<>
+const zone_type &string_id<zone_type>::obj() const
+{
+    return zone_type_factory.obj( *this );
+}
+
+template<>
+bool string_id<zone_type>::is_valid() const
+{
+    return zone_type_factory.is_valid( *this );
+}
+
+const std::vector<zone_type> &zone_type::get_all()
+{
+    return zone_type_factory.get_all();
+}
+
+void zone_type::load_zones( JsonObject &jo, const std::string &src )
+{
+    zone_type_factory.load( jo, src );
+}
+
+void zone_type::load( JsonObject &jo, const std::string & )
+{
+    mandatory( jo, was_loaded, "name", name_ );
+    mandatory( jo, was_loaded, "id", id );
+    optional( jo, was_loaded, "description", desc_, "" );
+}
+
 std::shared_ptr<zone_options> zone_options::create( const zone_type_id &type )
 {
     if( type == zone_type_id( "FARM_PLOT" ) ) {
@@ -220,20 +173,18 @@ int blueprint_options::get_final_construction(
         return idx;
     }
 
-    if( string_ends_with( con.post_terrain, "_half" ) ||
-        string_ends_with( con.post_terrain, "_halfway" ) ) {
-        for( int i = 0; i < static_cast<int>( list_constructions.size() ); ++i ) {
-            if( i == idx || skip_index.find( i ) != skip_index.end() ) {
-                continue;
-            }
-            const construction &con_next =  list_constructions[i];
-            if( con.description == con_next.description &&
-                con.post_terrain == con_next.pre_terrain ) {
-                skip_index.insert( idx );
-                return get_final_construction( list_constructions, i, skip_index );
-            }
+    for( int i = 0; i < static_cast<int>( list_constructions.size() ); ++i ) {
+        if( i == idx || skip_index.find( i ) != skip_index.end() ) {
+            continue;
+        }
+        const construction &con_next = list_constructions[i];
+        if( con.description == con_next.description &&
+            con.post_terrain == con_next.pre_terrain ) {
+            skip_index.insert( idx );
+            return get_final_construction( list_constructions, i, skip_index );
         }
     }
+
     return idx;
 }
 
@@ -717,17 +668,13 @@ bool zone_manager::has_loot_dest_near( const tripoint &where ) const
 
 const zone_data *zone_manager::get_zone_at( const tripoint &where, const zone_type_id &type ) const
 {
-    for( auto it = zones.rbegin(); it != zones.rend(); ++it ) {
-        const auto &zone = *it;
-
+    for( const zone_data &zone : zones ) {
         if( zone.has_inside( where ) && zone.get_type() == type ) {
             return &zone;
         }
     }
     auto vzones = g->m.get_vehicle_zones( g->get_levz() );
-    for( auto it = vzones.rbegin(); it != vzones.rend(); ++it ) {
-        const auto &zone = *it;
-
+    for( const zone_data *zone : vzones ) {
         if( zone->has_inside( where ) && zone->get_type() == type ) {
             return zone;
         }
diff --git a/src/clzones.h b/src/clzones.h
index c23a9f783ee6a..12965094d8866 100644
--- a/src/clzones.h
+++ b/src/clzones.h
@@ -36,10 +36,24 @@ class zone_type
         std::string name_;
         std::string desc_;
     public:
+
+        zone_type_id id;
+        bool was_loaded;
+
+        zone_type() = default;
         explicit zone_type( const std::string &name, const std::string &desc ) : name_( name ),
             desc_( desc ) {}
+
         std::string name() const;
         std::string desc() const;
+
+        static void load_zones( JsonObject &jo, const std::string &src );
+        void load( JsonObject &jo, const std::string & );
+        /**
+         * All spells in the game.
+         */
+        static const std::vector<zone_type> &get_all();
+        bool is_valid() const;
 };
 
 class zone_options
diff --git a/src/color.cpp b/src/color.cpp
index b49d37bebcecd..eb065c27e14b7 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -866,7 +866,7 @@ void color_manager::show_gui()
             finalize(); // Need to recalculate caches
 
         } else if( action == "LOAD_TEMPLATE" ) {
-            auto vFiles = get_files_from_path( ".json", FILENAMES["color_templates"], false, true );
+            auto vFiles = get_files_from_path( ".json", PATH_INFO::color_templates(), false, true );
 
             if( !vFiles.empty() ) {
                 uilist ui_templates;
@@ -978,7 +978,7 @@ void color_manager::show_gui()
 
 bool color_manager::save_custom()
 {
-    const auto savefile = FILENAMES["custom_colors"];
+    const auto savefile = PATH_INFO::custom_colors();
 
     return write_to_file( savefile, [&]( std::ostream & fout ) {
         JsonOut jsout( fout );
@@ -988,7 +988,7 @@ bool color_manager::save_custom()
 
 void color_manager::load_custom( const std::string &sPath )
 {
-    const auto file = sPath.empty() ? FILENAMES["custom_colors"] : sPath;
+    const auto file = sPath.empty() ? PATH_INFO::custom_colors() : sPath;
 
     read_from_file_optional_json( file, [this]( JsonIn & jsonin ) {
         deserialize( jsonin );
diff --git a/src/color_loader.h b/src/color_loader.h
index afcd2f2e57730..b8d3216d1eb57 100644
--- a/src/color_loader.h
+++ b/src/color_loader.h
@@ -61,8 +61,8 @@ class color_loader
     public:
         /// @throws std::exception upon any kind of error.
         void load( std::array<ColorType, COLOR_NAMES_COUNT> &windowsPalette ) {
-            const std::string default_path = FILENAMES["colors"];
-            const std::string custom_path = FILENAMES["base_colors"];
+            const std::string default_path = PATH_INFO::colors();
+            const std::string custom_path = PATH_INFO::base_colors();
 
             if( !file_exist( custom_path ) ) {
                 copy_file( default_path, custom_path );
diff --git a/src/computer.cpp b/src/computer.cpp
index 36038b1d6aba5..02d5057e8659f 100644
--- a/src/computer.cpp
+++ b/src/computer.cpp
@@ -65,7 +65,7 @@ const species_id HUMAN( "HUMAN" );
 
 const efftype_id effect_amigara( "amigara" );
 
-int alerts = 0;
+static int alerts = 0;
 
 computer_option::computer_option()
     : name( "Unknown" ), action( COMPACT_NULL ), security( 0 )
@@ -539,14 +539,14 @@ void computer::activate_function( computer_action action )
             // TODO: seed should probably be a member of the computer, or better: of the computer action.
             // It is here to ensure one computer reporting the same text on each invocation.
             const int seed = g->get_levx() + g->get_levy() + g->get_levz() + alerts;
-            std::string log = SNIPPET.get( SNIPPET.assign( "lab_notes", seed ) );
-            if( log.empty() ) {
-                log = _( "No data found." );
+            cata::optional<translation> log = SNIPPET.random_from_category( "lab_notes", seed );
+            if( !log.has_value() ) {
+                log = to_translation( "No data found." );
             } else {
                 g->u.moves -= 70;
             }
 
-            print_text( "%s", log );
+            print_text( "%s", log.value() );
             // One's an anomaly
             if( alerts == 0 ) {
                 query_any( _( "Local data-access error logged, alerting helpdesk.  Press any key…" ) );
@@ -566,7 +566,7 @@ void computer::activate_function( computer_action action )
             sfx::play_ambient_variant_sound( "radio", "inaudible_chatter", 100, sfx::channel::radio,
                                              2000 );
             print_text( "Accessing archive.  Playing audio recording nr %d.\n%s", rng( 1, 9999 ),
-                        SNIPPET.random_from_category( "radio_archive" ) );
+                        SNIPPET.random_from_category( "radio_archive" ).value_or( translation() ) );
             if( one_in( 3 ) ) {
                 query_any( _( "Warning: resticted data access.  Attempt logged.  Press any key…" ) );
                 alerts ++;
@@ -747,7 +747,7 @@ void computer::activate_function( computer_action action )
             g->u.moves -= 30;
             reset_terminal();
             print_line( _( "NEPower Mine(%d:%d) Log" ), g->get_levx(), g->get_levy() );
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "amigara1" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "amigara1" ).value_or( translation() ) );
 
             if( !query_bool( _( "Continue reading?" ) ) ) {
                 return;
@@ -755,7 +755,7 @@ void computer::activate_function( computer_action action )
             g->u.moves -= 30;
             reset_terminal();
             print_line( _( "NEPower Mine(%d:%d) Log" ), g->get_levx(), g->get_levy() );
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "amigara2" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "amigara2" ).value_or( translation() ) );
 
             if( !query_bool( _( "Continue reading?" ) ) ) {
                 return;
@@ -763,7 +763,7 @@ void computer::activate_function( computer_action action )
             g->u.moves -= 30;
             reset_terminal();
             print_line( _( "NEPower Mine(%d:%d) Log" ), g->get_levx(), g->get_levy() );
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "amigara3" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "amigara3" ).value_or( translation() ) );
 
             if( !query_bool( _( "Continue reading?" ) ) ) {
                 return;
@@ -786,7 +786,7 @@ void computer::activate_function( computer_action action )
             print_line( _( "SITE %d%d%d\n"
                            "PERTINENT FOREMAN LOGS WILL BE PREPENDED TO NOTES" ),
                         g->get_levx(), g->get_levy(), abs( g->get_levz() ) );
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "amigara4" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "amigara4" ).value_or( translation() ) );
             print_gibberish_line();
             print_gibberish_line();
             print_newline();
@@ -981,52 +981,52 @@ void computer::activate_function( computer_action action )
 
         case COMPACT_SR1_MESS:
             reset_terminal();
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "sr1_mess" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "sr1_mess" ).value_or( translation() ) );
             query_any( _( "Press any key to continue…" ) );
             break;
 
         case COMPACT_SR2_MESS:
             reset_terminal();
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "sr2_mess" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "sr2_mess" ).value_or( translation() ) );
             query_any( _( "Press any key to continue…" ) );
             break;
 
         case COMPACT_SR3_MESS:
             reset_terminal();
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "sr3_mess" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "sr3_mess" ).value_or( translation() ) );
             query_any( _( "Press any key to continue…" ) );
             break;
 
         case COMPACT_SR4_MESS:
             reset_terminal();
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "sr4_mess" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "sr4_mess" ).value_or( translation() ) );
             query_any( _( "Press any key to continue…" ) );
             break;
 
         case COMPACT_SRCF_1_MESS:
             reset_terminal();
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "scrf_1_mess" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "scrf_1_mess" ).value_or( translation() ) );
             query_any( _( "Press any key to continue…" ) );
             break;
 
         case COMPACT_SRCF_2_MESS:
             reset_terminal();
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "scrf_2_1_mess" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "scrf_2_1_mess" ).value_or( translation() ) );
             query_any( _( "Press any key to continue…" ) );
             reset_terminal();
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "scrf_2_2_mess" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "scrf_2_2_mess" ).value_or( translation() ) );
             query_any( _( "Press any key to continue…" ) );
             break;
 
         case COMPACT_SRCF_3_MESS:
             reset_terminal();
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "scrf_3_mess" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "scrf_3_mess" ).value_or( translation() ) );
             query_any( _( "Press any key to continue…" ) );
             break;
 
         case COMPACT_SRCF_SEAL_ORDER:
             reset_terminal();
-            print_text( "%s", SNIPPET.get( SNIPPET.assign( "scrf_seal_order" ) ) );
+            print_text( "%s", SNIPPET.random_from_category( "scrf_seal_order" ).value_or( translation() ) );
             query_any( _( "Press any key to continue…" ) );
             break;
 
diff --git a/src/consumption.cpp b/src/consumption.cpp
index 78ade97deb1e8..1d2bb0a9ad500 100644
--- a/src/consumption.cpp
+++ b/src/consumption.cpp
@@ -58,7 +58,6 @@ const mtype_id mon_player_blob( "mon_player_blob" );
 
 const bionic_id bio_advreactor( "bio_advreactor" );
 const bionic_id bio_digestion( "bio_digestion" );
-const bionic_id bio_ethanol( "bio_ethanol" );
 const bionic_id bio_furnace( "bio_furnace" );
 const bionic_id bio_reactor( "bio_reactor" );
 const bionic_id bio_taste_blocker( "bio_taste_blocker" );
@@ -73,7 +72,7 @@ const std::array<std::string, 2> temparray {{"ALLERGEN_MEAT", "ALLERGEN_EGG"}};
 const std::vector<std::string> herbivore_blacklist( temparray.begin(), temparray.end() );
 
 // Defines the maximum volume that a internal furnace can consume
-const units::volume furnace_max_volume( 3000_ml ) ;
+const units::volume furnace_max_volume( 3_liter ) ;
 
 // TODO: JSONize.
 const std::map<itype_id, int> plut_charges = {
@@ -596,7 +595,7 @@ ret_val<edible_rating> player::will_eat( const item &food, bool interactive ) co
         add_consequence( _( "Your stomach won't be happy (not rotten enough)." ), ALLERGY_WEAK );
     }
 
-    if( food.charges > 0 && stomach.stomach_remaining() < food.volume() / food.charges &&
+    if( food.charges > 0 && stomach.stomach_remaining( *this ) < food.volume() / food.charges &&
         !food.has_infinite_charges() ) {
         if( edible ) {
             add_consequence( _( "You're full already and will be forcing yourself to eat." ), TOO_FULL );
@@ -678,10 +677,10 @@ bool player::eat( item &food, bool force )
             _( "You've begun stockpiling calories and liquid for hibernation.  You get the feeling that you should prepare for bed, just in case, but… you're hungry again, and you could eat a whole week's worth of food RIGHT NOW." ) );
     }
 
-    const bool will_vomit = stomach.stomach_remaining() < food.volume() &&
-                            rng( units::to_milliliter( stomach.capacity() ) / 2,
+    const bool will_vomit = stomach.stomach_remaining( *this ) < food.volume() &&
+                            rng( units::to_milliliter( stomach.capacity( *this ) ) / 2,
                                  units::to_milliliter( stomach.contains() ) ) > units::to_milliliter(
-                                stomach.capacity() );
+                                stomach.capacity( *this ) );
     const bool saprophage = has_trait( trait_id( "SAPROPHAGE" ) );
     if( spoiled && !saprophage ) {
         add_msg_if_player( m_bad, _( "Ick, this %s doesn't taste so good…" ), food.tname() );
@@ -813,16 +812,6 @@ bool player::eat( item &food, bool force )
         use_charges( food.get_comestible()->tool, 1 );
     }
 
-    if( has_bionic( bio_ethanol ) && food.type->can_use( "ALCOHOL" ) ) {
-        mod_power_level( units::from_kilojoule( rng( 50, 200 ) ) );
-    }
-    if( has_bionic( bio_ethanol ) && food.type->can_use( "ALCOHOL_WEAK" ) ) {
-        mod_power_level( units::from_kilojoule( rng( 25, 100 ) ) );
-    }
-    if( has_bionic( bio_ethanol ) && food.type->can_use( "ALCOHOL_STRONG" ) ) {
-        mod_power_level( units::from_kilojoule( rng( 75, 300 ) ) );
-    }
-
     if( has_active_bionic( bio_taste_blocker ) ) {
         mod_power_level( units::from_kilojoule( -abs( food.get_comestible()->fun ) ) );
     }
@@ -1108,7 +1097,7 @@ bool player::consume_effects( item &food )
     // Incredibly minor stuff like this shouldn't require complexity
     if( !is_npc() && has_trait( trait_id( "SLIMESPAWNER" ) ) &&
         ( get_healthy_kcal() < get_stored_kcal() + 4000 &&
-          get_thirst() - stomach.get_water() / 5_ml < 40 ) ) {
+          get_thirst() - stomach.get_water() / 5_ml < -20 ) && get_thirst() < 40 ) {
         add_msg_if_player( m_mixed,
                            _( "You feel as though you're going to split open!  In a good way?" ) );
         mod_pain( 5 );
@@ -1142,8 +1131,21 @@ bool player::consume_effects( item &food )
         // Note: We want this here to prevent "you can't finish this" messages
         set_hunger( capacity );
     }
+
+    // Set up food for ingestion
+    nutrients ingested;
+    const item &contained_food = food.is_container() ? food.get_contained() : food;
+    // maybe move tapeworm to digestion
+    for( const std::pair<vitamin_id, int> &v : vitamins_from( contained_food ) ) {
+        ingested.vitamins[v.first] += has_effect( efftype_id( "tapeworm" ) ) ? v.second / 2 : v.second;
+    }
+    // @TODO: Move quench values to mL and remove the magic number here
+    ingested.water = contained_food.type->comestible->quench * 5_ml;
+    ingested.solids = contained_food.base_volume() - std::max( ingested.water, 0_ml );
+    ingested.kcal = kcal_for( contained_food );
+
     // GET IN MAH BELLY!
-    stomach.ingest( *this, food, 1 );
+    stomach.ingest( ingested );
     return true;
 }
 
diff --git a/src/crafting.cpp b/src/crafting.cpp
index 4b558d65584df..59c7b925d6bdd 100644
--- a/src/crafting.cpp
+++ b/src/crafting.cpp
@@ -205,7 +205,7 @@ static float workbench_crafting_speed_multiplier( const item &craft, const tripo
     const units::volume &craft_volume = craft.volume();
 
     multiplier *= lerped_multiplier( craft_mass, allowed_mass, 1000_kilogram );
-    multiplier *= lerped_multiplier( craft_volume, allowed_volume, 1000000_ml );
+    multiplier *= lerped_multiplier( craft_volume, allowed_volume, 1000_liter );
 
     return multiplier;
 }
@@ -563,7 +563,7 @@ const inventory &player::crafting_inventory( const tripoint &src_pos, int radius
     return cached_crafting_inventory;
 }
 
-void player::invalidate_crafting_inventory()
+void Character::invalidate_crafting_inventory()
 {
     cached_time = calendar::before_time_starts;
 }
@@ -617,35 +617,6 @@ static void set_components( std::list<item> &components, const std::list<item> &
     }
 }
 
-/**
- * @brief Round the item's birthday forward to the nearest hour.
- * The purpose of this is so that items with close birthdays will stack more readily.
- *
- * @param newit
- */
-static void set_item_food( item &newit )
-{
-    // TODO: encapsulate this into some function
-    int bday_tmp = to_turn<int>( newit.birthday() ) % 3600; // fuzzy birthday for stacking reasons
-    newit.set_birthday( newit.birthday() + 3600_turns - time_duration::from_turns( bday_tmp ) );
-}
-
-/**
- * @brief Calls set_item_food on the item if it's food, and set item's faction.
- *
- * @param newit The item for modification
- * @param maker_fac The faction the item should belong to
- */
-static void finalize_crafted_item( item &newit, faction *maker_fac )
-{
-    if( newit.is_food() ) {
-        set_item_food( newit );
-    }
-    // TODO for now this assumes player is doing the crafting
-    // this will need to be updated when NPCs do crafting
-    newit.set_owner( maker_fac->id );
-}
-
 static cata::optional<item_location> wield_craft( player &p, item &craft )
 {
     if( p.wield( craft ) ) {
@@ -1015,15 +986,15 @@ static void destroy_random_component( item &craft, const player &crafter )
                                    _( "<npcname> messes up and destroys the %s" ), destroyed.tname() );
 }
 
-void item::handle_craft_failure( player &crafter )
+bool item::handle_craft_failure( player &crafter )
 {
     if( !is_craft() ) {
         debugmsg( "handle_craft_failure() called on non-craft '%s.'  Aborting.", tname() );
-        return;
+        return false;
     }
 
     const double success_roll = crafter.crafting_success_roll( get_making() );
-
+    const int starting_components = this->components.size();
     // Destroy at most 75% of the components, always a chance of losing 1 though
     const size_t max_destroyed = std::max<size_t>( 1, components.size() * 3 / 4 );
     for( size_t i = 0; i < max_destroyed; i++ ) {
@@ -1037,6 +1008,10 @@ void item::handle_craft_failure( player &crafter )
         }
         destroy_random_component( *this, crafter );
     }
+    if( starting_components > 0 && this->components.empty() ) {
+        // The craft had components and all of them were destroyed.
+        return true;
+    }
 
     // Minimum 25% progress lost, average 35%.  Falls off exponentially
     // Loss is scaled by the success roll
@@ -1053,6 +1028,7 @@ void item::handle_craft_failure( player &crafter )
     if( !crafter.can_continue_craft( *this ) ) {
         crafter.cancel_activity();
     }
+    return false;
 }
 
 requirement_data item::get_continue_reqs() const
@@ -1216,10 +1192,10 @@ void player::complete_craft( item &craft, const tripoint &loc )
             }
         }
 
-        finalize_crafted_item( newit, get_faction() );
+        newit.set_owner( get_faction()->id );
         // If these aren't equal, newit is a container, so finalize its contents too.
         if( &newit != &food_contained ) {
-            finalize_crafted_item( food_contained, get_faction() );
+            food_contained.set_owner( get_faction()->id );
         }
 
         if( newit.made_of( LIQUID ) ) {
@@ -1245,7 +1221,7 @@ void player::complete_craft( item &craft, const tripoint &loc )
                     bp.reset_temp_check();
                 }
             }
-            finalize_crafted_item( bp, get_faction() );
+            bp.set_owner( get_faction()->id );
             if( bp.made_of( LIQUID ) ) {
                 liquid_handler::handle_all_liquid( bp, PICKUP_RANGE );
             } else if( loc == tripoint_zero ) {
diff --git a/src/crafting_gui.cpp b/src/crafting_gui.cpp
index 7be561a7d8117..6e7a0046293d5 100644
--- a/src/crafting_gui.cpp
+++ b/src/crafting_gui.cpp
@@ -646,8 +646,12 @@ const recipe *select_crafting_recipe( int &batch_size )
             }
 
             if( isWide ) {
-                draw_item_info( w_iteminfo, tmp.tname(), tmp.type_name(), thisItem, dummy,
-                                scroll_pos, true, true, true, false, true );
+                item_info_data data( tmp.tname(), tmp.type_name(), thisItem, dummy, scroll_pos );
+                data.without_getch = true;
+                data.without_border = true;
+                data.scrollbar_left = false;
+                data.use_full_win = true;
+                draw_item_info( w_iteminfo, data );
             }
         }
 
diff --git a/src/crash.cpp b/src/crash.cpp
index 6e2766242f9ff..d6c96ad92d82d 100644
--- a/src/crash.cpp
+++ b/src/crash.cpp
@@ -230,24 +230,13 @@ void init_crash_handlers()
 
 extern "C" {
 
-    static const char *get_crash_log_file_name()
-    {
-        auto crash_it = FILENAMES.find( "crash" );
-        if( crash_it != FILENAMES.end() ) {
-            return crash_it->second.c_str();
-        }
-        // If we failed to get the FILENAMES entry then just write to cwd,
-        // since we don't know whether any other directory would exist.
-        return "crash.log";
-    }
-
     static void log_crash( const char *type, const char *msg )
     {
         // This implementation is not technically async-signal-safe for many
         // reasons, including the memory allocations and the SDL message box.
         // But it should usually work in practice, unless for example the
         // program segfaults inside malloc.
-        const char *crash_log_file = get_crash_log_file_name();
+        const std::string crash_log_file = PATH_INFO::crash();
         std::ostringstream log_text;
         log_text << "The program has crashed."
                  << "\nSee the log file for a stack trace."
@@ -264,7 +253,7 @@ extern "C" {
         log_text << "\nSTACK TRACE:\n";
         debug_write_backtrace( log_text );
         std::cerr << log_text.str();
-        FILE *file = fopen( crash_log_file, "w" );
+        FILE *file = fopen( crash_log_file.c_str(), "w" );
         if( file ) {
             fwrite( log_text.str().data(), 1, log_text.str().size(), file );
             fclose( file );
diff --git a/src/creature.cpp b/src/creature.cpp
index 81a9e80f760cd..17126a28b6771 100644
--- a/src/creature.cpp
+++ b/src/creature.cpp
@@ -1474,7 +1474,6 @@ void Creature::set_armor_cut_bonus( int ncutarm )
     armor_cut_bonus = ncutarm;
 }
 
-
 void Creature::set_speed_base( int nspeed )
 {
     speed_base = nspeed;
diff --git a/src/debug.cpp b/src/debug.cpp
index e28df00a18125..c898f192741c1 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -136,7 +136,7 @@ void realDebugmsg( const char *filename, const char *line, const char *funcname,
     std::string backtrace_instructions =
         string_format(
             _( "See %s for a full stack backtrace" ),
-            FILENAMES["debug"]
+            PATH_INFO::debug()
         );
 #endif
 
@@ -416,7 +416,7 @@ void setupDebug( DebugOutput output_mode )
         limitDebugClass( cl );
     }
 
-    debugFile.init( output_mode, FILENAMES["debug"] );
+    debugFile.init( output_mode, PATH_INFO::debug() );
 }
 
 void deinitDebug()
diff --git a/src/debug.h b/src/debug.h
index 8832703e9fc9b..2582942e76502 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -24,7 +24,7 @@
  * DebugLog always returns a stream that starts on a new line. Don't add a
  * newline at the end of your debug message.
  * If the specific debug level or class have been disabled, the message is
- * actually discarded, otherwise it is written to a log file (FILENAMES["debug"]).
+ * actually discarded, otherwise it is written to a log file.
  * If a single source file contains mostly messages for the same debug class
  * (e.g. mapgen.cpp), create and use the macro dbg.
  *
diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp
index 7b23ea9705f02..24e9d0005e45c 100644
--- a/src/debug_menu.cpp
+++ b/src/debug_menu.cpp
@@ -1115,11 +1115,11 @@ void debug()
             std::string stom =
                 _( "Stomach Contents: %d ml / %d ml kCal: %d, Water: %d ml" );
             add_msg( m_info, stom.c_str(), units::to_milliliter( u.stomach.contains() ),
-                     units::to_milliliter( u.stomach.capacity() ), u.stomach.get_calories(),
+                     units::to_milliliter( u.stomach.capacity( u ) ), u.stomach.get_calories(),
                      units::to_milliliter( u.stomach.get_water() ), u.get_hunger() );
             stom = _( "Guts Contents: %d ml / %d ml kCal: %d, Water: %d ml\nHunger: %d, Thirst: %d, kCal: %d / %d" );
             add_msg( m_info, stom.c_str(), units::to_milliliter( u.guts.contains() ),
-                     units::to_milliliter( u.guts.capacity() ), u.guts.get_calories(),
+                     units::to_milliliter( u.guts.capacity( u ) ), u.guts.get_calories(),
                      units::to_milliliter( u.guts.get_water() ), u.get_hunger(), u.get_thirst(), u.get_stored_kcal(),
                      u.get_healthy_kcal() );
             add_msg( m_info, _( "Body Mass Index: %.0f\nBasal Metabolic Rate: %i" ), u.get_bmi(), u.get_bmr() );
@@ -1146,24 +1146,28 @@ void debug()
                 dbg( D_ERROR ) << "game:load: There's already vehicle here";
                 debugmsg( "There's already vehicle here" );
             } else {
-                std::vector<vproto_id> veh_strings;
+                // Vector of name, id so that we can sort by name
+                std::vector<std::pair<std::string, vproto_id>> veh_strings;
+                for( auto &elem : vehicle_prototype::get_all() ) {
+                    if( elem == vproto_id( "custom" ) ) {
+                        continue;
+                    }
+                    veh_strings.emplace_back( elem->name, elem );
+                }
+                std::sort( veh_strings.begin(), veh_strings.end() );
                 uilist veh_menu;
                 veh_menu.text = _( "Choose vehicle to spawn" );
                 int menu_ind = 0;
-                for( auto &elem : vehicle_prototype::get_all() ) {
-                    if( elem != vproto_id( "custom" ) ) {
-                        const vehicle_prototype &proto = elem.obj();
-                        veh_strings.push_back( elem );
-                        //~ Menu entry in vehicle wish menu: 1st string: displayed name, 2nd string: internal name of vehicle
-                        veh_menu.addentry( menu_ind, true, MENU_AUTOASSIGN, _( "%1$s (%2$s)" ), _( proto.name ),
-                                           elem.c_str() );
-                        ++menu_ind;
-                    }
+                for( auto &elem : veh_strings ) {
+                    //~ Menu entry in vehicle wish menu: 1st string: displayed name, 2nd string: internal name of vehicle
+                    veh_menu.addentry( menu_ind, true, MENU_AUTOASSIGN, _( "%1$s (%2$s)" ),
+                                       _( elem.first ), elem.second.c_str() );
+                    ++menu_ind;
                 }
                 veh_menu.query();
                 if( veh_menu.ret >= 0 && veh_menu.ret < static_cast<int>( veh_strings.size() ) ) {
                     //Didn't cancel
-                    const vproto_id &selected_opt = veh_strings[veh_menu.ret];
+                    const vproto_id &selected_opt = veh_strings[veh_menu.ret].second;
                     tripoint dest = u.pos(); // TODO: Allow picking this when add_vehicle has 3d argument
                     vehicle *veh = m.add_vehicle( selected_opt, dest.xy(), -90, 100, 0 );
                     if( veh != nullptr ) {
diff --git a/src/enums.h b/src/enums.h
index 4440085106f38..537df3f6746cc 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -236,6 +236,12 @@ enum game_message_type : int {
     m_headshot,
     m_critical,
     m_grazing,
+    num_game_message_type
+};
+
+template<>
+struct enum_traits<game_message_type> {
+    static constexpr game_message_type last = game_message_type::num_game_message_type;
 };
 
 enum game_message_flags {
diff --git a/src/explosion.cpp b/src/explosion.cpp
index 2615e07576217..659139538a8d2 100644
--- a/src/explosion.cpp
+++ b/src/explosion.cpp
@@ -136,7 +136,7 @@ static void do_blast( const tripoint &p, const float power,
                       const float distance_factor, const bool fire )
 {
     const float tile_dist = 1.0f;
-    const float diag_dist = trigdist ? 1.41f * tile_dist : 1.0f * tile_dist;
+    const float diag_dist = trigdist ? M_SQRT2 * tile_dist : 1.0f * tile_dist;
     const float zlev_dist = 2.0f; // Penalty for going up/down
     // 7 3 5
     // 1 . 2
@@ -577,6 +577,9 @@ void shockwave( const tripoint &p, int radius, int force, int stun, int dam_mult
                    "misc", "shockwave" );
 
     for( monster &critter : g->all_monsters() ) {
+        if( critter.posz() != p.z ) {
+            continue;
+        }
         if( rl_dist( critter.pos(), p ) <= radius ) {
             add_msg( _( "%s is caught in the shockwave!" ), critter.name() );
             g->knockback( p, critter.pos(), force, stun, dam_mult );
@@ -584,6 +587,9 @@ void shockwave( const tripoint &p, int radius, int force, int stun, int dam_mult
     }
     // TODO: combine the two loops and the case for g->u using all_creatures()
     for( npc &guy : g->all_npcs() ) {
+        if( guy.posz() != p.z ) {
+            continue;
+        }
         if( rl_dist( guy.pos(), p ) <= radius ) {
             add_msg( _( "%s is caught in the shockwave!" ), guy.name );
             g->knockback( p, guy.pos(), force, stun, dam_mult );
diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp
index 7c58314c36569..27a9d5ce39f47 100644
--- a/src/faction_camp.cpp
+++ b/src/faction_camp.cpp
@@ -95,7 +95,7 @@ const skill_id skill_swimming( "swimming" );
 
 static const trait_id trait_DEBUG_HS( "DEBUG_HS" );
 
-const zone_type_id z_loot_unsorted( "LOOT_UNSORTED" );
+const zone_type_id z_camp_storage( "CAMP_STORAGE" );
 const zone_type_id z_loot_ignore( "LOOT_IGNORE" );
 const zone_type_id z_camp_food( "CAMP_FOOD" );
 
@@ -609,8 +609,8 @@ void talk_function::basecamp_mission( npc &p )
         }
         tripoint src_loc;
         const auto abspos = p.global_square_location();
-        if( mgr.has_near( z_loot_unsorted, abspos ) ) {
-            const auto &src_set = mgr.get_near( z_loot_unsorted, abspos );
+        if( mgr.has_near( z_camp_storage, abspos, 60 ) ) {
+            const auto &src_set = mgr.get_near( z_camp_storage, abspos );
             const auto &src_sorted = get_sorted_tiles_by_distance( abspos, src_set );
             // Find the nearest unsorted zone to dump objects at
             for( auto &src : src_sorted ) {
@@ -1018,12 +1018,12 @@ void basecamp::get_available_missions_by_dir( mission_data &mission_key, const p
                    "Have a companion attempt to completely dissemble a vehicle into "
                    "components.\n\n"
                    "Skill used: mechanics\n"
-                   "Difficulty: 2 \n"
+                   "Difficulty: 2\n"
                    "Effects:\n"
                    "> Removed parts placed on the furniture in the garage.\n"
                    "> Skill plays a huge role to determine what is salvaged.\n\n"
                    "Risk: None\n"
-                   "Time: 5 days \n" );
+                   "Time: 5 days\n" );
         mission_key.add_start( dir_id + miss_info.miss_id, dir_abbr + miss_info.desc, dir, entry,
                                npc_list.empty() );
         if( !npc_list.empty() ) {
@@ -1073,13 +1073,13 @@ void basecamp::get_available_missions_by_dir( mission_data &mission_key, const p
                     farm_description( omt_trg, plots, farm_ops::plow ) +
                     _( "\n\n"
                        "Skill used: fabrication\n"
-                       "Difficulty: N/A \n"
+                       "Difficulty: N/A\n"
                        "Effects:\n"
                        "> Restores only the plots created in the last expansion upgrade.\n"
                        "> Does not damage existing crops.\n\n"
                        "Risk: None\n"
-                       "Time: 5 Min / Plot \n"
-                       "Positions: 0/1 \n" );
+                       "Time: 5 Min / Plot\n"
+                       "Positions: 0/1\n" );
             mission_key.add_start( dir_id + miss_info.miss_id, dir_abbr + miss_info.desc, dir,
                                    entry, plots > 0 );
         } else {
@@ -1100,14 +1100,14 @@ void basecamp::get_available_missions_by_dir( mission_data &mission_key, const p
                     farm_description( omt_trg, plots, farm_ops::plant ) +
                     _( "\n\n"
                        "Skill used: survival\n"
-                       "Difficulty: N/A \n"
+                       "Difficulty: N/A\n"
                        "Effects:\n"
                        "> Choose which seed type or all of your seeds.\n"
                        "> Stops when out of seeds or planting locations.\n"
                        "> Will plant in ALL dirt mounds in the expansion.\n\n"
                        "Risk: None\n"
-                       "Time: 1 Min / Plot \n"
-                       "Positions: 0/1 \n" );
+                       "Time: 1 Min / Plot\n"
+                       "Positions: 0/1\n" );
             mission_key.add_start( dir_id + miss_info.miss_id,
                                    dir_abbr + miss_info.desc, dir, entry,
                                    plots > 0 && warm_enough_to_plant( omt_trg ) );
@@ -1128,12 +1128,12 @@ void basecamp::get_available_missions_by_dir( mission_data &mission_key, const p
                     farm_description( omt_trg, plots, farm_ops::harvest ) +
                     _( "\n\n"
                        "Skill used: survival\n"
-                       "Difficulty: N/A \n"
+                       "Difficulty: N/A\n"
                        "Effects:\n"
                        "> Will dump all harvesting products onto your location.\n\n"
                        "Risk: None\n"
-                       "Time: 3 Min / Plot \n"
-                       "Positions: 0/1 \n" );
+                       "Time: 3 Min / Plot\n"
+                       "Positions: 0/1\n" );
             mission_key.add_start( dir_id + miss_info.miss_id,
                                    dir_abbr + miss_info.desc, dir, entry,
                                    plots > 0 );
@@ -1247,10 +1247,9 @@ void basecamp::get_available_missions( mission_data &mission_key )
     if( !by_radio ) {
         entry = string_format( _( "Notes:\n"
                                   "Distribute food to your follower and fill you larders.  "
-                                  "Place the food you wish to distribute in the camp food "
-                                  "zone.  You must have a camp food zone, an unsorted loot "
-                                  "zone, and at least one loot destination zone or you will "
-                                  "be prompted to create them using the zone manager.\n"
+                                  "Place the food you wish to distribute in the camp food zone.  "
+                                  "You must have a camp food zone, and a camp storage zone, "
+                                  "or you will be prompted to create them using the zone manager.\n"
                                   "Effects:\n"
                                   "> Increases your faction's food supply value which in "
                                   "turn is used to pay laborers for their time\n\n"
@@ -1263,20 +1262,6 @@ void basecamp::get_available_missions( mission_data &mission_key )
                                   "Total faction food stock: %d kcal\nor %d day's rations" ),
                                camp_food_supply(), camp_food_supply( 0, true ) );
         mission_key.add( "Distribute Food", _( "Distribute Food" ), entry );
-
-        entry = string_format( _( "Notes:\n"
-                                  "Reset the zones that items are sorted to using the "
-                                  "[ Menial Labor ] mission.\n\n"
-                                  "Effects:\n"
-                                  "> Assign sort zones using the zone manager.  You must "
-                                  "have a camp food zone, an unsorted loot zone, and at "
-                                  "least one loot destination zone.\n"
-                                  "> Only items that are in the unsorted loot zone and not "
-                                  "in any other zone will be sorted.\n"
-                                  "Items that do not have a loot destination zone will be "
-                                  "sorted using the normal rules for automatic zone "
-                                  "sorting." ) );
-        mission_key.add( "Reset Sort Points", _( "Reset Sort Points" ), entry );
         validate_assignees();
         std::vector<npc_ptr> npc_list = get_npcs_assigned();
         entry = string_format( _( "Notes:\n"
@@ -1320,10 +1305,6 @@ bool basecamp::handle_mission( const std::string &miss_id, cata::optional<point>
         distribute_food();
     }
 
-    if( miss_id == "Reset Sort Points" ) {
-        set_sort_points();
-    }
-
     if( miss_id.size() > 12 && miss_id.substr( 0, 12 ) == "Upgrade Camp" ) {
         const std::string bldg = miss_id.substr( 12 );
         start_upgrade( bldg, base_camps::base_dir, bldg + "_faction_upgrade_camp" );
@@ -3372,17 +3353,16 @@ bool basecamp::validate_sort_points()
         mgr.cache_vzones();
     }
     tripoint src_loc = bb_pos + point_north;
-    const auto abspos = g->m.getabs( g->u.pos() );
-    if( !mgr.has_near( z_loot_unsorted, abspos ) ||
-        !mgr.has_near( z_camp_food, abspos ) || !mgr.has_loot_dest_near( abspos ) ) {
+    const tripoint abspos = g->m.getabs( g->u.pos() );
+    if( !mgr.has_near( z_camp_storage, abspos, 60 ) || !mgr.has_near( z_camp_food, abspos, 60 ) ) {
         if( query_yn( _( "You do not have sufficient sort zones.  Do you want to add them?" ) ) ) {
             return set_sort_points();
         } else {
             return false;
         }
     } else {
-        const auto &src_set = mgr.get_near( z_loot_unsorted, abspos );
-        const auto &src_sorted = get_sorted_tiles_by_distance( abspos, src_set );
+        const std::unordered_set<tripoint> &src_set = mgr.get_near( z_camp_storage, abspos );
+        const std::vector<tripoint> &src_sorted = get_sorted_tiles_by_distance( abspos, src_set );
         // Find the nearest unsorted zone to dump objects at
         for( auto &src : src_sorted ) {
             src_loc = g->m.getlocal( src );
@@ -3396,8 +3376,7 @@ bool basecamp::validate_sort_points()
 bool basecamp::set_sort_points()
 {
     popup( _( "Sorting zones have changed.  Please create some sorting zones.  "
-              "You must create a camp food zone for your camp, an unsorted loot zone, "
-              "and at least one destination loot zone." ) );
+              "You must create a camp food zone, and a camp storage zone." ) );
     g->zones_manager();
     return validate_sort_points();
 }
@@ -3674,8 +3653,8 @@ bool basecamp::distribute_food()
     if( g->m.check_vehicle_zones( g->get_levz() ) ) {
         mgr.cache_vzones();
     }
-    const tripoint &abspos = g->m.getabs( g->u.pos() );
-    const std::unordered_set<tripoint> &z_food = mgr.get_near( z_camp_food, abspos );
+    const tripoint &abspos = get_dumping_spot();
+    const std::unordered_set<tripoint> &z_food = mgr.get_near( z_camp_food, abspos, 60 );
 
     tripoint p_litter = omt_to_sm_copy( omt_pos ) + point( -7, 0 );
 
@@ -3769,8 +3748,8 @@ void basecamp::place_results( item result )
             mgr.cache_vzones();
         }
         const auto abspos = g->m.getabs( g->u.pos() );
-        if( mgr.has_near( z_loot_unsorted, abspos ) ) {
-            const auto &src_set = mgr.get_near( z_loot_unsorted, abspos );
+        if( mgr.has_near( z_camp_storage, abspos ) ) {
+            const auto &src_set = mgr.get_near( z_camp_storage, abspos );
             const auto &src_sorted = get_sorted_tiles_by_distance( abspos, src_set );
             // Find the nearest unsorted zone to dump objects at
             for( auto &src : src_sorted ) {
diff --git a/src/field.cpp b/src/field.cpp
index 55debbf266c58..bf0f5a5bbbe66 100644
--- a/src/field.cpp
+++ b/src/field.cpp
@@ -265,18 +265,7 @@ int field::total_move_cost() const
     return current_cost;
 }
 
-effect field_entry::field_effect() const
+std::vector<field_effect> field_entry::field_effects() const
 {
-    const field_effect_data &field_effect = type->get_intensity_level( intensity - 1 ).field_effect;
-    const efftype_id fx_id = field_effect.id;
-    if( fx_id.is_empty() || fx_id.is_null() ) {
-        return effect();
-    }
-    return effect( &field_effect.id.obj(), rng( field_effect.min_duration, field_effect.max_duration ),
-                   field_effect.bp, false, field_effect.intensity, calendar::turn );
-}
-
-bool field_entry::inside_immune() const
-{
-    return type->get_intensity_level( intensity - 1 ).field_effect.inside_immune;
+    return type->get_intensity_level( intensity - 1 ).field_effects;
 }
diff --git a/src/field.h b/src/field.h
index 43f2e5c5f5655..3ccd136ac1797 100644
--- a/src/field.h
+++ b/src/field.h
@@ -104,8 +104,7 @@ class field_entry
             return type.obj().accelerated_decay;
         }
 
-        effect field_effect() const;
-        bool inside_immune() const;
+        std::vector<field_effect> field_effects() const;
 
     private:
         // The field identifier.
diff --git a/src/field_type.cpp b/src/field_type.cpp
index 384a91a8bf109..a9b88ad52b205 100644
--- a/src/field_type.cpp
+++ b/src/field_type.cpp
@@ -1,7 +1,5 @@
 #include "field_type.h"
 
-#include <set>
-
 #include "bodypart.h"
 #include "debug.h"
 #include "enums.h"
@@ -9,6 +7,34 @@
 #include "json.h"
 #include "int_id.h"
 
+namespace io
+{
+
+template<>
+std::string enum_to_string<game_message_type>( game_message_type data )
+{
+    switch( data ) {
+            // *INDENT-OFF*
+        case game_message_type::m_good: return "good";
+        case game_message_type::m_bad: return "bad";
+        case game_message_type::m_mixed: return "mixed";
+        case game_message_type::m_warning: return "warning";
+        case game_message_type::m_info: return "info";
+        case game_message_type::m_neutral: return "neutral";
+        case game_message_type::m_debug: return "debug";
+        case game_message_type::m_headshot: return "headshot";
+        case game_message_type::m_critical: return "critical";
+        case game_message_type::m_grazing: return "grazing";
+            // *INDENT-ON*
+        case game_message_type::num_game_message_type:
+            break;
+    }
+    debugmsg( "Invalid game_message_type" );
+    abort();
+}
+
+} // namespace io
+
 namespace
 {
 
@@ -124,18 +150,33 @@ void field_type::load( JsonObject &jo, const std::string & )
                   fallback_intensity_level.translucency );
         optional( jao, was_loaded, "convection_temperature_mod", intensity_level.convection_temperature_mod,
                   fallback_intensity_level.convection_temperature_mod );
-        optional( jao, was_loaded, "effect_id", intensity_level.field_effect.id,
-                  fallback_intensity_level.field_effect.id );
-        optional( jao, was_loaded, "effect_min_duration", intensity_level.field_effect.min_duration,
-                  fallback_intensity_level.field_effect.min_duration );
-        optional( jao, was_loaded, "effect_max_duration", intensity_level.field_effect.max_duration,
-                  fallback_intensity_level.field_effect.max_duration );
-        optional( jao, was_loaded, "effect_intensity", intensity_level.field_effect.intensity,
-                  fallback_intensity_level.field_effect.intensity );
-        optional( jao, was_loaded, "effect_body_part", intensity_level.field_effect.bp,
-                  fallback_intensity_level.field_effect.bp );
-        optional( jao, was_loaded, "inside_immune", intensity_level.field_effect.inside_immune,
-                  fallback_intensity_level.field_effect.inside_immune );
+        if( jao.has_array( "effects" ) ) {
+            JsonArray jae = jao.get_array( "effects" );
+            for( size_t j = 0; j < jae.size(); ++j ) {
+                JsonObject joe = jae.next_object();
+                field_effect fe;
+                mandatory( joe, was_loaded, "effect_id", fe.id );
+                optional( joe, was_loaded, "min_duration", fe.min_duration );
+                optional( joe, was_loaded, "max_duration", fe.max_duration );
+                optional( joe, was_loaded, "intensity", fe.intensity );
+                optional( joe, was_loaded, "body_part", fe.bp );
+                optional( joe, was_loaded, "is_environmental", fe.is_environmental );
+                optional( joe, was_loaded, "immune_in_vehicle", fe.immune_in_vehicle );
+                optional( joe, was_loaded, "immune_inside_vehicle", fe.immune_inside_vehicle );
+                optional( joe, was_loaded, "immune_outside_vehicle", fe.immune_outside_vehicle );
+                optional( joe, was_loaded, "chance_in_vehicle", fe.chance_in_vehicle );
+                optional( joe, was_loaded, "chance_inside_vehicle", fe.chance_inside_vehicle );
+                optional( joe, was_loaded, "chance_outside_vehicle", fe.chance_outside_vehicle );
+                optional( joe, was_loaded, "message", fe.message );
+                optional( joe, was_loaded, "message_npc", fe.message_npc );
+                const auto game_message_type_reader = enum_flags_reader<game_message_type> { "game message types" };
+                optional( joe, was_loaded, "message_type", fe.env_message_type, game_message_type_reader );
+                intensity_level.field_effects.emplace_back( fe );
+            }
+        } else {
+            // Use effects from previous intensity level
+            intensity_level.field_effects = fallback_intensity_level.field_effects;
+        }
         optional( jao, was_loaded, "scent_neutralization", intensity_level.scent_neutralization,
                   fallback_intensity_level.scent_neutralization );
         intensity_levels.emplace_back( intensity_level );
diff --git a/src/field_type.h b/src/field_type.h
index d0d11e220f0c2..54f1a8322b737 100644
--- a/src/field_type.h
+++ b/src/field_type.h
@@ -13,6 +13,7 @@
 #include "calendar.h"
 #include "catacharset.h"
 #include "color.h"
+#include "effect.h"
 #include "enums.h"
 #include "type_id.h"
 #include "string_id.h"
@@ -23,13 +24,34 @@ class JsonObject;
 enum phase_id : int;
 enum body_part : int;
 
-struct field_effect_data {
+struct field_effect {
     efftype_id id;
-    time_duration min_duration;
-    time_duration max_duration;
-    int intensity;
-    body_part bp;
-    bool inside_immune;
+    time_duration min_duration = 0_seconds;
+    time_duration max_duration = 0_seconds;
+    int intensity = 0;
+    body_part bp = num_bp;
+    bool is_environmental = true;
+    bool immune_in_vehicle  = false;
+    bool immune_inside_vehicle  = false;
+    bool immune_outside_vehicle = false;
+    int chance_in_vehicle = 0;
+    int chance_inside_vehicle = 0;
+    int chance_outside_vehicle = 0;
+    game_message_type env_message_type = m_neutral;
+    translation message;
+    translation message_npc;
+    time_duration get_duration() const {
+        return rng( min_duration, max_duration );
+    }
+    std::string get_message() const {
+        return message.translated();
+    }
+    std::string get_message_npc() const {
+        return message_npc.translated();
+    }
+    effect get_effect( const time_point &start_time = calendar::turn ) const {
+        return effect( &id.obj(), get_duration(), bp, false, intensity, start_time );
+    }
 };
 
 struct field_intensity_level {
@@ -54,7 +76,7 @@ struct field_intensity_level {
     float translucency = 0.0f;
     int convection_temperature_mod = 0;
     int scent_neutralization = 0;
-    field_effect_data field_effect;
+    std::vector<field_effect> field_effects;
 };
 
 struct field_type {
diff --git a/src/font_loader.h b/src/font_loader.h
index a2d490ef99a1d..67c85da1df525 100644
--- a/src/font_loader.h
+++ b/src/font_loader.h
@@ -62,13 +62,13 @@ class font_loader
     public:
         /// @throws std::exception upon any kind of error.
         void load() {
-            const std::string fontdata = FILENAMES["fontdata"];
-            const std::string legacy_fontdata = FILENAMES["legacy_fontdata"];
+            const std::string fontdata = PATH_INFO::fontdata();
+            const std::string legacy_fontdata = PATH_INFO::legacy_fontdata();
             if( file_exist( fontdata ) ) {
                 load_throws( fontdata );
             } else {
                 load_throws( legacy_fontdata );
-                assure_dir_exist( FILENAMES["config_dir"] );
+                assure_dir_exist( PATH_INFO::config_dir() );
                 save( fontdata );
             }
         }
diff --git a/src/game.cpp b/src/game.cpp
index 9983f7f5e5078..da45d208e55db 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -199,6 +199,8 @@ const efftype_id effect_emp( "emp" );
 const efftype_id effect_evil( "evil" );
 const efftype_id effect_flu( "flu" );
 const efftype_id effect_glowing( "glowing" );
+const efftype_id effect_has_bag( "has_bag" );
+const efftype_id effect_harnessed( "harnessed" );
 const efftype_id effect_hot( "hot" );
 const efftype_id effect_infected( "infected" );
 const efftype_id effect_laserlocked( "laserlocked" );
@@ -208,17 +210,15 @@ const efftype_id effect_pacified( "pacified" );
 const efftype_id effect_paid( "paid" );
 const efftype_id effect_pet( "pet" );
 const efftype_id effect_relax_gas( "relax_gas" );
+const efftype_id effect_ridden( "ridden" );
+const efftype_id effect_riding( "riding" );
 const efftype_id effect_sleep( "sleep" );
 const efftype_id effect_stunned( "stunned" );
 const efftype_id effect_teleglow( "teleglow" );
 const efftype_id effect_tetanus( "tetanus" );
+const efftype_id effect_tied( "tied" );
 const efftype_id effect_visuals( "visuals" );
 const efftype_id effect_winded( "winded" );
-const efftype_id effect_ridden( "ridden" );
-const efftype_id effect_tied( "tied" );
-const efftype_id effect_riding( "riding" );
-const efftype_id effect_has_bag( "has_bag" );
-const efftype_id effect_harnessed( "harnessed" );
 
 static const bionic_id bio_remote( "bio_remote" );
 
@@ -277,6 +277,7 @@ game::game() :
     remoteveh_cache_time( calendar::before_time_starts ),
     user_action_counter( 0 ),
     tileset_zoom( DEFAULT_TILESET_ZOOM ),
+    seed( 0 ),
     last_mouse_edge_scroll( std::chrono::steady_clock::now() )
 {
     player_was_sleeping = false;
@@ -407,7 +408,7 @@ void game::load_core_data( loading_ui &ui )
     // anyway.
     DynamicDataLoader::get_instance().unload_data();
 
-    load_data_from_dir( FILENAMES[ "jsondir" ], "core", ui );
+    load_data_from_dir( PATH_INFO::jsondir(), "core", ui );
 }
 
 void game::load_data_from_dir( const std::string &path, const std::string &src, loading_ui &ui )
@@ -1965,6 +1966,7 @@ int game::inventory_item_menu( int pos, int iStartX, int iWidth,
     int cMenu = static_cast<int>( '+' );
 
     item &oThisItem = u.i_at( pos );
+    item_location locThisItem( u, &oThisItem );
     if( u.has_item( oThisItem ) ) {
 #if defined(__ANDROID__)
         if( get_option<bool>( "ANDROID_INVENTORY_AUTOADD" ) ) {
@@ -2060,9 +2062,10 @@ int game::inventory_item_menu( int pos, int iStartX, int iWidth,
         action_menu.border_color = BORDER_COLOR;
 
         do {
-            draw_item_info( iStartX, iWidth, VIEW_OFFSET_X, TERMY - VIEW_OFFSET_Y * 2, oThisItem.tname(),
-                            oThisItem.type_name(), vThisItem, vDummy,
-                            iScrollPos, true, false, false );
+            item_info_data data( oThisItem.tname(), oThisItem.type_name(), vThisItem, vDummy, iScrollPos );
+            data.without_getch = true;
+
+            draw_item_info( iStartX, iWidth, VIEW_OFFSET_X, TERMY - VIEW_OFFSET_Y * 2, data );
             const int prev_selected = action_menu.selected;
             action_menu.query( false );
             if( action_menu.ret >= 0 ) {
@@ -2084,13 +2087,13 @@ int game::inventory_item_menu( int pos, int iStartX, int iWidth,
 
             switch( cMenu ) {
                 case 'a':
-                    use_item( pos );
+                    avatar_action::use_item( u, locThisItem );
                     break;
                 case 'E':
                     eat( pos );
                     break;
                 case 'W':
-                    u.wear( u.i_at( pos ) );
+                    u.wear( oThisItem );
                     break;
                 case 'w':
                     wield( pos );
@@ -2102,7 +2105,7 @@ int game::inventory_item_menu( int pos, int iStartX, int iWidth,
                     change_side( pos );
                     break;
                 case 'T':
-                    u.takeoff( u.i_at( pos ) );
+                    u.takeoff( oThisItem );
                     break;
                 case 'd':
                     u.drop( pos, u.pos() );
@@ -2123,13 +2126,13 @@ int game::inventory_item_menu( int pos, int iStartX, int iWidth,
                     u.read( pos );
                     break;
                 case 'D':
-                    u.disassemble( item_location( u, &u.i_at( pos ) ), false );
+                    u.disassemble( locThisItem, false );
                     break;
                 case 'f':
                     oThisItem.is_favorite = !oThisItem.is_favorite;
                     break;
                 case '=':
-                    game_menus::inv::reassign_letter( u, u.i_at( pos ) );
+                    game_menus::inv::reassign_letter( u, oThisItem );
                     break;
                 case KEY_PPAGE:
                     iScrollPos--;
@@ -2585,7 +2588,7 @@ void game::death_screen()
 void game::move_save_to_graveyard()
 {
     const std::string &save_dir      = get_world_base_save_path();
-    const std::string &graveyard_dir = FILENAMES["graveyarddir"];
+    const std::string &graveyard_dir = PATH_INFO::graveyarddir();
     const std::string &prefix        = base64_encode( u.name ) + ".";
 
     if( !assure_dir_exist( graveyard_dir ) ) {
@@ -2618,7 +2621,7 @@ void game::move_save_to_graveyard()
 void game::load_master()
 {
     using namespace std::placeholders;
-    const auto datafile = get_world_base_save_path() + "/master.gsav";
+    const auto datafile = get_world_base_save_path() + "/" + SAVE_MASTER;
     read_from_file_optional( datafile, std::bind( &game::unserialize_master, this, _1 ) );
 }
 
@@ -2659,23 +2662,21 @@ void game::load( const save_t &name )
     u.name = name.player_name();
     // This should be initialized more globally (in player/Character constructor)
     u.weapon = item( "null", 0 );
-    if( !read_from_file( playerpath + ".sav", std::bind( &game::unserialize, this, _1 ) ) ) {
+    if( !read_from_file( playerpath + SAVE_EXTENSION, std::bind( &game::unserialize, this, _1 ) ) ) {
         return;
     }
 
-    read_from_file_optional_json( playerpath + ".mm", [&]( JsonIn & jsin ) {
+    read_from_file_optional_json( playerpath + SAVE_EXTENSION_MAP_MEMORY, [&]( JsonIn & jsin ) {
         u.deserialize_map_memory( jsin );
     } );
 
-    read_from_file_optional( worldpath + name.base_path() + ".weather", std::bind( &game::load_weather,
-                             this, _1 ) );
     weather.nextweather = calendar::turn;
 
-    read_from_file_optional( worldpath + name.base_path() + ".log",
+    read_from_file_optional( worldpath + name.base_path() + SAVE_EXTENSION_LOG,
                              std::bind( &memorial_logger::load, &memorial(), _1 ) );
 
 #if defined(__ANDROID__)
-    read_from_file_optional( worldpath + name.base_path() + ".shortcuts",
+    read_from_file_optional( worldpath + name.base_path() + SAVE_EXTENSION_SHORTCUTS,
                              std::bind( &game::load_shortcuts, this, _1 ) );
 #endif
 
@@ -2755,7 +2756,7 @@ void game::load_world_modfiles( loading_ui &ui )
         mods.insert( mods.begin(), mod_id( "dda" ) );
     }
 
-    load_artifacts( get_world_base_save_path() + "/artifacts.gsav" );
+    load_artifacts( get_world_base_save_path() + "/" + SAVE_ARTIFACTS );
     // this code does not care about mod dependencies,
     // it assumes that those dependencies are static and
     // are resolved during the creation of the world.
@@ -2841,7 +2842,7 @@ void game::reset_npc_dispositions()
 //Saves all factions and missions and npcs.
 bool game::save_factions_missions_npcs()
 {
-    std::string masterfile = get_world_base_save_path() + "/master.gsav";
+    std::string masterfile = get_world_base_save_path() + "/" + SAVE_MASTER;
     return write_to_file( masterfile, [&]( std::ostream & fout ) {
         serialize_master( fout );
     }, _( "factions data" ) );
@@ -2849,7 +2850,7 @@ bool game::save_factions_missions_npcs()
 
 bool game::save_artifacts()
 {
-    std::string artfilename = get_world_base_save_path() + "/artifacts.gsav";
+    std::string artfilename = get_world_base_save_path() + "/" + SAVE_ARTIFACTS;
     return ::save_artifacts( artfilename );
 }
 
@@ -2870,26 +2871,26 @@ bool game::save_player_data()
 {
     const std::string playerfile = get_player_base_save_path();
 
-    const bool saved_data = write_to_file( playerfile + ".sav", [&]( std::ostream & fout ) {
+    const bool saved_data = write_to_file( playerfile + SAVE_EXTENSION, [&]( std::ostream & fout ) {
         serialize( fout );
     }, _( "player data" ) );
-    const bool saved_map_memory = write_to_file( playerfile + ".mm", [&]( std::ostream & fout ) {
+    const bool saved_map_memory = write_to_file( playerfile + SAVE_EXTENSION_MAP_MEMORY, [&](
+    std::ostream & fout ) {
         JsonOut jsout( fout );
         u.serialize_map_memory( jsout );
     }, _( "player map memory" ) );
-    const bool saved_weather = write_to_file( playerfile + ".weather", [&]( std::ostream & fout ) {
-        save_weather( fout );
-    }, _( "weather state" ) );
-    const bool saved_log = write_to_file( playerfile + ".log", [&]( std::ostream & fout ) {
+    const bool saved_log = write_to_file( playerfile + SAVE_EXTENSION_LOG, [&](
+    std::ostream & fout ) {
         fout << memorial().dump();
     }, _( "player memorial" ) );
 #if defined(__ANDROID__)
-    const bool saved_shortcuts = write_to_file( playerfile + ".shortcuts", [&]( std::ostream & fout ) {
+    const bool saved_shortcuts = write_to_file( playerfile + SAVE_EXTENSION_SHORTCUTS, [&](
+    std::ostream & fout ) {
         save_shortcuts( fout );
     }, _( "quick shortcuts" ) );
 #endif
 
-    return saved_data && saved_map_memory && saved_weather && saved_log
+    return saved_data && saved_map_memory && saved_log
 #if defined(__ANDROID__)
            && saved_shortcuts
 #endif
@@ -2958,7 +2959,7 @@ std::vector<std::string> game::list_active_characters()
  */
 void game::write_memorial_file( std::string sLastWords )
 {
-    const std::string &memorial_dir = FILENAMES["memorialdir"];
+    const std::string &memorial_dir = PATH_INFO::memorialdir();
     const std::string &memorial_active_world_dir = memorial_dir + utf8_to_native(
                 world_generator->active_world->world_name ) + "/";
 
@@ -4662,6 +4663,7 @@ T *game::critter_by_id( const character_id id )
 }
 
 // monsters don't have ids
+template Character *game::critter_by_id<Character>( character_id );
 template player *game::critter_by_id<player>( character_id );
 template npc *game::critter_by_id<npc>( character_id );
 template Creature *game::critter_by_id<Creature>( character_id );
@@ -4853,26 +4855,25 @@ bool game::swap_critters( Creature &a, Creature &b )
         g->m.unboard_vehicle( u_or_npc->pos() );
     }
 
-    if( other_npc->in_vehicle ) {
+    if( other_npc && other_npc->in_vehicle ) {
         g->m.unboard_vehicle( other_npc->pos() );
     }
 
     tripoint temp = second.pos();
     second.setpos( first.pos() );
-    first.setpos( temp );
 
-    if( g->m.veh_at( u_or_npc->pos() ).part_with_feature( VPFLAG_BOARDABLE, true ) ) {
-        g->m.board_vehicle( u_or_npc->pos(), u_or_npc );
+    if( first.is_player() ) {
+        g->walk_move( temp );
+    } else {
+        first.setpos( temp );
+        if( g->m.veh_at( u_or_npc->pos() ).part_with_feature( VPFLAG_BOARDABLE, true ) ) {
+            g->m.board_vehicle( u_or_npc->pos(), u_or_npc );
+        }
     }
 
-    if( g->m.veh_at( other_npc->pos() ).part_with_feature( VPFLAG_BOARDABLE, true ) ) {
+    if( other_npc && g->m.veh_at( other_npc->pos() ).part_with_feature( VPFLAG_BOARDABLE, true ) ) {
         g->m.board_vehicle( other_npc->pos(), other_npc );
     }
-
-    if( first.is_player() ) {
-        update_map( *u_or_npc );
-    }
-
     return true;
 }
 
@@ -5009,69 +5010,6 @@ void game::save_cyborg( item *cyborg, const tripoint &couch_pos, player &install
     }
 
 }
-static void make_active( item_location loc )
-{
-    switch( loc.where() ) {
-        case item_location::type::map:
-            g->m.make_active( loc );
-            break;
-        case item_location::type::vehicle:
-            g->m.veh_at( loc.position() )->vehicle().make_active( loc );
-            break;
-        default:
-            break;
-    }
-}
-
-static void update_lum( item_location loc, bool add )
-{
-    switch( loc.where() ) {
-        case item_location::type::map:
-            g->m.update_lum( loc, add );
-            break;
-        default:
-            break;
-    }
-}
-
-void game::use_item( int pos )
-{
-    bool use_loc = false;
-    item_location loc;
-
-    if( pos == INT_MIN ) {
-        loc = game_menus::inv::use( u );
-
-        if( !loc ) {
-            add_msg( _( "Never mind." ) );
-            return;
-        }
-
-        const item &it = *loc.get_item();
-        if( it.has_flag( "ALLOWS_REMOTE_USE" ) ) {
-            use_loc = true;
-        } else {
-            int obtain_cost = loc.obtain_cost( u );
-            pos = loc.obtain( u );
-            // This method only handles items in te inventory, so refund the obtain cost.
-            u.moves += obtain_cost;
-        }
-    }
-
-    refresh_all();
-
-    if( use_loc ) {
-        update_lum( loc, false );
-        u.use( loc );
-        update_lum( loc, true );
-
-        make_active( loc );
-    } else {
-        u.use( pos );
-    }
-
-    u.invalidate_crafting_inventory();
-}
 
 void game::exam_vehicle( vehicle &veh, const point &c )
 {
@@ -5780,7 +5718,7 @@ void game::print_all_tile_info( const tripoint &lp, const catacurses::window &w_
             print_items_info( lp, w_look, column, line, last_line );
             print_graffiti_info( lp, w_look, column, line, last_line );
 
-            if( draw_terrain_indicators ) {
+            if( draw_terrain_indicators && !liveview.is_enabled() ) {
                 if( creature != nullptr && u.sees( *creature ) ) {
                     creature->draw( w_terrain, lp, true );
                 } else {
@@ -5796,7 +5734,7 @@ void game::print_all_tile_info( const tripoint &lp, const catacurses::window &w_
         case VIS_HIDDEN:
             print_visibility_info( w_look, column, line, visibility );
 
-            if( draw_terrain_indicators ) {
+            if( draw_terrain_indicators && !liveview.is_enabled() ) {
                 print_visibility_indicator( visibility );
             }
             break;
@@ -7323,11 +7261,13 @@ game::vmenu_ret game::list_items( const std::vector<map_item_stack> &item_list )
         } else if( action == "EXAMINE" && !filtered_items.empty() && activeItem ) {
             std::vector<iteminfo> vThisItem;
             std::vector<iteminfo> vDummy;
-            int dummy = 0; // draw_item_info needs an int &
             activeItem->example->info( true, vThisItem );
-            draw_item_info( 0, width - 5, 0, TERMY - VIEW_OFFSET_Y * 2,
-                            activeItem->example->tname(), activeItem->example->type_name(), vThisItem, vDummy, dummy,
-                            false, false, true );
+
+            item_info_data info_data( activeItem->example->tname(), activeItem->example->type_name(), vThisItem,
+                                      vDummy );
+            info_data.handle_scrolling = true;
+
+            draw_item_info( 0, width - 5, 0, TERMY - VIEW_OFFSET_Y * 2, info_data );
             // wait until the user presses a key to wipe the screen
             iLastActive.reset();
         } else if( action == "PRIORITY_INCREASE" ) {
@@ -7561,7 +7501,12 @@ game::vmenu_ret game::list_items( const std::vector<map_item_stack> &item_list )
                 std::vector<iteminfo> vThisItem;
                 std::vector<iteminfo> vDummy;
                 activeItem->example->info( true, vThisItem );
-                draw_item_info( w_item_info, "", "", vThisItem, vDummy, iScrollPos, true, true );
+
+                item_info_data dummy( "", "", vThisItem, vDummy, iScrollPos );
+                dummy.without_getch = true;
+                dummy.without_border = true;
+
+                draw_item_info( w_item_info, dummy );
 
                 iLastActive.emplace( active_pos );
                 centerlistview( active_pos, width );
@@ -8562,8 +8507,6 @@ void game::reload( item_location &loc, bool prompt, bool empty )
             break;
     }
 
-
-
     bool use_loc = true;
     if( !it->has_flag( "ALLOWS_REMOTE_USE" ) ) {
         it = &u.i_at( loc.obtain( u ) );
@@ -9062,6 +9005,10 @@ bool game::walk_move( const tripoint &dest_loc )
                 return false;
             }
         }
+        if( !mons->move_effects( false ) ) {
+            add_msg( m_bad, _( "You cannot move as your %s isn't able to move." ), mons->get_name() );
+            return false;
+        }
     }
     const optional_vpart_position vp_here = m.veh_at( u.pos() );
     const optional_vpart_position vp_there = m.veh_at( dest_loc );
@@ -9974,12 +9921,11 @@ void game::on_move_effects()
             if( u.movement_mode_is( CMM_RUN ) ) {
                 u.mod_power_level( -55_J );
             } else {
-                u.mod_power_level( -35_kJ );
+                u.mod_power_level( -35_J );
             }
         }
     }
 
-
     if( u.movement_mode_is( CMM_RUN ) ) {
         if( !u.can_run() ) {
             u.toggle_run_mode();
@@ -12096,7 +12042,7 @@ std::string game::get_player_base_save_path() const
 std::string game::get_world_base_save_path() const
 {
     if( world_generator->active_world == nullptr ) {
-        return FILENAMES["savedir"];
+        return PATH_INFO::savedir();
     }
     return world_generator->active_world->folder_path();
 }
diff --git a/src/game.h b/src/game.h
index 78128a7be54ba..ad09c468dffed 100644
--- a/src/game.h
+++ b/src/game.h
@@ -35,6 +35,14 @@ class item;
 
 #define DEFAULT_TILESET_ZOOM 16
 
+static const std::string SAVE_MASTER( "master.gsav" );
+static const std::string SAVE_ARTIFACTS( "artifacts.gsav" );
+static const std::string SAVE_EXTENSION( ".sav" );
+static const std::string SAVE_EXTENSION_MAP_MEMORY( ".mm" );
+static const std::string SAVE_EXTENSION_LOG( ".log" );
+static const std::string SAVE_EXTENSION_WEATHER( ".weather" );
+static const std::string SAVE_EXTENSION_SHORTCUTS( ".shortcuts" );
+
 extern bool test_mode;
 
 // The reference to the one and only game instance.
@@ -709,7 +717,6 @@ class game
         // Game-start procedures
         void load( const save_t &name ); // Load a player-specific save file
         void load_master(); // Load the master data file, with factions &c
-        void load_weather( std::istream &fin );
 #if defined(__ANDROID__)
         void load_shortcuts( std::istream &fin );
 #endif
@@ -724,7 +731,6 @@ class game
         bool save_artifacts();
         // returns false if saving failed for whatever reason
         bool save_maps();
-        void save_weather( std::ostream &fout );
 #if defined(__ANDROID__)
         void save_shortcuts( std::ostream &fout );
 #endif
@@ -766,7 +772,6 @@ class game
         void drop_in_direction(); // Drop w/ direction  'D'
 
         void butcher(); // Butcher a corpse  'B'
-        void use_item( int pos = INT_MIN ); // Use item; also tries E,R,W  'a'
 
         void change_side( int pos = INT_MIN ); // Change the side on which an item is worn 'c'
         void reload( int pos, bool prompt = false );
diff --git a/src/game_constants.h b/src/game_constants.h
index b42663e4f4297..10b0f54f41178 100644
--- a/src/game_constants.h
+++ b/src/game_constants.h
@@ -5,7 +5,7 @@
 #include "calendar.h"
 #include "units.h"
 
-// Fixed window sizes
+// Fixed window sizes.
 #define HP_HEIGHT 14
 #define HP_WIDTH 7
 #define MINIMAP_HEIGHT 7
@@ -22,11 +22,11 @@
 #define BLINK_SPEED 300
 #define EXPLOSION_MULTIPLIER 7
 
-// Really just a sanity check for functions not tested beyond this. in theory 4096 works (`InvletInvlet)
+// Really just a sanity check for functions not tested beyond this. in theory 4096 works (`InvletInvlet).
 #define MAX_ITEM_IN_SQUARE 4096
-// no reason to differ
+// no reason to differ.
 #define MAX_ITEM_IN_VEHICLE_STORAGE MAX_ITEM_IN_SQUARE
-// only can wear a maximum of two of any type of clothing
+// only can wear a maximum of two of any type of clothing.
 #define MAX_WORN_PER_TYPE 2
 
 #define MAPSIZE 11
@@ -45,123 +45,135 @@
 
 #define MAX_VIEW_DISTANCE ( SEEX * HALF_MAPSIZE )
 
-// Size of the overmap. This is the number of overmap terrain tiles per dimension in one overmap,
-// it's just like SEEX/SEEY for submaps.
+/**
+ * Size of the overmap. This is the number of overmap terrain tiles per dimension in one overmap,
+ * it's just like SEEX/SEEY for submaps.
+*/
 #define OMAPX 180
 #define OMAPY 180
 
 // Size of a square unit of terrain saved to a directory.
 #define SEG_SIZE 32
 
-// Items on the map with at most this distance to the player are considered available for crafting,
-// see inventory::form_from_map
+/**
+ * Items on the map with at most this distance to the player are considered available for crafting,
+ * see inventory::form_from_map
+*/
 #define PICKUP_RANGE 6
 
-/** Number of z-levels below 0 (not including 0). */
+// Number of z-levels below 0 (not including 0).
 #define OVERMAP_DEPTH 10
-/** Number of z-levels above 0 (not including 0). */
+// Number of z-levels above 0 (not including 0).
 #define OVERMAP_HEIGHT 10
-/** Total number of z-levels */
+// Total number of z-levels.
 #define OVERMAP_LAYERS (1 + OVERMAP_DEPTH + OVERMAP_HEIGHT)
 
-/** Maximum move cost when handling an item */
+// Maximum move cost when handling an item.
 #define MAX_HANDLING_COST 400
-/** Move cost of accessing an item in inventory. */
+// Move cost of accessing an item in inventory.
 #define INVENTORY_HANDLING_PENALTY 100
-/** Move cost of accessing an item lying on the map. TODO: Less if player is crouching */
+// Move cost of accessing an item lying on the map. TODO: Less if player is crouching.
 #define MAP_HANDLING_PENALTY 80
-/** Move cost of accessing an item lying on a vehicle. */
+// Move cost of accessing an item lying on a vehicle.
 #define VEHICLE_HANDLING_PENALTY 80
 
-/** Amount by which to charge an item for each unit of plutonium cell */
+// Amount by which to charge an item for each unit of plutonium cell.
 #define PLUTONIUM_CHARGES 500
 
-/** Temperature constants */
+// Temperature constants.
 namespace temperatures
 {
-/** temperature at which something starts is considered HOT */
+// temperature at which something starts is considered HOT.
 constexpr int hot = 100; // ~ 38 Celsius
 
-/** the "normal" temperature midpoint between cold and hot */
+// the "normal" temperature midpoint between cold and hot.
 constexpr int normal = 70; // ~ 21 Celsius
 
-/** Temperature inside an active fridge in Fahrenheit  */
+// Temperature inside an active fridge in Fahrenheit.
 constexpr int fridge = 37; // ~ 2.7 Celsius
 
-/** Temperature at which things are considered "cold" */
+// Temperature at which things are considered "cold".
 constexpr int cold = 40; // ~4.4 C
 
-/** Temperature inside an active freezer in Fahrenheit  */
+// Temperature inside an active freezer in Fahrenheit.
 constexpr int freezer = 23; // -5 Celsius
 
-/** Temperature in which water freezes in Fahrenheit  */
+// Temperature in which water freezes in Fahrenheit.
 constexpr int freezing = 32; // 0 Celsius
 } // namespace temperatures
 
 // Shelf life of corpse. This should be kept same as raw flesh.
 constexpr time_duration CORPSE_ROT_TIME = 24_hours;
 
-/** Weight per level of LIFT/JACK tool quality */
+// Weight per level of LIFT/JACK tool quality.
 #define TOOL_LIFT_FACTOR 500_kilogram // 500kg/level
 
-/** Cap JACK requirements to support arbitrarily large vehicles */
+// Cap JACK requirements to support arbitrarily large vehicles.
 #define JACK_LIMIT 8500_kilogram // 8500kg ( 8.5 metric tonnes )
 
-/** Slowest speed at which a gun can be aimed */
+// Slowest speed at which a gun can be aimed.
 #define MAX_AIM_COST 10
 
-/** Maximum (effective) level for a skill */
+// Maximum (effective) level for a skill.
 #define MAX_SKILL 10
 
-/** Maximum (effective) level for a stat */
+// Maximum (effective) level for a stat.
 #define MAX_STAT 20
 
-/** Maximum range at which ranged attacks can be executed */
+// Maximum range at which ranged attacks can be executed.
 #define RANGE_HARD_CAP 60
 
-/** Accuracy levels which a shots tangent must be below */
+// Accuracy levels which a shots tangent must be below.
 constexpr double accuracy_headshot = 0.1;
 constexpr double accuracy_critical = 0.2;
 constexpr double accuracy_goodhit  = 0.5;
 constexpr double accuracy_standard = 0.8;
 constexpr double accuracy_grazing  = 1.0;
 
-/** Minimum item damage output of relevant type to allow using with relevant weapon skill */
+// Minimum item damage output of relevant type to allow using with relevant weapon skill.
 #define MELEE_STAT 5
 
-/** Effective lower bound to combat skill levels when CQB bionic is active */
+// Effective lower bound to combat skill levels when CQB bionic is active.
 #define BIO_CQB_LEVEL 5
 
-/** Minimum size of a horde to show up on the minimap.  */
+// Minimum size of a horde to show up on the minimap.
 #define HORDE_VISIBILITY_SIZE 3
 
-/** Average annual temperature in F used for climate, weather and temperature calculation */
-/** Average New England temperature = 43F/6C rounded to int */
+/**
+ * Average annual temperature in F used for climate, weather and temperature calculation.
+ * Average New England temperature = 43F/6C rounded to int.
+*/
 #define AVERAGE_ANNUAL_TEMPERATURE 43
 
-/** Base starting spring temperature in F used for climate, weather and temperature calculation */
-/** New England base spring temperature = 65F/18C rounded to int */
+/**
+ * Base starting spring temperature in F used for climate, weather and temperature calculation.
+ * New England base spring temperature = 65F/18C rounded to int.
+*/
 #define SPRING_TEMPERATURE 65
 
-/** Used to limit the random seed during noise calculation. A large value flattens the noise generator to zero.
-    Windows has a rand limit of 32768, other operating systems can have higher limits. */
+/**
+ * Used to limit the random seed during noise calculation. A large value flattens the noise generator to zero.
+ * Windows has a rand limit of 32768, other operating systems can have higher limits.
+*/
 constexpr int SIMPLEX_NOISE_RANDOM_SEED_LIMIT = 32768;
 
-// activity levels, used for BMR
-// these levels are normally used over the length of
-// days to weeks in order to calculate your total BMR
-// but we are making it more granular to be able to have
-// variable activity levels.
-// as such, when determining your activity level
-// in the json, think about what it would be if you
-// did this activity for a longer period of time.
+/**
+ * activity levels, used for BMR.
+ * these levels are normally used over the length of
+ * days to weeks in order to calculate your total BMR
+ * but we are making it more granular to be able to have
+ * variable activity levels.
+ * as such, when determining your activity level
+ * in the json, think about what it would be if you
+ * did this activity for a longer period of time.
+*/
 constexpr float NO_EXERCISE = 1.2f;
 constexpr float LIGHT_EXERCISE = 1.375f;
 constexpr float MODERATE_EXERCISE = 1.55f;
 constexpr float ACTIVE_EXERCISE = 1.725f;
 constexpr float EXTRA_EXERCISE = 1.9f;
 
-// these are the lower bounds of each of the weight classes
+// these are the lower bounds of each of the weight classes.
 namespace character_weight_category
 {
 constexpr float emaciated = 14.0f;
diff --git a/src/game_inventory.cpp b/src/game_inventory.cpp
index 62d869ab9ba79..4d0de712b8876 100644
--- a/src/game_inventory.cpp
+++ b/src/game_inventory.cpp
@@ -1415,11 +1415,16 @@ void game_menus::inv::compare( player &p, const cata::optional<tripoint> &offset
         int iScrollPosLast = 0;
 
         do {
+            item_info_data last_item_info( sItemLastCh, sItemLastTn, vItemLastCh, vItemCh, iScrollPosLast );
+            last_item_info.without_getch = true;
+
+            item_info_data cur_item_info( sItemCh, sItemTn, vItemCh, vItemLastCh, iScrollPos );
+            cur_item_info.without_getch = true;
+
             draw_item_info( 0, ( TERMX - VIEW_OFFSET_X * 2 ) / 2, 0, TERMY - VIEW_OFFSET_Y * 2,
-                            sItemLastCh, sItemLastTn, vItemLastCh, vItemCh, iScrollPosLast, true );
+                            last_item_info );
             draw_item_info( ( TERMX - VIEW_OFFSET_X * 2 ) / 2, ( TERMX - VIEW_OFFSET_X * 2 ) / 2,
-                            0, TERMY - VIEW_OFFSET_Y * 2, sItemCh, sItemTn, vItemCh, vItemLastCh,
-                            iScrollPos, true );
+                            0, TERMY - VIEW_OFFSET_Y * 2, cur_item_info );
 
             action = ctxt.handle_input();
 
@@ -1611,7 +1616,7 @@ class bionic_install_preset: public inventory_selector_preset
                 return _( "/!\\ CBM is highly contaminated. /!\\" );
             } else if( it->has_flag( "NO_STERILE" ) ) {
                 // NOLINTNEXTLINE(cata-text-style): single space after the period for symmetry
-                return _( "/!\\ CBM is not sterile. /!\\" ) ;
+                return _( "/!\\ CBM is not sterile. /!\\ Please use autoclave to sterilize." ) ;
             } else if( it->has_fault( fault_id( "fault_bionic_salvaged" ) ) ) {
                 return _( "CBM already deployed.  Please reset to factory state." );
             } else if( pa.has_bionic( bid ) ) {
diff --git a/src/gates.cpp b/src/gates.cpp
index 09aea67372af5..caf93fbb992b9 100644
--- a/src/gates.cpp
+++ b/src/gates.cpp
@@ -176,18 +176,15 @@ void gates::open_gate( const tripoint &pos )
     bool close = false;
     bool fail = false;
 
-    for( int i = 0; i < 4; ++i ) {
-        static constexpr tripoint dir[4] = {
-            { tripoint_east }, { tripoint_south }, { tripoint_west }, { tripoint_north }
-        };
-        const tripoint wall_pos = pos + dir[i];
+    for( const point &wall_offset : four_adjacent_offsets ) {
+        const tripoint wall_pos = pos + wall_offset;
 
         if( !gate.is_suitable_wall( wall_pos ) ) {
             continue;
         }
 
-        for( auto j : dir ) {
-            const tripoint gate_pos = wall_pos + j;
+        for( const point &gate_offset : four_adjacent_offsets ) {
+            const tripoint gate_pos = wall_pos + gate_offset;
 
             if( gate_pos == pos ) {
                 continue; // Never comes back
@@ -198,7 +195,7 @@ void gates::open_gate( const tripoint &pos )
                 while( g->m.ter( cur_pos ) == gate.floor.id() ) {
                     fail = !g->forced_door_closing( cur_pos, gate.door.id(), gate.bash_dmg ) || fail;
                     close = !fail;
-                    cur_pos += j;
+                    cur_pos += gate_offset;
                 }
             }
 
@@ -213,7 +210,7 @@ void gates::open_gate( const tripoint &pos )
                     } else if( ter != gate.floor.id() ) {
                         break;
                     }
-                    cur_pos += j;
+                    cur_pos += gate_offset;
                 }
             }
         }
@@ -304,7 +301,7 @@ void doors::close_door( map &m, Character &who, const tripoint &closep )
         auto items_in_way = m.i_at( closep );
         // Scoot up to 25 liters of items out of the way
         if( m.furn( closep ) != furn_str_id( "f_safe_o" ) && !items_in_way.empty() ) {
-            const units::volume max_nudge = 25000_ml;
+            const units::volume max_nudge = 25_liter;
 
             const auto toobig = std::find_if( items_in_way.begin(), items_in_way.end(),
             [&max_nudge]( const item & it ) {
diff --git a/src/generic_factory.h b/src/generic_factory.h
index e82ec476f396c..a755e792f7d4e 100644
--- a/src/generic_factory.h
+++ b/src/generic_factory.h
@@ -830,6 +830,8 @@ class auto_flags_reader : public generic_typed_reader<auto_flags_reader<FlagType
         }
 };
 
+using string_reader = auto_flags_reader<>;
+
 /**
  * Uses a map (unordered or standard) to convert strings from JSON to some other type
  * (the mapped type of the map: `C::mapped_type`). It works for all mapped types, not just enums.
diff --git a/src/handle_action.cpp b/src/handle_action.cpp
index 5a37ec7d1ffd8..1a74c10256051 100644
--- a/src/handle_action.cpp
+++ b/src/handle_action.cpp
@@ -666,7 +666,7 @@ static void smash()
     }
     if( m.get_field( smashp, fd_web ) != nullptr ) {
         m.remove_field( smashp, fd_web );
-        sounds::sound( smashp, 2, sounds::sound_t::combat, "hsh!", true, "smash", "web" );
+        sounds::sound( smashp, 2, sounds::sound_t::combat, _( "hsh!" ), true, "smash", "web" );
         add_msg( m_info, _( "You brush aside some webs." ) );
         u.moves -= 100;
         return;
@@ -1004,10 +1004,7 @@ static void loot()
     enum ZoneFlags {
         None = 1,
         SortLoot = 2,
-        TillPlots = 4,
-        PlantPlots = 8,
         FertilizePlots = 16,
-        HarvestPlots = 32,
         ConstructPlots = 64,
         MultiFarmPlots = 128,
         Multichoptrees = 256,
@@ -1020,10 +1017,6 @@ static void loot()
     player &u = g->u;
     int flags = 0;
     auto &mgr = zone_manager::get_manager();
-    const bool has_hoe = u.has_quality( quality_id( "DIG" ), 1 );
-    const bool has_seeds = u.has_item_with( []( const item & itm ) {
-        return itm.is_seed();
-    } );
     const bool has_fertilizer = u.has_item_with_flag( "FERTILIZER" );
 
     // Manually update vehicle cache.
@@ -1033,10 +1026,7 @@ static void loot()
 
     flags |= g->check_near_zone( zone_type_id( "LOOT_UNSORTED" ), u.pos() ) ? SortLoot : 0;
     if( g->check_near_zone( zone_type_id( "FARM_PLOT" ), u.pos() ) ) {
-        flags |= TillPlots;
-        flags |= PlantPlots;
         flags |= FertilizePlots;
-        flags |= HarvestPlots;
         flags |= MultiFarmPlots;
     }
     flags |= g->check_near_zone( zone_type_id( "CONSTRUCTION_BLUEPRINT" ),
@@ -1065,28 +1055,12 @@ static void loot()
                             _( "Sorts out the loot from Loot: Unsorted zone to nearby appropriate Loot zones.  Uses empty space in your inventory or utilizes a cart, if you are holding one." ) );
     }
 
-    if( flags & TillPlots ) {
-        menu.addentry_desc( TillPlots, has_hoe, 't',
-                            has_hoe ? _( "Till farm plots" ) : _( "Till farm plots… you need a tool to dig with" ),
-                            _( "Tills nearby Farm: Plot zones." ) );
-    }
-
-    if( flags & PlantPlots ) {
-        menu.addentry_desc( PlantPlots, warm_enough_to_plant( g->u.pos() ) && has_seeds, 'p',
-                            !warm_enough_to_plant( g->u.pos() ) ? _( "Plant seeds… it is too cold for planting" ) :
-                            !has_seeds ? _( "Plant seeds… you don't have any" ) : _( "Plant seeds" ),
-                            _( "Plant seeds into nearby Farm: Plot zones.  Farm plot has to be set to specific plant seed and you must have seeds in your inventory." ) );
-    }
     if( flags & FertilizePlots ) {
         menu.addentry_desc( FertilizePlots, has_fertilizer, 'f',
                             !has_fertilizer ? _( "Fertilize plots… you don't have any fertilizer" ) : _( "Fertilize plots" ),
                             _( "Fertilize any nearby Farm: Plot zones." ) );
     }
 
-    if( flags & HarvestPlots ) {
-        menu.addentry_desc( HarvestPlots, true, 'h', _( "Harvest plots" ),
-                            _( "Harvest any full-grown plants from nearby Farm: Plot zones." ) );
-    }
     if( flags & ConstructPlots ) {
         menu.addentry_desc( ConstructPlots, true, 'c', _( "Construct plots" ),
                             _( "Work on any nearby Blueprint: construction zones." ) );
@@ -1126,28 +1100,9 @@ static void loot()
         case SortLoot:
             u.assign_activity( activity_id( "ACT_MOVE_LOOT" ) );
             break;
-        case TillPlots:
-            if( has_hoe ) {
-                u.assign_activity( activity_id( "ACT_TILL_PLOT" ) );
-            } else {
-                add_msg( _( "You need a tool to dig with." ) );
-            }
-            break;
-        case PlantPlots:
-            if( !warm_enough_to_plant( g->u.pos() ) ) {
-                add_msg( m_info, _( "It is too cold to plant anything now." ) );
-            } else if( !has_seeds ) {
-                add_msg( m_info, _( "You don't have any seeds." ) );
-            } else {
-                u.assign_activity( activity_id( "ACT_PLANT_PLOT" ) );
-            }
-            break;
         case FertilizePlots:
             u.assign_activity( activity_id( "ACT_FERTILIZE_PLOT" ) );
             break;
-        case HarvestPlots:
-            u.assign_activity( activity_id( "ACT_HARVEST_PLOT" ) );
-            break;
         case ConstructPlots:
             u.assign_activity( activity_id( "ACT_MULTIPLE_CONSTRUCTION" ) );
             break;
@@ -1913,7 +1868,7 @@ bool game::handle_action()
             case ACTION_USE:
                 // Shell-users are presumed to be able to mess with their inventories, etc
                 // while in the shell.  Eating, gear-changing, and item use are OK.
-                use_item();
+                avatar_action::use_item( u );
                 break;
 
             case ACTION_USE_WIELDED:
diff --git a/src/help.cpp b/src/help.cpp
index 46f214bb72ef8..a845b4e67d09d 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -29,7 +29,7 @@ help &get_help()
 
 void help::load()
 {
-    read_from_file_optional_json( FILENAMES["help"], [&]( JsonIn & jsin ) {
+    read_from_file_optional_json( PATH_INFO::help(), [&]( JsonIn & jsin ) {
         deserialize( jsin );
     } );
 }
@@ -189,5 +189,5 @@ void help::display_help()
 
 std::string get_hint()
 {
-    return SNIPPET.get( SNIPPET.assign( "hint" ) );
+    return SNIPPET.random_from_category( "hint" ).value_or( translation() ).translated();
 }
diff --git a/src/iexamine.cpp b/src/iexamine.cpp
index a6c84ea471d37..72bfc433f2fe8 100644
--- a/src/iexamine.cpp
+++ b/src/iexamine.cpp
@@ -364,10 +364,10 @@ class atm_menu
                                            "Your current balance is: %s" ),
                                         format_money( u.cash ) );
 
-            if( u.cash >= 100 ) {
+            if( u.cash >= 1000 ) {
                 add_choice( purchase_card, _( "Purchase cash card?" ) );
             } else {
-                add_info( purchase_card, _( "You need $1.00 in your account to purchase a card." ) );
+                add_info( purchase_card, _( "You need $10.00 in your account to purchase a card." ) );
             }
 
             if( card_count && u.cash > 0 ) {
@@ -420,9 +420,10 @@ class atm_menu
             return clamp( amount, 0, max );
         }
 
-        //!Get a new cash card. $1.00 fine.
+        //!Get a new cash card. $10.00 fine.
         bool do_purchase_card() {
-            const char *prompt = _( "This will automatically deduct $1.00 from your bank account.  Continue?" );
+            const char *prompt =
+                _( "This will automatically deduct $10.00 from your bank account.  Continue?" );
 
             if( !query_yn( prompt ) ) {
                 return false;
@@ -431,7 +432,7 @@ class atm_menu
             item card( "cash_card", calendar::turn );
             card.charges = 0;
             u.i_add( card );
-            u.cash -= 100;
+            u.cash -= 1000;
             u.moves -= to_turns<int>( 5_seconds );
             finish_interaction();
 
@@ -3502,10 +3503,14 @@ void iexamine::trap( player &p, const tripoint &examp )
     }
     const int possible = tr.get_difficulty();
     bool seen = tr.can_see( examp, p );
-
     if( tr.loadid == tr_unfinished_construction || g->m.partial_con_at( examp ) ) {
         partial_con *pc = g->m.partial_con_at( examp );
         if( pc ) {
+            const trait_id trait_DEBUG_HS( "DEBUG_HS" );
+            if( g->u.fine_detail_vision_mod() > 4 && !g->u.has_trait( trait_DEBUG_HS ) ) {
+                add_msg( m_info, _( "It is too dark to construct right now." ) );
+                return;
+            }
             const std::vector<construction> &list_constructions = get_constructions();
             const construction &built = list_constructions[pc->id];
             if( !query_yn( _( "Unfinished task: %s, %d%% complete here, continue construction?" ),
@@ -4261,6 +4266,25 @@ static player &player_on_couch( player &p, const tripoint &autodoc_loc, player &
     return null_patient;
 }
 
+static Character &operator_present( Character &p, const tripoint &autodoc_loc,
+                                    Character &null_patient )
+{
+    for( const auto &loc : g->m.points_in_radius( autodoc_loc, 1 ) ) {
+        const furn_str_id couch( "f_autodoc_couch" );
+        if( g->m.furn( loc ) != couch ) {
+            if( p.pos() == loc ) {
+                return p;
+            }
+            for( const npc *e : g->allies() ) {
+                if( e->pos() == loc ) {
+                    return  *g->critter_by_id<player>( e->getID() );
+                }
+            }
+        }
+    }
+    return null_patient;
+}
+
 static item &cyborg_on_couch( const tripoint &couch_pos, item &null_cyborg )
 {
     for( item &it : g->m.i_at( couch_pos ) ) {
@@ -4339,6 +4363,7 @@ void iexamine::autodoc( player &p, const tripoint &examp )
     static avatar null_player;
     tripoint couch_pos;
     player &patient = player_on_couch( p, examp, null_player, adjacent_couch, couch_pos );
+    Character &Operator = operator_present( p, examp, null_player );
 
     static item null_cyborg;
     item &cyborg = cyborg_on_couch( couch_pos, null_cyborg );
@@ -4398,8 +4423,18 @@ void iexamine::autodoc( player &p, const tripoint &examp )
         return;
     }
 
+    const bool unsafe_usage = &Operator == &null_player || ( &Operator == &p && &patient == &p );
+    std::string autodoc_header = _( "Autodoc Mk. XI.  Status: Online.  Please choose operation" );
+    if( unsafe_usage ) {
+        const std::string &warning_sign = colorize( " /", c_yellow ) + colorize( "!",
+                                          c_red ) + colorize( "\\", c_yellow );
+        const std::string &warning = warning_sign + colorize( _( " WARNING: Operator missing" ),
+                                     c_red ) + warning_sign;
+        autodoc_header = warning +
+                         _( "\n Using the Autodoc without an operator can lead to <color_light_cyan>serious injuries</color> or <color_light_cyan>death</color>.\n By continuing with the operation you accept the risks and acknowledge that you will not take any legal actions against this facility in case of an accident. " );
+    }
     uilist amenu;
-    amenu.text = _( "Autodoc Mk. XI.  Status: Online.  Please choose operation" );
+    amenu.text = autodoc_header;
     amenu.addentry( INSTALL_CBM, true, 'i', _( "Choose Compact Bionic Module to install" ) );
     amenu.addentry( UNINSTALL_CBM, true, 'u', _( "Choose installed bionic to uninstall" ) );
     amenu.addentry( BONESETTING, true, 's', _( "Splint broken limbs" ) );
@@ -5370,7 +5405,7 @@ void iexamine::smoker_options( player &p, const tripoint &examp )
                              _( "Reload with charcoal" ),
                              string_format(
                                  _( "You need %d charges of charcoal for %s %s of food.  Minimal amount of charcoal is %d charges." ),
-                                 sm_rack::CHARCOAL_PER_LITER, format_volume( 1000_ml ), volume_units_long(),
+                                 sm_rack::CHARCOAL_PER_LITER, format_volume( 1_liter ), volume_units_long(),
                                  sm_rack::MIN_CHARCOAL ) );
 
     } else {
diff --git a/src/init.cpp b/src/init.cpp
index 064930c6b889a..ee79651aa4513 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -307,6 +307,8 @@ void DynamicDataLoader::initialize()
     add( "SPECIES", []( JsonObject & jo, const std::string & src ) {
         MonsterGenerator::generator().load_species( jo, src );
     } );
+
+    add( "LOOT_ZONE", &zone_type::load_zones );
     add( "monster_adjustment", &load_monster_adjustment );
     add( "recipe_category", &load_recipe_category );
     add( "recipe",  &recipe_dictionary::load_recipe );
@@ -592,6 +594,7 @@ void DynamicDataLoader::finalize_loaded_data( loading_ui &ui )
             { _( "Behaviors" ), &behavior::finalize },
             { _( "Harvest lists" ), &harvest_list::finalize_all },
             { _( "Anatomies" ), &anatomy::finalize_all },
+            { _( "Mutations" ), &mutation_branch::finalize },
 #if defined(TILES)
             { _( "Tileset" ), &load_tileset },
 #endif
diff --git a/src/input.cpp b/src/input.cpp
index 9de0ba04fc625..2692da7f5e6e3 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -116,19 +116,19 @@ void input_manager::init()
     reset_timeout();
 
     try {
-        load( FILENAMES["keybindings"], false );
+        load( PATH_INFO::keybindings(), false );
     } catch( const JsonError &err ) {
-        throw std::runtime_error( FILENAMES["keybindings"] + ": " + err.what() );
+        throw std::runtime_error( PATH_INFO::keybindings() + ": " + err.what() );
     }
     try {
-        load( FILENAMES["keybindings_vehicle"], false );
+        load( PATH_INFO::keybindings_vehicle(), false );
     } catch( const JsonError &err ) {
-        throw std::runtime_error( FILENAMES["keybindings_vehicle"] + ": " + err.what() );
+        throw std::runtime_error( PATH_INFO::keybindings_vehicle() + ": " + err.what() );
     }
     try {
-        load( FILENAMES["user_keybindings"], true );
+        load( PATH_INFO::user_keybindings(), true );
     } catch( const JsonError &err ) {
-        throw std::runtime_error( FILENAMES["user_keybindings"] + ": " + err.what() );
+        throw std::runtime_error( PATH_INFO::user_keybindings() + ": " + err.what() );
     }
 
     if( keymap_file_loaded_from.empty() || ( keymap.empty() && unbound_keymap.empty() ) ) {
@@ -275,7 +275,7 @@ void input_manager::load( const std::string &file_name, bool is_user_preferences
 
 void input_manager::save()
 {
-    write_to_file( FILENAMES["user_keybindings"], [&]( std::ostream & data_file ) {
+    write_to_file( PATH_INFO::user_keybindings(), [&]( std::ostream & data_file ) {
         JsonOut jsout( data_file, true );
 
         jsout.start_array();
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 441ab9eed1570..b31fef831305f 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -398,6 +398,16 @@ void inventory::form_from_map( const tripoint &origin, int range, const Characte
     form_from_map( g->m, origin, range, pl, assign_invlet, clear_path );
 }
 
+void inventory::form_from_zone( map &m, std::unordered_set<tripoint> &zone_pts, const Character *pl,
+                                bool assign_invlet )
+{
+    std::vector<tripoint> pts;
+    for( const tripoint &elem : zone_pts ) {
+        pts.push_back( m.getlocal( elem ) );
+    }
+    form_from_map( m, pts, pl, assign_invlet );
+}
+
 void inventory::form_from_map( map &m, const tripoint &origin, int range, const Character *pl,
                                bool assign_invlet,
                                bool clear_path )
@@ -414,9 +424,14 @@ void inventory::form_from_map( map &m, const tripoint &origin, int range, const
             reachable_pts.emplace_back( p );
         }
     }
+    form_from_map( m, reachable_pts, pl, assign_invlet );
+}
 
+void inventory::form_from_map( map &m, std::vector<tripoint> pts, const Character *pl,
+                               bool assign_invlet )
+{
     items.clear();
-    for( const tripoint &p : reachable_pts ) {
+    for( const tripoint &p : pts ) {
         if( m.has_furn( p ) ) {
             const furn_t &f = m.furn( p ).obj();
             const itype *type = f.crafting_pseudo_item_type();
@@ -583,7 +598,7 @@ void inventory::form_from_map( map &m, const tripoint &origin, int range, const
             add_item( chemistry_set );
         }
     }
-    reachable_pts.clear();
+    pts.clear();
 }
 
 std::list<item> inventory::reduce_stack( const int position, const int quantity )
@@ -869,7 +884,7 @@ void inventory::rust_iron_items()
                 //Scale with volume, bigger = slower (see #24204)
                 one_in( static_cast<int>( 14 * std::cbrt( 0.5 * std::max( 0.05,
                                           static_cast<double>( elem_stack_iter.base_volume().value() ) / 250 ) ) ) ) &&
-                //                       ^season length   ^14/5*0.75/3.14 (from volume of sphere)
+                //                       ^season length   ^14/5*0.75/pi (from volume of sphere)
                 g->m.water_from( g->u.pos() ).typeId() ==
                 "salt_water" ) { //Freshwater without oxygen rusts slower than air
                 elem_stack_iter.inc_damage( DT_ACID ); // rusting never completely destroys an item
diff --git a/src/inventory.h b/src/inventory.h
index 308a40a3ab452..b0ca34c60324d 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -7,9 +7,11 @@
 #include <list>
 #include <string>
 #include <unordered_map>
+#include <unordered_set>
 #include <bitset>
 #include <utility>
 #include <vector>
+#include <set>
 #include <limits>
 #include <functional>
 #include <map>
@@ -125,12 +127,16 @@ class inventory : public visitable<inventory>
          * the player's worn items / weapon
          */
         void restack( player &p );
+        void form_from_zone( map &m, std::unordered_set<tripoint> &zone_pts, const Character *pl = nullptr,
+                             bool assign_invlet = true );
         void form_from_map( const tripoint &origin, int range, const Character *pl = nullptr,
                             bool assign_invlet = true,
                             bool clear_path = true );
         void form_from_map( map &m, const tripoint &origin, int range, const Character *pl = nullptr,
                             bool assign_invlet = true,
                             bool clear_path = true );
+        void form_from_map( map &m, std::vector<tripoint> pts, const Character *pl,
+                            bool assign_invlet = true );
         /**
          * Remove a specific item from the inventory. The item is compared
          * by pointer. Contents of the item are removed as well.
diff --git a/src/item.cpp b/src/item.cpp
index f023fa6c4dd54..ac25a8a3bcc61 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -192,6 +192,7 @@ const int item::INFINITE_CHARGES = INT_MAX;
 item::item() : bday( calendar::start_of_cataclysm )
 {
     type = nullitem();
+    charges = 0;
 }
 
 item::item( const itype *type, time_point turn, int qty ) : type( type ), bday( turn )
@@ -244,7 +245,7 @@ item::item( const itype *type, time_point turn, int qty ) : type( type ), bday(
     }
 
     if( !type->snippet_category.empty() ) {
-        note = SNIPPET.assign( type->snippet_category );
+        snippet_id = SNIPPET.random_id_from_category( type->snippet_category );
     }
 
     if( current_phase == PNULL ) {
@@ -1555,24 +1556,8 @@ void item::gun_info( const item *mod, std::vector<iteminfo> &info, const iteminf
                      int /* batch */, bool /* debug */ ) const
 {
     const std::string space = "  ";
-    // many statistics are dependent upon loaded ammo
-    // if item is unloaded (or is RELOAD_AND_SHOOT) shows approximate stats using default ammo
-    item *aprox = nullptr;
-    item tmp;
-    if( mod->ammo_required() && !mod->ammo_remaining() ) {
-        tmp.ammo_set( mod->magazine_current() ? tmp.common_ammo_default() : tmp.ammo_default() );
-        tmp = *mod;
-        aprox = &tmp;
-    }
 
     const islot_gun &gun = *mod->type->gun;
-    const itype *curammo = mod->ammo_data();
-
-    bool has_ammo = curammo && mod->ammo_remaining();
-
-    // TODO: This doesn't cover multiple damage types
-    int ammo_pierce     = has_ammo ? get_ranged_pierce( *curammo->ammo ) : 0;
-    int ammo_dispersion = has_ammo ? curammo->ammo->dispersion : 0;
 
     const Skill &skill = *mod->gun_skill();
 
@@ -1618,7 +1603,25 @@ void item::gun_info( const item *mod, std::vector<iteminfo> &info, const iteminf
 
     insert_separation_line( info );
 
-    int max_gun_range = mod->gun_range( &g->u );
+    // many statistics are dependent upon loaded ammo
+    // if item is unloaded (or is RELOAD_AND_SHOOT) shows approximate stats using default ammo
+    const item *loaded_mod = mod;
+    item tmp;
+    if( mod->ammo_required() && !mod->ammo_remaining() ) {
+        tmp = *mod;
+        tmp.ammo_set( mod->magazine_current() ? tmp.common_ammo_default() : tmp.ammo_default() );
+        loaded_mod = &tmp;
+        if( parts->test( iteminfo_parts::GUN_DEFAULT_AMMO ) ) {
+            info.emplace_back( "GUN",
+                               _( "Gun is not loaded, so stats below assume the default ammo: " ),
+                               string_format( "<stat>%s</stat>",
+                                              loaded_mod->ammo_data()->nname( 1 ) ) );
+        }
+    }
+
+    const itype *curammo = loaded_mod->ammo_data();
+
+    int max_gun_range = loaded_mod->gun_range( &g->u );
     if( max_gun_range > 0 && parts->test( iteminfo_parts::GUN_MAX_RANGE ) ) {
         info.emplace_back( "GUN", _( "Maximum range: " ), "<num>", iteminfo::no_flags,
                            max_gun_range );
@@ -1632,13 +1635,16 @@ void item::gun_info( const item *mod, std::vector<iteminfo> &info, const iteminf
             if( type.name.empty() ) {
                 continue;
             }
-            info.emplace_back( "GUN", _( type.name ) );
-            int max_dispersion = g->u.get_weapon_dispersion( *mod ).max();
+            // For item comparison to work correctly each info object needs a
+            // distinct tag per aim type.
+            const std::string tag = "GUN_" + type.name;
+            info.emplace_back( tag, _( type.name ) );
+            int max_dispersion = g->u.get_weapon_dispersion( *loaded_mod ).max();
             int range = range_with_even_chance_of_good_hit( max_dispersion + type.threshold );
-            info.emplace_back( "GUN", _( "Even chance of good hit at range: " ),
+            info.emplace_back( tag, _( "Even chance of good hit at range: " ),
                                _( "<num>" ), iteminfo::no_flags, range );
             int aim_mv = g->u.gun_engagement_moves( *mod, type.threshold );
-            info.emplace_back( "GUN", _( "Time to reach aim level: " ), _( "<num> moves " ),
+            info.emplace_back( tag, _( "Time to reach aim level: " ), _( "<num> moves " ),
                                iteminfo::is_decimal | iteminfo::lower_is_better, aim_mv );
         }
     }
@@ -1648,17 +1654,18 @@ void item::gun_info( const item *mod, std::vector<iteminfo> &info, const iteminf
                                   mod->gun_damage( false ).total_damage() ) );
     }
 
-    if( has_ammo ) {
+    if( mod->ammo_required() ) {
         // ammo_damage, sum_of_damage, and ammo_mult not shown so don't need to translate.
-        if( mod->ammo_data()->ammo->prop_damage ) {
+        if( curammo->ammo->prop_damage ) {
             if( parts->test( iteminfo_parts::GUN_DAMAGE_AMMOPROP ) ) {
-                info.push_back( iteminfo( "GUN", "ammo_mult", "*",
-                                          iteminfo::no_newline | iteminfo::no_name,
-                                          *mod->ammo_data()->ammo->prop_damage ) );
+                info.push_back(
+                    iteminfo( "GUN", "ammo_mult", "*",
+                              iteminfo::no_newline | iteminfo::no_name | iteminfo::is_decimal,
+                              *curammo->ammo->prop_damage ) );
             }
         } else {
             if( parts->test( iteminfo_parts::GUN_DAMAGE_LOADEDAMMO ) ) {
-                damage_instance ammo_dam = has_ammo ? curammo->ammo->damage : damage_instance();
+                damage_instance ammo_dam = curammo->ammo->damage;
                 info.push_back( iteminfo( "GUN", "ammo_damage", "",
                                           iteminfo::no_newline | iteminfo::no_name |
                                           iteminfo::show_plus, ammo_dam.total_damage() ) );
@@ -1667,15 +1674,18 @@ void item::gun_info( const item *mod, std::vector<iteminfo> &info, const iteminf
         if( parts->test( iteminfo_parts::GUN_DAMAGE_TOTAL ) ) {
             info.push_back( iteminfo( "GUN", "sum_of_damage", _( " = <num>" ),
                                       iteminfo::no_newline | iteminfo::no_name,
-                                      mod->gun_damage( true ).total_damage() ) );
+                                      loaded_mod->gun_damage( true ).total_damage() ) );
         }
     }
 
+    // TODO: This doesn't cover multiple damage types
+
     if( parts->test( iteminfo_parts::GUN_ARMORPIERCE ) ) {
         info.push_back( iteminfo( "GUN", space + _( "Armor-pierce: " ), "",
                                   iteminfo::no_newline, get_ranged_pierce( gun ) ) );
     }
-    if( has_ammo ) {
+    if( mod->ammo_required() ) {
+        int ammo_pierce = get_ranged_pierce( *curammo->ammo );
         // ammo_armor_pierce and sum_of_armor_pierce don't need to translate.
         if( parts->test( iteminfo_parts::GUN_ARMORPIERCE_LOADEDAMMO ) ) {
             info.push_back( iteminfo( "GUN", "ammo_armor_pierce", "",
@@ -1695,7 +1705,8 @@ void item::gun_info( const item *mod, std::vector<iteminfo> &info, const iteminf
                                   iteminfo::no_newline | iteminfo::lower_is_better,
                                   mod->gun_dispersion( false, false ) ) );
     }
-    if( has_ammo ) {
+    if( mod->ammo_required() ) {
+        int ammo_dispersion = curammo->ammo->dispersion;
         // ammo_dispersion and sum_of_dispersion don't need to translate.
         if( parts->test( iteminfo_parts::GUN_DISPERSION_LOADEDAMMO ) ) {
             info.push_back( iteminfo( "GUN", "ammo_dispersion", "",
@@ -1706,7 +1717,7 @@ void item::gun_info( const item *mod, std::vector<iteminfo> &info, const iteminf
         if( parts->test( iteminfo_parts::GUN_DISPERSION_TOTAL ) ) {
             info.push_back( iteminfo( "GUN", "sum_of_dispersion", _( " = <num>" ),
                                       iteminfo::lower_is_better | iteminfo::no_name,
-                                      mod->gun_dispersion( true, false ) ) );
+                                      loaded_mod->gun_dispersion( true, false ) ) );
         }
     }
     info.back().bNewLine = true;
@@ -1732,31 +1743,17 @@ void item::gun_info( const item *mod, std::vector<iteminfo> &info, const iteminf
     }
 
     bool bipod = mod->has_flag( "BIPOD" );
-    if( aprox ) {
-        if( aprox->gun_recoil( g->u ) ) {
-            if( parts->test( iteminfo_parts::GUN_RECOIL ) ) {
-                info.emplace_back( "GUN", _( "Approximate recoil: " ), "",
-                                   iteminfo::no_newline | iteminfo::lower_is_better,
-                                   aprox->gun_recoil( g->u ) );
-            }
-            if( bipod && parts->test( iteminfo_parts::GUN_RECOIL_BIPOD ) ) {
-                info.emplace_back( "GUN", "bipod_recoil", _( " (with bipod <num>)" ),
-                                   iteminfo::lower_is_better | iteminfo::no_name,
-                                   aprox->gun_recoil( g->u, true ) );
-            }
+
+    if( loaded_mod->gun_recoil( g->u ) ) {
+        if( parts->test( iteminfo_parts::GUN_RECOIL ) ) {
+            info.emplace_back( "GUN", _( "Effective recoil: " ), "",
+                               iteminfo::no_newline | iteminfo::lower_is_better,
+                               loaded_mod->gun_recoil( g->u ) );
         }
-    } else {
-        if( mod->gun_recoil( g->u ) ) {
-            if( parts->test( iteminfo_parts::GUN_RECOIL ) ) {
-                info.emplace_back( "GUN", _( "Effective recoil: " ), "",
-                                   iteminfo::no_newline | iteminfo::lower_is_better,
-                                   mod->gun_recoil( g->u ) );
-            }
-            if( bipod && parts->test( iteminfo_parts::GUN_RECOIL_BIPOD ) ) {
-                info.emplace_back( "GUN", "bipod_recoil", _( " (with bipod <num>)" ),
-                                   iteminfo::lower_is_better | iteminfo::no_name,
-                                   mod->gun_recoil( g->u, true ) );
-            }
+        if( bipod && parts->test( iteminfo_parts::GUN_RECOIL_BIPOD ) ) {
+            info.emplace_back( "GUN", "bipod_recoil", _( " (with bipod <num>)" ),
+                               iteminfo::lower_is_better | iteminfo::no_name,
+                               loaded_mod->gun_recoil( g->u, true ) );
         }
     }
     info.back().bNewLine = true;
@@ -1924,8 +1921,8 @@ void item::gunmod_info( std::vector<iteminfo> &info, const iteminfo_query *parts
     if( parts->test( iteminfo_parts::GUNMOD_USEDON ) ) {
         std::string used_on_str = _( "Used on: " ) +
         enumerate_as_string( mod.usable.begin(), mod.usable.end(), []( const gun_type_type & used_on ) {
-            std::string id_string = item_controller->has_template( used_on.name() ) ? item::find_type(
-                                        used_on.name() )->nname( 1 ) : used_on.name();
+            std::string id_string = item_controller->has_template( used_on.name() ) ? nname( used_on.name(),
+                                    1 ) : used_on.name();
             return string_format( "<info>%s</info>", id_string );
         } );
         info.push_back( iteminfo( "GUNMOD", used_on_str ) );
@@ -2485,7 +2482,6 @@ void item::qualities_info( std::vector<iteminfo> &info, const iteminfo_query *pa
     }
 }
 
-
 void item::final_info( std::vector<iteminfo> &info, const iteminfo_query *parts, int batch,
                        bool /*debug*/ ) const
 {
@@ -2501,9 +2497,12 @@ void item::final_info( std::vector<iteminfo> &info, const iteminfo_query *parts,
         insert_separation_line( info );
         const std::map<std::string, std::string>::const_iterator idescription =
             item_vars.find( "description" );
-        if( !type->snippet_category.empty() ) {
+        const cata::optional<translation> snippet = snippet_id.has_value()
+                ? SNIPPET.get_snippet_by_id( snippet_id.value() )
+                : cata::nullopt;
+        if( snippet.has_value() ) {
             // Just use the dynamic description
-            info.push_back( iteminfo( "DESCRIPTION", SNIPPET.get( note ) ) );
+            info.push_back( iteminfo( "DESCRIPTION", snippet.value().translated() ) );
         } else if( idescription != item_vars.end() ) {
             info.push_back( iteminfo( "DESCRIPTION", idescription->second ) );
         } else {
@@ -2682,96 +2681,114 @@ void item::final_info( std::vector<iteminfo> &info, const iteminfo_query *parts,
         }
 
         if( parts->test( iteminfo_parts::DESCRIPTION_FLAGS_FITS ) ) {
-            if( has_flag( "FIT" ) ) {
-                if( sizing_level == sizing::human_sized_human_char ) {
-                    info.push_back( iteminfo( "DESCRIPTION",
-                                              _( "* This clothing <info>fits</info> you "
-                                                 "perfectly." ) ) );
-                } else if( sizing_level == sizing::big_sized_big_char ) {
-                    info.push_back( iteminfo( "DESCRIPTION",
-                                              _( "* This clothing <info>fits</info> your large "
-                                                 "frame perfectly." ) ) );
-                } else if( sizing_level == sizing::small_sized_small_char ) {
-                    info.push_back( iteminfo( "DESCRIPTION",
-                                              _( "* This clothing <info>fits</info> your small "
-                                                 "frame perfectly." ) ) );
-                }
-            }
-
-            if( sizing_level == sizing::big_sized_human_char ) {
-                info.push_back( iteminfo( "DESCRIPTION",
-                                          _( "* This clothing is <bad>oversized</bad> and does "
-                                             "<bad>not fit</bad> you." ) ) );
-            } else if( sizing_level == sizing::big_sized_small_char ) {
-                info.push_back( iteminfo( "DESCRIPTION",
-                                          _( "* This clothing is hilariously <bad>oversized</bad> "
-                                             "and does <bad>not fit</bad> your <info>abnormally "
-                                             "small mutated anatomy</info>." ) ) );
-            } else if( sizing_level == sizing::human_sized_big_char ) {
-                info.push_back( iteminfo( "DESCRIPTION",
-                                          _( "* This clothing is <bad>normal sized</bad> and does "
-                                             "<bad>not fit</info> your <info>abnormally large "
-                                             "mutated anatomy</info>." ) ) );
-            } else if( sizing_level == sizing::human_sized_small_char ) {
-                info.push_back( iteminfo( "DESCRIPTION",
-                                          _( "* This clothing is <bad>normal sized</bad> and does "
-                                             "<bad>not fit</bad> your <info>abnormally small "
-                                             "mutated anatomy</info>." ) ) );
-            } else if( sizing_level == sizing::small_sized_big_char ) {
-                info.push_back( iteminfo( "DESCRIPTION",
-                                          _( "* This clothing is hilariously "
-                                             "<bad>undersized</bad> and does <bad>not fit</bad> "
-                                             "your <info>abnormally large mutated "
-                                             "anatomy</info>." ) ) );
-            } else if( sizing_level == sizing::small_sized_human_char ) {
-                info.push_back( iteminfo( "DESCRIPTION",
-                                          _( "* This clothing is <bad>undersized</bad> and "
-                                             "does <bad>not fit</bad> you." ) ) );
+            switch( sizing_level ) {
+                case sizing::human_sized_human_char:
+                    if( has_flag( "FIT" ) ) {
+                        info.emplace_back( "DESCRIPTION",
+                                           _( "* This clothing <info>fits</info> you perfectly." ) );
+                    }
+                    break;
+                case sizing::big_sized_big_char:
+                    if( has_flag( "FIT" ) ) {
+                        info.emplace_back( "DESCRIPTION", _( "* This clothing <info>fits</info> "
+                                                             "your large frame perfectly." ) );
+                    }
+                    break;
+                case sizing::small_sized_small_char:
+                    if( has_flag( "FIT" ) ) {
+                        info.emplace_back( "DESCRIPTION", _( "* This clothing <info>fits</info> "
+                                                             "your small frame perfectly." ) );
+                    }
+                    break;
+                case sizing::big_sized_human_char:
+                    info.emplace_back( "DESCRIPTION", _( "* This clothing is <bad>oversized</bad> "
+                                                         "and does <bad>not fit</bad> you." ) );
+                    break;
+                case sizing::big_sized_small_char:
+                    info.emplace_back( "DESCRIPTION",
+                                       _( "* This clothing is hilariously <bad>oversized</bad> "
+                                          "and does <bad>not fit</bad> your <info>abnormally "
+                                          "small mutated anatomy</info>." ) );
+                    break;
+                case sizing::human_sized_big_char:
+                    info.emplace_back( "DESCRIPTION",
+                                       _( "* This clothing is <bad>normal sized</bad> and does "
+                                          "<bad>not fit</info> your <info>abnormally large "
+                                          "mutated anatomy</info>." ) );
+                    break;
+                case sizing::human_sized_small_char:
+                    info.emplace_back( "DESCRIPTION",
+                                       _( "* This clothing is <bad>normal sized</bad> and does "
+                                          "<bad>not fit</bad> your <info>abnormally small "
+                                          "mutated anatomy</info>." ) );
+                    break;
+                case sizing::small_sized_big_char:
+                    info.emplace_back( "DESCRIPTION",
+                                       _( "* This clothing is hilariously <bad>undersized</bad> "
+                                          "and does <bad>not fit</bad> your <info>abnormally "
+                                          "large mutated anatomy</info>." ) );
+                    break;
+                case sizing::small_sized_human_char:
+                    info.emplace_back( "DESCRIPTION", _( "* This clothing is <bad>undersized</bad> "
+                                                         "and does <bad>not fit</bad> you." ) );
+                    break;
+                default:
+                    break;
             }
         }
 
         if( parts->test( iteminfo_parts::DESCRIPTION_FLAGS_VARSIZE ) ) {
             if( has_flag( "VARSIZE" ) ) {
+                std::string resize_str;
                 if( has_flag( "FIT" ) ) {
-                    if( !( sizing_level == sizing::small_sized_small_char ||
-                           sizing_level == sizing::human_sized_human_char ||
-                           sizing_level == sizing::big_sized_big_char ) ) {
-                        std::string resize_str;
-                        if( sizing_level == sizing::small_sized_human_char ) {
+                    switch( sizing_level ) {
+                        case sizing::small_sized_human_char:
                             resize_str = _( "<info>can be upsized</info>" );
-                        } else if( sizing_level == sizing::human_sized_small_char ) {
+                            break;
+                        case sizing::human_sized_small_char:
                             resize_str = _( "<info>can be downsized</info>" );
-                        } else if( sizing_level == sizing::big_sized_human_char ||
-                                   sizing_level == sizing::big_sized_small_char ) {
+                            break;
+                        case sizing::big_sized_human_char:
+                        case sizing::big_sized_small_char:
                             resize_str = _( "<bad>can not be downsized</bad>" );
-                        } else if( sizing_level == sizing::small_sized_big_char ||
-                                   sizing_level == sizing::human_sized_big_char ) {
+                            break;
+                        case sizing::small_sized_big_char:
+                        case sizing::human_sized_big_char:
                             resize_str = _( "<bad>can not be upsized</bad>" );
-                        }
+                            break;
+                        default:
+                            break;
+                    }
+                    if( !resize_str.empty() ) {
                         std::string info_str = string_format( _( "* This clothing %s." ), resize_str );
                         info.push_back( iteminfo( "DESCRIPTION", info_str ) );
                     }
                 } else {
-                    std::string resize_str;
-                    if( sizing_level == sizing::small_sized_human_char ) {
-                        resize_str = _( " and <info>upsized</info>" );
-                    } else if( sizing_level == sizing::human_sized_small_char ) {
-                        resize_str = _( " and <info>downsized</info>" );
-                    } else if( sizing_level == sizing::big_sized_human_char ||
-                               sizing_level == sizing::big_sized_small_char ) {
-                        resize_str = _( " but <bad>not downsized</bad>" );
-                    } else if( sizing_level == sizing::small_sized_big_char ||
-                               sizing_level == sizing::human_sized_big_char ) {
-                        resize_str = _( " but <bad>not upsized</bad>" );
+                    switch( sizing_level ) {
+                        case sizing::small_sized_human_char:
+                            resize_str = _( " and <info>upsized</info>" );
+                            break;
+                        case sizing::human_sized_small_char:
+                            resize_str = _( " and <info>downsized</info>" );
+                            break;
+                        case sizing::big_sized_human_char:
+                        case sizing::big_sized_small_char:
+                            resize_str = _( " but <bad>not downsized</bad>" );
+                            break;
+                        case sizing::small_sized_big_char:
+                        case sizing::human_sized_big_char:
+                            resize_str = _( " but <bad>not upsized</bad>" );
+                            break;
+                        default:
+                            break;
                     }
                     std::string info_str = string_format( _( "* This clothing <info>can be "
                                                           "refitted</info>%s." ), resize_str );
                     info.push_back( iteminfo( "DESCRIPTION", info_str ) );
                 }
             } else {
-                info.push_back( iteminfo( "DESCRIPTION",
-                                          _( "* This clothing <bad>can not be refitted, upsized, "
-                                             "or downsized</bad>." ) ) );
+                info.emplace_back( "DESCRIPTION", _( "* This clothing <bad>can not be refitted, "
+                                                     "upsized, or downsized</bad>." ) );
             }
         }
 
@@ -2873,8 +2890,13 @@ void item::final_info( std::vector<iteminfo> &info, const iteminfo_query *parts,
         }
         insert_separation_line( info );
 
-        const bionic_id bid = type->bionic->id;
+        if( is_bionic() && has_flag( "NO_STERILE" ) ) {
+            info.push_back( iteminfo( "DESCRIPTION",
+                                      _( "* This bionic is <bad>not sterile</bad>, use an <info>autoclave</info> and an <info>autoclave pouch</info> to sterilize it. " ) ) );
+        }
+        insert_separation_line( info );
 
+        const bionic_id bid = type->bionic->id;
         const std::vector<itype_id> &fuels = bid->fuel_opts;
         if( !fuels.empty() ) {
             const int &fuel_numb = fuels.size();
@@ -2889,7 +2911,7 @@ void item::final_info( std::vector<iteminfo> &info, const iteminfo_query *parts,
         insert_separation_line( info );
 
         if( bid->capacity > 0_mJ ) {
-            info.push_back( iteminfo( "CBM", _( "<bold>Power Capacity:</bold>" ), " <num> mJ",
+            info.push_back( iteminfo( "CBM", _( "<bold>Power Capacity:</bold>" ), _( " <num> mJ" ),
                                       iteminfo::no_newline,
                                       units::to_millijoule( bid->capacity ) ) );
         }
@@ -3717,7 +3739,7 @@ std::string item::tname( unsigned int quantity, bool with_prefix, unsigned int t
 
     std::string burntext;
     if( with_prefix && !made_of_from_type( LIQUID ) ) {
-        if( volume() >= 1000_ml && burnt * 125_ml >= volume() ) {
+        if( volume() >= 1_liter && burnt * 125_ml >= volume() ) {
             burntext = pgettext( "burnt adjective", "badly burnt " );
         } else if( burnt > 0 ) {
             burntext = pgettext( "burnt adjective", "burnt " );
@@ -7814,7 +7836,7 @@ bool item::use_charges( const itype_id &what, int &qty, std::list<item> &used,
     return destroy;
 }
 
-void item::set_snippet( const std::string &snippet_id )
+void item::set_snippet( const std::string &id )
 {
     if( is_null() ) {
         return;
@@ -7823,13 +7845,12 @@ void item::set_snippet( const std::string &snippet_id )
         debugmsg( "can not set description for item %s without snippet category", typeId().c_str() );
         return;
     }
-    const int hash = SNIPPET.get_snippet_by_id( snippet_id );
-    if( SNIPPET.get( hash ).empty() ) {
-        debugmsg( "snippet id %s is not contained in snippet category %s", snippet_id.c_str(),
-                  type->snippet_category.c_str() );
+    if( !SNIPPET.get_snippet_by_id( id ).has_value() ) {
+        debugmsg( "snippet id %s is not contained in snippet category %s", id,
+                  type->snippet_category );
         return;
     }
-    note = hash;
+    snippet_id = id;
 }
 
 const item_category &item::get_category() const
@@ -8668,7 +8689,7 @@ bool item::process_extinguish( player *carrier, const tripoint &pos )
     return false;
 }
 
-cata::optional<tripoint> item::get_cable_target( player *p, const tripoint &pos ) const
+cata::optional<tripoint> item::get_cable_target( Character *p, const tripoint &pos ) const
 {
     const std::string &state = get_var( "state" );
     if( state != "pay_out_cable" && state != "cable_charger_link" ) {
@@ -8698,8 +8719,8 @@ bool item::process_cable( player *carrier, const tripoint &pos )
     }
     std::string state = get_var( "state" );
     if( state == "solar_pack_link" || state == "solar_pack" ) {
-        if( !carrier->has_item( *this ) || ( !carrier->is_wearing( "solarpack_on" ) ||
-                                             !carrier->is_wearing( "q_solarpack_on" ) ) ) {
+        if( !carrier->has_item( *this ) || !( carrier->is_wearing( "solarpack_on" ) ||
+                                              carrier->is_wearing( "q_solarpack_on" ) ) ) {
             carrier->add_msg_if_player( m_bad, _( "You notice the cable has come loose!" ) );
             reset_cable( carrier );
             return false;
@@ -8842,7 +8863,9 @@ bool item::process_blackpowder_fouling( player *carrier )
 {
     if( damage() < max_damage() && one_in( 2000 ) ) {
         inc_damage( DT_ACID );
-        carrier->add_msg_if_player( m_bad, _( "Your %s rusts due to blackpowder fouling." ), tname() );
+        if( carrier ) {
+            carrier->add_msg_if_player( m_bad, _( "Your %s rusts due to blackpowder fouling." ), tname() );
+        }
     }
     return false;
 }
diff --git a/src/item.h b/src/item.h
index 9d7d491fe6faf..ec61b298c72f6 100644
--- a/src/item.h
+++ b/src/item.h
@@ -1055,7 +1055,7 @@ class item : public visitable<item>
          * Gets the point (vehicle tile) the cable is connected to.
          * Returns nothing if not connected to anything.
          */
-        cata::optional<tripoint> get_cable_target( player *p, const tripoint &pos ) const;
+        cata::optional<tripoint> get_cable_target( Character *p, const tripoint &pos ) const;
         /**
          * Helper to bring a cable back to its initial state.
          */
@@ -1195,7 +1195,7 @@ class item : public visitable<item>
          * Set the snippet text (description) of this specific item, using the snippet library.
          * @see snippet_library.
          */
-        void set_snippet( const std::string &snippet_id );
+        void set_snippet( const std::string &id );
 
         bool operator<( const item &other ) const;
         /** List of all @ref components in printable form, empty if this item has
@@ -1992,8 +1992,9 @@ class item : public visitable<item>
          * Handle failure during crafting.
          * Destroy components, lose progress, and set a new failure point.
          * @param crafter the crafting player.
+         * @return whether the craft being worked on should be entirely destroyed
          */
-        void handle_craft_failure( player &crafter );
+        bool handle_craft_failure( player &crafter );
 
         /**
          * Returns requirement data representing what is needed to resume work on an in progress craft.
@@ -2115,7 +2116,7 @@ class item : public visitable<item>
         int burnt = 0;             // How badly we're burnt
         int poison = 0;            // How badly poisoned is it?
         int frequency = 0;         // Radio frequency
-        int note = 0;              // Associated dynamic text snippet.
+        cata::optional<std::string> snippet_id; // Associated dynamic text snippet id.
         int irradiation = 0;       // Tracks radiation dosage.
         int item_counter = 0;      // generic counter to be used with item flags
         int specific_energy = -10; // Specific energy (0.00001 J/g). Negative value for unprocessed.
diff --git a/src/item_factory.cpp b/src/item_factory.cpp
index 8a830585b9fe5..acbf1ce49dad7 100644
--- a/src/item_factory.cpp
+++ b/src/item_factory.cpp
@@ -209,9 +209,9 @@ void Item_factory::finalize_pre( itype &obj )
     }
 
     // Set max volume for containers to prevent integer overflow
-    if( obj.container && obj.container->contains > 10000000_ml ) {
-        debugmsg( obj.id + " storage volume is too large, reducing to 10000000" );
-        obj.container->contains = 10000000_ml;
+    if( obj.container && obj.container->contains > 10000_liter ) {
+        debugmsg( obj.id + " storage volume is too large, reducing to 10000 liters" );
+        obj.container->contains = 10000_liter;
     }
 
     // for ammo not specifying loudness (or an explicit zero) derive value from other properties
@@ -2233,13 +2233,23 @@ void Item_factory::load_basic_info( JsonObject &jo, itype &def, const std::strin
 void Item_factory::load_migration( JsonObject &jo )
 {
     migration m;
-    m.id = jo.get_string( "id" );
     assign( jo, "replace", m.replace );
     assign( jo, "flags", m.flags );
     assign( jo, "charges", m.charges );
     assign( jo, "contents", m.contents );
 
-    migrations[ jo.get_string( "id" ) ] = m;
+    if( jo.has_string( "id" ) ) {
+        m.id = jo.get_string( "id" );
+        migrations[ m.id ] = m;
+    } else if( jo.has_array( "id" ) ) {
+        JsonArray ja = jo.get_array( "id" );
+        while( ja.has_more() ) {
+            m.id = jo.get_string( "id" );
+            migrations[ m.id ] = m;
+        }
+    } else {
+        jo.throw_error( "`id` of `MIGRATION` is neither string nor array" );
+    }
 }
 
 itype_id Item_factory::migrate_id( const itype_id &id )
diff --git a/src/item_location.cpp b/src/item_location.cpp
index df322fa67ba59..903cd46cdf293 100644
--- a/src/item_location.cpp
+++ b/src/item_location.cpp
@@ -6,6 +6,7 @@
 
 #include "avatar.h"
 #include "character.h"
+#include "character_id.h"
 #include "debug.h"
 #include "game.h"
 #include "game_constants.h"
@@ -84,7 +85,7 @@ class item_location::impl
             return what.get();
         }
 
-        bool valid() const {
+        virtual bool valid() const {
             ensure_unpacked();
             return !!what;
         }
@@ -228,21 +229,49 @@ class item_location::impl::item_on_map : public item_location::impl
 class item_location::impl::item_on_person : public item_location::impl
 {
     private:
-        Character &who;
+        character_id who_id;
+        mutable Character *who;
+
+        bool ensure_who_unpacked() const {
+            if( !who ) {
+                who = g->critter_by_id<Character>( who_id );
+                if( !who ) {
+                    // If we failed to find it throw a debug message cause we're probably going to crash soon
+                    debugmsg( "Failed to find item_location owner with character_id %d", who_id.get_value() );
+                    return false;
+                }
+            }
+            return true;
+        }
 
     public:
-        item_on_person( Character &who, item *which ) : impl( which ), who( who ) {}
-        item_on_person( Character &who, int idx ) : impl( idx ), who( who ) {}
+        item_on_person( Character &who, item *which ) : impl( which ) {
+            who_id = who.getID();
+            this->who = &who;
+        }
+
+        item_on_person( character_id who_id, int idx ) : impl( idx ), who_id( who_id ), who( nullptr ) {}
 
         void serialize( JsonOut &js ) const override {
+            if( !ensure_who_unpacked() ) {
+                // Write an invalid item_location to avoid invalid json
+                js.start_object();
+                js.member( "type", "null" );
+                js.end_object();
+                return;
+            }
             js.start_object();
             js.member( "type", "character" );
-            js.member( "idx", find_index( who, target() ) );
+            js.member( "character", who_id );
+            js.member( "idx", find_index( *who, target() ) );
             js.end_object();
         }
 
         item *unpack( int idx ) const override {
-            return retrieve_index( who, idx );
+            if( !ensure_who_unpacked() ) {
+                return nullptr;
+            }
+            return retrieve_index( *who, idx );
         }
 
         type where() const override {
@@ -250,20 +279,23 @@ class item_location::impl::item_on_person : public item_location::impl
         }
 
         tripoint position() const override {
-            return who.pos();
+            if( !ensure_who_unpacked() ) {
+                return tripoint_zero;
+            }
+            return who->pos();
         }
 
         std::string describe( const Character *ch ) const override {
-            if( !target() ) {
+            if( !target() || !ensure_who_unpacked() ) {
                 return std::string();
             }
 
-            if( ch == &who ) {
-                auto parents = who.parents( *target() );
-                if( !parents.empty() && who.is_worn( *parents.back() ) ) {
+            if( ch == who ) {
+                auto parents = who->parents( *target() );
+                if( !parents.empty() && who->is_worn( *parents.back() ) ) {
                     return parents.back()->type_name();
 
-                } else if( who.is_worn( *target() ) ) {
+                } else if( who->is_worn( *target() ) ) {
                     return _( "worn" );
 
                 } else {
@@ -271,7 +303,7 @@ class item_location::impl::item_on_person : public item_location::impl
                 }
 
             } else {
-                return who.name;
+                return who->name;
             }
         }
 
@@ -294,7 +326,7 @@ class item_location::impl::item_on_person : public item_location::impl
         }
 
         int obtain_cost( const Character &ch, int qty ) const override {
-            if( !target() ) {
+            if( !target() || !ensure_who_unpacked() ) {
                 return 0;
             }
 
@@ -306,33 +338,33 @@ class item_location::impl::item_on_person : public item_location::impl
                 obj = *target();
             }
 
-            auto parents = who.parents( *target() );
-            if( !parents.empty() && who.is_worn( *parents.back() ) ) {
+            auto parents = who->parents( *target() );
+            if( !parents.empty() && who->is_worn( *parents.back() ) ) {
                 // if outermost parent item is worn status effects (e.g. GRABBED) are not applied
                 // holsters may also adjust the volume cost factor
 
                 if( parents.back()->can_holster( obj, true ) ) {
                     auto ptr = dynamic_cast<const holster_actor *>
                                ( parents.back()->type->get_use( "holster" )->get_actor_ptr() );
-                    mv += dynamic_cast<player &>( who ).item_handling_cost( obj, false, ptr->draw_cost );
+                    mv += dynamic_cast<player *>( who )->item_handling_cost( obj, false, ptr->draw_cost );
 
                 } else if( parents.back()->is_bandolier() ) {
                     auto ptr = dynamic_cast<const bandolier_actor *>
                                ( parents.back()->type->get_use( "bandolier" )->get_actor_ptr() );
-                    mv += dynamic_cast<player &>( who ).item_handling_cost( obj, false, ptr->draw_cost );
+                    mv += dynamic_cast<player *>( who )->item_handling_cost( obj, false, ptr->draw_cost );
 
                 } else {
-                    mv += dynamic_cast<player &>( who ).item_handling_cost( obj, false,
+                    mv += dynamic_cast<player *>( who )->item_handling_cost( obj, false,
                             INVENTORY_HANDLING_PENALTY / 2 );
                 }
 
             } else {
                 // it is more expensive to obtain items from the inventory
                 // TODO: calculate cost for searching in inventory proportional to item volume
-                mv += dynamic_cast<player &>( who ).item_handling_cost( obj, true, INVENTORY_HANDLING_PENALTY );
+                mv += dynamic_cast<player *>( who )->item_handling_cost( obj, true, INVENTORY_HANDLING_PENALTY );
             }
 
-            if( &ch != &who ) {
+            if( &ch != who ) {
                 // TODO: implement movement cost for transferring item between characters
             }
 
@@ -340,7 +372,16 @@ class item_location::impl::item_on_person : public item_location::impl
         }
 
         void remove_item() override {
-            who.remove_item( *what );
+            if( !ensure_who_unpacked() ) {
+                return;
+            }
+            who->remove_item( *what );
+        }
+
+        bool valid() const override {
+            ensure_who_unpacked();
+            ensure_unpacked();
+            return !!what && !!who;
         }
 };
 
@@ -503,7 +544,15 @@ void item_location::deserialize( JsonIn &js )
     obj.read( "pos", pos );
 
     if( type == "character" ) {
-        ptr.reset( new impl::item_on_person( g->u, idx ) );
+        character_id who_id;
+        if( obj.has_member( "character" ) ) {
+            obj.read( "character", who_id );
+        } else {
+            // This is for migrating saves before npc item locations were supported and all
+            // character item locations were assumed to be on g->u
+            who_id = g->u.getID();
+        }
+        ptr.reset( new impl::item_on_person( who_id, idx ) );
 
     } else if( type == "map" ) {
         ptr.reset( new impl::item_on_map( pos, idx ) );
diff --git a/src/iteminfo_query.h b/src/iteminfo_query.h
index a757c25d7d28d..57b528f8bec5f 100644
--- a/src/iteminfo_query.h
+++ b/src/iteminfo_query.h
@@ -65,6 +65,7 @@ enum class iteminfo_parts : size_t {
     AMMO_REMAINING,
     AMMO_UPSCOST,
 
+    GUN_DEFAULT_AMMO,
     GUN_MAX_RANGE,
     GUN_AIMING_STATS,
     GUN_DAMAGE,
diff --git a/src/iuse.cpp b/src/iuse.cpp
index 285fdc0fa7b18..05dbbf6c80c2f 100644
--- a/src/iuse.cpp
+++ b/src/iuse.cpp
@@ -1250,7 +1250,7 @@ static void marloss_common( player &p, item &it, const trait_id &current_color )
 
         // previously used to set hunger to -10. with the new system, needs to do something
         // else that actually makes sense, so it is a little bit more involved.
-        units::volume fulfill_vol = std::max( p.stomach.capacity() / 8 - p.stomach.contains(), 0_ml );
+        units::volume fulfill_vol = std::max( p.stomach.capacity( p ) / 8 - p.stomach.contains(), 0_ml );
         if( fulfill_vol != 0_ml ) {
             p.add_msg_if_player( m_good, _( "It is delicious, and very filling!" ) );
             int fulfill_cal = units::to_milliliter( fulfill_vol * 6 );
@@ -1483,7 +1483,7 @@ static int feedpet( player &p, monster &mon, item &it, m_flag food_flag, const c
         mon.friendly = -1;
         mon.add_effect( effect_pet, 1_turns, num_bp, true );
         p.consume_charges( it, 1 );
-        return 1;
+        return 0;
     } else {
         p.add_msg_if_player( _( "The %s doesn't want that kind of food." ), mon.get_name() );
         return 0;
@@ -1511,12 +1511,12 @@ static int petfood( player &p, item &it, Petfood animal_food_type )
                     person.say(
                         _( "Okay, but please, don't give me this again.  I don't want to eat dog food in the cataclysm all day." ) );
                     p.consume_charges( it, 1 );
-                    return 1;
+                    return 0;
                 } else {
                     p.add_msg_if_player( _( "%s knocks it out from your hand!" ), person.name );
                     person.make_angry();
                     p.consume_charges( it, 1 );
-                    return 1;
+                    return 0;
                 }
             } else {
                 p.add_msg_if_player( _( "Never mind." ) );
@@ -1544,7 +1544,7 @@ static int petfood( player &p, item &it, Petfood animal_food_type )
                         p.add_msg_if_player(
                             _( "Apparently it's more interested in your flesh than the dog food in your hand!" ) );
                         p.consume_charges( it, 1 );
-                        return 1;
+                        return 0;
                     }
                 } else {
                     return feedpet( p, mon, it, MF_DOGFOOD,
@@ -3400,13 +3400,33 @@ int iuse::geiger( player *p, item *it, bool t, const tripoint &pos )
     }
 
     int ch = uilist( _( "Geiger counter:" ), {
-        _( "Scan yourself" ), _( "Scan the ground" ), _( "Turn continuous scan on" )
+        _( "Scan yourself or other person" ), _( "Scan the ground" ), _( "Turn continuous scan on" )
     } );
     switch( ch ) {
-        case 0:
-            p->add_msg_if_player( m_info, _( "Your radiation level: %d mSv (%d mSv from items)" ), p->radiation,
-                                  p->leak_level( "RADIOACTIVE" ) );
+        case 0: {
+            const std::function<bool( const tripoint & )> f = [&]( const tripoint & pnt ) {
+                return g->critter_at<npc>( pnt ) != nullptr || g->critter_at<player>( pnt ) != nullptr;
+            };
+
+            const cata::optional<tripoint> pnt_ = choose_adjacent_highlight( _( "Scan whom?" ), f, false,
+                                                  true );
+            if( !pnt_ ) {
+                return 0;
+            }
+            const tripoint &pnt = *pnt_;
+            if( pnt == g->u.pos() ) {
+                p->add_msg_if_player( m_info, _( "Your radiation level: %d mSv (%d mSv from items)" ), p->radiation,
+                                      p->leak_level( "RADIOACTIVE" ) );
+                break;
+            }
+            if( npc *const person_ = g->critter_at<npc>( pnt ) ) {
+                npc &person = *person_;
+                p->add_msg_if_player( m_info, _( "%s's radiation level: %d mSv (%d mSv from items)" ),
+                                      person.name, person.radiation,
+                                      person.leak_level( "RADIOACTIVE" ) );
+            }
             break;
+        }
         case 1:
             p->add_msg_if_player( m_info, _( "The ground's radiation level: %d mSv/h" ),
                                   g->m.get_radiation( p->pos() ) );
@@ -3418,6 +3438,8 @@ int iuse::geiger( player *p, item *it, bool t, const tripoint &pos )
         default:
             return 0;
     }
+    p->mod_moves( -100 );
+
     return it->type->charges_to_use();
 }
 
@@ -4090,7 +4112,8 @@ static std::string get_music_description()
     // of snippets {a, b, c}, but only a 50% chance
     // Actual chance = 24.5% of being selected
     if( one_in( 2 ) ) {
-        return SNIPPET.random_from_category( "music_description" );
+        return SNIPPET.expand( SNIPPET.random_from_category( "<music_description>" ).value_or(
+                                   translation() ).translated() );
     }
 
     return _( "a sweet guitar solo!" );
@@ -9221,26 +9244,8 @@ int item::contain_monster( const tripoint &target )
     set_var( "contained_name", f.type->nname() );
     set_var( "name", string_format( _( "%s holding %s" ), type->nname( 1 ),
                                     f.type->nname() ) );
-    m_size mon_size = f.get_size();
-    int new_weight = 0;
-    switch( mon_size ) {
-        case MS_TINY:
-            new_weight = 1000;
-            break;
-        case MS_SMALL:
-            new_weight = 40750;
-            break;
-        case MS_MEDIUM:
-            new_weight = 81500;
-            break;
-        case MS_LARGE:
-            new_weight = 120000;
-            break;
-        case MS_HUGE:
-            new_weight = 200000;
-            break;
-    }
-    set_var( "weight", new_weight );
+    // Need to add the weight of the empty container because item::weight uses the "weight" variable directly.
+    set_var( "weight", to_milligram( type->weight + f.get_weight() ) );
     g->remove_zombie( f );
     return 0;
 }
@@ -9355,7 +9360,7 @@ int iuse::ladder( player *p, item *, bool, const tripoint & )
 washing_requirements washing_requirements_for_volume( const units::volume vol )
 {
     int water = divide_round_up( vol, 125_ml );
-    int cleanser = divide_round_up( vol, 1000_ml );
+    int cleanser = divide_round_up( vol, 1_liter );
     int time = to_moves<int>( 10_seconds * ( vol / 250_ml ) );
     return { water, cleanser, time };
 }
diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp
index 446c6cbb392a3..9941a85ef5451 100644
--- a/src/iuse_actor.cpp
+++ b/src/iuse_actor.cpp
@@ -2944,7 +2944,6 @@ bool repair_item_actor::handle_components( player &pl, const item &fix,
         }
     }
 
-    std::vector<item_comp> comps;
     if( valid_entries.empty() ) {
         if( print_msg ) {
             pl.add_msg_if_player( m_info, _( "Your %s is not made of any of:" ),
@@ -2979,8 +2978,16 @@ bool repair_item_actor::handle_components( player &pl, const item &fix,
     }
 
     // Go through all discovered repair items and see if we have any of them available
+    std::vector<item_comp> comps;
     for( const auto &entry : valid_entries ) {
-        const auto component_id = entry.obj().repaired_with();
+        const itype_id &component_id = entry.obj().repaired_with();
+        // Certain (different!) materials are repaired with the same components (steel, iron, hard steel use scrap metal).
+        // This checks avoids adding the same component twice, which is annoying to the user.
+        if( std::find_if( comps.begin(), comps.end(), [&]( const item_comp & ic ) {
+        return ic.type == component_id;
+    } ) != comps.end() ) {
+            continue;
+        }
         if( item::count_by_charges( component_id ) ) {
             if( crafting_inv.has_charges( component_id, items_needed ) ) {
                 comps.emplace_back( component_id, items_needed );
@@ -4578,30 +4585,34 @@ int sew_advanced_actor::use( player &p, item &it, bool, const tripoint & ) const
         bool enab = false;
         std::string prompt;
         if( mod.item_tags.count( obj.flag ) == 0 ) {
+            // @TODO Fix for UTF-8 strings
+            // @TODO find other places where this is used and make a global function for all
+            static const auto tolower = []( std::string t ) {
+                if( !t.empty() ) {
+                    t.front() = std::tolower( t.front() );
+                }
+                return t;
+            };
             // Mod not already present, check if modification is possible
             if( it.charges < thread_needed ) {
                 //~ %1$s: modification desc, %2$d: number of thread needed
                 prompt = string_format( _( "Can't %1$s (need %2$d thread loaded)" ),
-                                        obj.implement_prompt, thread_needed );
-                prompt[6] = std::tolower( prompt[6] );
+                                        tolower( obj.implement_prompt ), thread_needed );
             } else if( !has_enough[obj.item_string] ) {
                 //~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed
-                prompt = string_format( _( "Can't %1$s (need %2$d %3$s)" ), obj.implement_prompt, items_needed,
-                                        item::nname( obj.item_string, items_needed ) );
-                prompt[6] = std::tolower( prompt[6] );
+                prompt = string_format( _( "Can't %1$s (need %2$d %3$s)" ), tolower( obj.implement_prompt ),
+                                        items_needed, item::nname( obj.item_string, items_needed ) );
             } else if( obj.restricted &&
                        std::find( valid_mods.begin(), valid_mods.end(), obj.flag ) == valid_mods.end() ) {
                 //~ %1$s: modification desc, %2$s: mod name
-                prompt = string_format( _( "Can't %1$s (incompatible with %2$s)" ),
-                                        obj.implement_prompt, mod.tname( 1, false ) );
-                prompt[6] = std::tolower( prompt[6] );
+                prompt = string_format( _( "Can't %1$s (incompatible with %2$s)" ), tolower( obj.implement_prompt ),
+                                        mod.tname( 1, false ) );
             } else {
                 // Modification is possible
                 enab = true;
                 //~ %1$s: modification desc, %2$d: number of items needed, %3$s: items needed, %4$s: number of thread needed
-                prompt = string_format( _( "%1$s (%2$d %3$s and %4$d thread)" ), obj.implement_prompt, items_needed,
-                                        item::nname( obj.item_string, items_needed ), thread_needed );
-                prompt[0] = std::toupper( prompt[0] );
+                prompt = string_format( _( "%1$s (%2$d %3$s and %4$d thread)" ), tolower( obj.implement_prompt ),
+                                        items_needed, item::nname( obj.item_string, items_needed ), thread_needed );
             }
 
         } else {
diff --git a/src/iuse_software_sokoban.cpp b/src/iuse_software_sokoban.cpp
index 850e96cc62fa2..9e238dffb7b32 100644
--- a/src/iuse_software_sokoban.cpp
+++ b/src/iuse_software_sokoban.cpp
@@ -242,7 +242,7 @@ int sokoban_game::start_game()
     const int iOffsetY = TERMY > FULL_SCREEN_HEIGHT ? ( TERMY - FULL_SCREEN_HEIGHT ) / 2 : 0;
 
     using namespace std::placeholders;
-    read_from_file( FILENAMES["sokoban"], std::bind( &sokoban_game::parse_level, this, _1 ) );
+    read_from_file( PATH_INFO::sokoban(), std::bind( &sokoban_game::parse_level, this, _1 ) );
 
     const catacurses::window w_sokoban = catacurses::newwin( FULL_SCREEN_HEIGHT, FULL_SCREEN_WIDTH,
                                          point( iOffsetX, iOffsetY ) );
diff --git a/src/live_view.cpp b/src/live_view.cpp
index bfb891376dc4b..5469e8c9149b7 100644
--- a/src/live_view.cpp
+++ b/src/live_view.cpp
@@ -75,3 +75,8 @@ void live_view::show( const tripoint &p )
     enabled = true;
     mouse_position = p;
 }
+
+bool live_view::is_enabled()
+{
+    return enabled;
+}
diff --git a/src/live_view.h b/src/live_view.h
index 540396417bc7f..703075eef7382 100644
--- a/src/live_view.h
+++ b/src/live_view.h
@@ -17,6 +17,7 @@ class live_view
         void init();
         int draw( const catacurses::window &win, int max_height );
         void show( const tripoint &p );
+        bool is_enabled();
         void hide();
 
     private:
diff --git a/src/magic.cpp b/src/magic.cpp
index 336aab79f4bd6..ed5c62ea99b72 100644
--- a/src/magic.cpp
+++ b/src/magic.cpp
@@ -941,29 +941,7 @@ nc_color spell::damage_type_color() const
 
 std::string spell::damage_type_string() const
 {
-    switch( dmg_type() ) {
-        case DT_HEAT:
-            return "heat";
-        case DT_ACID:
-            return "acid";
-        case DT_BASH:
-            return "bashing";
-        case DT_BIOLOGICAL:
-            return "biological";
-        case DT_COLD:
-            return "cold";
-        case DT_CUT:
-            return "cutting";
-        case DT_ELECTRIC:
-            return "electric";
-        case DT_STAB:
-            return "stabbing";
-        case DT_TRUE:
-            // not *really* force damage
-            return "force";
-        default:
-            return "error";
-    }
+    return name_by_dt( dmg_type() );
 }
 
 // constants defined below are just for the formula to be used,
@@ -1585,7 +1563,7 @@ void spellcasting_callback::draw_spell_info( const spell &sp, const uilist *menu
 
     const bool cost_encumb = energy_cost_encumbered( sp, g->u );
     std::string cost_string = cost_encumb ? _( "Casting Cost (impeded)" ) : _( "Casting Cost" );
-    std::string energy_cur = sp.energy_source() == hp_energy ? "" : string_format( " (%s current)",
+    std::string energy_cur = sp.energy_source() == hp_energy ? "" : string_format( _( " (%s current)" ),
                              sp.energy_cur_string( g->u ) );
     if( !sp.can_cast( g->u ) ) {
         cost_string = colorize( _( "Not Enough Energy" ), c_red );
@@ -1606,12 +1584,12 @@ void spellcasting_callback::draw_spell_info( const spell &sp, const uilist *menu
 
     std::string targets;
     if( sp.is_valid_target( target_none ) ) {
-        targets = "self";
+        targets = _( "self" );
     } else {
         targets = sp.enumerate_targets();
     }
     print_colored_text( w_menu, point( h_col1, line++ ), gray, gray,
-                        string_format( "%s: %s", _( "Valid Targets" ), _( targets ) ) );
+                        string_format( "%s: %s", _( "Valid Targets" ), targets ) );
 
     if( line <= win_height * 3 / 4 ) {
         line++;
@@ -1632,15 +1610,15 @@ void spellcasting_callback::draw_spell_info( const spell &sp, const uilist *menu
                                            light_green ) );
         }
         if( sp.aoe() > 0 ) {
-            std::string aoe_string_temp = "Spell Radius";
+            std::string aoe_string_temp = _( "Spell Radius" );
             std::string degree_string;
             if( fx == "cone_attack" ) {
-                aoe_string_temp = "Cone Arc";
-                degree_string = "degrees";
+                aoe_string_temp = _( "Cone Arc" );
+                degree_string = _( "degrees" );
             } else if( fx == "line_attack" ) {
-                aoe_string_temp = "Line Width";
+                aoe_string_temp = _( "Line Width" );
             }
-            aoe_string = string_format( "%s: %d %s", _( aoe_string_temp ), sp.aoe(), degree_string );
+            aoe_string = string_format( "%s: %d %s", aoe_string_temp, sp.aoe(), degree_string );
         }
     } else if( fx == "teleport_random" ) {
         if( sp.aoe() > 0 ) {
diff --git a/src/magic_spell_effect.cpp b/src/magic_spell_effect.cpp
index 7360630a5e71f..1a005498b35b8 100644
--- a/src/magic_spell_effect.cpp
+++ b/src/magic_spell_effect.cpp
@@ -45,6 +45,61 @@
 #include "timed_event.h"
 #include "teleport.h"
 
+namespace spell_detail
+{
+struct line_iterable {
+    const std::vector<point> &delta_line;
+    point cur_origin;
+    point delta;
+    size_t index;
+
+    line_iterable( const point &origin, const point &delta, const std::vector<point> &dline )
+        : delta_line( dline ), cur_origin( origin ), delta( delta ), index( 0 ) {}
+
+    const point get() const {
+        return cur_origin + delta_line[index];
+    }
+    // Move forward along point set, wrap around and move origin forward if necessary
+    void next() {
+        index = ( index + 1 ) % delta_line.size();
+        cur_origin = cur_origin + delta * ( index == 0 );
+    }
+    // Move back along point set, wrap around and move origin backward if necessary
+    void prev() {
+        cur_origin = cur_origin - delta * ( index == 0 );
+        index = ( index + delta_line.size() - 1 ) % delta_line.size();
+    }
+    void reset( const point &origin ) {
+        cur_origin = origin;
+        index = 0;
+    }
+};
+// Orientation of point C relative to line AB
+static int side_of( const point &a, const point &b, const point &c )
+{
+    int cross = ( ( b.x - a.x ) * ( c.y - a.y ) - ( b.y - a.y ) * ( c.x - a.x ) );
+    return ( cross > 0 ) - ( cross < 0 );
+}
+// Tests if point c is between or on lines (a0, a0 + d) and (a1, a1 + d)
+static bool between_or_on( const point &a0, const point &a1, const point &d, const point &c )
+{
+    return side_of( a0, a0 + d, c ) != 1 && side_of( a1, a1 + d, c ) != -1;
+}
+// Builds line until obstructed or outside of region bound by near and far lines. Stores result in set
+static void build_line( spell_detail::line_iterable line, const tripoint &source,
+                        const point &delta, const point &delta_perp, bool ( *test )( const tripoint & ),
+                        std::set<tripoint> &result )
+{
+    while( between_or_on( point_zero, delta, delta_perp, line.get() ) ) {
+        if( !test( source + line.get() ) ) {
+            break;
+        }
+        result.emplace( source + line.get() );
+        line.next();
+    }
+}
+} // namespace spell_detail
+
 void spell_effect::teleport_random( const spell &sp, Creature &caster, const tripoint & )
 {
     bool safe = !sp.has_flag( spell_flag::UNSAFE_TELEPORT );
@@ -142,81 +197,141 @@ std::set<tripoint> spell_effect::spell_effect_cone( const spell &sp, const tripo
     return targets;
 }
 
+static bool test_always_true( const tripoint & )
+{
+    return true;
+}
+static bool test_passable( const tripoint &p )
+{
+    return g->m.passable( p );
+}
+
 std::set<tripoint> spell_effect::spell_effect_line( const spell &, const tripoint &source,
         const tripoint &target, const int aoe_radius, const bool ignore_walls )
 {
-    std::set<tripoint> targets;
-    const int initial_angle = coord_to_angle( source, target );
-    tripoint clockwise_starting_point;
-    calc_ray_end( initial_angle - 90, floor( aoe_radius / 2.0 ), source, clockwise_starting_point );
-    tripoint cclockwise_starting_point;
-    calc_ray_end( initial_angle + 90, ceil( aoe_radius / 2.0 ), source, cclockwise_starting_point );
-    tripoint clockwise_end_point;
-    calc_ray_end( initial_angle - 90, floor( aoe_radius / 2.0 ), target, clockwise_end_point );
-    tripoint cclockwise_end_point;
-    calc_ray_end( initial_angle + 90, ceil( aoe_radius / 2.0 ), target, cclockwise_end_point );
-
-    std::vector<tripoint> start_width = line_to( clockwise_starting_point, cclockwise_starting_point );
-    start_width.insert( start_width.begin(), clockwise_end_point );
-    std::vector<tripoint> end_width = line_to( clockwise_end_point, cclockwise_end_point );
-    end_width.insert( end_width.begin(), clockwise_starting_point );
-
-    std::vector<tripoint> cwise_line = line_to( clockwise_starting_point, cclockwise_starting_point );
-    cwise_line.insert( cwise_line.begin(), clockwise_starting_point );
-    std::vector<tripoint> ccwise_line = line_to( cclockwise_starting_point, cclockwise_end_point );
-    ccwise_line.insert( ccwise_line.begin(), cclockwise_starting_point );
-
-    for( const tripoint &start_line_pt : start_width ) {
-        bool passable = true;
-        for( const tripoint &potential_target : line_to( source, start_line_pt ) ) {
-            passable = g->m.passable( potential_target ) || ignore_walls;
-            if( passable ) {
-                targets.emplace( potential_target );
-            } else {
+    const point delta = ( target - source ).xy();
+    const int dist = square_dist( point_zero, delta );
+    // Early out to prevent unnecessary calculations
+    if( dist == 0 ) {
+        return std::set<tripoint>();
+    }
+    // Clockwise Perpendicular of Delta vector
+    const point delta_perp( -delta.y, delta.x );
+
+    const point abs_delta = abs( delta );
+    // Primary axis of delta vector
+    const point axis_delta = abs_delta.x > abs_delta.y ? point( delta.x, 0 ) : point( 0, delta.y );
+    // Clockwise Perpendicular of axis vector
+    const point cw_perp_axis( -axis_delta.y, axis_delta.x );
+    const point unit_cw_perp_axis( sgn( cw_perp_axis.x ), sgn( cw_perp_axis.y ) );
+    // bias leg length toward cw side if uneven
+    int ccw_len = aoe_radius / 2;
+    int cw_len = aoe_radius - ccw_len;
+
+    if( !trigdist ) {
+        ccw_len = ( ccw_len * ( abs_delta.x + abs_delta.y ) ) / dist;
+        cw_len = ( cw_len * ( abs_delta.x + abs_delta.y ) ) / dist;
+    }
+
+    // is delta aligned with, cw, or ccw of primary axis
+    int delta_side = spell_detail::side_of( point_zero, axis_delta, delta );
+
+    bool ( *test )( const tripoint & ) = ignore_walls ? test_always_true : test_passable;
+
+    // Canonical path from source to target, offset to local space
+    std::vector<point> path_to_target = line_to( point_zero, delta );
+    // Remove endpoint,
+    path_to_target.pop_back();
+    // and insert startpoint. Path is now prepared for wrapped iteration
+    path_to_target.insert( path_to_target.begin(), point_zero );
+
+    spell_detail::line_iterable base_line( point_zero, delta, path_to_target );
+
+    std::set<tripoint> result;
+
+    // Add midline points (source -> target )
+    spell_detail::build_line( base_line, source, delta, delta_perp, test, result );
+
+    // Add cw and ccw legs
+    if( delta_side == 0 ) { // delta is already axis aligned, only need straight lines
+        // cw leg
+        for( const point &p : line_to( point_zero, unit_cw_perp_axis * cw_len ) ) {
+            base_line.reset( p );
+            if( !test( source + p ) ) {
                 break;
             }
+
+            spell_detail::build_line( base_line, source, delta, delta_perp, test, result );
         }
-        if( !passable ) {
-            // leading edge of line attack is very important to the whole
-            // if the leading edge is blocked, none of the attack spawning
-            // from that edge can propogate
-            continue;
+        // ccw leg
+        for( const point &p : line_to( point_zero, unit_cw_perp_axis * -ccw_len ) ) {
+            base_line.reset( p );
+            if( !test( source + p ) ) {
+                break;
+            }
+
+            spell_detail::build_line( base_line, source, delta, delta_perp, test, result );
         }
-        for( const tripoint &end_line_pt : end_width ) {
-            std::vector<tripoint> temp_line = line_to( start_line_pt, end_line_pt );
-            for( const tripoint &potential_target : temp_line ) {
-                if( ignore_walls || g->m.passable( potential_target ) ) {
-                    targets.emplace( potential_target );
-                } else {
-                    break;
-                }
+    } else if( delta_side == 1 ) { // delta is cw of primary axis
+        // ccw leg is behind perp axis
+        for( const point &p : line_to( point_zero, unit_cw_perp_axis * -ccw_len ) ) {
+            base_line.reset( p );
+
+            // forward until in
+            while( spell_detail::side_of( point_zero, delta_perp, base_line.get() ) == 1 ) {
+                base_line.next();
+            }
+            if( !test( source + p ) ) {
+                break;
             }
+            spell_detail::build_line( base_line, source, delta, delta_perp, test, result );
         }
-        for( const tripoint &cwise_line_pt : cwise_line ) {
-            std::vector<tripoint> temp_line = line_to( start_line_pt, cwise_line_pt );
-            for( const tripoint &potential_target : temp_line ) {
-                if( ignore_walls || g->m.passable( potential_target ) ) {
-                    targets.emplace( potential_target );
-                } else {
-                    break;
-                }
+        // cw leg is before perp axis
+        for( const point &p : line_to( point_zero, unit_cw_perp_axis * cw_len ) ) {
+            base_line.reset( p );
+
+            // move back
+            while( spell_detail::side_of( point_zero, delta_perp, base_line.get() ) != 1 ) {
+                base_line.prev();
+            }
+            base_line.next();
+            if( !test( source + p ) ) {
+                break;
             }
+            spell_detail::build_line( base_line, source, delta, delta_perp, test, result );
         }
-        for( const tripoint &ccwise_line_pt : ccwise_line ) {
-            std::vector<tripoint> temp_line = line_to( start_line_pt, ccwise_line_pt );
-            for( const tripoint &potential_target : temp_line ) {
-                if( ignore_walls || g->m.passable( potential_target ) ) {
-                    targets.emplace( potential_target );
-                } else {
-                    break;
-                }
+    } else if( delta_side == -1 ) { // delta is ccw of primary axis
+        // ccw leg is before perp axis
+        for( const point &p : line_to( point_zero, unit_cw_perp_axis * -ccw_len ) ) {
+            base_line.reset( p );
+
+            // move back
+            while( spell_detail::side_of( point_zero, delta_perp, base_line.get() ) != 1 ) {
+                base_line.prev();
             }
+            base_line.next();
+            if( !test( source + p ) ) {
+                break;
+            }
+            spell_detail::build_line( base_line, source, delta, delta_perp, test, result );
         }
-    }
+        // cw leg is behind perp axis
+        for( const point &p : line_to( point_zero, unit_cw_perp_axis * cw_len ) ) {
+            base_line.reset( p );
 
-    targets.erase( source );
+            // forward until in
+            while( spell_detail::side_of( point_zero, delta_perp, base_line.get() ) == 1 ) {
+                base_line.next();
+            }
+            if( !test( source + p ) ) {
+                break;
+            }
+            spell_detail::build_line( base_line, source, delta, delta_perp, test, result );
+        }
+    }
 
-    return targets;
+    result.erase( source );
+    return result;
 }
 
 // spells do not reduce in damage the further away from the epicenter the targets are
@@ -295,6 +410,7 @@ static void damage_targets( const spell &sp, const Creature &caster,
         atk.end_point = target;
         atk.hit_critter = cr;
         atk.proj = bolt;
+        atk.missed_by = 0.0;
         if( !sp.effect_data().empty() ) {
             add_effect_to_target( target, sp );
         }
@@ -812,7 +928,7 @@ void spell_effect::mutate( const spell &sp, Creature &caster, const tripoint &ta
             continue;
         }
         // 10000 represents 100.00% to increase granularity without swapping everything to a float
-        if( sp.damage() >= rng( 0, 10000 ) ) {
+        if( sp.damage() < rng( 1, 10000 ) ) {
             // chance failure! but keep trying for other targets
             continue;
         }
diff --git a/src/magic_teleporter_list.cpp b/src/magic_teleporter_list.cpp
index 3c6b5a7a2d061..bb751ab455f9a 100644
--- a/src/magic_teleporter_list.cpp
+++ b/src/magic_teleporter_list.cpp
@@ -170,7 +170,7 @@ class teleporter_callback : public uilist_callback
             }
             overmap_ui::draw_overmap_chunk( menu->window, g->u, index_pairs[entnum], 1, start_x + 1, 29, 21 );
             mvwprintz( menu->window, point( start_x + 2, 1 ), c_white,
-                       string_format( "Distance: %d (%d, %d)",
+                       string_format( _( "Distance: %d (%d, %d)" ),
                                       rl_dist( ms_to_omt_copy( g->m.getabs( g->u.pos() ) ), index_pairs[entnum] ),
                                       index_pairs[entnum].x, index_pairs[entnum].y ) );
         }
diff --git a/src/magic_ter_furn_transform.h b/src/magic_ter_furn_transform.h
index 643ca7276da81..604b1721308f7 100644
--- a/src/magic_ter_furn_transform.h
+++ b/src/magic_ter_furn_transform.h
@@ -67,7 +67,7 @@ class ter_furn_transform
     public:
 
         ter_furn_transform_id id;
-        bool was_loaded;
+        bool was_loaded = false;
 
         void add_all_messages( const Creature &critter, const tripoint &location ) const;
         void add_all_messages( const map &m, const Creature &critter, const tripoint &location ) const;
diff --git a/src/main.cpp b/src/main.cpp
index 3c534df4fd7f2..21536165ad805 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -167,10 +167,10 @@ int main( int argc, char *argv[] )
 #endif
 
 #if defined(__ANDROID__)
-    PATH_INFO::init_user_dir( external_storage_path.c_str() );
+    PATH_INFO::init_user_dir( external_storage_path );
 #else
 #   if defined(USE_HOME_DIR) || defined(USE_XDG_DIR)
-    PATH_INFO::init_user_dir();
+    PATH_INFO::init_user_dir( "" );
 #   else
     PATH_INFO::init_user_dir( "./" );
 #   endif
@@ -376,8 +376,7 @@ int main( int argc, char *argv[] )
                         {
                             return -1;
                         }
-                        PATH_INFO::update_pathname( "datadir", params[0] );
-                        PATH_INFO::update_datadir();
+                        PATH_INFO::set_datadir( params[0] );
                         return 1;
                     }
                 },
@@ -390,7 +389,7 @@ int main( int argc, char *argv[] )
                         {
                             return -1;
                         }
-                        PATH_INFO::update_pathname( "savedir", params[0] );
+                        PATH_INFO::set_savedir( params[0] );
                         return 1;
                     }
                 },
@@ -403,8 +402,7 @@ int main( int argc, char *argv[] )
                         {
                             return -1;
                         }
-                        PATH_INFO::update_pathname( "config_dir", params[0] );
-                        PATH_INFO::update_config_dir();
+                        PATH_INFO::set_config_dir( params[0] );
                         return 1;
                     }
                 },
@@ -417,7 +415,7 @@ int main( int argc, char *argv[] )
                         {
                             return -1;
                         }
-                        PATH_INFO::update_pathname( "memorialdir", params[0] );
+                        PATH_INFO::set_memorialdir( params[0] );
                         return 1;
                     }
                 },
@@ -430,7 +428,7 @@ int main( int argc, char *argv[] )
                         {
                             return -1;
                         }
-                        PATH_INFO::update_pathname( "options", params[0] );
+                        PATH_INFO::set_options( params[0] );
                         return 1;
                     }
                 },
@@ -443,7 +441,7 @@ int main( int argc, char *argv[] )
                         {
                             return -1;
                         }
-                        PATH_INFO::update_pathname( "keymap", params[0] );
+                        PATH_INFO::set_keymap( params[0] );
                         return 1;
                     }
                 },
@@ -456,7 +454,7 @@ int main( int argc, char *argv[] )
                         {
                             return -1;
                         }
-                        PATH_INFO::update_pathname( "autopickup", params[0] );
+                        PATH_INFO::set_autopickup( params[0] );
                         return 1;
                     }
                 },
@@ -469,7 +467,7 @@ int main( int argc, char *argv[] )
                         {
                             return -1;
                         }
-                        PATH_INFO::update_pathname( "motd", params[0] );
+                        PATH_INFO::set_motd( params[0] );
                         return 1;
                     }
                 },
@@ -539,15 +537,15 @@ int main( int argc, char *argv[] )
         }
     }
 
-    if( !dir_exist( FILENAMES["datadir"] ) ) {
+    if( !dir_exist( PATH_INFO::datadir() ) ) {
         printf( "Fatal: Can't find directory \"%s\"\nPlease ensure the current working directory is correct.  Perhaps you meant to start \"cataclysm-launcher\"?\n",
-                FILENAMES["datadir"].c_str() );
+                PATH_INFO::datadir().c_str() );
         exit( 1 );
     }
 
-    if( !assure_dir_exist( FILENAMES["user_dir"] ) ) {
+    if( !assure_dir_exist( PATH_INFO::user_dir() ) ) {
         printf( "Can't open or create %s. Check permissions.\n",
-                FILENAMES["user_dir"].c_str() );
+                PATH_INFO::user_dir().c_str() );
         exit( 1 );
     }
 
diff --git a/src/main_menu.cpp b/src/main_menu.cpp
index 6ba57a47fff36..18b7f48e33e20 100644
--- a/src/main_menu.cpp
+++ b/src/main_menu.cpp
@@ -258,13 +258,9 @@ void main_menu::init_windows()
 void main_menu::init_strings()
 {
     // ASCII Art
-    mmenu_title = load_file( PATH_INFO::find_translated_file( "titledir",
-                             halloween_theme ? ".halloween" : ".title",
-                             halloween_theme ? "halloween" : "title" ),
-                             _( "Cataclysm: Dark Days Ahead" ) );
+    mmenu_title = load_file( PATH_INFO::title( halloween_theme ), _( "Cataclysm: Dark Days Ahead" ) );
     // MOTD
-    auto motd = load_file( PATH_INFO::find_translated_file( "motddir", ".motd", "motd" ),
-                           _( "No message today." ) );
+    auto motd = load_file( PATH_INFO::motd(), _( "No message today." ) );
 
     std::ostringstream buffer;
     mmenu_motd.clear();
@@ -277,8 +273,7 @@ void main_menu::init_strings()
 
     // Credits
     mmenu_credits.clear();
-    read_from_file_optional( PATH_INFO::find_translated_file( "creditsdir", ".credits",
-    "credits" ), [&buffer]( std::istream & stream ) {
+    read_from_file_optional( PATH_INFO::credits(), [&buffer]( std::istream & stream ) {
         std::string line;
         while( std::getline( stream, line ) ) {
             if( line[0] != '#' ) {
@@ -316,6 +311,7 @@ void main_menu::init_strings()
     vWorldSubItems.push_back( pgettext( "Main Menu|World", "<R|r>eset World" ) );
     vWorldSubItems.push_back( pgettext( "Main Menu|World", "<S|s>how World Mods" ) );
     vWorldSubItems.push_back( pgettext( "Main Menu|World", "<C|c>opy World Settings" ) );
+    vWorldSubItems.push_back( pgettext( "Main Menu|World", "Character to <T|t>emplate" ) );
 
     vWorldHotkeys.clear();
     for( const std::string &item : vWorldSubItems ) {
@@ -336,7 +332,7 @@ void main_menu::init_strings()
 
     loading_ui ui( false );
     g->load_core_data( ui );
-    vdaytip = SNIPPET.random_from_category( "tip" );
+    vdaytip = SNIPPET.random_from_category( "tip" ).value_or( translation() ).translated();
 }
 
 void main_menu::display_text( const std::string &text, const std::string &title, int &selected )
@@ -376,7 +372,7 @@ void main_menu::load_char_templates()
 {
     templates.clear();
 
-    for( std::string path : get_files_from_path( ".template", FILENAMES["templatedir"], false,
+    for( std::string path : get_files_from_path( ".template", PATH_INFO::templatedir(), false,
             true ) ) {
         path = native_to_utf8( path );
         path.erase( path.find( ".template" ), std::string::npos );
@@ -399,27 +395,27 @@ bool main_menu::opening_screen()
     init_strings();
     print_menu( w_open, 0, menu_offset );
 
-    if( !assure_dir_exist( FILENAMES["config_dir"] ) ) {
+    if( !assure_dir_exist( PATH_INFO::config_dir() ) ) {
         popup( _( "Unable to make config directory.  Check permissions." ) );
         return false;
     }
 
-    if( !assure_dir_exist( FILENAMES["savedir"] ) ) {
+    if( !assure_dir_exist( PATH_INFO::savedir() ) ) {
         popup( _( "Unable to make save directory.  Check permissions." ) );
         return false;
     }
 
-    if( !assure_dir_exist( FILENAMES["templatedir"] ) ) {
+    if( !assure_dir_exist( PATH_INFO::templatedir() ) ) {
         popup( _( "Unable to make templates directory.  Check permissions." ) );
         return false;
     }
 
-    if( !assure_dir_exist( FILENAMES["user_sound"] ) ) {
+    if( !assure_dir_exist( PATH_INFO::user_sound() ) ) {
         popup( _( "Unable to make sound directory.  Check permissions." ) );
         return false;
     }
 
-    if( !assure_dir_exist( FILENAMES["user_gfx"] ) ) {
+    if( !assure_dir_exist( PATH_INFO::user_gfx() ) ) {
         popup( _( "Unable to make graphics directory.  Check permissions." ) );
         return false;
     }
@@ -823,7 +819,7 @@ bool main_menu::new_character_tab()
             } else if( !templates.empty() && action == "DELETE_TEMPLATE" ) {
                 if( query_yn( _( "Are you sure you want to delete %s?" ),
                               templates[sel3].c_str() ) ) {
-                    const auto path = FILENAMES["templatedir"] + utf8_to_native( templates[sel3] ) + ".template";
+                    const auto path = PATH_INFO::templatedir() + utf8_to_native( templates[sel3] ) + ".template";
                     if( std::remove( path.c_str() ) != 0 ) {
                         popup( _( "Sorry, something went wrong." ) );
                     } else {
@@ -877,32 +873,43 @@ bool main_menu::new_character_tab()
     return start;
 }
 
-bool main_menu::load_character_tab()
+bool main_menu::load_character_tab( bool transfer )
 {
     bool start = false;
     const auto all_worldnames = world_generator->all_worldnames();
 
-    const size_t last_world_pos = std::find( all_worldnames.begin(), all_worldnames.end(),
-                                  world_generator->last_world_name ) - all_worldnames.begin();
-    if( last_world_pos < all_worldnames.size() ) {
-        sel2 = last_world_pos;
+    if( transfer ) {
+        layer = 3;
+        sel1 = 2;
+        sel2 -= 1;
+        sel3 = 0;
         savegames = world_generator->get_world( all_worldnames[sel2] )->world_saves;
-    }
-    const size_t last_character_pos = std::find_if( savegames.begin(), savegames.end(),
-    []( const save_t &it ) {
-        return it.player_name() == world_generator->last_character_name;
-    } ) - savegames.begin();
-    if( last_character_pos < savegames.size() ) {
-        sel3 = last_character_pos;
     } else {
-        sel3 = 0;
+        const size_t last_world_pos = std::find( all_worldnames.begin(), all_worldnames.end(),
+                                      world_generator->last_world_name ) - all_worldnames.begin();
+        if( last_world_pos < all_worldnames.size() ) {
+            sel2 = last_world_pos;
+            savegames = world_generator->get_world( all_worldnames[sel2] )->world_saves;
+        }
+
+        const size_t last_character_pos = std::find_if( savegames.begin(), savegames.end(),
+        []( const save_t &it ) {
+            return it.player_name() == world_generator->last_character_name;
+        } ) - savegames.begin();
+        if( last_character_pos < savegames.size() ) {
+            sel3 = last_character_pos;
+        } else {
+            sel3 = 0;
+        }
     }
 
+    const int offset_x = transfer ? 25 : 15;
+    const int offset_y = transfer ? -1 : 0;
     while( !start && sel1 == 2 && ( layer == 2 || layer == 3 ) ) {
-        print_menu( w_open, 2, menu_offset );
+        print_menu( w_open, transfer ? 3 : 2, menu_offset );
         if( layer == 2 && sel1 == 2 ) {
             if( all_worldnames.empty() ) {
-                mvwprintz( w_open, menu_offset + point( 15 + extra_w / 2, -2 ),
+                mvwprintz( w_open, menu_offset + point( offset_x + extra_w / 2, -2 ),
                            c_red, "%s", _( "No Worlds found!" ) );
                 on_error();
             } else {
@@ -918,7 +925,7 @@ bool main_menu::load_character_tab()
                         color1 = c_white;
                         color2 = h_white;
                     }
-                    mvwprintz( w_open, point( 15 + menu_offset.x + extra_w / 2, line ),
+                    mvwprintz( w_open, point( offset_x + menu_offset.x + extra_w / 2, line + offset_y ),
                                ( sel2 == i ? color2 : color1 ), "%s (%d)",
                                world_name, savegames_count );
                 }
@@ -960,11 +967,11 @@ bool main_menu::load_character_tab()
                 savegames.erase( new_end, savegames.end() );
             }
 
-            mvwprintz( w_open, menu_offset + point( 15 + extra_w / 2, -2 - sel2 ), h_white,
+            mvwprintz( w_open, menu_offset + point( offset_x + extra_w / 2, -2 - sel2 + offset_y ), h_white,
                        "%s", wn );
 
             if( savegames.empty() ) {
-                mvwprintz( w_open, menu_offset + point( 40 + extra_w / 2, -2 - sel2 ),
+                mvwprintz( w_open, menu_offset + point( 40 + extra_w / 2, -2 - sel2 + offset_y ),
                            c_red, "%s", _( "No save games found!" ) );
                 on_error();
             } else {
@@ -972,7 +979,7 @@ bool main_menu::load_character_tab()
 
                 for( const auto &savename : savegames ) {
                     const bool selected = sel3 + line == menu_offset.y - 2;
-                    mvwprintz( w_open, point( 40 + menu_offset.x + extra_w / 2, line-- ),
+                    mvwprintz( w_open, point( 40 + menu_offset.x + extra_w / 2, line-- + offset_y ),
                                selected ? h_white : c_white,
                                "%s", savename.player_name() );
                 }
@@ -982,7 +989,7 @@ bool main_menu::load_character_tab()
             std::string action = handle_input_timeout( ctxt );
             if( errflag && action != "TIMEOUT" ) {
                 clear_error();
-                layer = 2;
+                layer = transfer ? 1 : 2;
             } else if( action == "DOWN" ) {
                 if( sel3 > 0 ) {
                     sel3--;
@@ -996,7 +1003,7 @@ bool main_menu::load_character_tab()
                     sel3 = 0;
                 }
             } else if( action == "LEFT" || action == "QUIT" ) {
-                layer = 2;
+                layer = transfer ? 1 : 2;
                 sel3 = 0;
                 print_menu( w_open, sel1, menu_offset );
             }
@@ -1004,11 +1011,13 @@ bool main_menu::load_character_tab()
                 if( sel3 >= 0 && sel3 < static_cast<int>( savegames.size() ) ) {
                     werase( w_background );
                     wrefresh( w_background );
+
                     WORLDPTR world = world_generator->get_world( all_worldnames[sel2] );
                     world_generator->last_world_name = world->world_name;
                     world_generator->last_character_name = savegames[sel3].player_name();
                     world_generator->save_last_world_info();
                     world_generator->set_active_world( world );
+
                     try {
                         g->setup();
                     } catch( const std::exception &err ) {
@@ -1023,14 +1032,45 @@ bool main_menu::load_character_tab()
             }
         }
     } // end while
+
+    if( transfer ) {
+        layer = 3;
+        sel1 = 3;
+        sel2++;
+        sel3 = vWorldSubItems.size() - 1;
+    }
+
     return start;
 }
 
 void main_menu::world_tab()
 {
-    while( sel1 == 3 && ( layer == 2 || layer == 3 ) ) {
+    while( sel1 == 3 && ( layer == 2 || layer == 3 || layer == 4 ) ) {
         print_menu( w_open, 3, menu_offset );
-        if( layer == 3 ) { // World Menu
+        if( layer == 4 ) {  //Character to Template
+            if( load_character_tab( true ) ) {
+                points_left points;
+                points.stat_points = 0;
+                points.trait_points = 0;
+                points.skill_points = 0;
+                points.limit = points_left::TRANSFER;
+
+                g->u.setID( character_id(), true );
+                g->u.reset_all_misions();
+                g->u.save_template( g->u.name, points );
+
+                g->u = avatar();
+                MAPBUFFER.reset();
+                overmap_buffer.clear();
+
+                load_char_templates();
+
+                werase( w_background );
+                wrefresh( w_background );
+
+                layer = 3;
+            }
+        } else if( layer == 3 ) { // World Menu
             // Show options for Destroy, Reset worlds.
             // Reset and Destroy ask for world to modify.
             // Reset empties world of everything but options, then makes new world within it.
@@ -1109,6 +1149,9 @@ void main_menu::world_tab()
                     } else if( sel3 == 3 ) { // Copy World settings
                         layer = 2;
                         world_generator->make_new_world( true, all_worldnames[sel2 - 1] );
+                    } else if( sel3 == 4 ) { // Character to Template
+                        layer = 4;
+                        sel4 = 0;
                     }
 
                     if( query_yes ) {
diff --git a/src/main_menu.h b/src/main_menu.h
index f114b27a9db05..7b63c44b78294 100644
--- a/src/main_menu.h
+++ b/src/main_menu.h
@@ -53,7 +53,7 @@ class main_menu
         // Tab functions. They return whether a game was started or not. The ones that can never
         // start a game have a void return type.
         bool new_character_tab();
-        bool load_character_tab();
+        bool load_character_tab( bool transfer = false );
         void world_tab();
 
         /*
@@ -67,6 +67,7 @@ class main_menu
         int sel1 = 1;
         int sel2 = 1;
         int sel3 = 1;
+        int sel4 = 1;
         int layer = 1;
         point LAST_TERM;
         catacurses::window w_open;
diff --git a/src/map.cpp b/src/map.cpp
index b4b3ec88389fd..dd8155bd45d67 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1431,10 +1431,6 @@ ter_id map::ter( const tripoint &p ) const
 uint8_t map::get_known_connections( const tripoint &p, int connect_group,
                                     const std::map<tripoint, ter_id> &override ) const
 {
-    constexpr std::array<point, 4> offsets = {{
-            point_south, point_east, point_west, point_north
-        }
-    };
     auto &ch = access_cache( p.z );
     uint8_t val = 0;
     std::function<bool( const tripoint & )> is_memorized;
@@ -2965,6 +2961,7 @@ void map::collapse_at( const tripoint &p, const bool silent, const bool was_supp
     // If something supporting the roof collapsed, see what else collapses
     if( supports && !still_supports ) {
         for( const tripoint &t : points_in_radius( p, 1 ) ) {
+            // If z-levels are off, tz == t, so we end up skipping a lot of stuff to avoid bugs.
             const tripoint &tz = tripoint( t.xy(), t.z + 1 );
             // if nothing above us had the chance of collapsing, move on
             if( !one_in( collapse_check( tz ) ) ) {
@@ -2972,7 +2969,7 @@ void map::collapse_at( const tripoint &p, const bool silent, const bool was_supp
             }
             // if a wall collapses, walls without support from below risk collapsing and
             //propogate the collapse upwards
-            if( wall && p == t && has_flag( "WALL", tz ) ) {
+            if( zlevels && wall && p == t && has_flag( "WALL", tz ) ) {
                 collapse_at( tz, silent );
             }
             // floors without support from below risk collapsing into open air and can propogate
@@ -2982,8 +2979,10 @@ void map::collapse_at( const tripoint &p, const bool silent, const bool was_supp
             }
             // this tile used to support a roof, now it doesn't, which means there is only
             // open air above us
-            ter_set( tz, t_open_air );
-            furn_set( tz, f_null );
+            if( zlevels ) {
+                ter_set( tz, t_open_air );
+                furn_set( tz, f_null );
+            }
         }
     }
     // it would be great to check if collapsing ceilings smashed through the floor, but
diff --git a/src/map.h b/src/map.h
index a8788221e19b6..3faea041fbeae 100644
--- a/src/map.h
+++ b/src/map.h
@@ -1336,8 +1336,12 @@ class map
         }
 
         // Not protected/private for mapgen_functions.cpp access
-        void rotate( int turns ); // Rotates the current map 90*turns degrees clockwise
+        // Rotates the current map 90*turns degrees clockwise
         // Useful for houses, shops, etc
+        // @param turns number of 90 clockwise turns to make
+        // @param setpos_safe if true, being used outside of mapgen and can use setpos to
+        // set NPC positions.  if false, cannot use setpos
+        void rotate( int turns, bool setpos_safe = false );
 
         // Monster spawning:
     public:
diff --git a/src/map_extras.cpp b/src/map_extras.cpp
index 6060100f7f58f..44e14a14cca6c 100644
--- a/src/map_extras.cpp
+++ b/src/map_extras.cpp
@@ -1932,14 +1932,14 @@ static void burned_ground_parser( map &m, const tripoint &loc )
     for( wrapped_vehicle vehicle : vehs ) {
         vehicles.push_back( vehicle.v );
         std::set<tripoint> occupied = vehicle.v->get_points();
-        for( tripoint t : occupied ) {
+        for( const tripoint &t : occupied ) {
             points.push_back( t );
         }
     }
     for( vehicle *vrem : vehicles ) {
         m.destroy_vehicle( vrem );
     }
-    for( tripoint tri : points ) {
+    for( const tripoint &tri : points ) {
         m.furn_set( tri, f_wreckage );
     }
 
@@ -2065,14 +2065,14 @@ static void mx_burned_ground( map &m, const tripoint &abs_sub )
     for( wrapped_vehicle vehicle : vehs ) {
         vehicles.push_back( vehicle.v );
         std::set<tripoint> occupied = vehicle.v->get_points();
-        for( tripoint t : occupied ) {
+        for( const tripoint &t : occupied ) {
             points.push_back( t );
         }
     }
     for( vehicle *vrem : vehicles ) {
         m.destroy_vehicle( vrem );
     }
-    for( tripoint tri : points ) {
+    for( const tripoint &tri : points ) {
         m.furn_set( tri, f_wreckage );
     }
 }
diff --git a/src/map_field.cpp b/src/map_field.cpp
index a942ca7a5d129..a559e9bb487ac 100644
--- a/src/map_field.cpp
+++ b/src/map_field.cpp
@@ -72,7 +72,6 @@ const efftype_id effect_onfire( "onfire" );
 const efftype_id effect_poison( "poison" );
 const efftype_id effect_relax_gas( "relax_gas" );
 const efftype_id effect_sap( "sap" );
-const efftype_id effect_smoke( "smoke" );
 const efftype_id effect_stung( "stung" );
 const efftype_id effect_stunned( "stunned" );
 const efftype_id effect_teargas( "teargas" );
@@ -1238,9 +1237,8 @@ bool map::process_fields_in_submap( submap *const current_submap,
 
                             std::vector<point> candidate_positions =
                                 squares_in_direction( p.xy(), point( g->u.posx(), g->u.posy() ) );
-                            for( point &candidate_position : candidate_positions ) {
-                                field &target_field =
-                                    get_field( tripoint( candidate_position, p.z ) );
+                            for( const point &candidate_position : candidate_positions ) {
+                                field &target_field = get_field( tripoint( candidate_position, p.z ) );
                                 // Only shift if there are no bees already there.
                                 // TODO: Figure out a way to merge bee fields without allowing
                                 // Them to effectively move several times in a turn depending
@@ -1415,12 +1413,8 @@ void map::player_in_field( player &u )
             }
         }
         if( ft == fd_sap ) {
-            // Sap causes the player to get sap disease, slowing them down.
             // Sap does nothing to cars.
             if( !u.in_vehicle ) {
-                u.add_msg_player_or_npc( m_bad, _( "The sap sticks to you!" ),
-                                         _( "The sap sticks to <npcname>!" ) );
-                u.add_effect( effect_sap, cur.get_field_intensity() * 2_turns );
                 // Use up sap.
                 cur.set_field_intensity( cur.get_field_intensity() - 1 );
             }
@@ -1524,11 +1518,6 @@ void map::player_in_field( player &u )
                 u.add_env_effect( effect_blind, bp_eyes, cur.get_field_intensity() * 2, 10_seconds );
             }
         }
-        if( ft == fd_relax_gas ) {
-            if( ( cur.get_field_intensity() > 1 || !one_in( 3 ) ) && ( !inside || one_in( 3 ) ) ) {
-                u.add_env_effect( effect_relax_gas, bp_mouth, cur.get_field_intensity() * 2, 3_turns );
-            }
-        }
         if( ft == fd_fungal_haze ) {
             if( !u.has_trait( trait_id( "M_IMMUNE" ) ) && ( !inside || one_in( 4 ) ) ) {
                 u.add_env_effect( effect_fungus, bp_mouth, 4, 10_minutes, num_bp, true );
@@ -1542,25 +1531,6 @@ void map::player_in_field( player &u )
                 u.add_env_effect( effect_blind, bp_eyes, 2, 2_turns );
             }
         }
-        if( ft == fd_toxic_gas ) {
-            // Toxic gas at low levels poisons you.
-            // Toxic gas at high levels will cause very nasty poison.
-            {
-                bool inhaled = false;
-                if( ( cur.get_field_intensity() == 2 && !inside ) ||
-                    ( cur.get_field_intensity() == 3 && inside ) ) {
-                    inhaled = u.add_env_effect( effect_poison, bp_mouth, 5, 3_minutes );
-                } else if( cur.get_field_intensity() == 3 && !inside ) {
-                    inhaled = u.add_env_effect( effect_badpoison, bp_mouth, 5, 3_minutes );
-                } else if( cur.get_field_intensity() == 1 && !inside ) {
-                    inhaled = u.add_env_effect( effect_poison, bp_mouth, 2, 2_minutes );
-                }
-                if( inhaled ) {
-                    // Player does not know how the npc feels, so no message.
-                    u.add_msg_if_player( m_bad, _( "You feel sick from inhaling the %s" ), cur.name() );
-                }
-            }
-        }
 
         if( cur.extra_radiation_min() > 0 ) {
             // Get irradiated by the nuclear fallout.
@@ -1719,10 +1689,25 @@ void map::player_in_field( player &u )
 
 void map::creature_in_field( Creature &critter )
 {
+    bool in_vehicle = false;
+    bool inside_vehicle = false;
+    player *u = critter.as_player();
     if( critter.is_monster() ) {
         monster_in_field( *static_cast<monster *>( &critter ) );
-    } else if( player *p = critter.as_player() ) {
-        player_in_field( *p );
+    } else {
+        if( u ) {
+            in_vehicle = u->in_vehicle;
+            // If we are in a vehicle figure out if we are inside (reduces effects usually)
+            // and what part of the vehicle we need to deal with.
+            if( in_vehicle ) {
+                if( const optional_vpart_position vp = veh_at( u->pos() ) ) {
+                    if( vp->is_inside() ) {
+                        inside_vehicle = true;
+                    }
+                }
+            }
+            player_in_field( *u );
+        }
     }
 
     field &curfield = get_field( critter.pos() );
@@ -1732,25 +1717,42 @@ void map::creature_in_field( Creature &critter )
             continue;
         }
         const field_type_id cur_field_id = cur_field_entry.get_field_type();
-        const effect field_fx = cur_field_entry.field_effect();
-        if( field_fx.is_null() ||
-            critter.is_immune_field( cur_field_id ) || field_fx.get_id().is_empty() ||
-            critter.is_immune_effect( field_fx.get_id() ) ) {
-            continue;
-        }
-        player *u = critter.as_player();
-        if( u && cur_field_entry.inside_immune() ) {
-            // If we are in a vehicle figure out if we are inside (reduces effects usually)
-            // and what part of the vehicle we need to deal with.
-            if( u->in_vehicle ) {
-                if( const optional_vpart_position vp = veh_at( u->pos() ) ) {
-                    if( vp->is_inside() ) {
-                        continue;
-                    }
-                }
+
+        for( const auto &fe : cur_field_entry.field_effects() ) {
+            if( in_vehicle && fe.immune_in_vehicle ) {
+                continue;
+            }
+            if( inside_vehicle && fe.immune_inside_vehicle ) {
+                continue;
+            }
+            if( !inside_vehicle && fe.immune_outside_vehicle ) {
+                continue;
+            }
+            if( in_vehicle && !one_in( fe.chance_in_vehicle ) ) {
+                continue;
+            }
+            if( inside_vehicle && !one_in( fe.chance_inside_vehicle ) ) {
+                continue;
+            }
+            if( !inside_vehicle && !one_in( fe.chance_outside_vehicle ) ) {
+                continue;
+            }
+
+            const effect field_fx = fe.get_effect();
+            if( critter.is_immune_field( cur_field_id ) || critter.is_immune_effect( field_fx.get_id() ) ) {
+                continue;
+            }
+            bool effect_added = false;
+            if( fe.is_environmental ) {
+                effect_added = critter.add_env_effect( fe.id, fe.bp, fe.intensity, fe.get_duration() );
+            } else {
+                effect_added = true;
+                critter.add_effect( field_fx );
+            }
+            if( effect_added ) {
+                critter.add_msg_player_or_npc( fe.env_message_type, fe.get_message(), fe.get_message_npc() );
             }
         }
-        critter.add_effect( field_fx );
     }
 }
 
diff --git a/src/mapbuffer.cpp b/src/mapbuffer.cpp
index cc40e39d9f27f..6c32db50189be 100644
--- a/src/mapbuffer.cpp
+++ b/src/mapbuffer.cpp
@@ -21,6 +21,18 @@
 
 #define dbg(x) DebugLog((x),D_MAP) << __FILE__ << ":" << __LINE__ << ": "
 
+static std::string find_quad_path( const std::string &dirname, const tripoint &om_addr )
+{
+    return string_format( "%s/%d.%d.%d.map", dirname, om_addr.x, om_addr.y, om_addr.z );
+}
+
+static std::string find_dirname( const tripoint &om_addr )
+{
+    const tripoint segment_addr = omt_to_seg_copy( om_addr );
+    return string_format( "%s/maps/%d.%d.%d", g->get_world_base_save_path(), segment_addr.x,
+                          segment_addr.y, segment_addr.z );
+}
+
 mapbuffer MAPBUFFER;
 
 mapbuffer::mapbuffer() = default;
@@ -103,8 +115,7 @@ submap *mapbuffer::lookup_submap( const tripoint &p )
 
 void mapbuffer::save( bool delete_after_save )
 {
-    const std::string map_directory = g->get_world_base_save_path() + "/maps";
-    assure_dir_exist( map_directory );
+    assure_dir_exist( g->get_world_base_save_path() + "/maps" );
 
     int num_saved_submaps = 0;
     int num_total_submaps = submaps.size();
@@ -137,11 +148,8 @@ void mapbuffer::save( bool delete_after_save )
         // A segment is a chunk of 32x32 submap quads.
         // We're breaking them into subdirectories so there aren't too many files per directory.
         // Might want to make a set for this one too so it's only checked once per save().
-        tripoint segment_addr = omt_to_seg_copy( om_addr );
-        const std::string dirname = string_format( "%s/%d.%d.%d", map_directory, segment_addr.x,
-                                    segment_addr.y, segment_addr.z );
-        const std::string quad_path = string_format( "%s/%d.%d.%d.map", dirname, om_addr.x, om_addr.y,
-                                      om_addr.z );
+        const std::string dirname = find_dirname( om_addr );
+        const std::string quad_path = find_quad_path( dirname, om_addr );
 
         // delete_on_save deletes everything, otherwise delete submaps
         // outside the current map.
@@ -240,11 +248,20 @@ submap *mapbuffer::unserialize_submaps( const tripoint &p )
 {
     // Map the tripoint to the submap quad that stores it.
     const tripoint om_addr = sm_to_omt_copy( p );
-    const tripoint segment_addr = omt_to_seg_copy( om_addr );
-    const std::string dirname = string_format( "%s/maps/%d.%d.%d", g->get_world_base_save_path(),
-                                segment_addr.x, segment_addr.y, segment_addr.z );
-    const std::string quad_path = string_format( "%s/%d.%d.%d.map", dirname, om_addr.x, om_addr.y,
-                                  om_addr.z );
+    const std::string dirname = find_dirname( om_addr );
+    std::string quad_path = find_quad_path( dirname, om_addr );
+
+    if( !file_exist( quad_path ) ) {
+        // Fix for old saves where the path was generated using std::stringstream, which
+        // did format the number using the current locale. That formatting may insert
+        // thousands separators, so the resulting path is "map/1,234.7.8.map" instead
+        // of "map/1234.7.8.map".
+        std::ostringstream buffer;
+        buffer << dirname << "/" << om_addr.x << "." << om_addr.y << "." << om_addr.z << ".map";
+        if( file_exist( buffer.str() ) ) {
+            quad_path = buffer.str();
+        }
+    }
 
     using namespace std::placeholders;
     if( !read_from_file_optional_json( quad_path, std::bind( &mapbuffer::deserialize, this, _1 ) ) ) {
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index e49359e4f7302..264fb933708e9 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -834,7 +834,7 @@ class jmapgen_sign : public jmapgen_piece
 
             if( !snippet.empty() ) {
                 // select a snippet from the category
-                signtext = SNIPPET.get( SNIPPET.assign( snippet ) );
+                signtext = SNIPPET.random_from_category( snippet ).value_or( translation() ).translated();
             } else if( !signage.empty() ) {
                 signtext = signage;
             }
@@ -886,7 +886,7 @@ class jmapgen_graffiti : public jmapgen_piece
 
             if( !snippet.empty() ) {
                 // select a snippet from the category
-                graffiti = SNIPPET.get( SNIPPET.assign( snippet ) );
+                graffiti = SNIPPET.random_from_category( snippet ).value_or( translation() ).translated();
             } else if( !text.empty() ) {
                 graffiti = text;
             }
@@ -2599,6 +2599,8 @@ void mapgen_function_json::generate( mapgendata &md )
 
     objects.apply( md, point_zero );
 
+    resolve_regional_terrain_and_furniture( md );
+
     m->rotate( rotation.get() );
 
     if( md.terrain_type()->is_rotatable() ) {
@@ -2620,6 +2622,8 @@ void mapgen_function_json_nested::nest( mapgendata &dat, const point &offset ) c
     }
 
     objects.apply( dat, offset );
+
+    resolve_regional_terrain_and_furniture( dat );
 }
 
 /*
@@ -6263,6 +6267,8 @@ void map::draw_connections( mapgendata &dat )
             }
         }
     }
+
+    resolve_regional_terrain_and_furniture( dat );
 }
 
 void map::place_spawns( const mongroup_id &group, const int chance,
@@ -6684,7 +6690,7 @@ computer *map::add_computer( const tripoint &p, const std::string &name, int sec
  * degrees.
  * @param turns How many 90-degree turns to rotate the map.
  */
-void map::rotate( int turns )
+void map::rotate( int turns, const bool setpos_safe )
 {
 
     //Handle anything outside the 1-3 range gracefully; rotate(0) is a no-op.
@@ -6704,6 +6710,8 @@ void map::rotate( int turns )
     for( const std::shared_ptr<npc> &i : npcs ) {
         npc &np = *i;
         const tripoint sq = np.global_square_location();
+        const point local_sq = getlocal( sq ).xy();
+
         real_coords np_rc;
         np_rc.fromabs( sq.x, sq.y );
         // Note: We are rotating the entire overmap square (2x2 of submaps)
@@ -6714,7 +6722,6 @@ void map::rotate( int turns )
         // OK, this is ugly: we remove the NPC from the whole map
         // Then we place it back from scratch
         // It could be rewritten to utilize the fact that rotation shouldn't cross overmaps
-        auto npc_ptr = overmap_buffer.remove_npc( np.getID() );
 
         int old_x = np_rc.sub_pos.x;
         int old_y = np_rc.sub_pos.y;
@@ -6725,10 +6732,21 @@ void map::rotate( int turns )
             old_y += SEEY;
         }
 
-        const auto new_pos = point{ old_x, old_y } .rotate( turns, { SEEX * 2, SEEY * 2 } );
-
-        np.spawn_at_precise( { abs_sub.xy() }, { new_pos, abs_sub.z } );
-        overmap_buffer.insert_npc( npc_ptr );
+        const point new_pos = point{ old_x, old_y } .rotate( turns, { SEEX * 2, SEEY * 2 } );
+        if( setpos_safe ) {
+            // setpos can't be used during mapgen, but spawn_at_precise clips position
+            // to be between 0-11,0-11 and teleports NPCs when used inside of update_mapgen
+            // calls
+            const tripoint new_global_sq = sq - local_sq + new_pos;
+            np.setpos( g->m.getlocal( new_global_sq ) );
+        } else {
+            // OK, this is ugly: we remove the NPC from the whole map
+            // Then we place it back from scratch
+            // It could be rewritten to utilize the fact that rotation shouldn't cross overmaps
+            std::shared_ptr<npc> npc_ptr = overmap_buffer.remove_npc( np.getID() );
+            np.spawn_at_precise( { abs_sub.xy() }, { new_pos, abs_sub.z } );
+            overmap_buffer.insert_npc( npc_ptr );
+        }
     }
 
     clear_vehicle_cache( abs_sub.z );
@@ -7702,15 +7720,14 @@ bool update_mapgen_function_json::update_map( const tripoint &omt_pos, const poi
     tinymap update_tmap;
     const tripoint sm_pos = omt_to_sm_copy( omt_pos );
     update_tmap.load( sm_pos, false );
-    const std::string map_id = overmap_buffer.ter( omt_pos ).id().c_str();
 
     mapgendata md( omt_pos, update_tmap, 0.0f, calendar::start_of_cataclysm, miss );
 
     // If the existing map is rotated, we need to rotate it back to the north
     // orientation before applying our updates.
-    int rotation = oter_get_rotation( overmap_buffer.ter( omt_pos ) );
+    const int rotation = oter_get_rotation( overmap_buffer.ter( omt_pos ) );
     if( rotation > 0 ) {
-        md.m.rotate( rotation );
+        md.m.rotate( rotation, true );
     }
 
     const bool applied = update_map( md, offset, verify );
@@ -7718,7 +7735,7 @@ bool update_mapgen_function_json::update_map( const tripoint &omt_pos, const poi
     // If we rotated the map before applying updates, we now need to rotate
     // it back to where we found it.
     if( rotation ) {
-        md.m.rotate( 4 - rotation );
+        md.m.rotate( 4 - rotation, true );
     }
 
     if( applied ) {
@@ -7743,6 +7760,8 @@ bool update_mapgen_function_json::update_map( mapgendata &md, const point &offse
     }
     objects.apply( md, offset );
 
+    resolve_regional_terrain_and_furniture( md );
+
     return true;
 }
 
diff --git a/src/mapgen_functions.cpp b/src/mapgen_functions.cpp
index 44a95877bf011..18643be30e0f1 100644
--- a/src/mapgen_functions.cpp
+++ b/src/mapgen_functions.cpp
@@ -46,9 +46,6 @@ const mtype_id mon_ant_queen( "mon_ant_queen" );
 const mtype_id mon_bat( "mon_bat" );
 const mtype_id mon_bee( "mon_bee" );
 const mtype_id mon_beekeeper( "mon_beekeeper" );
-const mtype_id mon_fungaloid_queen( "mon_fungaloid_queen" );
-const mtype_id mon_fungaloid_seeder( "mon_fungaloid_seeder" );
-const mtype_id mon_fungaloid_tower( "mon_fungaloid_tower" );
 const mtype_id mon_rat_king( "mon_rat_king" );
 const mtype_id mon_sewer_rat( "mon_sewer_rat" );
 const mtype_id mon_spider_widow_giant( "mon_spider_widow_giant" );
@@ -102,9 +99,6 @@ building_gen_pointer get_mapgen_cfunction( const std::string &ident )
             { "forest_trail_four_way",    &mapgen_forest_trail_four_way },
             { "hive",             &mapgen_hive },
             { "spider_pit",       &mapgen_spider_pit },
-            { "fungal_bloom",     &mapgen_fungal_bloom },
-            { "fungal_tower",     &mapgen_fungal_tower },
-            { "fungal_flowers",   &mapgen_fungal_flowers },
             { "road_straight",    &mapgen_road },
             { "road_curved",      &mapgen_road },
             { "road_end",         &mapgen_road },
@@ -513,85 +507,6 @@ void mapgen_spider_pit( mapgendata &dat )
     }
 }
 
-void mapgen_fungal_bloom( mapgendata &dat )
-{
-    map *const m = &dat.m;
-    for( int i = 0; i < SEEX * 2; i++ ) {
-        for( int j = 0; j < SEEY * 2; j++ ) {
-            if( one_in( rl_dist( point( i, j ), point( 12, 12 ) ) * 4 ) ) {
-                m->ter_set( point( i, j ), t_marloss );
-            } else if( one_in( 10 ) ) {
-                if( one_in( 3 ) ) {
-                    m->ter_set( point( i, j ), t_tree_fungal );
-                } else {
-                    m->ter_set( point( i, j ), t_tree_fungal_young );
-                }
-
-            } else if( one_in( 5 ) ) {
-                m->ter_set( point( i, j ), t_shrub_fungal );
-            } else if( one_in( 10 ) ) {
-                m->ter_set( point( i, j ), t_fungus_mound );
-            } else {
-                m->ter_set( point( i, j ), t_fungus );
-            }
-        }
-    }
-    square( m, t_fungus, SEEX - 2, SEEY - 2, SEEX + 2, SEEY + 2 );
-    m->add_spawn( mon_fungaloid_queen, 1, point( 12, 12 ) );
-}
-
-void mapgen_fungal_tower( mapgendata &dat )
-{
-    map *const m = &dat.m;
-    for( int i = 0; i < SEEX * 2; i++ ) {
-        for( int j = 0; j < SEEY * 2; j++ ) {
-            if( one_in( 8 ) ) {
-                if( one_in( 3 ) ) {
-                    m->ter_set( point( i, j ), t_tree_fungal );
-                } else {
-                    m->ter_set( point( i, j ), t_tree_fungal_young );
-                }
-
-            } else if( one_in( 10 ) ) {
-                m->ter_set( point( i, j ), t_fungus_mound );
-            } else {
-                m->ter_set( point( i, j ), t_fungus );
-            }
-        }
-    }
-    square( m, t_fungus, SEEX - 2, SEEY - 2, SEEX + 2, SEEY + 2 );
-    m->add_spawn( mon_fungaloid_tower, 1, point( 12, 12 ) );
-}
-
-void mapgen_fungal_flowers( mapgendata &dat )
-{
-    map *const m = &dat.m;
-    for( int i = 0; i < SEEX * 2; i++ ) {
-        for( int j = 0; j < SEEY * 2; j++ ) {
-            if( one_in( rl_dist( point( i, j ), point( 12, 12 ) ) * 6 ) ) {
-                m->ter_set( point( i, j ), t_fungus );
-                m->furn_set( point( i, j ), f_flower_marloss );
-            } else if( one_in( 10 ) ) {
-                if( one_in( 3 ) ) {
-                    m->ter_set( point( i, j ), t_fungus_mound );
-                } else {
-                    m->ter_set( point( i, j ), t_tree_fungal_young );
-                }
-
-            } else if( one_in( 5 ) ) {
-                m->ter_set( point( i, j ), t_fungus );
-                m->furn_set( point( i, j ), f_flower_fungal );
-            } else if( one_in( 10 ) ) {
-                m->ter_set( point( i, j ), t_shrub_fungal );
-            } else {
-                m->ter_set( point( i, j ), t_fungus );
-            }
-        }
-    }
-    square( m, t_fungus, SEEX - 2, SEEY - 2, SEEX + 2, SEEY + 2 );
-    m->add_spawn( mon_fungaloid_seeder, 1, point( 12, 12 ) );
-}
-
 int terrain_type_to_nesw_array( oter_id terrain_type, bool array[4] )
 {
     // count and mark which directions the road goes
@@ -4608,3 +4523,19 @@ void place_stairs( mapgendata &dat )
         }
     }
 }
+
+void resolve_regional_terrain_and_furniture( const mapgendata &dat )
+{
+    for( const tripoint &p : dat.m.points_on_zlevel() ) {
+        const ter_id tid_before = dat.m.ter( p );
+        const ter_id tid_after = dat.region.region_terrain_and_furniture.resolve( tid_before );
+        if( tid_after != tid_before ) {
+            dat.m.ter_set( p, tid_after );
+        }
+        const furn_id fid_before = dat.m.furn( p );
+        const furn_id fid_after = dat.region.region_terrain_and_furniture.resolve( fid_before );
+        if( fid_after != fid_before ) {
+            dat.m.furn_set( p, fid_after );
+        }
+    }
+}
diff --git a/src/mapgen_functions.h b/src/mapgen_functions.h
index d9fbc04c930d2..264e7184c5f16 100644
--- a/src/mapgen_functions.h
+++ b/src/mapgen_functions.h
@@ -99,4 +99,7 @@ bool run_mapgen_update_func( const std::string &update_mapgen_id, const tripoint
 bool run_mapgen_func( const std::string &mapgen_id, mapgendata &dat );
 std::pair<std::map<ter_id, int>, std::map<furn_id, int>> get_changed_ids_from_update(
             const std::string &update_mapgen_id );
+
+void resolve_regional_terrain_and_furniture( const mapgendata &dat );
+
 #endif
diff --git a/src/martialarts.cpp b/src/martialarts.cpp
index 4cca111b04414..1e73b4050ee27 100644
--- a/src/martialarts.cpp
+++ b/src/martialarts.cpp
@@ -1091,7 +1091,7 @@ float Character::mabuff_attack_cost_mult() const
     return ret;
 }
 
-bool player::is_throw_immune() const
+bool Character::is_throw_immune() const
 {
     return search_ma_buff_effect( *effects, []( const ma_buff & b, const effect & ) {
         return b.is_throw_immune();
diff --git a/src/melee.cpp b/src/melee.cpp
index f7acf0084b54c..77d5ec2cc83c7 100644
--- a/src/melee.cpp
+++ b/src/melee.cpp
@@ -322,18 +322,18 @@ float player::hit_roll() const
     return melee::melee_hit_range( hit );
 }
 
-void player::add_miss_reason( const std::string &reason, const unsigned int weight )
+void Character::add_miss_reason( const std::string &reason, const unsigned int weight )
 {
     melee_miss_reasons.add( reason, weight );
 
 }
 
-void player::clear_miss_reasons()
+void Character::clear_miss_reasons()
 {
     melee_miss_reasons.clear();
 }
 
-std::string player::get_miss_reason()
+std::string Character::get_miss_reason()
 {
     // everything that lowers accuracy in player::hit_roll()
     // adding it in hit_roll() might not be safe if it's called multiple times
diff --git a/src/mod_manager.cpp b/src/mod_manager.cpp
index 29f17913d7712..430e21ca31bca 100644
--- a/src/mod_manager.cpp
+++ b/src/mod_manager.cpp
@@ -105,7 +105,7 @@ void mod_manager::load_replacement_mods( const std::string &path )
 
 mod_manager::mod_manager()
 {
-    load_replacement_mods( FILENAMES["mods-replacements"] );
+    load_replacement_mods( PATH_INFO::mods_replacements() );
     refresh_mod_list();
     set_usable_mods();
 }
@@ -139,14 +139,14 @@ void mod_manager::refresh_mod_list()
     clear();
 
     std::map<mod_id, std::vector<mod_id>> mod_dependency_map;
-    load_mods_from( FILENAMES["moddir"] );
-    load_mods_from( FILENAMES["user_moddir"] );
+    load_mods_from( PATH_INFO::moddir() );
+    load_mods_from( PATH_INFO::user_moddir() );
 
-    if( file_exist( FILENAMES["mods-dev-default"] ) ) {
-        load_mod_info( FILENAMES["mods-dev-default"] );
+    if( file_exist( PATH_INFO::mods_dev_default() ) ) {
+        load_mod_info( PATH_INFO::mods_dev_default() );
     }
-    if( file_exist( FILENAMES["mods-user-default"] ) ) {
-        load_mod_info( FILENAMES["mods-user-default"] );
+    if( file_exist( PATH_INFO::mods_user_default() ) ) {
+        load_mod_info( PATH_INFO::mods_user_default() );
     }
 
     if( set_default_mods( mod_id( "user:default" ) ) ) {
@@ -270,7 +270,7 @@ void mod_manager::load_modfile( JsonObject &jo, const std::string &path )
 bool mod_manager::set_default_mods( const t_mod_list &mods )
 {
     default_mods = mods;
-    return write_to_file( FILENAMES["mods-user-default"], [&]( std::ostream & fout ) {
+    return write_to_file( PATH_INFO::mods_user_default(), [&]( std::ostream & fout ) {
         JsonOut json( fout, true ); // pretty-print
         json.start_object();
         json.member( "type", "MOD_INFO" );
diff --git a/src/monattack.cpp b/src/monattack.cpp
index 1bf0b47f5aeb8..2f382ca1e805c 100644
--- a/src/monattack.cpp
+++ b/src/monattack.cpp
@@ -706,7 +706,8 @@ bool mattack::shockstorm( monster *z )
 bool mattack::shocking_reveal( monster *z )
 {
     shockstorm( z );
-    std::string WHAT_A_SCOOP = SNIPPET.random_from_category( "clickbait" );
+    const translation WHAT_A_SCOOP = SNIPPET.random_from_category( "clickbait" ).value_or(
+                                         translation() );
     sounds::sound( z->pos(), 10, sounds::sound_t::alert,
                    string_format( _( "the %s obnoxiously yelling \"%s!!!\"" ),
                                   z->name(), WHAT_A_SCOOP ) );
@@ -2762,7 +2763,7 @@ bool mattack::stare( monster *z )
         //dimensional effects don't take against dimensionally anchored foes.
         if( g->u.worn_with_flag( "DIMENSIONAL_ANCHOR" ) ||
             g->u.has_effect_with_flag( "DIMENSIONAL_ANCHOR" ) ) {
-            add_msg( m_warning, _( "You feel a strange reverberation accross your body." ), z->name() );
+            add_msg( m_warning, _( "You feel a strange reverberation accross your body." ) );
             return true;
         }
         if( g->u.sees( *z ) ) {
diff --git a/src/monexamine.cpp b/src/monexamine.cpp
index f264fdbdbaff3..3a1db0ae8352e 100644
--- a/src/monexamine.cpp
+++ b/src/monexamine.cpp
@@ -419,9 +419,7 @@ void monexamine::swap( monster &z )
             z.remove_effect( effect_tied );
         }
 
-        tripoint zp = z.pos();
-        z.move_to( g->u.pos(), true );
-        g->u.setpos( zp );
+        g->swap_critters( g->u, z );
 
         if( t ) {
             z.add_effect( effect_tied, 1_turns, num_bp, true );
diff --git a/src/monmove.cpp b/src/monmove.cpp
index 22de0ed8cea10..7387879f897c7 100644
--- a/src/monmove.cpp
+++ b/src/monmove.cpp
@@ -99,10 +99,28 @@ bool monster::is_immune_field( const field_type_id fid ) const
     return Creature::is_immune_field( fid );
 }
 
+static bool z_is_valid( int z )
+{
+    return z >= -OVERMAP_DEPTH && z <= OVERMAP_HEIGHT;
+}
+
 bool monster::can_move_to( const tripoint &p ) const
 {
     const bool can_climb = has_flag( MF_CLIMBS ) || has_flag( MF_FLIES );
 
+    if( p.z > pos().z && z_is_valid( pos().z ) ) {
+        if( !g->m.has_flag( TFLAG_GOES_UP, pos() ) && !g->m.has_flag( TFLAG_NO_FLOOR, p ) ) {
+            // can't go through the roof
+            return false;
+        }
+    } else if( p.z < pos().z && z_is_valid( pos().z ) ) {
+        if( !g->m.has_flag( TFLAG_GOES_DOWN, pos() ) ) {
+            // can't go through the floor
+            // you would fall anyway if there was no floor, so no need to check for that here
+            return false;
+        }
+    }
+
     if( g->m.impassable( p ) ) {
         if( digging() ) {
             if( !g->m.has_flag( "BURROWABLE", p ) ) {
@@ -1183,7 +1201,7 @@ static std::vector<tripoint> get_bashing_zone( const tripoint &bashee, const tri
     tripoint previous = bashee;
     for( const tripoint &p : path ) {
         std::vector<point> swath = squares_in_direction( previous.xy(), p.xy() );
-        for( point q : swath ) {
+        for( const point &q : swath ) {
             zone.push_back( tripoint( q, bashee.z ) );
         }
 
@@ -1344,16 +1362,45 @@ bool monster::attack_at( const tripoint &p )
     return false;
 }
 
+static tripoint find_closest_stair( const tripoint &near_this, const ter_bitflags stair_type )
+{
+    for( const tripoint &candidate : closest_tripoints_first( 10, near_this ) ) {
+        if( g->m.has_flag( stair_type, candidate ) ) {
+            return candidate;
+        }
+    }
+    // we didn't find it
+    return near_this;
+}
+
 bool monster::move_to( const tripoint &p, bool force, const float stagger_adjustment )
 {
     const bool digs = digging();
     const bool flies = has_flag( MF_FLIES );
     const bool on_ground = !digs && !flies;
     const bool climbs = has_flag( MF_CLIMBS ) && g->m.has_flag( TFLAG_NO_FLOOR, p );
+
+    const bool z_move = p.z != pos().z;
+    const bool going_up = p.z > pos().z;
+
+    tripoint destination = p;
+
+    // This is stair teleportation hackery.
+    // @TODO: Remove this in favor of stair alignment
+    if( going_up ) {
+        if( g->m.has_flag( TFLAG_GOES_UP, pos() ) ) {
+            destination = find_closest_stair( p, TFLAG_GOES_DOWN );
+        }
+    } else if( z_move ) {
+        if( g->m.has_flag( TFLAG_GOES_DOWN, pos() ) ) {
+            destination = find_closest_stair( p, TFLAG_GOES_UP );
+        }
+    }
+
     // Allows climbing monsters to move on terrain with movecost <= 0
-    Creature *critter = g->critter_at( p, is_hallucination() );
-    if( g->m.has_flag( "CLIMBABLE", p ) ) {
-        if( g->m.impassable( p ) && critter == nullptr ) {
+    Creature *critter = g->critter_at( destination, is_hallucination() );
+    if( g->m.has_flag( "CLIMBABLE", destination ) ) {
+        if( g->m.impassable( destination ) && critter == nullptr ) {
             if( flies ) {
                 moves -= 100;
                 force = true;
@@ -1379,7 +1426,7 @@ bool monster::move_to( const tripoint &p, bool force, const float stagger_adjust
     }
 
     // Make sure that we can move there, unless force is true.
-    if( !force && !can_move_to( p ) ) {
+    if( !force && !can_move_to( destination ) ) {
         return false;
     }
 
@@ -1389,7 +1436,8 @@ bool monster::move_to( const tripoint &p, bool force, const float stagger_adjust
         // and the same regardless of the distance measurement mode.
         // Note: Keep this as float here or else it will cancel valid moves
         const float cost = stagger_adjustment *
-                           static_cast<float>( climbs ? calc_climb_cost( pos(), p ) : calc_movecost( pos(), p ) );
+                           static_cast<float>( climbs ? calc_climb_cost( pos(), destination ) : calc_movecost( pos(),
+                                               destination ) );
         if( cost > 0.0f ) {
             moves -= static_cast<int>( ceil( cost ) );
         } else {
@@ -1399,10 +1447,10 @@ bool monster::move_to( const tripoint &p, bool force, const float stagger_adjust
 
     //Check for moving into/out of water
     bool was_water = g->m.is_divable( pos() );
-    bool will_be_water = on_ground && can_submerge() && g->m.is_divable( p );
+    bool will_be_water = on_ground && can_submerge() && g->m.is_divable( destination );
 
     //Birds and other flying creatures flying over the deep water terrain
-    if( was_water && flies && g->u.sees( p ) ) {
+    if( was_water && flies && g->u.sees( destination ) ) {
         if( one_in( 4 ) ) {
             add_msg( m_warning, _( "A %1$s flies over the %2$s!" ), name(),
                      g->m.tername( pos() ) );
@@ -1414,16 +1462,16 @@ bool monster::move_to( const tripoint &p, bool force, const float stagger_adjust
         add_msg( m_warning, pgettext( "monster movement", "A %1$s %2$s from the %3$s!" ), name(),
                  has_flag( MF_SWIMS ) || has_flag( MF_AQUATIC ) ? _( "leaps" ) : _( "emerges" ),
                  g->m.tername( pos() ) );
-    } else if( !was_water && will_be_water && g->u.sees( p ) ) {
+    } else if( !was_water && will_be_water && g->u.sees( destination ) ) {
         //~ Message when a monster enters water
         //~ %1$s: monster name, %2$s: dives/sinks, %3$s: terrain name
         add_msg( m_warning, pgettext( "monster movement", "A %1$s %2$s into the %3$s!" ), name(),
                  has_flag( MF_SWIMS ) || has_flag( MF_AQUATIC ) ? _( "dives" ) : _( "sinks" ),
-                 g->m.tername( p ) );
+                 g->m.tername( destination ) );
     }
 
-    setpos( p );
-    footsteps( p );
+    setpos( destination );
+    footsteps( destination );
     underwater = will_be_water;
     if( is_hallucination() ) {
         //Hallucinations don't do any of the stuff after this point
@@ -1441,13 +1489,13 @@ bool monster::move_to( const tripoint &p, bool force, const float stagger_adjust
         }
     }
 
-    if( g->m.has_flag( "UNSTABLE", p ) && on_ground ) {
+    if( g->m.has_flag( "UNSTABLE", destination ) && on_ground ) {
         add_effect( effect_bouldering, 1_turns, num_bp, true );
     } else if( has_effect( effect_bouldering ) ) {
         remove_effect( effect_bouldering );
     }
 
-    if( g->m.has_flag_ter_or_furn( TFLAG_NO_SIGHT, p ) && on_ground ) {
+    if( g->m.has_flag_ter_or_furn( TFLAG_NO_SIGHT, destination ) && on_ground ) {
         add_effect( effect_no_sight, 1_turns, num_bp, true );
     } else if( has_effect( effect_no_sight ) ) {
         remove_effect( effect_no_sight );
diff --git a/src/monster.cpp b/src/monster.cpp
index 97f0672051fd7..653a337f1d29e 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -169,12 +169,12 @@ static const trait_id trait_FLOWERS( "FLOWERS" );
 static const trait_id trait_PACIFIST( "PACIFIST" );
 static const trait_id trait_KILLER( "KILLER" );
 
-static const std::map<m_size, std::string> size_names {
-    {m_size::MS_TINY, translate_marker( "tiny" )},
-    {m_size::MS_SMALL, translate_marker( "small" )},
-    {m_size::MS_MEDIUM, translate_marker( "medium" )},
-    {m_size::MS_LARGE, translate_marker( "large" )},
-    {m_size::MS_HUGE, translate_marker( "huge" )},
+static const std::map<m_size, translation> size_names {
+    { m_size::MS_TINY, to_translation( "size adj", "tiny" ) },
+    { m_size::MS_SMALL, to_translation( "size adj", "small" ) },
+    { m_size::MS_MEDIUM, to_translation( "size adj", "medium" ) },
+    { m_size::MS_LARGE, to_translation( "size adj", "large" ) },
+    { m_size::MS_HUGE, to_translation( "size adj", "huge" ) },
 };
 
 static const std::map<monster_attitude, std::pair<std::string, color_id>> attitude_names {
@@ -674,7 +674,7 @@ std::string monster::extended_description() const
     ss << "--" << std::endl;
 
     ss << string_format( _( "It is %s in size." ),
-                         _( size_names.at( get_size() ) ) ) << std::endl;
+                         size_names.at( get_size() ) ) << std::endl;
 
     std::vector<std::string> types;
     if( type->has_flag( MF_ANIMAL ) ) {
@@ -2109,8 +2109,8 @@ void monster::die( Creature *nkiller )
         g->events().send<event_type::character_kills_monster>( ch->getID(), type->id );
         if( ch->is_player() && ch->has_trait( trait_KILLER ) ) {
             if( one_in( 4 ) ) {
-                std::string snip = SNIPPET.random_from_category( "killer_on_kill" );
-                ch->add_msg_if_player( m_good, _( snip ) );
+                const translation snip = SNIPPET.random_from_category( "killer_on_kill" ).value_or( translation() );
+                ch->add_msg_if_player( m_good, "%s", snip );
             }
             ch->add_morale( MORALE_KILLER_HAS_KILLED, 5, 10, 6_hours, 4_hours );
             ch->rem_morale( MORALE_KILLER_NEED_TO_KILL );
diff --git a/src/mutation.cpp b/src/mutation.cpp
index 07108c56cb6da..6108ab4c9f6a0 100644
--- a/src/mutation.cpp
+++ b/src/mutation.cpp
@@ -415,10 +415,10 @@ bool Character::can_install_cbm_on_bp( const std::vector<body_part> &bps ) const
     return can_install;
 }
 
-void player::activate_mutation( const trait_id &mut )
+void Character::activate_mutation( const trait_id &mut )
 {
     const mutation_branch &mdata = mut.obj();
-    auto &tdata = my_mutations[mut];
+    trait_data &tdata = my_mutations[mut];
     int cost = mdata.cost;
     // Preserve the fake weapon used to initiate ranged mutation firing
     static item mut_ranged( weapon );
@@ -568,7 +568,7 @@ void player::activate_mutation( const trait_id &mut )
     }
 }
 
-void player::deactivate_mutation( const trait_id &mut )
+void Character::deactivate_mutation( const trait_id &mut )
 {
     my_mutations[mut].powered = false;
 
diff --git a/src/mutation.h b/src/mutation.h
index b30fc8b7d4e6e..dbe64394d21a8 100644
--- a/src/mutation.h
+++ b/src/mutation.h
@@ -205,7 +205,7 @@ struct mutation_branch {
         float mana_multiplier;
         float mana_regen_multiplier;
         // spells learned and their associated level when gaining the mutation
-        std::map<spell_id, float> spells_learned;
+        std::map<spell_id, int> spells_learned;
     private:
         std::string raw_spawn_item_message;
     public:
diff --git a/src/mutation_data.cpp b/src/mutation_data.cpp
index 58b7fc8f84e81..e615551c8c4ba 100644
--- a/src/mutation_data.cpp
+++ b/src/mutation_data.cpp
@@ -18,6 +18,7 @@
 
 using TraitGroupMap = std::map<trait_group::Trait_group_tag, std::shared_ptr<Trait_group>>;
 using TraitSet = std::set<trait_id>;
+using trait_reader = auto_flags_reader<trait_id>;
 
 TraitSet trait_blacklist;
 TraitGroupMap trait_groups;
@@ -380,14 +381,14 @@ void mutation_branch::load( JsonObject &jo, const std::string & )
     /* Not currently supported due to inability to save active mutation state
     load_mutation_mods(jsobj, "active_mods", new_mut.mods); */
 
-    optional( jo, was_loaded, "prereqs", prereqs );
-    optional( jo, was_loaded, "prereqs2", prereqs2 );
-    optional( jo, was_loaded, "threshreq", threshreq );
-    optional( jo, was_loaded, "cancels", cancels );
-    optional( jo, was_loaded, "changes_to", replacements );
-    optional( jo, was_loaded, "leads_to", additions );
-    optional( jo, was_loaded, "flags", flags );
-    optional( jo, was_loaded, "types", types );
+    optional( jo, was_loaded, "prereqs", prereqs, trait_reader{} );
+    optional( jo, was_loaded, "prereqs2", prereqs2, trait_reader{} );
+    optional( jo, was_loaded, "threshreq", threshreq, trait_reader{} );
+    optional( jo, was_loaded, "cancels", cancels, trait_reader{} );
+    optional( jo, was_loaded, "changes_to", replacements, trait_reader{} );
+    optional( jo, was_loaded, "leads_to", additions, trait_reader{} );
+    optional( jo, was_loaded, "flags", flags, string_reader{} );
+    optional( jo, was_loaded, "types", types, string_reader{} );
 
     JsonArray jsar = jo.get_array( "no_cbm_on_bp" );
     while( jsar.has_more() ) {
@@ -395,14 +396,9 @@ void mutation_branch::load( JsonObject &jo, const std::string & )
         no_cbm_on_bp.emplace( get_body_part_token( s ) );
     }
 
-    auto jsarr = jo.get_array( "category" );
-    while( jsarr.has_more() ) {
-        std::string s = jsarr.next_string();
-        category.push_back( s );
-        mutations_category[s].push_back( trait_id( id ) );
-    }
+    optional( jo, was_loaded, "category", category, string_reader{} );
 
-    jsarr = jo.get_array( "spells_learned" );
+    JsonArray jsarr = jo.get_array( "spells_learned" );
     while( jsarr.has_more() ) {
         JsonArray ja = jsarr.next_array();
         const spell_id sp( ja.next_string() );
@@ -615,6 +611,11 @@ bool mutation_branch::trait_is_blacklisted( const trait_id &tid )
 
 void mutation_branch::finalize()
 {
+    for( const mutation_branch &branch : get_all() ) {
+        for( const std::string &cat : branch.category ) {
+            mutations_category[cat].push_back( trait_id( branch.id ) );
+        }
+    }
     finalize_trait_blacklist();
 }
 
diff --git a/src/newcharacter.cpp b/src/newcharacter.cpp
index b69aed3322bb2..a2a4330076d73 100644
--- a/src/newcharacter.cpp
+++ b/src/newcharacter.cpp
@@ -53,8 +53,6 @@
 #include "pimpl.h"
 #include "type_id.h"
 
-struct points_left;
-
 // Colors used in this file: (Most else defaults to c_light_gray)
 #define COL_STAT_ACT        c_white   // Selected stat
 #define COL_STAT_BONUS      c_light_green // Bonus
@@ -87,90 +85,6 @@ struct points_left;
 
 static int skill_increment_cost( const Character &u, const skill_id &skill );
 
-struct points_left {
-    int stat_points;
-    int trait_points;
-    int skill_points;
-
-    enum point_limit : int {
-        FREEFORM = 0,
-        ONE_POOL,
-        MULTI_POOL
-    } limit;
-
-    points_left() {
-        limit = MULTI_POOL;
-        init_from_options();
-    }
-
-    void init_from_options() {
-        stat_points = get_option<int>( "INITIAL_STAT_POINTS" );
-        trait_points = get_option<int>( "INITIAL_TRAIT_POINTS" );
-        skill_points = get_option<int>( "INITIAL_SKILL_POINTS" );
-    }
-
-    // Highest amount of points to spend on stats without points going invalid
-    int stat_points_left() const {
-        switch( limit ) {
-            case FREEFORM:
-            case ONE_POOL:
-                return stat_points + trait_points + skill_points;
-            case MULTI_POOL:
-                return std::min( trait_points_left(),
-                                 stat_points + std::min( 0, trait_points + skill_points ) );
-        }
-
-        return 0;
-    }
-
-    int trait_points_left() const {
-        switch( limit ) {
-            case FREEFORM:
-            case ONE_POOL:
-                return stat_points + trait_points + skill_points;
-            case MULTI_POOL:
-                return stat_points + trait_points + std::min( 0, skill_points );
-        }
-
-        return 0;
-    }
-
-    int skill_points_left() const {
-        return stat_points + trait_points + skill_points;
-    }
-
-    bool is_freeform() {
-        return limit == FREEFORM;
-    }
-
-    bool is_valid() {
-        return is_freeform() ||
-               ( stat_points_left() >= 0 && trait_points_left() >= 0 &&
-                 skill_points_left() >= 0 );
-    }
-
-    bool has_spare() {
-        return !is_freeform() && is_valid() && skill_points_left() > 0;
-    }
-
-    std::string to_string() {
-        if( limit == MULTI_POOL ) {
-            return string_format(
-                       _( "Points left: <color_%s>%d</color>%c<color_%s>%d</color>%c<color_%s>%d</color>=<color_%s>%d</color>" ),
-                       stat_points_left() >= 0 ? "light_gray" : "red", stat_points,
-                       trait_points >= 0 ? '+' : '-',
-                       trait_points_left() >= 0 ? "light_gray" : "red", abs( trait_points ),
-                       skill_points >= 0 ? '+' : '-',
-                       skill_points_left() >= 0 ? "light_gray" : "red", abs( skill_points ),
-                       is_valid() ? "light_gray" : "red", stat_points + trait_points + skill_points );
-        } else if( limit == ONE_POOL ) {
-            return string_format( _( "Points left: %4d" ), skill_points_left() );
-        } else {
-            return _( "Freeform" );
-        }
-    }
-};
-
 enum struct tab_direction {
     NONE,
     FORWARD,
@@ -190,7 +104,6 @@ tab_direction set_description( const catacurses::window &w, avatar &you, bool al
                                points_left &points );
 
 static cata::optional<std::string> query_for_template_name();
-static void save_template( const avatar &u, const std::string &name, const points_left &points );
 void reset_scenario( avatar &u, const scenario *scen );
 
 void Character::pick_name( bool bUseDefault )
@@ -465,7 +378,10 @@ bool avatar::create( character_type type, const std::string &tempname )
             }
             // We want to prevent recipes known by the template from being applied to the
             // new character. The recipe list will be rebuilt when entering the game.
-            learned_recipes->clear();
+            // Except if it is a character transfer template
+            if( points.limit != points_left::TRANSFER ) {
+                learned_recipes->clear();
+            }
             tab = NEWCHAR_TAB_MAX;
             break;
     }
@@ -491,6 +407,11 @@ bool avatar::create( character_type type, const std::string &tempname )
         }
         werase( w );
         wrefresh( w );
+
+        if( points.limit == points_left::TRANSFER ) {
+            tab = 6;
+        }
+
         switch( tab ) {
             case 0:
                 result = set_points( w, *this, points );
@@ -543,7 +464,11 @@ bool avatar::create( character_type type, const std::string &tempname )
         return false;
     }
 
-    save_template( *this, _( "Last Character" ), points );
+    if( points.limit == points_left::TRANSFER ) {
+        return true;
+    }
+
+    save_template( _( "Last Character" ), points );
 
     recalc_hp();
     for( int i = 0; i < num_hp_parts; i++ ) {
@@ -1690,10 +1615,22 @@ tab_direction set_skills( const catacurses::window &w, avatar &u, points_left &p
         // Clear the bottom of the screen.
         werase( w_description );
         mvwprintz( w, point( 31, 3 ), c_light_gray, std::string( getmaxx( w ) - 32, ' ' ) );
+
+        // Write the hint as to upgrade costs
         const int cost = skill_increment_cost( u, currentSkill->ident() );
-        mvwprintz( w, point( 31, 3 ), points.skill_points_left() >= cost ? COL_SKILL_USED : c_light_red,
-                   ngettext( "Upgrading %s costs %d point", "Upgrading %s costs %d points", cost ),
-                   currentSkill->name(), cost );
+        const int level = u.get_skill_level( currentSkill->ident() );
+        const int upgrade_levels = level == 0 ? 2 : 1;
+        // We have two different strings to pluralize, so we have to use two
+        // translation calls.
+        const std::string upgrade_levels_s = string_format(
+                //~ levels here are skill levels at character creation time
+                ngettext( "%d level", "%d levels", upgrade_levels ), upgrade_levels );
+        const nc_color color = points.skill_points_left() >= cost ? COL_SKILL_USED : c_light_red;
+        mvwprintz( w, point( 31, 3 ), color,
+                   //~ Second string is e.g. "1 level" or "2 levels"
+                   ngettext( "Upgrading %s by %s costs %d point",
+                             "Upgrading %s by %s costs %d points", cost ),
+                   currentSkill->name(), upgrade_levels_s, cost );
 
         // We want recipes from profession skills displayed, but without boosting the skills
         // Copy the skills, and boost the copy
@@ -2275,7 +2212,8 @@ tab_direction set_description( const catacurses::window &w, avatar &you, const b
             wrefresh( w_stats );
 
             mvwprintz( w_traits, point_zero, COL_HEADER, _( "Traits: " ) );
-            std::vector<trait_id> current_traits = you.get_base_traits();
+            std::vector<trait_id> current_traits = points.limit == points_left::TRANSFER ? you.get_mutations() :
+                                                   you.get_base_traits();
             if( current_traits.empty() ) {
                 wprintz( w_traits, c_light_red, _( "None!" ) );
             } else {
@@ -2300,13 +2238,16 @@ tab_direction set_description( const catacurses::window &w, avatar &you, const b
             profession::StartingSkillList list_skills = you.prof->skills();
             for( auto &elem : skillslist ) {
                 int level = you.get_skill_level( elem->ident() );
-                profession::StartingSkillList::iterator i = list_skills.begin();
-                while( i != list_skills.end() ) {
-                    if( i->first == ( elem )->ident() ) {
-                        level += i->second;
-                        break;
+
+                if( points.limit != points_left::TRANSFER ) {
+                    profession::StartingSkillList::iterator i = list_skills.begin();
+                    while( i != list_skills.end() ) {
+                        if( i->first == ( elem )->ident() ) {
+                            level += i->second;
+                            break;
+                        }
+                        ++i;
                     }
-                    ++i;
                 }
 
                 if( level > 0 ) {
@@ -2434,7 +2375,7 @@ tab_direction set_description( const catacurses::window &w, avatar &you, const b
             return tab_direction::NONE;
         } else if( action == "SAVE_TEMPLATE" ) {
             if( const auto name = query_for_template_name() ) {
-                ::save_template( you, *name, points );
+                you.save_template( *name, points );
             }
             // redraw after saving template
             draw_character_tabs( w, _( "DESCRIPTION" ) );
@@ -2607,7 +2548,7 @@ cata::optional<std::string> query_for_template_name()
     }
 }
 
-void save_template( const avatar &u, const std::string &name, const points_left &points )
+void avatar::save_template( const std::string &name, const points_left &points )
 {
     std::string native = utf8_to_native( name );
 #if defined(_WIN32)
@@ -2622,7 +2563,7 @@ void save_template( const avatar &u, const std::string &name, const points_left
     }
 #endif
 
-    write_to_file( FILENAMES["templatedir"] + native + ".template", [&]( std::ostream & fout ) {
+    write_to_file( PATH_INFO::templatedir() + native + ".template", [&]( std::ostream & fout ) {
         JsonOut jsout( fout, true );
 
         jsout.start_array();
@@ -2632,10 +2573,10 @@ void save_template( const avatar &u, const std::string &name, const points_left
         jsout.member( "trait_points", points.trait_points );
         jsout.member( "skill_points", points.skill_points );
         jsout.member( "limit", points.limit );
-        jsout.member( "start_location", u.start_location );
+        jsout.member( "start_location", start_location );
         jsout.end_object();
 
-        u.serialize( jsout );
+        serialize( jsout );
 
         jsout.end_array();
     }, _( "player template" ) );
@@ -2643,7 +2584,7 @@ void save_template( const avatar &u, const std::string &name, const points_left
 
 bool avatar::load_template( const std::string &template_name, points_left &points )
 {
-    return read_from_file_json( FILENAMES["templatedir"] + utf8_to_native( template_name ) +
+    return read_from_file_json( PATH_INFO::templatedir() + utf8_to_native( template_name ) +
     ".template", [&]( JsonIn & jsin ) {
 
         if( jsin.test_array() ) {
diff --git a/src/npc.cpp b/src/npc.cpp
index 705c063679753..9ddb71f0b255a 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -1192,6 +1192,15 @@ bool npc::wield( item &it )
     return true;
 }
 
+void npc::drop( const std::list<std::pair<int, int>> &what, const tripoint &target,
+                bool stash )
+{
+    Character::drop( what, target, stash );
+    // TODO: Remove the hack. Its here because npcs didn't process activities, but they do now
+    // so is this necessary?
+    activity.do_turn( *this );
+}
+
 void npc::form_opinion( const player &u )
 {
     // FEAR
@@ -1455,7 +1464,15 @@ void npc::decide_needs()
         elem = 20;
     }
     if( weapon.is_gun() ) {
-        needrank[need_ammo] = 5 * get_ammo( ammotype( *weapon.type->gun->ammo.begin() ) ).size();
+        int ups_drain = weapon.get_gun_ups_drain();
+        if( ups_drain > 0 ) {
+            int ups_charges = charges_of( "UPS_off", ups_drain ) +
+                              charges_of( "UPS_off", ups_drain );
+            needrank[need_ammo] = static_cast<double>( ups_charges ) / ups_drain;
+        } else {
+            needrank[need_ammo] = get_ammo( ammotype( *weapon.type->gun->ammo.begin() ) ).size();
+        }
+        needrank[need_ammo] *= 5;
     }
     if( !base_location ) {
         needrank[need_safety] = 1;
@@ -2832,6 +2849,28 @@ void npc::process_turn()
     // TODO: Make NPCs leave the player if there's a path out of map and player is sleeping/unseen/etc.
 }
 
+bool npc::invoke_item( item *used, const tripoint &pt )
+{
+    const auto &use_methods = used->type->use_methods;
+
+    if( use_methods.empty() ) {
+        return false;
+    } else if( use_methods.size() == 1 ) {
+        return Character::invoke_item( used, use_methods.begin()->first, pt );
+    }
+    return false;
+}
+
+bool npc::invoke_item( item *used, const std::string &method )
+{
+    return Character::invoke_item( used, method );
+}
+
+bool npc::invoke_item( item *used )
+{
+    return Character::invoke_item( used );
+}
+
 std::array<std::pair<std::string, overmap_location_str_id>, npc_need::num_needs> npc::need_data = {
     {
         { "need_none", overmap_location_str_id( "source_of_anything" ) },
diff --git a/src/npc.h b/src/npc.h
index ebf8efa69e713..0cece0d87750b 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -60,7 +60,7 @@ using mission_type_id = string_id<mission_type>;
 using mfaction_id = int_id<monfaction>;
 using overmap_location_str_id = string_id<overmap_location>;
 
-void parse_tags( std::string &phrase, const player &u, const player &me,
+void parse_tags( std::string &phrase, const Character &u, const Character &me,
                  const itype_id &item_type = "null" );
 
 /*
@@ -509,9 +509,9 @@ struct healing_options {
 
 // Data relevant only for this action
 struct npc_short_term_cache {
-    float danger;
-    float total_danger;
-    float danger_assessment;
+    float danger = 0;
+    float total_danger = 0;
+    float danger_assessment = 0;
     // Use weak_ptr to avoid circular references between Creatures
     std::weak_ptr<Creature> target;
     // target is hostile, ally is for aiding actions
@@ -525,7 +525,7 @@ struct npc_short_term_cache {
     int stuck = 0;
     // Position to return to guarding
     cata::optional<tripoint> guard_pos;
-    double my_weapon_value;
+    double my_weapon_value = 0;
 
     // Use weak_ptr to avoid circular references between Creatures
     std::vector<std::weak_ptr<Creature>> friends;
@@ -912,6 +912,8 @@ class npc : public player
         void do_npc_read();
         void stow_item( item &it );
         bool wield( item &it ) override;
+        void drop( const std::list<std::pair<int, int>> &what, const tripoint &target,
+                   bool stash ) override;
         bool adjust_worn();
         bool has_healing_item( healing_options try_to_fix );
         healing_options has_healing_options();
@@ -1028,6 +1030,11 @@ class npc : public player
         void execute_action( npc_action action ); // Performs action
         void process_turn() override;
 
+        using Character::invoke_item;
+        bool invoke_item( item *, const tripoint &pt ) override;
+        bool invoke_item( item *used, const std::string &method ) override;
+        bool invoke_item( item * ) override;
+
         /** rates how dangerous a target is from 0 (harmless) to 1 (max danger) */
         float evaluate_enemy( const Creature &target ) const;
 
diff --git a/src/npcmove.cpp b/src/npcmove.cpp
index c8d7e9cfd43c3..f816a89c4c454 100644
--- a/src/npcmove.cpp
+++ b/src/npcmove.cpp
@@ -152,7 +152,6 @@ namespace
 {
 const std::vector<bionic_id> power_cbms = { {
         bio_advreactor,
-        bio_ethanol,
         bio_furnace,
         bio_reactor,
     }
@@ -1646,17 +1645,13 @@ bool npc::wants_to_recharge_cbm()
     const float allowed_ratio = static_cast<int>( rules.cbm_recharge ) / 100.0f;
     const units::energy max_pow_allowed = get_max_power_level() * allowed_ratio;
 
-    bool no_fueled_cbm = true;
-    for( const bionic_id bid : get_fueled_bionics() ) {
-        no_fueled_cbm = false;
-        if( get_fuel_available( bid ).empty() ) {
-            return true;
-        } else if( curr_power < max_pow_allowed && !use_bionic_by_id( bid ) ) {
-            return true;
+    if( curr_power < max_pow_allowed ) {
+        for( const bionic_id &bid : get_fueled_bionics() ) {
+            if( !has_active_bionic( bid ) ) {
+                return true;
+            }
         }
-    }
-    if( no_fueled_cbm ) {
-        return curr_power < max_pow_allowed;
+        return get_fueled_bionics().empty(); //NPC might have power CBM that doesn't use the json fuel_opts entry
     }
     return false;
 }
@@ -1695,6 +1690,10 @@ bool npc::recharge_cbm()
     }
 
     for( bionic_id &bid : get_fueled_bionics() ) {
+        if( has_active_bionic( bid ) ) {
+            continue;
+        }
+
         if( !get_fuel_available( bid ).empty() ) {
             use_bionic_by_id( bid );
             return true;
@@ -1711,8 +1710,15 @@ bool npc::recharge_cbm()
                 return true;
             } else {
                 const std::vector<itype_id> fuel_op = bid->fuel_opts;
+                const bool need_alcohol = std::find( fuel_op.begin(), fuel_op.end(),
+                                                     "chem_ethanol" ) != fuel_op.end() ||
+                                          std::find( fuel_op.begin(), fuel_op.end(), "chem_methanol" ) != fuel_op.end() ||
+                                          std::find( fuel_op.begin(), fuel_op.end(), "denat_alcohol" ) != fuel_op.end();
+
                 if( std::find( fuel_op.begin(), fuel_op.end(), "battery" ) != fuel_op.end() ) {
                     complain_about( "need_batteries", 3_hours, "<need_batteries>", false );
+                } else if( need_alcohol ) {
+                    complain_about( "need_booze", 3_hours, "<need_booze>", false );
                 } else {
                     complain_about( "need_fuel", 3_hours, "<need_fuel>", false );
                 }
@@ -1732,18 +1738,6 @@ bool npc::recharge_cbm()
         }
     }
 
-    if( use_bionic_by_id( bio_ethanol ) ) {
-        const std::function<bool( const item & )> ethanol_filter = []( const item & it ) {
-            return it.type->can_use( "WEAK_ALCOHOL" ) || it.type->can_use( "ALCOHOL" ) ||
-                   it.type->can_use( "STRONG_ALOCHOL" );
-        };
-        if( consume_cbm_items( ethanol_filter ) ) {
-            return true;
-        } else {
-            complain_about( "need_booze", 3_hours, "<need_booze>", false );
-        }
-    }
-
     if( use_bionic_by_id( bio_reactor ) || use_bionic_by_id( bio_advreactor ) ) {
         const std::function<bool( const item & )> reactor_filter = []( const item & it ) {
             return it.is_ammo() && ( it.ammo_type() == plutonium ||
diff --git a/src/npctalk.cpp b/src/npctalk.cpp
index 632992726bb74..59197d2e6f89c 100644
--- a/src/npctalk.cpp
+++ b/src/npctalk.cpp
@@ -1505,7 +1505,8 @@ int topic_category( const talk_topic &the_topic )
     return -1; // Not grouped with other topics
 }
 
-void parse_tags( std::string &phrase, const player &u, const player &me, const itype_id &item_type )
+void parse_tags( std::string &phrase, const Character &u, const Character &me,
+                 const itype_id &item_type )
 {
     phrase = SNIPPET.expand( remove_color_tags( phrase ) );
 
diff --git a/src/npctrade.cpp b/src/npctrade.cpp
index 8ac220c17ff1c..cbc641fce9e70 100644
--- a/src/npctrade.cpp
+++ b/src/npctrade.cpp
@@ -399,10 +399,10 @@ int trading_window::get_var_trade( const item &it, int total_count )
     int how_many = total_count;
     const bool contained = it.is_container() && !it.contents.empty();
 
-    const std::string title = string_format( _( "Trade how many %s [MAX: %d]: " ), contained ?
-                              "containers with " + it.get_contained().type_name( how_many ) :
-                              it.type_name( how_many ),
-                              total_count );
+    const std::string title = contained ?
+                              string_format( _( "Trade how many containers with %s [MAX: %d]: " ),
+                                      it.get_contained().type_name( how_many ), total_count ) :
+                              string_format( _( "Trade how many %s [MAX: %d]: " ), it.type_name( how_many ), total_count );
     popup_input.title( title ).edit( how_many );
     if( popup_input.canceled() || how_many <= 0 ) {
         return -1;
@@ -419,7 +419,7 @@ bool trading_window::perform_trade( npc &np, const std::string &deal )
 
     // Shopkeeps are happy to have large inventories.
     if( np.mission == NPC_MISSION_SHOPKEEP ) {
-        volume_left = 5'000'000_ml;
+        volume_left = 5'000_liter;
         weight_left = 5'000_kilogram;
     }
 
diff --git a/src/options.cpp b/src/options.cpp
index f96fb8ab7edd7..914aebd8c5498 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -841,23 +841,22 @@ void options_manager::cOpt::setValue( std::string sSetIn )
 }
 
 /** Fill a mapping with values.
- * Scans all directories in FILENAMES[dirname_label] directory for
- * a file named FILENAMES[filename_label].
+ * Scans all directories in @p dirname directory for
+ * a file named @p filename.
  * All found values added to resource_option as name, resource_dir.
  * Furthermore, it builds possible values list for cOpt class.
  */
 static std::vector<options_manager::id_and_option> build_resource_list(
     std::map<std::string, std::string> &resource_option, const std::string &operation_name,
-    const std::string &dirname_label, const std::string &filename_label )
+    const std::string &dirname, const std::string &filename )
 {
     std::vector<options_manager::id_and_option> resource_names;
 
     resource_option.clear();
-    const auto resource_dirs = get_directories_with( FILENAMES[filename_label],
-                               FILENAMES[dirname_label], true );
+    const auto resource_dirs = get_directories_with( filename, dirname, true );
 
     for( auto &resource_dir : resource_dirs ) {
-        read_from_file( resource_dir + "/" + FILENAMES[filename_label], [&]( std::istream & fin ) {
+        read_from_file( resource_dir + "/" + filename, [&]( std::istream & fin ) {
             std::string resource_name;
             std::string view_name;
             // should only have 2 values inside it, otherwise is going to only load the last 2 values
@@ -901,7 +900,8 @@ std::vector<options_manager::id_and_option> options_manager::load_tilesets_from(
 {
     // Use local map as build_resource_list will clear the first parameter
     std::map<std::string, std::string> local_tilesets;
-    auto tileset_names = build_resource_list( local_tilesets, "tileset", path, "tileset-conf" );
+    auto tileset_names = build_resource_list( local_tilesets, "tileset", path,
+                         PATH_INFO::tileset_conf() );
 
     // Copy found tilesets
     TILESETS.insert( local_tilesets.begin(), local_tilesets.end() );
@@ -916,11 +916,11 @@ std::vector<options_manager::id_and_option> options_manager::build_tilesets_list
     std::vector<id_and_option> result;
 
     // Load from data directory
-    auto data_tilesets = load_tilesets_from( "gfxdir" );
+    auto data_tilesets = load_tilesets_from( PATH_INFO::gfxdir() );
     result.insert( result.end(), data_tilesets.begin(), data_tilesets.end() );
 
     // Load from user directory
-    auto user_tilesets = load_tilesets_from( "user_gfx" );
+    auto user_tilesets = load_tilesets_from( PATH_INFO::user_gfx() );
     result.insert( result.end(), user_tilesets.begin(), user_tilesets.end() );
 
     // Default values
@@ -936,7 +936,8 @@ std::vector<options_manager::id_and_option> options_manager::load_soundpack_from
 {
     // build_resource_list will clear &resource_option - first param
     std::map<std::string, std::string> local_soundpacks;
-    auto soundpack_names = build_resource_list( local_soundpacks, "soundpack", path, "soundpack-conf" );
+    auto soundpack_names = build_resource_list( local_soundpacks, "soundpack", path,
+                           PATH_INFO::soundpack_conf() );
 
     // Copy over found soundpacks
     SOUNDPACKS.insert( local_soundpacks.begin(), local_soundpacks.end() );
@@ -952,11 +953,11 @@ std::vector<options_manager::id_and_option> options_manager::build_soundpacks_li
     std::vector<id_and_option> result;
 
     // Search data directory for sound packs
-    auto data_soundpacks = load_soundpack_from( "data_sound" );
+    auto data_soundpacks = load_soundpack_from( PATH_INFO::data_sound() );
     result.insert( result.end(), data_soundpacks.begin(), data_soundpacks.end() );
 
     // Search user directory for sound packs
-    auto user_soundpacks = load_soundpack_from( "user_sound" );
+    auto user_soundpacks = load_soundpack_from( PATH_INFO::user_sound() );
     result.insert( result.end(), user_soundpacks.begin(), user_soundpacks.end() );
 
     // Select default built-in sound pack
@@ -1491,6 +1492,11 @@ void options_manager::add_options_interface()
     "Vertical"
        );
 
+    add( "AIM_WIDTH", "interface", translate_marker( "Full screen Advanced Inventory Manager" ),
+         translate_marker( "If true, Advanced Inventory Manager menu will fit full screen, otherwise it will leave sidebar visible." ),
+         false
+       );
+
     mOptionsSort["interface"]++;
 
     add( "MOVE_VIEW_OFFSET", "interface", translate_marker( "Move view offset" ),
@@ -2842,7 +2848,7 @@ std::string options_manager::migrateOptionValue( const std::string &name,
 
 bool options_manager::save()
 {
-    const auto savefile = FILENAMES["options"];
+    const auto savefile = PATH_INFO::options();
 
     // cache to global due to heavy usage.
     trigdist = ::get_option<bool>( "CIRCLEDIST" );
@@ -2863,14 +2869,14 @@ bool options_manager::save()
 
 void options_manager::load()
 {
-    const auto file = FILENAMES["options"];
+    const auto file = PATH_INFO::options();
     if( !read_from_file_optional_json( file, [&]( JsonIn & jsin ) {
     deserialize( jsin );
     } ) ) {
         if( load_legacy() ) {
             if( save() ) {
-                remove_file( FILENAMES["legacy_options"] );
-                remove_file( FILENAMES["legacy_options2"] );
+                remove_file( PATH_INFO::legacy_options() );
+                remove_file( PATH_INFO::legacy_options2() );
             }
         }
     }
@@ -2911,8 +2917,8 @@ bool options_manager::load_legacy()
         }
     };
 
-    return read_from_file_optional( FILENAMES["legacy_options"], reader ) ||
-           read_from_file_optional( FILENAMES["legacy_options2"], reader );
+    return read_from_file_optional( PATH_INFO::legacy_options(), reader ) ||
+           read_from_file_optional( PATH_INFO::legacy_options2(), reader );
 }
 
 bool options_manager::has_option( const std::string &name ) const
diff --git a/src/output.cpp b/src/output.cpp
index 64d6061b35531..47dca17830fe2 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -640,11 +640,7 @@ void popup_status( const char *const title, const std::string &mes )
 // well frack, half the game uses it so: optional (int)selected argument causes entry highlight, and enter to return entry's key. Also it now returns int
 //@param without_getch don't wait getch, return = (int)' ';
 input_event draw_item_info( const int iLeft, const int iWidth, const int iTop, const int iHeight,
-                            const std::string &sItemName, const std::string &sTypeName,
-                            const std::vector<iteminfo> &vItemDisplay, const std::vector<iteminfo> &vItemCompare,
-                            int &selected, const bool without_getch, const bool without_border,
-                            const bool handle_scrolling, const bool scrollbar_left, const bool use_full_win,
-                            const unsigned int padding )
+                            item_info_data &data )
 {
     catacurses::window win =
         catacurses::newwin( iHeight, iWidth,
@@ -656,9 +652,7 @@ input_event draw_item_info( const int iLeft, const int iWidth, const int iTop, c
     wclear( win );
     wrefresh( win );
 
-    const auto result = draw_item_info(
-                            win, sItemName, sTypeName, vItemDisplay, vItemCompare, selected, without_getch,
-                            without_border, handle_scrolling, scrollbar_left, use_full_win, padding );
+    const input_event result = draw_item_info( win, data );
     return result;
 }
 
@@ -819,31 +813,25 @@ std::string format_item_info( const std::vector<iteminfo> &vItemDisplay,
     return buffer;
 }
 
-input_event draw_item_info( const catacurses::window &win, const std::string &sItemName,
-                            const std::string &sTypeName,
-                            const std::vector<iteminfo> &vItemDisplay,
-                            const std::vector<iteminfo> &vItemCompare,
-                            int &selected, const bool without_getch, const bool without_border,
-                            const bool handle_scrolling, const bool scrollbar_left, const bool use_full_win,
-                            const unsigned int padding )
+input_event draw_item_info( const catacurses::window &win, item_info_data &data )
 {
     std::string buffer;
-    int line_num = use_full_win || without_border ? 0 : 1;
-    if( !sItemName.empty() ) {
-        buffer += sItemName + "\n";
+    int line_num = data.use_full_win || data.without_border ? 0 : 1;
+    if( !data.get_item_name().empty() ) {
+        buffer += data.get_item_name() + "\n";
     }
-    if( sItemName != sTypeName && !sTypeName.empty() ) {
-        buffer += sTypeName + "\n";
+    if( data.get_item_name() != data.get_type_name() && !data.get_type_name().empty() ) {
+        buffer += data.get_type_name() + "\n";
     }
-    for( unsigned int i = 0; i < padding; i++ ) {
+    for( unsigned int i = 0; i < data.padding; i++ ) {
         buffer += "\n";
     }
 
-    buffer += format_item_info( vItemDisplay, vItemCompare );
+    buffer += format_item_info( data.get_item_display(), data.get_item_compare() );
 
-    const auto b = use_full_win ? 0 : ( without_border ? 1 : 2 );
-    const auto width = getmaxx( win ) - ( use_full_win ? 1 : b * 2 );
-    const auto height = getmaxy( win ) - ( use_full_win ? 0 : 2 );
+    const int b = data.use_full_win ? 0 : ( data.without_border ? 1 : 2 );
+    const int width = getmaxx( win ) - ( data.use_full_win ? 1 : b * 2 );
+    const int height = getmaxy( win ) - ( data.use_full_win ? 0 : 2 );
 
     input_event result;
     while( true ) {
@@ -852,42 +840,43 @@ input_event draw_item_info( const catacurses::window &win, const std::string &sI
             const auto vFolded = foldstring( buffer, width - 1 );
             iLines = vFolded.size();
 
-            if( selected < 0 ) {
-                selected = 0;
+            if( data.selected < 0 ) {
+                data.selected = 0;
             } else if( iLines < height ) {
-                selected = 0;
-            } else if( selected >= iLines - height ) {
-                selected = iLines - height;
+                data.selected = 0;
+            } else if( data.selected >= iLines - height ) {
+                data.selected = iLines - height;
             }
 
-            fold_and_print_from( win, point( b, line_num ), width - 1, selected, c_light_gray, buffer );
+            fold_and_print_from( win, point( b, line_num ), width - 1, data.selected, c_light_gray, buffer );
 
-            draw_scrollbar( win, selected, height, iLines, point( scrollbar_left ? 0 : getmaxx( win ) - 1,
-                            ( without_border && use_full_win ? 0 : 1 ) ), BORDER_COLOR, true );
+            draw_scrollbar( win, data.selected, height, iLines,
+                            point( data.scrollbar_left ? 0 : getmaxx( win ) - 1,
+                                   ( data.without_border && data.use_full_win ? 0 : 1 ) ), BORDER_COLOR, true );
         }
 
-        if( !without_border ) {
+        if( !data.without_border ) {
             draw_custom_border( win, buffer.empty() );
             wrefresh( win );
         }
 
-        if( without_getch ) {
+        if( data.without_getch ) {
             break;
         }
 
         // TODO: use input context
         result = inp_mngr.get_input_event();
         const int ch = static_cast<int>( result.get_first_input() );
-        if( handle_scrolling && ch == KEY_PPAGE ) {
-            selected--;
+        if( data.handle_scrolling && ch == KEY_PPAGE ) {
+            data.selected--;
             werase( win );
-        } else if( handle_scrolling && ch == KEY_NPAGE ) {
-            selected++;
+        } else if( data.handle_scrolling && ch == KEY_NPAGE ) {
+            data.selected++;
             werase( win );
-        } else if( selected > 0 && ( ch == '\n' || ch == KEY_RIGHT ) ) {
+        } else if( data.selected > 0 && ( ch == '\n' || ch == KEY_RIGHT ) ) {
             result = input_event( static_cast<int>( '\n' ), CATA_INPUT_KEYBOARD );
             break;
-        } else if( selected == KEY_LEFT ) {
+        } else if( data.selected == KEY_LEFT ) {
             result = input_event( static_cast<int>( ' ' ), CATA_INPUT_KEYBOARD );
             break;
         } else {
diff --git a/src/output.h b/src/output.h
index 45630c3a13c6f..b505296cfa421 100644
--- a/src/output.h
+++ b/src/output.h
@@ -469,19 +469,48 @@ inline void popup_player_or_npc( player &p, const char *player_mes, const char *
 std::string format_item_info( const std::vector<iteminfo> &vItemDisplay,
                               const std::vector<iteminfo> &vItemCompare );
 
-input_event draw_item_info( const catacurses::window &win, const std::string &sItemName,
-                            const std::string &sTypeName,
-                            const std::vector<iteminfo> &vItemDisplay, const std::vector<iteminfo> &vItemCompare,
-                            int &selected, bool without_getch = false, bool without_border = false,
-                            bool handle_scrolling = false, bool scrollbar_left = true,
-                            bool use_full_win = false, unsigned int padding = 1 );
-
-input_event draw_item_info( int iLeft, int iWidth, int iTop, int iHeight,
-                            const std::string &sItemName, const std::string &sTypeName,
-                            const std::vector<iteminfo> &vItemDisplay, const std::vector<iteminfo> &vItemCompare,
-                            int &selected, bool without_getch = false, bool without_border = false,
-                            bool handle_scrolling = false, bool scrollbar_left = true,
-                            bool use_full_win = false, unsigned int padding = 1 );
+// the extra data that item_info needs to draw
+struct item_info_data {
+    private:
+        std::string sItemName;
+        std::string sTypeName;
+        std::vector<iteminfo> vItemDisplay;
+        std::vector<iteminfo> vItemCompare;
+    public:
+
+        item_info_data() = default;
+        item_info_data( const std::string &sItemName, const std::string &sTypeName,
+                        const std::vector<iteminfo> &vItemDisplay, const std::vector<iteminfo> &vItemCompare,
+                        const int selected = 0 )
+            : sItemName( sItemName ), sTypeName( sTypeName ),
+              vItemDisplay( vItemDisplay ), vItemCompare( vItemCompare ),
+              selected( selected ) {}
+
+        const std::string &get_item_name() const {
+            return sItemName;
+        }
+        const std::string &get_type_name() const {
+            return sTypeName;
+        }
+        const std::vector<iteminfo> &get_item_display() const {
+            return vItemDisplay;
+        }
+        const std::vector<iteminfo> &get_item_compare() const {
+            return vItemCompare;
+        }
+
+        int selected = 0;
+        bool without_getch = false;
+        bool without_border = false;
+        bool handle_scrolling = false;
+        bool scrollbar_left = true;
+        bool use_full_win = false;
+        unsigned int padding = 1;
+};
+
+input_event draw_item_info( const catacurses::window &win, item_info_data &data );
+
+input_event draw_item_info( int iLeft, int iWidth, int iTop, int iHeight, item_info_data &data );
 
 enum class item_filter_type : int {
     FIRST = 1, // used for indexing into tables
diff --git a/src/overmap.cpp b/src/overmap.cpp
index 907764215d081..477421fa5ff40 100644
--- a/src/overmap.cpp
+++ b/src/overmap.cpp
@@ -4076,10 +4076,10 @@ void overmap::place_specials( overmap_special_batch &enabled_specials )
         std::vector<point> nearest_candidates;
         // Since this starts at enabled_specials::origin, it will only place new overmaps
         // in the 5x5 area surrounding the initial overmap, bounding the amount of work we will do.
-        for( point candidate_addr : closest_points_first( 2, custom_overmap_specials.get_origin() ) ) {
+        for( const point &candidate_addr : closest_points_first( 2,
+                custom_overmap_specials.get_origin() ) ) {
             if( !overmap_buffer.has( candidate_addr ) ) {
-                int current_distance = square_dist( pos(),
-                                                    candidate_addr );
+                int current_distance = square_dist( pos(), candidate_addr );
                 if( nearest_candidates.empty() || current_distance == previous_distance ) {
                     nearest_candidates.push_back( candidate_addr );
                     previous_distance = current_distance;
diff --git a/src/overmapbuffer.cpp b/src/overmapbuffer.cpp
index 6bb7dcca90fe5..115a9a697b40e 100644
--- a/src/overmapbuffer.cpp
+++ b/src/overmapbuffer.cpp
@@ -489,7 +489,7 @@ std::vector<mongroup *> overmapbuffer::monsters_at( const tripoint &p )
     // but monster groups are defined with submap coordinates.
     tripoint p_sm = omt_to_sm_copy( p );
     std::vector<mongroup *> result;
-    for( point offset : std::array<point, 4> { { { point_zero }, { point_south }, { point_east }, { point_south_east } } } ) {
+    for( const point &offset : std::array<point, 4> { { { point_zero }, { point_south }, { point_east }, { point_south_east } } } ) {
         std::vector<mongroup *> tmp = groups_at( p_sm + offset );
         result.insert( result.end(), tmp.begin(), tmp.end() );
     }
@@ -1497,9 +1497,26 @@ bool overmapbuffer::place_special( const overmap_special_id &special_id, const t
         specials.push_back( &special );
         overmap_special_batch batch( om->pos(), specials );
 
+        // Filter the sectors to those which are in in range of our center point, so
+        // that we don't end up creating specials in areas that are outside of our radius,
+        // since the whole point is to create a special that is within the parameters.
+        std::vector<point> sector_points_in_range;
+        std::copy_if( sectors.sectors.begin(), sectors.sectors.end(),
+        std::back_inserter( sector_points_in_range ), [&]( point & p ) {
+            const point global_sector_point = om->global_base_point() + p;
+            // We'll include this sector if it's within our radius. We reduce the radius by
+            // the length of the longest side of our special so that we don't end up in a
+            // scenario where one overmap terrain of the special is within the radius but the
+            // rest of it is outside the radius (due to size, rotation, etc), which would
+            // then result in us placing the special but then not finding it later if we
+            // search using the same radius value we used in placing it.
+            return square_dist( global_sector_point, center.xy() ) <= radius - longest_side;
+        } );
+        om_special_sectors sectors_in_range {sector_points_in_range, sectors.sector_width};
+
         // Attempt to place the specials using our batch and sectors. We
         // require they be placed in unexplored terrain right now.
-        om->place_specials_pass( batch, sectors, true, true );
+        om->place_specials_pass( batch, sectors_in_range, true, true );
 
         // The place special pass will erase specials that have reached their
         // maximum number of instances so first check if its been erased.
diff --git a/src/panels.cpp b/src/panels.cpp
index c63d8af55877d..267f2c446b87a 100644
--- a/src/panels.cpp
+++ b/src/panels.cpp
@@ -2135,7 +2135,7 @@ void panel_manager::update_offsets( int x )
 
 bool panel_manager::save()
 {
-    return write_to_file( FILENAMES["panel_options"], [&]( std::ostream & fout ) {
+    return write_to_file( PATH_INFO::panel_options(), [&]( std::ostream & fout ) {
         JsonOut jout( fout, true );
         serialize( jout );
     }, _( "panel options" ) );
@@ -2143,7 +2143,7 @@ bool panel_manager::save()
 
 bool panel_manager::load()
 {
-    return read_from_file_optional_json( FILENAMES["panel_options"], [&]( JsonIn & jsin ) {
+    return read_from_file_optional_json( PATH_INFO::panel_options(), [&]( JsonIn & jsin ) {
         deserialize( jsin );
     } );
 }
diff --git a/src/path_info.cpp b/src/path_info.cpp
index 352beffa1c004..7ee9ebe9d5a24 100644
--- a/src/path_info.cpp
+++ b/src/path_info.cpp
@@ -11,8 +11,30 @@
 #include <windows.h>
 #endif
 
-/** Map where we store filenames */
-std::map<std::string, std::string> FILENAMES;
+/**
+ * Return a locale specific path, or if there is no path for the current
+ * locale, return the default path.
+ * @param path The local path is based on that value.
+ * @param extension File name extension, is automatically added to the path
+ * of the translated file. Can be empty, but must otherwise include the
+ * initial '.', e.g. ".json"
+ * @param fallback The path of the fallback filename.
+ * It is used if no translated file can be found.
+ */
+static std::string find_translated_file( const std::string &path, const std::string &extension,
+        const std::string &fallback );
+
+static std::string motd_value;
+static std::string gfxdir_value;
+static std::string config_dir_value;
+static std::string user_dir_value;
+static std::string datadir_value;
+static std::string base_path_value;
+static std::string savedir_value;
+static std::string autopickup_value;
+static std::string keymap_value;
+static std::string options_value;
+static std::string memorialdir_value;
 
 void PATH_INFO::init_base_path( std::string path )
 {
@@ -23,14 +45,11 @@ void PATH_INFO::init_base_path( std::string path )
         }
     }
 
-    //FILENAMES.insert(std::pair<std::string,std::string>("base_path", path));
-    FILENAMES["base_path"] = path;
+    base_path_value = path;
 }
 
-void PATH_INFO::init_user_dir( const char *ud )
+void PATH_INFO::init_user_dir( std::string dir )
 {
-    std::string dir = std::string( ud );
-
     if( dir.empty() ) {
         const char *user_dir;
 #if defined(_WIN32)
@@ -53,122 +72,33 @@ void PATH_INFO::init_user_dir( const char *ud )
 #endif
     }
 
-    FILENAMES["user_dir"] = dir;
-}
-
-void PATH_INFO::update_pathname( const std::string &name, const std::string &path )
-{
-    const std::map<std::string, std::string>::iterator iter = FILENAMES.find( name );
-    if( iter != FILENAMES.end() ) {
-        FILENAMES[name] = path;
-    } else {
-        FILENAMES.insert( std::pair<std::string, std::string>( name, path ) );
-    }
-}
-
-void PATH_INFO::update_datadir()
-{
-    // Shared dirs
-    update_pathname( "gfxdir", FILENAMES["datadir"] + "gfx/" );
-    update_pathname( "fontdir", FILENAMES["datadir"] + "font/" );
-    update_pathname( "rawdir", FILENAMES["datadir"] + "raw/" );
-    update_pathname( "jsondir", FILENAMES["datadir"] + "core/" );
-    update_pathname( "moddir", FILENAMES["datadir"] + "mods/" );
-    update_pathname( "recycledir", FILENAMES["datadir"] + "recycling/" );
-    update_pathname( "namesdir", FILENAMES["datadir"] + "names/" );
-    update_pathname( "titledir", FILENAMES["datadir"] + "title/" );
-    update_pathname( "motddir", FILENAMES["datadir"] + "motd/" );
-    update_pathname( "creditsdir", FILENAMES["datadir"] + "credits/" );
-    update_pathname( "data_sound", FILENAMES["datadir"] + "sound" );
-    update_pathname( "helpdir", FILENAMES["datadir"] + "help/" );
-
-    // Shared files
-    update_pathname( "title", FILENAMES["titledir"] + "en.title" );
-    update_pathname( "halloween", FILENAMES["titledir"] + "en.halloween" );
-    update_pathname( "motd", FILENAMES["motddir"] + "en.motd" );
-    update_pathname( "credits", FILENAMES["creditsdir"] + "en.credits" );
-    update_pathname( "names", FILENAMES["namesdir"] + "en.json" );
-    update_pathname( "colors", FILENAMES["rawdir"] + "colors.json" );
-    update_pathname( "keybindings", FILENAMES["rawdir"] + "keybindings.json" );
-    update_pathname( "keybindings_vehicle", FILENAMES["rawdir"] + "keybindings/vehicle.json" );
-    update_pathname( "legacy_fontdata", FILENAMES["datadir"] + "fontdata.json" );
-    update_pathname( "sokoban", FILENAMES["rawdir"] + "sokoban.txt" );
-    update_pathname( "defaulttilejson", FILENAMES["gfx"] + "tile_config.json" );
-    update_pathname( "defaulttilepng", FILENAMES["gfx"] + "tinytile.png" );
-    update_pathname( "mods-dev-default", FILENAMES["moddir"] + "default.json" );
-    update_pathname( "mods-replacements", FILENAMES["moddir"] + "replacements.json" );
-    update_pathname( "defaultsounddir", FILENAMES["datadir"] + "sound" );
-    update_pathname( "help", FILENAMES["helpdir"] + "texts.json" );
-}
-
-void PATH_INFO::update_config_dir()
-{
-    update_pathname( "options", FILENAMES["config_dir"] + "options.json" );
-    update_pathname( "panel_options", FILENAMES["config_dir"] + "panel_options.json" );
-    update_pathname( "keymap", FILENAMES["config_dir"] + "keymap.txt" );
-    update_pathname( "debug", FILENAMES["config_dir"] + "debug.log" );
-    update_pathname( "crash", FILENAMES["config_dir"] + "crash.log" );
-    update_pathname( "fontlist", FILENAMES["config_dir"] + "fontlist.txt" );
-    update_pathname( "fontdata", FILENAMES["config_dir"] + "fonts.json" );
-    update_pathname( "autopickup", FILENAMES["config_dir"] + "auto_pickup.json" );
-    update_pathname( "safemode", FILENAMES["config_dir"] + "safemode.json" );
-    update_pathname( "base_colors", FILENAMES["config_dir"] + "base_colors.json" );
-    update_pathname( "custom_colors", FILENAMES["config_dir"] + "custom_colors.json" );
-    update_pathname( "mods-user-default", FILENAMES["config_dir"] + "user-default-mods.json" );
-    update_pathname( "lastworld", FILENAMES["config_dir"] + "lastworld.json" );
+    user_dir_value = dir;
 }
 
 void PATH_INFO::set_standard_filenames()
 {
     // Special: data_dir and gfx_dir
-    if( !FILENAMES["base_path"].empty() ) {
+    if( !base_path_value.empty() ) {
 #if defined(DATA_DIR_PREFIX)
-        update_pathname( "datadir", FILENAMES["base_path"] + "share/cataclysm-dda/" );
-        update_pathname( "gfxdir", FILENAMES["datadir"] + "gfx/" );
+        datadir_value = base_path_value + "share/cataclysm-dda/";
+        gfxdir_value = datadir_value + "gfx/";
 #else
-        update_pathname( "datadir", FILENAMES["base_path"] + "data/" );
-        update_pathname( "gfxdir", FILENAMES["base_path"] + "gfx/" );
+        datadir_value = base_path_value + "data/";
+        gfxdir_value = base_path_value + "gfx/";
 #endif
     } else {
-        update_pathname( "datadir", "data/" );
-        update_pathname( "gfxdir", "gfx/" );
+        datadir_value = "data/";
+        gfxdir_value = "gfx/";
     }
 
     // Shared dirs
-    update_pathname( "fontdir", FILENAMES["datadir"] + "font/" );
-    update_pathname( "rawdir", FILENAMES["datadir"] + "raw/" );
-    update_pathname( "jsondir", FILENAMES["datadir"] + "core/" );
-    update_pathname( "moddir", FILENAMES["datadir"] + "mods/" );
-    update_pathname( "namesdir", FILENAMES["datadir"] + "names/" );
-    update_pathname( "titledir", FILENAMES["datadir"] + "title/" );
-    update_pathname( "motddir", FILENAMES["datadir"] + "motd/" );
-    update_pathname( "creditsdir", FILENAMES["datadir"] + "credits/" );
-    update_pathname( "color_templates", FILENAMES["rawdir"] + "color_templates/" );
-    update_pathname( "data_sound", FILENAMES["datadir"] + "sound" );
-    update_pathname( "helpdir", FILENAMES["datadir"] + "help/" );
 
     // Shared files
-    update_pathname( "title", FILENAMES["titledir"] + "en.title" );
-    update_pathname( "halloween", FILENAMES["titledir"] + "en.halloween" );
-    update_pathname( "motd", FILENAMES["motddir"] + "en.motd" );
-    update_pathname( "credits", FILENAMES["creditsdir"] + "en.credits" );
-    update_pathname( "names", FILENAMES["namesdir"] + "en.json" );
-    update_pathname( "colors", FILENAMES["rawdir"] + "colors.json" );
-    update_pathname( "keybindings", FILENAMES["rawdir"] + "keybindings.json" );
-    update_pathname( "keybindings_vehicle", FILENAMES["rawdir"] + "keybindings/vehicle.json" );
-    update_pathname( "sokoban", FILENAMES["rawdir"] + "sokoban.txt" );
-    update_pathname( "defaulttilejson", FILENAMES["gfx"] + "tile_config.json" );
-    update_pathname( "defaulttilepng", FILENAMES["gfx"] + "tinytile.png" );
-    update_pathname( "mods-dev-default", FILENAMES["moddir"] + "default.json" );
-    update_pathname( "mods-replacements", FILENAMES["moddir"] + "replacements.json" );
-    update_pathname( "defaultsounddir", FILENAMES["datadir"] + "sound" );
-    update_pathname( "help", FILENAMES["helpdir"] + "texts.json" );
+    motd_value = datadir_value + "motd/" + "en.motd";
+
+    savedir_value = user_dir_value + "save/";
+    memorialdir_value = user_dir_value + "memorial/";
 
-    update_pathname( "savedir", FILENAMES["user_dir"] + "save/" );
-    update_pathname( "memorialdir", FILENAMES["user_dir"] + "memorial/" );
-    update_pathname( "templatedir", FILENAMES["user_dir"] + "templates/" );
-    update_pathname( "user_sound", FILENAMES["user_dir"] + "sound/" );
-    update_pathname( "user_gfx", FILENAMES["user_dir"] + "gfx/" );
 #if defined(USE_XDG_DIR)
     const char *user_dir;
     std::string dir;
@@ -178,52 +108,18 @@ void PATH_INFO::set_standard_filenames()
         user_dir = getenv( "HOME" );
         dir = std::string( user_dir ) + "/.config/cataclysm-dda/";
     }
-    update_pathname( "config_dir", dir );
+    config_dir_value = dir;
 #else
-    update_pathname( "config_dir", FILENAMES["user_dir"] + "config/" );
-#endif
-    update_pathname( "graveyarddir", FILENAMES["user_dir"] + "graveyard/" );
-
-    update_pathname( "options", FILENAMES["config_dir"] + "options.json" );
-    update_pathname( "panel_options", FILENAMES["config_dir"] + "panel_options.json" );
-    update_pathname( "keymap", FILENAMES["config_dir"] + "keymap.txt" );
-    update_pathname( "user_keybindings", FILENAMES["config_dir"] + "keybindings.json" );
-    update_pathname( "debug", FILENAMES["config_dir"] + "debug.log" );
-    update_pathname( "crash", FILENAMES["config_dir"] + "crash.log" );
-    update_pathname( "fontlist", FILENAMES["config_dir"] + "fontlist.txt" );
-    update_pathname( "fontdata", FILENAMES["config_dir"] + "fonts.json" );
-    update_pathname( "autopickup", FILENAMES["config_dir"] + "auto_pickup.json" );
-    update_pathname( "safemode", FILENAMES["config_dir"] + "safemode.json" );
-    update_pathname( "base_colors", FILENAMES["config_dir"] + "base_colors.json" );
-    update_pathname( "custom_colors", FILENAMES["config_dir"] + "custom_colors.json" );
-    update_pathname( "mods-user-default", FILENAMES["config_dir"] + "user-default-mods.json" );
-    update_pathname( "lastworld", FILENAMES["config_dir"] + "lastworld.json" );
-    update_pathname( "user_moddir", FILENAMES["user_dir"] + "mods/" );
-    update_pathname( "worldoptions", "worldoptions.json" );
-
-    // Needed to move files from these legacy locations to the new config directory.
-    update_pathname( "legacy_options", "data/options.txt" );
-    update_pathname( "legacy_options2", FILENAMES["config_dir"] + "options.txt" );
-    update_pathname( "legacy_keymap", "data/keymap.txt" );
-    update_pathname( "legacy_autopickup", "data/auto_pickup.txt" );
-    update_pathname( "legacy_autopickup2", FILENAMES["config_dir"] + "auto_pickup.txt" );
-    update_pathname( "legacy_fontdata", FILENAMES["datadir"] + "fontdata.json" );
-    update_pathname( "legacy_worldoptions", "worldoptions.txt" );
-#if defined(TILES)
-    // Default tileset config file.
-    update_pathname( "tileset-conf", "tileset.txt" );
-#endif
-#if defined(SDL_SOUND)
-    // Default soundpack config file.
-    update_pathname( "soundpack-conf", "soundpack.txt" );
+    config_dir_value = user_dir_value + "config/";
 #endif
+    options_value = config_dir_value + "options.json";
+    keymap_value = config_dir_value + "keymap.txt";
+    autopickup_value = config_dir_value + "auto_pickup.json";
 }
 
-std::string PATH_INFO::find_translated_file( const std::string &pathid,
-        const std::string &extension, const std::string &fallbackid )
+std::string find_translated_file( const std::string &base_path, const std::string &extension,
+                                  const std::string &fallback )
 {
-    const std::string base_path = FILENAMES[pathid];
-
 #if defined(LOCALIZE) && !defined(__CYGWIN__)
     std::string loc_name;
     if( get_option<std::string>( "USE_LANG" ).empty() ) {
@@ -266,7 +162,285 @@ std::string PATH_INFO::find_translated_file( const std::string &pathid,
             }
         }
     }
-#endif
+#else
+    ( void ) base_path;
     ( void ) extension;
-    return FILENAMES[fallbackid];
+#endif
+    return fallback;
+}
+std::string PATH_INFO::autopickup()
+{
+    return autopickup_value;
+}
+std::string PATH_INFO::base_colors()
+{
+    return config_dir_value + "base_colors.json";
+}
+std::string PATH_INFO::base_path()
+{
+    return base_path_value;
+}
+std::string PATH_INFO::colors()
+{
+    return datadir_value + "raw/" + "colors.json";
+}
+std::string PATH_INFO::color_templates()
+{
+    return datadir_value + "raw/" + "color_templates/";
+}
+std::string PATH_INFO::config_dir()
+{
+    return config_dir_value;
+}
+std::string PATH_INFO::custom_colors()
+{
+    return config_dir_value + "custom_colors.json";
+}
+std::string PATH_INFO::datadir()
+{
+    return datadir_value;
+}
+std::string PATH_INFO::debug()
+{
+    return config_dir_value + "debug.log";
+}
+std::string PATH_INFO::defaultsounddir()
+{
+    return datadir_value + "sound";
+}
+std::string PATH_INFO::defaulttilejson()
+{
+    return "tile_config.json";
+}
+std::string PATH_INFO::defaulttilepng()
+{
+    return "tinytile.png";
+}
+std::string PATH_INFO::fontdata()
+{
+    return config_dir_value + "fonts.json";
+}
+std::string PATH_INFO::fontdir()
+{
+    return datadir_value + "font/";
+}
+std::string PATH_INFO::fontlist()
+{
+    return config_dir_value + "fontlist.txt";
+}
+std::string PATH_INFO::graveyarddir()
+{
+    return user_dir_value + "graveyard/";
+}
+std::string PATH_INFO::help()
+{
+    return datadir_value + "help/" + "texts.json";
+}
+std::string PATH_INFO::keybindings()
+{
+    return datadir_value + "raw/" + "keybindings.json";
+}
+std::string PATH_INFO::keybindings_vehicle()
+{
+    return datadir_value + "raw/" + "keybindings/vehicle.json";
+}
+std::string PATH_INFO::keymap()
+{
+    return keymap_value;
+}
+std::string PATH_INFO::lastworld()
+{
+    return config_dir_value + "lastworld.json";
+}
+std::string PATH_INFO::legacy_autopickup()
+{
+    return "data/auto_pickup.txt";
+}
+std::string PATH_INFO::legacy_autopickup2()
+{
+    return config_dir_value + "auto_pickup.txt";
+}
+std::string PATH_INFO::legacy_fontdata()
+{
+    return datadir_value + "fontdata.json";
+}
+std::string PATH_INFO::legacy_keymap()
+{
+    return "data/keymap.txt";
+}
+std::string PATH_INFO::legacy_options()
+{
+    return "data/options.txt";
+}
+std::string PATH_INFO::legacy_options2()
+{
+    return config_dir_value + "options.txt";
+}
+std::string PATH_INFO::legacy_worldoptions()
+{
+    return "worldoptions.txt";
+}
+std::string PATH_INFO::memorialdir()
+{
+    return memorialdir_value;
+}
+std::string PATH_INFO::jsondir()
+{
+    return datadir_value + "core/";
+}
+std::string PATH_INFO::moddir()
+{
+    return datadir_value + "mods/";
+}
+std::string PATH_INFO::options()
+{
+    return options_value;
+}
+std::string PATH_INFO::panel_options()
+{
+    return config_dir_value + "panel_options.json";
+}
+std::string PATH_INFO::safemode()
+{
+    return config_dir_value + "safemode.json";
+}
+std::string PATH_INFO::savedir()
+{
+    return savedir_value;
+}
+std::string PATH_INFO::sokoban()
+{
+    return datadir_value + "raw/" + "sokoban.txt";
+}
+std::string PATH_INFO::templatedir()
+{
+    return user_dir_value + "templates/";
+}
+std::string PATH_INFO::user_dir()
+{
+    return user_dir_value;
+}
+std::string PATH_INFO::user_gfx()
+{
+    return user_dir_value + "gfx/";
+}
+std::string PATH_INFO::user_keybindings()
+{
+    return config_dir_value + "keybindings.json";
+}
+std::string PATH_INFO::user_moddir()
+{
+    return user_dir_value + "mods/";
+}
+std::string PATH_INFO::user_sound()
+{
+    return user_dir_value + "sound/";
+}
+std::string PATH_INFO::worldoptions()
+{
+    return "worldoptions.json";
+}
+std::string PATH_INFO::crash()
+{
+    return config_dir_value + "crash.log";
+}
+std::string PATH_INFO::tileset_conf()
+{
+    return "tileset.txt";
+}
+std::string PATH_INFO::mods_replacements()
+{
+    return datadir_value + "mods/" + "replacements.json";
+}
+std::string PATH_INFO::mods_dev_default()
+{
+    return datadir_value + "mods/" + "default.json";
+}
+std::string PATH_INFO::mods_user_default()
+{
+    return config_dir_value + "user-default-mods.json";
+}
+std::string PATH_INFO::soundpack_conf()
+{
+    return "soundpack.txt";
+}
+std::string PATH_INFO::gfxdir()
+{
+    return gfxdir_value;
+}
+std::string PATH_INFO::data_sound()
+{
+    return datadir_value + "sound";
+}
+
+std::string PATH_INFO::credits()
+{
+    return find_translated_file( datadir_value + "credits/", ".credits",
+                                 datadir_value + "credits/" + "en.credits" );
+}
+
+std::string PATH_INFO::motd()
+{
+    return find_translated_file( datadir_value + "motd/", ".motd", motd_value );
+}
+
+std::string PATH_INFO::title( const bool halloween_theme )
+{
+    return find_translated_file( datadir_value + "title/", halloween_theme ? ".halloween" : ".title",
+                                 halloween_theme ? ( datadir_value + "title/" + "en.halloween" ) : ( datadir_value + "title/" +
+                                         "en.title" ) );
+}
+
+std::string PATH_INFO::names()
+{
+    return find_translated_file( datadir_value + "names/", ".json",
+                                 datadir_value + "names/" + "en.json" );
+}
+
+void PATH_INFO::set_datadir( const std::string &datadir )
+{
+    datadir_value = datadir;
+    // Shared dirs
+    gfxdir_value = datadir_value + "gfx/";
+
+    // Shared files
+    motd_value = datadir_value + "motd/" + "en.motd";
+}
+
+void PATH_INFO::set_config_dir( const std::string &config_dir )
+{
+    config_dir_value = config_dir;
+    options_value = config_dir_value + "options.json";
+    keymap_value = config_dir_value + "keymap.txt";
+    autopickup_value = config_dir_value + "auto_pickup.json";
+}
+
+void PATH_INFO::set_savedir( const std::string &savedir )
+{
+    savedir_value = savedir;
+}
+
+void PATH_INFO::set_memorialdir( const std::string &memorialdir )
+{
+    memorialdir_value = memorialdir;
+}
+
+void PATH_INFO::set_options( const std::string &options )
+{
+    options_value = options;
+}
+
+void PATH_INFO::set_keymap( const std::string &keymap )
+{
+    keymap_value = keymap;
+}
+
+void PATH_INFO::set_autopickup( const std::string &autopickup )
+{
+    autopickup_value = autopickup;
+}
+
+void PATH_INFO::set_motd( const std::string &motd )
+{
+    motd_value = motd;
 }
diff --git a/src/path_info.h b/src/path_info.h
index a7ba0caab07ac..9b054146612ea 100644
--- a/src/path_info.h
+++ b/src/path_info.h
@@ -2,33 +2,82 @@
 #ifndef PATH_INFO_H
 #define PATH_INFO_H
 
-#include <map>
 #include <string>
 
-extern std::map<std::string, std::string> FILENAMES;
-
 namespace PATH_INFO
 {
 void init_base_path( std::string path );
-void init_user_dir( const char *ud = "" );
-void update_datadir();
-void update_config_dir();
-void update_pathname( const std::string &name, const std::string &path );
+void init_user_dir( std::string dir );
 void set_standard_filenames();
-/**
- * Return a locale specific path, or if there is no path for the current
- * locale, return the default path.
- * @param pathid The key in the @ref FILENAMES map. The local path is based
- * on that value.
- * @param extension File name extension, is automatically added to the path
- * of the translated file. Can be empty, but must otherwise include the
- * initial '.', e.g. ".json"
- * @param fallbackid The path id of the fallback filename. As like pathid it's
- * the key into the @ref FILENAMES map. It is used if no translated file can be
- * found.
- */
-std::string find_translated_file( const std::string &pathid, const std::string &extension,
-                                  const std::string &fallbackid );
+
+std::string autopickup();
+std::string base_colors();
+std::string base_path();
+std::string colors();
+std::string color_templates();
+std::string config_dir();
+std::string custom_colors();
+std::string datadir();
+std::string debug();
+std::string defaultsounddir();
+std::string defaulttilejson();
+std::string defaulttilepng();
+std::string fontdata();
+std::string fontdir();
+std::string fontlist();
+std::string graveyarddir();
+std::string help();
+std::string keybindings();
+std::string keybindings_vehicle();
+std::string keymap();
+std::string lastworld();
+std::string legacy_autopickup();
+std::string legacy_autopickup2();
+std::string legacy_fontdata();
+std::string legacy_keymap();
+std::string legacy_options();
+std::string legacy_options2();
+std::string legacy_worldoptions();
+std::string memorialdir();
+std::string jsondir();
+std::string moddir();
+std::string options();
+std::string panel_options();
+std::string safemode();
+std::string savedir();
+std::string sokoban();
+std::string templatedir();
+std::string user_dir();
+std::string user_gfx();
+std::string user_keybindings();
+std::string user_moddir();
+std::string user_sound();
+std::string worldoptions();
+std::string crash();
+std::string tileset_conf();
+std::string gfxdir();
+std::string user_gfx();
+std::string data_sound();
+std::string user_sound();
+std::string mods_replacements();
+std::string mods_dev_default();
+std::string mods_user_default();
+std::string soundpack_conf();
+
+std::string credits();
+std::string motd();
+std::string title( bool halloween_theme );
+std::string names();
+
+void set_datadir( const std::string &datadir );
+void set_config_dir( const std::string &config_dir );
+void set_savedir( const std::string &savedir );
+void set_memorialdir( const std::string &memorialdir );
+void set_options( const std::string &options );
+void set_keymap( const std::string &keymap );
+void set_autopickup( const std::string &autopickup );
+void set_motd( const std::string &motd );
+
 } // namespace PATH_INFO
 
 #endif
diff --git a/src/pickup.cpp b/src/pickup.cpp
index c022cc7561036..111e09f356090 100644
--- a/src/pickup.cpp
+++ b/src/pickup.cpp
@@ -788,7 +788,11 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from )
                 std::vector<iteminfo> vDummy;
                 selected_item.info( true, vThisItem );
 
-                draw_item_info( w_item_info, "", "", vThisItem, vDummy, iScrollPos, true, true );
+                item_info_data dummy( "", "", vThisItem, vDummy, iScrollPos );
+                dummy.without_getch = true;
+                dummy.without_border = true;
+
+                draw_item_info( w_item_info, dummy );
             }
             draw_custom_border( w_item_info, 0 );
             mvwprintw( w_item_info, point( 2, 0 ), "< " );
diff --git a/src/player.cpp b/src/player.cpp
index 239ae6b828800..3e89b22a2894e 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -444,7 +444,7 @@ stat_mod player::get_pain_penalty() const
     return ret;
 }
 
-player::player() : cached_time( calendar::before_time_starts )
+player::player()
 {
     str_cur = 8;
     str_max = 8;
@@ -458,10 +458,6 @@ player::player() : cached_time( calendar::before_time_starts )
     blocks_left = 1;
     set_power_level( 0_kJ );
     set_max_power_level( 0_kJ );
-    radiation = 0;
-    tank_plut = 0;
-    reactor_plut = 0;
-    slow_rad = 0;
     cash = 0;
     scent = 500;
     male = true;
@@ -854,19 +850,9 @@ int player::run_cost( int base_cost, bool diag ) const
         if( has_trait( trait_ROOTS3 ) && g->m.has_flag( "DIGGABLE", pos() ) ) {
             movecost += 10 * footwear_factor();
         }
-        // Both walk and run speed drop to half their maximums as stamina approaches 0.
-        // Convert stamina to a float first to allow for decimal place carrying
-        float stamina_modifier = ( static_cast<float>( get_stamina() ) / get_stamina_max() + 1 ) / 2;
-        if( move_mode == CMM_RUN && get_stamina() > 0 ) {
-            // Rationale: Average running speed is 2x walking speed. (NOT sprinting)
-            stamina_modifier *= 2.0;
-        }
-        if( move_mode == CMM_CROUCH ) {
-            stamina_modifier *= 0.5;
-        }
 
         movecost = calculate_by_enchantment( movecost, enchantment::mod::MOVE_COST );
-        movecost /= stamina_modifier;
+        movecost /= stamina_move_cost_modifier();
     }
 
     if( diag ) {
@@ -980,29 +966,6 @@ bool player::is_on_ground() const
     return get_working_leg_count() < 2 || has_effect( effect_downed );
 }
 
-bool player::is_elec_immune() const
-{
-    return is_immune_damage( DT_ELECTRIC );
-}
-
-bool player::is_immune_effect( const efftype_id &eff ) const
-{
-    if( eff == effect_downed ) {
-        return is_throw_immune() || ( has_trait( trait_LEG_TENT_BRACE ) && footwear_factor() == 0 );
-    } else if( eff == effect_onfire ) {
-        return is_immune_damage( DT_HEAT );
-    } else if( eff == effect_deaf ) {
-        return worn_with_flag( "DEAF" ) || worn_with_flag( "PARTIAL_DEAF" ) || has_bionic( bio_ears ) ||
-               is_wearing( "rm13_armor_on" );
-    } else if( eff == effect_corroding ) {
-        return is_immune_damage( DT_ACID ) || has_trait( trait_SLIMY ) || has_trait( trait_VISCOUS );
-    } else if( eff == effect_nausea ) {
-        return has_trait( trait_STRONGSTOMACH );
-    }
-
-    return false;
-}
-
 float player::stability_roll() const
 {
     /** @EFFECT_STR improves player stability roll */
@@ -1015,47 +978,6 @@ float player::stability_roll() const
     return get_melee() + get_str() + ( get_per() / 3.0f ) + ( get_dex() / 4.0f );
 }
 
-bool player::is_immune_damage( const damage_type dt ) const
-{
-    switch( dt ) {
-        case DT_NULL:
-            return true;
-        case DT_TRUE:
-            return false;
-        case DT_BIOLOGICAL:
-            return has_effect_with_flag( "EFFECT_BIO_IMMUNE" ) ||
-                   worn_with_flag( "BIO_IMMUNE" );
-        case DT_BASH:
-            return has_effect_with_flag( "EFFECT_BASH_IMMUNE" ) ||
-                   worn_with_flag( "BASH_IMMUNE" );
-        case DT_CUT:
-            return has_effect_with_flag( "EFFECT_CUT_IMMUNE" ) ||
-                   worn_with_flag( "CUT_IMMUNE" );
-        case DT_ACID:
-            return has_trait( trait_ACIDPROOF ) ||
-                   has_effect_with_flag( "EFFECT_ACID_IMMUNE" ) ||
-                   worn_with_flag( "ACID_IMMUNE" );
-        case DT_STAB:
-            return has_effect_with_flag( "EFFECT_STAB_IMMUNE" ) ||
-                   worn_with_flag( "STAB_IMMUNE" );
-        case DT_HEAT:
-            return has_trait( trait_M_SKIN2 ) ||
-                   has_trait( trait_M_SKIN3 ) ||
-                   has_effect_with_flag( "EFFECT_HEAT_IMMUNE" ) ||
-                   worn_with_flag( "HEAT_IMMUNE" );
-        case DT_COLD:
-            return has_effect_with_flag( "EFFECT_COLD_IMMUNE" ) ||
-                   worn_with_flag( "COLD_IMMUNE" );
-        case DT_ELECTRIC:
-            return has_active_bionic( bio_faraday ) ||
-                   worn_with_flag( "ELECTRIC_IMMUNE" ) ||
-                   has_artifact_with( AEP_RESIST_ELECTRICITY ) ||
-                   has_effect_with_flag( "EFFECT_ELECTRIC_IMMUNE" );
-        default:
-            return true;
-    }
-}
-
 double player::recoil_vehicle() const
 {
     // TODO: vary penalty dependent upon vehicle part on which player is boarded
@@ -2116,7 +2038,7 @@ void player::apply_damage( Creature *source, body_part hurt, int dam, const bool
     g->events().send<event_type::character_takes_damage>( getID(), dam_to_bodypart );
 
     if( hp_cur[hurtpart] <= 0 && ( source == nullptr || !source->is_hallucination() ) ) {
-        if( !can_wield( weapon ).success() ) {
+        if( !weapon.is_null() && !can_wield( weapon ).success() ) {
             put_into_vehicle_or_drop( *this, item_drop_reason::tumbling, { weapon } );
             i_rem( &weapon );
         }
@@ -2456,37 +2378,39 @@ void player::update_stomach( const time_point &from, const time_point &to )
     const bool mycus = has_trait( trait_M_DEPENDENT );
     const float kcal_per_time = get_bmr() / ( 12.0f * 24.0f );
     const int five_mins = ticks_between( from, to, 5_minutes );
+    const int half_hours = ticks_between( from, to, 30_minutes );
+    const units::volume stomach_capacity = stomach.capacity( *this );
 
     if( five_mins > 0 ) {
-        stomach.absorb_water( *this, 250_ml * five_mins );
-        guts.absorb_water( *this, 250_ml * five_mins );
-    }
-    if( ticks_between( from, to, 30_minutes ) > 0 ) {
-        // the stomach does not currently have rates of absorption, but this is where it goes
-        stomach.calculate_absorbed( stomach.get_absorb_rates( true, rates ) );
-        guts.calculate_absorbed( guts.get_absorb_rates( false, rates ) );
-        stomach.store_absorbed( *this );
-        guts.store_absorbed( *this );
-        guts.bowel_movement( guts.get_pass_rates( false ) );
-        stomach.bowel_movement( stomach.get_pass_rates( true ), guts );
+        // Digest nutrients in stomach, they are destined for the guts (except water)
+        nutrients digested_to_guts = stomach.digest( *this, rates, five_mins, half_hours );
+        // Digest nutrients in guts, they will be distributed to needs levels
+        nutrients digested_to_body = guts.digest( *this, rates, five_mins, half_hours );
+        // Water from stomach skips guts and gets absorbed by body
+        set_thirst( std::max(
+                        -100, get_thirst() - units::to_milliliter<int>( digested_to_guts.water ) / 5 ) );
+        guts.ingest( digested_to_guts );
+        // Apply nutrients, unless this is an NPC and NO_NPC_FOOD is enabled.
+        if( !is_npc() || !get_option<bool>( "NO_NPC_FOOD" ) ) {
+            mod_stored_kcal( digested_to_body.kcal );
+            vitamins_mod( digested_to_body.vitamins, false );
+        }
     }
     if( stomach.time_since_ate() > 10_minutes ) {
-        if( stomach.contains() >= stomach.capacity() && get_hunger() > -61 ) {
+        if( stomach.contains() >= stomach_capacity && get_hunger() > -61 ) {
             // you're engorged! your stomach is full to bursting!
             set_hunger( -61 );
-        } else if( stomach.contains() >= stomach.capacity() / 2 && get_hunger() > -21 ) {
+        } else if( stomach.contains() >= stomach_capacity / 2 && get_hunger() > -21 ) {
             // sated
             set_hunger( -21 );
-        } else if( stomach.contains() >= stomach.capacity() / 8 && get_hunger() > -1 ) {
+        } else if( stomach.contains() >= stomach_capacity / 8 && get_hunger() > -1 ) {
             // that's really all the food you need to feel full
             set_hunger( -1 );
         } else if( stomach.contains() == 0_ml ) {
-            if( guts.get_calories() == 0 && guts.get_calories_absorbed() == 0 &&
-                get_stored_kcal() < get_healthy_kcal() && get_hunger() < 300 ) {
+            if( guts.get_calories() == 0 && get_stored_kcal() < get_healthy_kcal() && get_hunger() < 300 ) {
                 // there's no food except what you have stored in fat
                 set_hunger( 300 );
             } else if( get_hunger() < 100 && ( ( guts.get_calories() == 0 &&
-                                                 guts.get_calories_absorbed() == 0 &&
                                                  get_stored_kcal() >= get_healthy_kcal() ) || get_stored_kcal() < get_healthy_kcal() ) ) {
                 set_hunger( 100 );
             } else if( get_hunger() < 0 ) {
@@ -2503,13 +2427,13 @@ void player::update_stomach( const time_point &from, const time_point &to )
         // if you just ate but your stomach is still empty it will still
         // delay your filling up (drugs?)
     {
-        if( stomach.contains() >= stomach.capacity() && get_hunger() > -61 ) {
+        if( stomach.contains() >= stomach_capacity && get_hunger() > -61 ) {
             // you're engorged! your stomach is full to bursting!
             set_hunger( -61 );
-        } else if( stomach.contains() >= stomach.capacity() * 3 / 4 && get_hunger() > -21 ) {
+        } else if( stomach.contains() >= stomach_capacity * 3 / 4 && get_hunger() > -21 ) {
             // sated
             set_hunger( -21 );
-        } else if( stomach.contains() >= stomach.capacity() / 2 && get_hunger() > -1 ) {
+        } else if( stomach.contains() >= stomach_capacity / 2 && get_hunger() > -1 ) {
             // that's really all the food you need to feel full
             set_hunger( -1 );
         } else if( stomach.contains() > 0_ml && get_kcal_percent() > 0.95 ) {
@@ -2607,7 +2531,7 @@ void player::check_needs_extremes()
         } else {
             if( calendar::once_every( 1_hours ) ) {
                 std::string message;
-                if( stomach.contains() <= stomach.capacity() / 4 ) {
+                if( stomach.contains() <= stomach.capacity( *this ) / 4 ) {
                     if( get_kcal_percent() < 0.1f ) {
                         message = _( "Food…" );
                     } else if( get_kcal_percent() < 0.25f ) {
@@ -2763,9 +2687,9 @@ void player::check_needs_extremes()
 
 }
 
-needs_rates player::calc_needs_rates()
+needs_rates player::calc_needs_rates() const
 {
-    effect &sleep = get_effect( effect_sleep );
+    const effect &sleep = get_effect( effect_sleep );
     const bool has_recycler = has_bionic( bio_recycler );
     const bool asleep = !sleep.is_null();
 
@@ -2947,12 +2871,6 @@ void player::update_needs( int rate_multiplier )
         mod_painkiller( -std::min( get_painkiller(), rate_multiplier ) );
     }
 
-    if( g->is_in_sunlight( pos() ) ) {
-        if( has_bionic( bn_bio_solar ) ) {
-            mod_power_level( units::from_kilojoule( rate_multiplier * 25 ) );
-        }
-    }
-
     // Huge folks take penalties for cramming themselves in vehicles
     if( in_vehicle && ( has_trait( trait_HUGE ) || has_trait( trait_HUGE_OK ) ) ) {
         vehicle *veh = veh_pointer_or_null( g->m.veh_at( pos() ) );
@@ -3044,83 +2962,6 @@ bool player::is_hibernating() const
            get_thirst() <= 80 && has_active_mutation( trait_id( "HIBERNATE" ) );
 }
 
-void player::add_addiction( add_type type, int strength )
-{
-    if( type == ADD_NULL ) {
-        return;
-    }
-    time_duration timer = 2_hours;
-    if( has_trait( trait_ADDICTIVE ) ) {
-        strength *= 2;
-        timer = 1_hours;
-    } else if( has_trait( trait_NONADDICTIVE ) ) {
-        strength /= 2;
-        timer = 6_hours;
-    }
-    //Update existing addiction
-    for( auto &i : addictions ) {
-        if( i.type != type ) {
-            continue;
-        }
-
-        if( i.sated < 0_turns ) {
-            i.sated = timer;
-        } else if( i.sated < 10_minutes ) {
-            i.sated += timer; // TODO: Make this variable?
-        } else {
-            i.sated += timer / 2;
-        }
-        if( i.intensity < MAX_ADDICTION_LEVEL && strength > i.intensity * rng( 2, 5 ) ) {
-            i.intensity++;
-        }
-
-        add_msg( m_debug, "Updating addiction: %d intensity, %d sated",
-                 i.intensity, to_turns<int>( i.sated ) );
-
-        return;
-    }
-
-    // Add a new addiction
-    const int roll = rng( 0, 100 );
-    add_msg( m_debug, "Addiction: roll %d vs strength %d", roll, strength );
-    if( roll < strength ) {
-        const std::string &type_name = addiction_type_name( type );
-        add_msg( m_debug, "%s got addicted to %s", disp_name(), type_name );
-        addictions.emplace_back( type, 1 );
-        g->events().send<event_type::gains_addiction>( getID(), type );
-    }
-}
-
-bool player::has_addiction( add_type type ) const
-{
-    return std::any_of( addictions.begin(), addictions.end(),
-    [type]( const addiction & ad ) {
-        return ad.type == type && ad.intensity >= MIN_ADDICTION_LEVEL;
-    } );
-}
-
-void player::rem_addiction( add_type type )
-{
-    auto iter = std::find_if( addictions.begin(), addictions.end(),
-    [type]( const addiction & ad ) {
-        return ad.type == type;
-    } );
-
-    if( iter != addictions.end() ) {
-        addictions.erase( iter );
-        g->events().send<event_type::loses_addiction>( getID(), type );
-    }
-}
-
-int player::addiction_level( add_type type ) const
-{
-    auto iter = std::find_if( addictions.begin(), addictions.end(),
-    [type]( const addiction & ad ) {
-        return ad.type == type;
-    } );
-    return iter != addictions.end() ? iter->intensity : 0;
-}
-
 void player::siphon( vehicle &veh, const itype_id &desired_liquid )
 {
     auto qty = veh.fuel_left( desired_liquid );
@@ -3176,38 +3017,6 @@ void player::add_pain_msg( int val, body_part bp ) const
     }
 }
 
-void player::print_health() const
-{
-    if( !is_player() ) {
-        return;
-    }
-    int current_health = get_healthy();
-    if( has_trait( trait_SELFAWARE ) ) {
-        add_msg_if_player( _( "Your current health value is %d." ), current_health );
-    }
-
-    if( current_health > 0 &&
-        ( has_effect( effect_common_cold ) || has_effect( effect_flu ) ) ) {
-        return;
-    }
-
-    static const std::map<int, std::string> msg_categories = {
-        { -100, "health_horrible" },
-        { -50, "health_very_bad" },
-        { -10, "health_bad" },
-        { 10, "" },
-        { 50, "health_good" },
-        { 100, "health_very_good" },
-        { INT_MAX, "health_great" }
-    };
-
-    auto iter = msg_categories.lower_bound( current_health );
-    if( iter != msg_categories.end() && !iter->second.empty() ) {
-        const std::string &msg = SNIPPET.random_from_category( iter->second );
-        add_msg_if_player( current_health > 0 ? m_good : m_bad, msg );
-    }
-}
-
 void player::process_one_effect( effect &it, bool is_new )
 {
     bool reduced = resists_effect( it );
@@ -3424,1655 +3233,73 @@ void player::process_effects()
         remove_effect( effect_darkness );
     }
     if( has_trait( trait_M_IMMUNE ) && has_effect( effect_fungus ) ) {
-        vomit();
-        remove_effect( effect_fungus );
-        add_msg_if_player( m_bad,  _( "We have mistakenly colonized a local guide!  Purging now." ) );
-    }
-    if( has_trait( trait_PARAIMMUNE ) && ( has_effect( effect_dermatik ) ||
-                                           has_effect( effect_tapeworm ) ||
-                                           has_effect( effect_bloodworms ) || has_effect( effect_brainworms ) ||
-                                           has_effect( effect_paincysts ) ) ) {
-        remove_effect( effect_dermatik );
-        remove_effect( effect_tapeworm );
-        remove_effect( effect_bloodworms );
-        remove_effect( effect_brainworms );
-        remove_effect( effect_paincysts );
-        add_msg_if_player( m_good, _( "Something writhes and inside of you as it dies." ) );
-    }
-    if( has_trait( trait_ACIDBLOOD ) && ( has_effect( effect_dermatik ) ||
-                                          has_effect( effect_bloodworms ) ||
-                                          has_effect( effect_brainworms ) ) ) {
-        remove_effect( effect_dermatik );
-        remove_effect( effect_bloodworms );
-        remove_effect( effect_brainworms );
-    }
-    if( has_trait( trait_EATHEALTH ) && has_effect( effect_tapeworm ) ) {
-        remove_effect( effect_tapeworm );
-        add_msg_if_player( m_good, _( "Your bowels gurgle as something inside them dies." ) );
-    }
-    if( has_trait( trait_INFIMMUNE ) && ( has_effect( effect_bite ) || has_effect( effect_infected ) ||
-                                          has_effect( effect_recover ) ) ) {
-        remove_effect( effect_bite );
-        remove_effect( effect_infected );
-        remove_effect( effect_recover );
-    }
-
-    //Human only effects
-    for( auto &elem : *effects ) {
-        for( auto &_effect_it : elem.second ) {
-            process_one_effect( _effect_it.second, false );
-        }
-    }
-
-    Creature::process_effects();
-}
-
-double player::vomit_mod()
-{
-    double mod = 1;
-    if( has_effect( effect_weed_high ) ) {
-        mod *= .1;
-    }
-    if( has_trait( trait_STRONGSTOMACH ) ) {
-        mod *= .5;
-    }
-    if( has_trait( trait_WEAKSTOMACH ) ) {
-        mod *= 2;
-    }
-    if( has_trait( trait_NAUSEA ) ) {
-        mod *= 3;
-    }
-    if( has_trait( trait_VOMITOUS ) ) {
-        mod *= 3;
-    }
-    // If you're already nauseous, any food in your stomach greatly
-    // increases chance of vomiting. Liquids don't provoke vomiting, though.
-    if( stomach.contains() != 0_ml && has_effect( effect_nausea ) ) {
-        mod *= 5 * get_effect_int( effect_nausea );
-    }
-    return mod;
-}
-
-void player::suffer()
-{
-    const int current_stim = get_stim();
-    // TODO: Remove this section and encapsulate hp_cur
-    for( int i = 0; i < num_hp_parts; i++ ) {
-        body_part bp = hp_to_bp( static_cast<hp_part>( i ) );
-        if( hp_cur[i] <= 0 ) {
-            add_effect( effect_disabled, 1_turns, bp, true );
-        }
-    }
-
-    for( size_t i = 0; i < my_bionics->size(); i++ ) {
-        if( ( *my_bionics )[i].powered ) {
-            process_bionic( i );
-        }
-    }
-
-    for( auto &mut : my_mutations ) {
-        auto &tdata = mut.second;
-        if( !tdata.powered ) {
-            continue;
-        }
-        const auto &mdata = mut.first.obj();
-        if( tdata.powered && tdata.charge > 0 ) {
-            // Already-on units just lose a bit of charge
-            tdata.charge--;
-        } else {
-            // Not-on units, or those with zero charge, have to pay the power cost
-            if( mdata.cooldown > 0 ) {
-                tdata.powered = true;
-                tdata.charge = mdata.cooldown - 1;
-            }
-            if( mdata.hunger ) {
-                // does not directly modify hunger, but burns kcal
-                mod_stored_nutr( mdata.cost );
-                if( get_bmi() < character_weight_category::underweight ) {
-                    add_msg_if_player( m_warning, _( "You're too malnourished to keep your %s going." ), mdata.name() );
-                    tdata.powered = false;
-                }
-            }
-            if( mdata.thirst ) {
-                mod_thirst( mdata.cost );
-                if( get_thirst() >= 260 ) { // Well into Dehydrated
-                    add_msg_if_player( m_warning, _( "You're too dehydrated to keep your %s going." ), mdata.name() );
-                    tdata.powered = false;
-                }
-            }
-            if( mdata.fatigue ) {
-                mod_fatigue( mdata.cost );
-                if( get_fatigue() >= EXHAUSTED ) { // Exhausted
-                    add_msg_if_player( m_warning, _( "You're too exhausted to keep your %s going." ), mdata.name() );
-                    tdata.powered = false;
-                }
-            }
-
-            if( !tdata.powered ) {
-                apply_mods( mut.first, false );
-            }
-        }
-    }
-
-    if( underwater ) {
-        if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) ) {
-            oxygen--;
-        }
-        if( oxygen < 12 && worn_with_flag( "REBREATHER" ) ) {
-            oxygen += 12;
-        }
-        if( oxygen <= 5 ) {
-            if( has_bionic( bio_gills ) && get_power_level() >= 25_kJ ) {
-                oxygen += 5;
-                mod_power_level( -25_kJ );
-            } else {
-                add_msg_if_player( m_bad, _( "You're drowning!" ) );
-                apply_damage( nullptr, bp_torso, rng( 1, 4 ) );
-            }
-        }
-        if( has_trait( trait_FRESHWATEROSMOSIS ) && !g->m.has_flag_ter( "SALT_WATER", pos() ) &&
-            get_thirst() > -60 ) {
-            mod_thirst( -1 );
-        }
-    }
-
-    if( has_trait( trait_SHARKTEETH ) && one_turn_in( 24_hours ) ) {
-        add_msg_if_player( m_neutral, _( "You shed a tooth!" ) );
-        g->m.spawn_item( pos(), "bone", 1 );
-    }
-
-    if( has_active_mutation( trait_id( "WINGS_INSECT" ) ) ) {
-        //~Sound of buzzing Insect Wings
-        sounds::sound( pos(), 10, sounds::sound_t::movement, _( "BZZZZZ" ), false, "misc", "insect_wings" );
-    }
-
-    bool wearing_shoes = is_wearing_shoes( side::LEFT ) || is_wearing_shoes( side::RIGHT );
-    int root_vitamins = 0;
-    int root_water = 0;
-    if( has_trait( trait_ROOTS3 ) && g->m.has_flag( "PLOWABLE", pos() ) && !wearing_shoes ) {
-        root_vitamins += 1;
-        if( get_thirst() <= -2000 ) {
-            root_water += 51;
-        }
-    }
-
-    if( x_in_y( root_vitamins, 576 ) ) {
-        vitamin_mod( vitamin_id( "iron" ), 1, true );
-        vitamin_mod( vitamin_id( "calcium" ), 1, true );
-        mod_healthy_mod( 5, 50 );
-    }
-
-    if( x_in_y( root_water, 2550 ) ) {
-        // Plants draw some crazy amounts of water from the ground in real life,
-        // so these numbers try to reflect that uncertain but large amount
-        // this should take 12 hours to meet your daily needs with ROOTS2, and 8 with ROOTS3
-        mod_thirst( -1 );
-    }
-
-    time_duration timer = -6_hours;
-    if( has_trait( trait_ADDICTIVE ) ) {
-        timer = -10_hours;
-    } else if( has_trait( trait_NONADDICTIVE ) ) {
-        timer = -3_hours;
-    }
-    for( auto &cur_addiction : addictions ) {
-        if( cur_addiction.sated <= 0_turns &&
-            cur_addiction.intensity >= MIN_ADDICTION_LEVEL ) {
-            addict_effect( *this, cur_addiction );
-        }
-        cur_addiction.sated -= 1_turns;
-        // Higher intensity addictions heal faster
-        if( cur_addiction.sated - 10_minutes * cur_addiction.intensity < timer ) {
-            if( cur_addiction.intensity <= 2 ) {
-                rem_addiction( cur_addiction.type );
-                break;
-            } else {
-                cur_addiction.intensity--;
-                cur_addiction.sated = 0_turns;
-            }
-        }
-    }
-
-    if( !in_sleep_state() ) {
-        if( !has_trait( trait_id( "DEBUG_STORAGE" ) ) && ( weight_carried() > 4 * weight_capacity() ) ) {
-            if( has_effect( effect_downed ) ) {
-                add_effect( effect_downed, 1_turns, num_bp, false, 0, true );
-            } else {
-                add_effect( effect_downed, 2_turns, num_bp, false, 0, true );
-            }
-        }
-        if( has_trait( trait_CHEMIMBALANCE ) ) {
-            if( one_turn_in( 6_hours ) && !has_trait( trait_NOPAIN ) ) {
-                add_msg_if_player( m_bad, _( "You suddenly feel sharp pain for no reason." ) );
-                mod_pain( 3 * rng( 1, 3 ) );
-            }
-            if( one_turn_in( 6_hours ) ) {
-                int pkilladd = 5 * rng( -1, 2 );
-                if( pkilladd > 0 ) {
-                    add_msg_if_player( m_bad, _( "You suddenly feel numb." ) );
-                } else if( ( pkilladd < 0 ) && ( !( has_trait( trait_NOPAIN ) ) ) ) {
-                    add_msg_if_player( m_bad, _( "You suddenly ache." ) );
-                }
-                mod_painkiller( pkilladd );
-            }
-            if( one_turn_in( 6_hours ) && !has_effect( effect_sleep ) ) {
-                add_msg_if_player( m_bad, _( "You feel dizzy for a moment." ) );
-                moves -= rng( 10, 30 );
-            }
-            if( one_turn_in( 6_hours ) ) {
-                int hungadd = 5 * rng( -1, 3 );
-                if( hungadd > 0 ) {
-                    add_msg_if_player( m_bad, _( "You suddenly feel hungry." ) );
-                } else {
-                    add_msg_if_player( m_good, _( "You suddenly feel a little full." ) );
-                }
-                mod_hunger( hungadd );
-            }
-            if( one_turn_in( 6_hours ) ) {
-                add_msg_if_player( m_bad, _( "You suddenly feel thirsty." ) );
-                mod_thirst( 5 * rng( 1, 3 ) );
-            }
-            if( one_turn_in( 6_hours ) ) {
-                add_msg_if_player( m_good, _( "You feel fatigued all of a sudden." ) );
-                mod_fatigue( 10 * rng( 2, 4 ) );
-            }
-            if( one_turn_in( 8_hours ) ) {
-                if( one_in( 3 ) ) {
-                    add_morale( MORALE_FEELING_GOOD, 20, 100 );
-                } else {
-                    add_morale( MORALE_FEELING_BAD, -20, -100 );
-                }
-            }
-            if( one_turn_in( 6_hours ) ) {
-                if( one_in( 3 ) ) {
-                    add_msg_if_player( m_bad, _( "You suddenly feel very cold." ) );
-                    temp_cur.fill( BODYTEMP_VERY_COLD );
-                } else {
-                    add_msg_if_player( m_bad, _( "You suddenly feel cold." ) );
-                    temp_cur.fill( BODYTEMP_COLD );
-                }
-            }
-            if( one_turn_in( 6_hours ) ) {
-                if( one_in( 3 ) ) {
-                    add_msg_if_player( m_bad, _( "You suddenly feel very hot." ) );
-                    temp_cur.fill( BODYTEMP_VERY_HOT );
-                } else {
-                    add_msg_if_player( m_bad, _( "You suddenly feel hot." ) );
-                    temp_cur.fill( BODYTEMP_HOT );
-                }
-            }
-        }
-        if( ( has_trait( trait_SCHIZOPHRENIC ) || has_artifact_with( AEP_SCHIZO ) ) &&
-            !has_effect( effect_took_thorazine ) ) {
-            if( is_player() ) {
-                bool done_effect = false;
-                // Sound
-                if( one_turn_in( 4_hours ) ) {
-                    sound_hallu();
-                }
-
-                // Follower turns hostile
-                if( !done_effect && one_turn_in( 4_hours ) ) {
-                    std::vector<std::shared_ptr<npc>> followers = overmap_buffer.get_npcs_near_player( 12 );
-
-                    std::string who_gets_angry = name;
-                    if( !followers.empty() ) {
-                        who_gets_angry = random_entry_ref( followers )->name;
-                    }
-                    add_msg( m_bad, _( "%1$s gets angry!" ), who_gets_angry );
-                    done_effect = true;
-                }
-
-                // Monster dies
-                if( !done_effect && one_turn_in( 6_hours ) ) {
-
-                    // TODO: move to monster group json
-                    static const mtype_id mon_zombie( "mon_zombie" );
-                    static const mtype_id mon_zombie_fat( "mon_zombie_fat" );
-                    static const mtype_id mon_zombie_fireman( "mon_zombie_fireman" );
-                    static const mtype_id mon_zombie_cop( "mon_zombie_cop" );
-                    static const mtype_id mon_zombie_soldier( "mon_zombie_soldier" );
-                    static const std::array<mtype_id, 5> monsters = { {
-                            mon_zombie, mon_zombie_fat, mon_zombie_fireman, mon_zombie_cop, mon_zombie_soldier
-                        }
-                    };
-                    add_msg( _( "%s dies!" ), random_entry_ref( monsters )->nname() );
-                    done_effect = true;
-                }
-
-                // Limb Breaks
-                if( !done_effect && one_turn_in( 4_hours ) ) {
-                    std::string snip = SNIPPET.random_from_category( "broken_limb" );
-                    add_msg( m_bad, snip );
-                    done_effect = true;
-                }
-
-                // NPC chat
-                if( !done_effect && one_turn_in( 4_hours ) ) {
-                    std::string i_name = Name::generate( one_in( 2 ) );
-
-                    std::string i_talk = SNIPPET.random_from_category( "<lets_talk>" );
-                    parse_tags( i_talk, *this, *this );
-
-                    add_msg( _( "%1$s says: \"%2$s\"" ), i_name, i_talk );
-                    done_effect = true;
-                }
-
-                // Skill raise
-                if( !done_effect && one_turn_in( 12_hours ) ) {
-                    skill_id raised_skill = Skill::random_skill();
-                    add_msg( m_good, _( "You increase %1$s to level %2$d." ), raised_skill.obj().name(),
-                             get_skill_level( raised_skill ) + 1 );
-                    done_effect = true;
-                }
-
-                // Talk to self
-                if( !done_effect && one_turn_in( 4_hours ) ) {
-                    std::string snip = SNIPPET.random_from_category( "schizo_self_talk" );
-                    add_msg( _( "%1$s says: \"%2$s\"" ), name, snip );
-                    done_effect = true;
-                }
-
-                // Talking weapon
-                if( !done_effect && !weapon.is_null() ) {
-                    // If player has a weapon, picks a message from said weapon
-                    // Weapon tells player to kill a monster if any are nearby
-                    // Weapon is concerned for player if bleeding
-                    // Weapon is concerned for itself if damaged
-                    // Otherwise random chit-chat
-
-                    std::string i_name_w = weapon.has_var( "item_label" ) ?
-                                           weapon.get_var( "item_label" ) :
-                                           //~ %1$s: weapon name
-                                           string_format( _( "Your %1$s" ), weapon.type_name() );
-
-                    std::vector<std::weak_ptr<monster>> mons = g->all_monsters().items;
-
-                    std::string i_talk_w;
-                    bool does_talk = false;
-                    if( !mons.empty() && one_turn_in( 12_minutes ) ) {
-                        std::vector<std::string> seen_mons;
-                        for( auto &n : mons ) {
-                            if( sees( *n.lock() ) ) {
-                                seen_mons.emplace_back( n.lock()->get_name() );
-                            }
-                        }
-                        if( !seen_mons.empty() ) {
-                            std::string talk_w = SNIPPET.random_from_category( "schizo_weapon_talk_monster" );
-                            i_talk_w = string_format( talk_w, random_entry_ref( seen_mons ) );
-                            does_talk = true;
-                        }
-                    }
-                    if( !does_talk && has_effect( effect_bleed ) && one_turn_in( 5_minutes ) ) {
-                        i_talk_w = SNIPPET.random_from_category( "schizo_weapon_talk_bleeding" );
-                        does_talk = true;
-                    } else if( weapon.damage() >= weapon.max_damage() / 3 && one_turn_in( 1_hours ) ) {
-                        i_talk_w = SNIPPET.random_from_category( "schizo_weapon_talk_damaged" );
-                        does_talk = true;
-                    } else if( one_turn_in( 4_hours ) ) {
-                        i_talk_w = SNIPPET.random_from_category( "schizo_weapon_talk_misc" );
-                        does_talk = true;
-                    }
-                    if( does_talk ) {
-                        add_msg( _( "%1$s says: \"%2$s\"" ), i_name_w, i_talk_w );
-                        done_effect = true;
-                    }
-                }
-                // Delusions
-                if( !done_effect && one_turn_in( 8_hours ) ) {
-                    if( rng( 1, 20 ) > 5 ) {  // 75% chance
-                        std::string snip = SNIPPET.random_from_category( "schizo_delusion_paranoid" );
-                        add_msg( m_warning, snip );
-                        add_morale( MORALE_FEELING_BAD, -20, -100 );
-                    } else { // 25% chance
-                        std::string snip = SNIPPET.random_from_category( "schizo_delusion_grandiose" );
-                        add_msg( m_good, snip );
-                        add_morale( MORALE_FEELING_GOOD, 20, 100 );
-                    }
-                    done_effect = true;
-                }
-                // Formication
-                if( !done_effect && one_turn_in( 6_hours ) ) {
-                    std::string snip = SNIPPET.random_from_category( "schizo_formication" );
-                    body_part bp = random_body_part( true );
-                    add_effect( effect_formication, 45_minutes, bp );
-                    add_msg( m_bad, snip );
-                    done_effect = true;
-                }
-                // Numbness
-                if( !done_effect && one_turn_in( 4_hours ) ) {
-                    add_msg( m_bad, _( "You suddenly feel so numb…" ) );
-                    mod_painkiller( 25 );
-                    done_effect = true;
-                }
-                // Hallucination
-                if( !done_effect && one_turn_in( 6_hours ) ) {
-                    add_effect( effect_hallu, 6_hours );
-                    done_effect = true;
-                }
-                // Visuals
-                if( !done_effect && one_turn_in( 2_hours ) ) {
-                    add_effect( effect_visuals, rng( 15_turns, 60_turns ) );
-                    done_effect = true;
-                }
-                // Shaking
-                if( !done_effect && !has_effect( effect_valium ) && one_turn_in( 4_hours ) ) {
-                    add_msg( m_bad, _( "You start to shake uncontrollably." ) );
-                    add_effect( effect_shakes, rng( 2_minutes, 5_minutes ) );
-                    done_effect = true;
-                }
-                // Shout
-                if( !done_effect && one_turn_in( 4_hours ) ) {
-                    std::string snip = SNIPPET.random_from_category( "schizo_self_shout" );
-                    shout( string_format( _( "yourself shout, %s" ), snip ) );
-                    done_effect = true;
-                }
-                // Drop weapon
-                if( !done_effect && one_turn_in( 2_days ) ) {
-                    if( !weapon.is_null() ) {
-                        std::string i_name_w = weapon.has_var( "item_label" ) ?
-                                               weapon.get_var( "item_label" ) :
-                                               //~ %1$s: weapon name
-                                               string_format( _( "your %1$s" ), weapon.type_name() );
-
-                        std::string snip = SNIPPET.random_from_category( "schizo_weapon_drop" );
-                        std::string str = string_format( snip, i_name_w );
-                        str[0] = toupper( str[0] );
-
-                        add_msg( m_bad, str );
-                        drop( get_item_position( &weapon ), pos() );
-                        // NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores)
-                        done_effect = true;
-                    }
-                }
-            }
-        }
-
-        if( ( has_trait( trait_NARCOLEPTIC ) || has_artifact_with( AEP_SCHIZO ) ) ) {
-            if( one_turn_in( 8_hours ) ) {
-                add_msg( m_bad, _( "You're suddenly overcome with the urge to sleep and you pass out." ) );
-                add_effect( effect_lying_down, 20_minutes );
-            }
-        }
-
-        if( has_trait( trait_JITTERY ) && !has_effect( effect_shakes ) ) {
-            if( current_stim > 50 && one_in( to_turns<int>( 30_minutes ) - ( current_stim * 6 ) ) ) {
-                add_effect( effect_shakes, 30_minutes + 1_turns * current_stim );
-            } else if( ( get_hunger() > 80 || get_kcal_percent() < 1.0f ) && get_hunger() > 0 &&
-                       one_in( to_turns<int>( 50_minutes ) - ( get_hunger() * 6 ) ) ) {
-                add_effect( effect_shakes, 40_minutes );
-            }
-        }
-
-        if( has_trait( trait_MOODSWINGS ) && one_turn_in( 6_hours ) ) {
-            if( rng( 1, 20 ) > 9 ) { // 55% chance
-                add_morale( MORALE_MOODSWING, -100, -500 );
-            } else {  // 45% chance
-                add_morale( MORALE_MOODSWING, 100, 500 );
-            }
-        }
-
-        if( has_trait( trait_VOMITOUS ) && one_turn_in( 7_hours ) ) {
-            vomit();
-        }
-
-        if( has_trait( trait_SHOUT1 ) && one_turn_in( 6_hours ) ) {
-            shout();
-        }
-        if( has_trait( trait_SHOUT2 ) && one_turn_in( 4_hours ) ) {
-            shout();
-        }
-        if( has_trait( trait_SHOUT3 ) && one_turn_in( 3_hours ) ) {
-            shout();
-        }
-        if( has_trait( trait_M_SPORES ) && one_turn_in( 4_hours ) ) {
-            spores();
-        }
-        if( has_trait( trait_M_BLOSSOMS ) && one_turn_in( 3_hours ) ) {
-            blossoms();
-        }
-    } // Done with while-awake-only effects
-
-    if( has_trait( trait_ASTHMA ) && !has_effect( effect_adrenaline ) &&
-        !has_effect( effect_datura ) &&
-        one_in( ( to_turns<int>( 6_hours ) - current_stim * 300 ) *
-                ( has_effect( effect_sleep ) ? 10 : 1 ) ) ) {
-        bool auto_use = has_charges( "inhaler", 1 ) || has_charges( "oxygen_tank", 1 ) ||
-                        has_charges( "smoxygen_tank", 1 );
-        bool oxygenator = has_bionic( bio_gills ) && get_power_level() >= 3_kJ;
-        if( underwater ) {
-            oxygen = oxygen / 2;
-            auto_use = false;
-        }
-
-        add_msg_player_or_npc( m_bad, _( "You have an asthma attack!" ),
-                               "<npcname> starts wheezing and coughing." );
-
-        if( in_sleep_state() && !has_effect( effect_narcosis ) ) {
-            inventory map_inv;
-            map_inv.form_from_map( g->u.pos(), 2, &g->u );
-            // check if an inhaler is somewhere near
-            bool nearby_use = auto_use || oxygenator || map_inv.has_charges( "inhaler", 1 ) ||
-                              map_inv.has_charges( "oxygen_tank", 1 ) ||
-                              map_inv.has_charges( "smoxygen_tank", 1 );
-            // check if character has an oxygenator first
-            if( oxygenator ) {
-                mod_power_level( -3_kJ );
-                add_msg_if_player( m_info, _( "You use your Oxygenator to clear it up, "
-                                              "then go back to sleep." ) );
-            } else if( auto_use ) {
-                if( use_charges_if_avail( "inhaler", 1 ) ) {
-                    add_msg_if_player( m_info, _( "You use your inhaler and go back to sleep." ) );
-                } else if( use_charges_if_avail( "oxygen_tank", 1 ) ||
-                           use_charges_if_avail( "smoxygen_tank", 1 ) ) {
-                    add_msg_if_player( m_info, _( "You take a deep breath from your oxygen tank "
-                                                  "and go back to sleep." ) );
-                }
-            } else if( nearby_use ) {
-                // create new variable to resolve a reference issue
-                int amount = 1;
-                if( !g->m.use_charges( g->u.pos(), 2, "inhaler", amount ).empty() ) {
-                    add_msg_if_player( m_info, _( "You use your inhaler and go back to sleep." ) );
-                } else if( !g->m.use_charges( g->u.pos(), 2, "oxygen_tank", amount ).empty() ||
-                           !g->m.use_charges( g->u.pos(), 2, "smoxygen_tank", amount ).empty() ) {
-                    add_msg_if_player( m_info, _( "You take a deep breath from your oxygen tank "
-                                                  "and go back to sleep." ) );
-                }
-            } else {
-                add_effect( effect_asthma, rng( 5_minutes, 20_minutes ) );
-                if( has_effect( effect_sleep ) ) {
-                    wake_up();
-                } else {
-                    if( !is_npc() ) {
-                        g->cancel_activity_or_ignore_query( distraction_type::asthma,
-                                                            _( "You can't focus while choking!" ) );
-                    }
-                }
-            }
-        } else if( auto_use ) {
-            int charges = 0;
-            if( use_charges_if_avail( "inhaler", 1 ) ) {
-                moves -= 40;
-                charges = charges_of( "inhaler" );
-                if( charges == 0 ) {
-                    add_msg_if_player( m_bad, _( "You use your last inhaler charge." ) );
-                } else {
-                    add_msg_if_player( m_info, ngettext( "You use your inhaler, "
-                                                         "only %d charge left.",
-                                                         "You use your inhaler, "
-                                                         "only %d charges left.", charges ),
-                                       charges );
-                }
-            } else if( use_charges_if_avail( "oxygen_tank", 1 ) ||
-                       use_charges_if_avail( "smoxygen_tank", 1 ) ) {
-                moves -= 500; // synched with use action
-                charges = charges_of( "oxygen_tank" ) + charges_of( "smoxygen_tank" );
-                if( charges == 0 ) {
-                    add_msg_if_player( m_bad, _( "You breathe in last bit of oxygen "
-                                                 "from the tank." ) );
-                } else {
-                    add_msg_if_player( m_info, ngettext( "You take a deep breath from your oxygen "
-                                                         "tank, only %d charge left.",
-                                                         "You take a deep breath from your oxygen "
-                                                         "tank, only %d charges left.", charges ),
-                                       charges );
-                }
-            }
-        } else {
-            add_effect( effect_asthma, rng( 5_minutes, 20_minutes ) );
-            if( !is_npc() ) {
-                g->cancel_activity_or_ignore_query( distraction_type::asthma,
-                                                    _( "You can't focus while choking!" ) );
-            }
-        }
-    }
-
-    double sleeve_factor = armwear_factor();
-    const bool has_hat = wearing_something_on( bp_head );
-    const bool leafy = has_trait( trait_LEAVES ) || has_trait( trait_LEAVES2 ) ||
-                       has_trait( trait_LEAVES3 );
-    const bool leafier = has_trait( trait_LEAVES2 ) || has_trait( trait_LEAVES3 );
-    const bool leafiest = has_trait( trait_LEAVES3 );
-    int sunlight_nutrition = 0;
-    if( leafy && g->m.is_outside( pos() ) && ( g->light_level( pos().z ) >= 40 ) ) {
-        const float weather_factor = ( g->weather.weather == WEATHER_CLEAR ||
-                                       g->weather.weather == WEATHER_SUNNY ) ? 1.0 : 0.5;
-        const int player_local_temp = g->weather.get_temperature( pos() );
-        int flux = ( player_local_temp - 65 ) / 2;
-        if( !has_hat ) {
-            sunlight_nutrition += ( 100 + flux ) * weather_factor;
-        }
-        if( leafier ) {
-            int rate = ( ( 100 * sleeve_factor ) + flux ) * 2;
-            sunlight_nutrition += ( rate * ( leafiest ? 2 : 1 ) ) * weather_factor;
-        }
-    }
-
-    if( x_in_y( sunlight_nutrition, 18000 ) ) {
-        vitamin_mod( vitamin_id( "vitA" ), 1, true );
-        vitamin_mod( vitamin_id( "vitC" ), 1, true );
-    }
-
-    if( x_in_y( sunlight_nutrition, 12000 ) ) {
-        mod_hunger( -1 );
-        // photosynthesis absorbs kcal directly
-        mod_stored_nutr( -1 );
-        stomach.ate();
-    }
-
-    if( get_pain() > 0 ) {
-        if( has_trait( trait_PAINREC1 ) && one_turn_in( 1_hours ) ) {
-            mod_pain( -1 );
-        }
-        if( has_trait( trait_PAINREC2 ) && one_turn_in( 30_minutes ) ) {
-            mod_pain( -1 );
-        }
-        if( has_trait( trait_PAINREC3 ) && one_turn_in( 15_minutes ) ) {
-            mod_pain( -1 );
-        }
-    }
-
-    if( ( has_trait( trait_ALBINO ) || has_effect( effect_datura ) ) &&
-        g->is_in_sunlight( pos() ) && one_turn_in( 1_minutes ) ) {
-        // Umbrellas can keep the sun off the skin and sunglasses - off the eyes.
-        if( !weapon.has_flag( "RAIN_PROTECT" ) ) {
-            //calculate total coverage of skin
-            body_part_set affected_bp { {
-                    bp_leg_l, bp_leg_r, bp_torso, bp_head, bp_mouth, bp_arm_l,
-                    bp_arm_r, bp_foot_l, bp_foot_r, bp_hand_l, bp_hand_r
-                }
-            };
-            //pecentage of "open skin" by body part
-            std::map<body_part, float> open_percent;
-            //initialize coverage
-            for( const body_part &bp : all_body_parts ) {
-                if( affected_bp.test( bp ) ) {
-                    open_percent[bp] = 1.0;
-                }
-            }
-            //calculate coverage for every body part
-            for( const item &i : worn ) {
-                body_part_set covered = i.get_covered_body_parts();
-                for( const body_part &bp : all_body_parts )  {
-                    if( !affected_bp.test( bp ) || !covered.test( bp ) ) {
-                        continue;
-                    }
-                    //percent of "not covered skin"
-                    float p = 1.0 - i.get_coverage() / 100.0;
-                    open_percent[bp] = open_percent[bp] * p;
-                }
-            }
-
-            const float COVERAGE_LIMIT = 0.01;
-            body_part max_affected_bp = num_bp;
-            float max_affected_bp_percent = 0;
-            int count_affected_bp = 0;
-            for( auto &it : open_percent ) {
-                const body_part &bp = it.first;
-                const float &p = it.second;
-
-                if( p <= COVERAGE_LIMIT ) {
-                    continue;
-                }
-                ++count_affected_bp;
-                if( max_affected_bp_percent < p ) {
-                    max_affected_bp_percent = p;
-                    max_affected_bp = bp;
-                }
-            }
-            if( count_affected_bp > 0 && max_affected_bp != num_bp ) {
-                //Check if both arms/legs are affected
-                int parts_count = 1;
-                body_part other_bp = static_cast<body_part>( bp_aiOther[max_affected_bp] );
-                body_part other_bp_rev = static_cast<body_part>( bp_aiOther[other_bp] );
-                if( other_bp != other_bp_rev ) {
-                    const auto found = open_percent.find( other_bp );
-                    if( found != open_percent.end() && found->second > COVERAGE_LIMIT ) {
-                        ++parts_count;
-                    }
-                }
-                std::string bp_name = body_part_name( max_affected_bp, parts_count );
-                if( count_affected_bp > parts_count ) {
-                    bp_name = string_format( _( "%s and other body parts" ), bp_name );
-                }
-                add_msg_if_player( m_bad, _( "The sunlight is really irritating your %s." ), bp_name );
-
-                //apply effects
-                if( has_effect( effect_sleep ) && !has_effect( effect_narcosis ) ) {
-                    wake_up();
-                }
-                if( one_turn_in( 1_minutes ) ) {
-                    mod_pain( 1 );
-                } else {
-                    focus_pool --;
-                }
-            }
-        }
-        if( !( ( ( worn_with_flag( "SUN_GLASSES" ) ) || worn_with_flag( "BLIND" ) ) &&
-               ( wearing_something_on( bp_eyes ) ) )
-            && !has_bionic( bionic_id( "bio_sunglasses" ) ) ) {
-            add_msg_if_player( m_bad, _( "The sunlight is really irritating your eyes." ) );
-            if( one_turn_in( 1_minutes ) ) {
-                mod_pain( 1 );
-            } else {
-                focus_pool --;
-            }
-        }
-    }
-    for( const auto &m : my_mutations ) {
-        const mutation_branch &mdata = m.first.obj();
-        for( const body_part bp : all_body_parts ) {
-            if( calendar::once_every( 1_minutes ) ) {
-                // 0.0 - 1.0
-                const float wetness_percentage =  static_cast<float>( body_wetness[bp] ) / drench_capacity[bp];
-                const int dmg = mdata.weakness_to_water * wetness_percentage;
-                if( dmg > 0 ) {
-                    apply_damage( nullptr, bp, dmg );
-                    add_msg_player_or_npc( m_bad, _( "Your %s is damaged by the water." ),
-                                           _( "<npcname>'s %s is damaged by the water." ), body_part_name( bp ) );
-                } else if( dmg < 0 && hp_cur[bp_to_hp( bp )] != hp_max[bp_to_hp( bp )] ) {
-                    heal( bp, abs( dmg ) );
-                    add_msg_player_or_npc( m_good, _( "Your %s is healed by the water." ),
-                                           _( "<npcname>'s %s is healed by the water." ), body_part_name( bp ) );
-                }
-            }
-        }
-    }
-
-    if( has_trait( trait_SUNBURN ) && g->is_in_sunlight( pos() ) && one_in( 10 ) ) {
-        if( !( weapon.has_flag( "RAIN_PROTECT" ) ) ) {
-            add_msg_if_player( m_bad, _( "The sunlight burns your skin!" ) );
-            if( has_effect( effect_sleep ) && !has_effect( effect_narcosis ) ) {
-                wake_up();
-            }
-            mod_pain( 1 );
-            hurtall( 1, nullptr );
-        }
-    }
-
-    if( ( has_trait( trait_TROGLO ) || has_trait( trait_TROGLO2 ) ) &&
-        g->is_in_sunlight( pos() ) && g->weather.weather == WEATHER_SUNNY ) {
-        mod_str_bonus( -1 );
-        mod_dex_bonus( -1 );
-        add_miss_reason( _( "The sunlight distracts you." ), 1 );
-        mod_int_bonus( -1 );
-        mod_per_bonus( -1 );
-    }
-    if( has_trait( trait_TROGLO2 ) && g->is_in_sunlight( pos() ) ) {
-        mod_str_bonus( -1 );
-        mod_dex_bonus( -1 );
-        add_miss_reason( _( "The sunlight distracts you." ), 1 );
-        mod_int_bonus( -1 );
-        mod_per_bonus( -1 );
-    }
-    if( has_trait( trait_TROGLO3 ) && g->is_in_sunlight( pos() ) ) {
-        mod_str_bonus( -4 );
-        mod_dex_bonus( -4 );
-        add_miss_reason( _( "You can't stand the sunlight!" ), 4 );
-        mod_int_bonus( -4 );
-        mod_per_bonus( -4 );
-    }
-
-    if( has_trait( trait_SORES ) ) {
-        for( const body_part bp : all_body_parts ) {
-            if( bp == bp_head ) {
-                continue;
-            }
-            int sores_pain = 5 + 0.4 * abs( encumb( bp ) );
-            if( get_pain() < sores_pain ) {
-                set_pain( sores_pain );
-            }
-        }
-    }
-    //Web Weavers...weave web
-    if( has_active_mutation( trait_WEB_WEAVER ) && !in_vehicle ) {
-        // this adds intensity to if its not already there.
-        g->m.add_field( pos(), fd_web, 1 );
-
-    }
-
-    // Blind/Deaf for brief periods about once an hour,
-    // and visuals about once every 30 min.
-    if( has_trait( trait_PER_SLIME ) ) {
-        if( one_turn_in( 1_hours ) && !has_effect( effect_deaf ) ) {
-            add_msg_if_player( m_bad, _( "Suddenly, you can't hear anything!" ) );
-            add_effect( effect_deaf, rng( 20_minutes, 60_minutes ) );
-        }
-        if( one_turn_in( 1_hours ) && !( has_effect( effect_blind ) ) ) {
-            add_msg_if_player( m_bad, _( "Suddenly, your eyes stop working!" ) );
-            add_effect( effect_blind, rng( 2_minutes, 6_minutes ) );
-        }
-        // Yes, you can be blind and hallucinate at the same time.
-        // Your post-human biology is truly remarkable.
-        if( one_turn_in( 30_minutes ) && !( has_effect( effect_visuals ) ) ) {
-            add_msg_if_player( m_bad, _( "Your visual centers must be acting up…" ) );
-            add_effect( effect_visuals, rng( 36_minutes, 72_minutes ) );
-        }
-    }
-
-    if( has_trait( trait_WEB_SPINNER ) && !in_vehicle && one_in( 3 ) ) {
-        // this adds intensity to if its not already there.
-        g->m.add_field( pos(), fd_web, 1 );
-    }
-
-    if( has_trait( trait_UNSTABLE ) && !has_trait( trait_CHAOTIC_BAD ) && one_turn_in( 48_hours ) ) {
-        mutate();
-    }
-    if( ( has_trait( trait_CHAOTIC ) || has_trait( trait_CHAOTIC_BAD ) ) && one_turn_in( 12_hours ) ) {
-        mutate();
-    }
-    if( has_artifact_with( AEP_MUTAGENIC ) && one_turn_in( 48_hours ) ) {
-        mutate();
-    }
-    if( has_artifact_with( AEP_FORCE_TELEPORT ) && one_turn_in( 1_hours ) ) {
-        teleport::teleport( *this );
-    }
-    const bool needs_fire = !has_morale( MORALE_PYROMANIA_NEARFIRE ) &&
-                            !has_morale( MORALE_PYROMANIA_STARTFIRE );
-    if( has_trait( trait_PYROMANIA ) && needs_fire && !in_sleep_state() &&
-        calendar::once_every( 2_hours ) ) {
-        add_morale( MORALE_PYROMANIA_NOFIRE, -1, -30, 24_hours, 24_hours, true );
-        if( calendar::once_every( 4_hours ) ) {
-            std::string smokin_hot_fiyah = SNIPPET.random_from_category( "pyromania_withdrawal" );
-            add_msg_if_player( m_bad, _( smokin_hot_fiyah ) );
-        }
-    }
-    if( has_trait( trait_KILLER ) && !has_morale( MORALE_KILLER_HAS_KILLED ) &&
-        calendar::once_every( 2_hours ) ) {
-        add_morale( MORALE_KILLER_NEED_TO_KILL, -1, -30, 24_hours, 24_hours );
-        if( calendar::once_every( 4_hours ) ) {
-            std::string snip = SNIPPET.random_from_category( "killer_withdrawal" );
-            add_msg_if_player( m_bad, _( snip ) );
-        }
-    }
-
-    // checking for radioactive items in inventory
-    const int item_radiation = leak_level( "RADIOACTIVE" );
-
-    const int map_radiation = g->m.get_radiation( pos() );
-
-    float rads = map_radiation / 100.0f + item_radiation / 10.0f;
-
-    int rad_mut = 0;
-    if( has_trait( trait_RADIOACTIVE3 ) ) {
-        rad_mut = 3;
-    } else if( has_trait( trait_RADIOACTIVE2 ) ) {
-        rad_mut = 2;
-    } else if( has_trait( trait_RADIOACTIVE1 ) ) {
-        rad_mut = 1;
-    }
-
-    // Spread less radiation when sleeping (slower metabolism etc.)
-    // Otherwise it can quickly get to the point where you simply can't sleep at all
-    const bool rad_mut_proc = rad_mut > 0 &&
-                              x_in_y( rad_mut, to_turns<int>( in_sleep_state() ? 3_hours : 30_minutes ) );
-
-    bool has_helmet = false;
-    const bool power_armored = is_wearing_power_armor( &has_helmet );
-    const bool rad_resist = power_armored || worn_with_flag( "RAD_RESIST" );
-
-    if( rad_mut > 0 ) {
-        const bool kept_in = is_rad_immune() || ( rad_resist && !one_in( 4 ) );
-        if( kept_in ) {
-            // As if standing on a map tile with radiation level equal to rad_mut
-            rads += rad_mut / 100.0f;
-        }
-
-        if( rad_mut_proc && !kept_in ) {
-            // Irradiate a random nearby point
-            // If you can't, irradiate the player instead
-            tripoint rad_point = pos() + point( rng( -3, 3 ), rng( -3, 3 ) );
-            // TODO: Radioactive vehicles?
-            if( g->m.get_radiation( rad_point ) < rad_mut ) {
-                g->m.adjust_radiation( rad_point, 1 );
-            } else {
-                rads += rad_mut;
-            }
-        }
-    }
-
-    // Used to control vomiting from radiation to make it not-annoying
-    bool radiation_increasing = irradiate( rads );
-
-    if( radiation_increasing && calendar::once_every( 3_minutes ) && has_bionic( bio_geiger ) ) {
-        add_msg_if_player( m_warning,
-                           _( "You feel an anomalous sensation coming from your radiation sensors." ) );
-    }
-
-    if( calendar::once_every( 15_minutes ) ) {
-        if( radiation < 0 ) {
-            radiation = 0;
-        } else if( radiation > 2000 ) {
-            radiation = 2000;
-        }
-        if( get_option<bool>( "RAD_MUTATION" ) && rng( 100, 10000 ) < radiation ) {
-            mutate();
-            radiation -= 50;
-        } else if( radiation > 50 && rng( 1, 3000 ) < radiation && ( stomach.contains() > 0_ml ||
-                   radiation_increasing || !in_sleep_state() ) ) {
-            vomit();
-            radiation -= 1;
-        }
-    }
-
-    const bool radiogenic = has_trait( trait_RADIOGENIC );
-    if( radiogenic && calendar::once_every( 30_minutes ) && radiation > 0 ) {
-        // At 200 irradiation, twice as fast as REGEN
-        if( x_in_y( radiation, 200 ) ) {
-            healall( 1 );
-            if( rad_mut == 0 ) {
-                // Don't heal radiation if we're generating it naturally
-                // That would counter the main downside of radioactivity
-                radiation -= 5;
-            }
-        }
-    }
-
-    if( !radiogenic && radiation > 0 ) {
-        // Even if you heal the radiation itself, the damage is done.
-        const int hmod = get_healthy_mod();
-        if( hmod > 200 - radiation ) {
-            set_healthy_mod( std::max( -200, 200 - radiation ) );
-        }
-    }
-
-    if( radiation > 200 && calendar::once_every( 10_minutes ) && x_in_y( radiation, 1000 ) ) {
-        hurtall( 1, nullptr );
-        radiation -= 5;
-    }
-
-    if( reactor_plut || tank_plut || slow_rad ) {
-        // Microreactor CBM and supporting bionics
-        if( has_bionic( bio_reactor ) || has_bionic( bio_advreactor ) ) {
-            //first do the filtering of plutonium from storage to reactor
-            if( tank_plut > 0 ) {
-                int plut_trans;
-                if( has_active_bionic( bio_plut_filter ) ) {
-                    plut_trans = tank_plut * 0.025;
-                } else {
-                    plut_trans = tank_plut * 0.005;
-                }
-                if( plut_trans < 1 ) {
-                    plut_trans = 1;
-                }
-                tank_plut -= plut_trans;
-                reactor_plut += plut_trans;
-            }
-            //leaking radiation, reactor is unshielded, but still better than a simple tank
-            slow_rad += ( ( tank_plut * 0.1 ) + ( reactor_plut * 0.01 ) );
-            //begin power generation
-            if( reactor_plut > 0 ) {
-                int power_gen = 0;
-                if( has_bionic( bio_advreactor ) ) {
-                    if( ( reactor_plut * 0.05 ) > 2000 ) {
-                        power_gen = 2000;
-                    } else {
-                        power_gen = reactor_plut * 0.05;
-                        if( power_gen < 1 ) {
-                            power_gen = 1;
-                        }
-                    }
-                    slow_rad += ( power_gen * 3 );
-                    while( slow_rad >= 50 ) {
-                        if( power_gen >= 1 ) {
-                            slow_rad -= 50;
-                            power_gen -= 1;
-                            reactor_plut -= 1;
-                        } else {
-                            break;
-                        }
-                    }
-                } else if( has_bionic( bio_reactor ) ) {
-                    if( ( reactor_plut * 0.025 ) > 500 ) {
-                        power_gen = 500;
-                    } else {
-                        power_gen = reactor_plut * 0.025;
-                        if( power_gen < 1 ) {
-                            power_gen = 1;
-                        }
-                    }
-                    slow_rad += ( power_gen * 3 );
-                }
-                reactor_plut -= power_gen;
-                while( power_gen >= 250 ) {
-                    apply_damage( nullptr, bp_torso, 1 );
-                    mod_pain( 1 );
-                    add_msg_if_player( m_bad, _( "Your chest burns as your power systems overload!" ) );
-                    mod_power_level( 50_kJ );
-                    power_gen -= 60; // ten units of power lost due to short-circuiting into you
-                }
-                mod_power_level( units::from_kilojoule( power_gen ) );
-            }
-        } else {
-            slow_rad += ( ( ( reactor_plut * 0.4 ) + ( tank_plut * 0.4 ) ) * 100 );
-            //plutonium in body without any kind of container.  Not good at all.
-            reactor_plut *= 0.6;
-            tank_plut *= 0.6;
-        }
-        while( slow_rad >= 1000 ) {
-            radiation += 1;
-            slow_rad -= 1000;
-        }
-    }
-
-    // Negative bionics effects
-    if( has_bionic( bio_dis_shock ) && get_power_level() > 9_kJ && one_turn_in( 2_hours ) &&
-        !has_effect( effect_narcosis ) ) {
-        add_msg_if_player( m_bad, _( "You suffer a painful electrical discharge!" ) );
-        mod_pain( 1 );
-        moves -= 150;
-        mod_power_level( -10_kJ );
-
-        if( weapon.typeId() == "e_handcuffs" && weapon.charges > 0 ) {
-            weapon.charges -= rng( 1, 3 ) * 50;
-            if( weapon.charges < 1 ) {
-                weapon.charges = 1;
-            }
-
-            add_msg_if_player( m_good, _( "The %s seems to be affected by the discharge." ),
-                               weapon.tname() );
-        }
-        sfx::play_variant_sound( "bionics", "elec_discharge", 100 );
-    }
-    if( has_bionic( bio_dis_acid ) && one_turn_in( 150_minutes ) ) {
-        add_msg_if_player( m_bad, _( "You suffer a burning acidic discharge!" ) );
-        hurtall( 1, nullptr );
-        sfx::play_variant_sound( "bionics", "acid_discharge", 100 );
-        sfx::do_player_death_hurt( g->u, false );
-    }
-    if( has_bionic( bio_drain ) && get_power_level() > 24_kJ && one_turn_in( 1_hours ) ) {
-        add_msg_if_player( m_bad, _( "Your batteries discharge slightly." ) );
-        mod_power_level( -25_kJ );
-        sfx::play_variant_sound( "bionics", "elec_crackle_low", 100 );
-    }
-    if( has_bionic( bio_noise ) && one_turn_in( 50_minutes ) &&
-        !has_effect( effect_narcosis ) ) {
-        // TODO: NPCs with said bionic
-        if( !is_deaf() ) {
-            add_msg( m_bad, _( "A bionic emits a crackle of noise!" ) );
-            sfx::play_variant_sound( "bionics", "elec_blast", 100 );
-        } else {
-            add_msg( m_bad, _( "You feel your faulty bionic shuddering." ) );
-            sfx::play_variant_sound( "bionics", "elec_blast_muffled", 100 );
-        }
-        sounds::sound( pos(), 60, sounds::sound_t::movement, _( "Crackle!" ) ); //sfx above
-    }
-    if( has_bionic( bio_power_weakness ) && has_max_power() &&
-        get_power_level() >= get_max_power_level() * .75 ) {
-        mod_str_bonus( -3 );
-    }
-    if( has_bionic( bio_trip ) && one_turn_in( 50_minutes ) &&
-        !has_effect( effect_visuals ) &&
-        !has_effect( effect_narcosis ) && !in_sleep_state() ) {
-        add_msg_if_player( m_bad, _( "Your vision pixelates!" ) );
-        add_effect( effect_visuals, 10_minutes );
-        sfx::play_variant_sound( "bionics", "pixelated", 100 );
-    }
-    if( has_bionic( bio_spasm ) && one_turn_in( 5_hours ) && !has_effect( effect_downed ) &&
-        !has_effect( effect_narcosis ) ) {
-        add_msg_if_player( m_bad,
-                           _( "Your malfunctioning bionic causes you to spasm and fall to the floor!" ) );
-        mod_pain( 1 );
-        add_effect( effect_stunned, 1_turns );
-        add_effect( effect_downed, 1_turns, num_bp, false, 0, true );
-        sfx::play_variant_sound( "bionics", "elec_crackle_high", 100 );
-    }
-    if( has_bionic( bio_shakes ) && get_power_level() > 24_kJ && one_turn_in( 2_hours ) ) {
-        add_msg_if_player( m_bad, _( "Your bionics short-circuit, causing you to tremble and shiver." ) );
-        mod_power_level( -25_kJ );
-        add_effect( effect_shakes, 5_minutes );
-        sfx::play_variant_sound( "bionics", "elec_crackle_med", 100 );
-    }
-    if( has_bionic( bio_leaky ) && one_turn_in( 6_minutes ) ) {
-        mod_healthy_mod( -1, -200 );
-    }
-    if( has_bionic( bio_sleepy ) && one_turn_in( 50_minutes ) && !in_sleep_state() ) {
-        mod_fatigue( 1 );
-    }
-    if( has_bionic( bio_itchy ) && one_turn_in( 50_minutes ) && !has_effect( effect_formication ) &&
-        !has_effect( effect_narcosis ) ) {
-        add_msg_if_player( m_bad, _( "Your malfunctioning bionic itches!" ) );
-        body_part bp = random_body_part( true );
-        add_effect( effect_formication, 10_minutes, bp );
-    }
-    if( has_bionic( bio_glowy ) && !has_effect( effect_glowy_led ) && one_turn_in( 50_minutes ) &&
-        get_power_level() > 1_kJ ) {
-        add_msg_if_player( m_bad, _( "Your malfunctioning bionic starts to glow!" ) );
-        add_effect( effect_glowy_led, 5_minutes );
-        mod_power_level( -1_kJ );
-    }
-
-    // Artifact effects
-    if( has_artifact_with( AEP_ATTENTION ) ) {
-        add_effect( effect_attention, 3_turns );
-    }
-
-    if( has_artifact_with( AEP_BAD_WEATHER ) && calendar::once_every( 1_minutes ) &&
-        g->weather.weather != WEATHER_SNOWSTORM ) {
-        g->weather.weather_override = WEATHER_SNOWSTORM;
-        g->weather.set_nextweather( calendar::turn );
-    }
-
-    // Stim +250 kills
-    if( current_stim > 210 ) {
-        if( one_turn_in( 2_minutes ) && !has_effect( effect_downed ) ) {
-            add_msg_if_player( m_bad, _( "Your muscles spasm!" ) );
-            if( !has_effect( effect_downed ) ) {
-                add_msg_if_player( m_bad, _( "You fall to the ground!" ) );
-                add_effect( effect_downed, rng( 6_turns, 20_turns ) );
-            }
-        }
-    }
-    if( current_stim > 170 ) {
-        if( !has_effect( effect_winded ) && calendar::once_every( 10_minutes ) ) {
-            add_msg( m_bad, _( "You feel short of breath." ) );
-            add_effect( effect_winded, 10_minutes + 1_turns );
-        }
-    }
-    if( current_stim > 110 ) {
-        if( !has_effect( effect_shakes ) && calendar::once_every( 10_minutes ) ) {
-            add_msg( _( "You shake uncontrollably." ) );
-            add_effect( effect_shakes, 15_minutes + 1_turns );
-        }
-    }
-    if( current_stim > 75 ) {
-        if( !one_turn_in( 2_minutes ) && !has_effect( effect_nausea ) ) {
-            add_msg( _( "You feel nauseous…" ) );
-            add_effect( effect_nausea, 5_minutes );
-        }
-    }
-
-    //stim -200 or painkillers 240 kills
-    if( current_stim < -160 || get_painkiller() > 200 ) {
-        if( one_turn_in( 3_minutes ) && !in_sleep_state() ) {
-            add_msg_if_player( m_bad, _( "You black out!" ) );
-            const time_duration dur = rng( 30_minutes, 60_minutes );
-            add_effect( effect_downed, dur );
-            add_effect( effect_blind, dur );
-            fall_asleep( dur );
-        }
-    }
-    if( current_stim < -120 || get_painkiller() > 160 ) {
-        if( !has_effect( effect_winded ) && calendar::once_every( 10_minutes ) ) {
-            add_msg( m_bad, _( "Your breathing slows down." ) );
-            add_effect( effect_winded, 10_minutes + 1_turns );
-        }
-    }
-    if( current_stim < -85 || get_painkiller() > 145 ) {
-        if( one_turn_in( 15_seconds ) && !has_effect( effect_sleep ) ) {
-            add_msg_if_player( m_bad, _( "You feel dizzy for a moment." ) );
-            mod_moves( -rng( 10, 30 ) );
-            if( one_in( 3 ) && !has_effect( effect_downed ) ) {
-                add_msg_if_player( m_bad, _( "You stumble and fall over!" ) );
-                add_effect( effect_downed, rng( 3_turns, 10_turns ) );
-            }
-        }
-    }
-    if( current_stim < -60 || get_painkiller() > 130 ) {
-        if( calendar::once_every( 10_minutes ) ) {
-            add_msg( m_warning, _( "You feel tired…" ) );
-            mod_fatigue( rng( 1, 2 ) );
-        }
-    }
-
-    int sleep_deprivation = !in_sleep_state() ? get_sleep_deprivation() : 0;
-    // Stimulants can lessen the PERCEIVED effects of sleep deprivation, but
-    // they do nothing to cure it. As such, abuse is even more dangerous now.
-    if( current_stim > 0 ) {
-        // 100% of blacking out = 20160sd ; Max. stim modifier = 12500sd @ 250stim
-        // Note: Very high stim already has its own slew of bad effects,
-        // so the "useful" part of this bonus is actually lower.
-        sleep_deprivation -= current_stim * 50;
-    }
-
-    // Harmless warnings
-    if( sleep_deprivation >= SLEEP_DEPRIVATION_HARMLESS ) {
-        if( one_turn_in( 50_minutes ) ) {
-            switch( dice( 1, 4 ) ) {
-                default:
-                case 1:
-                    add_msg_player_or_npc( m_warning, _( "You tiredly rub your eyes." ),
-                                           _( "<npcname> tiredly rubs their eyes." ) );
-                    break;
-                case 2:
-                    add_msg_player_or_npc( m_warning, _( "You let out a small yawn." ),
-                                           _( "<npcname> lets out a small yawn." ) );
-                    break;
-                case 3:
-                    add_msg_player_or_npc( m_warning, _( "You stretch your back." ),
-                                           _( "<npcname> streches their back." ) );
-                    break;
-                case 4:
-                    add_msg_player_or_npc( m_warning, _( "You feel mentally tired." ),
-                                           _( "<npcname> lets out a huge yawn." ) );
-                    break;
-            }
-        }
-    }
-    // Minor discomfort
-    if( sleep_deprivation >= SLEEP_DEPRIVATION_MINOR ) {
-        if( one_turn_in( 75_minutes ) ) {
-            add_msg_if_player( m_warning, _( "You feel lightheaded for a moment." ) );
-            moves -= 10;
-        }
-        if( one_turn_in( 100_minutes ) ) {
-            add_msg_if_player( m_warning, _( "Your muscles spasm uncomfortably." ) );
-            mod_pain( 2 );
-        }
-        if( !has_effect( effect_visuals ) && one_turn_in( 150_minutes ) ) {
-            add_msg_if_player( m_warning, _( "Your vision blurs a little." ) );
-            add_effect( effect_visuals, rng( 1_minutes, 5_minutes ) );
-        }
-    }
-    // Slight disability
-    if( sleep_deprivation >= SLEEP_DEPRIVATION_SERIOUS ) {
-        if( one_turn_in( 75_minutes ) ) {
-            add_msg_if_player( m_bad, _( "Your mind lapses into unawareness briefly." ) );
-            moves -= rng( 20, 80 );
-        }
-        if( one_turn_in( 125_minutes ) ) {
-            add_msg_if_player( m_bad, _( "Your muscles ache in stressfully unpredictable ways." ) );
-            mod_pain( rng( 2, 10 ) );
-        }
-        if( one_turn_in( 5_hours ) ) {
-            add_msg_if_player( m_bad, _( "You have a distractingly painful headache." ) );
-            mod_pain( rng( 10, 25 ) );
-        }
-    }
-    // Major disability, high chance of passing out also relevant
-    if( sleep_deprivation >= SLEEP_DEPRIVATION_MAJOR ) {
-        if( !has_effect( effect_nausea ) && one_turn_in( 500_minutes ) ) {
-            add_msg_if_player( m_bad, _( "You feel heartburn and an acid taste in your mouth." ) );
-            mod_pain( 5 );
-            add_effect( effect_nausea, rng( 5_minutes, 30_minutes ) );
-        }
-        if( one_turn_in( 5_hours ) ) {
-            add_msg_if_player( m_bad,
-                               _( "Your mind is so tired that you feel you can't trust your eyes anymore." ) );
-            add_effect( effect_hallu, rng( 5_minutes, 60_minutes ) );
-        }
-        if( !has_effect( effect_shakes ) && one_turn_in( 425_minutes ) ) {
-            add_msg_if_player( m_bad,
-                               _( "Your muscles spasm uncontrollably, and you have trouble keeping your balance." ) );
-            add_effect( effect_shakes, 15_minutes );
-        } else if( has_effect( effect_shakes ) && one_turn_in( 75_seconds ) ) {
-            moves -= 10;
-            add_msg_player_or_npc( m_warning, _( "Your shaking legs make you stumble." ),
-                                   _( "<npcname> stumbles." ) );
-            if( !has_effect( effect_downed ) && one_in( 10 ) ) {
-                add_msg_player_or_npc( m_bad, _( "You fall over!" ), _( "<npcname> falls over!" ) );
-                add_effect( effect_downed, rng( 3_turns, 10_turns ) );
-            }
-        }
-    }
-}
-
-bool player::irradiate( float rads, bool bypass )
-{
-    int rad_mut = 0;
-    if( has_trait( trait_RADIOACTIVE3 ) ) {
-        rad_mut = 3;
-    } else if( has_trait( trait_RADIOACTIVE2 ) ) {
-        rad_mut = 2;
-    } else if( has_trait( trait_RADIOACTIVE1 ) ) {
-        rad_mut = 1;
-    }
-
-    if( rads > 0 ) {
-        bool has_helmet = false;
-        const bool power_armored = is_wearing_power_armor( &has_helmet );
-        const bool rad_resist = power_armored || worn_with_flag( "RAD_RESIST" );
-
-        if( is_rad_immune() && !bypass ) {
-            // Power armor and some high-tech gear protects completely from radiation
-            rads = 0.0f;
-        } else if( rad_resist && !bypass ) {
-            rads /= 4.0f;
-        }
-
-        if( has_effect( effect_iodine ) ) {
-            // Radioactive mutation makes iodine less efficient (but more useful)
-            rads *= 0.3f + 0.1f * rad_mut;
-        }
-
-        int rads_max = roll_remainder( rads );
-        radiation += rng( 0, rads_max );
-
-        // Apply rads to any radiation badges.
-        for( item *const it : inv_dump() ) {
-            if( it->typeId() != "rad_badge" ) {
-                continue;
-            }
-
-            // Actual irradiation levels of badges and the player aren't precisely matched.
-            // This is intentional.
-            const int before = it->irradiation;
-
-            const int delta = rng( 0, rads_max );
-            if( delta == 0 ) {
-                continue;
-            }
-
-            it->irradiation += delta;
-
-            // If in inventory (not worn), don't print anything.
-            if( inv.has_item( *it ) ) {
-                continue;
-            }
-
-            // If the color hasn't changed, don't print anything.
-            const std::string &col_before = rad_badge_color( before );
-            const std::string &col_after = rad_badge_color( it->irradiation );
-            if( col_before == col_after ) {
-                continue;
-            }
-
-            add_msg_if_player( m_warning, _( "Your radiation badge changes from %1$s to %2$s!" ),
-                               col_before, col_after );
-        }
-
-        if( rads > 0.0f ) {
-            return true;
-        }
-    }
-    return false;
-}
-
-// At minimum level, return at_min, at maximum at_max
-static float addiction_scaling( float at_min, float at_max, float add_lvl )
-{
-    // Not addicted
-    if( add_lvl < MIN_ADDICTION_LEVEL ) {
-        return 1.0f;
-    }
-
-    return lerp( at_min, at_max, ( add_lvl - MIN_ADDICTION_LEVEL ) / MAX_ADDICTION_LEVEL );
-}
-
-void player::mend( int rate_multiplier )
-{
-    // Wearing splints can slowly mend a broken limb back to 1 hp.
-    bool any_broken = false;
-    for( int i = 0; i < num_hp_parts; i++ ) {
-        if( hp_cur[i] <= 0 ) {
-            any_broken = true;
-            break;
-        }
-    }
-
-    if( !any_broken ) {
-        return;
-    }
-
-    double healing_factor = 1.0;
-    // Studies have shown that alcohol and tobacco use delay fracture healing time
-    // Being under effect is 50% slowdown
-    // Being addicted but not under effect scales from 25% slowdown to 75% slowdown
-    // The improvement from being intoxicated over withdrawal is intended
-    if( has_effect( effect_cig ) ) {
-        healing_factor *= 0.5;
-    } else {
-        healing_factor *= addiction_scaling( 0.25f, 0.75f, addiction_level( ADD_CIG ) );
-    }
-
-    if( has_effect( effect_drunk ) ) {
-        healing_factor *= 0.5;
-    } else {
-        healing_factor *= addiction_scaling( 0.25f, 0.75f, addiction_level( ADD_ALCOHOL ) );
-    }
-
-    if( radiation > 0 && !has_trait( trait_RADIOGENIC ) ) {
-        healing_factor *= clamp( ( 1000.0f - radiation ) / 1000.0f, 0.0f, 1.0f );
-    }
-
-    // Bed rest speeds up mending
-    if( has_effect( effect_sleep ) ) {
-        healing_factor *= 4.0;
-    } else if( get_fatigue() > DEAD_TIRED ) {
-        // but being dead tired does not...
-        healing_factor *= 0.75;
-    } else {
-        // If not dead tired, resting without sleep also helps
-        healing_factor *= 1.0f + rest_quality();
-    }
-
-    // Being healthy helps.
-    healing_factor *= 1.0f + get_healthy() / 200.0f;
-
-    // Very hungry starts lowering the chance
-    // square rooting the value makes the numbers drop off faster when below 1
-    healing_factor *= sqrt( static_cast<float>( get_stored_kcal() ) / static_cast<float>
-                            ( get_healthy_kcal() ) );
-    // Similar for thirst - starts at very thirsty, drops to 0 ~halfway between two last statuses
-    healing_factor *= 1.0f - clamp( ( get_thirst() - 80.0f ) / 300.0f, 0.0f, 1.0f );
-
-    // Mutagenic healing factor!
-    bool needs_splint = true;
-    if( has_trait( trait_REGEN_LIZ ) ) {
-        healing_factor *= 20.0;
-        needs_splint = false;
-    } else if( has_trait( trait_REGEN ) ) {
-        healing_factor *= 16.0;
-    } else if( has_trait( trait_FASTHEALER2 ) ) {
-        healing_factor *= 4.0;
-    } else if( has_trait( trait_FASTHEALER ) ) {
-        healing_factor *= 2.0;
-    } else if( has_trait( trait_SLOWHEALER ) ) {
-        healing_factor *= 0.5;
-    }
-
-    add_msg( m_debug, "Limb mend healing factor: %.2f", healing_factor );
-    if( healing_factor <= 0.0f ) {
-        // The section below assumes positive healing rate
-        return;
-    }
-
-    for( int i = 0; i < num_hp_parts; i++ ) {
-        const bool broken = ( hp_cur[i] <= 0 );
-        if( !broken ) {
-            continue;
-        }
-
-        body_part part = hp_to_bp( static_cast<hp_part>( i ) );
-        if( needs_splint && !worn_with_flag( "SPLINT", part ) ) {
-            continue;
-        }
-
-        const time_duration dur_inc = 1_turns * roll_remainder( rate_multiplier * healing_factor );
-        auto &eff = get_effect( effect_mending, part );
-        if( eff.is_null() ) {
-            add_effect( effect_mending, dur_inc, part, true );
-            continue;
-        }
-
-        eff.set_duration( eff.get_duration() + dur_inc );
-
-        if( eff.get_duration() >= eff.get_max_duration() ) {
-            hp_cur[i] = 1;
-            remove_effect( effect_mending, part );
-            g->events().send<event_type::broken_bone_mends>( getID(), part );
-            //~ %s is bodypart
-            add_msg_if_player( m_good, _( "Your %s has started to mend!" ),
-                               body_part_name( part ) );
-        }
-    }
-}
-
-void player::sound_hallu()
-{
-    // Random 'dangerous' sound from a random direction
-    // 1/5 chance to be a loud sound
-    std::vector<std::string> dir{ "north",
-                                  "northeast",
-                                  "northwest",
-                                  "south",
-                                  "southeast",
-                                  "southwest",
-                                  "east",
-                                  "west" };
-
-    std::vector<std::string> dirz{ "and above you ", "and below you " };
-
-    std::vector<std::tuple<std::string, std::string, std::string>> desc{
-        std::make_tuple( "whump!", "smash_fail", "t_door_c" ),
-        std::make_tuple( "crash!", "smash_success", "t_door_c" ),
-        std::make_tuple( "glass breaking!", "smash_success", "t_window_domestic" ) };
-
-    std::vector<std::tuple<std::string, std::string, std::string>> desc_big{
-        std::make_tuple( "huge explosion!", "explosion", "default" ),
-        std::make_tuple( "bang!", "fire_gun", "glock_19" ),
-        std::make_tuple( "blam!", "fire_gun", "mossberg_500" ),
-        std::make_tuple( "crash!", "smash_success", "t_wall" ),
-        std::make_tuple( "SMASH!", "smash_success", "t_wall" ) };
-
-    std::string i_dir = dir[rng( 0, dir.size() - 1 )];
-
-    if( one_in( 10 ) ) {
-        i_dir += " " + dirz[rng( 0, dirz.size() - 1 )];
+        vomit();
+        remove_effect( effect_fungus );
+        add_msg_if_player( m_bad,  _( "We have mistakenly colonized a local guide!  Purging now." ) );
     }
-
-    std::string i_desc;
-    std::pair<std::string, std::string> i_sound;
-    if( one_in( 5 ) ) {
-        int r_int = rng( 0, desc_big.size() - 1 );
-        i_desc = std::get<0>( desc_big[r_int] );
-        i_sound = std::make_pair( std::get<1>( desc_big[r_int] ), std::get<2>( desc_big[r_int] ) );
-    } else {
-        int r_int = rng( 0, desc.size() - 1 );
-        i_desc = std::get<0>( desc[r_int] );
-        i_sound = std::make_pair( std::get<1>( desc[r_int] ), std::get<2>( desc[r_int] ) );
+    if( has_trait( trait_PARAIMMUNE ) && ( has_effect( effect_dermatik ) ||
+                                           has_effect( effect_tapeworm ) ||
+                                           has_effect( effect_bloodworms ) || has_effect( effect_brainworms ) ||
+                                           has_effect( effect_paincysts ) ) ) {
+        remove_effect( effect_dermatik );
+        remove_effect( effect_tapeworm );
+        remove_effect( effect_bloodworms );
+        remove_effect( effect_brainworms );
+        remove_effect( effect_paincysts );
+        add_msg_if_player( m_good, _( "Something writhes and inside of you as it dies." ) );
     }
-
-    add_msg( m_warning, _( "From the %1$s you hear %2$s" ), i_dir, i_desc );
-    sfx::play_variant_sound( i_sound.first, i_sound.second, rng( 20, 80 ) );
-}
-
-void player::drench( int saturation, const body_part_set &flags, bool ignore_waterproof )
-{
-    if( saturation < 1 ) {
-        return;
+    if( has_trait( trait_ACIDBLOOD ) && ( has_effect( effect_dermatik ) ||
+                                          has_effect( effect_bloodworms ) ||
+                                          has_effect( effect_brainworms ) ) ) {
+        remove_effect( effect_dermatik );
+        remove_effect( effect_bloodworms );
+        remove_effect( effect_brainworms );
     }
-
-    // OK, water gets in your AEP suit or whatever.  It wasn't built to keep you dry.
-    if( has_trait( trait_DEBUG_NOTEMP ) || has_active_mutation( trait_id( "SHELL2" ) ) ||
-        ( !ignore_waterproof && is_waterproof( flags ) ) ) {
-        return;
+    if( has_trait( trait_EATHEALTH ) && has_effect( effect_tapeworm ) ) {
+        remove_effect( effect_tapeworm );
+        add_msg_if_player( m_good, _( "Your bowels gurgle as something inside them dies." ) );
     }
-
-    // Make the body wet
-    for( const body_part bp : all_body_parts ) {
-        // Different body parts have different size, they can only store so much water
-        int bp_wetness_max = 0;
-        if( flags.test( bp ) ) {
-            bp_wetness_max = drench_capacity[bp];
-        }
-
-        if( bp_wetness_max == 0 ) {
-            continue;
-        }
-        // Different sources will only make the bodypart wet to a limit
-        int source_wet_max = saturation * bp_wetness_max * 2 / 100;
-        int wetness_increment = ignore_waterproof ? 100 : 2;
-        // Respect maximums
-        const int wetness_max = std::min( source_wet_max, bp_wetness_max );
-        if( body_wetness[bp] < wetness_max ) {
-            body_wetness[bp] = std::min( wetness_max, body_wetness[bp] + wetness_increment );
-        }
+    if( has_trait( trait_INFIMMUNE ) && ( has_effect( effect_bite ) || has_effect( effect_infected ) ||
+                                          has_effect( effect_recover ) ) ) {
+        remove_effect( effect_bite );
+        remove_effect( effect_infected );
+        remove_effect( effect_recover );
     }
 
-    if( is_weak_to_water() ) {
-        add_msg_if_player( m_bad, _( "You feel the water burning your skin." ) );
+    //Human only effects
+    for( auto &elem : *effects ) {
+        for( auto &_effect_it : elem.second ) {
+            process_one_effect( _effect_it.second, false );
+        }
     }
 
-    // Remove onfire effect
-    if( saturation > 10 || x_in_y( saturation, 10 ) ) {
-        remove_effect( effect_onfire );
-    }
+    Creature::process_effects();
 }
 
-void player::apply_wetness_morale( int temperature )
+double player::vomit_mod()
 {
-    // First, a quick check if we have any wetness to calculate morale from
-    // Faster than checking all worn items for friendliness
-    if( !std::any_of( body_wetness.begin(), body_wetness.end(),
-    []( const int w ) {
-    return w != 0;
-} ) ) {
-        return;
+    double mod = 1;
+    if( has_effect( effect_weed_high ) ) {
+        mod *= .1;
     }
-
-    // Normalize temperature to [-1.0,1.0]
-    temperature = std::max( 0, std::min( 100, temperature ) );
-    const double global_temperature_mod = -1.0 + ( 2.0 * temperature / 100.0 );
-
-    int total_morale = 0;
-    const auto wet_friendliness = exclusive_flag_coverage( "WATER_FRIENDLY" );
-    for( const body_part bp : all_body_parts ) {
-        // Sum of body wetness can go up to 103
-        const int part_drench = body_wetness[bp];
-        if( part_drench == 0 ) {
-            continue;
-        }
-
-        const auto &part_arr = mut_drench[bp];
-        const int part_ignored = part_arr[WT_IGNORED];
-        const int part_neutral = part_arr[WT_NEUTRAL];
-        const int part_good    = part_arr[WT_GOOD];
-
-        if( part_ignored >= part_drench ) {
-            continue;
-        }
-
-        int bp_morale = 0;
-        const bool is_friendly = wet_friendliness.test( bp );
-        const int effective_drench = part_drench - part_ignored;
-        if( is_friendly ) {
-            // Using entire bonus from mutations and then some "human" bonus
-            bp_morale = std::min( part_good, effective_drench ) + effective_drench / 2;
-        } else if( effective_drench < part_good ) {
-            // Positive or 0
-            // Won't go higher than part_good / 2
-            // Wet slime/scale doesn't feel as good when covered by wet rags/fur/kevlar
-            bp_morale = std::min( effective_drench, part_good - effective_drench );
-        } else if( effective_drench > part_good + part_neutral ) {
-            // This one will be negative
-            bp_morale = part_good + part_neutral - effective_drench;
-        }
-
-        // Clamp to [COLD,HOT] and cast to double
-        const double part_temperature =
-            std::min( BODYTEMP_HOT, std::max( BODYTEMP_COLD, temp_cur[bp] ) );
-        // 0.0 at COLD, 1.0 at HOT
-        const double part_mod = ( part_temperature - BODYTEMP_COLD ) /
-                                ( BODYTEMP_HOT - BODYTEMP_COLD );
-        // Average of global and part temperature modifiers, each in range [-1.0, 1.0]
-        double scaled_temperature = ( global_temperature_mod + part_mod ) / 2;
-
-        if( bp_morale < 0 ) {
-            // Damp, hot clothing on hot skin feels bad
-            scaled_temperature = fabs( scaled_temperature );
-        }
-
-        // For an unmutated human swimming in deep water, this will add up to:
-        // +51 when hot in 100% water friendly clothing
-        // -103 when cold/hot in 100% unfriendly clothing
-        total_morale += static_cast<int>( bp_morale * ( 1.0 + scaled_temperature ) / 2.0 );
+    if( has_trait( trait_STRONGSTOMACH ) ) {
+        mod *= .5;
     }
-
-    if( total_morale == 0 ) {
-        return;
+    if( has_trait( trait_WEAKSTOMACH ) ) {
+        mod *= 2;
     }
-
-    int morale_effect = total_morale / 8;
-    if( morale_effect == 0 ) {
-        if( total_morale > 0 ) {
-            morale_effect = 1;
-        } else {
-            morale_effect = -1;
-        }
+    if( has_trait( trait_NAUSEA ) ) {
+        mod *= 3;
+    }
+    if( has_trait( trait_VOMITOUS ) ) {
+        mod *= 3;
+    }
+    // If you're already nauseous, any food in your stomach greatly
+    // increases chance of vomiting. Liquids don't provoke vomiting, though.
+    if( stomach.contains() != 0_ml && has_effect( effect_nausea ) ) {
+        mod *= 5 * get_effect_int( effect_nausea );
     }
-    // 61_seconds because decay is applied in 1_minutes increments
-    add_morale( MORALE_WET, morale_effect, total_morale, 61_seconds, 61_seconds, true );
+    return mod;
 }
 
 void player::update_body_wetness( const w_point &weather )
@@ -5342,47 +3569,6 @@ bool player::can_interface_armor() const
     return okay;
 }
 
-std::vector<item *> player::inv_dump()
-{
-    std::vector<item *> ret;
-    if( is_armed() && can_unwield( weapon ).success() ) {
-        ret.push_back( &weapon );
-    }
-    for( auto &i : worn ) {
-        ret.push_back( &i );
-    }
-    inv.dump( ret );
-    return ret;
-}
-
-bool player::covered_with_flag( const std::string &flag, const body_part_set &parts ) const
-{
-    if( parts.none() ) {
-        return true;
-    }
-
-    body_part_set to_cover( parts );
-
-    for( const auto &elem : worn ) {
-        if( !elem.has_flag( flag ) ) {
-            continue;
-        }
-
-        to_cover &= ~elem.get_covered_body_parts();
-
-        if( to_cover.none() ) {
-            return true;    // Allows early exit.
-        }
-    }
-
-    return to_cover.none();
-}
-
-bool player::is_waterproof( const body_part_set &parts ) const
-{
-    return covered_with_flag( "WATERPROOF", parts );
-}
-
 int player::amount_worn( const itype_id &id ) const
 {
     int amount = 0;
@@ -5394,13 +3580,6 @@ int player::amount_worn( const itype_id &id ) const
     return amount;
 }
 
-int  player::leak_level( const std::string &flag ) const
-{
-    int leak_level = 0;
-    leak_level = inv.leak_level( flag );
-    return leak_level;
-}
-
 bool player::has_mission_item( int mission_id ) const
 {
     return mission_id != -1 && has_item_with( has_mission_item_filter{ mission_id } );
@@ -6107,15 +4286,6 @@ ret_val<bool> player::can_wield( const item &it ) const
     return ret_val<bool>::make_success();
 }
 
-ret_val<bool> player::can_unwield( const item &it ) const
-{
-    if( it.has_flag( "NO_UNWIELD" ) ) {
-        return ret_val<bool>::make_failure( _( "You cannot unwield your %s." ), it.tname() );
-    }
-
-    return ret_val<bool>::make_success();
-}
-
 bool player::unwield()
 {
     if( weapon.is_null() ) {
@@ -6408,6 +4578,17 @@ void player::mend_item( item_location &&obj, bool interactive )
     if( mending_options.empty() ) {
         if( interactive ) {
             add_msg( m_info, _( "The %s doesn't have any faults to mend." ), obj->tname() );
+            if( obj->damage() > 0 ) {
+                const std::set<std::string> &rep = obj->repaired_with();
+                const std::string repair_options =
+                enumerate_as_string( rep.begin(), rep.end(), []( const itype_id & e ) {
+                    return item::nname( e );
+                }, enumeration_conjunction::or_ );
+
+                add_msg( m_info, _( "It is damaged, and could be repaired with %s.  "
+                                    "%s to use one of those items." ),
+                         repair_options, press_x( ACTION_USE ) );
+            }
         }
         return;
     }
@@ -6839,43 +5020,6 @@ bool player::takeoff( int pos )
     return takeoff( i_at( pos ) );
 }
 
-void player::drop( int pos, const tripoint &where )
-{
-    const item &it = i_at( pos );
-    const int count = it.count();
-
-    drop( { std::make_pair( pos, count ) }, where );
-}
-
-void player::drop( const std::list<std::pair<int, int>> &what, const tripoint &target, bool stash )
-{
-    const activity_id type( stash ? "ACT_STASH" : "ACT_DROP" );
-
-    if( what.empty() ) {
-        return;
-    }
-
-    if( rl_dist( pos(), target ) > 1 || !( stash || g->m.can_put_items( target ) ) ) {
-        add_msg_player_or_npc( m_info, _( "You can't place items here!" ),
-                               _( "<npcname> can't place items here!" ) );
-        return;
-    }
-
-    assign_activity( type );
-    activity.placement = target - pos();
-
-    for( auto item_pair : what ) {
-        if( can_unwield( i_at( item_pair.first ) ).success() ) {
-            activity.values.push_back( item_pair.first );
-            activity.values.push_back( item_pair.second );
-        }
-    }
-    // TODO: Remove the hack. Its here because npcs don't process activities
-    if( is_npc() ) {
-        activity.do_turn( *this );
-    }
-}
-
 bool player::add_or_drop_with_msg( item &it, const bool unloading )
 {
     if( it.made_of( LIQUID ) ) {
@@ -7171,83 +5315,6 @@ hint_rating player::rate_action_use( const item &it ) const
     return HINT_CANT;
 }
 
-bool player::has_enough_charges( const item &it, bool show_msg ) const
-{
-    if( !it.is_tool() || !it.ammo_required() ) {
-        return true;
-    }
-    if( it.has_flag( "USE_UPS" ) ) {
-        if( has_charges( "UPS", it.ammo_required() ) || it.ammo_sufficient() ) {
-            return true;
-        }
-        if( show_msg ) {
-            add_msg_if_player( m_info,
-                               ngettext( "Your %s needs %d charge from some UPS.",
-                                         "Your %s needs %d charges from some UPS.",
-                                         it.ammo_required() ),
-                               it.tname(), it.ammo_required() );
-        }
-        return false;
-    } else if( !it.ammo_sufficient() ) {
-        if( show_msg ) {
-            add_msg_if_player( m_info,
-                               ngettext( "Your %s has %d charge but needs %d.",
-                                         "Your %s has %d charges but needs %d.",
-                                         it.ammo_remaining() ),
-                               it.tname(), it.ammo_remaining(), it.ammo_required() );
-        }
-        return false;
-    }
-    return true;
-}
-
-bool player::consume_charges( item &used, int qty )
-{
-    if( qty < 0 ) {
-        debugmsg( "Tried to consume negative charges" );
-        return false;
-    }
-
-    if( qty == 0 ) {
-        return false;
-    }
-
-    if( !used.is_tool() && !used.is_food() && !used.is_medication() ) {
-        debugmsg( "Tried to consume charges for non-tool, non-food, non-med item" );
-        return false;
-    }
-
-    // Consume comestibles destroying them if no charges remain
-    if( used.is_food() || used.is_medication() ) {
-        used.charges -= qty;
-        if( used.charges <= 0 ) {
-            i_rem( &used );
-            return true;
-        }
-        return false;
-    }
-
-    // Tools which don't require ammo are instead destroyed
-    if( used.is_tool() && !used.ammo_required() ) {
-        i_rem( &used );
-        return true;
-    }
-
-    // USE_UPS never occurs on base items but is instead added by the UPS tool mod
-    if( used.has_flag( "USE_UPS" ) ) {
-        // With the new UPS system, we'll want to use any charges built up in the tool before pulling from the UPS
-        // The usage of the item was already approved, so drain item if possible, otherwise use UPS
-        if( used.charges >= qty ) {
-            used.ammo_consume( qty, pos() );
-        } else {
-            use_charges( "UPS", qty );
-        }
-    } else {
-        used.ammo_consume( std::min( qty, used.ammo_remaining() ), pos() );
-    }
-    return false;
-}
-
 void player::use( int inventory_position )
 {
     item &used = i_at( inventory_position );
@@ -7302,83 +5369,6 @@ void player::use( item_location loc )
     }
 }
 
-bool player::invoke_item( item *used )
-{
-    return invoke_item( used, pos() );
-}
-
-bool player::invoke_item( item *used, const tripoint &pt )
-{
-    const auto &use_methods = used->type->use_methods;
-
-    if( use_methods.empty() ) {
-        return false;
-    } else if( use_methods.size() == 1 ) {
-        return invoke_item( used, use_methods.begin()->first, pt );
-    }
-
-    uilist umenu;
-
-    umenu.text = string_format( _( "What to do with your %s?" ), used->tname() );
-    umenu.hilight_disabled = true;
-
-    for( const auto &e : use_methods ) {
-        const auto res = e.second.can_call( *this, *used, false, pt );
-        umenu.addentry_desc( MENU_AUTOASSIGN, res.success(), MENU_AUTOASSIGN, e.second.get_name(),
-                             res.str() );
-    }
-
-    umenu.desc_enabled = std::any_of( umenu.entries.begin(),
-    umenu.entries.end(), []( const uilist_entry & elem ) {
-        return !elem.desc.empty();
-    } );
-
-    umenu.query();
-
-    int choice = umenu.ret;
-    if( choice < 0 || choice >= static_cast<int>( use_methods.size() ) ) {
-        return false;
-    }
-
-    const std::string &method = std::next( use_methods.begin(), choice )->first;
-
-    return invoke_item( used, method, pt );
-}
-
-bool player::invoke_item( item *used, const std::string &method )
-{
-    return invoke_item( used, method, pos() );
-}
-
-bool player::invoke_item( item *used, const std::string &method, const tripoint &pt )
-{
-    if( !has_enough_charges( *used, true ) ) {
-        return false;
-    }
-
-    item *actually_used = used->get_usable_item( method );
-    if( actually_used == nullptr ) {
-        debugmsg( "Tried to invoke a method %s on item %s, which doesn't have this method",
-                  method.c_str(), used->tname() );
-        return false;
-    }
-
-    int charges_used = actually_used->type->invoke( *this, *actually_used, pt, method );
-    if( charges_used == 0 ) {
-        return false;
-    }
-    // Prevent accessing the item as it may have been deleted by the invoked iuse function.
-
-    if( used->is_tool() || used->is_medication() || used->get_contained().is_medication() ) {
-        return consume_charges( *actually_used, charges_used );
-    } else if( used->is_bionic() || used->is_deployable() || method == "place_trap" ) {
-        i_rem( used );
-        return true;
-    }
-
-    return false;
-}
-
 void player::reassign_item( item &it, int invlet )
 {
     bool remove_old = true;
@@ -8230,55 +6220,6 @@ bool player::natural_attack_restricted_on( body_part bp ) const
     return false;
 }
 
-bool player::is_wearing_helmet() const
-{
-    for( const item &i : worn ) {
-        if( i.covers( bp_head ) && !i.has_flag( "HELMET_COMPAT" ) && !i.has_flag( "SKINTIGHT" ) &&
-            !i.has_flag( "PERSONAL" ) && !i.has_flag( "AURA" ) && !i.has_flag( "SEMITANGIBLE" ) &&
-            !i.has_flag( "OVERSIZE" ) ) {
-            return true;
-        }
-    }
-    return false;
-}
-
-int player::head_cloth_encumbrance() const
-{
-    int ret = 0;
-    for( auto &i : worn ) {
-        const item *worn_item = &i;
-        if( i.covers( bp_head ) && !i.has_flag( "SEMITANGIBLE" ) &&
-            ( worn_item->has_flag( "HELMET_COMPAT" ) || worn_item->has_flag( "SKINTIGHT" ) ) ) {
-            ret += worn_item->get_encumber( *this );
-        }
-    }
-    return ret;
-}
-
-double player::armwear_factor() const
-{
-    double ret = 0;
-    if( wearing_something_on( bp_arm_l ) ) {
-        ret += .5;
-    }
-    if( wearing_something_on( bp_arm_r ) ) {
-        ret += .5;
-    }
-    return ret;
-}
-
-int player::shoe_type_count( const itype_id &it ) const
-{
-    int ret = 0;
-    if( is_wearing_on_bp( it, bp_foot_l ) ) {
-        ret++;
-    }
-    if( is_wearing_on_bp( it, bp_foot_r ) ) {
-        ret++;
-    }
-    return ret;
-}
-
 int player::adjust_for_focus( int amount ) const
 {
     int effective_focus = focus_pool;
@@ -8975,13 +6916,6 @@ void player::add_known_trap( const tripoint &pos, const trap &t )
     }
 }
 
-bool player::is_deaf() const
-{
-    return get_effect_int( effect_deaf ) > 2 || worn_with_flag( "DEAF" ) || has_trait( trait_DEAF ) ||
-           ( has_active_bionic( bio_earplugs ) && !has_active_bionic( bio_ears ) ) ||
-           ( has_trait( trait_M_SKIN3 ) && g->m.has_flag_ter_or_furn( "FUNGUS", pos() ) && in_sleep_state() );
-}
-
 bool player::can_hear( const tripoint &source, const int volume ) const
 {
     if( is_deaf() ) {
@@ -9368,12 +7302,6 @@ std::set<tripoint> player::get_path_avoid() const
     return ret;
 }
 
-bool player::is_rad_immune() const
-{
-    bool has_helmet = false;
-    return ( is_wearing_power_armor( &has_helmet ) && has_helmet ) || worn_with_flag( "RAD_PROOF" );
-}
-
 void player::do_skill_rust()
 {
     const int rate = rust_rate();
@@ -9427,7 +7355,7 @@ std::pair<std::string, nc_color> player::get_hunger_description() const
 {
     const bool calorie_deficit = get_bmi() < character_weight_category::normal;
     const units::volume contains = stomach.contains();
-    const units::volume cap = stomach.capacity();
+    const units::volume cap = stomach.capacity( *this );
     std::string hunger_string;
     nc_color hunger_color = c_white;
     // i ate just now!
diff --git a/src/player.h b/src/player.h
index 688d1124f57fd..947cfda438b47 100644
--- a/src/player.h
+++ b/src/player.h
@@ -237,7 +237,7 @@ class player : public Character
         void update_stomach( const time_point &from, const time_point &to );
         /** Increases hunger, thirst, fatigue and stimulants wearing off. `rate_multiplier` is for retroactive updates. */
         void update_needs( int rate_multiplier );
-        needs_rates calc_needs_rates();
+        needs_rates calc_needs_rates() const;
 
         /**
           * Handles passive regeneration of pain and maybe hp.
@@ -275,8 +275,6 @@ class player : public Character
         /** Handles process of introducing patient into anesthesia during Autodoc operations. Requires anesthetic kits or NOPAIN mutation */
         void introduce_into_anesthesia( const time_duration &duration, player &installer,
                                         bool needs_anesthesia );
-        /** Adds a bionic to my_bionics[] */
-        void add_bionic( const bionic_id &b );
         /** Removes a bionic from my_bionics[] */
         void remove_bionic( const bionic_id &b );
         /** Calculate skill for (un)installing bionics */
@@ -326,12 +324,11 @@ class player : public Character
         void power_mutations();
         /** Handles bionic activation effects of the entered bionic, returns if anything activated */
         bool activate_bionic( int b, bool eff_only = false );
-        /** Handles bionic deactivation effects of the entered bionic, returns if anything deactivated */
-        bool deactivate_bionic( int b, bool eff_only = false );
-        /**Convert fuel to bionic power*/
-        bool burn_fuel( int b, bool start = false );
-        /** Handles bionic effects over time of the entered bionic */
-        void process_bionic( int b );
+        /** Handles bionic deactivation effects of the entered bionic, returns if anything
+         *  deactivated */
+        bool deactivate_bionic( int b, bool eff_only = false ) override;
+        /** Adds a bionic to my_bionics[] */
+        void add_bionic( const bionic_id &b );
         /** Randomly removes a bionic from my_bionics[] */
         bool remove_random_bionic();
         /** Remove all bionics */
@@ -406,8 +403,6 @@ class player : public Character
         /** Returns true if the player can learn the entered martial art */
         bool can_autolearn( const matype_id &ma_id ) const;
 
-        /** Returns true if the player is immune to throws */
-        bool is_throw_immune() const;
         /** Returns value of player's stable footing */
         float stability_roll() const override;
         /** Returns true if the player has quiet melee attacks */
@@ -422,14 +417,6 @@ class player : public Character
         bool is_on_ground() const override;
         /** Returns true if the player should be dead */
         bool is_dead_state() const override;
-        /** Returns true is the player is protected from electric shocks */
-        bool is_elec_immune() const override;
-        /** Returns true if the player is immune to this kind of effect */
-        bool is_immune_effect( const efftype_id & ) const override;
-        /** Returns true if the player is immune to this kind of damage */
-        bool is_immune_damage( damage_type ) const override;
-        /** Returns true if the player is protected from radiation */
-        bool is_rad_immune() const;
 
         /** Returns true if the player is able to use a grab breaking technique */
         bool can_grab_break( const item &weap ) const;
@@ -552,21 +539,6 @@ class player : public Character
 
         /** Returns melee skill level, to be used to throttle dodge practice. **/
         float get_melee() const override;
-        /**
-         * Adds a reason for why the player would miss a melee attack.
-         *
-         * To possibly be messaged to the player when he misses a melee attack.
-         * @param reason A message for the player that gives a reason for him missing.
-         * @param weight The weight used when choosing what reason to pick when the
-         * player misses.
-         */
-        void add_miss_reason( const std::string &reason, unsigned int weight );
-        /** Clears the list of reasons for why the player would miss a melee attack. */
-        void clear_miss_reasons();
-        /**
-         * Returns an explanation for why the player would miss a melee attack.
-         */
-        std::string get_miss_reason();
 
         /** Handles the uncanny dodge bionic and effects, returns true if the player successfully dodges */
         bool uncanny_dodge() override;
@@ -641,33 +613,10 @@ class player : public Character
         /** Returns list of artifacts in player inventory. **/
         std::list<item *> get_artifact_items();
 
-        /** Adds an addiction to the player */
-        void add_addiction( add_type type, int strength );
-        /** Removes an addition from the player */
-        void rem_addiction( add_type type );
-        /** Returns true if the player has an addiction of the specified type */
-        bool has_addiction( add_type type ) const;
-        /** Returns the intensity of the specified addiction */
-        int  addiction_level( add_type type ) const;
-
         /** Siphons fuel (if available) from the specified vehicle into container or
          * similar via @ref game::handle_liquid. May start a player activity.
          */
         void siphon( vehicle &veh, const itype_id &desired_liquid );
-        /** Handles a large number of timers decrementing and other randomized effects */
-        void suffer();
-        /** Handles mitigation and application of radiation */
-        bool irradiate( float rads, bool bypass = false );
-        /** Handles the chance for broken limbs to spontaneously heal to 1 HP */
-        void mend( int rate_multiplier );
-
-        /** Creates an auditory hallucination */
-        void sound_hallu();
-
-        /** Drenches the player with water, saturation is the percent gotten wet */
-        void drench( int saturation, const body_part_set &flags, bool ignore_waterproof );
-        /** Recalculates morale penalty/bonus from wetness based on mutations, equipment and temperature */
-        void apply_wetness_morale( int temperature );
 
         /** used for drinking from hands, returns how many charges were consumed */
         int drink_from_hands( item &water );
@@ -795,11 +744,6 @@ class player : public Character
          * @param it Thing to be wielded
          */
         ret_val<bool> can_wield( const item &it ) const;
-        /**
-         * Check player capable of unwielding an item.
-         * @param it Thing to be unwielded
-         */
-        ret_val<bool> can_unwield( const item &it ) const;
         /** Check player's capability of consumption overall */
         bool can_consume( const item &it ) const;
 
@@ -862,9 +806,6 @@ class player : public Character
         /** Takes off an item, returning false on fail. The taken off item is processed in the interact */
         bool takeoff( const item &it, std::list<item> *res = nullptr );
         bool takeoff( int pos );
-        /** Drops an item to the specified location */
-        void drop( int pos, const tripoint &where );
-        void drop( const std::list<std::pair<int, int>> &what, const tripoint &target, bool stash = false );
 
         /** So far only called by unload() from game.cpp */
         bool add_or_drop_with_msg( item &it, bool unloading = false );
@@ -897,26 +838,10 @@ class player : public Character
         void use( item_location loc );
         /** Uses the current wielded weapon */
         void use_wielded();
-        /**
-         * Asks how to use the item (if it has more than one use_method) and uses it.
-         * Returns true if it destroys the item. Consumes charges from the item.
-         * Multi-use items are ONLY supported when all use_methods are iuse_actor!
-         */
-        bool invoke_item( item *, const tripoint &pt );
-        /** As above, but with a pre-selected method. Debugmsg if this item doesn't have this method. */
-        bool invoke_item( item *, const std::string &, const tripoint &pt );
-        /** As above two, but with position equal to current position */
-        bool invoke_item( item * );
-        bool invoke_item( item *, const std::string & );
+
         /** Reassign letter. */
         void reassign_item( item &it, int invlet );
 
-        /** Consume charges of a tool or comestible item, potentially destroying it in the process
-         *  @param used item consuming the charges
-         *  @param qty number of charges to consume which must be non-zero
-         *  @return true if item was destroyed */
-        bool consume_charges( item &used, int qty );
-
         /** Removes gunmod after first unloading any contained ammo and returns true on success */
         bool gunmod_remove( item &gun, item &mod );
 
@@ -987,14 +912,6 @@ class player : public Character
         int get_armor_type( damage_type dt, body_part bp ) const override;
         /** Returns true if the player is wearing something on the entered body_part, ignoring items with the ALLOWS_NATURAL_ATTACKS flag */
         bool natural_attack_restricted_on( body_part bp ) const;
-        /** Returns true if the player is wearing something occupying the helmet slot */
-        bool is_wearing_helmet() const;
-        /** Returns the total encumbrance of all SKINTIGHT and HELMET_COMPAT items covering the head */
-        int head_cloth_encumbrance() const;
-        /** Same as footwear factor, but for arms */
-        double armwear_factor() const;
-        /** Returns 1 if the player is wearing an item of that count on one foot, 2 if on both, and zero if on neither */
-        int shoe_type_count( const itype_id &it ) const;
         /** Returns the effect of pain on stats */
         stat_mod get_pain_penalty() const;
         int kcal_speed_penalty();
@@ -1046,22 +963,14 @@ class player : public Character
         */
         bool can_interface_armor() const;
 
-        // Inventory + weapon + worn (for death, etc)
-        std::vector<item *> inv_dump();
         // Put corpse+inventory on map at the place where this is.
         void place_corpse();
         // Put corpse+inventory on defined om tile
         void place_corpse( const tripoint &om_target );
 
-        bool covered_with_flag( const std::string &flag, const body_part_set &parts ) const;
-        bool is_waterproof( const body_part_set &parts ) const;
-
         /** Returns the amount of item `type' that is currently worn */
         int  amount_worn( const itype_id &id ) const;
 
-        // Carried items may leak radiation or chemicals
-        int  leak_level( const std::string &flag ) const;
-
         /** Returns the item in the player's inventory with the highest of the specified quality*/
         item &item_with_best_of_quality( const quality_id &qid );
 
@@ -1194,7 +1103,6 @@ class player : public Character
         // includes nearby items
         const inventory &crafting_inventory( const tripoint &src_pos = tripoint_zero,
                                              int radius = PICKUP_RANGE );
-        void invalidate_crafting_inventory();
         comp_selection<item_comp>
         select_item_component( const std::vector<item_comp> &components,
                                int batch, inventory &map_inv, bool can_cancel = false,
@@ -1250,9 +1158,6 @@ class player : public Character
 
         start_location_id start_location;
 
-        int tank_plut;
-        int reactor_plut;
-        int slow_rad;
         double recoil = MAX_RECOIL;
         std::weak_ptr<Creature> last_target;
         cata::optional<tripoint> last_target_pos;
@@ -1265,12 +1170,9 @@ class player : public Character
         int movecounter;
         bool death_drops;// Turned to false for simulating NPCs on distant missions so they don't drop all their gear in sight
 
-        int focus_pool;
-
         bool reach_attacking = false;
         bool manual_examine = false;
 
-        std::vector <addiction> addictions;
         std::vector<mtype_id> starting_pets;
 
         void make_craft_with_command( const recipe_id &id_to_make, int batch_size, bool is_long = false,
@@ -1294,7 +1196,6 @@ class player : public Character
         bool is_hallucination() const override;
         void environmental_revert_effect();
 
-        bool is_deaf() const;
         // Checks whether a player can hear a sound at a given volume and location.
         bool can_hear( const tripoint &source, int volume ) const;
         // Returns a multiplier indicating the keenness of a player's hearing.
@@ -1363,18 +1264,9 @@ class player : public Character
         void print_encumbrance( const catacurses::window &win, int line = -1,
                                 const item *selected_clothing = nullptr ) const;
 
-        // Prints message(s) about current health
-        void print_health() const;
-
         using Character::query_yn;
         bool query_yn( const std::string &mes ) const override;
 
-        /**
-         * Has the item enough charges to invoke its use function?
-         * Also checks if UPS from this player is used instead of item charges.
-         */
-        bool has_enough_charges( const item &it, bool show_msg ) const;
-
         const pathfinding_settings &get_pathfinding_settings() const override;
         std::set<tripoint> get_path_avoid() const override;
 
@@ -1423,10 +1315,6 @@ class player : public Character
          */
         bool is_visible_in_range( const Creature &critter, int range ) const;
 
-        // Trigger and disable mutations that can be so toggled.
-        void activate_mutation( const trait_id &mutation );
-        void deactivate_mutation( const trait_id &mut );
-
         /** Determine player's capability of recharging their CBMs. */
         bool can_feed_reactor_with( const item &it ) const;
         bool can_feed_furnace_with( const item &it ) const;
@@ -1453,13 +1341,9 @@ class player : public Character
         std::map<faction_id, std::pair<int, time_point>> warning_record;
         inventory cached_crafting_inventory;
         int cached_moves;
-        time_point cached_time;
         tripoint cached_position;
 
     private:
-
-        struct weighted_int_list<std::string> melee_miss_reasons;
-
         /** smart pointer to targeting data stored for aiming the player's weapon across turns. */
         std::shared_ptr<targeting_data> tdata;
 
diff --git a/src/point.h b/src/point.h
index 5d3ec219df33b..d593ffc4477c3 100644
--- a/src/point.h
+++ b/src/point.h
@@ -349,6 +349,23 @@ static constexpr std::array<point, 4> four_adjacent_offsets{{
         point_north, point_east, point_south, point_west
     }};
 
+static constexpr std::array<point, 4> neighborhood{ {
+        point_south, point_east, point_west, point_north
+    }};
+
+static constexpr std::array<point, 4> offsets = {{
+        point_south, point_east, point_west, point_north
+    }
+};
+
+static constexpr std::array<point, 4> four_cardinal_directions{{
+        point_west, point_east, point_north, point_south
+    }};
+
+static constexpr std::array<point, 5> five_cardinal_directions{{
+        point_west, point_east, point_north, point_south, point_zero
+    }};
+
 static const std::array<tripoint, 8> eight_horizontal_neighbors = { {
         { tripoint_north_west },
         { tripoint_north },
diff --git a/src/profession.cpp b/src/profession.cpp
index 69586f5f74190..a7951e66927d9 100644
--- a/src/profession.cpp
+++ b/src/profession.cpp
@@ -131,8 +131,7 @@ class item_reader : public generic_typed_reader<item_reader>
             }
             JsonArray jarr = jin.get_array();
             const auto id = jarr.get_string( 0 );
-            const auto s = jarr.get_string( 1 );
-            const auto snippet = _( s );
+            const auto snippet = jarr.get_string( 1 );
             return profession::itypedec( id, snippet );
         }
         template<typename C>
@@ -256,17 +255,16 @@ void profession::check_item_definitions( const itypedecvec &items ) const
 {
     for( auto &itd : items ) {
         if( !item::type_is_defined( itd.type_id ) ) {
-            debugmsg( "profession %s: item %s does not exist", id.c_str(), itd.type_id.c_str() );
+            debugmsg( "profession %s: item %s does not exist", id.str(), itd.type_id );
         } else if( !itd.snippet_id.empty() ) {
             const itype *type = item::find_type( itd.type_id );
             if( type->snippet_category.empty() ) {
                 debugmsg( "profession %s: item %s has no snippet category - no description can be set",
-                          id.c_str(), itd.type_id.c_str() );
+                          id.str(), itd.type_id );
             } else {
-                const int hash = SNIPPET.get_snippet_by_id( itd.snippet_id );
-                if( SNIPPET.get( hash ).empty() ) {
+                if( !SNIPPET.get_snippet_by_id( itd.snippet_id ).has_value() ) {
                     debugmsg( "profession %s: snippet id %s for item %s is not contained in snippet category %s",
-                              id.c_str(), itd.snippet_id.c_str(), itd.type_id.c_str(), type->snippet_category.c_str() );
+                              id.str(), itd.snippet_id, itd.type_id, type->snippet_category );
                 }
             }
         }
diff --git a/src/ranged.cpp b/src/ranged.cpp
index 2c133afb79f39..bed4d7d4198a2 100644
--- a/src/ranged.cpp
+++ b/src/ranged.cpp
@@ -505,7 +505,7 @@ int Character::throwing_dispersion( const item &to_throw, Creature *critter,
     int throw_difficulty = 1000;
     // 1000 penalty for every liter after the first
     // TODO: Except javelin type items
-    throw_difficulty += std::max<int>( 0, units::to_milliliter( volume - 1000_ml ) );
+    throw_difficulty += std::max<int>( 0, units::to_milliliter( volume - 1_liter ) );
     // 1 penalty for gram above str*100 grams (at 0 skill)
     ///\EFFECT_STR decreases throwing dispersion when throwing heavy objects
     const int weight_in_gram = units::to_gram( weight );
@@ -604,7 +604,7 @@ dealt_projectile_attack player::throw_item( const tripoint &target, const item &
     // Item will shatter upon landing, destroying the item, dealing damage, and making noise
     /** @EFFECT_STR increases chance of shattering thrown glass items (NEGATIVE) */
     const bool shatter = !thrown.active && thrown.made_of( material_id( "glass" ) ) &&
-                         rng( 0, units::to_milliliter( 2000_ml - volume ) ) < get_str() * 100;
+                         rng( 0, units::to_milliliter( 2_liter - volume ) ) < get_str() * 100;
 
     // Item will burst upon landing, destroying the item, and spilling its contents
     const bool burst = thrown.has_property( "burst_when_filled" ) && thrown.is_container() &&
@@ -1056,7 +1056,8 @@ static int draw_turret_aim( const player &p, const catacurses::window &w, int li
 
     mvwprintw( w, point( 1, line_number++ ), _( "Turrets in range: %d" ), turrets.size() );
     for( const auto e : turrets ) {
-        mvwprintw( w, point( 1, line_number++ ), "*  %s", e->name() );
+        nc_color o = c_white;
+        print_colored_text( w, point( 1, line_number++ ), o, o, string_format( "*  %s", e->name() ) );
     }
 
     return line_number;
diff --git a/src/regional_settings.cpp b/src/regional_settings.cpp
index af1c4f921a916..9e6135ef916e1 100644
--- a/src/regional_settings.cpp
+++ b/src/regional_settings.cpp
@@ -359,6 +359,72 @@ static void load_overmap_lake_settings( JsonObject &jo,
     }
 }
 
+static void load_region_terrain_and_furniture_settings( JsonObject &jo,
+        region_terrain_and_furniture_settings &region_terrain_and_furniture_settings,
+        const bool strict, const bool overlay )
+{
+    if( !jo.has_object( "region_terrain_and_furniture" ) ) {
+        if( strict ) {
+            jo.throw_error( "\"region_terrain_and_furniture\": { … } required for default" );
+        }
+    } else {
+        JsonObject region_terrain_and_furniture_settings_jo =
+            jo.get_object( "region_terrain_and_furniture" );
+
+        if( !region_terrain_and_furniture_settings_jo.has_object( "terrain" ) ) {
+            if( !overlay ) {
+                region_terrain_and_furniture_settings_jo.throw_error( "terrain required" );
+            }
+        } else {
+            JsonObject template_terrain_jo = region_terrain_and_furniture_settings_jo.get_object( "terrain" );
+            std::set<std::string> template_terrain_ids = template_terrain_jo.get_member_names();
+            for( const auto &template_terrain_id : template_terrain_ids ) {
+                if( template_terrain_id == "//" ) {
+                    continue;
+                }
+                JsonObject terrain_jo = template_terrain_jo.get_object( template_terrain_id );
+                std::set<std::string> terrain_ids = terrain_jo.get_member_names();
+                for( const auto &terrain_id : terrain_ids ) {
+                    if( terrain_id == "//" ) {
+                        continue;
+                    }
+                    int weight = 0;
+                    if( terrain_jo.read( terrain_id, weight ) ) {
+                        region_terrain_and_furniture_settings.unfinalized_terrain[template_terrain_id][terrain_id] = weight;
+                    }
+                }
+            }
+        }
+
+        if( !region_terrain_and_furniture_settings_jo.has_object( "furniture" ) ) {
+            if( !overlay ) {
+                region_terrain_and_furniture_settings_jo.throw_error( "furniture required" );
+            }
+        } else {
+            JsonObject template_furniture_jo =
+                region_terrain_and_furniture_settings_jo.get_object( "furniture" );
+            std::set<std::string> template_furniture_ids = template_furniture_jo.get_member_names();
+            for( const auto &template_furniture_id : template_furniture_ids ) {
+                if( template_furniture_id == "//" ) {
+                    continue;
+                }
+                JsonObject furniture_jo = template_furniture_jo.get_object( template_furniture_id );
+                std::set<std::string> furniture_ids = furniture_jo.get_member_names();
+                for( const auto &furniture_id : furniture_ids ) {
+                    if( furniture_id == "//" ) {
+                        continue;
+                    }
+                    int weight = 0;
+                    if( furniture_jo.read( furniture_id, weight ) ) {
+                        region_terrain_and_furniture_settings.unfinalized_furniture[template_furniture_id][furniture_id] =
+                            weight;
+                    }
+                }
+            }
+        }
+    }
+}
+
 void load_region_settings( JsonObject &jo )
 {
     regional_settings new_region;
@@ -539,6 +605,9 @@ void load_region_settings( JsonObject &jo )
 
     load_overmap_lake_settings( jo, new_region.overmap_lake, strict, false );
 
+    load_region_terrain_and_furniture_settings( jo, new_region.region_terrain_and_furniture, strict,
+            false );
+
     region_settings_map[new_region.id] = new_region;
 }
 
@@ -701,6 +770,8 @@ void apply_region_overlay( JsonObject &jo, regional_settings &region )
     load_overmap_forest_settings( jo, region.overmap_forest, false, true );
 
     load_overmap_lake_settings( jo, region.overmap_lake, false, true );
+
+    load_region_terrain_and_furniture_settings( jo, region.region_terrain_and_furniture, false, true );
 }
 
 void groundcover_extra::finalize()   // FIXME: return bool for failure
@@ -899,6 +970,67 @@ void overmap_lake_settings::finalize()
     }
 }
 
+void region_terrain_and_furniture_settings::finalize()
+{
+    for( auto const &template_pr : unfinalized_terrain ) {
+        const ter_str_id template_tid( template_pr.first );
+        if( !template_tid.is_valid() ) {
+            debugmsg( "Tried to add invalid regional template terrain %s to region_terrain_and_furniture terrain.",
+                      template_tid.c_str() );
+            continue;
+        }
+        for( auto const &actual_pr : template_pr.second ) {
+            const ter_str_id tid( actual_pr.first );
+            if( !tid.is_valid() ) {
+                debugmsg( "Tried to add invalid regional terrain %s to region_terrain_and_furniture terrain template %s.",
+                          tid.c_str(), template_tid.c_str() );
+                continue;
+            }
+            terrain[template_tid.id()].add( tid.id(), actual_pr.second );
+        }
+    }
+
+    for( auto const &template_pr : unfinalized_furniture ) {
+        const furn_str_id template_fid( template_pr.first );
+        if( !template_fid.is_valid() ) {
+            debugmsg( "Tried to add invalid regional template furniture %s to region_terrain_and_furniture furniture.",
+                      template_fid.c_str() );
+            continue;
+        }
+        for( auto const &actual_pr : template_pr.second ) {
+            const furn_str_id fid( actual_pr.first );
+            if( !fid.is_valid() ) {
+                debugmsg( "Tried to add invalid regional furniture %s to region_terrain_and_furniture furniture template %s.",
+                          fid.c_str(), template_fid.c_str() );
+                continue;
+            }
+            furniture[template_fid.id()].add( fid.id(), actual_pr.second );
+        }
+    }
+}
+
+ter_id region_terrain_and_furniture_settings::resolve( const ter_id tid ) const
+{
+    ter_id result = tid;
+    auto region_list = terrain.find( result );
+    while( region_list != terrain.end() ) {
+        result = *region_list->second.pick();
+        region_list = terrain.find( result );
+    }
+    return result;
+}
+
+furn_id region_terrain_and_furniture_settings::resolve( const furn_id fid ) const
+{
+    furn_id result = fid;
+    auto region_list = furniture.find( result );
+    while( region_list != furniture.end() ) {
+        result = *region_list->second.pick();
+        region_list = furniture.find( result );
+    }
+    return result;
+}
+
 void regional_settings::finalize()
 {
     if( default_groundcover_str != nullptr ) {
@@ -912,6 +1044,7 @@ void regional_settings::finalize()
         forest_composition.finalize();
         forest_trail.finalize();
         overmap_lake.finalize();
+        region_terrain_and_furniture.finalize();
         get_options().add_value( "DEFAULT_REGION", id, no_translation( id ) );
     }
 }
diff --git a/src/regional_settings.h b/src/regional_settings.h
index d3804845eeab5..cf3c7b765d90c 100644
--- a/src/regional_settings.h
+++ b/src/regional_settings.h
@@ -214,6 +214,18 @@ struct map_extras {
     map_extras( const unsigned int embellished ) : chance( embellished ) {}
 };
 
+struct region_terrain_and_furniture_settings {
+    std::map<std::string, std::map<std::string, int>> unfinalized_terrain;
+    std::map<std::string, std::map<std::string, int>> unfinalized_furniture;
+    std::map<ter_id, weighted_int_list<ter_id>> terrain;
+    std::map<furn_id, weighted_int_list<furn_id>> furniture;
+
+    void finalize();
+    ter_id resolve( ter_id ) const;
+    furn_id resolve( furn_id ) const;
+    region_terrain_and_furniture_settings() = default;
+};
+
 /*
  * Spationally relevant overmap and mapgen variables grouped into a set of suggested defaults;
  * eventually region mapping will modify as required and allow for transitions of biomes / demographics in a smoooth fashion
@@ -233,6 +245,7 @@ struct regional_settings {
     overmap_feature_flag_settings overmap_feature_flag;
     overmap_forest_settings overmap_forest;
     overmap_lake_settings overmap_lake;
+    region_terrain_and_furniture_settings region_terrain_and_furniture;
 
     std::unordered_map<std::string, map_extras> region_extras;
 
diff --git a/src/safemode_ui.cpp b/src/safemode_ui.cpp
index 739be245ff069..ae03647b6a93f 100644
--- a/src/safemode_ui.cpp
+++ b/src/safemode_ui.cpp
@@ -636,7 +636,7 @@ bool safemode::save_global()
 bool safemode::save( const bool is_character_in )
 {
     is_character = is_character_in;
-    auto file = FILENAMES["safemode"];
+    auto file = PATH_INFO::safemode();
 
     if( is_character ) {
         file = g->get_player_base_save_path() + ".sfm.json";
@@ -670,7 +670,7 @@ void safemode::load( const bool is_character_in )
     is_character = is_character_in;
 
     std::ifstream fin;
-    std::string file = FILENAMES["safemode"];
+    std::string file = PATH_INFO::safemode();
     if( is_character ) {
         file = g->get_player_base_save_path() + ".sfm.json";
     }
diff --git a/src/savegame.cpp b/src/savegame.cpp
index c57e1bbede964..04f60029b16ec 100644
--- a/src/savegame.cpp
+++ b/src/savegame.cpp
@@ -149,20 +149,7 @@ static void chkversion( std::istream &fin )
  */
 void game::unserialize( std::istream &fin )
 {
-    if( fin.peek() == '#' ) {
-        std::string vline;
-        getline( fin, vline );
-        std::string tmphash;
-        std::string tmpver;
-        int savedver = -1;
-        std::stringstream vliness( vline );
-        vliness >> tmphash >> tmpver >> savedver;
-        if( tmpver == "version" && savedver != -1 ) {
-            savegame_loading_version = savedver;
-        }
-    }
-    std::string linebuf;
-
+    chkversion( fin );
     int tmpturn = 0;
     int tmpcalstart = 0;
     int tmprun = 0;
@@ -198,7 +185,7 @@ void game::unserialize( std::istream &fin )
             safe_mode = SAFE_MODE_ON;
         }
 
-        linebuf.clear();
+        std::string linebuf;
         if( data.read( "grscent", linebuf ) ) {
             scent.deserialize( linebuf );
         } else {
@@ -263,53 +250,10 @@ void scent_map::deserialize( const std::string &data )
     }
 }
 
-///// weather
-void game::load_weather( std::istream &fin )
-{
-    if( fin.peek() == '#' ) {
-        std::string vline;
-        getline( fin, vline );
-        std::string tmphash;
-        std::string tmpver;
-        int savedver = -1;
-        std::stringstream vliness( vline );
-        vliness >> tmphash >> tmpver >> savedver;
-        if( tmpver == "version" && savedver != -1 ) {
-            savegame_loading_version = savedver;
-        }
-    }
-
-    //Check for "lightning:" marker - if absent, ignore
-    if( fin.peek() == 'l' ) {
-        std::string line;
-        getline( fin, line );
-        weather.lightning_active = line == "lightning: 1";
-    } else {
-        weather.lightning_active = false;
-    }
-    if( fin.peek() == 's' ) {
-        std::string line;
-        std::string label;
-        getline( fin, line );
-        std::stringstream liness( line );
-        liness >> label >> seed;
-    }
-}
-
-void game::save_weather( std::ostream &fout )
-{
-    fout << "# version " << savegame_version << std::endl;
-    fout << "lightning: " << ( weather.lightning_active ? "1" : "0" ) << std::endl;
-    fout << "seed: " << seed;
-}
-
 #if defined(__ANDROID__)
 ///// quick shortcuts
 void game::load_shortcuts( std::istream &fin )
 {
-    std::string linebuf;
-    std::stringstream linein;
-
     JsonIn jsin( fin );
     try {
         JsonObject data = jsin.get_object();
@@ -1585,7 +1529,7 @@ void mongroup::deserialize_legacy( JsonIn &json )
 ///// mapbuffer
 
 ///////////////////////////////////////////////////////////////////////////////////////
-///// master.gsav
+///// SAVE_MASTER (i.e. master.gsav)
 
 void mission::unserialize_all( JsonIn &jsin )
 {
@@ -1620,13 +1564,18 @@ void game::unserialize_master( std::istream &fin )
                 mission::unserialize_all( jsin );
             } else if( name == "factions" ) {
                 jsin.read( *faction_manager_ptr );
+            } else if( name == "seed" ) {
+                jsin.read( seed );
+            } else if( name == "weather" ) {
+                JsonObject w = jsin.get_object();
+                w.read( "lightning", weather.lightning_active );
             } else {
                 // silently ignore anything else
                 jsin.skip_value();
             }
         }
     } catch( const JsonError &e ) {
-        debugmsg( "error loading master.gsav: %s", e.c_str() );
+        debugmsg( "error loading %s: %s", SAVE_MASTER, e.c_str() );
     }
 }
 
@@ -1653,10 +1602,16 @@ void game::serialize_master( std::ostream &fout )
         mission::serialize_all( json );
 
         json.member( "factions", *faction_manager_ptr );
+        json.member( "seed", seed );
+
+        json.member( "weather" );
+        json.start_object();
+        json.member( "lightning", weather.lightning_active );
+        json.end_object();
 
         json.end_object();
     } catch( const JsonError &e ) {
-        debugmsg( "error saving to master.gsav: %s", e.c_str() );
+        debugmsg( "error saving to %s: %s", SAVE_MASTER, e.c_str() );
     }
 }
 
diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp
index 8a4a7393d65a3..80ba19e1e1c85 100644
--- a/src/savegame_json.cpp
+++ b/src/savegame_json.cpp
@@ -77,6 +77,7 @@
 #include "morale_types.h"
 #include "pimpl.h"
 #include "recipe.h"
+#include "text_snippets.h"
 #include "tileray.h"
 #include "visitable.h"
 #include "string_id.h"
@@ -911,10 +912,6 @@ void player::load( JsonObject &data )
         remove_mutation( trait_MYOPIC );
     }
 
-    if( has_bionic( bionic_id( "bio_solar" ) ) ) {
-        remove_bionic( bionic_id( "bio_solar" ) );
-    }
-
     if( data.has_array( "faction_warnings" ) ) {
         JsonArray warning_arr = data.get_array( "faction_warnings" );
         while( warning_arr.has_more() ) {
@@ -2071,7 +2068,7 @@ void item::io( Archive &archive )
     archive.io( "burnt", burnt, 0 );
     archive.io( "poison", poison, 0 );
     archive.io( "frequency", frequency, 0 );
-    archive.io( "note", note, 0 );
+    archive.io( "snippet_id", snippet_id, io::default_tag() );
     // NB! field is named `irridation` in legacy files
     archive.io( "irridation", irradiation, 0 );
     archive.io( "bday", bday, calendar::start_of_cataclysm );
@@ -2134,6 +2131,9 @@ void item::io( Archive &archive )
                             max_damage() );
     }
 
+    int note = 0;
+    const bool note_read = archive.read( "note", note );
+
     // Old saves used to only contain one of those values (stored under "poison"), it would be
     // loaded into a union of those members. Now they are separate members and must be set separately.
     if( poison != 0 && note == 0 && !type->snippet_category.empty() ) {
@@ -2146,6 +2146,10 @@ void item::io( Archive &archive )
         std::swap( irradiation, poison );
     }
 
+    if( note_read ) {
+        snippet_id = SNIPPET.migrate_hash_to_id( note );
+    }
+
     // Compatibility for item type changes: for example soap changed from being a generic item
     // (item::charges -1 or 0 or anything else) to comestible (and thereby counted by charges),
     // old saves still have invalid charges, this fixes the charges value to the default charges.
@@ -2808,8 +2812,9 @@ void mission::deserialize( JsonIn &jsin )
 
     // Suppose someone had two living players in an 0.C stable world. When loading player 1 in 0.D
     // (or maybe even creating a new player), the former condition makes legacy_no_player_id true.
-    // When loading player 2, there will be a player_id member in master.gsav, but the bool member legacy_no_player_id
-    // will have been saved as true (unless the mission belongs to a player that's been loaded into 0.D)
+    // When loading player 2, there will be a player_id member in SAVE_MASTER (i.e. master.gsav),
+    // but the bool member legacy_no_player_id will have been saved as true
+    // (unless the mission belongs to a player that's been loaded into 0.D)
     // See player::deserialize and mission::set_player_id_legacy_0c
     legacy_no_player_id = !jo.read( "player_id", player_id ) ||
                           jo.get_bool( "legacy_no_player_id", false );
diff --git a/src/sdlsound.cpp b/src/sdlsound.cpp
index 153cb6cceb250..da6b331422862 100644
--- a/src/sdlsound.cpp
+++ b/src/sdlsound.cpp
@@ -549,7 +549,7 @@ void sfx::play_ambient_variant_sound( const std::string &id, const std::string &
 
 void load_soundset()
 {
-    const std::string default_path = FILENAMES["defaultsounddir"];
+    const std::string default_path = PATH_INFO::defaultsounddir();
     const std::string default_soundpack = "basic";
     std::string current_soundpack = get_option<std::string>( "SOUNDPACKS" );
     std::string soundpack_path;
diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp
index 08b41e19940cf..35aef3dc76e34 100644
--- a/src/sdltiles.cpp
+++ b/src/sdltiles.cpp
@@ -3219,8 +3219,8 @@ static void save_font_list()
 {
     try {
         std::set<std::string> bitmap_fonts;
-        write_to_file( FILENAMES["fontlist"], [&]( std::ostream & fout ) {
-            font_folder_list( fout, FILENAMES["fontdir"], bitmap_fonts );
+        write_to_file( PATH_INFO::fontlist(), [&]( std::ostream & fout ) {
+            font_folder_list( fout, PATH_INFO::fontdir(), bitmap_fonts );
 
 #if defined(_WIN32)
             constexpr UINT max_dir_len = 256;
@@ -3256,31 +3256,18 @@ static void save_font_list()
     } catch( const std::exception &err ) {
         // This is called during startup, the UI system may not be initialized (because that
         // needs the font file in order to load the font for it).
-        dbg( D_ERROR ) << "Faied to create fontlist file \"" << FILENAMES["fontlist"] << "\": " <<
+        dbg( D_ERROR ) << "Faied to create fontlist file \"" << PATH_INFO::fontlist() << "\": " <<
                        err.what();
     }
 }
 
 static cata::optional<std::string> find_system_font( const std::string &name, int &faceIndex )
 {
-    const std::string fontlist_path = FILENAMES["fontlist"];
+    const std::string fontlist_path = PATH_INFO::fontlist();
     std::ifstream fin( fontlist_path.c_str() );
     if( !fin.is_open() ) {
-        // Try opening the fontlist at the old location.
-        fin.open( FILENAMES["legacy_fontlist"].c_str() );
-        if( !fin.is_open() ) {
-            dbg( D_INFO ) << "Generating fontlist";
-            assure_dir_exist( FILENAMES["config_dir"] );
-            save_font_list();
-            fin.open( fontlist_path.c_str() );
-            if( !fin ) {
-                dbg( D_ERROR ) << "Can't open or create fontlist file " << fontlist_path;
-                return cata::nullopt;
-            }
-        } else {
-            // Write out fontlist to the new location.
-            save_font_list();
-        }
+        // Write out fontlist to the new location.
+        save_font_list();
     }
     if( fin.is_open() ) {
         std::string fname;
@@ -3517,7 +3504,7 @@ std::unique_ptr<Font> Font::load_font( const std::string &typeface, int fontsize
         // Try to load as bitmap font.
         try {
             return std::unique_ptr<Font>( std::make_unique<BitmapFont>( fontwidth, fontheight,
-                                          FILENAMES["fontdir"] + typeface ) );
+                                          PATH_INFO::fontdir() + typeface ) );
         } catch( std::exception &err ) {
             dbg( D_ERROR ) << "Failed to load " << typeface << ": " << err.what();
             // Continue to load as truetype font
@@ -3816,13 +3803,13 @@ CachedTTFFont::CachedTTFFont( const int w, const int h, std::string typeface, in
     //make fontdata compatible with wincurse
     if( !file_exist( typeface ) ) {
         faceIndex = 0;
-        typeface = FILENAMES["fontdir"] + typeface + ".ttf";
+        typeface = PATH_INFO::fontdir() + typeface + ".ttf";
         dbg( D_INFO ) << "Using compatible font [" + typeface + "]." ;
     }
     //different default font with wincurse
     if( !file_exist( typeface ) ) {
         faceIndex = 0;
-        typeface = FILENAMES["fontdir"] + "fixedsys.ttf";
+        typeface = PATH_INFO::fontdir() + "fixedsys.ttf";
         dbg( D_INFO ) << "Using fallback font [" + typeface + "]." ;
     }
     dbg( D_INFO ) << "Loading truetype font [" + typeface + "]." ;
diff --git a/src/simple_pathfinding.h b/src/simple_pathfinding.h
index 29e5bd3e64c98..31b3c5becc8f9 100644
--- a/src/simple_pathfinding.h
+++ b/src/simple_pathfinding.h
@@ -50,8 +50,6 @@ path find_path( const point &source,
                 const int max_y,
                 BinaryPredicate estimator )
 {
-    static constexpr point d[4] = { point_north, point_east, point_south, point_west };
-
     const auto inbounds = [ max_x, max_y ]( const point & p ) {
         return p.x >= 0 && p.x < max_x && p.y >= 0 && p.y < max_y;
     };
@@ -105,7 +103,7 @@ path find_path( const point &source,
                 const int n = map_index( p );
                 const int dir = dirs[n];
                 res.nodes.emplace_back( p, dir );
-                p += d[dir];
+                p += four_adjacent_offsets[dir];
             }
 
             res.nodes.emplace_back( p, -1 );
@@ -114,7 +112,7 @@ path find_path( const point &source,
         }
 
         for( int dir = 0; dir < 4; dir++ ) {
-            const point p = mn.pos + d[dir];
+            const point p = mn.pos + four_adjacent_offsets[dir];
             const int n = map_index( p );
             // don't allow:
             // * out of bounds
@@ -162,8 +160,6 @@ inline path straight_path( const point &source,
                            int dir,
                            size_t len )
 {
-    static constexpr point d[4] = { point_north, point_east, point_south, point_west };
-
     path res;
 
     if( len == 0 ) {
@@ -177,7 +173,7 @@ inline path straight_path( const point &source,
     for( size_t i = 0; i + 1 < len; ++i ) {
         res.nodes.emplace_back( p, dir );
 
-        p += d[dir];
+        p += four_adjacent_offsets[dir];
     }
 
     res.nodes.emplace_back( p, -1 );
diff --git a/src/sounds.cpp b/src/sounds.cpp
index fe045360cf201..8e6bd34650045 100644
--- a/src/sounds.cpp
+++ b/src/sounds.cpp
@@ -416,7 +416,7 @@ void sounds::process_sound_markers( player *p )
                 continue;
             }
         }
-        const std::string &description = sound.description.empty() ? "a noise" : sound.description;
+        const std::string &description = sound.description.empty() ? _( "a noise" ) : sound.description;
         if( p->is_npc() ) {
             if( !sound.ambient ) {
                 npc *guy = dynamic_cast<npc *>( p );
diff --git a/src/stomach.cpp b/src/stomach.cpp
index da3c8598f8c81..6748490470511 100644
--- a/src/stomach.cpp
+++ b/src/stomach.cpp
@@ -1,29 +1,19 @@
-#include <algorithm>
-#include <memory>
 #include <string>
-#include <cmath>
 
 #include "avatar.h"
-#include "calendar.h"
 #include "cata_utility.h"
 #include "json.h"
-#include "player.h"
 #include "stomach.h"
 #include "units.h"
-#include "compatibility.h"
 #include "game.h"
-#include "item.h"
 #include "itype.h"
-#include "optional.h"
-#include "rng.h"
-#include "character.h"
-#include "options.h"
 
 stomach_contents::stomach_contents() = default;
 
-stomach_contents::stomach_contents( units::volume max_vol )
+stomach_contents::stomach_contents( units::volume max_vol, bool is_stomach )
 {
     max_volume = max_vol;
+    stomach = is_stomach;
     last_ate = calendar::before_time_starts;
 }
 
@@ -36,7 +26,6 @@ void stomach_contents::serialize( JsonOut &json ) const
 {
     json.start_object();
     json.member( "vitamins", vitamins );
-    json.member( "vitamins_absorbed", vitamins_absorbed );
     json.member( "calories", calories );
     json.member( "water", ml_to_string( water ) );
     json.member( "max_volume", ml_to_string( max_volume ) );
@@ -54,7 +43,6 @@ void stomach_contents::deserialize( JsonIn &json )
 {
     JsonObject jo = json.get_object();
     jo.read( "vitamins", vitamins );
-    jo.read( "vitamins_absorbed", vitamins_absorbed );
     jo.read( "calories", calories );
     std::string str;
     jo.read( "water", str );
@@ -66,27 +54,27 @@ void stomach_contents::deserialize( JsonIn &json )
     jo.read( "last_ate", last_ate );
 }
 
-units::volume stomach_contents::capacity() const
+units::volume stomach_contents::capacity( const Character &owner ) const
 {
     float max_mod = 1;
-    if( g->u.has_trait( trait_id( "GIZZARD" ) ) ) {
+    if( owner.has_trait( trait_id( "GIZZARD" ) ) ) {
         max_mod *= 0.9;
     }
-    if( g->u.has_active_mutation( trait_id( "HIBERNATE" ) ) ) {
+    if( owner.has_active_mutation( trait_id( "HIBERNATE" ) ) ) {
         max_mod *= 3;
     }
-    if( g->u.has_active_mutation( trait_id( "GOURMAND" ) ) ) {
+    if( owner.has_active_mutation( trait_id( "GOURMAND" ) ) ) {
         max_mod *= 2;
     }
-    if( g->u.has_trait( trait_id( "SLIMESPAWNER" ) ) ) {
+    if( owner.has_trait( trait_id( "SLIMESPAWNER" ) ) ) {
         max_mod *= 3;
     }
     return max_volume * max_mod;
 }
 
-units::volume stomach_contents::stomach_remaining() const
+units::volume stomach_contents::stomach_remaining( const Character &owner ) const
 {
-    return capacity() - contents - water;
+    return capacity( owner ) - contents - water;
 }
 
 units::volume stomach_contents::contains() const
@@ -94,281 +82,92 @@ units::volume stomach_contents::contains() const
     return contents + water;
 }
 
-bool stomach_contents::store_absorbed( player &p )
+void stomach_contents::ingest( const nutrients &ingested )
 {
-    if( p.is_npc() && get_option<bool>( "NO_NPC_FOOD" ) ) {
-        return false;
+    contents += ingested.solids;
+    water += ingested.water;
+    calories += ingested.kcal;
+    for( const std::pair<const vitamin_id, int> &vit : ingested.vitamins ) {
+        vitamins[vit.first] += vit.second;
     }
-    bool absorbed = false;
-    if( calories_absorbed != 0 ) {
-        p.mod_stored_kcal( calories_absorbed );
-        absorbed = true;
-    }
-    p.vitamins_mod( vitamins_absorbed, false );
-    vitamins_absorbed.clear();
-    return absorbed;
-}
-
-void stomach_contents::bowel_movement( const stomach_pass_rates &rates )
-{
-    int cal_rate = static_cast<int>( round( calories * rates.percent_kcal ) );
-    cal_rate = clamp( cal_rate, std::min( rates.min_kcal, calories - calories_absorbed ),
-                      calories - calories_absorbed );
-    if( cal_rate < 0 ) {
-        cal_rate = 0;
-    }
-    mod_calories( -cal_rate );
-    calories_absorbed = 0;
-    units::volume contents_rate = clamp( units::from_milliliter<int>( round(
-            units::to_milliliter<float>
-            ( contents ) * rates.percent_vol ) ), rates.min_vol, contents );
-    mod_contents( -contents_rate );
-    // water is a special case.
-    water = 0_ml;
-
-    for( auto &vit : vitamins ) {
-        const int vit_absorbed = vitamins_absorbed[vit.first];
-        // need to take absorbed vitamins into account for % moved
-        int percent = static_cast<int>( ( vit.second + vit_absorbed ) * rates.percent_vit );
-        // minimum vitamins that will move
-        int min = rates.min_vit;
-        int calc = std::max( percent, min );
-
-        if( vit_absorbed >= calc ) {
-            // vitamins are absorbed instead of moved
-            // assumed absorption is called from another function
-            calc = 0;
-        } else if( vit_absorbed != 0 ) {
-            calc -= vit_absorbed;
-        }
-
-        if( calc > vitamins[vit.first] ) {
-            calc = vitamins[vit.first];
-        }
-
-        vitamins[vit.first] -= calc;
-    }
-}
-
-void stomach_contents::bowel_movement()
-{
-    stomach_pass_rates rates;
-
-    /**
-     * The min numbers aren't technically needed since the percentage will
-     * take care of the entirety, but some values needed to be assigned
-     */
-    rates.percent_kcal = 1;
-    rates.min_kcal = 250;
-    rates.percent_vol = 1;
-    rates.min_vol = 25000_ml;
-    rates.percent_vit = 1;
-    rates.min_vit = 100;
-
-    bowel_movement( rates );
+    ate();
 }
 
-void stomach_contents::bowel_movement( const stomach_pass_rates &rates, stomach_contents &move_to )
+nutrients stomach_contents::digest( const Character &owner, const needs_rates &metabolic_rates,
+                                    int five_mins, int half_hours )
 {
-    int cal_rate = static_cast<int>( round( calories * rates.percent_kcal ) );
-    cal_rate = clamp( cal_rate, std::min( rates.min_kcal, calories - calories_absorbed ),
-                      calories - calories_absorbed );
-    move_to.mod_calories( cal_rate );
-    units::volume contents_rate = clamp( units::from_milliliter<int>( round(
-            units::to_milliliter<float>
-            ( contents ) * rates.percent_vol ) ), rates.min_vol, contents );
-    move_to.mod_contents( -contents_rate );
-    move_to.water += water;
+    nutrients digested;
+    stomach_digest_rates rates = get_digest_rates( metabolic_rates, owner );
 
-    for( auto &vit : vitamins ) {
-        const int vit_absorbed = vitamins_absorbed[vit.first];
-        // need to take absorbed vitamins into account for % moved
-        int percent = static_cast<int>( ( vit.second + vit_absorbed ) * rates.percent_vit );
-        // minimum vitamins that will move
-        int min = rates.min_vit;
-        int calc = std::max( percent, min );
+    // Digest water, but no more than in stomach.
+    digested.water = std::min( water, rates.water * five_mins );
+    water -= digested.water;
 
-        if( vit_absorbed >= calc ) {
-            // vitamins are absorbed instead of moved
-            // assumed absorption is called from another function
-            calc = 0;
-        } else if( vit_absorbed != 0 ) {
-            calc -= vit_absorbed;
+    // If no half-hour intervals have passed, we only process water, so bail out early.
+    if( half_hours == 0 ) {
+        // We need to initialize these to zero first, though.
+        digested.kcal = 0;
+        digested.solids = 0_ml;
+        for( const std::pair<const vitamin_id, int> &vit : digested.vitamins ) {
+            digested.vitamins[vit.first] = 0;
         }
-
-        if( calc > vitamins[vit.first] ) {
-            calc = vitamins[vit.first];
-        }
-
-        move_to.vitamins[vit.first] += calc;
+        return digested;
     }
-    bowel_movement( rates );
-}
 
-void stomach_contents::ingest( player &p, item &food, int charges = 1 )
-{
-    item comest;
-    if( food.is_container() ) {
-        comest = food.get_contained();
-    } else {
-        comest = food;
-    }
-    if( charges == 0 ) {
-        // if charges is 0, it means the item is not count_by_charges
-        charges = 1;
-    }
-    // maybe move tapeworm to digestion
-    for( const auto &v : p.vitamins_from( comest ) ) {
-        vitamins[v.first] += p.has_effect( efftype_id( "tapeworm" ) ) ? v.second / 2 : v.second;
-    }
-    auto &comest_t = comest.type->comestible;
-    const units::volume add_water = std::max( 0_ml, comest_t->quench * 5_ml );
-    // if this number is negative, we decrease the quench/increase the thirst of the player
-    if( comest_t->quench < 0 ) {
-        p.mod_thirst( -comest_t->quench );
-    } else {
-        mod_quench( comest_t->quench );
-    }
-    // @TODO: Move quench values to mL and remove the magic number here
-    mod_contents( comest.base_volume() * charges - add_water );
-
-    ate();
-
-    mod_calories( p.kcal_for( comest ) );
-}
-
-void stomach_contents::absorb_water( player &p, units::volume amount )
-{
-    if( water < amount ) {
-        amount = water;
-        water = 0_ml;
-    } else {
-        water -= amount;
-    }
-    if( p.get_thirst() < -100 ) {
-        return;
-    } else if( p.get_thirst() - units::to_milliliter( amount / 5 ) < -100 ) {
-        p.set_thirst( -100 );
-    }
-    p.mod_thirst( -units::to_milliliter( amount ) / 5 );
-}
+    // Digest solids, but no more than in stomach.
+    digested.solids = std::min( contents, rates.solids * half_hours );
+    contents -= digested.solids;
 
-void stomach_contents::absorb_kcal( int amount )
-{
-    if( amount <= 0 ) {
-        return;
-    }
-    calories_absorbed += amount;
-    calories -= amount;
-    if( calories < 0 ) { // just a little trickery to avoid overflow
-        calories_absorbed += calories;
-        calories = 0;
-    }
-}
+    // Digest kCal -- use min_kcal by default, but no more than what's in stomach,
+    // and no less than percentage_kcal of what's in stomach.
+    digested.kcal = half_hours * clamp( rates.min_kcal,
+                                        static_cast<int>( round( calories * rates.percent_kcal ) ), calories );
+    calories -= digested.kcal;
 
-bool stomach_contents::absorb_vitamin( const vitamin_id &vit, int amount )
-{
-    if( amount <= 0 ) {
-        return false;
+    // Digest vitamins just like we did kCal, but we need to do one at a time.
+    for( const std::pair<const vitamin_id, int> &vit : vitamins ) {
+        digested.vitamins[vit.first] = half_hours * clamp( rates.min_vitamin,
+                                       static_cast<int>( round( vit.second * rates.percent_vitamin ) ), vit.second );
+        vitamins[vit.first] -= digested.vitamins[vit.first];
     }
-    vitamins_absorbed[vit] += amount;
-    vitamins[vit] -= amount;
-    if( vitamins[vit] < 0 ) {
-        vitamins_absorbed[vit] += vitamins[vit];
-        vitamins[vit] = amount;
-    }
-    return true;
-}
 
-bool stomach_contents::absorb_vitamin( const std::pair<vitamin_id, int> &vit )
-{
-    return absorb_vitamin( vit.first, vit.second );
+    return digested;
 }
 
-bool stomach_contents::absorb_vitamins( const std::map<vitamin_id, int> &vitamins )
+void stomach_contents::empty()
 {
-    bool absorbed = false;
-    for( const std::pair<vitamin_id, int> vit : vitamins ) {
-        if( absorb_vitamin( vit ) ) {
-            absorbed = true;
-        }
-    }
-    return absorbed;
+    calories = 0;
+    water = 0_ml;
+    contents = 0_ml;
+    vitamins.clear();
 }
 
-stomach_pass_rates stomach_contents::get_pass_rates( bool stomach )
+stomach_digest_rates stomach_contents::get_digest_rates( const needs_rates &metabolic_rates,
+        const Character &owner )
 {
-    stomach_pass_rates rates;
-    // a human will digest food in about 53 hours
-    // most of the excrement is completely indigestible
-    // ie almost all of the calories ingested are absorbed.
-    // 3 hours will be accounted here as stomach
-    // the rest will be guts
+    stomach_digest_rates rates;
     if( stomach ) {
-        rates.min_vol = capacity() / 6;
+        // The stomach is focused on passing material on to the guts.
         // 3 hours to empty in 30 minute increments
-        rates.percent_vol = 1.0f / 6.0f;
-        rates.min_vit = 1;
-        rates.percent_vit = 1.0f / 6.0f;
+        rates.solids = capacity( owner ) / 6;
+        rates.water = 250_ml; // Water is special, passes very quickly, in 5 minute intervals
+        rates.min_vitamin = 1;
+        rates.percent_vitamin = 1.0f / 6.0f;
         rates.min_kcal = 5;
         rates.percent_kcal = 1.0f / 6.0f;
     } else {
-        rates.min_vol = std::max( capacity() / 100, 1_ml );
-        // 50 hours to empty in 30 minute increments
-        rates.percent_vol = 0.01f;
-        rates.min_vit = 1;
-        rates.percent_vit = 0.01f;
-        rates.min_kcal = 5;
-        rates.percent_kcal = 0.01f;
-    }
-    return rates;
-}
-
-stomach_absorb_rates stomach_contents::get_absorb_rates( bool stomach,
-        const needs_rates &metabolic_rates )
-{
-    stomach_absorb_rates rates;
-    if( !stomach ) {
+        // The guts are focused on absorption into the body, we don't care about passing rates.
+        // Solids rate doesn't do anything impactful here so just make it big enough to avoid overflow.
+        rates.solids = 250_ml;
+        rates.water = 250_ml;
         rates.min_kcal = roll_remainder( metabolic_rates.kcal / 24.0 * metabolic_rates.hunger );
         rates.percent_kcal = 0.05f * metabolic_rates.hunger;
-        rates.min_vitamin_default = round( 100.0 / 24.0 * metabolic_rates.hunger );
-        rates.percent_vitamin_default = 0.05f * metabolic_rates.hunger;
-    } else {
-        rates.min_kcal = 0;
-        rates.percent_kcal = 0.0f;
-        rates.min_vitamin_default = 0;
-        rates.percent_vitamin_default = 0.0f;
+        rates.min_vitamin = round( 100.0 / 24.0 * metabolic_rates.hunger );
+        rates.percent_vitamin = 0.05f * metabolic_rates.hunger;
     }
     return rates;
 }
 
-void stomach_contents::calculate_absorbed( stomach_absorb_rates rates )
-{
-    for( const auto vit : vitamins ) {
-        int min_v;
-        float percent_v;
-        if( rates.min_vitamin.find( vit.first ) != rates.min_vitamin.end() ) {
-            min_v = rates.min_vitamin[vit.first];
-        } else {
-            min_v = rates.min_vitamin_default;
-        }
-        if( rates.percent_vitamin.find( vit.first ) != rates.percent_vitamin.end() ) {
-            percent_v = rates.percent_vitamin[vit.first];
-        } else {
-            percent_v = rates.percent_vitamin_default;
-        }
-        int vit_absorbed = std::max( min_v, static_cast<int>( percent_v * vit.second ) );
-        // make sure the vitamins don't overflow
-        vit_absorbed = std::min( vit_absorbed, vit.second );
-        vitamins_absorbed[vit.first] += vit_absorbed;
-        vitamins[vit.first] -= vit_absorbed;
-    }
-    int cal = clamp( static_cast<int>( round( calories * rates.percent_kcal ) ),
-                     std::min( rates.min_kcal, calories ), calories );
-    calories_absorbed += cal;
-    calories -= cal;
-}
-
 void stomach_contents::mod_calories( int cal )
 {
     if( -cal >= calories ) {
@@ -378,11 +177,6 @@ void stomach_contents::mod_calories( int cal )
     calories += cal;
 }
 
-void stomach_contents::set_calories( int cal )
-{
-    calories = cal;
-}
-
 void stomach_contents::mod_nutr( int nutr )
 {
     // nutr is legacy type code, this function simply converts old nutrition to new kcal
@@ -415,16 +209,6 @@ int stomach_contents::get_calories() const
     return calories;
 }
 
-int stomach_contents::get_calories_absorbed() const
-{
-    return calories_absorbed;
-}
-
-void stomach_contents::set_calories_absorbed( int cal )
-{
-    calories_absorbed = cal;
-}
-
 units::volume stomach_contents::get_water() const
 {
     return water;
@@ -443,9 +227,9 @@ time_duration stomach_contents::time_since_ate() const
 // sets default stomach contents when starting the game
 void Character::initialize_stomach_contents()
 {
-    stomach = stomach_contents( 2500_ml );
-    guts = stomach_contents( 24000_ml );
-    guts.set_calories( 300 );
-    stomach.set_calories( 800 );
+    stomach = stomach_contents( 2500_ml, true );
+    guts = stomach_contents( 24_liter, false );
+    guts.mod_calories( 300 );
+    stomach.mod_calories( 800 );
     stomach.mod_contents( 475_ml );
 }
diff --git a/src/stomach.h b/src/stomach.h
index 28f975400f217..21a27ecddc26d 100644
--- a/src/stomach.h
+++ b/src/stomach.h
@@ -1,38 +1,31 @@
 #pragma once
 
 #include <map>
-#include <utility>
 
 #include "units.h"
-#include "calendar.h"
-#include "type_id.h"
 
 struct needs_rates;
-class player;
 class JsonIn;
 class JsonOut;
 class item;
 
-// how much the stomach_contents passes
-// based on 30 minute increments
-struct stomach_pass_rates {
-    units::volume min_vol;
-    float percent_vol;
-    int min_kcal;
-    float percent_kcal;
-    int min_vit;
-    float percent_vit;
+// Contains all information that can pass out of (or into) a stomach
+struct nutrients {
+    units::volume water;
+    units::volume solids;
+    int kcal;
+    std::map<vitamin_id, int> vitamins;
 };
 
-// how much a stomach_contents can absorb
+// how much a stomach_contents can digest
 // based on 30 minute increments
-struct stomach_absorb_rates {
+struct stomach_digest_rates {
+    units::volume solids;
+    units::volume water;
     float percent_kcal;
     int min_kcal;
-    std::map<vitamin_id, float> percent_vitamin;
-    std::map<vitamin_id, int> min_vitamin;
-    float percent_vitamin_default;
-    int min_vitamin_default;
+    float percent_vitamin;
+    int min_vitamin;
 };
 
 // an abstract of food that has been eaten.
@@ -40,46 +33,60 @@ class stomach_contents
 {
     public:
         stomach_contents();
-        stomach_contents( units::volume max_volume );
-
-        // empties the stomach_contents of all of its contents
-        void bowel_movement();
-        // empties contents equal to amount as ratio
-        // amount ranges from 0 to 1
-        void bowel_movement( const stomach_pass_rates &rates );
-        // moves @rates contents to other stomach_contents
-        // amount ranges from 0 to 1
-        void bowel_movement( const stomach_pass_rates &rates, stomach_contents &move_to );
-
-        // turns an item into stomach contents
-        // will still add contents if past maximum volume.
-        void ingest( player &p, item &food, int charges );
-
-        // calculates max volume for a stomach_contents
-        units::volume capacity() const;
+        /**
+         * @brief Construct a new stomach contents object
+         * Stomachs always process their food in a few hours. Guts take significantly longer,
+         * and their rate is dependent on the metabolic rate of their owner.
+         * @param max_volume Base capacity, subject to modification, i.e. by traits
+         * @param is_stomach If true, treated as stomach, if false, treated as guts
+         */
+        stomach_contents( units::volume max_volume, bool is_stomach );
+
+        /**
+         * @brief Directly adds nutrients to stomach contents.
+         * Will still add contents if past maximum volume. Also updates last_ate to current turn.
+         * @param ingested The nutrients to be ingested
+         */
+        void ingest( const nutrients &ingested );
+
+        /**
+         * @brief Processes food and outputs nutrients that are finished processing
+         * Metabolic rates are required because they determine the rate of absorption of
+         * nutrients into the body.
+         * All returned values are >= 0, with the exception of water, which
+         * can be negative in some circumstances (i.e. after eating dry/salty food).
+         * TODO: Update stomach capacity upon mutation changes, instead of calculating every time we
+         * need it, so we can get rid of 'owner' parameter here.
+         * @param owner The owner of this stomach
+         * @param metabolic_rates The metabolic rates of the owner of this stomach
+         * @param five_mins Five-minute intervals passed since this method was last called
+         * @param half_hours Half-hour intervals passed since this method was last called
+         * @return nutrients that are done processing in this stomach
+         */
+        nutrients digest( const Character &owner, const needs_rates &metabolic_rates,
+                          int five_mins, int half_hours );
+
+        // Empties the stomach of all contents.
+        void empty();
+
+        /**
+         * @brief Calculates the capacity of this stomach.
+         * This function needs a ref to the stomach's owner so it can account for relevant mutations.
+         * TODO: JSONize stomach capacity multipliers.
+         * @param owner This stomach's owner
+         * @return This stomach's capacity, in units::volume
+         */
+        units::volume capacity( const Character &owner ) const;
         // how much stomach capacity you have left before you puke from stuffing your gob
-        units::volume stomach_remaining() const;
+        units::volume stomach_remaining( const Character &owner ) const;
         // how much volume is in the stomach_contents
         units::volume contains() const;
 
-        // calculates and sets absorbed kcal and vitamins
-        void calculate_absorbed( stomach_absorb_rates rates );
-
-        // gets the rates of passing contents out of stomach_contents if true and guts if false
-        stomach_pass_rates get_pass_rates( bool stomach );
-        // gets the absorption rates for kcal and vitamins
-        // stomach == true, guts == false
-        stomach_absorb_rates get_absorb_rates( bool stomach, const needs_rates &metabolic_rates );
-
         int get_calories() const;
-        int get_calories_absorbed() const;
-        void set_calories_absorbed( int cal );
         units::volume get_water() const;
 
         // changes calorie amount
         void mod_calories( int calories );
-        // sets calories amount
-        void set_calories( int cal );
 
         // changes calorie amount based on old nutr value
         void mod_nutr( int nutr );
@@ -92,13 +99,6 @@ class stomach_contents
         // adds volume to your stomach
         void mod_contents( units::volume vol );
 
-        void absorb_water( player &p, units::volume amount );
-
-        // moves absorbed nutrients to the player for use
-        // returns true if any calories are absorbed
-        // does not empty absorbed calories
-        bool store_absorbed( player &p );
-
         // how long has it been since i ate?
         // only really relevant for player::stomach
         time_duration time_since_ate() const;
@@ -110,14 +110,13 @@ class stomach_contents
 
     private:
 
+        // If true, this object represents a stomach; if false, this object represents guts.
+        bool stomach;
+
         // vitamins in stomach_contents
         std::map<vitamin_id, int> vitamins;
-        // vitamins to be absorbed in stomach_contents
-        std::map<vitamin_id, int> vitamins_absorbed;
         // number of calories in stomach_contents
         int calories = 0;
-        // number of calories to be absorbed in stomach_contents
-        int calories_absorbed = 0;
         // volume of water in stomach_contents
         units::volume water;
         /**
@@ -131,21 +130,8 @@ class stomach_contents
         // when did this stomach_contents call stomach_contents::ingest()
         time_point last_ate;
 
-        // turns calories into absorbed calories.
-        // they are not added to your fat stores just yet
-        // only does anything if the input is a positive number
-        void absorb_kcal( int amount );
-        // absorbs a single vitamin.
-        // does not add it to player vitamins yet
-        // returns true if vitamins are absorbed
-        bool absorb_vitamin( const vitamin_id &vit, int amount );
-        // absorbs a single vitamin
-        // does not add it to player vitamins yet
-        // returns true if vitamins are absorbed
-        bool absorb_vitamin( const std::pair<vitamin_id, int> &vit );
-        // absorbs multiple vitamins
-        // does not add it to player vitamins yet
-        // returns true if any vitamins are absorbed
-        bool absorb_vitamins( const std::map<vitamin_id, int> &vitamins );
+        // Gets the rates at which this stomach will digest things.
+        stomach_digest_rates get_digest_rates( const needs_rates &metabolic_rates,
+                                               const Character &owner );
 
 };
diff --git a/src/suffer.cpp b/src/suffer.cpp
new file mode 100644
index 0000000000000..165f3bee055fa
--- /dev/null
+++ b/src/suffer.cpp
@@ -0,0 +1,1963 @@
+#include "character.h"
+
+#include <cctype>
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <string>
+#include <sstream>
+#include <limits>
+#include <bitset>
+#include <exception>
+#include <tuple>
+
+#include "activity_handlers.h"
+#include "addiction.h"
+#include "avatar.h"
+#include "bionics.h"
+#include "cata_utility.h"
+#include "catacharset.h"
+#include "effect.h"
+#include "enums.h"
+#include "field.h"
+#include "int_id.h"
+#include "game.h"
+#include "inventory.h"
+#include "item.h"
+#include "item_location.h"
+#include "itype.h"
+#include "iuse_actor.h"
+#include "magic.h"
+#include "map.h"
+#include "material.h"
+#include "math_defines.h"
+#include "messages.h"
+#include "morale.h"
+#include "morale_types.h"
+#include "mutation.h"
+#include "name.h"
+#include "npc.h"
+#include "options.h"
+#include "output.h"
+#include "recipe.h"
+#include "rng.h"
+#include "skill.h"
+#include "sounds.h"
+#include "stomach.h"
+#include "string_formatter.h"
+#include "string_id.h"
+#include "teleport.h"
+#include "text_snippets.h"
+#include "translations.h"
+#include "units.h"
+#include "veh_type.h"
+#include "vehicle.h"
+#include "visitable.h"
+#include "vitamin.h"
+#include "vpart_position.h"
+#include "vpart_range.h"
+#include "weather.h"
+#include "weather_gen.h"
+
+const efftype_id effect_adrenaline( "adrenaline" );
+const efftype_id effect_asthma( "asthma" );
+const efftype_id effect_attention( "attention" );
+const efftype_id effect_bandaged( "bandaged" );
+const efftype_id effect_bite( "bite" );
+const efftype_id effect_blind( "blind" );
+const efftype_id effect_bloodworms( "bloodworms" );
+const efftype_id effect_boomered( "boomered" );
+const efftype_id effect_brainworms( "brainworms" );
+const efftype_id effect_cig( "cig" );
+const efftype_id effect_common_cold( "common_cold" );
+const efftype_id effect_contacts( "contacts" );
+const efftype_id effect_corroding( "corroding" );
+const efftype_id effect_cough_suppress( "cough_suppress" );
+const efftype_id effect_darkness( "darkness" );
+const efftype_id effect_datura( "datura" );
+const efftype_id effect_deaf( "deaf" );
+const efftype_id effect_depressants( "depressants" );
+const efftype_id effect_dermatik( "dermatik" );
+const efftype_id effect_disabled( "disabled" );
+const efftype_id effect_disinfected( "disinfected" );
+const efftype_id effect_downed( "downed" );
+const efftype_id effect_drunk( "drunk" );
+const efftype_id effect_earphones( "earphones" );
+const efftype_id effect_evil( "evil" );
+const efftype_id effect_flu( "flu" );
+const efftype_id effect_foodpoison( "foodpoison" );
+const efftype_id effect_formication( "formication" );
+const efftype_id effect_fungus( "fungus" );
+const efftype_id effect_glowing( "glowing" );
+const efftype_id effect_glowy_led( "glowy_led" );
+const efftype_id effect_hallu( "hallu" );
+const efftype_id effect_happy( "happy" );
+const efftype_id effect_infected( "infected" );
+const efftype_id effect_iodine( "iodine" );
+const efftype_id effect_irradiated( "irradiated" );
+const efftype_id effect_jetinjector( "jetinjector" );
+const efftype_id effect_lack_sleep( "lack_sleep" );
+const efftype_id effect_sleep_deprived( "sleep_deprived" );
+const efftype_id effect_lying_down( "lying_down" );
+const efftype_id effect_mending( "mending" );
+const efftype_id effect_meth( "meth" );
+const efftype_id effect_narcosis( "narcosis" );
+const efftype_id effect_nausea( "nausea" );
+const efftype_id effect_no_sight( "no_sight" );
+const efftype_id effect_onfire( "onfire" );
+const efftype_id effect_paincysts( "paincysts" );
+const efftype_id effect_pkill( "pkill" );
+const efftype_id effect_pkill1( "pkill1" );
+const efftype_id effect_pkill2( "pkill2" );
+const efftype_id effect_pkill3( "pkill3" );
+const efftype_id effect_sad( "sad" );
+const efftype_id effect_shakes( "shakes" );
+const efftype_id effect_sleep( "sleep" );
+const efftype_id effect_slept_through_alarm( "slept_through_alarm" );
+const efftype_id effect_spores( "spores" );
+const efftype_id effect_stim( "stim" );
+const efftype_id effect_stim_overdose( "stim_overdose" );
+const efftype_id effect_stunned( "stunned" );
+const efftype_id effect_tapeworm( "tapeworm" );
+const efftype_id effect_took_thorazine( "took_thorazine" );
+const efftype_id effect_valium( "valium" );
+const efftype_id effect_visuals( "visuals" );
+const efftype_id effect_weed_high( "weed_high" );
+const efftype_id effect_winded( "winded" );
+const efftype_id effect_bleed( "bleed" );
+const efftype_id effect_magnesium_supplements( "magnesium" );
+const efftype_id effect_pet( "pet" );
+
+static const bionic_id bio_advreactor( "bio_advreactor" );
+static const bionic_id bio_dis_acid( "bio_dis_acid" );
+static const bionic_id bio_dis_shock( "bio_dis_shock" );
+static const bionic_id bio_drain( "bio_drain" );
+static const bionic_id bio_faraday( "bio_faraday" );
+static const bionic_id bio_glowy( "bio_glowy" );
+static const bionic_id bio_geiger( "bio_geiger" );
+static const bionic_id bio_gills( "bio_gills" );
+static const bionic_id bio_itchy( "bio_itchy" );
+static const bionic_id bio_jointservo( "bio_jointservo" );
+static const bionic_id bio_leaky( "bio_leaky" );
+static const bionic_id bio_noise( "bio_noise" );
+static const bionic_id bio_plut_filter( "bio_plut_filter" );
+static const bionic_id bio_power_weakness( "bio_power_weakness" );
+static const bionic_id bio_reactor( "bio_reactor" );
+static const bionic_id bio_shakes( "bio_shakes" );
+static const bionic_id bio_sleepy( "bio_sleepy" );
+static const bionic_id bio_soporific( "bio_soporific" );
+static const bionic_id bio_spasm( "bio_spasm" );
+static const bionic_id bio_trip( "bio_trip" );
+
+static const trait_id trait_ADDICTIVE( "ADDICTIVE" );
+static const trait_id trait_ALBINO( "ALBINO" );
+static const trait_id trait_ASTHMA( "ASTHMA" );
+static const trait_id trait_CHAOTIC( "CHAOTIC" );
+static const trait_id trait_CHAOTIC_BAD( "CHAOTIC_BAD" );
+static const trait_id trait_CHEMIMBALANCE( "CHEMIMBALANCE" );
+static const trait_id trait_DEBUG_NOTEMP( "DEBUG_NOTEMP" );
+static const trait_id trait_FASTHEALER( "FASTHEALER" );
+static const trait_id trait_FASTHEALER2( "FASTHEALER2" );
+static const trait_id trait_FRESHWATEROSMOSIS( "FRESHWATEROSMOSIS" );
+static const trait_id trait_GILLS( "GILLS" );
+static const trait_id trait_GILLS_CEPH( "GILLS_CEPH" );
+static const trait_id trait_JITTERY( "JITTERY" );
+static const trait_id trait_KILLER( "KILLER" );
+static const trait_id trait_LEAVES( "LEAVES" );
+static const trait_id trait_LEAVES2( "LEAVES2" );
+static const trait_id trait_LEAVES3( "LEAVES3" );
+static const trait_id trait_MOODSWINGS( "MOODSWINGS" );
+static const trait_id trait_M_BLOSSOMS( "M_BLOSSOMS" );
+static const trait_id trait_M_SKIN3( "M_SKIN3" );
+static const trait_id trait_M_SPORES( "M_SPORES" );
+static const trait_id trait_NARCOLEPTIC( "NARCOLEPTIC" );
+static const trait_id trait_NONADDICTIVE( "NONADDICTIVE" );
+static const trait_id trait_NOPAIN( "NOPAIN" );
+static const trait_id trait_PAINREC1( "PAINREC1" );
+static const trait_id trait_PAINREC2( "PAINREC2" );
+static const trait_id trait_PAINREC3( "PAINREC3" );
+static const trait_id trait_PER_SLIME( "PER_SLIME" );
+static const trait_id trait_PYROMANIA( "PYROMANIA" );
+static const trait_id trait_RADIOACTIVE1( "RADIOACTIVE1" );
+static const trait_id trait_RADIOACTIVE2( "RADIOACTIVE2" );
+static const trait_id trait_RADIOACTIVE3( "RADIOACTIVE3" );
+static const trait_id trait_RADIOGENIC( "RADIOGENIC" );
+static const trait_id trait_REGEN( "REGEN" );
+static const trait_id trait_REGEN_LIZ( "REGEN_LIZ" );
+static const trait_id trait_ROOTS2( "ROOTS2" );
+static const trait_id trait_ROOTS3( "ROOTS3" );
+static const trait_id trait_SCHIZOPHRENIC( "SCHIZOPHRENIC" );
+static const trait_id trait_SHARKTEETH( "SHARKTEETH" );
+static const trait_id trait_SHOUT1( "SHOUT1" );
+static const trait_id trait_SHOUT2( "SHOUT2" );
+static const trait_id trait_SHOUT3( "SHOUT3" );
+static const trait_id trait_SLOWHEALER( "SLOWHEALER" );
+static const trait_id trait_SORES( "SORES" );
+static const trait_id trait_SUNBURN( "SUNBURN" );
+static const trait_id trait_TROGLO( "TROGLO" );
+static const trait_id trait_TROGLO2( "TROGLO2" );
+static const trait_id trait_TROGLO3( "TROGLO3" );
+static const trait_id trait_UNSTABLE( "UNSTABLE" );
+static const trait_id trait_VOMITOUS( "VOMITOUS" );
+static const trait_id trait_WEB_SPINNER( "WEB_SPINNER" );
+static const trait_id trait_WEB_WEAVER( "WEB_WEAVER" );
+
+static float addiction_scaling( float at_min, float at_max, float add_lvl )
+{
+    // Not addicted
+    if( add_lvl < MIN_ADDICTION_LEVEL ) {
+        return 1.0f;
+    }
+
+    return lerp( at_min, at_max, ( add_lvl - MIN_ADDICTION_LEVEL ) / MAX_ADDICTION_LEVEL );
+}
+
+void Character::suffer_water_damage( const mutation_branch &mdata )
+{
+    for( const body_part bp : all_body_parts ) {
+        const float wetness_percentage = static_cast<float>( body_wetness[bp] ) /
+                                         drench_capacity[bp];
+        const int dmg = mdata.weakness_to_water * wetness_percentage;
+        if( dmg > 0 ) {
+            apply_damage( nullptr, bp, dmg );
+            add_msg_player_or_npc( m_bad, _( "Your %s is damaged by the water." ),
+                                   _( "<npcname>'s %s is damaged by the water." ),
+                                   body_part_name( bp ) );
+        } else if( dmg < 0 && hp_cur[bp_to_hp( bp )] != hp_max[bp_to_hp( bp )] ) {
+            heal( bp, abs( dmg ) );
+            add_msg_player_or_npc( m_good, _( "Your %s is healed by the water." ),
+                                   _( "<npcname>'s %s is healed by the water." ),
+                                   body_part_name( bp ) );
+        }
+    }
+}
+
+void Character::suffer_mutation_power( const mutation_branch &mdata,
+                                       Character::trait_data &tdata )
+{
+    if( tdata.powered && tdata.charge > 0 ) {
+        // Already-on units just lose a bit of charge
+        tdata.charge--;
+    } else {
+        // Not-on units, or those with zero charge, have to pay the power cost
+        if( mdata.cooldown > 0 ) {
+            tdata.powered = true;
+            tdata.charge = mdata.cooldown - 1;
+        }
+        if( mdata.hunger ) {
+            // does not directly modify hunger, but burns kcal
+            mod_stored_nutr( mdata.cost );
+            if( get_bmi() < character_weight_category::underweight ) {
+                add_msg_if_player( m_warning,
+                                   _( "You're too malnourished to keep your %s going." ),
+                                   mdata.name() );
+                tdata.powered = false;
+            }
+        }
+        if( mdata.thirst ) {
+            mod_thirst( mdata.cost );
+            if( get_thirst() >= 260 ) { // Well into Dehydrated
+                add_msg_if_player( m_warning,
+                                   _( "You're too dehydrated to keep your %s going." ),
+                                   mdata.name() );
+                tdata.powered = false;
+            }
+        }
+        if( mdata.fatigue ) {
+            mod_fatigue( mdata.cost );
+            if( get_fatigue() >= EXHAUSTED ) { // Exhausted
+                add_msg_if_player( m_warning,
+                                   _( "You're too exhausted to keep your %s going." ),
+                                   mdata.name() );
+                tdata.powered = false;
+            }
+        }
+        if( !tdata.powered ) {
+            apply_mods( mdata.id, false );
+        }
+    }
+}
+
+void Character::suffer_while_underwater()
+{
+    if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) ) {
+        oxygen--;
+    }
+    if( oxygen < 12 && worn_with_flag( "REBREATHER" ) ) {
+        oxygen += 12;
+    }
+    if( oxygen <= 5 ) {
+        if( has_bionic( bio_gills ) && get_power_level() >= 25_kJ ) {
+            oxygen += 5;
+            mod_power_level( -25_kJ );
+        } else {
+            add_msg_if_player( m_bad, _( "You're drowning!" ) );
+            apply_damage( nullptr, bp_torso, rng( 1, 4 ) );
+        }
+    }
+    if( has_trait( trait_FRESHWATEROSMOSIS ) && !g->m.has_flag_ter( "SALT_WATER", pos() ) &&
+        get_thirst() > -60 ) {
+        mod_thirst( -1 );
+    }
+}
+
+void Character::suffer_from_addictions()
+{
+    time_duration timer = -6_hours;
+    if( has_trait( trait_ADDICTIVE ) ) {
+        timer = -10_hours;
+    } else if( has_trait( trait_NONADDICTIVE ) ) {
+        timer = -3_hours;
+    }
+    for( addiction &cur_addiction : addictions ) {
+        if( cur_addiction.sated <= 0_turns &&
+            cur_addiction.intensity >= MIN_ADDICTION_LEVEL ) {
+            addict_effect( *this, cur_addiction );
+        }
+        cur_addiction.sated -= 1_turns;
+        // Higher intensity addictions heal faster
+        if( cur_addiction.sated - 10_minutes * cur_addiction.intensity < timer ) {
+            if( cur_addiction.intensity <= 2 ) {
+                rem_addiction( cur_addiction.type );
+                break;
+            } else {
+                cur_addiction.intensity--;
+                cur_addiction.sated = 0_turns;
+            }
+        }
+    }
+}
+
+void Character::suffer_while_awake( const int current_stim )
+{
+    if( !has_trait( trait_id( "DEBUG_STORAGE" ) ) &&
+        ( weight_carried() > 4 * weight_capacity() ) ) {
+        if( has_effect( effect_downed ) ) {
+            add_effect( effect_downed, 1_turns, num_bp, false, 0, true );
+        } else {
+            add_effect( effect_downed, 2_turns, num_bp, false, 0, true );
+        }
+    }
+    if( has_trait( trait_CHEMIMBALANCE ) ) {
+        suffer_from_chemimbalance();
+    }
+    if( ( has_trait( trait_SCHIZOPHRENIC ) || has_artifact_with( AEP_SCHIZO ) ) &&
+        !has_effect( effect_took_thorazine ) ) {
+        suffer_from_schizophrenia();
+    }
+
+    if( ( has_trait( trait_NARCOLEPTIC ) || has_artifact_with( AEP_SCHIZO ) ) ) {
+        if( one_turn_in( 8_hours ) ) {
+            add_msg( m_bad,
+                     _( "You're suddenly overcome with the urge to sleep and you pass out." ) );
+            add_effect( effect_lying_down, 20_minutes );
+        }
+    }
+
+    if( has_trait( trait_JITTERY ) && !has_effect( effect_shakes ) ) {
+        if( current_stim > 50 && one_in( to_turns<int>( 30_minutes ) - ( current_stim * 6 ) ) ) {
+            add_effect( effect_shakes, 30_minutes + 1_turns * current_stim );
+        } else if( ( get_hunger() > 80 || get_kcal_percent() < 1.0f ) && get_hunger() > 0 &&
+                   one_in( to_turns<int>( 50_minutes ) - ( get_hunger() * 6 ) ) ) {
+            add_effect( effect_shakes, 40_minutes );
+        }
+    }
+
+    if( has_trait( trait_MOODSWINGS ) && one_turn_in( 6_hours ) ) {
+        if( rng( 1, 20 ) > 9 ) { // 55% chance
+            add_morale( MORALE_MOODSWING, -100, -500 );
+        } else {  // 45% chance
+            add_morale( MORALE_MOODSWING, 100, 500 );
+        }
+    }
+
+    if( has_trait( trait_VOMITOUS ) && one_turn_in( 7_hours ) ) {
+        vomit();
+    }
+
+    if( has_trait( trait_SHOUT1 ) && one_turn_in( 6_hours ) ) {
+        shout();
+    }
+    if( has_trait( trait_SHOUT2 ) && one_turn_in( 4_hours ) ) {
+        shout();
+    }
+    if( has_trait( trait_SHOUT3 ) && one_turn_in( 3_hours ) ) {
+        shout();
+    }
+    if( has_trait( trait_M_SPORES ) && one_turn_in( 4_hours ) ) {
+        spores();
+    }
+    if( has_trait( trait_M_BLOSSOMS ) && one_turn_in( 3_hours ) ) {
+        blossoms();
+    }
+}
+
+void Character::suffer_from_chemimbalance()
+{
+    if( one_turn_in( 6_hours ) && !has_trait( trait_NOPAIN ) ) {
+        add_msg_if_player( m_bad, _( "You suddenly feel sharp pain for no reason." ) );
+        mod_pain( 3 * rng( 1, 3 ) );
+    }
+    if( one_turn_in( 6_hours ) ) {
+        int pkilladd = 5 * rng( -1, 2 );
+        if( pkilladd > 0 ) {
+            add_msg_if_player( m_bad, _( "You suddenly feel numb." ) );
+        } else if( ( pkilladd < 0 ) && ( !( has_trait( trait_NOPAIN ) ) ) ) {
+            add_msg_if_player( m_bad, _( "You suddenly ache." ) );
+        }
+        mod_painkiller( pkilladd );
+    }
+    if( one_turn_in( 6_hours ) && !has_effect( effect_sleep ) ) {
+        add_msg_if_player( m_bad, _( "You feel dizzy for a moment." ) );
+        moves -= rng( 10, 30 );
+    }
+    if( one_turn_in( 6_hours ) ) {
+        int hungadd = 5 * rng( -1, 3 );
+        if( hungadd > 0 ) {
+            add_msg_if_player( m_bad, _( "You suddenly feel hungry." ) );
+        } else {
+            add_msg_if_player( m_good, _( "You suddenly feel a little full." ) );
+        }
+        mod_hunger( hungadd );
+    }
+    if( one_turn_in( 6_hours ) ) {
+        add_msg_if_player( m_bad, _( "You suddenly feel thirsty." ) );
+        mod_thirst( 5 * rng( 1, 3 ) );
+    }
+    if( one_turn_in( 6_hours ) ) {
+        add_msg_if_player( m_good, _( "You feel fatigued all of a sudden." ) );
+        mod_fatigue( 10 * rng( 2, 4 ) );
+    }
+    if( one_turn_in( 8_hours ) ) {
+        if( one_in( 3 ) ) {
+            add_morale( MORALE_FEELING_GOOD, 20, 100 );
+        } else {
+            add_morale( MORALE_FEELING_BAD, -20, -100 );
+        }
+    }
+    if( one_turn_in( 6_hours ) ) {
+        if( one_in( 3 ) ) {
+            add_msg_if_player( m_bad, _( "You suddenly feel very cold." ) );
+            temp_cur.fill( BODYTEMP_VERY_COLD );
+        } else {
+            add_msg_if_player( m_bad, _( "You suddenly feel cold." ) );
+            temp_cur.fill( BODYTEMP_COLD );
+        }
+    }
+    if( one_turn_in( 6_hours ) ) {
+        if( one_in( 3 ) ) {
+            add_msg_if_player( m_bad, _( "You suddenly feel very hot." ) );
+            temp_cur.fill( BODYTEMP_VERY_HOT );
+        } else {
+            add_msg_if_player( m_bad, _( "You suddenly feel hot." ) );
+            temp_cur.fill( BODYTEMP_HOT );
+        }
+    }
+}
+
+void Character::suffer_from_schizophrenia()
+{
+    std::string i_name_w;
+    if( !weapon.is_null() ) {
+        std::string i_name_w = weapon.has_var( "item_label" ) ? weapon.get_var( "item_label" ) :
+                               //~ %1$s: weapon name
+                               string_format( _( "your %1$s" ), weapon.type_name() );
+    }
+    // Start with the effects that both NPCs and avatars can suffer from
+    // Delusions
+    if( one_turn_in( 8_hours ) ) {
+        if( rng( 1, 20 ) > 5 ) {  // 75% chance
+            const translation snip = SNIPPET.random_from_category( "schizo_delusion_paranoid" ).value_or(
+                                         translation() );
+            add_msg_if_player( m_warning, "%s", snip );
+            add_morale( MORALE_FEELING_BAD, -20, -100 );
+        } else { // 25% chance
+            const translation snip = SNIPPET.random_from_category( "schizo_delusion_grandiose" ).value_or(
+                                         translation() );
+            add_msg_if_player( m_good, "%s", snip );
+            add_morale( MORALE_FEELING_GOOD, 20, 100 );
+        }
+        return;
+    }
+    // Formication
+    if( one_turn_in( 6_hours ) ) {
+        const translation snip = SNIPPET.random_from_category( "schizo_formication" ).value_or(
+                                     translation() );
+        body_part bp = random_body_part( true );
+        add_effect( effect_formication, 45_minutes, bp );
+        add_msg_if_player( m_bad, "%s", snip );
+        return;
+    }
+    // Numbness
+    if( one_turn_in( 4_hours ) ) {
+        add_msg_if_player( m_bad, _( "You suddenly feel so numb…" ) );
+        mod_painkiller( 25 );
+        return;
+    }
+    // Hallucination
+    if( one_turn_in( 6_hours ) ) {
+        add_effect( effect_hallu, 6_hours );
+        return;
+    }
+    // Visuals
+    if( one_turn_in( 2_hours ) ) {
+        add_effect( effect_visuals, rng( 15_turns, 60_turns ) );
+        return;
+    }
+    // Shaking
+    if( !has_effect( effect_valium ) && one_turn_in( 4_hours ) ) {
+        add_msg_player_or_npc( m_bad, _( "You start to shake uncontrollably." ),
+                               _( "<npcname> starts to shake uncontrollably." ) );
+        add_effect( effect_shakes, rng( 2_minutes, 5_minutes ) );
+        return;
+    }
+    // Shout
+    if( one_turn_in( 4_hours ) ) {
+        shout( SNIPPET.random_from_category( "schizo_self_shout" ).value_or( translation() ).translated() );
+        return;
+    }
+    // Drop weapon
+    if( one_turn_in( 2_days ) && !weapon.is_null() ) {
+        const translation snip = SNIPPET.random_from_category( "schizo_weapon_drop" ).value_or(
+                                     translation() );
+        std::string str = string_format( snip, i_name_w );
+        str[0] = toupper( str[0] );
+
+        add_msg_if_player( m_bad, "%s", str );
+        drop( get_item_position( &weapon ), pos() );
+        // NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores)
+        return;
+    }
+    // Talk to self
+    if( one_turn_in( 4_hours ) ) {
+        const translation snip = SNIPPET.random_from_category( "schizo_self_talk" ).value_or(
+                                     translation() );
+        add_msg( _( "%1$s says: \"%2$s\"" ), name, snip );
+        return;
+    }
+
+    // effects of this point are entirely internal, so NPCs can't suffer from them
+    if( is_npc() ) {
+        return;
+    }
+    // Sound
+    if( one_turn_in( 4_hours ) ) {
+        sound_hallu();
+    }
+    // Follower turns hostile
+    if( one_turn_in( 4_hours ) ) {
+        std::vector<std::shared_ptr<npc>> followers = overmap_buffer.get_npcs_near_player( 12 );
+
+        std::string who_gets_angry = name;
+        if( !followers.empty() ) {
+            who_gets_angry = random_entry_ref( followers )->name;
+        }
+        add_msg( m_bad, _( "%1$s gets angry!" ), who_gets_angry );
+        return;
+    }
+
+    // Monster dies
+    if( one_turn_in( 6_hours ) ) {
+        // TODO: move to monster group json
+        static const mtype_id mon_zombie( "mon_zombie" );
+        static const mtype_id mon_zombie_fat( "mon_zombie_fat" );
+        static const mtype_id mon_zombie_fireman( "mon_zombie_fireman" );
+        static const mtype_id mon_zombie_cop( "mon_zombie_cop" );
+        static const mtype_id mon_zombie_soldier( "mon_zombie_soldier" );
+        static const std::array<mtype_id, 5> monsters = { {
+                mon_zombie, mon_zombie_fat, mon_zombie_fireman, mon_zombie_cop, mon_zombie_soldier
+            }
+        };
+        add_msg( _( "%s dies!" ), random_entry_ref( monsters )->nname() );
+        return;
+    }
+
+    // Limb Breaks
+    if( one_turn_in( 4_hours ) ) {
+        const translation snip = SNIPPET.random_from_category( "broken_limb" ).value_or( translation() );
+        add_msg( m_bad, "%s", snip );
+        return;
+    }
+
+    // NPC chat
+    if( one_turn_in( 4_hours ) ) {
+        std::string i_name = Name::generate( one_in( 2 ) );
+
+        std::string i_talk = SNIPPET.expand( SNIPPET.random_from_category( "<lets_talk>" ).value_or(
+                translation() ).translated() );
+        parse_tags( i_talk, *this, *this );
+
+        add_msg( _( "%1$s says: \"%2$s\"" ), i_name, i_talk );
+        return;
+    }
+
+    // Skill raise
+    if( one_turn_in( 12_hours ) ) {
+        skill_id raised_skill = Skill::random_skill();
+        add_msg( m_good, _( "You increase %1$s to level %2$d." ), raised_skill.obj().name(),
+                 get_skill_level( raised_skill ) + 1 );
+        return;
+    }
+
+    // Talking weapon
+    if( !weapon.is_null() ) {
+        // If player has a weapon, picks a message from said weapon
+        // Weapon tells player to kill a monster if any are nearby
+        // Weapon is concerned for player if bleeding
+        // Weapon is concerned for itself if damaged
+        // Otherwise random chit-chat
+        std::vector<std::weak_ptr<monster>> mons = g->all_monsters().items;
+
+        std::string i_talk_w;
+        bool does_talk = false;
+        if( !mons.empty() && one_turn_in( 12_minutes ) ) {
+            std::vector<std::string> seen_mons;
+            for( std::weak_ptr<monster> &n : mons ) {
+                if( sees( *n.lock() ) ) {
+                    seen_mons.emplace_back( n.lock()->get_name() );
+                }
+            }
+            if( !seen_mons.empty() ) {
+                const translation talk_w = SNIPPET.random_from_category( "schizo_weapon_talk_monster" ).value_or(
+                                               translation() );
+                i_talk_w = string_format( talk_w, random_entry_ref( seen_mons ) );
+                does_talk = true;
+            }
+        }
+        if( !does_talk && has_effect( effect_bleed ) && one_turn_in( 5_minutes ) ) {
+            i_talk_w = SNIPPET.random_from_category( "schizo_weapon_talk_bleeding" ).value_or(
+                           translation() ).translated();
+            does_talk = true;
+        } else if( weapon.damage() >= weapon.max_damage() / 3 && one_turn_in( 1_hours ) ) {
+            i_talk_w = SNIPPET.random_from_category( "schizo_weapon_talk_damaged" ).value_or(
+                           translation() ).translated();
+            does_talk = true;
+        } else if( one_turn_in( 4_hours ) ) {
+            i_talk_w = SNIPPET.random_from_category( "schizo_weapon_talk_misc" ).value_or(
+                           translation() ).translated();
+            does_talk = true;
+        }
+        if( does_talk ) {
+            add_msg( _( "%1$s says: \"%2$s\"" ), i_name_w, i_talk_w );
+            return;
+        }
+    }
+}
+
+void Character::suffer_from_asthma( const int current_stim )
+{
+    if( has_effect( effect_adrenaline ) || has_effect( effect_datura ) ) {
+        return;
+    }
+    if( !one_in( ( to_turns<int>( 6_hours ) - current_stim * 300 ) *
+                 ( has_effect( effect_sleep ) ? 10 : 1 ) ) ) {
+        return;
+    }
+    bool auto_use = has_charges( "inhaler", 1 ) || has_charges( "oxygen_tank", 1 ) ||
+                    has_charges( "smoxygen_tank", 1 );
+    bool oxygenator = has_bionic( bio_gills ) && get_power_level() >= 3_kJ;
+    if( underwater ) {
+        oxygen = oxygen / 2;
+        auto_use = false;
+    }
+
+    add_msg_player_or_npc( m_bad, _( "You have an asthma attack!" ),
+                           "<npcname> starts wheezing and coughing." );
+
+    if( in_sleep_state() && !has_effect( effect_narcosis ) ) {
+        inventory map_inv;
+        map_inv.form_from_map( g->u.pos(), 2, &g->u );
+        // check if an inhaler is somewhere near
+        bool nearby_use = auto_use || oxygenator || map_inv.has_charges( "inhaler", 1 ) ||
+                          map_inv.has_charges( "oxygen_tank", 1 ) ||
+                          map_inv.has_charges( "smoxygen_tank", 1 );
+        // check if character has an oxygenator first
+        if( oxygenator ) {
+            mod_power_level( -3_kJ );
+            add_msg_if_player( m_info, _( "You use your Oxygenator to clear it up, "
+                                          "then go back to sleep." ) );
+        } else if( auto_use ) {
+            if( use_charges_if_avail( "inhaler", 1 ) ) {
+                add_msg_if_player( m_info, _( "You use your inhaler and go back to sleep." ) );
+            } else if( use_charges_if_avail( "oxygen_tank", 1 ) ||
+                       use_charges_if_avail( "smoxygen_tank", 1 ) ) {
+                add_msg_if_player( m_info, _( "You take a deep breath from your oxygen tank "
+                                              "and go back to sleep." ) );
+            }
+        } else if( nearby_use ) {
+            // create new variable to resolve a reference issue
+            int amount = 1;
+            if( !g->m.use_charges( g->u.pos(), 2, "inhaler", amount ).empty() ) {
+                add_msg_if_player( m_info, _( "You use your inhaler and go back to sleep." ) );
+            } else if( !g->m.use_charges( g->u.pos(), 2, "oxygen_tank", amount ).empty() ||
+                       !g->m.use_charges( g->u.pos(), 2, "smoxygen_tank", amount ).empty() ) {
+                add_msg_if_player( m_info, _( "You take a deep breath from your oxygen tank "
+                                              "and go back to sleep." ) );
+            }
+        } else {
+            add_effect( effect_asthma, rng( 5_minutes, 20_minutes ) );
+            if( has_effect( effect_sleep ) ) {
+                wake_up();
+            } else {
+                if( !is_npc() ) {
+                    g->cancel_activity_or_ignore_query( distraction_type::asthma,
+                                                        _( "You can't focus while choking!" ) );
+                }
+            }
+        }
+    } else if( auto_use ) {
+        int charges = 0;
+        if( use_charges_if_avail( "inhaler", 1 ) ) {
+            moves -= 40;
+            charges = charges_of( "inhaler" );
+            if( charges == 0 ) {
+                add_msg_if_player( m_bad, _( "You use your last inhaler charge." ) );
+            } else {
+                add_msg_if_player( m_info, ngettext( "You use your inhaler, "
+                                                     "only %d charge left.",
+                                                     "You use your inhaler, "
+                                                     "only %d charges left.", charges ),
+                                   charges );
+            }
+        } else if( use_charges_if_avail( "oxygen_tank", 1 ) ||
+                   use_charges_if_avail( "smoxygen_tank", 1 ) ) {
+            moves -= 500; // synched with use action
+            charges = charges_of( "oxygen_tank" ) + charges_of( "smoxygen_tank" );
+            if( charges == 0 ) {
+                add_msg_if_player( m_bad, _( "You breathe in last bit of oxygen "
+                                             "from the tank." ) );
+            } else {
+                add_msg_if_player( m_info, ngettext( "You take a deep breath from your oxygen "
+                                                     "tank, only %d charge left.",
+                                                     "You take a deep breath from your oxygen "
+                                                     "tank, only %d charges left.", charges ),
+                                   charges );
+            }
+        }
+    } else {
+        add_effect( effect_asthma, rng( 5_minutes, 20_minutes ) );
+        if( !is_npc() ) {
+            g->cancel_activity_or_ignore_query( distraction_type::asthma,
+                                                _( "You can't focus while choking!" ) );
+        }
+    }
+}
+
+void Character::suffer_in_sunlight()
+{
+    double sleeve_factor = armwear_factor();
+    const bool has_hat = wearing_something_on( bp_head );
+    const bool leafy = has_trait( trait_LEAVES ) || has_trait( trait_LEAVES2 ) ||
+                       has_trait( trait_LEAVES3 );
+    const bool leafier = has_trait( trait_LEAVES2 ) || has_trait( trait_LEAVES3 );
+    const bool leafiest = has_trait( trait_LEAVES3 );
+    int sunlight_nutrition = 0;
+    if( leafy && g->m.is_outside( pos() ) && ( g->light_level( pos().z ) >= 40 ) ) {
+        const float weather_factor = ( g->weather.weather == WEATHER_CLEAR ||
+                                       g->weather.weather == WEATHER_SUNNY ) ? 1.0 : 0.5;
+        const int player_local_temp = g->weather.get_temperature( pos() );
+        int flux = ( player_local_temp - 65 ) / 2;
+        if( !has_hat ) {
+            sunlight_nutrition += ( 100 + flux ) * weather_factor;
+        }
+        if( leafier ) {
+            int rate = ( ( 100 * sleeve_factor ) + flux ) * 2;
+            sunlight_nutrition += ( rate * ( leafiest ? 2 : 1 ) ) * weather_factor;
+        }
+    }
+
+    if( x_in_y( sunlight_nutrition, 18000 ) ) {
+        vitamin_mod( vitamin_id( "vitA" ), 1, true );
+        vitamin_mod( vitamin_id( "vitC" ), 1, true );
+    }
+
+    if( x_in_y( sunlight_nutrition, 12000 ) ) {
+        mod_hunger( -1 );
+        // photosynthesis absorbs kcal directly
+        mod_stored_nutr( -1 );
+        stomach.ate();
+    }
+
+    if( !g->is_in_sunlight( pos() ) ) {
+        return;
+    }
+
+    if( has_trait( trait_ALBINO ) || has_effect( effect_datura ) ) {
+        suffer_from_albinism();
+    }
+
+    if( has_trait( trait_SUNBURN ) && one_in( 10 ) ) {
+        if( !( weapon.has_flag( "RAIN_PROTECT" ) ) ) {
+            add_msg_if_player( m_bad, _( "The sunlight burns your skin!" ) );
+            if( has_effect( effect_sleep ) && !has_effect( effect_narcosis ) ) {
+                wake_up();
+            }
+            mod_pain( 1 );
+            hurtall( 1, nullptr );
+        }
+    }
+
+    if( ( has_trait( trait_TROGLO ) || has_trait( trait_TROGLO2 ) ) &&
+        g->weather.weather == WEATHER_SUNNY ) {
+        mod_str_bonus( -1 );
+        mod_dex_bonus( -1 );
+        add_miss_reason( _( "The sunlight distracts you." ), 1 );
+        mod_int_bonus( -1 );
+        mod_per_bonus( -1 );
+    }
+    if( has_trait( trait_TROGLO2 ) ) {
+        mod_str_bonus( -1 );
+        mod_dex_bonus( -1 );
+        add_miss_reason( _( "The sunlight distracts you." ), 1 );
+        mod_int_bonus( -1 );
+        mod_per_bonus( -1 );
+    }
+    if( has_trait( trait_TROGLO3 ) ) {
+        mod_str_bonus( -4 );
+        mod_dex_bonus( -4 );
+        add_miss_reason( _( "You can't stand the sunlight!" ), 4 );
+        mod_int_bonus( -4 );
+        mod_per_bonus( -4 );
+    }
+}
+
+void Character::suffer_from_albinism()
+{
+    if( !one_turn_in( 1_minutes ) ) {
+        return;
+    }
+    // Sunglasses can keep the sun off the eyes.
+    if( !has_bionic( bionic_id( "bio_sunglasses" ) ) &&
+        !( wearing_something_on( bp_eyes ) &&
+           ( worn_with_flag( "SUN_GLASSES" ) || worn_with_flag( "BLIND" ) ) ) ) {
+        add_msg_if_player( m_bad, _( "The sunlight is really irritating your eyes." ) );
+        if( one_turn_in( 1_minutes ) ) {
+            mod_pain( 1 );
+        } else {
+            focus_pool --;
+        }
+    }
+    // Umbrellas can keep the sun off the skin
+    if( weapon.has_flag( "RAIN_PROTECT" ) ) {
+        return;
+    }
+    //calculate total coverage of skin
+    body_part_set affected_bp { {
+            bp_leg_l, bp_leg_r, bp_torso, bp_head, bp_mouth, bp_arm_l,
+            bp_arm_r, bp_foot_l, bp_foot_r, bp_hand_l, bp_hand_r
+        }
+    };
+    //pecentage of "open skin" by body part
+    std::map<body_part, float> open_percent;
+    //initialize coverage
+    for( const body_part &bp : all_body_parts ) {
+        if( affected_bp.test( bp ) ) {
+            open_percent[bp] = 1.0;
+        }
+    }
+    //calculate coverage for every body part
+    for( const item &i : worn ) {
+        body_part_set covered = i.get_covered_body_parts();
+        for( const body_part &bp : all_body_parts )  {
+            if( !affected_bp.test( bp ) || !covered.test( bp ) ) {
+                continue;
+            }
+            //percent of "not covered skin"
+            float p = 1.0 - i.get_coverage() / 100.0;
+            open_percent[bp] = open_percent[bp] * p;
+        }
+    }
+
+    const float COVERAGE_LIMIT = 0.01;
+    body_part max_affected_bp = num_bp;
+    float max_affected_bp_percent = 0;
+    int count_affected_bp = 0;
+    for( const std::pair<body_part, float> &it : open_percent ) {
+        const body_part &bp = it.first;
+        const float &p = it.second;
+
+        if( p <= COVERAGE_LIMIT ) {
+            continue;
+        }
+        ++count_affected_bp;
+        if( max_affected_bp_percent < p ) {
+            max_affected_bp_percent = p;
+            max_affected_bp = bp;
+        }
+    }
+    if( count_affected_bp > 0 && max_affected_bp != num_bp ) {
+        //Check if both arms/legs are affected
+        int parts_count = 1;
+        body_part other_bp = static_cast<body_part>( bp_aiOther[max_affected_bp] );
+        body_part other_bp_rev = static_cast<body_part>( bp_aiOther[other_bp] );
+        if( other_bp != other_bp_rev ) {
+            const auto found = open_percent.find( other_bp );
+            if( found != open_percent.end() && found->second > COVERAGE_LIMIT ) {
+                ++parts_count;
+            }
+        }
+        std::string bp_name = body_part_name( max_affected_bp, parts_count );
+        if( count_affected_bp > parts_count ) {
+            bp_name = string_format( _( "%s and other body parts" ), bp_name );
+        }
+        add_msg_if_player( m_bad, _( "The sunlight is really irritating your %s." ), bp_name );
+
+        //apply effects
+        if( has_effect( effect_sleep ) && !has_effect( effect_narcosis ) ) {
+            wake_up();
+        }
+        if( one_turn_in( 1_minutes ) ) {
+            mod_pain( 1 );
+        } else {
+            focus_pool --;
+        }
+    }
+}
+
+void Character::suffer_from_other_mutations()
+{
+    if( has_trait( trait_SHARKTEETH ) && one_turn_in( 24_hours ) ) {
+        add_msg_if_player( m_neutral, _( "You shed a tooth!" ) );
+        g->m.spawn_item( pos(), "bone", 1 );
+    }
+
+    if( has_active_mutation( trait_id( "WINGS_INSECT" ) ) ) {
+        //~Sound of buzzing Insect Wings
+        sounds::sound( pos(), 10, sounds::sound_t::movement, _( "BZZZZZ" ), false, "misc",
+                       "insect_wings" );
+    }
+
+    bool wearing_shoes = is_wearing_shoes( side::LEFT ) || is_wearing_shoes( side::RIGHT );
+    int root_vitamins = 0;
+    int root_water = 0;
+    if( has_trait( trait_ROOTS3 ) && g->m.has_flag( "PLOWABLE", pos() ) && !wearing_shoes ) {
+        root_vitamins += 1;
+        if( get_thirst() <= -2000 ) {
+            root_water += 51;
+        }
+    }
+
+    if( x_in_y( root_vitamins, 576 ) ) {
+        vitamin_mod( vitamin_id( "iron" ), 1, true );
+        vitamin_mod( vitamin_id( "calcium" ), 1, true );
+        mod_healthy_mod( 5, 50 );
+    }
+
+    if( x_in_y( root_water, 2550 ) ) {
+        // Plants draw some crazy amounts of water from the ground in real life,
+        // so these numbers try to reflect that uncertain but large amount
+        // this should take 12 hours to meet your daily needs with ROOTS2, and 8 with ROOTS3
+        mod_thirst( -1 );
+    }
+
+    if( has_trait( trait_SORES ) ) {
+        for( const body_part bp : all_body_parts ) {
+            if( bp == bp_head ) {
+                continue;
+            }
+            int sores_pain = 5 + 0.4 * abs( encumb( bp ) );
+            if( get_pain() < sores_pain ) {
+                set_pain( sores_pain );
+            }
+        }
+    }
+    //Web Weavers...weave web
+    if( has_active_mutation( trait_WEB_WEAVER ) && !in_vehicle ) {
+        // this adds intensity to if its not already there.
+        g->m.add_field( pos(), fd_web, 1 );
+
+    }
+
+    // Blind/Deaf for brief periods about once an hour,
+    // and visuals about once every 30 min.
+    if( has_trait( trait_PER_SLIME ) ) {
+        if( one_turn_in( 1_hours ) && !has_effect( effect_deaf ) ) {
+            add_msg_if_player( m_bad, _( "Suddenly, you can't hear anything!" ) );
+            add_effect( effect_deaf, rng( 20_minutes, 60_minutes ) );
+        }
+        if( one_turn_in( 1_hours ) && !( has_effect( effect_blind ) ) ) {
+            add_msg_if_player( m_bad, _( "Suddenly, your eyes stop working!" ) );
+            add_effect( effect_blind, rng( 2_minutes, 6_minutes ) );
+        }
+        // Yes, you can be blind and hallucinate at the same time.
+        // Your post-human biology is truly remarkable.
+        if( one_turn_in( 30_minutes ) && !( has_effect( effect_visuals ) ) ) {
+            add_msg_if_player( m_bad, _( "Your visual centers must be acting up…" ) );
+            add_effect( effect_visuals, rng( 36_minutes, 72_minutes ) );
+        }
+    }
+
+    if( has_trait( trait_WEB_SPINNER ) && !in_vehicle && one_in( 3 ) ) {
+        // this adds intensity to if its not already there.
+        g->m.add_field( pos(), fd_web, 1 );
+    }
+
+    bool should_mutate = has_trait( trait_UNSTABLE ) && !has_trait( trait_CHAOTIC_BAD ) &&
+                         one_turn_in( 48_hours );
+    should_mutate |= ( has_trait( trait_CHAOTIC ) || has_trait( trait_CHAOTIC_BAD ) ) &&
+                     one_turn_in( 12_hours );
+    if( should_mutate ) {
+        mutate();
+    }
+
+    const bool needs_fire = !has_morale( MORALE_PYROMANIA_NEARFIRE ) &&
+                            !has_morale( MORALE_PYROMANIA_STARTFIRE );
+    if( has_trait( trait_PYROMANIA ) && needs_fire && !in_sleep_state() &&
+        calendar::once_every( 2_hours ) ) {
+        add_morale( MORALE_PYROMANIA_NOFIRE, -1, -30, 24_hours, 24_hours, true );
+        if( calendar::once_every( 4_hours ) ) {
+            const translation smokin_hot_fiyah =
+                SNIPPET.random_from_category( "pyromania_withdrawal" ).value_or( translation() );
+            add_msg_if_player( m_bad, "%s", smokin_hot_fiyah );
+        }
+    }
+    if( has_trait( trait_KILLER ) && !has_morale( MORALE_KILLER_HAS_KILLED ) &&
+        calendar::once_every( 2_hours ) ) {
+        add_morale( MORALE_KILLER_NEED_TO_KILL, -1, -30, 24_hours, 24_hours );
+        if( calendar::once_every( 4_hours ) ) {
+            const translation snip = SNIPPET.random_from_category( "killer_withdrawal" ).value_or(
+                                         translation() );
+            add_msg_if_player( m_bad, "%s", snip );
+        }
+    }
+}
+
+void Character::suffer_from_radiation()
+{
+    // checking for radioactive items in inventory
+    const int item_radiation = leak_level( "RADIOACTIVE" );
+    const int map_radiation = g->m.get_radiation( pos() );
+    float rads = map_radiation / 100.0f + item_radiation / 10.0f;
+
+    int rad_mut = 0;
+    if( has_trait( trait_RADIOACTIVE3 ) ) {
+        rad_mut = 3;
+    } else if( has_trait( trait_RADIOACTIVE2 ) ) {
+        rad_mut = 2;
+    } else if( has_trait( trait_RADIOACTIVE1 ) ) {
+        rad_mut = 1;
+    }
+
+    // Spread less radiation when sleeping (slower metabolism etc.)
+    // Otherwise it can quickly get to the point where you simply can't sleep at all
+    const bool rad_mut_proc = rad_mut > 0 && x_in_y( rad_mut, to_turns<int>( in_sleep_state() ?
+                              3_hours : 30_minutes ) );
+
+    bool has_helmet = false;
+    const bool power_armored = is_wearing_power_armor( &has_helmet );
+    const bool rad_resist = power_armored || worn_with_flag( "RAD_RESIST" );
+
+    if( rad_mut > 0 ) {
+        const bool kept_in = is_rad_immune() || ( rad_resist && !one_in( 4 ) );
+        if( kept_in ) {
+            // As if standing on a map tile with radiation level equal to rad_mut
+            rads += rad_mut / 100.0f;
+        }
+
+        if( rad_mut_proc && !kept_in ) {
+            // Irradiate a random nearby point
+            // If you can't, irradiate the player instead
+            tripoint rad_point = pos() + point( rng( -3, 3 ), rng( -3, 3 ) );
+            // TODO: Radioactive vehicles?
+            if( g->m.get_radiation( rad_point ) < rad_mut ) {
+                g->m.adjust_radiation( rad_point, 1 );
+            } else {
+                rads += rad_mut;
+            }
+        }
+    }
+
+    // Used to control vomiting from radiation to make it not-annoying
+    bool radiation_increasing = irradiate( rads );
+
+    if( radiation_increasing && calendar::once_every( 3_minutes ) && has_bionic( bio_geiger ) ) {
+        add_msg_if_player( m_warning,
+                           _( "You feel an anomalous sensation coming from "
+                              "your radiation sensors." ) );
+    }
+
+    if( calendar::once_every( 15_minutes ) ) {
+        if( radiation < 0 ) {
+            radiation = 0;
+        } else if( radiation > 2000 ) {
+            radiation = 2000;
+        }
+        if( get_option<bool>( "RAD_MUTATION" ) && rng( 100, 10000 ) < radiation ) {
+            mutate();
+            radiation -= 50;
+        } else if( radiation > 50 && rng( 1, 3000 ) < radiation && ( stomach.contains() > 0_ml ||
+                   radiation_increasing || !in_sleep_state() ) ) {
+            vomit();
+            radiation -= 1;
+        }
+    }
+
+    const bool radiogenic = has_trait( trait_RADIOGENIC );
+    if( radiogenic && calendar::once_every( 30_minutes ) && radiation > 0 ) {
+        // At 200 irradiation, twice as fast as REGEN
+        if( x_in_y( radiation, 200 ) ) {
+            healall( 1 );
+            if( rad_mut == 0 ) {
+                // Don't heal radiation if we're generating it naturally
+                // That would counter the main downside of radioactivity
+                radiation -= 5;
+            }
+        }
+
+        if( !radiogenic && radiation > 0 ) {
+            // Even if you heal the radiation itself, the damage is done.
+            const int hmod = get_healthy_mod();
+            if( hmod > 200 - radiation ) {
+                set_healthy_mod( std::max( -200, 200 - radiation ) );
+            }
+        }
+    }
+
+    if( radiation > 200 && calendar::once_every( 10_minutes ) && x_in_y( radiation, 1000 ) ) {
+        hurtall( 1, nullptr );
+        radiation -= 5;
+    }
+
+    if( !reactor_plut && !tank_plut && !slow_rad ) {
+        return;
+    }
+    // Microreactor CBM and supporting bionics
+    if( has_bionic( bio_reactor ) || has_bionic( bio_advreactor ) ) {
+        //first do the filtering of plutonium from storage to reactor
+        if( tank_plut > 0 ) {
+            int plut_trans;
+            if( has_active_bionic( bio_plut_filter ) ) {
+                plut_trans = tank_plut * 0.025;
+            } else {
+                plut_trans = tank_plut * 0.005;
+            }
+            if( plut_trans < 1 ) {
+                plut_trans = 1;
+            }
+            tank_plut -= plut_trans;
+            reactor_plut += plut_trans;
+        }
+        //leaking radiation, reactor is unshielded, but still better than a simple tank
+        slow_rad += ( ( tank_plut * 0.1 ) + ( reactor_plut * 0.01 ) );
+        //begin power generation
+        if( reactor_plut > 0 ) {
+            int power_gen = 0;
+            if( has_bionic( bio_advreactor ) ) {
+                if( ( reactor_plut * 0.05 ) > 2000 ) {
+                    power_gen = 2000;
+                } else {
+                    power_gen = reactor_plut * 0.05;
+                    if( power_gen < 1 ) {
+                        power_gen = 1;
+                    }
+                }
+                slow_rad += ( power_gen * 3 );
+                while( slow_rad >= 50 ) {
+                    if( power_gen >= 1 ) {
+                        slow_rad -= 50;
+                        power_gen -= 1;
+                        reactor_plut -= 1;
+                    } else {
+                        break;
+                    }
+                }
+            } else if( has_bionic( bio_reactor ) ) {
+                if( ( reactor_plut * 0.025 ) > 500 ) {
+                    power_gen = 500;
+                } else {
+                    power_gen = reactor_plut * 0.025;
+                    if( power_gen < 1 ) {
+                        power_gen = 1;
+                    }
+                }
+                slow_rad += ( power_gen * 3 );
+            }
+            reactor_plut -= power_gen;
+            while( power_gen >= 250 ) {
+                apply_damage( nullptr, bp_torso, 1 );
+                mod_pain( 1 );
+                add_msg_if_player( m_bad,
+                                   _( "Your chest burns as your power systems overload!" ) );
+                mod_power_level( 50_kJ );
+                power_gen -= 60; // ten units of power lost due to short-circuiting into you
+            }
+            mod_power_level( units::from_kilojoule( power_gen ) );
+        }
+    } else {
+        slow_rad += ( reactor_plut + tank_plut ) * 40;
+        //plutonium in body without any kind of container.  Not good at all.
+        reactor_plut *= 0.6;
+        tank_plut *= 0.6;
+    }
+    while( slow_rad >= 1000 ) {
+        radiation += 1;
+        slow_rad -= 1000;
+    }
+}
+
+void Character::suffer_from_bad_bionics()
+{
+    // Negative bionics effects
+    if( has_bionic( bio_dis_shock ) && get_power_level() > 9_kJ && one_turn_in( 2_hours ) &&
+        !has_effect( effect_narcosis ) ) {
+        add_msg_if_player( m_bad, _( "You suffer a painful electrical discharge!" ) );
+        mod_pain( 1 );
+        moves -= 150;
+        mod_power_level( -10_kJ );
+
+        if( weapon.typeId() == "e_handcuffs" && weapon.charges > 0 ) {
+            weapon.charges -= rng( 1, 3 ) * 50;
+            if( weapon.charges < 1 ) {
+                weapon.charges = 1;
+            }
+
+            add_msg_if_player( m_good, _( "The %s seems to be affected by the discharge." ),
+                               weapon.tname() );
+        }
+        sfx::play_variant_sound( "bionics", "elec_discharge", 100 );
+    }
+    if( has_bionic( bio_dis_acid ) && one_turn_in( 150_minutes ) ) {
+        add_msg_if_player( m_bad, _( "You suffer a burning acidic discharge!" ) );
+        hurtall( 1, nullptr );
+        sfx::play_variant_sound( "bionics", "acid_discharge", 100 );
+        sfx::do_player_death_hurt( g->u, false );
+    }
+    if( has_bionic( bio_drain ) && get_power_level() > 24_kJ && one_turn_in( 1_hours ) ) {
+        add_msg_if_player( m_bad, _( "Your batteries discharge slightly." ) );
+        mod_power_level( -25_kJ );
+        sfx::play_variant_sound( "bionics", "elec_crackle_low", 100 );
+    }
+    if( has_bionic( bio_noise ) && one_turn_in( 50_minutes ) &&
+        !has_effect( effect_narcosis ) ) {
+        // TODO: NPCs with said bionic
+        if( !is_deaf() ) {
+            add_msg( m_bad, _( "A bionic emits a crackle of noise!" ) );
+            sfx::play_variant_sound( "bionics", "elec_blast", 100 );
+        } else {
+            add_msg( m_bad, _( "You feel your faulty bionic shuddering." ) );
+            sfx::play_variant_sound( "bionics", "elec_blast_muffled", 100 );
+        }
+        sounds::sound( pos(), 60, sounds::sound_t::movement, _( "Crackle!" ) ); //sfx above
+    }
+    if( has_bionic( bio_power_weakness ) && has_max_power() &&
+        get_power_level() >= get_max_power_level() * .75 ) {
+        mod_str_bonus( -3 );
+    }
+    if( has_bionic( bio_trip ) && one_turn_in( 50_minutes ) &&
+        !has_effect( effect_visuals ) &&
+        !has_effect( effect_narcosis ) && !in_sleep_state() ) {
+        add_msg_if_player( m_bad, _( "Your vision pixelates!" ) );
+        add_effect( effect_visuals, 10_minutes );
+        sfx::play_variant_sound( "bionics", "pixelated", 100 );
+    }
+    if( has_bionic( bio_spasm ) && one_turn_in( 5_hours ) && !has_effect( effect_downed ) &&
+        !has_effect( effect_narcosis ) ) {
+        add_msg_if_player( m_bad,
+                           _( "Your malfunctioning bionic causes you to spasm and fall to the floor!" ) );
+        mod_pain( 1 );
+        add_effect( effect_stunned, 1_turns );
+        add_effect( effect_downed, 1_turns, num_bp, false, 0, true );
+        sfx::play_variant_sound( "bionics", "elec_crackle_high", 100 );
+    }
+    if( has_bionic( bio_shakes ) && get_power_level() > 24_kJ && one_turn_in( 2_hours ) ) {
+        add_msg_if_player( m_bad, _( "Your bionics short-circuit, causing you to tremble and shiver." ) );
+        mod_power_level( -25_kJ );
+        add_effect( effect_shakes, 5_minutes );
+        sfx::play_variant_sound( "bionics", "elec_crackle_med", 100 );
+    }
+    if( has_bionic( bio_leaky ) && one_turn_in( 6_minutes ) ) {
+        mod_healthy_mod( -1, -200 );
+    }
+    if( has_bionic( bio_sleepy ) && one_turn_in( 50_minutes ) && !in_sleep_state() ) {
+        mod_fatigue( 1 );
+    }
+    if( has_bionic( bio_itchy ) && one_turn_in( 50_minutes ) && !has_effect( effect_formication ) &&
+        !has_effect( effect_narcosis ) ) {
+        add_msg_if_player( m_bad, _( "Your malfunctioning bionic itches!" ) );
+        body_part bp = random_body_part( true );
+        add_effect( effect_formication, 10_minutes, bp );
+    }
+    if( has_bionic( bio_glowy ) && !has_effect( effect_glowy_led ) && one_turn_in( 50_minutes ) &&
+        get_power_level() > 1_kJ ) {
+        add_msg_if_player( m_bad, _( "Your malfunctioning bionic starts to glow!" ) );
+        add_effect( effect_glowy_led, 5_minutes );
+        mod_power_level( -1_kJ );
+    }
+}
+
+void Character::suffer_from_artifacts()
+{
+    // Artifact effects
+    if( has_artifact_with( AEP_ATTENTION ) ) {
+        add_effect( effect_attention, 3_turns );
+    }
+
+    if( has_artifact_with( AEP_BAD_WEATHER ) && calendar::once_every( 1_minutes ) &&
+        g->weather.weather != WEATHER_SNOWSTORM ) {
+        g->weather.weather_override = WEATHER_SNOWSTORM;
+        g->weather.set_nextweather( calendar::turn );
+    }
+
+    if( has_artifact_with( AEP_MUTAGENIC ) && one_turn_in( 48_hours ) ) {
+        mutate();
+    }
+    if( has_artifact_with( AEP_FORCE_TELEPORT ) && one_turn_in( 1_hours ) ) {
+        teleport::teleport( *this );
+    }
+}
+
+void Character::suffer_from_stimulants( const int current_stim )
+{
+    // Stim +250 kills
+    if( current_stim > 210 ) {
+        if( one_turn_in( 2_minutes ) && !has_effect( effect_downed ) ) {
+            add_msg_if_player( m_bad, _( "Your muscles spasm!" ) );
+            if( !has_effect( effect_downed ) ) {
+                add_msg_if_player( m_bad, _( "You fall to the ground!" ) );
+                add_effect( effect_downed, rng( 6_turns, 20_turns ) );
+            }
+        }
+    }
+    if( current_stim > 170 ) {
+        if( !has_effect( effect_winded ) && calendar::once_every( 10_minutes ) ) {
+            add_msg( m_bad, _( "You feel short of breath." ) );
+            add_effect( effect_winded, 10_minutes + 1_turns );
+        }
+    }
+    if( current_stim > 110 ) {
+        if( !has_effect( effect_shakes ) && calendar::once_every( 10_minutes ) ) {
+            add_msg( _( "You shake uncontrollably." ) );
+            add_effect( effect_shakes, 15_minutes + 1_turns );
+        }
+    }
+    if( current_stim > 75 ) {
+        if( !one_turn_in( 2_minutes ) && !has_effect( effect_nausea ) ) {
+            add_msg( _( "You feel nauseous…" ) );
+            add_effect( effect_nausea, 5_minutes );
+        }
+    }
+
+    //stim -200 or painkillers 240 kills
+    if( current_stim < -160 || get_painkiller() > 200 ) {
+        if( one_turn_in( 3_minutes ) && !in_sleep_state() ) {
+            add_msg_if_player( m_bad, _( "You black out!" ) );
+            const time_duration dur = rng( 30_minutes, 60_minutes );
+            add_effect( effect_downed, dur );
+            add_effect( effect_blind, dur );
+            fall_asleep( dur );
+        }
+    }
+    if( current_stim < -120 || get_painkiller() > 160 ) {
+        if( !has_effect( effect_winded ) && calendar::once_every( 10_minutes ) ) {
+            add_msg( m_bad, _( "Your breathing slows down." ) );
+            add_effect( effect_winded, 10_minutes + 1_turns );
+        }
+    }
+    if( current_stim < -85 || get_painkiller() > 145 ) {
+        if( one_turn_in( 15_seconds ) && !has_effect( effect_sleep ) ) {
+            add_msg_if_player( m_bad, _( "You feel dizzy for a moment." ) );
+            mod_moves( -rng( 10, 30 ) );
+            if( one_in( 3 ) && !has_effect( effect_downed ) ) {
+                add_msg_if_player( m_bad, _( "You stumble and fall over!" ) );
+                add_effect( effect_downed, rng( 3_turns, 10_turns ) );
+            }
+        }
+    }
+    if( current_stim < -60 || get_painkiller() > 130 ) {
+        if( calendar::once_every( 10_minutes ) ) {
+            add_msg( m_warning, _( "You feel tired…" ) );
+            mod_fatigue( rng( 1, 2 ) );
+        }
+    }
+}
+
+void Character::suffer_without_sleep( const int sleep_deprivation )
+{
+    // redo as a snippet?
+    if( sleep_deprivation >= SLEEP_DEPRIVATION_HARMLESS ) {
+        if( one_turn_in( 50_minutes ) ) {
+            switch( dice( 1, 4 ) ) {
+                default:
+                case 1:
+                    add_msg_player_or_npc( m_warning, _( "You tiredly rub your eyes." ),
+                                           _( "<npcname> tiredly rubs their eyes." ) );
+                    break;
+                case 2:
+                    add_msg_player_or_npc( m_warning, _( "You let out a small yawn." ),
+                                           _( "<npcname> lets out a small yawn." ) );
+                    break;
+                case 3:
+                    add_msg_player_or_npc( m_warning, _( "You stretch your back." ),
+                                           _( "<npcname> streches their back." ) );
+                    break;
+                case 4:
+                    add_msg_player_or_npc( m_warning, _( "You feel mentally tired." ),
+                                           _( "<npcname> lets out a huge yawn." ) );
+                    break;
+            }
+        }
+    }
+    // Minor discomfort
+    if( sleep_deprivation >= SLEEP_DEPRIVATION_MINOR ) {
+        if( one_turn_in( 75_minutes ) ) {
+            add_msg_if_player( m_warning, _( "You feel lightheaded for a moment." ) );
+            moves -= 10;
+        }
+        if( one_turn_in( 100_minutes ) ) {
+            add_msg_if_player( m_warning, _( "Your muscles spasm uncomfortably." ) );
+            mod_pain( 2 );
+        }
+        if( !has_effect( effect_visuals ) && one_turn_in( 150_minutes ) ) {
+            add_msg_if_player( m_warning, _( "Your vision blurs a little." ) );
+            add_effect( effect_visuals, rng( 1_minutes, 5_minutes ) );
+        }
+    }
+    // Slight disability
+    if( sleep_deprivation >= SLEEP_DEPRIVATION_SERIOUS ) {
+        if( one_turn_in( 75_minutes ) ) {
+            add_msg_if_player( m_bad, _( "Your mind lapses into unawareness briefly." ) );
+            moves -= rng( 20, 80 );
+        }
+        if( one_turn_in( 125_minutes ) ) {
+            add_msg_if_player( m_bad, _( "Your muscles ache in stressfully unpredictable ways." ) );
+            mod_pain( rng( 2, 10 ) );
+        }
+        if( one_turn_in( 5_hours ) ) {
+            add_msg_if_player( m_bad, _( "You have a distractingly painful headache." ) );
+            mod_pain( rng( 10, 25 ) );
+        }
+    }
+    // Major disability, high chance of passing out also relevant
+    if( sleep_deprivation >= SLEEP_DEPRIVATION_MAJOR ) {
+        if( !has_effect( effect_nausea ) && one_turn_in( 500_minutes ) ) {
+            add_msg_if_player( m_bad, _( "You feel heartburn and an acid taste in your mouth." ) );
+            mod_pain( 5 );
+            add_effect( effect_nausea, rng( 5_minutes, 30_minutes ) );
+        }
+        if( one_turn_in( 5_hours ) ) {
+            add_msg_if_player( m_bad, _( "Your mind is so tired that you feel you can't trust "
+                                         "your eyes anymore." ) );
+            add_effect( effect_hallu, rng( 5_minutes, 60_minutes ) );
+        }
+        if( !has_effect( effect_shakes ) && one_turn_in( 425_minutes ) ) {
+            add_msg_if_player( m_bad, _( "Your muscles spasm uncontrollably, and you have "
+                                         "trouble keeping your balance." ) );
+            add_effect( effect_shakes, 15_minutes );
+        } else if( has_effect( effect_shakes ) && one_turn_in( 75_seconds ) ) {
+            moves -= 10;
+            add_msg_player_or_npc( m_warning, _( "Your shaking legs make you stumble." ),
+                                   _( "<npcname> stumbles." ) );
+            if( !has_effect( effect_downed ) && one_in( 10 ) ) {
+                add_msg_player_or_npc( m_bad, _( "You fall over!" ), _( "<npcname> falls over!" ) );
+                add_effect( effect_downed, rng( 3_turns, 10_turns ) );
+            }
+        }
+    }
+}
+
+void Character::suffer_from_pain()
+{
+}
+
+void Character::suffer()
+{
+    const int current_stim = get_stim();
+    // TODO: Remove this section and encapsulate hp_cur
+    for( int i = 0; i < num_hp_parts; i++ ) {
+        body_part bp = hp_to_bp( static_cast<hp_part>( i ) );
+        if( hp_cur[i] <= 0 ) {
+            add_effect( effect_disabled, 1_turns, bp, true );
+        }
+    }
+
+    for( size_t i = 0; i < my_bionics->size(); i++ ) {
+        process_bionic( i );
+    }
+
+    for( std::pair<const trait_id, Character::trait_data> &mut : my_mutations ) {
+        const mutation_branch &mdata = mut.first.obj();
+        if( calendar::once_every( 1_minutes ) ) {
+            suffer_water_damage( mdata );
+        }
+        Character::trait_data &tdata = mut.second;
+        if( tdata.powered ) {
+            suffer_mutation_power( mdata, tdata );
+        }
+    }
+
+    if( underwater ) {
+        suffer_while_underwater();
+    }
+
+    suffer_from_addictions();
+
+    if( !in_sleep_state() ) {
+        suffer_while_awake( current_stim );
+    } // Done with while-awake-only effects
+
+    if( has_trait( trait_ASTHMA ) ) {
+        suffer_from_asthma( current_stim );
+    }
+
+    suffer_in_sunlight();
+    suffer_from_other_mutations();
+    suffer_from_artifacts();
+    suffer_from_radiation();
+    suffer_from_bad_bionics();
+    suffer_from_stimulants( current_stim );
+    int sleep_deprivation = in_sleep_state() ? 0 : get_sleep_deprivation();
+    // Stimulants can lessen the PERCEIVED effects of sleep deprivation, but
+    // they do nothing to cure it. As such, abuse is even more dangerous now.
+    if( current_stim > 0 ) {
+        // 100% of blacking out = 20160sd ; Max. stim modifier = 12500sd @ 250stim
+        // Note: Very high stim already has its own slew of bad effects,
+        // so the "useful" part of this bonus is actually lower.
+        sleep_deprivation -= current_stim * 50;
+    }
+
+    suffer_without_sleep( sleep_deprivation );
+    suffer_from_pain();
+}
+
+bool Character::irradiate( float rads, bool bypass )
+{
+    int rad_mut = 0;
+    if( has_trait( trait_RADIOACTIVE3 ) ) {
+        rad_mut = 3;
+    } else if( has_trait( trait_RADIOACTIVE2 ) ) {
+        rad_mut = 2;
+    } else if( has_trait( trait_RADIOACTIVE1 ) ) {
+        rad_mut = 1;
+    }
+
+    if( rads > 0 ) {
+        bool has_helmet = false;
+        const bool power_armored = is_wearing_power_armor( &has_helmet );
+        const bool rad_resist = power_armored || worn_with_flag( "RAD_RESIST" );
+
+        if( is_rad_immune() && !bypass ) {
+            // Power armor and some high-tech gear protects completely from radiation
+            rads = 0.0f;
+        } else if( rad_resist && !bypass ) {
+            rads /= 4.0f;
+        }
+
+        if( has_effect( effect_iodine ) ) {
+            // Radioactive mutation makes iodine less efficient (but more useful)
+            rads *= 0.3f + 0.1f * rad_mut;
+        }
+
+        int rads_max = roll_remainder( rads );
+        radiation += rng( 0, rads_max );
+
+        // Apply rads to any radiation badges.
+        for( item *const it : inv_dump() ) {
+            if( it->typeId() != "rad_badge" ) {
+                continue;
+            }
+
+            // Actual irradiation levels of badges and the player aren't precisely matched.
+            // This is intentional.
+            const int before = it->irradiation;
+
+            const int delta = rng( 0, rads_max );
+            if( delta == 0 ) {
+                continue;
+            }
+
+            it->irradiation += delta;
+
+            // If in inventory (not worn), don't print anything.
+            if( inv.has_item( *it ) ) {
+                continue;
+            }
+
+            // If the color hasn't changed, don't print anything.
+            const std::string &col_before = rad_badge_color( before );
+            const std::string &col_after = rad_badge_color( it->irradiation );
+            if( col_before == col_after ) {
+                continue;
+            }
+
+            add_msg_if_player( m_warning, _( "Your radiation badge changes from %1$s to %2$s!" ),
+                               col_before, col_after );
+        }
+
+        if( rads > 0.0f ) {
+            return true;
+        }
+    }
+    return false;
+}
+
+void Character::mend( int rate_multiplier )
+{
+    // Wearing splints can slowly mend a broken limb back to 1 hp.
+    bool any_broken = false;
+    for( int i = 0; i < num_hp_parts; i++ ) {
+        if( hp_cur[i] <= 0 ) {
+            any_broken = true;
+            break;
+        }
+    }
+
+    if( !any_broken ) {
+        return;
+    }
+
+    double healing_factor = 1.0;
+    // Studies have shown that alcohol and tobacco use delay fracture healing time
+    // Being under effect is 50% slowdown
+    // Being addicted but not under effect scales from 25% slowdown to 75% slowdown
+    // The improvement from being intoxicated over withdrawal is intended
+    if( has_effect( effect_cig ) ) {
+        healing_factor *= 0.5;
+    } else {
+        healing_factor *= addiction_scaling( 0.25f, 0.75f, addiction_level( ADD_CIG ) );
+    }
+
+    if( has_effect( effect_drunk ) ) {
+        healing_factor *= 0.5;
+    } else {
+        healing_factor *= addiction_scaling( 0.25f, 0.75f, addiction_level( ADD_ALCOHOL ) );
+    }
+
+    if( radiation > 0 && !has_trait( trait_RADIOGENIC ) ) {
+        healing_factor *= clamp( ( 1000.0f - radiation ) / 1000.0f, 0.0f, 1.0f );
+    }
+
+    // Bed rest speeds up mending
+    if( has_effect( effect_sleep ) ) {
+        healing_factor *= 4.0;
+    } else if( get_fatigue() > DEAD_TIRED ) {
+        // but being dead tired does not...
+        healing_factor *= 0.75;
+    } else {
+        // If not dead tired, resting without sleep also helps
+        healing_factor *= 1.0f + rest_quality();
+    }
+
+    // Being healthy helps.
+    healing_factor *= 1.0f + get_healthy() / 200.0f;
+
+    // Very hungry starts lowering the chance
+    // square rooting the value makes the numbers drop off faster when below 1
+    healing_factor *= sqrt( static_cast<float>( get_stored_kcal() ) / static_cast<float>
+                            ( get_healthy_kcal() ) );
+    // Similar for thirst - starts at very thirsty, drops to 0 ~halfway between two last statuses
+    healing_factor *= 1.0f - clamp( ( get_thirst() - 80.0f ) / 300.0f, 0.0f, 1.0f );
+
+    // Mutagenic healing factor!
+    bool needs_splint = true;
+    if( has_trait( trait_REGEN_LIZ ) ) {
+        healing_factor *= 20.0;
+        needs_splint = false;
+    } else if( has_trait( trait_REGEN ) ) {
+        healing_factor *= 16.0;
+    } else if( has_trait( trait_FASTHEALER2 ) ) {
+        healing_factor *= 4.0;
+    } else if( has_trait( trait_FASTHEALER ) ) {
+        healing_factor *= 2.0;
+    } else if( has_trait( trait_SLOWHEALER ) ) {
+        healing_factor *= 0.5;
+    }
+
+    add_msg( m_debug, "Limb mend healing factor: %.2f", healing_factor );
+    if( healing_factor <= 0.0f ) {
+        // The section below assumes positive healing rate
+        return;
+    }
+
+    for( int i = 0; i < num_hp_parts; i++ ) {
+        const bool broken = ( hp_cur[i] <= 0 );
+        if( !broken ) {
+            continue;
+        }
+
+        body_part part = hp_to_bp( static_cast<hp_part>( i ) );
+        if( needs_splint && !worn_with_flag( "SPLINT", part ) ) {
+            continue;
+        }
+
+        const time_duration dur_inc = 1_turns * roll_remainder( rate_multiplier * healing_factor );
+        auto &eff = get_effect( effect_mending, part );
+        if( eff.is_null() ) {
+            add_effect( effect_mending, dur_inc, part, true );
+            continue;
+        }
+
+        eff.set_duration( eff.get_duration() + dur_inc );
+
+        if( eff.get_duration() >= eff.get_max_duration() ) {
+            hp_cur[i] = 1;
+            remove_effect( effect_mending, part );
+            g->events().send<event_type::broken_bone_mends>( getID(), part );
+            //~ %s is bodypart
+            add_msg_if_player( m_good, _( "Your %s has started to mend!" ),
+                               body_part_name( part ) );
+        }
+    }
+}
+
+void Character::sound_hallu()
+{
+    // Random 'dangerous' sound from a random direction
+    // 1/5 chance to be a loud sound
+    std::vector<std::string> dir{ "north",
+                                  "northeast",
+                                  "northwest",
+                                  "south",
+                                  "southeast",
+                                  "southwest",
+                                  "east",
+                                  "west" };
+
+    std::vector<std::string> dirz{ "and above you ", "and below you " };
+
+    std::vector<std::tuple<std::string, std::string, std::string>> desc{
+        std::make_tuple( "whump!", "smash_fail", "t_door_c" ),
+        std::make_tuple( "crash!", "smash_success", "t_door_c" ),
+        std::make_tuple( "glass breaking!", "smash_success", "t_window_domestic" ) };
+
+    std::vector<std::tuple<std::string, std::string, std::string>> desc_big{
+        std::make_tuple( "huge explosion!", "explosion", "default" ),
+        std::make_tuple( "bang!", "fire_gun", "glock_19" ),
+        std::make_tuple( "blam!", "fire_gun", "mossberg_500" ),
+        std::make_tuple( "crash!", "smash_success", "t_wall" ),
+        std::make_tuple( "SMASH!", "smash_success", "t_wall" ) };
+
+    std::string i_dir = dir[rng( 0, dir.size() - 1 )];
+
+    if( one_in( 10 ) ) {
+        i_dir += " " + dirz[rng( 0, dirz.size() - 1 )];
+    }
+
+    std::string i_desc;
+    std::pair<std::string, std::string> i_sound;
+    if( one_in( 5 ) ) {
+        int r_int = rng( 0, desc_big.size() - 1 );
+        i_desc = std::get<0>( desc_big[r_int] );
+        i_sound = std::make_pair( std::get<1>( desc_big[r_int] ), std::get<2>( desc_big[r_int] ) );
+    } else {
+        int r_int = rng( 0, desc.size() - 1 );
+        i_desc = std::get<0>( desc[r_int] );
+        i_sound = std::make_pair( std::get<1>( desc[r_int] ), std::get<2>( desc[r_int] ) );
+    }
+
+    add_msg( m_warning, _( "From the %1$s you hear %2$s" ), i_dir, i_desc );
+    sfx::play_variant_sound( i_sound.first, i_sound.second, rng( 20, 80 ) );
+}
+
+void Character::drench( int saturation, const body_part_set &flags, bool ignore_waterproof )
+{
+    if( saturation < 1 ) {
+        return;
+    }
+
+    // OK, water gets in your AEP suit or whatever.  It wasn't built to keep you dry.
+    if( has_trait( trait_DEBUG_NOTEMP ) || has_active_mutation( trait_id( "SHELL2" ) ) ||
+        ( !ignore_waterproof && is_waterproof( flags ) ) ) {
+        return;
+    }
+
+    // Make the body wet
+    for( const body_part bp : all_body_parts ) {
+        // Different body parts have different size, they can only store so much water
+        int bp_wetness_max = 0;
+        if( flags.test( bp ) ) {
+            bp_wetness_max = drench_capacity[bp];
+        }
+
+        if( bp_wetness_max == 0 ) {
+            continue;
+        }
+        // Different sources will only make the bodypart wet to a limit
+        int source_wet_max = saturation * bp_wetness_max * 2 / 100;
+        int wetness_increment = ignore_waterproof ? 100 : 2;
+        // Respect maximums
+        const int wetness_max = std::min( source_wet_max, bp_wetness_max );
+        if( body_wetness[bp] < wetness_max ) {
+            body_wetness[bp] = std::min( wetness_max, body_wetness[bp] + wetness_increment );
+        }
+    }
+
+    if( is_weak_to_water() ) {
+        add_msg_if_player( m_bad, _( "You feel the water burning your skin." ) );
+    }
+
+    // Remove onfire effect
+    if( saturation > 10 || x_in_y( saturation, 10 ) ) {
+        remove_effect( effect_onfire );
+    }
+}
+
+void Character::apply_wetness_morale( int temperature )
+{
+    // First, a quick check if we have any wetness to calculate morale from
+    // Faster than checking all worn items for friendliness
+    if( !std::any_of( body_wetness.begin(), body_wetness.end(),
+    []( const int w ) {
+    return w != 0;
+} ) ) {
+        return;
+    }
+
+    // Normalize temperature to [-1.0,1.0]
+    temperature = std::max( 0, std::min( 100, temperature ) );
+    const double global_temperature_mod = -1.0 + ( 2.0 * temperature / 100.0 );
+
+    int total_morale = 0;
+    const auto wet_friendliness = exclusive_flag_coverage( "WATER_FRIENDLY" );
+    for( const body_part bp : all_body_parts ) {
+        // Sum of body wetness can go up to 103
+        const int part_drench = body_wetness[bp];
+        if( part_drench == 0 ) {
+            continue;
+        }
+
+        const auto &part_arr = mut_drench[bp];
+        const int part_ignored = part_arr[WT_IGNORED];
+        const int part_neutral = part_arr[WT_NEUTRAL];
+        const int part_good    = part_arr[WT_GOOD];
+
+        if( part_ignored >= part_drench ) {
+            continue;
+        }
+
+        int bp_morale = 0;
+        const bool is_friendly = wet_friendliness.test( bp );
+        const int effective_drench = part_drench - part_ignored;
+        if( is_friendly ) {
+            // Using entire bonus from mutations and then some "human" bonus
+            bp_morale = std::min( part_good, effective_drench ) + effective_drench / 2;
+        } else if( effective_drench < part_good ) {
+            // Positive or 0
+            // Won't go higher than part_good / 2
+            // Wet slime/scale doesn't feel as good when covered by wet rags/fur/kevlar
+            bp_morale = std::min( effective_drench, part_good - effective_drench );
+        } else if( effective_drench > part_good + part_neutral ) {
+            // This one will be negative
+            bp_morale = part_good + part_neutral - effective_drench;
+        }
+
+        // Clamp to [COLD,HOT] and cast to double
+        const double part_temperature =
+            std::min( BODYTEMP_HOT, std::max( BODYTEMP_COLD, temp_cur[bp] ) );
+        // 0.0 at COLD, 1.0 at HOT
+        const double part_mod = ( part_temperature - BODYTEMP_COLD ) /
+                                ( BODYTEMP_HOT - BODYTEMP_COLD );
+        // Average of global and part temperature modifiers, each in range [-1.0, 1.0]
+        double scaled_temperature = ( global_temperature_mod + part_mod ) / 2;
+
+        if( bp_morale < 0 ) {
+            // Damp, hot clothing on hot skin feels bad
+            scaled_temperature = fabs( scaled_temperature );
+        }
+
+        // For an unmutated human swimming in deep water, this will add up to:
+        // +51 when hot in 100% water friendly clothing
+        // -103 when cold/hot in 100% unfriendly clothing
+        total_morale += static_cast<int>( bp_morale * ( 1.0 + scaled_temperature ) / 2.0 );
+    }
+
+    if( total_morale == 0 ) {
+        return;
+    }
+
+    int morale_effect = total_morale / 8;
+    if( morale_effect == 0 ) {
+        if( total_morale > 0 ) {
+            morale_effect = 1;
+        } else {
+            morale_effect = -1;
+        }
+    }
+    // 61_seconds because decay is applied in 1_minutes increments
+    add_morale( MORALE_WET, morale_effect, total_morale, 61_seconds, 61_seconds, true );
+}
+
+void Character::add_addiction( add_type type, int strength )
+{
+    if( type == ADD_NULL ) {
+        return;
+    }
+    time_duration timer = 2_hours;
+    if( has_trait( trait_ADDICTIVE ) ) {
+        strength *= 2;
+        timer = 1_hours;
+    } else if( has_trait( trait_NONADDICTIVE ) ) {
+        strength /= 2;
+        timer = 6_hours;
+    }
+    //Update existing addiction
+    for( auto &i : addictions ) {
+        if( i.type != type ) {
+            continue;
+        }
+
+        if( i.sated < 0_turns ) {
+            i.sated = timer;
+        } else if( i.sated < 10_minutes ) {
+            i.sated += timer; // TODO: Make this variable?
+        } else {
+            i.sated += timer / 2;
+        }
+        if( i.intensity < MAX_ADDICTION_LEVEL && strength > i.intensity * rng( 2, 5 ) ) {
+            i.intensity++;
+        }
+
+        add_msg( m_debug, "Updating addiction: %d intensity, %d sated",
+                 i.intensity, to_turns<int>( i.sated ) );
+
+        return;
+    }
+
+    // Add a new addiction
+    const int roll = rng( 0, 100 );
+    add_msg( m_debug, "Addiction: roll %d vs strength %d", roll, strength );
+    if( roll < strength ) {
+        const std::string &type_name = addiction_type_name( type );
+        add_msg( m_debug, "%s got addicted to %s", disp_name(), type_name );
+        addictions.emplace_back( type, 1 );
+        g->events().send<event_type::gains_addiction>( getID(), type );
+    }
+}
+
+bool Character::has_addiction( add_type type ) const
+{
+    return std::any_of( addictions.begin(), addictions.end(),
+    [type]( const addiction & ad ) {
+        return ad.type == type && ad.intensity >= MIN_ADDICTION_LEVEL;
+    } );
+}
+
+void Character::rem_addiction( add_type type )
+{
+    auto iter = std::find_if( addictions.begin(), addictions.end(),
+    [type]( const addiction & ad ) {
+        return ad.type == type;
+    } );
+
+    if( iter != addictions.end() ) {
+        addictions.erase( iter );
+        g->events().send<event_type::loses_addiction>( getID(), type );
+    }
+}
+
+int Character::addiction_level( add_type type ) const
+{
+    auto iter = std::find_if( addictions.begin(), addictions.end(),
+    [type]( const addiction & ad ) {
+        return ad.type == type;
+    } );
+    return iter != addictions.end() ? iter->intensity : 0;
+}
+
+int  Character::leak_level( const std::string &flag ) const
+{
+    int leak_level = 0;
+    leak_level = inv.leak_level( flag );
+    return leak_level;
+}
diff --git a/src/text_snippets.cpp b/src/text_snippets.cpp
index 1b5093063a330..f81998b6818b1 100644
--- a/src/text_snippets.cpp
+++ b/src/text_snippets.cpp
@@ -1,22 +1,21 @@
 #include "text_snippets.h"
 
 #include <random>
-#include <string>
 #include <iterator>
 #include <utility>
 
+#include "generic_factory.h"
 #include "json.h"
 #include "rng.h"
-#include "translations.h"
-
-static const std::string null_string;
 
 snippet_library SNIPPET;
 
-snippet_library::snippet_library() = default;
-
 void snippet_library::load_snippet( JsonObject &jsobj )
 {
+    if( hash_to_id_migration.has_value() ) {
+        debugmsg( "snippet_library::load_snippet called after snippet_library::migrate_hash_to_id." );
+    }
+    hash_to_id_migration = cata::nullopt;
     const std::string category = jsobj.get_string( "category" );
     if( jsobj.has_array( "text" ) ) {
         JsonArray jarr = jsobj.get_array( "text" );
@@ -28,10 +27,17 @@ void snippet_library::load_snippet( JsonObject &jsobj )
 
 void snippet_library::add_snippets_from_json( const std::string &category, JsonArray &jarr )
 {
+    if( hash_to_id_migration.has_value() ) {
+        debugmsg( "snippet_library::add_snippets_from_json called after snippet_library::migrate_hash_to_id." );
+    }
+    hash_to_id_migration = cata::nullopt;
     while( jarr.has_more() ) {
         if( jarr.test_string() ) {
-            const std::string text = jarr.next_string();
-            add_snippet( category, text );
+            translation text;
+            if( !jarr.read_next( text ) ) {
+                jarr.throw_error( "Error reading snippet from JSON array" );
+            }
+            snippets_by_category[category].no_id.emplace_back( text );
         } else {
             JsonObject jo = jarr.next_object();
             add_snippet_from_json( category, jo );
@@ -41,73 +47,45 @@ void snippet_library::add_snippets_from_json( const std::string &category, JsonA
 
 void snippet_library::add_snippet_from_json( const std::string &category, JsonObject &jo )
 {
-    const std::string text = jo.get_string( "text" );
-    const int hash = add_snippet( category, text );
+    if( hash_to_id_migration.has_value() ) {
+        debugmsg( "snippet_library::add_snippet_from_json called after snippet_library::migrate_hash_to_id." );
+    }
+    hash_to_id_migration = cata::nullopt;
+    translation text;
+    mandatory( jo, false, "text", text );
     if( jo.has_member( "id" ) ) {
         const std::string id = jo.get_string( "id" );
-        snippets_by_id[id] = hash;
+        if( snippets_by_id.find( id ) != snippets_by_id.end() ) {
+            jo.throw_error( "Duplicate snippet id", "id" );
+        }
+        snippets_by_category[category].ids.emplace_back( id );
+        snippets_by_id[id] = text;
+    } else {
+        snippets_by_category[category].no_id.emplace_back( text );
     }
 }
 
-int snippet_library::add_snippet( const std::string &category, const std::string &text )
-{
-    int hash = djb2_hash( reinterpret_cast<const unsigned char *>( text.c_str() ) );
-    snippets.insert( std::pair<int, std::string>( hash, text ) );
-    categories.insert( std::pair<std::string, int>( category, hash ) );
-    return hash;
-}
-
-bool snippet_library::has_category( const std::string &category ) const
-{
-    return categories.lower_bound( category ) != categories.end();
-}
-
 void snippet_library::clear_snippets()
 {
-    snippets.clear();
+    hash_to_id_migration = cata::nullopt;
+    snippets_by_category.clear();
     snippets_by_id.clear();
-    categories.clear();
-}
-
-int snippet_library::get_snippet_by_id( const std::string &id ) const
-{
-    const auto it = snippets_by_id.find( id );
-    if( it != snippets_by_id.end() ) {
-        return it->second;
-    }
-    return 0;
 }
 
-int snippet_library::assign( const std::string &category ) const
+bool snippet_library::has_category( const std::string &category ) const
 {
-    return assign( category, rng_bits() );
+    return snippets_by_category.find( category ) != snippets_by_category.end();
 }
 
-int snippet_library::assign( const std::string &category, const unsigned seed ) const
+cata::optional<translation> snippet_library::get_snippet_by_id( const std::string &id ) const
 {
-    const int count = categories.count( category );
-    if( count == 0 ) {
-        return 0;
-    }
-    std::mt19937 generator( seed );
-    std::uniform_int_distribution<int> dis( 0, count - 1 );
-    const int selected_text = dis( generator );
-    std::multimap<std::string, int>::const_iterator it = categories.lower_bound( category );
-    for( int index = 0; index < selected_text; ++index ) {
-        ++it;
+    const auto it = snippets_by_id.find( id );
+    if( it == snippets_by_id.end() ) {
+        return cata::nullopt;
     }
     return it->second;
 }
 
-std::string snippet_library::get( const int index ) const
-{
-    const std::map<int, std::string>::const_iterator chosen_snippet = snippets.find( index );
-    if( chosen_snippet == snippets.end() ) {
-        return null_string;
-    }
-    return _( chosen_snippet->second );
-}
-
 std::string snippet_library::expand( const std::string &str ) const
 {
     size_t tag_begin = str.find( '<' );
@@ -120,42 +98,71 @@ std::string snippet_library::expand( const std::string &str ) const
     }
 
     std::string symbol = str.substr( tag_begin, tag_end - tag_begin + 1 );
-    std::string replacement = random_from_category( symbol );
-    if( replacement.empty() ) {
+    cata::optional<translation> replacement = random_from_category( symbol );
+    if( !replacement.has_value() ) {
         return str.substr( 0, tag_end + 1 )
                + expand( str.substr( tag_end + 1 ) );
     }
     return str.substr( 0, tag_begin )
-           + expand( replacement )
+           + expand( replacement.value().translated() )
            + expand( str.substr( tag_end + 1 ) );
 }
 
-std::string snippet_library::random_from_category( const std::string &cat ) const
+cata::optional<std::string> snippet_library::random_id_from_category( const std::string &cat ) const
 {
-    const auto iters = categories.equal_range( cat );
-    if( iters.first == iters.second ) {
-        return null_string;
+    const auto it = snippets_by_category.find( cat );
+    if( it == snippets_by_category.end() ) {
+        return cata::nullopt;
     }
+    if( !it->second.no_id.empty() ) {
+        debugmsg( "ids are required, but not specified for some snippets in category %s", cat );
+    }
+    if( it->second.ids.empty() ) {
+        return cata::nullopt;
+    }
+    return random_entry( it->second.ids );
+}
 
-    const int count = std::distance( iters.first, iters.second );
-    const int index = rng( 0, count - 1 );
-    auto iter = iters.first;
-    std::advance( iter, index );
-    return expand( get( iter->second ) );
+cata::optional<translation> snippet_library::random_from_category( const std::string &cat ) const
+{
+    return random_from_category( cat, rng_bits() );
 }
 
-std::vector<int> snippet_library::all_ids_from_category( const std::string &cat ) const
+cata::optional<translation> snippet_library::random_from_category( const std::string &cat,
+        unsigned int seed ) const
 {
-    std::vector<int> ret;
-    const auto iters = categories.equal_range( cat );
-    if( iters.first == categories.end() ) {
-        return ret;
+    const auto it = snippets_by_category.find( cat );
+    if( it == snippets_by_category.end() ) {
+        return cata::nullopt;
     }
-
-    for( auto iter = iters.first; iter != iters.second; iter++ ) {
-        ret.push_back( iter->second );
+    if( it->second.ids.empty() && it->second.no_id.empty() ) {
+        return cata::nullopt;
+    }
+    const size_t count = it->second.ids.size() + it->second.no_id.size();
+    std::mt19937 generator( seed );
+    std::uniform_int_distribution<size_t> dis( 0, count - 1 );
+    const size_t index = dis( generator );
+    if( index < it->second.ids.size() ) {
+        return get_snippet_by_id( it->second.ids[index] );
+    } else {
+        return it->second.no_id[index - it->second.ids.size()];
     }
-
-    return ret;
 }
 
+cata::optional<std::string> snippet_library::migrate_hash_to_id( const int hash )
+{
+    if( !hash_to_id_migration.has_value() ) {
+        hash_to_id_migration.emplace();
+        for( const auto &id_and_text : snippets_by_id ) {
+            cata::optional<int> hash = id_and_text.second.legacy_hash();
+            if( hash ) {
+                hash_to_id_migration->emplace( hash.value(), id_and_text.first );
+            }
+        }
+    }
+    const auto it = hash_to_id_migration->find( hash );
+    if( it == hash_to_id_migration->end() ) {
+        return cata::nullopt;
+    }
+    return it->second;
+}
diff --git a/src/text_snippets.h b/src/text_snippets.h
index 19641f5a0290d..ef8d7832ae7ab 100644
--- a/src/text_snippets.h
+++ b/src/text_snippets.h
@@ -2,69 +2,103 @@
 #ifndef TEXT_SNIPPETS_H
 #define TEXT_SNIPPETS_H
 
-#include <map>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
+#include "optional.h"
+#include "translations.h"
+
 class JsonObject;
 class JsonArray;
 
 class snippet_library
 {
     public:
-        snippet_library();
-
         /**
          * Load snippet from the standalone entry, used by the @ref DynamicDataLoader.
          */
         void load_snippet( JsonObject &jsobj );
         /**
-         * Returns the id of a random snippet out of the given category.
-         */
-        int assign( const std::string &category ) const;
-        /**
-         * Like @ref assign, but with an explicit seed to the RNG. The seed decides which
-         * snippet out of the category is returned (same seed yields same snippet).
+         * Load all snippet definitions in the json array into given category.
+         * Entries in the array can be simple strings, or json objects (for the
+         * later see add_snippet_from_json).
          */
-        int assign( const std::string &category, unsigned seed ) const;
-        std::string get( int index ) const;
-        std::string expand( const std::string &str ) const;
-        bool has_category( const std::string &category ) const;
-        int get_snippet_by_id( const std::string &id ) const;
-        std::string random_from_category( const std::string &cat ) const;
-        std::vector<int> all_ids_from_category( const std::string &cat ) const;
+        void add_snippets_from_json( const std::string &category, JsonArray &jarr );
         /**
          * Load a single snippet text from the json object. The object should have
          * a "text" member with the text of the snippet.
          * A "id" member is optional and if present gives the snippet text a id,
          * stored in snippets_by_id.
          */
-        void add_snippets_from_json( const std::string &category, JsonArray &jarr );
-
+        void add_snippet_from_json( const std::string &category, JsonObject &jo );
         void clear_snippets();
-    private:
+
+        bool has_category( const std::string &category ) const;
         /**
-         * Adds the snippet text, puts it into @ref categories and @ref snippets.
-         * Snippet texts must already be translated!
-         * @return the hash of the snippet.
+         * Returns the snippet referenced by the id, or cata::nullopt if there
+         * is no snippet with such id.
+         * The tags in the snippet are not automatically expanded - you need to
+         * call `expand()` to do that.
          */
-        int add_snippet( const std::string &category, const std::string &text );
-        void add_snippet_from_json( const std::string &category, JsonObject &jo );
+        cata::optional<translation> get_snippet_by_id( const std::string &id ) const;
         /**
-         * Load all snippet definitions in the json array into given category.
-         * Entries in the array can be simple strings, or json objects (for the
-         * later see add_snippet_from_json).
+         * Expand the string by recursively replacing tags in angle brackets (<>)
+         * with random snippets from the tags' respective category. For example,
+         * if the string is "<okay><punc>", the function then replaces "<okay>"
+         * with a snippet from the "<okay>" category, and "<punc>" with a snippet
+         * from the "<punc>" category, and returns, for example, "okay!". If a tag
+         * does not have a corresponding category, it is copied to the final string,
+         * for example, "drop <yrwp>, <okay>?" may expand to "drop <yrwp>, okay?"
+         * because "<yrwp>" is a special tag that does not have a category defined
+         * in the JSON files.
+         */
+        std::string expand( const std::string &str ) const;
+        /**
+         * Returns the id of a random snippet out of the given category.
+         * Snippets without an id will NOT be returned by this function.
+         * If there isn't any snippet in the category, or if none of the snippets
+         * in the category has an id, cata::nullopt is returned.
+         */
+        cata::optional<std::string> random_id_from_category( const std::string &cat ) const;
+        /**
+         * Returns a random snippet out of the given category. Both snippets with
+         * or without an id may be returned.
+         * If there isn't any snippet in the category, cata::nullopt is returned.
+         * The tags in the snippet are not automatically expanded - you need to
+         * call `expand()` to do that.
          */
-        // Snippets holds a map from the strings hash to the string.
-        // The strings stored and used for hashing are untranslated in case the language changes.
-        // This is so the reference to the string remains stable across
-        // changes to the layout and contents of the snippets json file.
-        std::map<int, std::string> snippets;
-        // Key is an arbitrary id string (from json), value is the hash of the untranslated snippet.
-        std::unordered_map<std::string, int> snippets_by_id;
-        // Categories groups snippets by well, category.
-        std::multimap<std::string, int> categories;
+        cata::optional<translation> random_from_category( const std::string &cat ) const;
+        /**
+         * Use the given seed to select a random snippet from the category.
+         * For the same seed, the returned snippet stays the same *in a single
+         * game session*, but may change after reloading or restarting a game,
+         * due to layout changes in the JSON files, for example. If there isn't
+         * any snippet in the category, cata::nullopt is returned.
+         * The tags in the snippet are not automatically expanded - you need to
+         * call `expand()` to do that.
+         *
+         * @todo: make the result stay the same through different game sessions
+         */
+        cata::optional<translation> random_from_category( const std::string &cat, unsigned int seed ) const;
+        /**
+         * Used only for legacy compatibility. `hash_to_id_migration` will be
+         * initialized if it hasn't been yet, and the snippet with the given
+         * hash is looked up and returned. If there's no longer any snippet with
+         * the given hash, cata::nullopt is returned instead.
+         */
+        cata::optional<std::string> migrate_hash_to_id( int hash );
+
+    private:
+        std::unordered_map<std::string, translation> snippets_by_id;
+
+        struct category_snippets {
+            std::vector<std::string> ids;
+            std::vector<translation> no_id;
+        };
+        std::unordered_map<std::string, category_snippets> snippets_by_category;
+
+        cata::optional<std::map<int, std::string>> hash_to_id_migration;
 };
 
 extern snippet_library SNIPPET;
diff --git a/src/translations.cpp b/src/translations.cpp
index 1bc46b7d25970..2bd330314ea63 100644
--- a/src/translations.cpp
+++ b/src/translations.cpp
@@ -23,6 +23,7 @@
 #include "name.h"
 #include "output.h"
 #include "path_info.h"
+#include "rng.h"
 #include "text_style_check.h"
 #include "cursesdef.h"
 #include "cata_utility.h"
@@ -35,7 +36,7 @@ extern bool test_mode;
 static void reload_names()
 {
     Name::clear();
-    Name::load_from_file( PATH_INFO::find_translated_file( "namesdir", ".json", "names" ) );
+    Name::load_from_file( PATH_INFO::names() );
 }
 
 static bool sanity_checked_genders = false;
@@ -208,11 +209,11 @@ void set_language()
     // Since we're using libintl-lite instead of libintl on Android, we hack the locale_dir to point directly to the .mo file.
     // This is because of our hacky libintl-lite bindtextdomain() implementation.
     auto env = getenv( "LANGUAGE" );
-    locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) +
+    locale_dir = std::string( PATH_INFO::base_path() + "lang/mo/" + ( env ? env : "none" ) +
                               "/LC_MESSAGES/cataclysm-dda.mo" );
 #elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES)))
-    if( !FILENAMES["base_path"].empty() ) {
-        locale_dir = FILENAMES["base_path"] + "share/locale";
+    if( !PATH_INFO::base_path().empty() ) {
+        locale_dir = PATH_INFO::base_path() + "share/locale";
     } else {
         locale_dir = "lang/mo";
     }
@@ -579,6 +580,16 @@ bool translation::operator!=( const translation &that ) const
     return !operator==( that );
 }
 
+cata::optional<int> translation::legacy_hash() const
+{
+    if( needs_translation && !ctxt && !raw_pl ) {
+        return djb2_hash( reinterpret_cast<const unsigned char *>( raw.c_str() ) );
+    }
+    // Otherwise the translation must have been added after snippets were changed
+    // to use string ids only, so the translation doesn't have a legacy hash value.
+    return cata::nullopt;
+}
+
 translation to_translation( const std::string &raw )
 {
     return translation::to_translation( raw );
diff --git a/src/translations.h b/src/translations.h
index 3f49964395ac7..d2a0dfa83db5e 100644
--- a/src/translations.h
+++ b/src/translations.h
@@ -200,6 +200,11 @@ class translation
          */
         bool operator==( const translation &that ) const;
         bool operator!=( const translation &that ) const;
+
+        /**
+         * Only used for migrating old snippet hashes into snippet ids.
+         */
+        cata::optional<int> legacy_hash() const;
     private:
         translation( const std::string &ctxt, const std::string &raw );
         translation( const std::string &raw );
diff --git a/src/trapfunc.cpp b/src/trapfunc.cpp
index c829aa80fa64a..f4555d235cf0c 100644
--- a/src/trapfunc.cpp
+++ b/src/trapfunc.cpp
@@ -126,7 +126,7 @@ bool trapfunc::cot( const tripoint &, Creature *c, item * )
     monster *z = dynamic_cast<monster *>( c );
     if( z != nullptr ) {
         // Haha, only monsters stumble over a cot, humans are smart.
-        add_msg( m_good, _( "The %s stumbles over the cot" ), z->name() );
+        add_msg( m_good, _( "The %s stumbles over the cot!" ), z->name() );
         c->moves -= 100;
         return true;
     }
@@ -150,7 +150,6 @@ bool trapfunc::beartrap( const tripoint &p, Creature *c, item * )
                                   _( "A bear trap closes on <npcname>'s foot!" ) );
         if( c->has_effect( effect_ridden ) ) {
             add_msg( m_warning, _( "Your %s is caught by a beartrap!" ), c->get_name() );
-            g->u.add_effect( effect_beartrap, 1_turns, hit, true );
         }
         // Actual effects
         c->add_effect( effect_beartrap, 1_turns, hit, true );
@@ -547,7 +546,6 @@ bool trapfunc::snare_light( const tripoint &p, Creature *c, item * )
     // Messages
     if( c->has_effect( effect_ridden ) ) {
         add_msg( m_bad, _( "A snare closes on your %s's leg!" ), c->get_name() );
-        g->u.add_effect( effect_lightsnare, 1_turns, hit, true );
     }
     c->add_msg_player_or_npc( m_bad, _( "A snare closes on your leg." ),
                               _( "A snare closes on <npcname>s leg." ) );
@@ -572,8 +570,7 @@ bool trapfunc::snare_heavy( const tripoint &p, Creature *c, item * )
     // Determine what got hit
     const body_part hit = one_in( 2 ) ? bp_leg_l : bp_leg_r;
     if( c->has_effect( effect_ridden ) ) {
-        add_msg( m_bad, _( "A snare closes on your %s's leg" ), c->get_name() );
-        g->u.add_effect( effect_heavysnare, 1_turns, hit, true );
+        add_msg( m_bad, _( "A snare closes on your %s's leg!" ), c->get_name() );
     }
     //~ %s is bodypart name in accusative.
     c->add_msg_player_or_npc( m_bad, _( "A snare closes on your %s." ),
@@ -1198,7 +1195,8 @@ bool trapfunc::ledge( const tripoint &p, Creature *c, item * )
     }
 
     if( pl->is_player() ) {
-        add_msg( m_warning, _( "You fall down a level!" ) );
+        add_msg( m_bad, ngettext( "You fall down %d story!", "You fall down %d stories!", height ),
+                 height );
         g->vertical_move( -height, true );
     } else {
         pl->setpos( where );
@@ -1211,7 +1209,7 @@ bool trapfunc::ledge( const tripoint &p, Creature *c, item * )
         pl->add_msg_if_player( m_info,
                                _( "You hit the ground hard, but your shock absorbers handle the impact admirably!" ) );
     } else {
-        pl->impact( height * 10, where );
+        pl->impact( height * 30, where );
     }
     return true;
 }
diff --git a/src/turret.cpp b/src/turret.cpp
index c25574c272647..d6860a2fc3932 100644
--- a/src/turret.cpp
+++ b/src/turret.cpp
@@ -23,6 +23,7 @@
 #include "debug.h"
 #include "optional.h"
 #include "enums.h"
+#include "vpart_range.h"
 
 static const itype_id fuel_type_battery( "battery" );
 const efftype_id effect_on_roof( "on_roof" );
@@ -292,16 +293,12 @@ void vehicle::turrets_set_targeting()
 {
     std::vector<vehicle_part *> turrets;
     std::vector<tripoint> locations;
-    std::vector<vehicle_part *> turret_controls;
 
     for( auto &p : parts ) {
-        if( p.base.is_gun() ) {
+        if( p.is_turret() ) {
             turrets.push_back( &p );
             locations.push_back( global_part_pos3( p ) );
         }
-        if( part_flag( index_of_part( &p ), "TURRET_CONTROLS" ) ) {
-            turret_controls.push_back( &p );
-        }
     }
 
     pointmenu_cb callback( locations );
@@ -331,11 +328,17 @@ void vehicle::turrets_set_targeting()
         sel = menu.ret;
         if( has_part( locations[ sel ], "TURRET_CONTROLS" ) ) {
             turrets[sel]->enabled = !turrets[sel]->enabled;
-            turret_controls[sel]->enabled = turrets[sel]->enabled;
         } else {
             turrets[sel]->enabled = false;
         }
 
+        for( const vpart_reference &vp : get_avail_parts( "TURRET_CONTROLS" ) ) {
+            vehicle_part &e = vp.part();
+            if( e.mount == turrets[sel]->mount ) {
+                e.enabled = turrets[sel]->enabled;
+            }
+        }
+
         // clear the turret's current targets to prevent unwanted auto-firing
         tripoint pos = locations[ sel ];
         turrets[ sel ]->reset_target( pos );
diff --git a/src/units.h b/src/units.h
index 639c6952b44a3..1e9c61e53a91d 100644
--- a/src/units.h
+++ b/src/units.h
@@ -342,6 +342,12 @@ inline constexpr quantity<value_type, mass_in_milligram_tag> from_kilogram(
     return from_gram( v * 1000 );
 }
 
+template<typename value_type>
+inline constexpr value_type to_milligram( const quantity<value_type, mass_in_milligram_tag> &v )
+{
+    return v.value();
+}
+
 template<typename value_type>
 inline constexpr value_type to_gram( const quantity<value_type, mass_in_milligram_tag> &v )
 {
@@ -517,6 +523,18 @@ inline constexpr units::quantity<double, units::volume_in_milliliter_tag> operat
     return units::from_milliliter( v );
 }
 
+// Implicitly converted to volume, which has int as value_type!
+inline constexpr units::volume operator"" _liter( const unsigned long long v )
+{
+    return units::from_milliliter( v * 1000 );
+}
+
+inline constexpr units::quantity<double, units::volume_in_milliliter_tag> operator"" _liter(
+    const long double v )
+{
+    return units::from_milliliter( v * 1000 );
+}
+
 // Implicitly converted to mass, which has int as value_type!
 inline constexpr units::mass operator"" _milligram( const unsigned long long v )
 {
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 9dc14e9753718..b1eca0359b5fd 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -86,8 +86,6 @@ const efftype_id effect_winded( "winded" );
 // 1 kJ per battery charge
 const int bat_energy_j = 1000;
 //
-// Point dxs for the adjacent cardinal tiles.
-point vehicles::cardinal_d[5] = { point_west, point_east, point_north, point_south, point_zero };
 
 // For reference what each function is supposed to do, see their implementation in
 // @ref DefaultRemovePartHandler. Add compatible code for it into @ref MapgenRemovePartHandler,
@@ -204,7 +202,7 @@ units::volume vehicle_stack::max_volume() const
 {
     if( myorigin->part_flag( part_num, "CARGO" ) && myorigin->parts[part_num].is_available() ) {
         // Set max volume for vehicle cargo to prevent integer overflow
-        return std::min( myorigin->parts[part_num].info().size, 10000000_ml );
+        return std::min( myorigin->parts[part_num].info().size, 10000_liter );
     }
     return 0_ml;
 }
@@ -1681,8 +1679,8 @@ bool vehicle::is_connected( const vehicle_part &to, const vehicle_part &from,
         discovered.pop_front();
         auto current = current_part.mount;
 
-        for( int i = 0; i < 4; i++ ) {
-            point next = current + vehicles::cardinal_d[i];
+        for( const point &offset : four_adjacent_offsets ) {
+            point next = current + offset;
 
             if( next == target ) {
                 //Success!
@@ -1812,8 +1810,9 @@ bool vehicle::try_to_rack_nearby_vehicle( const std::vector<std::vector<int>> &l
         partial_matches.assign( 4, veh_partial_match );
         for( auto rack_part : this_bike_rack ) {
             tripoint rack_pos = global_part_pos3( rack_part );
-            for( int i = 0; i < 4; i++ ) {
-                tripoint search_pos( rack_pos + vehicles::cardinal_d[ i ] );
+            int i = 0;
+            for( const point &offset : four_cardinal_directions ) {
+                tripoint search_pos( rack_pos + offset );
                 test_veh = veh_pointer_or_null( g->m.veh_at( search_pos ) );
                 if( test_veh == nullptr || test_veh == this ) {
                     continue;
@@ -1825,6 +1824,7 @@ bool vehicle::try_to_rack_nearby_vehicle( const std::vector<std::vector<int>> &l
                 if( partial_matches[ i ] == test_veh->get_points() ) {
                     return merge_rackable_vehicle( test_veh, this_bike_rack );
                 }
+                ++i;
             }
         }
     }
@@ -1897,18 +1897,19 @@ bool vehicle::merge_rackable_vehicle( vehicle *carry_veh, const std::vector<int>
             // There's no mathematical transform from global pos3 to vehicle mount, so search for the
             // carry part in global pos3 after translating
             point carry_mount;
-            for( j = 0; j < 4; j++ ) {
-                carry_mount = parts[ rack_part ].mount + vehicles::cardinal_d[ j ];
+            for( const point &offset : four_cardinal_directions ) {
+                carry_mount = parts[ rack_part ].mount + offset;
                 tripoint possible_pos = mount_to_tripoint( carry_mount );
                 if( possible_pos == carry_pos ) {
                     break;
                 }
+                ++j;
             }
 
             // We checked the adjacent points from the mounting rack and managed
             // to find the current structure part were looking for nearby. If the part was not
             // near this particular rack, we would look at each in the list of rack_parts
-            const bool carry_part_next_to_this_rack = j < 4;
+            const bool carry_part_next_to_this_rack = j < four_adjacent_offsets.size();
             if( carry_part_next_to_this_rack ) {
                 mapping carry_map;
                 point old_mount = carry_veh->parts[ carry_part ].mount;
@@ -2289,8 +2290,8 @@ bool vehicle::find_and_split_vehicles( int exclude )
                 veh_parts.push_back( p );
             }
             checked_parts.insert( test_part );
-            for( size_t i = 0; i < 4; i++ ) {
-                const point dp = parts[test_part].mount + vehicles::cardinal_d[ i ];
+            for( const point &offset : four_adjacent_offsets ) {
+                const point dp = parts[test_part].mount + offset;
                 std::vector<int> all_neighbor_parts = parts_at_relative( dp, true );
                 int neighbor_struct_part = -1;
                 for( int p : all_neighbor_parts ) {
@@ -5645,11 +5646,14 @@ void vehicle::refresh_insides()
             continue;
         }
 
-        parts[p].inside = true; // inside if not otherwise
-        for( int i = 0; i < 4; i++ ) { // let's check four neighbor parts
-            point near_mount = parts[ p ].mount + vehicles::cardinal_d[ i ];
+        // inside if not otherwise
+        parts[p].inside = true;
+        // let's check four neighbor parts
+        for( const point &offset : four_adjacent_offsets ) {
+            point near_mount = parts[ p ].mount + offset;
             std::vector<int> parts_n3ar = parts_at_relative( near_mount, true );
-            bool cover = false; // if we aren't covered from sides, the roof at p won't save us
+            // if we aren't covered from sides, the roof at p won't save us
+            bool cover = false;
             for( auto &j : parts_n3ar ) {
                 // another roof -- cover
                 if( part_flag( j, "ROOF" ) && parts[ j ].is_available() ) {
@@ -5658,7 +5662,8 @@ void vehicle::refresh_insides()
                 } else if( part_flag( j, "OBSTACLE" ) && parts[ j ].is_available() ) {
                     // found an obstacle, like board or windshield or door
                     if( parts[j].inside || ( part_flag( j, "OPENABLE" ) && parts[j].open ) ) {
-                        continue; // door and it's open -- can't cover
+                        // door and it's open -- can't cover
+                        continue;
                     }
                     cover = true;
                     break;
@@ -6327,11 +6332,6 @@ void vehicle::calc_mass_center( bool use_precalc ) const
             m_part += p != nullptr ? p->get_weight() : 0_gram;
         }
 
-        if( vp.part().has_flag( vehicle_part::animal_flag ) ) {
-            std::int64_t animal_mass = vp.part().base.get_var( "weight", 0 );
-            m_part += units::from_gram( animal_mass );
-        }
-
         if( use_precalc ) {
             xf += vp.part().precalc[0].x * m_part;
             yf += vp.part().precalc[0].y * m_part;
diff --git a/src/vehicle.h b/src/vehicle.h
index 1ffc892abbe00..de4f5f2dc8f0a 100644
--- a/src/vehicle.h
+++ b/src/vehicle.h
@@ -63,7 +63,6 @@ class window;
 } // namespace catacurses
 namespace vehicles
 {
-extern point cardinal_d[5];
 // ratio of constant rolling resistance to the part that varies with velocity
 constexpr double rolling_constant_to_variable = 33.33;
 constexpr float vmiph_per_tile = 400.0f;
diff --git a/src/vehicle_part.cpp b/src/vehicle_part.cpp
index c056316750d97..2404bf1e8bbd1 100644
--- a/src/vehicle_part.cpp
+++ b/src/vehicle_part.cpp
@@ -80,6 +80,9 @@ item vehicle_part::properties_to_item() const
         tmp.active = true;
     }
 
+    // force rationalization of damage values to the middle value of each damage level so
+    // that parts will stack nicely
+    tmp.set_damage( tmp.damage_level( 4 ) * itype::damage_scale );
     return tmp;
 }
 
diff --git a/src/vehicle_use.cpp b/src/vehicle_use.cpp
index c1ded4b8161e8..774f7bf211b60 100644
--- a/src/vehicle_use.cpp
+++ b/src/vehicle_use.cpp
@@ -814,7 +814,7 @@ bool vehicle::fold_up()
     }
 
     if( can_be_folded ) {
-        bicycle.set_var( "weight", to_gram( total_mass() ) );
+        bicycle.set_var( "weight", to_milligram( total_mass() ) );
         bicycle.set_var( "volume", total_folded_volume() / units::legacy_volume_factor );
         bicycle.set_var( "name", string_format( _( "folded %s" ), name ) );
         bicycle.set_var( "vehicle_name", name );
@@ -1747,7 +1747,7 @@ void vehicle::use_bike_rack( int part )
                 cur_vehicle.clear();
                 continue;
             }
-            for( const point &mount_dir : vehicles::cardinal_d ) {
+            for( const point &mount_dir : five_cardinal_directions ) {
                 point near_loc = parts[ rack_part ].mount + mount_dir;
                 std::vector<int> near_parts = parts_at_relative( near_loc, true );
                 if( near_parts.empty() ) {
diff --git a/src/worldfactory.cpp b/src/worldfactory.cpp
index 30af0a65e807e..50774fa250671 100644
--- a/src/worldfactory.cpp
+++ b/src/worldfactory.cpp
@@ -37,9 +37,6 @@ using namespace std::placeholders;
 
 #define dbg(x) DebugLog((x), D_MAIN) << __FILE__ << ":" << __LINE__ << ": "
 
-static const std::string SAVE_MASTER( "master.gsav" );
-static const std::string SAVE_EXTENSION( ".sav" );
-
 // single instance of world generator
 std::unique_ptr<worldfactory> world_generator;
 
@@ -93,7 +90,7 @@ void WORLD::COPY_WORLD( const WORLD *world_to_copy )
 
 std::string WORLD::folder_path() const
 {
-    return FILENAMES["savedir"] + utf8_to_native( world_name );
+    return PATH_INFO::savedir() + utf8_to_native( world_name );
 }
 
 bool WORLD::save_exists( const save_t &name ) const
@@ -228,7 +225,7 @@ bool WORLD::save( const bool is_conversion ) const
     }
 
     if( !is_conversion ) {
-        const auto savefile = folder_path() + "/" + FILENAMES["worldoptions"];
+        const auto savefile = folder_path() + "/" + PATH_INFO::worldoptions();
         const bool saved = write_to_file( savefile, [&]( std::ostream & fout ) {
             JsonOut jout( fout );
 
@@ -264,8 +261,8 @@ void worldfactory::init()
     load_last_world_info();
 
     std::vector<std::string> qualifiers;
-    qualifiers.push_back( FILENAMES["worldoptions"] );
-    qualifiers.push_back( FILENAMES["legacy_worldoptions"] );
+    qualifiers.push_back( PATH_INFO::worldoptions() );
+    qualifiers.push_back( PATH_INFO::legacy_worldoptions() );
     qualifiers.push_back( SAVE_MASTER );
 
     all_worlds.clear();
@@ -273,7 +270,7 @@ void worldfactory::init()
     // get the master files. These determine the validity of a world
     // worlds exist by having an option file
     // create worlds
-    for( const auto &world_dir : get_directories_with( qualifiers, FILENAMES["savedir"], true ) ) {
+    for( const auto &world_dir : get_directories_with( qualifiers, PATH_INFO::savedir(), true ) ) {
         // get the save files
         auto world_sav_files = get_files_from_path( SAVE_EXTENSION, world_dir, false );
         // split the save file names between the directory and the extension
@@ -559,7 +556,7 @@ void worldfactory::remove_world( const std::string &worldname )
 
 void worldfactory::load_last_world_info()
 {
-    std::ifstream file( FILENAMES["lastworld"], std::ifstream::in | std::ifstream::binary );
+    std::ifstream file( PATH_INFO::lastworld(), std::ifstream::in | std::ifstream::binary );
     if( !file.good() ) {
         return;
     }
@@ -572,7 +569,7 @@ void worldfactory::load_last_world_info()
 
 void worldfactory::save_last_world_info()
 {
-    write_to_file( FILENAMES["lastworld"], [&]( std::ostream & file ) {
+    write_to_file( PATH_INFO::lastworld(), [&]( std::ostream & file ) {
         JsonOut jsout( file, true );
         jsout.start_object();
         jsout.member( "world_name", last_world_name );
@@ -820,7 +817,6 @@ int worldfactory::show_worldgen_tab_modselection( const catacurses::window &win,
     catacurses::window w_description = catacurses::newwin( 4, iMinScreenWidth - 4,
                                        point( 1 + iOffsetX, TERMY - 5 ) );
 
-
     draw_modselection_borders( win, ctxt );
     std::vector<std::string> headers;
     headers.push_back( _( "Mod List" ) );
@@ -1174,6 +1170,9 @@ int worldfactory::show_worldgen_tab_confirm( const catacurses::window &win, WORL
                     if( !valid_worldname( world->world_name ) ) {
                         continue;
                     }
+#if defined(TILES) || defined(_WIN32)
+                    handle_redraw();
+#endif
                     return 1;
                 }
             } else if( query_yn( _( "Are you SURE you're finished?" ) ) ) {
@@ -1184,6 +1183,9 @@ int worldfactory::show_worldgen_tab_confirm( const catacurses::window &win, WORL
 
                 if( valid_worldname( worldname ) ) {
                     world->world_name = worldname;
+#if defined(TILES) || defined(_WIN32)
+                    handle_redraw();
+#endif
                     return 1;
                 } else {
                     continue;
@@ -1301,7 +1303,11 @@ void worldfactory::draw_worldgen_tabs( const catacurses::window &w, size_t curre
         }
     };
 
-    draw_tabs( w, tab_strings, current );
+    std::vector<std::string> tab_strings_translated( tab_strings );
+    std::for_each( tab_strings_translated.begin(),
+                   tab_strings_translated.end(), []( std::string & str )->void { str = _( str ); } );
+
+    draw_tabs( w, tab_strings_translated, current );
     draw_border_below_tabs( w );
 }
 
@@ -1386,14 +1392,14 @@ bool WORLD::load_options()
     WORLD_OPTIONS = get_options().get_world_defaults();
 
     using namespace std::placeholders;
-    const auto path = folder_path() + "/" + FILENAMES["worldoptions"];
+    const auto path = folder_path() + "/" + PATH_INFO::worldoptions();
     if( read_from_file_optional_json( path, [&]( JsonIn & jsin ) {
     load_options( jsin );
     } ) ) {
         return true;
     }
 
-    const auto legacy_path = folder_path() + "/" + FILENAMES["legacy_worldoptions"];
+    const auto legacy_path = folder_path() + "/" + PATH_INFO::legacy_worldoptions();
     if( read_from_file_optional( legacy_path, std::bind( &WORLD::load_legacy_options, this, _1 ) ) ) {
         if( save() ) {
             // Remove old file as the options have been saved to the new file.
@@ -1462,7 +1468,7 @@ WORLDPTR worldfactory::get_world( const std::string &name )
 // Helper predicate to exclude files from deletion when resetting a world directory.
 static bool isForbidden( const std::string &candidate )
 {
-    return candidate.find( FILENAMES["worldoptions"] ) != std::string::npos ||
+    return candidate.find( PATH_INFO::worldoptions() ) != std::string::npos ||
            candidate.find( "mods.json" ) != std::string::npos;
 }
 
diff --git a/tests/energy_units_test.cpp b/tests/energy_units_test.cpp
deleted file mode 100644
index 0d183c3395262..0000000000000
--- a/tests/energy_units_test.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <sstream>
-#include <string>
-
-#include "catch/catch.hpp"
-#include "json.h"
-#include "units.h"
-
-static units::energy parse_energy_quantity( const std::string &json )
-{
-    std::istringstream buffer( json );
-    JsonIn jsin( buffer );
-    return read_from_json_string<units::energy>( jsin, units::energy_units );
-}
-
-TEST_CASE( "energy parsing from JSON" )
-{
-    CHECK_THROWS( parse_energy_quantity( "\"\"" ) ); // empty string
-    CHECK_THROWS( parse_energy_quantity( "27" ) ); // not a string at all
-    CHECK_THROWS( parse_energy_quantity( "\"    \"" ) ); // only spaces
-    CHECK_THROWS( parse_energy_quantity( "\"27\"" ) ); // no energy unit
-
-    REQUIRE( parse_energy_quantity( "\"1 mJ\"" ) == 1_mJ );
-    REQUIRE( parse_energy_quantity( "\"1 J\"" ) == 1_J );
-    REQUIRE( parse_energy_quantity( "\"1 kJ\"" ) == 1_kJ );
-    REQUIRE( parse_energy_quantity( "\"+1 mJ\"" ) == 1_mJ );
-    REQUIRE( parse_energy_quantity( "\"+1 J\"" ) == 1_J );
-    REQUIRE( parse_energy_quantity( "\"+1 kJ\"" ) == 1_kJ );
-
-    REQUIRE( parse_energy_quantity( "\"1 mJ 1 J 1 kJ\"" ) == 1_mJ + 1_J + 1_kJ );
-    REQUIRE( parse_energy_quantity( "\"1 mJ -4 J 1 kJ\"" ) == 1_mJ - 4_J + 1_kJ );
-
-    REQUIRE( 1_mJ * 1000 == units::from_joule( 1 ) );
-    REQUIRE( 1_J * 1000 == units::from_kilojoule( 1 ) );
-}
diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp
index dafe64dff6dd3..ffa2434c47404 100644
--- a/tests/iteminfo_test.cpp
+++ b/tests/iteminfo_test.cpp
@@ -48,3 +48,22 @@ TEST_CASE( "if_covers_nothing_omit_irreelevant_info", "[item][iteminfo]" )
         "--\n"
         "Covers: <color_c_cyan>Nothing</color>.\n" );
 }
+
+TEST_CASE( "gun_lists_default_ammo", "[item][iteminfo]" )
+{
+    iteminfo_query q( { iteminfo_parts::GUN_DEFAULT_AMMO } );
+    iteminfo_test(
+        item( "compbow" ), q,
+        "--\n"
+        "Gun is not loaded, so stats below assume the default ammo: <color_c_light_blue>wooden broadhead arrow</color>\n" );
+}
+TEST_CASE( "gun_damage_multiplier_not_integer", "[item][iteminfo]" )
+{
+    iteminfo_query q( { iteminfo_parts::GUN_DAMAGE, iteminfo_parts::GUN_DAMAGE_AMMOPROP,
+                        iteminfo_parts::GUN_DAMAGE_TOTAL
+                      } );
+    iteminfo_test(
+        item( "compbow" ), q,
+        "--\n"
+        "Damage: <color_c_yellow>18</color>*<color_c_yellow>1.25</color> = <color_c_yellow>22</color>\n" );
+}
diff --git a/tests/npc_test.cpp b/tests/npc_test.cpp
index 39e9108a698b2..07e3ae4cd84e7 100644
--- a/tests/npc_test.cpp
+++ b/tests/npc_test.cpp
@@ -188,19 +188,23 @@ TEST_CASE( "snippet-tag-test" )
     };
 
     for( const auto &tag : npc_talk_tags ) {
-        const auto ids = SNIPPET.all_ids_from_category( tag );
-        CHECK( !ids.empty() );
-
-        for( size_t i = 0; i < ids.size() * 100; i++ ) {
-            const auto snip = SNIPPET.random_from_category( tag );
-            CHECK( !snip.empty() );
+        for( int i = 0; i < 100; i++ ) {
+            CHECK( SNIPPET.random_from_category( tag ).has_value() );
         }
     }
 
-    // Special tags, those should have empty replacements
-    CHECK( SNIPPET.all_ids_from_category( "<yrwp>" ).empty() );
-    CHECK( SNIPPET.all_ids_from_category( "<mywp>" ).empty() );
-    CHECK( SNIPPET.all_ids_from_category( "<ammo>" ).empty() );
+    // Special tags, those should have no replacements
+    static const std::set<std::string> special_tags = {
+        {
+            "<yrwp>", "<mywp>", "<ammo>"
+        }
+    };
+
+    for( const std::string &tag : special_tags ) {
+        for( int i = 0; i < 100; i++ ) {
+            CHECK( !SNIPPET.random_from_category( tag ).has_value() );
+        }
+    }
 }
 
 /* Test setup. Player should always be at top-left.
diff --git a/tests/stomach_contents_tests.cpp b/tests/stomach_contents_tests.cpp
index e53662e01e427..dee3711b14cd1 100644
--- a/tests/stomach_contents_tests.cpp
+++ b/tests/stomach_contents_tests.cpp
@@ -31,10 +31,8 @@ static void pass_time( player &p, time_duration amt )
 
 static void clear_stomach( player &p )
 {
-    p.guts.set_calories( 0 );
-    p.stomach.set_calories( 0 );
-    p.stomach.bowel_movement();
-    p.guts.bowel_movement();
+    p.stomach.empty();
+    p.guts.empty();
 }
 
 static void set_all_vitamins( int target, player &p )
@@ -63,14 +61,13 @@ static void print_stomach_contents( player &p, const bool print )
     if( !print ) {
         return;
     }
-    printf( "stomach: %d/%d guts: %d/%d player: %d/%d hunger: %d\n", p.stomach.get_calories(),
-            p.stomach.get_calories_absorbed(), p.guts.get_calories(),
-            p.guts.get_calories_absorbed(), p.get_stored_kcal(), p.get_healthy_kcal(), p.get_hunger() );
+    printf( "stomach: %d guts: %d player: %d/%d hunger: %d\n", p.stomach.get_calories(),
+            p.guts.get_calories(), p.get_stored_kcal(), p.get_healthy_kcal(), p.get_hunger() );
     printf( "stomach: %d mL/ %d mL guts %d mL/ %d mL\n",
             units::to_milliliter<int>( p.stomach.contains() ),
-            units::to_milliliter<int>( p.stomach.capacity() ),
+            units::to_milliliter<int>( p.stomach.capacity( p ) ),
             units::to_milliliter<int>( p.guts.contains() ),
-            units::to_milliliter<int>( p.guts.capacity() ) );
+            units::to_milliliter<int>( p.guts.capacity( p ) ) );
     printf( "metabolic rate: %.2f\n", p.metabolic_rate() );
 }
 
@@ -78,24 +75,9 @@ static void print_stomach_contents( player &p, const bool print )
 // accounting for appropriate vitamins
 static void eat_all_nutrients( player &p )
 {
-    // Absorption rates are imperfect for now, so target is 140% DV (== 135 vitamin units if rate is 15m)
-    item f( "fried_brain" );
-    p.eat( f );
-    f = item( "carrot" );
-    p.eat( f );
-    f = item( "carrot" );
-    p.eat( f );
-    f = item( "hotdogs_cooked" );
-    p.eat( f );
-    f = item( "veggy" );
-    p.eat( f );
-    f = item( "can_herring" );
-    p.eat( f );
-    f = item( "can_herring" );
-    p.eat( f );
-    f = item( "can_herring" );
-    p.eat( f );
-    f = item( "junk_burrito" );
+    // Vitamin target: 100% DV -- or 96 vitamin "units" since all vitamins currently decay every 15m.
+    // Energy target: 2100 kcal -- debug target will be completely sedentary.
+    item f( "debug_nutrition" );
     p.eat( f );
 }
 
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
index 9f203e2be58e9..9d71d809799cc 100644
--- a/tests/test_main.cpp
+++ b/tests/test_main.cpp
@@ -100,18 +100,18 @@ static void init_global_game_state( const std::vector<mod_id> &mods,
     }
 
     PATH_INFO::init_base_path( "" );
-    PATH_INFO::init_user_dir( user_dir.c_str() );
+    PATH_INFO::init_user_dir( user_dir );
     PATH_INFO::set_standard_filenames();
 
-    if( !assure_dir_exist( FILENAMES["config_dir"] ) ) {
+    if( !assure_dir_exist( PATH_INFO::config_dir() ) ) {
         assert( !"Unable to make config directory.  Check permissions." );
     }
 
-    if( !assure_dir_exist( FILENAMES["savedir"] ) ) {
+    if( !assure_dir_exist( PATH_INFO::savedir() ) ) {
         assert( !"Unable to make save directory.  Check permissions." );
     }
 
-    if( !assure_dir_exist( FILENAMES["templatedir"] ) ) {
+    if( !assure_dir_exist( PATH_INFO::templatedir() ) ) {
         assert( !"Unable to make templates directory.  Check permissions." );
     }
 
diff --git a/tests/time_duration_test.cpp b/tests/time_duration_test.cpp
deleted file mode 100644
index 766dfc4583b2b..0000000000000
--- a/tests/time_duration_test.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <sstream>
-#include <string>
-
-#include "catch/catch.hpp"
-#include "calendar.h"
-#include "json.h"
-#include "units.h"
-
-static time_duration parse_time_duration( const std::string &json )
-{
-    std::istringstream buffer( json );
-    JsonIn jsin( buffer );
-    return read_from_json_string<time_duration>( jsin, time_duration::units );
-}
-
-TEST_CASE( "time_duration parsing from JSON" )
-{
-    CHECK_THROWS( parse_time_duration( "\"\"" ) ); // empty string
-    CHECK_THROWS( parse_time_duration( "27" ) ); // not a string at all
-    CHECK_THROWS( parse_time_duration( "\"    \"" ) ); // only spaces
-    CHECK_THROWS( parse_time_duration( "\"27\"" ) ); // no time unit
-
-    REQUIRE( parse_time_duration( "\"1 turns\"" ) == 1_turns );
-    REQUIRE( parse_time_duration( "\"1 minutes\"" ) == 1_minutes );
-    REQUIRE( parse_time_duration( "\"+1 hours\"" ) == 1_hours );
-    REQUIRE( parse_time_duration( "\"+1 days\"" ) == 1_days );
-
-    REQUIRE( parse_time_duration( "\"1 turns 1 minutes 1 hours 1 days\"" ) == 1_turns + 1_minutes +
-             1_hours + 1_days );
-    REQUIRE( parse_time_duration( "\"1 turns -4 minutes 1 hours -4 days\"" ) == 1_turns - 4_minutes +
-             1_hours - 4_days );
-
-    REQUIRE( 1_turns * 60 == time_duration::from_minutes( 1 ) );
-    REQUIRE( 1_minutes * 60 == time_duration::from_hours( 1 ) );
-    REQUIRE( 1_hours * 24 == time_duration::from_days( 1 ) );
-}
diff --git a/tests/units_test.cpp b/tests/units_test.cpp
new file mode 100644
index 0000000000000..fe4407017dd08
--- /dev/null
+++ b/tests/units_test.cpp
@@ -0,0 +1,87 @@
+#include <sstream>
+#include <string>
+
+#include "catch/catch.hpp"
+#include "calendar.h"
+#include "json.h"
+#include "units.h"
+
+TEST_CASE( "units_have_correct_ratios", "[units]" )
+{
+    CHECK( 1_liter == 1000_ml );
+    CHECK( 1.0_liter == 1000.0_ml );
+    CHECK( 1_gram == 1000_milligram );
+    CHECK( 1.0_gram == 1000.0_milligram );
+    CHECK( 1_kilogram == 1000_gram );
+    CHECK( 1.0_kilogram == 1000.0_gram );
+    CHECK( 1_J == 1000_mJ );
+    CHECK( 1.0_J == 1000.0_mJ );
+    CHECK( 1_kJ == 1000_J );
+    CHECK( 1.0_kJ == 1000.0_J );
+    CHECK( 1_USD == 100_cent );
+    CHECK( 1.0_USD == 100.0_cent );
+    CHECK( 1_kUSD == 1000_USD );
+    CHECK( 1.0_kUSD == 1000.0_USD );
+    CHECK( 1_days == 24_hours );
+    CHECK( 1_hours == 60_minutes );
+    CHECK( 1_minutes == 60_seconds );
+
+    CHECK( 1_mJ == units::from_millijoule( 1 ) );
+    CHECK( 1_J == units::from_joule( 1 ) );
+    CHECK( 1_kJ == units::from_kilojoule( 1 ) );
+
+    CHECK( 1_seconds == time_duration::from_seconds( 1 ) );
+    CHECK( 1_minutes == time_duration::from_minutes( 1 ) );
+    CHECK( 1_hours == time_duration::from_hours( 1 ) );
+    CHECK( 1_days == time_duration::from_days( 1 ) );
+}
+
+static units::energy parse_energy_quantity( const std::string &json )
+{
+    std::istringstream buffer( json );
+    JsonIn jsin( buffer );
+    return read_from_json_string<units::energy>( jsin, units::energy_units );
+}
+
+TEST_CASE( "energy parsing from JSON", "[units]" )
+{
+    CHECK_THROWS( parse_energy_quantity( "\"\"" ) ); // empty string
+    CHECK_THROWS( parse_energy_quantity( "27" ) ); // not a string at all
+    CHECK_THROWS( parse_energy_quantity( "\"    \"" ) ); // only spaces
+    CHECK_THROWS( parse_energy_quantity( "\"27\"" ) ); // no energy unit
+
+    CHECK( parse_energy_quantity( "\"1 mJ\"" ) == 1_mJ );
+    CHECK( parse_energy_quantity( "\"1 J\"" ) == 1_J );
+    CHECK( parse_energy_quantity( "\"1 kJ\"" ) == 1_kJ );
+    CHECK( parse_energy_quantity( "\"+1 mJ\"" ) == 1_mJ );
+    CHECK( parse_energy_quantity( "\"+1 J\"" ) == 1_J );
+    CHECK( parse_energy_quantity( "\"+1 kJ\"" ) == 1_kJ );
+
+    CHECK( parse_energy_quantity( "\"1 mJ 1 J 1 kJ\"" ) == 1_mJ + 1_J + 1_kJ );
+    CHECK( parse_energy_quantity( "\"1 mJ -4 J 1 kJ\"" ) == 1_mJ - 4_J + 1_kJ );
+}
+
+static time_duration parse_time_duration( const std::string &json )
+{
+    std::istringstream buffer( json );
+    JsonIn jsin( buffer );
+    return read_from_json_string<time_duration>( jsin, time_duration::units );
+}
+
+TEST_CASE( "time_duration parsing from JSON", "[units]" )
+{
+    CHECK_THROWS( parse_time_duration( "\"\"" ) ); // empty string
+    CHECK_THROWS( parse_time_duration( "27" ) ); // not a string at all
+    CHECK_THROWS( parse_time_duration( "\"    \"" ) ); // only spaces
+    CHECK_THROWS( parse_time_duration( "\"27\"" ) ); // no time unit
+
+    CHECK( parse_time_duration( "\"1 turns\"" ) == 1_turns );
+    CHECK( parse_time_duration( "\"1 minutes\"" ) == 1_minutes );
+    CHECK( parse_time_duration( "\"+1 hours\"" ) == 1_hours );
+    CHECK( parse_time_duration( "\"+1 days\"" ) == 1_days );
+
+    CHECK( parse_time_duration( "\"1 turns 1 minutes 1 hours 1 days\"" ) == 1_turns + 1_minutes +
+           1_hours + 1_days );
+    CHECK( parse_time_duration( "\"1 turns -4 minutes 1 hours -4 days\"" ) == 1_turns - 4_minutes +
+           1_hours - 4_days );
+}
diff --git a/tests/vehicle_drag.cpp b/tests/vehicle_drag.cpp
index f8e4b11f487f2..6ff2a3abe5e55 100644
--- a/tests/vehicle_drag.cpp
+++ b/tests/vehicle_drag.cpp
@@ -254,19 +254,19 @@ TEST_CASE( "vehicle_drag", "[vehicle] [engine]" )
     test_vehicle_drag( "tandem", 0.609525, 0.021344, 40.290625, 2353, 3076 );
     test_vehicle_drag( "unicycle", 0.690795, 0.002400, 24.162500, 2266, 2958 );
     test_vehicle_drag( "beetle", 0.785610, 1.693784, 1199.020312, 8902, 10668 );
-    test_vehicle_drag( "bubble_car", 0.823988, 1.670566, 1126.270833, 9434, 9785 );
+    test_vehicle_drag( "bubble_car", 0.823988, 1.373576, 926.044643, 9365, 9711 );
     test_vehicle_drag( "car", 0.294604, 2.366883, 1117.002083, 11837, 14304 );
     test_vehicle_drag( "car_mini", 0.294604, 1.709414, 1210.084375, 12080, 14536 );
     test_vehicle_drag( "car_sports", 0.294604, 2.424461, 1373.010000, 20847, 24914 );
     test_vehicle_drag( "car_sports_atomic", 0.294604, 3.552642, 1676.596875, 24664, 25593 );
     test_vehicle_drag( "car_sports_electric", 0.294604, 3.192600, 1808.018750, 24774, 25702 );
     test_vehicle_drag( "electric_car", 0.304763, 2.407649, 1136.240625, 16203, 16819 );
-    test_vehicle_drag( "rara_x", 0.880425, 2.099200, 1093.158405, 8484, 8803 );
+    test_vehicle_drag( "rara_x", 0.880425, 1.902452, 990.701509, 8408, 8724 );
     test_vehicle_drag( "suv", 0.294604, 2.807600, 1135.705357, 13939, 16801 );
     test_vehicle_drag( "suv_electric", 0.304763, 2.589389, 1047.436607, 16144, 16760 );
     test_vehicle_drag( "golf_cart", 0.943313, 1.479398, 930.895833, 7126, 7393 );
     test_vehicle_drag( "golf_cart_4seat", 0.943313, 1.446760, 910.358333, 7131, 7398 );
-    test_vehicle_drag( "hearse", 0.355556, 3.016494, 1220.205357, 10995, 13320 );
+    test_vehicle_drag( "hearse", 0.355556, 2.827377, 1143.705357, 11164, 13453 );
     test_vehicle_drag( "pickup_technical", 0.838097, 2.820320, 1140.850893, 10136, 12149 );
     test_vehicle_drag( "ambulance", 1.049323, 2.264056, 1858.217708, 11256, 13438 );
     test_vehicle_drag( "car_fbi", 0.457144, 2.635064, 1243.564583, 14570, 17458 );
@@ -303,7 +303,7 @@ TEST_CASE( "vehicle_drag", "[vehicle] [engine]" )
     test_vehicle_drag( "lux_rv", 1.609183, 3.571591, 2015.961623, 8400, 9790 );
     test_vehicle_drag( "meth_lab", 0.518580, 3.025322, 2070.948138, 11677, 14056 );
     test_vehicle_drag( "rv", 0.541800, 3.000739, 2054.120213, 11528, 13872 );
-    test_vehicle_drag( "schoolbus", 0.411188, 3.060324, 1370.046591, 12891, 15087 );
+    test_vehicle_drag( "schoolbus", 0.411187, 2.794265, 1250.937500, 13069, 15234 );
     test_vehicle_drag( "security_van", 0.541800, 7.592192, 6231.269792, 10977, 13009 );
     test_vehicle_drag( "wienermobile", 1.063697, 2.315334, 1900.304167, 11201, 13374 );
     test_vehicle_drag( "canoe", 0.609525, 6.948203, 1.967437, 331, 691 );
diff --git a/tests/vehicle_efficiency.cpp b/tests/vehicle_efficiency.cpp
index 4f6767882b4ab..5b0065064a2f9 100644
--- a/tests/vehicle_efficiency.cpp
+++ b/tests/vehicle_efficiency.cpp
@@ -430,22 +430,22 @@ TEST_CASE( "vehicle_make_efficiency_case", "[.]" )
 // Fix test for electric vehicles
 TEST_CASE( "vehicle_efficiency", "[vehicle] [engine]" )
 {
-    test_vehicle( "beetle", 787373, 292300, 228600, 75730, 56370 );
-    test_vehicle( "car", 1092322, 520800, 302500, 47060, 26470 );
-    test_vehicle( "car_sports", 1125918, 456200, 312000, 38140, 22390 );
-    test_vehicle( "electric_car", 1097791, 215469, 120379, 17211, 8898 );
-    test_vehicle( "suv", 1291990, 987100, 483000, 69560, 33260 );
+    test_vehicle( "beetle", 745101, 294587, 242197, 79708, 60855 );
+    test_vehicle( "car", 1050050, 522175, 313125, 48143, 29452 );
+    test_vehicle( "car_sports", 1083646, 456200, 320929, 39494, 24378 );
+    test_vehicle( "electric_car", 1055519, 215663, 125341, 18172, 9614 );
+    test_vehicle( "suv", 1249718, 988969, 499869, 73538, 35070 );
     test_vehicle( "motorcycle", 163085, 77300, 63120, 47530, 39030 );
     test_vehicle( "quad_bike", 265345, 75950, 75950, 35190, 35190 );
     test_vehicle( "scooter", 62587, 266900, 258300, 195200, 184400 );
     test_vehicle( "superbike", 242085, 72120, 46820, 34580, 21610 );
-    test_vehicle( "ambulance", 1803929, 432000, 345500, 64010, 47220 );
-    test_vehicle( "fire_engine", 2593241, 1169000, 960700, 244700, 215300 );
-    test_vehicle( "fire_truck", 6279233, 308500, 199100, 19950, 4747 );
+    test_vehicle( "ambulance", 1751089, 432000, 356896, 65848, 50876 );
+    test_vehicle( "fire_engine", 2540401, 1169000, 972534, 246049, 216909 );
+    test_vehicle( "fire_truck", 6226393, 308500, 199989, 19950, 4747 );
     test_vehicle( "truck_swat", 5959334, 505800, 348000, 30060, 7719 );
     test_vehicle( "tractor_plow", 723658, 528000, 528000, 117000, 117000 );
     test_vehicle( "apc", 5801619, 1100000, 948300, 132800, 86880 );
     test_vehicle( "humvee", 5499145, 607600, 341100, 25880, 9263 );
-    test_vehicle( "road_roller", 8779702, 369800, 412000, 22990, 6996 );
+    test_vehicle( "road_roller", 8705726, 359830, 414037, 22990, 6996 );
     test_vehicle( "golf_cart", 444630, 52800, 105591, 27250, 14207 );
 }